pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 12:02:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

CRASH (#1109)

Browse Source 
* sounds 1

* identify looping sounds

* standardize sound names

* more sounds

* more sounds

* ow ow ow

* 2 more

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
This commit is contained in:
HailSanta 2023-08-05 01:24:23 -04:00 committed by GitHub
parent 9cac66c54a
commit 38c7785bfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
693 changed files with 5039 additions and 5016 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2284
include/enums.h
View File

File diff suppressed because it is too large Load Diff

8
src/16F740.c
View File

@ -771,7 +771,7 @@ void btl_state_update_begin_player_turn(void) {
fx_water_splash(0, player->curPos.x - 15.0f, player->curPos.y + 32.0f, player->curPos.z + 5.0f, 1.0f, 24);
fx_water_splash(1, player->curPos.x + 15.0f, player->curPos.y + 22.0f, player->curPos.z + 5.0f, 1.0f, 24);
battleStatus->waterBlockEffect = NULL;
sfx_play_sound(SOUND_299);
sfx_play_sound(SOUND_0299);
btl_show_battle_message(BTL_MSG_WATER_BLOCK_END, 60);
gBattleSubState = BTL_SUBSTATE_BEGIN_PLAYER_TURN_AWAIT_WATER_BLOCK;
} else {
@ -2294,7 +2294,7 @@ void btl_state_update_run_away(void) {
enemyCount = prevSP - battleStatus->totalStarPoints;
if (enemyCount > 0) {
sfx_play_sound(SOUND_211);
sfx_play_sound(SOUND_COIN_PICKUP);
}
playerData->starPoints += enemyCount;
BattleScreenFadeAmt++;
@ -2852,7 +2852,7 @@ void btl_state_update_player_move(void) {
gBattleSubState = BTL_SUBSTATE_PLAYER_MOVE_CHECK_PLAYER_STATUS;
break;
}
sfx_play_sound(SOUND_2107);
sfx_play_sound(SOUND_INFLICT_KO);
btl_show_battle_message(messageIndex, 60);
for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) {
actor = battleStatus->enemyActors[i];
@ -3362,7 +3362,7 @@ void btl_state_update_partner_move(void) {
break;
}
sfx_play_sound(SOUND_2107);
sfx_play_sound(SOUND_INFLICT_KO);
btl_show_battle_message(messageIndex, 60);
for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) {

980
src/17D6A0.c
View File

File diff suppressed because it is too large Load Diff

4
src/17FEB0.c
View File

@ -391,7 +391,7 @@ HitResult calc_item_damage_enemy(void) {
hitResult = HIT_RESULT_HIT;
sp1C = TRUE;
gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10 | BS_FLAGS1_SHOW_PLAYER_DECORATIONS | BS_FLAGS1_ACTORS_VISIBLE;
sfx_play_sound_at_position(SOUND_231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
sfx_play_sound_at_position(SOUND_0231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
wasStatusInflicted = TRUE;
gBattleStatus.flags1 |= BS_FLAGS1_40;
} else {
@ -407,7 +407,7 @@ HitResult calc_item_damage_enemy(void) {
|| ((gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) && !(gBattleStatus.flags1 & BS_FLAGS1_80))
) {
if (battleStatus->lastAttackDamage > 0) {
sfx_play_sound_at_position(SOUND_231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
sfx_play_sound_at_position(SOUND_0231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
}
if (battleStatus->lastAttackDamage > 0 || (battleStatus->curAttackElement & DAMAGE_TYPE_STATUS_ALWAYS_HITS) && sp1C) {

8
src/18C790.c
View File

@ -508,7 +508,7 @@ void btl_state_update_celebration(void) {
bFadeToBlackAmt = 0;
LevelUpSelectTextOffsetX = 0;
LevelUpSelectTextVelX = 0;
sfx_play_sound(SOUND_D4);
sfx_play_sound(SOUND_JINGLE_WON_BATTLE);
prevSP = playerData->starPoints + battleStatus->totalStarPoints;
if (prevSP > 99) {
@ -551,7 +551,7 @@ void btl_state_update_celebration(void) {
battleStatus->totalStarPoints = EndBattleRewardTotal / 100;
deltaSP = prevSP - battleStatus->totalStarPoints;
if (deltaSP > 0) {
sfx_play_sound(SOUND_215);
sfx_play_sound(SOUND_STAR_POINT_PICKUP);
}
playerData->starPoints += deltaSP;
@ -615,7 +615,7 @@ void btl_state_update_celebration(void) {
btl_cam_use_preset(BTL_CAM_DEFAULT);
btl_cam_move(5);
DMA_COPY_SEGMENT(level_up);
sfx_play_sound(SOUND_80000008);
sfx_play_sound(SOUND_LOOP_08);
CelebrateStateTime = 0;
gBattleSubState = BTL_SUBSTATE_CELEBRATE_LEVEL_UP_BEGIN;
}
@ -981,7 +981,7 @@ void btl_state_update_celebration(void) {
if (battleStatus->curButtonsPressed & BUTTON_A) {
if (!CantLevelUpStat[battleStatus->curSubmenu]) {
sfx_play_sound(SOUND_MENU_NEXT);
sfx_play_sound(SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND);
sfx_play_sound(SOUND_LRAW_CHEERING | SOUND_ID_TRIGGER_CHANGE_SOUND);
gBattleSubState = BTL_SUBSTATE_CELEBRATE_LEVEL_UP_UPGRADE;
} else {
sfx_play_sound(SOUND_MENU_ERROR);

30
src/18F340.c
View File

@ -75,7 +75,7 @@ API_CALLABLE(DoesMarioStatusPreventHappyAnimation) {
Actor* player = gBattleStatus.playerActor;
show_action_rating(ACTION_RATING_LUCKY, player, player->curPos.x, player->curPos.y + 20.0f, player->curPos.z);
sfx_play_sound(SOUND_3FC);
sfx_play_sound(SOUND_03FC);
script->varTable[0] = FALSE;
if (player->debuff == STATUS_KEY_FEAR || player->debuff == STATUS_KEY_DIZZY || player->debuff == STATUS_KEY_PARALYZE ||
player->debuff == STATUS_KEY_SLEEP ||player->debuff == STATUS_KEY_FROZEN || player->debuff == STATUS_KEY_STOP) {
@ -368,7 +368,7 @@ API_CALLABLE(BattleFadeInMerlee) {
Npc* merlee = get_npc_unsafe(NPC_BTL_MERLEE);
if (isInitialCall) {
sfx_play_sound(SOUND_24B);
sfx_play_sound(SOUND_024B);
merlee->alpha = 0;
}
@ -695,7 +695,7 @@ EvtScript EVS_MarioEnterStage = {
EVT_CHILD_THREAD
EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0))
EVT_END_CHILD_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_162)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0162)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_GetUp)
EVT_WAIT(10)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_DustOff)
@ -1059,7 +1059,7 @@ EvtScript EVS_Player_Celebrate = {
EvtScript EVS_RunAwayNoCommand = {
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB3_Hustled)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15D)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_015D)
EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30)
EVT_WAIT(1)
EVT_CALL(SetActorYaw, ACTOR_PLAYER, 60)
@ -1096,7 +1096,7 @@ EvtScript EVS_RunAwayNoCommand = {
EVT_CALL(DetermineAutoRunAwaySuccess)
EVT_IF_EQ(LVar0, 1)
EVT_CALL(SetFledBattleFlag)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15E)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_015E)
EVT_CALL(SetGoalPos, ACTOR_PLAYER, -240, 0, 10)
EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(16.0))
EVT_CALL(PlayerRunToGoal, 0)
@ -1106,7 +1106,7 @@ EvtScript EVS_RunAwayNoCommand = {
EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0))
EVT_END_CHILD_THREAD
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Trip)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_162)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0162)
EVT_CALL(SetGoalPos, ACTOR_PLAYER, -100, 0, 10)
EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(10.0))
EVT_CALL(PlayerRunToGoal, 0)
@ -1168,7 +1168,7 @@ EvtScript EVS_RunAwayStart = {
EVT_CALL(SetupMashMeter, 1, 100, 0, 0, 0, 0)
EVT_CALL(func_80260E38)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB3_Hustled)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15D)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_015D)
EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30)
EVT_WAIT(1)
EVT_CALL(SetActorYaw, ACTOR_PLAYER, 60)
@ -1210,7 +1210,7 @@ EvtScript EVS_RunAwayStart = {
EVT_CALL(DetermineAutoRunAwaySuccess)
EVT_IF_EQ(LVar0, 1)
EVT_CALL(SetFledBattleFlag)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15E)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_015E)
EVT_CALL(SetGoalPos, ACTOR_PLAYER, -240, 0, 10)
EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(16.0))
EVT_CALL(PlayerRunToGoal, 0)
@ -1220,7 +1220,7 @@ EvtScript EVS_RunAwayStart = {
EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0))
EVT_END_CHILD_THREAD
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Trip)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_162)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0162)
EVT_CALL(SetGoalPos, ACTOR_PLAYER, -100, 0, 10)
EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(10.0))
EVT_CALL(PlayerRunToGoal, 0)
@ -1286,7 +1286,7 @@ EvtScript EVS_PlayerDies = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_24)
EVT_WAIT(15)
EVT_CALL(EnablePlayerBlur, BLUR_DISABLE)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_371)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0371)
EVT_SET(LVar0, 0)
EVT_LOOP(30)
EVT_ADD(LVar0, 60)
@ -1301,7 +1301,7 @@ EvtScript EVS_PlayerDies = {
EVT_END_LOOP
EVT_CALL(EnablePlayerBlur, BLUR_ENABLE)
EVT_WAIT(30)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_3FB)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_03FB)
EVT_SET(LVar0, 0)
EVT_SET(LVar1, 1)
EVT_LOOP(0)
@ -1473,7 +1473,7 @@ EvtScript EVS_UseLifeShroom = {
EVT_WAIT(15)
EVT_CALL(GiveRefundCleanup)
EVT_END_IF
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_372)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0372)
EVT_ADD(LVar4, 15)
EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 3, LVar3, LVar4, LVar5, EVT_FLOAT(1.0))
EVT_SET(LVar0, LVarF)
@ -1488,7 +1488,7 @@ EvtScript EVS_UseLifeShroom = {
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2055)
EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 1, LVar3, LVar4, LVar5, 70, 70, 10, 20)
EVT_WAIT(20)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_373)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0373)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 2, LVar0, LVar1, LVar2, 50, 20, 32, 30)
EVT_WAIT(40)
@ -1517,7 +1517,7 @@ EvtScript EVS_UseLifeShroom = {
EVT_CHILD_THREAD
EVT_CALL(LifeShroomRevealWorld)
EVT_END_CHILD_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_374)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0374)
EVT_CALL(SetActorRotation, ACTOR_PLAYER, 0, 0, 0)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(ConsumeLifeShroom)
@ -1551,7 +1551,7 @@ EvtScript EVS_UseLifeShroom = {
EVT_PLAY_EFFECT(EFFECT_MISC_PARTICLES, 2, LVar0, LVar1, LVar2, 20, 20, EVT_FLOAT(1.0), 10, 50)
EVT_END_LOOP
EVT_END_CHILD_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_160)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0160)
EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0))
EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0))
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)

6
src/190B20.c
View File

@ -2199,7 +2199,7 @@ s32 inflict_partner_ko(Actor* target, s32 statusTypeKey, s32 duration) {
if (statusTypeKey == STATUS_KEY_DAZE) {
if (statusTypeKey != target->koStatus) {
inflict_status(target, STATUS_KEY_DAZE, duration);
sfx_play_sound(SOUND_2107);
sfx_play_sound(SOUND_INFLICT_KO);
} else {
target->koDuration += duration;
if (target->koDuration > 9) {
@ -2875,7 +2875,7 @@ void remove_player_buffs(s32 buffs) {
fx_water_splash(1, player->curPos.x + 15.0f, player->curPos.y + 22.0f, player->curPos.z + 5.0f, 1.0f, 0x18);
battleStatus->waterBlockEffect = NULL;
sfx_play_sound(SOUND_299);
sfx_play_sound(SOUND_0299);
}
if (buffs & PLAYER_BUFF_TURBO_CHARGE && (battleStatus->turboChargeTurnsLeft != 0)) {
battleStatus->turboChargeTurnsLeft = 0;
@ -2907,7 +2907,7 @@ void btl_update_ko_status(void) {
player->disableEffect->data.disableX->koDuration = player->koDuration;
if (koDuration == 0) {
sfx_play_sound(SOUND_2107);
sfx_play_sound(SOUND_INFLICT_KO);
}
}

36
src/19FAF0.c
View File

@ -216,7 +216,7 @@ HitResult calc_player_test_enemy(void) {
&& (targetPart->eventFlags & ACTOR_EVENT_FLAG_SPIKY_TOP)
&& !player_team_is_ability_active(player, ABILITY_SPIKE_SHIELD))
{
sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
sfx_play_sound_at_position(SOUND_0108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
return HIT_RESULT_LANDED_ON_SPIKE;
}
@ -225,7 +225,7 @@ HitResult calc_player_test_enemy(void) {
&& (!(battleStatus->curAttackEventSuppression & SUPPRESS_EVENT_SPIKY_FRONT)
&& !player_team_is_ability_active(player, ABILITY_SPIKE_SHIELD)))
{
sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
sfx_play_sound_at_position(SOUND_0108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
dispatch_damage_event_player_1(1, EVENT_SPIKE_CONTACT);
dispatch_event_actor(target, EVENT_SPIKE_TAUNT);
return HIT_RESULT_BACKFIRE;
@ -326,7 +326,7 @@ HitResult calc_player_damage_enemy(void) {
&& (targetPart->eventFlags & ACTOR_EVENT_FLAG_SPIKY_TOP)
&& !player_team_is_ability_active(player, ABILITY_SPIKE_SHIELD))
{
sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
sfx_play_sound_at_position(SOUND_0108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
dispatch_damage_event_player_1(1, EVENT_SPIKE_CONTACT);
dispatch_event_actor(target, EVENT_SPIKE_TAUNT);
return HIT_RESULT_BACKFIRE;
@ -369,7 +369,7 @@ HitResult calc_player_damage_enemy(void) {
&& !(battleStatus->curAttackEventSuppression & SUPPRESS_EVENT_FLAG_80)
&& !player_team_is_ability_active(player, ABILITY_SPIKE_SHIELD)
) {
sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
sfx_play_sound_at_position(SOUND_0108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
dispatch_damage_event_player_1(1, EVENT_SPIKE_CONTACT);
dispatch_event_actor(target, EVENT_SPIKE_TAUNT);
return HIT_RESULT_BACKFIRE;
@ -402,13 +402,13 @@ HitResult calc_player_damage_enemy(void) {
switch (attackFxType) {
case 1:
sfx_play_sound_at_position(SOUND_372, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
sfx_play_sound_at_position(SOUND_0372, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
break;
case 2:
sfx_play_sound_at_position(SOUND_F1, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
sfx_play_sound_at_position(SOUND_00F1, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
break;
case 3:
sfx_play_sound_at_position(SOUND_DC, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
sfx_play_sound_at_position(SOUND_SLIDE_WHISTLE_OUT, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
break;
case 4:
sfx_play_sound_at_position(SOUND_2072, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
@ -898,7 +898,7 @@ HitResult calc_player_damage_enemy(void) {
}
if (battleStatus->lastAttackDamage > 0) {
sfx_play_sound(SOUND_231);
sfx_play_sound(SOUND_0231);
}
if (battleStatus->lastAttackDamage > 0 || battleStatus->curAttackElement & DAMAGE_TYPE_STATUS_ALWAYS_HITS && tempBinary) {
@ -1173,7 +1173,7 @@ ApiStatus func_80273444(Evt* script, s32 isInitialCall) {
playerState->unk_28 = 180 / playerState->moveTime;
playerState->unk_2C = playerState->goalPos.y;
if (script->functionTemp[1] != 2) {
sfx_play_sound_at_position(SOUND_160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z);
sfx_play_sound_at_position(SOUND_0160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z);
}
script->functionTemp[0] = TRUE;
}
@ -1218,7 +1218,7 @@ ApiStatus func_80273444(Evt* script, s32 isInitialCall) {
play_movement_dust_effects(2, player->curPos.x, player->curPos.y, player->curPos.z, player->yaw);
}
if (script->functionTemp[1] != 2) {
sfx_play_sound_at_position(SOUND_SOFT_LAND, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z);
sfx_play_sound_at_position(SOUND_LAND_SOFTLY, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z);
}
return ApiStatus_DONE1;
@ -1286,7 +1286,7 @@ ApiStatus PlayerFallToGoal(Evt* script, s32 isInitialCall) {
player->curPos.y = state->goalPos.y;
player->curPos.z = state->goalPos.z;
play_movement_dust_effects(2, player->curPos.x, player->curPos.y, player->curPos.z, player->yaw);
sfx_play_sound_at_position(SOUND_SOFT_LAND, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z);
sfx_play_sound_at_position(SOUND_LAND_SOFTLY, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z);
return ApiStatus_DONE1;
}
return ApiStatus_BLOCK;
@ -1332,7 +1332,7 @@ ApiStatus PlayerLandJump(Evt* script, s32 isInitialCall) {
player->curPos.y = 0.0f;
play_movement_dust_effects(2, player->curPos.x, player->curPos.y, player->curPos.z, player->yaw);
sfx_play_sound_at_position(SOUND_SOFT_LAND, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z);
sfx_play_sound_at_position(SOUND_LAND_SOFTLY, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z);
return ApiStatus_DONE1;
}
@ -1843,7 +1843,7 @@ ApiStatus func_80274A18(Evt* script, s32 isInitialCall) {
playerState->vel = vel2 + ((sin_rad(DEG_TO_RAD(playerState->unk_24)) * 0.8 * acc2) + acc2);
}
set_animation(0, 0, playerState->animJumpRise);
sfx_play_sound_at_position(SOUND_160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z);
sfx_play_sound_at_position(SOUND_0160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z);
script->functionTemp[0] = 1;
}
@ -1984,7 +1984,7 @@ ApiStatus func_802752AC(Evt* script, s32 isInitialCall) {
playerState->vel = 0.0f;
playerState->speed += temp / playerState->moveTime;
set_animation(ACTOR_PLAYER, 0, playerState->animJumpRise);
sfx_play_sound_at_position(SOUND_160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z);
sfx_play_sound_at_position(SOUND_0160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z);
playerState->unk_24 = 90.0f;
playerState->bounceDivisor = 45.0f;
playerState->unk_28 = 360 / playerState->moveTime;
@ -2088,7 +2088,7 @@ ApiStatus func_802752AC(Evt* script, s32 isInitialCall) {
playerState->unk_24 = clamp_angle(playerState->unk_24);
playerState->moveTime--;
if (playerState->moveTime == 0) {
sfx_play_sound_at_position(SOUND_160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z);
sfx_play_sound_at_position(SOUND_0160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z);
set_animation(ACTOR_PLAYER, 0, playerState->animJumpFall);
player->rotPivotOffset.y = 14;
player->rot.z -= 66.0f;
@ -2228,7 +2228,7 @@ ApiStatus func_80275F00(Evt* script, s32 isInitialCall) {
playerState->unk_30.z = (playerState->goalPos.z - playerState->curPos.z) / playerState->moveTime;
playerState->speed += temp / playerState->moveTime;
set_animation(ACTOR_PLAYER, 0, playerState->animJumpFall);
sfx_play_sound_at_position(SOUND_160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z);
sfx_play_sound_at_position(SOUND_0160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z);
sfx_play_sound_at_position(SOUND_TORNADO_JUMP, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z);
playerState->unk_18.x = 0.0f;
playerState->unk_18.y = 0.0f;
@ -2272,7 +2272,7 @@ ApiStatus func_80275F00(Evt* script, s32 isInitialCall) {
playerState->unk_30.z = (playerState->goalPos.z - playerState->curPos.z) / playerState->moveTime;
playerState->speed += temp / playerState->moveTime;
set_animation(ACTOR_PLAYER, 0, playerState->animJumpRise);
sfx_play_sound_at_position(SOUND_160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z);
sfx_play_sound_at_position(SOUND_0160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z);
sfx_play_sound_at_position(SOUND_TORNADO_JUMP, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z);
playerState->unk_18.x = 0.0f;
playerState->unk_18.y = 0.0f;
@ -2327,7 +2327,7 @@ ApiStatus func_80275F00(Evt* script, s32 isInitialCall) {
playerState->unk_30.z = (playerState->goalPos.z - playerState->curPos.z) / playerState->moveTime;
playerState->speed += temp / playerState->moveTime;
set_animation(ACTOR_PLAYER, 0, playerState->animJumpRise);
sfx_play_sound_at_position(SOUND_160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z);
sfx_play_sound_at_position(SOUND_0160, SOUND_SPACE_MODE_0, player->curPos.x, player->curPos.y, player->curPos.z);
playerState->unk_24 = 90.0f;
playerState->bounceDivisor = 45.0f;
playerState->unk_28 = 360 / playerState->moveTime;

4
src/1A5830.c
View File

@ -438,7 +438,7 @@ HitResult calc_enemy_damage_target(Actor* attacker) {
if (blocked) {
damage--;
damage -= player_team_is_ability_active(target, ABILITY_DAMAGE_DODGE);
sfx_play_sound_at_position(SOUND_231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
sfx_play_sound_at_position(SOUND_0231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
show_action_rating(ACTION_RATING_NICE, target, state->goalPos.x, state->goalPos.y, state->goalPos.z);
gBattleStatus.flags1 |= BS_FLAGS1_ATK_BLOCKED;
break;
@ -451,7 +451,7 @@ HitResult calc_enemy_damage_target(Actor* attacker) {
if (target->koStatus == 0 && !(battleStatus->curAttackElement & DAMAGE_TYPE_UNBLOCKABLE)) {
if (check_block_input(BUTTON_A)) {
damage = 0;
sfx_play_sound_at_position(SOUND_231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
sfx_play_sound_at_position(SOUND_0231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
show_action_rating(ACTION_RATING_NICE, target, state->goalPos.x, state->goalPos.y, state->goalPos.z);
gBattleStatus.flags1 |= BS_FLAGS1_ATK_BLOCKED;
break;

22
src/1AC760.c
View File

@ -79,7 +79,7 @@ HitResult calc_partner_test_enemy(void) {
&& (part->eventFlags & ACTOR_EVENT_FLAG_SPIKY_TOP)
&& !(target->flags2 & ACTOR_FLAG_UPSIDE_DOWN)
) {
sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
sfx_play_sound_at_position(SOUND_0108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
return HIT_RESULT_LANDED_ON_SPIKE;
}
@ -89,7 +89,7 @@ HitResult calc_partner_test_enemy(void) {
&& !(battleStatus->curAttackEventSuppression & SUPPRESS_EVENT_SPIKY_FRONT)
&& !player_team_is_ability_active(partner, ABILITY_SPIKE_SHIELD)
) {
sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
sfx_play_sound_at_position(SOUND_0108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
dispatch_damage_event_partner_1(1, EVENT_SPIKE_CONTACT);
dispatch_event_actor(target, EVENT_SPIKE_TAUNT);
return HIT_RESULT_BACKFIRE;
@ -114,7 +114,7 @@ HitResult calc_partner_test_enemy(void) {
&& !(target->flags & ACTOR_FLAG_UPSIDE_DOWN)
&& !(battleStatus->curAttackEventSuppression & SUPPRESS_EVENT_SPIKY_TOP)
) {
sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
sfx_play_sound_at_position(SOUND_0108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
dispatch_damage_event_partner_1(1, EVENT_SPIKE_CONTACT);
dispatch_event_actor(target, EVENT_SPIKE_TAUNT);
return HIT_RESULT_BACKFIRE;
@ -125,7 +125,7 @@ HitResult calc_partner_test_enemy(void) {
&& !(target->flags & ACTOR_FLAG_UPSIDE_DOWN)
&& !(battleStatus->curAttackEventSuppression & SUPPRESS_EVENT_FLAG_80)
) {
sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
sfx_play_sound_at_position(SOUND_0108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
dispatch_damage_event_partner_1(1, EVENT_SPIKE_CONTACT);
dispatch_event_actor(target, EVENT_SPIKE_TAUNT);
return HIT_RESULT_BACKFIRE;
@ -228,7 +228,7 @@ HitResult calc_partner_damage_enemy(void) {
if (battleStatus->curAttackElement & DAMAGE_TYPE_JUMP
&& targetPart->eventFlags & ACTOR_EVENT_FLAG_SPIKY_TOP
) {
sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
sfx_play_sound_at_position(SOUND_0108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
dispatch_damage_event_partner_1(1, EVENT_SPIKE_CONTACT);
dispatch_event_actor(target, EVENT_SPIKE_TAUNT);
return HIT_RESULT_BACKFIRE;
@ -269,7 +269,7 @@ HitResult calc_partner_damage_enemy(void) {
&& targetPart->eventFlags & ACTOR_EVENT_FLAG_SPIKY_FRONT
&& !(battleStatus->curAttackEventSuppression & SUPPRESS_EVENT_SPIKY_FRONT)
) {
sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
sfx_play_sound_at_position(SOUND_0108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
dispatch_damage_event_partner_1(1, EVENT_SPIKE_CONTACT);
dispatch_event_actor(target, EVENT_SPIKE_TAUNT);
return HIT_RESULT_BACKFIRE;
@ -294,7 +294,7 @@ HitResult calc_partner_damage_enemy(void) {
&& !(target->flags & ACTOR_FLAG_UPSIDE_DOWN)
&& !(battleStatus->curAttackEventSuppression & SUPPRESS_EVENT_FLAG_80)
) {
sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
sfx_play_sound_at_position(SOUND_0108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
dispatch_damage_event_partner_1(1, EVENT_SPIKE_CONTACT);
dispatch_event_actor(target, EVENT_SPIKE_TAUNT);
return HIT_RESULT_BACKFIRE;
@ -306,7 +306,7 @@ HitResult calc_partner_damage_enemy(void) {
&& !(target->flags & ACTOR_FLAG_UPSIDE_DOWN)
&& !(battleStatus->curAttackEventSuppression & SUPPRESS_EVENT_SPIKY_TOP)
) {
sfx_play_sound_at_position(SOUND_108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
sfx_play_sound_at_position(SOUND_0108, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
dispatch_damage_event_partner_1(1, EVENT_SPIKE_CONTACT);
dispatch_event_actor(target, EVENT_SPIKE_TAUNT);
return HIT_RESULT_BACKFIRE;
@ -684,7 +684,7 @@ HitResult calc_partner_damage_enemy(void) {
retVal = 0;
tempBinary = TRUE;
gBattleStatus.flags1 |= (BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10 | BS_FLAGS1_SHOW_PLAYER_DECORATIONS | BS_FLAGS1_ACTORS_VISIBLE);
sfx_play_sound_at_position(SOUND_231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
sfx_play_sound_at_position(SOUND_0231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
} else {
dispatchEvent = EVENT_IMMUNE;
retVal = 2;
@ -725,7 +725,7 @@ HitResult calc_partner_damage_enemy(void) {
retVal = 0;
tempBinary = TRUE;
gBattleStatus.flags1 |= (BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10 | BS_FLAGS1_SHOW_PLAYER_DECORATIONS | BS_FLAGS1_ACTORS_VISIBLE);
sfx_play_sound_at_position(SOUND_231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
sfx_play_sound_at_position(SOUND_0231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
} else {
dispatchEvent = EVENT_IMMUNE;
retVal = 2;
@ -764,7 +764,7 @@ HitResult calc_partner_damage_enemy(void) {
&& !(gBattleStatus.flags1 & BS_FLAGS1_80)
) {
if (battleStatus->lastAttackDamage > 0) {
sfx_play_sound_at_position(SOUND_231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
sfx_play_sound_at_position(SOUND_0231, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
}
if (battleStatus->lastAttackDamage > 0 || (battleStatus->curAttackElement & DAMAGE_TYPE_STATUS_ALWAYS_HITS && tempBinary)) {

6
src/23680.c
View File

@ -586,7 +586,7 @@ void basic_ai_wander(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolum
yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->pos.x, gPlayerStatusPtr->pos.z);
if (!npc_test_move_simple_with_slipping(npc->collisionChannel, &x, &y, &z, aiSettings->chaseSpeed, yaw, npc->collisionHeight, npc->collisionDiameter)) {
npc->yaw = yaw;
ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET);
ai_enemy_play_sound(npc, SOUND_SRAW_0B_A, SOUND_PARAM_MORE_QUIET);
fx_emote(EMOTE_EXCLAMATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &sp34);
enemy->aiFlags &= ~ENEMY_AI_FLAG_40;
enemy->aiFlags &= ~ENEMY_AI_FLAG_20;
@ -683,7 +683,7 @@ void basic_ai_loiter(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolum
yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->pos.x, gPlayerStatusPtr->pos.z);
if (!npc_test_move_simple_with_slipping(npc->collisionChannel, &x, &y, &z, aiSettings->chaseSpeed, yaw, npc->collisionHeight, npc->collisionDiameter)) {
npc->yaw = yaw;
ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET);
ai_enemy_play_sound(npc, SOUND_SRAW_0B_A, SOUND_PARAM_MORE_QUIET);
fx_emote(EMOTE_EXCLAMATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp);
if (enemy->npcSettings->actionFlags & AI_ACTION_JUMP_WHEN_SEE_PLAYER) {
script->AI_TEMP_STATE = AI_STATE_ALERT_INIT;
@ -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_3E1, 0);
ai_enemy_play_sound(npc, SOUND_03E1, 0);
npc->curAnim = enemy->animList[ENEMY_ANIM_INDEX_JUMP];
npc->jumpVel = 10.0f;
npc->jumpScale = 2.5f;

2
src/7bb60_len_41b0.c
View File

@ -390,7 +390,7 @@ void phys_player_land(void) {
playerStatus->landPos.x = playerStatus->pos.x;
playerStatus->landPos.z = playerStatus->pos.z;
playerStatus->flags &= ~PS_FLAG_AIRBORNE;
sfx_play_sound_at_player(SOUND_SOFT_LAND, SOUND_SPACE_MODE_0);
sfx_play_sound_at_player(SOUND_LAND_SOFTLY, SOUND_SPACE_MODE_0);
if (!(collisionStatus->curFloor & COLLISION_WITH_ENTITY_BIT)) {
phys_adjust_cam_on_landing();
}

6
src/80850_len_3060.c
View File

@ -619,7 +619,7 @@ void update_status_bar(void) {
if (uiStatus->drawPosY >= 18) {
if (gGameStatusPtr->frameCounter % 4 == 0) {
uiStatus->displayHP++;
sfx_play_sound(SOUND_213);
sfx_play_sound(SOUND_HEART_PICKUP);
}
} else if (gGameStatusPtr->frameCounter % 4 == 0) {
uiStatus->displayHP++;
@ -637,7 +637,7 @@ void update_status_bar(void) {
if (uiStatus->drawPosY >= 18) {
if (gGameStatusPtr->frameCounter % 4 == 0) {
uiStatus->displayFP++;
sfx_play_sound(SOUND_217);
sfx_play_sound(SOUND_FLOWER_PICKUP);
}
} else if (gGameStatusPtr->frameCounter % 4 == 0) {
uiStatus->displayFP++;
@ -1121,7 +1121,7 @@ void coin_counter_draw_content(UNK_TYPE arg0, s32 posX, s32 posY) {
s32 iconIndex;
if ((gPlayerData.coins != uiStatus->displayCoins) && ((gGameStatusPtr->frameCounter % 3) == 0)) {
sfx_play_sound(SOUND_211);
sfx_play_sound(SOUND_COIN_PICKUP);
}
iconIndex = uiStatus->iconIndex10;

44
src/C50A0.c
View File

@ -2371,34 +2371,34 @@ void update_item_entity_collectable(ItemEntity* item) {
item->flags |= ITEM_ENTITY_FLAG_DONE_FALLING;
} else {
if (IS_BADGE(item->itemID)) {
sfx_play_sound_at_position(SOUND_21B, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
sfx_play_sound_at_position(SOUND_021B, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
} else if (IS_ITEM(item->itemID)) {
sfx_play_sound_at_position(SOUND_21A, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
sfx_play_sound_at_position(SOUND_021A, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
} else {
switch (item->itemID) {
case ITEM_HEART:
sfx_play_sound_at_position(SOUND_214, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
sfx_play_sound_at_position(SOUND_HEART_BOUNCE, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
break;
case ITEM_COIN:
sfx_play_sound_at_position(SOUND_212, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
sfx_play_sound_at_position(SOUND_COIN_BOUNCE, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
break;
case ITEM_KOOPA_FORTRESS_KEY:
sfx_play_sound_at_position(SOUND_212, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
sfx_play_sound_at_position(SOUND_COIN_BOUNCE, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
break;
case ITEM_HEART_PIECE:
sfx_play_sound_at_position(SOUND_214, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
sfx_play_sound_at_position(SOUND_HEART_BOUNCE, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
break;
case ITEM_STAR_POINT:
sfx_play_sound_at_position(SOUND_212, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
sfx_play_sound_at_position(SOUND_COIN_BOUNCE, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
break;
case ITEM_HEART_POINT:
sfx_play_sound_at_position(SOUND_214, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
sfx_play_sound_at_position(SOUND_HEART_BOUNCE, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
break;
case ITEM_STAR_PIECE:
sfx_play_sound_at_position(SOUND_219, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
sfx_play_sound_at_position(SOUND_STAR_PIECE_BOUNCE, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
break;
case ITEM_FLOWER_POINT:
sfx_play_sound_at_position(SOUND_218, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
sfx_play_sound_at_position(SOUND_FLOWER_BOUNCE, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
break;
}
}
@ -2439,25 +2439,25 @@ void update_item_entity_collectable(ItemEntity* item) {
case ITEM_HEART:
if (playerData->curHP < playerData->curMaxHP) {
fx_recover(0, playerStatus->pos.x, playerStatus->pos.y + playerStatus->colliderHeight, playerStatus->pos.z, 1);
sfx_play_sound_at_position(SOUND_2056, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
sfx_play_sound_at_position(SOUND_RECOVER, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
}
playerData->curHP++;
if (playerData->curHP > playerData->curMaxHP) {
playerData->curHP = playerData->curMaxHP;
}
sfx_play_sound_at_position(SOUND_213, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
sfx_play_sound_at_position(SOUND_HEART_PICKUP, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
fx_sparkles(4, playerStatus->pos.x, playerStatus->pos.y + playerStatus->colliderHeight, playerStatus->pos.z, 30.0f);
break;
case ITEM_FLOWER_POINT:
if (playerData->curFP < playerData->curMaxFP) {
fx_recover(1, playerStatus->pos.x, playerStatus->pos.y + playerStatus->colliderHeight, playerStatus->pos.z, 1);
sfx_play_sound_at_position(SOUND_2056, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
sfx_play_sound_at_position(SOUND_RECOVER, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
}
playerData->curFP++;
if (playerData->curFP > playerData->curMaxFP) {
playerData->curFP = playerData->curMaxFP;
}
sfx_play_sound_at_position(SOUND_217, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
sfx_play_sound_at_position(SOUND_FLOWER_PICKUP, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
fx_sparkles(4, playerStatus->pos.x, playerStatus->pos.y + playerStatus->colliderHeight, playerStatus->pos.z, 30.0f);
break;
case ITEM_COIN:
@ -2465,7 +2465,7 @@ void update_item_entity_collectable(ItemEntity* item) {
if (playerData->coins > 999) {
playerData->coins = 999;
}
sfx_play_sound_at_position(SOUND_211, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
sfx_play_sound_at_position(SOUND_COIN_PICKUP, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
playerData->totalCoinsEarned++;
if (playerData->totalCoinsEarned > 99999) {
playerData->totalCoinsEarned = 99999;
@ -2473,19 +2473,19 @@ void update_item_entity_collectable(ItemEntity* item) {
break;
case ITEM_KOOPA_FORTRESS_KEY:
playerData->fortressKeyCount = playerData->fortressKeyCount + 1;
sfx_play_sound_at_position(SOUND_211, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
sfx_play_sound_at_position(SOUND_COIN_PICKUP, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
break;
case ITEM_STAR_POINT:
playerData->starPoints++;
if (playerData->starPoints > 100) {
playerData->starPoints = 100;
}
sfx_play_sound_at_position(SOUND_211, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
sfx_play_sound_at_position(SOUND_COIN_PICKUP, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
break;
case ITEM_HEART_POINT:
playerData->curHP = playerData->curMaxHP;
playerData->curFP = playerData->curMaxFP;
sfx_play_sound_at_position(SOUND_213, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
sfx_play_sound_at_position(SOUND_HEART_PICKUP, SOUND_SPACE_MODE_0, item->pos.x, item->pos.y, item->pos.z);
break;
}
D_801565A8 = FALSE;
@ -2602,13 +2602,13 @@ void update_item_entity_pickup(ItemEntity* item) {
if (!(item->pickupMsgFlags & ITEM_PICKUP_FLAG_NO_SOUND)) {
if (gItemTable[item->itemID].typeFlags & ITEM_TYPE_FLAG_BADGE) {
sfx_play_sound(SOUND_D3);
sfx_play_sound(SOUND_JINGLE_GOT_BADGE);
} else if (gItemTable[item->itemID].typeFlags & ITEM_TYPE_FLAG_KEY) {
sfx_play_sound(SOUND_D2);
sfx_play_sound(SOUND_JINGLE_GOT_KEY);
} else if (item->itemID == ITEM_COIN) {
sfx_play_sound_at_position(SOUND_211, 0, item->pos.x, item->pos.y, item->pos.z);
sfx_play_sound_at_position(SOUND_COIN_PICKUP, 0, item->pos.x, item->pos.y, item->pos.z);
} else {
sfx_play_sound(SOUND_D1);
sfx_play_sound(SOUND_JINGLE_GOT_ITEM);
}
}

367
src/audio/sfx.c
View File

@ -6,196 +6,197 @@
SHIFT_BSS u16 gCurrentDoorSounds;
SHIFT_BSS u16 gCurrentRoomDoorSounds;
// sound IDs
#define SOUND_LOOP_IDX(soundID) (soundID & 0xFFFF)
// map logical looping soundIDs to raw ones
s32 LoopingSounds[] = {
SOUND_287, SOUND_2A8, SOUND_54, SOUND_56, SOUND_24, SOUND_27, SOUND_21, SOUND_22, SOUND_349,
SOUND_273, SOUND_275, SOUND_275, SOUND_274, SOUND_273, SOUND_274, SOUND_99, SOUND_9E, SOUND_32E,
SOUND_8E, SOUND_89, SOUND_83, SOUND_388, SOUND_A0, SOUND_4A, SOUND_9F, SOUND_168, SOUND_185,
SOUND_52, SOUND_4E, SOUND_4F, SOUND_189, 0, 0, SOUND_198, SOUND_199, SOUND_194,
SOUND_19A, SOUND_91, SOUND_164, SOUND_271, SOUND_271, SOUND_274, SOUND_275, SOUND_271, SOUND_273,
SOUND_271, SOUND_273, SOUND_271, SOUND_274, SOUND_275, SOUND_276, SOUND_271, SOUND_273, SOUND_271,
SOUND_274, SOUND_276, SOUND_275, SOUND_271, SOUND_271, SOUND_271, SOUND_271, SOUND_276, SOUND_275,
SOUND_274, SOUND_39E, SOUND_341, SOUND_207, SOUND_271, SOUND_271, SOUND_275, SOUND_276, SOUND_271,
SOUND_271, SOUND_271, SOUND_50, SOUND_70, SOUND_36C, SOUND_36D, SOUND_295, SOUND_43, SOUND_197,
SOUND_221, SOUND_22A, SOUND_22B, SOUND_2040, SOUND_JR_TROOPA_SWIM, SOUND_33, SOUND_34, SOUND_39, SOUND_4C,
SOUND_4D, SOUND_1B1, SOUND_1B2, SOUND_94, SOUND_5D, SOUND_5B, SOUND_60, SOUND_1B3, 0,
SOUND_AD, SOUND_AE, SOUND_AF, SOUND_23D, SOUND_A2, SOUND_248, SOUND_249, SOUND_391, SOUND_3BC,
SOUND_3AD, SOUND_22C, SOUND_22D,
[SOUND_LOOP_IDX(SOUND_LOOP_00)] SOUND_LRAW_0287,
[SOUND_LOOP_IDX(SOUND_LOOP_01)] SOUND_LRAW_02A8,
[SOUND_LOOP_IDX(SOUND_LOOP_02)] SOUND_LRAW_0054,
[SOUND_LOOP_IDX(SOUND_LOOP_03)] SOUND_LRAW_0056,
[SOUND_LOOP_IDX(SOUND_LOOP_04)] SOUND_LRAW_0024,
[SOUND_LOOP_IDX(SOUND_LOOP_05)] SOUND_LRAW_0027,
[SOUND_LOOP_IDX(SOUND_LOOP_06)] SOUND_LRAW_0021,
[SOUND_LOOP_IDX(SOUND_LOOP_07)] SOUND_LRAW_0022,
[SOUND_LOOP_IDX(SOUND_LOOP_08)] SOUND_LRAW_CHEERING,
[SOUND_LOOP_IDX(SOUND_LOOP_09)] SOUND_LRAW_0273,
[SOUND_LOOP_IDX(SOUND_LOOP_0A)] SOUND_LRAW_0275,
[SOUND_LOOP_IDX(SOUND_LOOP_0B)] SOUND_LRAW_0275,
[SOUND_LOOP_IDX(SOUND_LOOP_0C)] SOUND_LRAW_0274,
[SOUND_LOOP_IDX(SOUND_LOOP_0D)] SOUND_LRAW_0273,
[SOUND_LOOP_IDX(SOUND_LOOP_0E)] SOUND_LRAW_0274,
[SOUND_LOOP_IDX(SOUND_LOOP_0F)] SOUND_LRAW_0099,
[SOUND_LOOP_IDX(SOUND_LOOP_10)] SOUND_LRAW_009E,
[SOUND_LOOP_IDX(SOUND_LOOP_11)] SOUND_LRAW_032E,
[SOUND_LOOP_IDX(SOUND_LOOP_12)] SOUND_LRAW_008E,
[SOUND_LOOP_IDX(SOUND_LOOP_13)] SOUND_LRAW_0089,
[SOUND_LOOP_IDX(SOUND_LOOP_14)] SOUND_LRAW_0083,
[SOUND_LOOP_IDX(SOUND_LOOP_15)] SOUND_LRAW_0388,
[SOUND_LOOP_IDX(SOUND_LOOP_16)] SOUND_LRAW_00A0,
[SOUND_LOOP_IDX(SOUND_LOOP_17)] SOUND_LRAW_004A,
[SOUND_LOOP_IDX(SOUND_LOOP_18)] SOUND_LRAW_009F,
[SOUND_LOOP_IDX(SOUND_LOOP_19)] SOUND_LRAW_0168,
[SOUND_LOOP_IDX(SOUND_LOOP_1A)] SOUND_LRAW_0185,
[SOUND_LOOP_IDX(SOUND_LOOP_1B)] SOUND_LRAW_0052,
[SOUND_LOOP_IDX(SOUND_LOOP_1C)] SOUND_LRAW_004E,
[SOUND_LOOP_IDX(SOUND_LOOP_1D)] SOUND_LRAW_004F,
[SOUND_LOOP_IDX(SOUND_LOOP_1E)] SOUND_LRAW_0189,
[SOUND_LOOP_IDX(SOUND_LOOP_1F)] SOUND_NONE,
[SOUND_LOOP_IDX(SOUND_LOOP_20)] SOUND_NONE,
[SOUND_LOOP_IDX(SOUND_LOOP_21)] SOUND_LRAW_0198,
[SOUND_LOOP_IDX(SOUND_LOOP_22)] SOUND_LRAW_0199,
[SOUND_LOOP_IDX(SOUND_LOOP_23)] SOUND_LRAW_0194,
[SOUND_LOOP_IDX(SOUND_LOOP_24)] SOUND_LRAW_019A,
[SOUND_LOOP_IDX(SOUND_LOOP_25)] SOUND_LRAW_0091,
[SOUND_LOOP_IDX(SOUND_LOOP_26)] SOUND_LRAW_0164,
[SOUND_LOOP_IDX(SOUND_LOOP_27)] SOUND_LRAW_0271,
[SOUND_LOOP_IDX(SOUND_LOOP_28)] SOUND_LRAW_0271,
[SOUND_LOOP_IDX(SOUND_LOOP_29)] SOUND_LRAW_0274,
[SOUND_LOOP_IDX(SOUND_LOOP_2A)] SOUND_LRAW_0275,
[SOUND_LOOP_IDX(SOUND_LOOP_2B)] SOUND_LRAW_0271,
[SOUND_LOOP_IDX(SOUND_LOOP_2C)] SOUND_LRAW_0273,
[SOUND_LOOP_IDX(SOUND_LOOP_2D)] SOUND_LRAW_0271,
[SOUND_LOOP_IDX(SOUND_LOOP_2E)] SOUND_LRAW_0273,
[SOUND_LOOP_IDX(SOUND_LOOP_2F)] SOUND_LRAW_0271,
[SOUND_LOOP_IDX(SOUND_LOOP_30)] SOUND_LRAW_0274,
[SOUND_LOOP_IDX(SOUND_LOOP_31)] SOUND_LRAW_0275,
[SOUND_LOOP_IDX(SOUND_LOOP_32)] SOUND_LRAW_0276,
[SOUND_LOOP_IDX(SOUND_LOOP_33)] SOUND_LRAW_0271,
[SOUND_LOOP_IDX(SOUND_LOOP_34)] SOUND_LRAW_0273,
[SOUND_LOOP_IDX(SOUND_LOOP_35)] SOUND_LRAW_0271,
[SOUND_LOOP_IDX(SOUND_LOOP_36)] SOUND_LRAW_0274,
[SOUND_LOOP_IDX(SOUND_LOOP_37)] SOUND_LRAW_0276,
[SOUND_LOOP_IDX(SOUND_LOOP_38)] SOUND_LRAW_0275,
[SOUND_LOOP_IDX(SOUND_LOOP_39)] SOUND_LRAW_0271,
[SOUND_LOOP_IDX(SOUND_LOOP_3A)] SOUND_LRAW_0271,
[SOUND_LOOP_IDX(SOUND_LOOP_3B)] SOUND_LRAW_0271,
[SOUND_LOOP_IDX(SOUND_LOOP_3C)] SOUND_LRAW_0271,
[SOUND_LOOP_IDX(SOUND_LOOP_3D)] SOUND_LRAW_0276,
[SOUND_LOOP_IDX(SOUND_LOOP_3E)] SOUND_LRAW_0275,
[SOUND_LOOP_IDX(SOUND_LOOP_3F)] SOUND_LRAW_0274,
[SOUND_LOOP_IDX(SOUND_LOOP_40)] SOUND_LRAW_039E,
[SOUND_LOOP_IDX(SOUND_LOOP_CHARGE_BAR)] SOUND_LRAW_CHARGE_BAR,
[SOUND_LOOP_IDX(SOUND_LOOP_42)] SOUND_LRAW_0207,
[SOUND_LOOP_IDX(SOUND_LOOP_43)] SOUND_LRAW_0271,
[SOUND_LOOP_IDX(SOUND_LOOP_44)] SOUND_LRAW_0271,
[SOUND_LOOP_IDX(SOUND_LOOP_45)] SOUND_LRAW_0275,
[SOUND_LOOP_IDX(SOUND_LOOP_46)] SOUND_LRAW_0276,
[SOUND_LOOP_IDX(SOUND_LOOP_47)] SOUND_LRAW_0271,
[SOUND_LOOP_IDX(SOUND_LOOP_48)] SOUND_LRAW_0271,
[SOUND_LOOP_IDX(SOUND_LOOP_49)] SOUND_LRAW_0271,
[SOUND_LOOP_IDX(SOUND_LOOP_4A)] SOUND_LRAW_0050,
[SOUND_LOOP_IDX(SOUND_LOOP_4B)] SOUND_LRAW_0070,
[SOUND_LOOP_IDX(SOUND_LOOP_4C)] SOUND_LRAW_036C,
[SOUND_LOOP_IDX(SOUND_LOOP_4D)] SOUND_LRAW_036D,
[SOUND_LOOP_IDX(SOUND_LOOP_4E)] SOUND_LRAW_0295,
[SOUND_LOOP_IDX(SOUND_LOOP_4F)] SOUND_LRAW_0043,
[SOUND_LOOP_IDX(SOUND_LOOP_50)] SOUND_LRAW_0197,
[SOUND_LOOP_IDX(SOUND_LOOP_51)] SOUND_LRAW_0221,
[SOUND_LOOP_IDX(SOUND_LOOP_52)] SOUND_LRAW_022A,
[SOUND_LOOP_IDX(SOUND_LOOP_53)] SOUND_LRAW_022B,
[SOUND_LOOP_IDX(SOUND_LOOP_54)] SOUND_LRAW_2040,
[SOUND_LOOP_IDX(SOUND_LOOP_JR_TROOPA_SWIM)] SOUND_LRAW_JR_TROOPA_SWIM,
[SOUND_LOOP_IDX(SOUND_LOOP_56)] SOUND_LRAW_0033,
[SOUND_LOOP_IDX(SOUND_LOOP_57)] SOUND_LRAW_0034,
[SOUND_LOOP_IDX(SOUND_LOOP_58)] SOUND_LRAW_0039,
[SOUND_LOOP_IDX(SOUND_LOOP_59)] SOUND_LRAW_004C,
[SOUND_LOOP_IDX(SOUND_LOOP_5A)] SOUND_LRAW_004D,
[SOUND_LOOP_IDX(SOUND_LOOP_5B)] SOUND_LRAW_01B1,
[SOUND_LOOP_IDX(SOUND_LOOP_5C)] SOUND_LRAW_01B2,
[SOUND_LOOP_IDX(SOUND_LOOP_5D)] SOUND_LRAW_0094,
[SOUND_LOOP_IDX(SOUND_LOOP_5E)] SOUND_LRAW_005D,
[SOUND_LOOP_IDX(SOUND_LOOP_5F)] SOUND_LRAW_005B,
[SOUND_LOOP_IDX(SOUND_LOOP_60)] SOUND_LRAW_0060,
[SOUND_LOOP_IDX(SOUND_LOOP_61)] SOUND_LRAW_01B3,
[SOUND_LOOP_IDX(SOUND_LOOP_62)] SOUND_NONE,
[SOUND_LOOP_IDX(SOUND_LOOP_63)] SOUND_LRAW_00AD,
[SOUND_LOOP_IDX(SOUND_LOOP_64)] SOUND_LRAW_00AE,
[SOUND_LOOP_IDX(SOUND_LOOP_65)] SOUND_LRAW_00AF,
[SOUND_LOOP_IDX(SOUND_LOOP_66)] SOUND_LRAW_023D,
[SOUND_LOOP_IDX(SOUND_LOOP_67)] SOUND_LRAW_00A2,
[SOUND_LOOP_IDX(SOUND_LOOP_68)] SOUND_LRAW_0248,
[SOUND_LOOP_IDX(SOUND_LOOP_69)] SOUND_LRAW_0249,
[SOUND_LOOP_IDX(SOUND_LOOP_6A)] SOUND_LRAW_0391,
[SOUND_LOOP_IDX(SOUND_LOOP_6B)] SOUND_LRAW_03BC,
[SOUND_LOOP_IDX(SOUND_LOOP_6C)] SOUND_LRAW_03AD,
[SOUND_LOOP_IDX(SOUND_LOOP_6D)] SOUND_LRAW_022C,
[SOUND_LOOP_IDX(SOUND_LOOP_6E)] SOUND_LRAW_022D,
};
// all sound IDs for alternating sounds
s32 D_8014F48C[] = { SOUND_336, SOUND_316 };
s32 D_8014F494[] = { SOUND_337, SOUND_317 };
s32 D_8014F49C[] = { SOUND_338, SOUND_318 };
s32 D_8014F4A4[] = { SOUND_339, SOUND_319 };
s32 D_8014F4AC[] = { SOUND_33A, SOUND_31A };
s32 D_8014F4B4[] = { SOUND_33B, SOUND_31B };
s32 D_8014F4BC[] = { SOUND_33C, SOUND_31C };
s32 D_8014F4C4[] = { SOUND_33D, SOUND_31D };
s32 D_8014F4CC[] = { SOUND_33E, SOUND_31E };
s32 D_8014F4D4[] = { SOUND_33F, SOUND_31F };
s32 D_8014F4DC[] = { SOUND_340, SOUND_340 };
s32 D_8014F4E4[] = { SOUND_2F4, SOUND_2F5 };
s32 D_8014F4EC[] = { SOUND_32F, SOUND_330 };
s32 D_8014F4F4[] = { SOUND_334, SOUND_335 };
s32 D_8014F4FC[] = { SOUND_2F1, SOUND_2F2 };
s32 D_8014F48C[] = { SOUND_SRAW_FIRE_BAR_0_A, SOUND_SRAW_FIRE_BAR_0_B };
s32 D_8014F494[] = { SOUND_SRAW_FIRE_BAR_1_A, SOUND_SRAW_FIRE_BAR_1_B };
s32 D_8014F49C[] = { SOUND_SRAW_FIRE_BAR_2_A, SOUND_SRAW_FIRE_BAR_2_B };
s32 D_8014F4A4[] = { SOUND_SRAW_FIRE_BAR_3_A, SOUND_SRAW_FIRE_BAR_3_B };
s32 D_8014F4AC[] = { SOUND_SRAW_FIRE_BAR_4_A, SOUND_SRAW_FIRE_BAR_4_B };
s32 D_8014F4B4[] = { SOUND_SRAW_FIRE_BAR_5_A, SOUND_SRAW_FIRE_BAR_5_B };
s32 D_8014F4BC[] = { SOUND_SRAW_FIRE_BAR_6_A, SOUND_SRAW_FIRE_BAR_6_B };
s32 D_8014F4C4[] = { SOUND_SRAW_FIRE_BAR_7_A, SOUND_SRAW_FIRE_BAR_7_B };
s32 D_8014F4CC[] = { SOUND_SRAW_FIRE_BAR_8_A, SOUND_SRAW_FIRE_BAR_8_B };
s32 D_8014F4D4[] = { SOUND_SRAW_FIRE_BAR_9_A, SOUND_SRAW_FIRE_BAR_9_B };
s32 D_8014F4DC[] = { SOUND_SRAW_FIRE_BAR_DEAD, SOUND_SRAW_FIRE_BAR_DEAD };
s32 D_8014F4E4[] = { SOUND_SRAW_0B_A, SOUND_SRAW_0B_B };
s32 D_8014F4EC[] = { SOUND_SRAW_0C_A, SOUND_SRAW_0C_B };
s32 D_8014F4F4[] = { SOUND_SRAW_0D_A, SOUND_SRAW_0D_B };
s32 D_8014F4FC[] = { SOUND_SRAW_0E_A, SOUND_SRAW_0E_B };
s32 D_8014F504[] = { SOUND_BOO_VANISH_A, SOUND_BOO_VANISH_B };
s32 D_8014F50C[] = { SOUND_BOO_APPEAR_A, SOUND_BOO_APPEAR_B };
s32 D_8014F514[] = { SOUND_1CB, SOUND_1CD };
s32 D_8014F51C[] = { SOUND_1CC, SOUND_1CE };
s32 D_8014F524[] = { SOUND_2A6, SOUND_2A7 };
s32 D_8014F52C[] = { SOUND_20C, SOUND_20D, SOUND_20E };
s32 D_8014F538[] = { SOUND_259, SOUND_25A };
s32 D_8014F540[] = { SOUND_25C, SOUND_25D };
s32 D_8014F548[] = { SOUND_331, SOUND_332, SOUND_333 };
s32 D_8014F554[] = { SOUND_2078, SOUND_2079 };
s32 D_8014F55C[] = { SOUND_179, SOUND_17A };
s32 D_8014F564[] = { SOUND_1FB, SOUND_1FC };
s32 D_8014F56C[] = { SOUND_203A, SOUND_203B };
s32 D_8014F574[] = { SOUND_22E, SOUND_22F };
s32 D_8014F57C[] = { SOUND_202A, SOUND_202B };
s32 D_8014F584[] = { SOUND_2041, SOUND_2042 };
s32 D_8014F58C[] = { SOUND_2043, SOUND_2044 };
s32 D_8014F594[] = { SOUND_2078, SOUND_2079 };
s32 D_8014F59C[] = { SOUND_3B6, SOUND_3B7 };
s32 D_8014F514[] = { SOUND_SRAW_11_A, SOUND_SRAW_11_B };
s32 D_8014F51C[] = { SOUND_SRAW_12_A, SOUND_SRAW_12_B };
s32 D_8014F524[] = { SOUND_SRAW_13_A, SOUND_SRAW_13_B };
s32 D_8014F52C[] = { SOUND_SRAW_14_A, SOUND_SRAW_14_B, SOUND_SRAW_14_C };
s32 D_8014F538[] = { SOUND_SRAW_15_A, SOUND_SRAW_15_B };
s32 D_8014F540[] = { SOUND_SRAW_16_A, SOUND_SRAW_16_B };
s32 D_8014F548[] = { SOUND_SRAW_17_A, SOUND_SRAW_17_B, SOUND_SRAW_17_C };
s32 D_8014F554[] = { SOUND_SRAW_20_A, SOUND_SRAW_20_B };
s32 D_8014F55C[] = { SOUND_SRAW_19_A, SOUND_SRAW_19_B };
s32 D_8014F564[] = { SOUND_SRAW_1A_A, SOUND_SRAW_1A_B };
s32 D_8014F56C[] = { SOUND_SRAW_1B_A, SOUND_SRAW_1B_B };
s32 D_8014F574[] = { SOUND_SRAW_1C_A, SOUND_SRAW_1C_B };
s32 D_8014F57C[] = { SOUND_SRAW_1D_A, SOUND_SRAW_1D_B };
s32 D_8014F584[] = { SOUND_SRAW_1E_A, SOUND_SRAW_1E_B };
s32 D_8014F58C[] = { SOUND_SRAW_1F_A, SOUND_SRAW_1F_B };
s32 D_8014F594[] = { SOUND_SRAW_20_A, SOUND_SRAW_20_B };
s32 D_8014F59C[] = { SOUND_SRAW_21_A, SOUND_SRAW_21_B };
#define SEQ_SOUND_ENTRY(soundID, sym) [soundID & 0xFFFF] { .sounds = sym, .soundCount = ARRAY_COUNT(sym) }
// map logical alternating soundIDs to lists of raw ones
AlternatingSoundSet AlternatingSounds[] = {
{
.sounds = D_8014F48C,
.soundCount = ARRAY_COUNT(D_8014F48C),
},
{
.sounds = D_8014F494,
.soundCount = ARRAY_COUNT(D_8014F494),
},
{
.sounds = D_8014F49C,
.soundCount = ARRAY_COUNT(D_8014F494),
},
{
.sounds = D_8014F4A4,
.soundCount = ARRAY_COUNT(D_8014F4A4),
},
{
.sounds = D_8014F4AC,
.soundCount = ARRAY_COUNT(D_8014F4AC),
},
{
.sounds = D_8014F4B4,
.soundCount = ARRAY_COUNT(D_8014F4B4),
},
{
.sounds = D_8014F4BC,
.soundCount = ARRAY_COUNT(D_8014F4BC),
},
{
.sounds = D_8014F4C4,
.soundCount = ARRAY_COUNT(D_8014F4C4),
},
{
.sounds = D_8014F4CC,
.soundCount = ARRAY_COUNT(D_8014F4CC),
},
{
.sounds = D_8014F4D4,
.soundCount = ARRAY_COUNT(D_8014F4D4),
},
{
.sounds = D_8014F4DC,
.soundCount = ARRAY_COUNT(D_8014F4DC),
},
{
.sounds = D_8014F4E4,
.soundCount = ARRAY_COUNT(D_8014F4E4),
},
{
.sounds = D_8014F4EC,
.soundCount = ARRAY_COUNT(D_8014F4EC),
},
{
.sounds = D_8014F4F4,
.soundCount = ARRAY_COUNT(D_8014F4F4),
},
{
.sounds = D_8014F4FC,
.soundCount = ARRAY_COUNT(D_8014F4FC),
},
{
.sounds = D_8014F504,
.soundCount = ARRAY_COUNT(D_8014F504),
},
{
.sounds = D_8014F50C,
.soundCount = ARRAY_COUNT(D_8014F50C),
},
{
.sounds = D_8014F514,
.soundCount = ARRAY_COUNT(D_8014F514),
},
{
.sounds = D_8014F51C,
.soundCount = ARRAY_COUNT(D_8014F51C),
},
{
.sounds = D_8014F524,
.soundCount = ARRAY_COUNT(D_8014F524),
},
{
.sounds = D_8014F52C,
.soundCount = ARRAY_COUNT(D_8014F52C),
},
{
.sounds = D_8014F538,
.soundCount = ARRAY_COUNT(D_8014F538),
},
{
.sounds = D_8014F540,
.soundCount = ARRAY_COUNT(D_8014F540),
},
{
.sounds = D_8014F548,
.soundCount = ARRAY_COUNT(D_8014F548),
},
{
.sounds = D_8014F554,
.soundCount = ARRAY_COUNT(D_8014F554),
},
{
.sounds = D_8014F55C,
.soundCount = ARRAY_COUNT(D_8014F55C),
},
{
.sounds = D_8014F564,
.soundCount = ARRAY_COUNT(D_8014F564),
},
{
.sounds = D_8014F56C,
.soundCount = ARRAY_COUNT(D_8014F56C),
},
{
.sounds = D_8014F574,
.soundCount = ARRAY_COUNT(D_8014F574),
},
{
.sounds = D_8014F57C,
.soundCount = ARRAY_COUNT(D_8014F57C),
},
{
.sounds = D_8014F584,
.soundCount = ARRAY_COUNT(D_8014F584),
},
{
.sounds = D_8014F58C,
.soundCount = ARRAY_COUNT(D_8014F58C),
},
{
.sounds = D_8014F594,
.soundCount = ARRAY_COUNT(D_8014F594),
},
{
.sounds = D_8014F59C,
.soundCount = ARRAY_COUNT(D_8014F59C),
}
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_0, D_8014F48C),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_1, D_8014F494),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_2, D_8014F49C),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_3, D_8014F4A4),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_4, D_8014F4AC),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_5, D_8014F4B4),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_6, D_8014F4BC),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_7, D_8014F4C4),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_8, D_8014F4CC),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_9, D_8014F4D4),
SEQ_SOUND_ENTRY(SOUND_SEQ_FIRE_BAR_DEAD, D_8014F4DC),
SEQ_SOUND_ENTRY(SOUND_SEQ_0B, D_8014F4E4),
SEQ_SOUND_ENTRY(SOUND_SEQ_0C, D_8014F4EC),
SEQ_SOUND_ENTRY(SOUND_SEQ_0D, D_8014F4F4),
SEQ_SOUND_ENTRY(SOUND_SEQ_0E, D_8014F4FC),
SEQ_SOUND_ENTRY(SOUND_SEQ_0F, D_8014F504),
SEQ_SOUND_ENTRY(SOUND_SEQ_10, D_8014F50C),
SEQ_SOUND_ENTRY(SOUND_SEQ_11, D_8014F514),
SEQ_SOUND_ENTRY(SOUND_SEQ_12, D_8014F51C),
SEQ_SOUND_ENTRY(SOUND_SEQ_13, D_8014F524),
SEQ_SOUND_ENTRY(SOUND_SEQ_14, D_8014F52C),
SEQ_SOUND_ENTRY(SOUND_SEQ_15, D_8014F538),
SEQ_SOUND_ENTRY(SOUND_SEQ_16, D_8014F540),
SEQ_SOUND_ENTRY(SOUND_SEQ_17, D_8014F548),
SEQ_SOUND_ENTRY(SOUND_SEQ_18, D_8014F554),
SEQ_SOUND_ENTRY(SOUND_SEQ_19, D_8014F55C),
SEQ_SOUND_ENTRY(SOUND_SEQ_1A, D_8014F564),
SEQ_SOUND_ENTRY(SOUND_SEQ_1B, D_8014F56C),
SEQ_SOUND_ENTRY(SOUND_SEQ_1C, D_8014F574),
SEQ_SOUND_ENTRY(SOUND_SEQ_1D, D_8014F57C),
SEQ_SOUND_ENTRY(SOUND_SEQ_1E, D_8014F584),
SEQ_SOUND_ENTRY(SOUND_SEQ_1F, D_8014F58C),
SEQ_SOUND_ENTRY(SOUND_SEQ_20, D_8014F594),
SEQ_SOUND_ENTRY(SOUND_SEQ_21, D_8014F59C),
};
s32 OpenCloseSounds[][2] = {
@ -204,7 +205,7 @@ s32 OpenCloseSounds[][2] = {
{ SOUND_LARGE_DOOR_OPEN, SOUND_LARGE_DOOR_CLOSE },
{ SOUND_CREAKY_DOOR_OPEN, SOUND_CREAKY_DOOR_CLOSE },
{ SOUND_METAL_GATE_OPEN, SOUND_METAL_GATE_CLOSE },
{ SOUND_1CB, SOUND_1CC },
{ SOUND_SRAW_11_A, SOUND_SRAW_12_A },
{ SOUND_20A3, SOUND_20A4 },
};

4
src/audio/sfx_player.c
View File

@ -120,8 +120,8 @@ s32 CUSTOM_ECHO_PARAMS_3[] = {
AlUnkGemini D_80078370[] = {
{
.sound1 = SOUND_34A,
.sound2 = SOUND_349,
.sound1 = SOUND_034A,
.sound2 = SOUND_LRAW_CHEERING,
.flags = 1
}
};

2
src/battle/action_cmd.c
View File

@ -737,7 +737,7 @@ API_CALLABLE(CloseActionCommandInfo) {
}
}
sfx_stop_sound(SOUND_80000041);
sfx_stop_sound(SOUND_LOOP_CHARGE_BAR);
close_action_command_instruction_popup();
return ApiStatus_DONE2;

6
src/battle/action_cmd/air_lift.c
View File

@ -136,7 +136,7 @@ void N(update)(void) {
hud_element_set_script(actionCommandStatus->hudElements[0], &HES_MashAButton);
air_lift_bss_0 = 1;
actionCommandStatus->frameCounter = actionCommandStatus->duration;
sfx_play_sound_with_params(SOUND_80000041, 0, 0, 0);
sfx_play_sound_with_params(SOUND_LOOP_CHARGE_BAR, 0, 0, 0);
actionCommandStatus->state = 11;
// fallthrough
case 11:
@ -184,7 +184,7 @@ void N(update)(void) {
if (battleStatus->actionResult < battleStatus->actionSuccess) {
battleStatus->actionResult = battleStatus->actionSuccess;
}
sfx_adjust_env_sound_params(SOUND_80000041, 0, 0, battleStatus->actionSuccess * 12);
sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionSuccess * 12);
if (actionCommandStatus->frameCounter != 0) {
actionCommandStatus->frameCounter--;
@ -208,7 +208,7 @@ void N(update)(void) {
func_80269160();
}
btl_set_popup_duration(0);
sfx_stop_sound(SOUND_80000041);
sfx_stop_sound(SOUND_LOOP_CHARGE_BAR);
actionCommandStatus->frameCounter = 20;
actionCommandStatus->state = 12;
break;

6
src/battle/action_cmd/air_raid.c
View File

@ -115,7 +115,7 @@ void N(update)(void) {
battleStatus->unk_85 = 0;
actionCommandStatus->unk_5C = 0;
actionCommandStatus->frameCounter = actionCommandStatus->duration;
sfx_play_sound_with_params(SOUND_80000041, 0, 0, 0);
sfx_play_sound_with_params(SOUND_LOOP_CHARGE_BAR, 0, 0, 0);
actionCommandStatus->state = 11;
// fallthrough
case 11:
@ -159,7 +159,7 @@ void N(update)(void) {
}
battleStatus->actionResult = actionCommandStatus->barFillLevel / 100;
sfx_adjust_env_sound_params(SOUND_80000041, 0, 0, battleStatus->actionResult * 12);
sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionResult * 12);
switch (partner->actorBlueprint->level) {
case 0:
@ -212,7 +212,7 @@ void N(update)(void) {
}
btl_set_popup_duration(0);
sfx_stop_sound(SOUND_80000041);
sfx_stop_sound(SOUND_LOOP_CHARGE_BAR);
actionCommandStatus->frameCounter = 5;
actionCommandStatus->state = 12;
break;

8
src/battle/action_cmd/body_slam.c
View File

@ -115,7 +115,7 @@ void N(update)(void) {
actionCommandStatus->barFillLevel = 0;
actionCommandStatus->thresholdLevel = 0;
actionCommandStatus->frameCounter = actionCommandStatus->duration;
sfx_play_sound_with_params(SOUND_80000041, 0, 0, 0);
sfx_play_sound_with_params(SOUND_LOOP_CHARGE_BAR, 0, 0, 0);
actionCommandStatus->state = 11;
case 11:
btl_set_popup_duration(99);
@ -132,13 +132,13 @@ void N(update)(void) {
hud_element_set_script(actionCommandStatus->hudElements[2], &HES_TimingReady);
hud_element_set_script(actionCommandStatus->hudElements[0], &HES_AButton);
if (!actionCommandStatus->isBarFilled) {
sfx_play_sound(SOUND_234);
sfx_play_sound(SOUND_0234);
actionCommandStatus->isBarFilled = TRUE;
}
}
battleStatus->actionResult = actionCommandStatus->barFillLevel / 100;
sfx_adjust_env_sound_params(SOUND_80000041, 0, 0, battleStatus->actionResult * 12);
sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionResult * 12);
if (actionCommandStatus->frameCounter != 0) {
actionCommandStatus->frameCounter--;
return;
@ -159,7 +159,7 @@ void N(update)(void) {
func_80269160();
}
btl_set_popup_duration(0);
sfx_stop_sound(SOUND_80000041);
sfx_stop_sound(SOUND_LOOP_CHARGE_BAR);
actionCommandStatus->frameCounter = 5;
actionCommandStatus->state = 12;
break;

6
src/battle/action_cmd/bomb.c
View File

@ -104,7 +104,7 @@ void N(update)(void) {
hud_element_set_script(actionCommandStatus->hudElements[0], &HES_MashAButton);
actionCommandStatus->barFillLevel = 0;
actionCommandStatus->frameCounter = actionCommandStatus->duration;
sfx_play_sound_with_params(SOUND_80000041, 0, 0, 0);
sfx_play_sound_with_params(SOUND_LOOP_CHARGE_BAR, 0, 0, 0);
actionCommandStatus->state = 11;
// fallthrough
@ -148,7 +148,7 @@ void N(update)(void) {
}
battleStatus->actionResult = actionCommandStatus->barFillLevel / 100;
sfx_adjust_env_sound_params(SOUND_80000041, 0, 0, battleStatus->actionResult * 12);
sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionResult * 12);
if (actionCommandStatus->frameCounter == 0) {
if (actionCommandStatus->barFillLevel == 0) {
@ -168,7 +168,7 @@ void N(update)(void) {
func_80269160();
}
sfx_stop_sound(SOUND_80000041);
sfx_stop_sound(SOUND_LOOP_CHARGE_BAR);
btl_set_popup_duration(0);
actionCommandStatus->frameCounter = 5;
actionCommandStatus->state = 12;

6
src/battle/action_cmd/dizzy_shell.c
View File

@ -100,7 +100,7 @@ void N(update)(void) {
hud_element_set_script(actionCommandStatus->hudElements[0], &HES_MashAButton);
actionCommandStatus->barFillLevel = 0;
actionCommandStatus->frameCounter = actionCommandStatus->duration;
sfx_play_sound_with_params(SOUND_80000041, 0, 0, 0);
sfx_play_sound_with_params(SOUND_LOOP_CHARGE_BAR, 0, 0, 0);
actionCommandStatus->state = 11;
case 11:
btl_set_popup_duration(99);
@ -144,7 +144,7 @@ void N(update)(void) {
}
battleStatus->actionResult = actionCommandStatus->barFillLevel / 100;
sfx_adjust_env_sound_params(SOUND_80000041, 0, 0, battleStatus->actionResult * 12);
sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionResult * 12);
if (actionCommandStatus->frameCounter != 0) {
actionCommandStatus->frameCounter--;
@ -173,7 +173,7 @@ void N(update)(void) {
if (battleStatus->actionSuccess == 100) {
func_80269160();
}
sfx_stop_sound(SOUND_80000041);
sfx_stop_sound(SOUND_LOOP_CHARGE_BAR);
btl_set_popup_duration(0);
actionCommandStatus->frameCounter = 5;
actionCommandStatus->state = 12;

6
src/battle/action_cmd/fire_shell.c
View File

@ -106,7 +106,7 @@ void N(update)(void) {
battleStatus->unk_85 = 0;
actionCommandStatus->unk_5C = 0;
actionCommandStatus->frameCounter = actionCommandStatus->duration;
sfx_play_sound_with_params(SOUND_80000041, 0, 0, 0);
sfx_play_sound_with_params(SOUND_LOOP_CHARGE_BAR, 0, 0, 0);
actionCommandStatus->state = 11;
case 11:
btl_set_popup_duration(99);
@ -146,7 +146,7 @@ void N(update)(void) {
}
battleStatus->actionResult = actionCommandStatus->barFillLevel / 100;
sfx_adjust_env_sound_params(SOUND_80000041, 0, 0, battleStatus->actionResult * 12);
sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionResult * 12);
switch (partner->actorBlueprint->level) {
case 0:
if (battleStatus->actionResult >= D_802A9964_427334[battleStatus->unk_85]) {
@ -195,7 +195,7 @@ void N(update)(void) {
if (battleStatus->actionSuccess == 100) {
func_80269160();
}
sfx_stop_sound(SOUND_80000041);
sfx_stop_sound(SOUND_LOOP_CHARGE_BAR);
btl_set_popup_duration(0);
actionCommandStatus->frameCounter = 5;
actionCommandStatus->state = 12;

8
src/battle/action_cmd/hammer.c
View File

@ -215,14 +215,14 @@ void N(update)(void) {
hud_element_set_script(actionCommandStatus->hudElements[4], &HES_TimingCharge3);
battleStatus->actionResult = 0;
if (actionCommandStatus->frameCounter == 0 && actionCommandStatus->playHammerSounds) {
sfx_play_sound(SOUND_233);
sfx_play_sound(SOUND_0233);
}
} else if (actionCommandStatus->frameCounter < temp_f20 * 2) {
hud_element_set_script(actionCommandStatus->hudElements[3], &HES_TimingCharge2);
battleStatus->actionResult = 1;
if (actionCommandStatus->frameCounter == temp_f20) {
if (actionCommandStatus->playHammerSounds) {
sfx_play_sound(SOUND_233);
sfx_play_sound(SOUND_0233);
}
}
} else if (actionCommandStatus->frameCounter < temp_f20 * 3.0f) {
@ -230,7 +230,7 @@ void N(update)(void) {
battleStatus->actionResult = 2;
if (actionCommandStatus->frameCounter == temp_f20 * 2) {
if (actionCommandStatus->playHammerSounds) {
sfx_play_sound(SOUND_233);
sfx_play_sound(SOUND_0233);
}
}
}
@ -240,7 +240,7 @@ void N(update)(void) {
hud_element_set_script(actionCommandStatus->hudElements[1], &HES_TimingReady);
hud_element_set_script(actionCommandStatus->hudElements[5], &HES_StickTapNeutral);
if (actionCommandStatus->playHammerSounds) {
sfx_play_sound(SOUND_234);
sfx_play_sound(SOUND_0234);
}
if (actionCommandStatus->autoSucceed != 0 && actionCommandStatus->autoSucceed != 2) {
actionCommandStatus->autoSucceed = 2;

6
src/battle/action_cmd/mega_shock.c
View File

@ -162,7 +162,7 @@ void N(update)(void) {
actionCommandStatus->barFillLevel = 0;
actionCommandStatus->unk_5C = 0;
actionCommandStatus->frameCounter = actionCommandStatus->duration;
sfx_play_sound_with_params(SOUND_80000041, 0, 0, 0);
sfx_play_sound_with_params(SOUND_LOOP_CHARGE_BAR, 0, 0, 0);
actionCommandStatus->state = 11;
case 11:
btl_set_popup_duration(99);
@ -257,7 +257,7 @@ void N(update)(void) {
adjustedFillLevel = actionCommandStatus->barFillLevel / 100;
battleStatus->actionResult = adjustedFillLevel;
sfx_adjust_env_sound_params(SOUND_80000041, 0, 0, adjustedFillLevel * 12);
sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, adjustedFillLevel * 12);
if (actionCommandStatus->frameCounter == 0) {
s16 threshold;
@ -290,7 +290,7 @@ void N(update)(void) {
func_80269160();
}
sfx_stop_sound(SOUND_80000041);
sfx_stop_sound(SOUND_LOOP_CHARGE_BAR);
btl_set_popup_duration(0);
actionCommandStatus->frameCounter = 5;
actionCommandStatus->state = 12;

6
src/battle/action_cmd/power_shock.c
View File

@ -160,7 +160,7 @@ void N(update)(void) {
actionCommandStatus->unk_5C = 0;
D_802A9B00 = TRUE;
actionCommandStatus->frameCounter = actionCommandStatus->duration;
sfx_play_sound_with_params(SOUND_80000041, 0, 0, 0);
sfx_play_sound_with_params(SOUND_LOOP_CHARGE_BAR, 0, 0, 0);
actionCommandStatus->state = 11;
// fallthrough
case 11:
@ -208,7 +208,7 @@ void N(update)(void) {
}
battleStatus->actionResult = actionCommandStatus->barFillLevel / 100;
sfx_adjust_env_sound_params(SOUND_80000041, 0, 0, battleStatus->actionResult * 12);
sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionResult * 12);
if (actionCommandStatus->frameCounter == 0) {
phi_a1 = actionCommandStatus->barFillLevel;
@ -236,7 +236,7 @@ void N(update)(void) {
func_80269160();
}
sfx_stop_sound(SOUND_80000041);
sfx_stop_sound(SOUND_LOOP_CHARGE_BAR);
btl_set_popup_duration(0);
actionCommandStatus->frameCounter = 5;
actionCommandStatus->state = 12;

6
src/battle/action_cmd/smack.c
View File

@ -134,7 +134,7 @@ void N(update)(void) {
battleStatus->unk_85 = 0;
actionCommandStatus->unk_5C = 0;
actionCommandStatus->frameCounter = actionCommandStatus->duration;
sfx_play_sound_with_params(SOUND_80000041, 0, 0, 0);
sfx_play_sound_with_params(SOUND_LOOP_CHARGE_BAR, 0, 0, 0);
actionCommandStatus->state = 11;
// fallthrough
@ -185,7 +185,7 @@ void N(update)(void) {
}
battleStatus->actionResult = actionCommandStatus->barFillLevel / 100;
sfx_adjust_env_sound_params(SOUND_80000041, 0, 0, battleStatus->actionResult * 12);
sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionResult * 12);
switch (partnerActor->actorBlueprint->level) {
case 0:
@ -261,7 +261,7 @@ void N(update)(void) {
}
btl_set_popup_duration(0);
sfx_stop_sound(SOUND_80000041);
sfx_stop_sound(SOUND_LOOP_CHARGE_BAR);
actionCommandStatus->frameCounter = 5;
actionCommandStatus->state = 12;
break;

6
src/battle/action_cmd/spiny_surge.c
View File

@ -140,7 +140,7 @@ void N(update)(void) {
actionCommandStatus->unk_5C = 0;
D_802A98C0 = 0;
actionCommandStatus->frameCounter = actionCommandStatus->duration;
sfx_play_sound_with_params(SOUND_80000041, 0, 0, 0);
sfx_play_sound_with_params(SOUND_LOOP_CHARGE_BAR, 0, 0, 0);
actionCommandStatus->state = 11;
// fallthrough
@ -194,7 +194,7 @@ void N(update)(void) {
D_802A98C0 = battleStatus->curButtonsDown;
battleStatus->actionResult = actionCommandStatus->unk_5C;
sfx_adjust_env_sound_params(SOUND_80000041, 0, 0, battleStatus->actionSuccess * 12);
sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionSuccess * 12);
if (actionCommandStatus->frameCounter != 0) {
actionCommandStatus->frameCounter--;
@ -219,7 +219,7 @@ void N(update)(void) {
}
btl_set_popup_duration(0);
sfx_stop_sound(SOUND_80000041);
sfx_stop_sound(SOUND_LOOP_CHARGE_BAR);
actionCommandStatus->frameCounter = 5;
actionCommandStatus->state = 12;
break;

6
src/battle/action_cmd/spook.c
View File

@ -102,7 +102,7 @@ void N(update)(void) {
battleStatus->actionResult = 0;
actionCommandStatus->unk_5C = 0;
actionCommandStatus->frameCounter = actionCommandStatus->duration;
sfx_play_sound_with_params(SOUND_80000041, 0, 0, 0);
sfx_play_sound_with_params(SOUND_LOOP_CHARGE_BAR, 0, 0, 0);
actionCommandStatus->state = 11;
case 11:
btl_set_popup_duration(99);
@ -174,7 +174,7 @@ void N(update)(void) {
}
battleStatus->actionResult = actionCommandStatus->barFillLevel / 100;
sfx_adjust_env_sound_params(SOUND_80000041, 0, 0, battleStatus->actionResult * 12);
sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionResult * 12);
if (actionCommandStatus->frameCounter != 0) {
actionCommandStatus->frameCounter--;
@ -204,7 +204,7 @@ void N(update)(void) {
func_80269160();
}
btl_set_popup_duration(0);
sfx_stop_sound(SOUND_80000041);
sfx_stop_sound(SOUND_LOOP_CHARGE_BAR);
actionCommandStatus->frameCounter = 5;
actionCommandStatus->state = 12;
break;

8
src/battle/action_cmd/squirt.c
View File

@ -123,7 +123,7 @@ void N(update)(void) {
actionCommandStatus->barFillLevel = 0;
actionCommandStatus->unk_5C = 0;
actionCommandStatus->frameCounter = actionCommandStatus->duration;
sfx_play_sound_with_params(SOUND_80000041, 0, 0, 0);
sfx_play_sound_with_params(SOUND_LOOP_CHARGE_BAR, 0, 0, 0);
actionCommandStatus->state = 11;
// fallthrough
case 11:
@ -152,7 +152,7 @@ void N(update)(void) {
}
battleStatus->actionResult = actionCommandStatus->barFillLevel / 100;
sfx_adjust_env_sound_params(SOUND_80000041, 0, 0, battleStatus->actionResult * 12);
sfx_adjust_env_sound_params(SOUND_LOOP_CHARGE_BAR, 0, 0, battleStatus->actionResult * 12);
id = actionCommandStatus->hudElements[0];
if (temp < 80) {
if (hud_element_get_script(id) != &HES_AButtonDown) {
@ -186,7 +186,7 @@ void N(update)(void) {
func_80269160();
}
btl_set_popup_duration(0);
sfx_stop_sound(SOUND_80000041);
sfx_stop_sound(SOUND_LOOP_CHARGE_BAR);
actionCommandStatus->frameCounter = 5;
actionCommandStatus->state = 12;
break;
@ -217,7 +217,7 @@ void N(draw)(void) {
}
void N(free)(void) {
sfx_stop_sound(SOUND_80000041);
sfx_stop_sound(SOUND_LOOP_CHARGE_BAR);
hud_element_free(gActionCommandStatus.hudElements[0]);
hud_element_free(gActionCommandStatus.hudElements[1]);
}

4
src/battle/action_cmd/tidal_wave.c
View File

@ -139,7 +139,7 @@ void N(update)(void) {
actionCommandStatus->hudPosX + ((actionCommandStatus->unk_5D - 1) * 20) + 16,
actionCommandStatus->hudPosY);
hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED);
sfx_play_sound(SOUND_233);
sfx_play_sound(SOUND_0233);
actionCommandStatus->lookBackCounter = 1;
actionCommandStatus->state = 12;
// fallthrough
@ -263,7 +263,7 @@ void N(update)(void) {
}
actionCommandStatus->state = 11;
battleStatus->actionResult++;
sfx_play_sound(SOUND_21C);
sfx_play_sound(SOUND_021C);
return;
}

10
src/battle/action_cmd/water_block.c
View File

@ -349,16 +349,16 @@ void N(update)(void) {
btl_set_popup_duration(99);
if (actionCommandStatus->frameCounter == 42) {
hud_element_set_script(actionCommandStatus->hudElements[11], &HES_TimingCharge3);
sfx_play_sound(SOUND_233);
sfx_play_sound(SOUND_0233);
}
if (actionCommandStatus->frameCounter == 22) {
hud_element_set_script(actionCommandStatus->hudElements[12], &HES_TimingCharge2);
sfx_play_sound(SOUND_233);
sfx_play_sound(SOUND_0233);
}
if (actionCommandStatus->frameCounter == 2) {
hud_element_set_script(actionCommandStatus->hudElements[2], &HES_TimingReady);
hud_element_set_script(actionCommandStatus->hudElements[0], &HES_AButtonDown);
sfx_play_sound(SOUND_234);
sfx_play_sound(SOUND_0234);
}
actionCommandStatus->frameCounter--;
if (actionCommandStatus->frameCounter == 0) {
@ -428,7 +428,7 @@ void N(update)(void) {
if (actionCommandStatus->frameCounter == 2) {
hud_element_set_script(actionCommandStatus->hudElements[3], &HES_TimingReady);
hud_element_set_script(actionCommandStatus->hudElements[0], &HES_AButtonDown);
sfx_play_sound(SOUND_234);
sfx_play_sound(SOUND_0234);
}
actionCommandStatus->frameCounter--;
if (actionCommandStatus->frameCounter == 0) {
@ -502,7 +502,7 @@ void N(update)(void) {
if (actionCommandStatus->frameCounter == 2) {
hud_element_set_script(actionCommandStatus->hudElements[4], &HES_TimingReady);
hud_element_set_script(actionCommandStatus->hudElements[0], &HES_AButtonDown);
sfx_play_sound(SOUND_234);
sfx_play_sound(SOUND_0234);
}
actionCommandStatus->frameCounter--;
if (actionCommandStatus->frameCounter == 0) {

4
src/battle/area/arn/actor/tubba_blubba.c
View File

@ -282,7 +282,7 @@ EvtScript N(80226558) = {
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_35E)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035E)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim16)
EVT_WAIT(20)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim17)
@ -368,7 +368,7 @@ EvtScript N(80226B88) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim0A)
EVT_WAIT(8)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim0B)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_3E7, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_LARGE_ACTOR_JUMP, 0)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)

4
src/battle/area/arn/actor/tubbas_heart.c
View File

@ -603,10 +603,10 @@ EvtScript N(802255D8) = {
EVT_CALL(SetBattleCamOffsetZ, 35)
EVT_CALL(MoveBattleCamOver, 50)
EVT_WAIT(56)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_3DB)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_03DB)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Leeching)
EVT_WAIT(37)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_3DB)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_03DB)
EVT_WAIT(22)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 10)

4
src/battle/area/dgb/actor/tubba_blubba.c
View File

@ -402,7 +402,7 @@ EvtScript N(80219D88) = {
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_35E)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035E)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim16)
EVT_WAIT(20)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim17)
@ -486,7 +486,7 @@ EvtScript N(8021A36C) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim0F)
EVT_WAIT(8)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim10)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_3E7, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_LARGE_ACTOR_JUMP, 0)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)

4
src/battle/area/dig/actor/tubba_blubba.c
View File

@ -350,7 +350,7 @@ EvtScript N(attackBodyCrush) = {
EVT_SET(LVar1, 0)
EVT_ADD(LVar2, 5)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0))
EVT_CALL(PlaySound, SOUND_JUMP_3E2)
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)
@ -390,7 +390,7 @@ EvtScript N(attackBodyCrush) = {
EVT_END_THREAD
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0))
EVT_CALL(PlaySound, SOUND_JUMP_3E2)
EVT_CALL(PlaySound, SOUND_ACTOR_JUMP)
EVT_CALL(JumpToGoal, ACTOR_SELF, 16, FALSE, TRUE, FALSE)
EVT_END_SWITCH
EVT_WAIT(2)

278
src/battle/area/flo2/actor/huff_n_puff.c
View File

@ -807,7 +807,7 @@ EvtScript N(OnDeath) = {
EVT_KILL_THREAD(LVar0)
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_EFFECT_SNAKING_STATIC), LVar0)
EVT_CALL(RemoveEffect, LVar0)
EVT_CALL(StopSound, SOUND_35C)
EVT_CALL(StopSound, SOUND_035C)
EVT_END_CASE_GROUP
EVT_END_SWITCH
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_HuffNPuff_Anim08)
@ -909,7 +909,7 @@ EvtScript N(OnBurnDeath) = {
EVT_KILL_THREAD(LVar0)
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_EFFECT_SNAKING_STATIC), LVar0)
EVT_CALL(RemoveEffect, LVar0)
EVT_CALL(StopSound, SOUND_35C)
EVT_CALL(StopSound, SOUND_035C)
EVT_END_CASE_GROUP
EVT_END_SWITCH
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_HuffNPuff_Anim27)
@ -1522,7 +1522,7 @@ EvtScript N(attackBodySlam) = {
EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 20, 0)
EVT_CALL(FlyToGoal, ACTOR_SELF, 40, -20, EASING_SIN_OUT)
EVT_WAIT(10)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E7)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LARGE_ACTOR_JUMP)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
@ -1780,7 +1780,7 @@ EvtScript N(normalAction) = {
EVT_END_IF
EVT_END_IF
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03B0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim1A)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_HuffNPuff_Anim1B)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_3, ANIM_HuffNPuff_Anim1C)
@ -1863,7 +1863,7 @@ EvtScript N(normalAction) = {
EVT_GOTO(0)
EVT_END_IF
EVT_CALL(RemoveEffect, LVar8)
EVT_CALL(StopSound, SOUND_3B0)
EVT_CALL(StopSound, SOUND_03B0)
EVT_CALL(StopSound, SOUND_BIG_POWER_UP)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim17)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_HuffNPuff_Anim18)
@ -1871,7 +1871,7 @@ EvtScript N(normalAction) = {
EVT_THREAD
EVT_WAIT(5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE)
EVT_END_THREAD
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_SCALE_X), LVar3)
@ -1938,7 +1938,7 @@ EvtScript N(attackWindBreath) = {
EVT_GOTO(1)
EVT_END_IF
EVT_END_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03B0)
EVT_THREAD
EVT_WAIT(15)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BIG_POWER_UP)
@ -1951,7 +1951,7 @@ EvtScript N(attackWindBreath) = {
EVT_CALL(SetBattleCamOffsetZ, 20)
EVT_CALL(MoveBattleCamOver, 180)
EVT_WAIT(90)
EVT_CALL(StopSound, SOUND_3B0)
EVT_CALL(StopSound, SOUND_03B0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim1D)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_HuffNPuff_Anim1D)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_3, ANIM_HuffNPuff_Anim1E)
@ -1959,7 +1959,7 @@ EvtScript N(attackWindBreath) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim20)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_HuffNPuff_Anim21)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_3, ANIM_HuffNPuff_Anim22)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35D)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035D)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 15)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
@ -2025,7 +2025,7 @@ EvtScript N(attackWindBreath) = {
EVT_WAIT(LVar0)
EVT_END_LOOP
EVT_WAIT(20)
EVT_CALL(StopSound, SOUND_35D)
EVT_CALL(StopSound, SOUND_035D)
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
@ -2178,7 +2178,7 @@ EvtScript N(attackWindBreath) = {
EVT_WAIT(110)
EVT_SET(LVar1, 0)
EVT_END_IF
EVT_CALL(StopSound, SOUND_35D)
EVT_CALL(StopSound, SOUND_035D)
EVT_WAIT(2)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -2228,7 +2228,7 @@ EvtScript N(electricCharge) = {
EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_2, EVT_PTR(N(IdleAnimations_charged2)))
EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_3, EVT_PTR(N(IdleAnimations_charged3)))
EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_ELECTRIFIED, TRUE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35C)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035C)
EVT_CALL(N(StartRumbleWithParams), 70, 120)
EVT_THREAD
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 60, EVT_FLOAT(0.3))
@ -2295,8 +2295,8 @@ EvtScript N(attackGroundLightning) = {
EVT_GOTO(1)
EVT_END_IF
EVT_END_THREAD
EVT_CALL(StopSound, SOUND_35C)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3D3)
EVT_CALL(StopSound, SOUND_035C)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03D3)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_SUB(LVar2, 10)
EVT_SET(LVar3, LVar0)
@ -2372,7 +2372,7 @@ EvtScript N(electicCharge_copy) = {
EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_2, EVT_PTR(N(IdleAnimations_charged2)))
EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_3, EVT_PTR(N(IdleAnimations_charged3)))
EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_ELECTRIFIED, TRUE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35C)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035C)
EVT_CALL(N(StartRumbleWithParams), 70, 120)
EVT_THREAD
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 60, EVT_FLOAT(0.3))
@ -2459,8 +2459,8 @@ EvtScript N(attackDirectLightning) = {
EVT_GOTO(1)
EVT_END_IF
EVT_END_THREAD
EVT_CALL(StopSound, SOUND_35C)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35B)
EVT_CALL(StopSound, SOUND_035C)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035B)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_EQ(HIT_RESULT_LUCKY)
@ -2603,7 +2603,7 @@ EvtScript N(attackGroundSlam) = {
EVT_CALL(SetBattleCamOffsetZ, 5)
EVT_CALL(MoveBattleCamOver, 30)
EVT_WAIT(30)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B3)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03B3)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim1A)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_HuffNPuff_Anim1B)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_3, ANIM_HuffNPuff_Anim1C)
@ -2653,9 +2653,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVar9, 2)
EVT_IF_EQ(LVar9, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_03D6)
EVT_END_IF
EVT_CALL(GetActorPos, ArrayVar(4), LVarD, LVarE, LVarF)
EVT_CALL(SetGoalPos, ArrayVar(4), LVarA, LVarB, LVarF)
@ -2682,9 +2682,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVar9, 2)
EVT_IF_EQ(LVar9, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_03D6)
EVT_END_IF
EVT_CALL(GetActorPos, ArrayVar(9), LVarD, LVarE, LVarF)
EVT_CALL(SetGoalPos, ArrayVar(9), LVarA, LVarB, LVarF)
@ -2711,9 +2711,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVar9, 2)
EVT_IF_EQ(LVar9, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_03D6)
EVT_END_IF
EVT_CALL(GetActorPos, ArrayVar(3), LVarD, LVarE, LVarF)
EVT_CALL(SetGoalPos, ArrayVar(3), LVarA, LVarB, LVarF)
@ -2740,9 +2740,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVar9, 2)
EVT_IF_EQ(LVar9, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_03D6)
EVT_END_IF
EVT_CALL(GetActorPos, ArrayVar(5), LVarD, LVarE, LVarF)
EVT_CALL(SetGoalPos, ArrayVar(5), LVarA, LVarB, LVarF)
@ -2769,9 +2769,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVar9, 2)
EVT_IF_EQ(LVar9, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_03D6)
EVT_END_IF
EVT_CALL(GetActorPos, ArrayVar(1), LVarD, LVarE, LVarF)
EVT_CALL(SetGoalPos, ArrayVar(1), LVarA, LVarB, LVarF)
@ -2798,9 +2798,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVar9, 2)
EVT_IF_EQ(LVar9, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_03D6)
EVT_END_IF
EVT_CALL(GetActorPos, ArrayVar(0), LVarD, LVarE, LVarF)
EVT_CALL(SetGoalPos, ArrayVar(0), LVarA, LVarB, LVarF)
@ -2827,9 +2827,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVar9, 2)
EVT_IF_EQ(LVar9, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_03D6)
EVT_END_IF
EVT_CALL(GetActorPos, ArrayVar(8), LVarD, LVarE, LVarF)
EVT_CALL(SetGoalPos, ArrayVar(8), LVarA, LVarB, LVarF)
@ -2856,9 +2856,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVar9, 2)
EVT_IF_EQ(LVar9, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_03D6)
EVT_END_IF
EVT_CALL(GetActorPos, ArrayVar(2), LVarD, LVarE, LVarF)
EVT_CALL(SetGoalPos, ArrayVar(2), LVarA, LVarB, LVarF)
@ -2885,9 +2885,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVar9, 2)
EVT_IF_EQ(LVar9, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_03D6)
EVT_END_IF
EVT_CALL(GetActorPos, ArrayVar(7), LVarD, LVarE, LVarF)
EVT_CALL(SetGoalPos, ArrayVar(7), LVarA, LVarB, LVarF)
@ -2914,9 +2914,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVar9, 2)
EVT_IF_EQ(LVar9, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_03D6)
EVT_END_IF
EVT_CALL(GetActorPos, ArrayVar(6), LVarD, LVarE, LVarF)
EVT_CALL(SetGoalPos, ArrayVar(6), LVarA, LVarB, LVarF)
@ -3613,9 +3613,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(4))
EVT_CALL(FlyToGoal, ArrayVar(4), 20, -10, EASING_SIN_OUT)
@ -3627,9 +3627,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(9))
EVT_CALL(FlyToGoal, ArrayVar(9), 20, -10, EASING_SIN_OUT)
@ -3641,9 +3641,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(3))
EVT_CALL(FlyToGoal, ArrayVar(3), 20, -10, EASING_SIN_OUT)
@ -3655,9 +3655,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(5))
EVT_CALL(FlyToGoal, ArrayVar(5), 20, -10, EASING_SIN_OUT)
@ -3669,9 +3669,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(1))
EVT_CALL(FlyToGoal, ArrayVar(1), 20, -10, EASING_SIN_OUT)
@ -3683,9 +3683,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(0))
EVT_CALL(FlyToGoal, ArrayVar(0), 20, -10, EASING_SIN_OUT)
@ -3697,9 +3697,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(8))
EVT_CALL(FlyToGoal, ArrayVar(8), 20, -10, EASING_SIN_OUT)
@ -3711,9 +3711,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(2))
EVT_CALL(FlyToGoal, ArrayVar(2), 20, -10, EASING_SIN_OUT)
@ -3725,9 +3725,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(7))
EVT_CALL(FlyToGoal, ArrayVar(7), 20, -10, EASING_SIN_OUT)
@ -3739,9 +3739,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(6))
EVT_CALL(FlyToGoal, ArrayVar(6), 20, -10, EASING_SIN_OUT)
@ -3804,9 +3804,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(4))
EVT_CALL(FlyToGoal, ArrayVar(4), 20, -10, EASING_SIN_OUT)
@ -3818,9 +3818,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(9))
EVT_CALL(FlyToGoal, ArrayVar(9), 20, -10, EASING_SIN_OUT)
@ -3832,9 +3832,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(3))
EVT_CALL(FlyToGoal, ArrayVar(3), 20, -10, EASING_SIN_OUT)
@ -3846,9 +3846,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(5))
EVT_CALL(FlyToGoal, ArrayVar(5), 20, -10, EASING_SIN_OUT)
@ -3860,9 +3860,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(1))
EVT_CALL(FlyToGoal, ArrayVar(1), 20, -10, EASING_SIN_OUT)
@ -3874,9 +3874,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(0))
EVT_CALL(FlyToGoal, ArrayVar(0), 20, -10, EASING_SIN_OUT)
@ -3888,9 +3888,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(8))
EVT_CALL(FlyToGoal, ArrayVar(8), 20, -10, EASING_SIN_OUT)
@ -3902,9 +3902,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(2))
EVT_CALL(FlyToGoal, ArrayVar(2), 20, -10, EASING_SIN_OUT)
@ -3916,9 +3916,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(7))
EVT_CALL(FlyToGoal, ArrayVar(7), 20, -10, EASING_SIN_OUT)
@ -3930,9 +3930,9 @@ EvtScript N(attackGroundSlam) = {
EVT_THREAD
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(6))
EVT_CALL(FlyToGoal, ArrayVar(6), 20, -10, EASING_SIN_OUT)
@ -3969,7 +3969,7 @@ EvtScript N(tuffPuffMoveToPlayer) = {
EVT_CALL(N(Atan2), LVarE, LVar0, LVar2, LVar3, LVar5)
EVT_SET(LVarF, 0)
EVT_LOOP(0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DB)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DB)
EVT_SET(LVarF, 0)
EVT_SET(LVarC, LVarB)
EVT_ADD(LVarC, LVarB)
@ -4172,9 +4172,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_ADD(LVar2, LVar4)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalPos, ArrayVar(4), LVar1, LVar2, LVar3)
EVT_CALL(FlyToGoal, ArrayVar(4), 30, -10, EASING_SIN_OUT)
@ -4206,9 +4206,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_ADD(LVar2, LVar4)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalPos, ArrayVar(9), LVar1, LVar2, LVar3)
EVT_CALL(FlyToGoal, ArrayVar(9), 30, -10, EASING_SIN_OUT)
@ -4240,9 +4240,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_ADD(LVar2, LVar4)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalPos, ArrayVar(3), LVar1, LVar2, LVar3)
EVT_CALL(FlyToGoal, ArrayVar(3), 30, -10, EASING_SIN_OUT)
@ -4274,9 +4274,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_ADD(LVar2, LVar4)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalPos, ArrayVar(5), LVar1, LVar2, LVar3)
EVT_CALL(FlyToGoal, ArrayVar(5), 30, -10, EASING_SIN_OUT)
@ -4308,9 +4308,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_ADD(LVar2, LVar4)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalPos, ArrayVar(1), LVar1, LVar2, LVar3)
EVT_CALL(FlyToGoal, ArrayVar(1), 30, -10, EASING_SIN_OUT)
@ -4342,9 +4342,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_ADD(LVar2, LVar4)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalPos, ArrayVar(0), LVar1, LVar2, LVar3)
EVT_CALL(FlyToGoal, ArrayVar(0), 30, -10, EASING_SIN_OUT)
@ -4376,9 +4376,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_ADD(LVar2, LVar4)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalPos, ArrayVar(8), LVar1, LVar2, LVar3)
EVT_CALL(FlyToGoal, ArrayVar(8), 30, -10, EASING_SIN_OUT)
@ -4410,9 +4410,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_ADD(LVar2, LVar4)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalPos, ArrayVar(2), LVar1, LVar2, LVar3)
EVT_CALL(FlyToGoal, ArrayVar(2), 30, -10, EASING_SIN_OUT)
@ -4444,9 +4444,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_ADD(LVar2, LVar4)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalPos, ArrayVar(7), LVar1, LVar2, LVar3)
EVT_CALL(FlyToGoal, ArrayVar(7), 30, -10, EASING_SIN_OUT)
@ -4478,9 +4478,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_ADD(LVar2, LVar4)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalPos, ArrayVar(6), LVar1, LVar2, LVar3)
EVT_CALL(FlyToGoal, ArrayVar(6), 30, -10, EASING_SIN_OUT)
@ -4825,9 +4825,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_CALL(SetActorVar, ArrayVar(4), 2, 0)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(4))
EVT_CALL(FlyToGoal, ArrayVar(4), 30, 10, EASING_SIN_OUT)
@ -4854,9 +4854,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_CALL(SetActorVar, ArrayVar(9), 2, 0)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(9))
EVT_CALL(FlyToGoal, ArrayVar(9), 30, 10, EASING_SIN_OUT)
@ -4883,9 +4883,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_CALL(SetActorVar, ArrayVar(3), 2, 0)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(3))
EVT_CALL(FlyToGoal, ArrayVar(3), 30, 10, EASING_SIN_OUT)
@ -4912,9 +4912,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_CALL(SetActorVar, ArrayVar(5), 2, 0)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(5))
EVT_CALL(FlyToGoal, ArrayVar(5), 30, 10, EASING_SIN_OUT)
@ -4941,9 +4941,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_CALL(SetActorVar, ArrayVar(1), 2, 0)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(1))
EVT_CALL(FlyToGoal, ArrayVar(1), 30, 10, EASING_SIN_OUT)
@ -4970,9 +4970,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_CALL(SetActorVar, ArrayVar(0), 2, 0)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(0))
EVT_CALL(FlyToGoal, ArrayVar(0), 30, 10, EASING_SIN_OUT)
@ -4999,9 +4999,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_CALL(SetActorVar, ArrayVar(8), 2, 0)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(8))
EVT_CALL(FlyToGoal, ArrayVar(8), 30, 10, EASING_SIN_OUT)
@ -5028,9 +5028,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_CALL(SetActorVar, ArrayVar(2), 2, 0)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(2))
EVT_CALL(FlyToGoal, ArrayVar(2), 30, 10, EASING_SIN_OUT)
@ -5057,9 +5057,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_CALL(SetActorVar, ArrayVar(7), 2, 0)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(7))
EVT_CALL(FlyToGoal, ArrayVar(7), 30, 10, EASING_SIN_OUT)
@ -5086,9 +5086,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_CALL(SetActorVar, ArrayVar(6), 2, 0)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(6))
EVT_CALL(FlyToGoal, ArrayVar(6), 30, 10, EASING_SIN_OUT)
@ -5428,9 +5428,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_CALL(SetActorVar, ArrayVar(4), 2, 0)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(4), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(4))
EVT_CALL(FlyToGoal, ArrayVar(4), 30, 10, EASING_SIN_OUT)
@ -5457,9 +5457,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_CALL(SetActorVar, ArrayVar(9), 2, 0)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(9), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(9))
EVT_CALL(FlyToGoal, ArrayVar(9), 30, 10, EASING_SIN_OUT)
@ -5486,9 +5486,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_CALL(SetActorVar, ArrayVar(3), 2, 0)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(3), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(3))
EVT_CALL(FlyToGoal, ArrayVar(3), 30, 10, EASING_SIN_OUT)
@ -5515,9 +5515,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_CALL(SetActorVar, ArrayVar(5), 2, 0)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(5), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(5))
EVT_CALL(FlyToGoal, ArrayVar(5), 30, 10, EASING_SIN_OUT)
@ -5544,9 +5544,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_CALL(SetActorVar, ArrayVar(1), 2, 0)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(1), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(1))
EVT_CALL(FlyToGoal, ArrayVar(1), 30, 10, EASING_SIN_OUT)
@ -5573,9 +5573,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_CALL(SetActorVar, ArrayVar(0), 2, 0)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(0), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(0))
EVT_CALL(FlyToGoal, ArrayVar(0), 30, 10, EASING_SIN_OUT)
@ -5602,9 +5602,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_CALL(SetActorVar, ArrayVar(8), 2, 0)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(8), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(8))
EVT_CALL(FlyToGoal, ArrayVar(8), 30, 10, EASING_SIN_OUT)
@ -5631,9 +5631,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_CALL(SetActorVar, ArrayVar(2), 2, 0)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(2), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(2))
EVT_CALL(FlyToGoal, ArrayVar(2), 30, 10, EASING_SIN_OUT)
@ -5660,9 +5660,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_CALL(SetActorVar, ArrayVar(7), 2, 0)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(7), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(7))
EVT_CALL(FlyToGoal, ArrayVar(7), 30, 10, EASING_SIN_OUT)
@ -5689,9 +5689,9 @@ EvtScript N(attackTuffPuffs) = {
EVT_CALL(SetActorVar, ArrayVar(6), 2, 0)
EVT_MOD(LVarA, 2)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D5)
EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_03D5)
EVT_ELSE
EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_3D6)
EVT_CALL(PlaySoundAtActor, ArrayVar(6), SOUND_03D6)
EVT_END_IF
EVT_CALL(SetGoalToHome, ArrayVar(6))
EVT_CALL(FlyToGoal, ArrayVar(6), 30, 10, EASING_SIN_OUT)

4
src/battle/area/flo2/actor/spike.c
View File

@ -290,7 +290,7 @@ EvtScript N(attack) = {
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_2C5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02C5)
EVT_THREAD
EVT_LOOP(15)
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 1, 0, 0)
@ -311,7 +311,7 @@ EvtScript N(attack) = {
EVT_WAIT(10)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleLakilester_ThrowSpiny)
EVT_WAIT(3)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_2C6)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_02C6)
EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_2, ACTOR_SOUND_JUMP, 0, 0)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)

2
src/battle/area/hos/actor/goombario_tutor.c
View File

@ -209,7 +209,7 @@ EvtScript N(takeTurn_80219444) = {
EVT_WAIT(10)
EVT_CALL(action_command_jump_start, 12, 3)
EVT_END_THREAD
EVT_CALL(PlaySound, SOUND_JUMP_3E2)
EVT_CALL(PlaySound, SOUND_ACTOR_JUMP)
EVT_CALL(JumpToGoal, ACTOR_SELF, 22, FALSE, TRUE, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0))

20
src/battle/area/hos/actor/magikoopa.c
View File

@ -276,7 +276,7 @@ EvtScript N(8021D890) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_SUB(LVar2, 1)
EVT_CALL(SetPartPos, ACTOR_SELF, PRT_3, LVar0, LVar1, LVar2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_SET(LVar1, 0)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8))
@ -797,9 +797,9 @@ EvtScript N(healOne) = {
EVT_THREAD
EVT_WAIT(5)
EVT_CALL(PlaySoundAtActor, LVarB, SOUND_206D)
EVT_CALL(PlaySoundAtActor, LVarB, SOUND_214)
EVT_CALL(PlaySoundAtActor, LVarB, SOUND_HEART_BOUNCE)
EVT_WAIT(30)
EVT_CALL(PlaySoundAtActor, LVarB, SOUND_25C)
EVT_CALL(PlaySoundAtActor, LVarB, SOUND_SRAW_16_A)
EVT_END_THREAD
EVT_THREAD
EVT_CALL(FreezeBattleState, TRUE)
@ -890,9 +890,9 @@ EvtScript N(healAll) = {
EVT_THREAD
EVT_WAIT(5)
EVT_CALL(PlaySoundAtActor, LVar0, SOUND_206D)
EVT_CALL(PlaySoundAtActor, LVar0, SOUND_214)
EVT_CALL(PlaySoundAtActor, LVar0, SOUND_HEART_BOUNCE)
EVT_WAIT(30)
EVT_CALL(PlaySoundAtActor, LVar0, SOUND_25C)
EVT_CALL(PlaySoundAtActor, LVar0, SOUND_SRAW_16_A)
EVT_END_THREAD
EVT_THREAD
EVT_CALL(FreezeBattleState, TRUE)
@ -1546,7 +1546,7 @@ EvtScript N(boostAttack) = {
EVT_WAIT(5)
EVT_THREAD
EVT_WAIT(10)
EVT_CALL(PlaySoundAtActor, LVar8, SOUND_2DD)
EVT_CALL(PlaySoundAtActor, LVar8, SOUND_02DD)
EVT_END_THREAD
EVT_THREAD
EVT_CALL(FreezeBattleState, TRUE)
@ -1658,7 +1658,7 @@ EvtScript N(boostDefense) = {
EVT_WAIT(5)
EVT_THREAD
EVT_WAIT(10)
EVT_CALL(PlaySoundAtActor, LVar8, SOUND_2DD)
EVT_CALL(PlaySoundAtActor, LVar8, SOUND_02DD)
EVT_END_THREAD
EVT_THREAD
EVT_CALL(FreezeBattleState, TRUE)
@ -1729,7 +1729,7 @@ EvtScript N(electrify) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_FlyingMagikoopa_Anim02)
EVT_END_IF
EVT_WAIT(5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2F0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02F0)
EVT_CALL(GetActorFlags, ACTOR_SELF, LVar0)
EVT_IF_NOT_FLAG(LVar0, ACTOR_FLAG_FLYING)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -1771,7 +1771,7 @@ EvtScript N(electrify) = {
EVT_THREAD
EVT_WAIT(10)
EVT_LOOP(4)
EVT_CALL(PlaySoundAtActor, LVar8, SOUND_3D2)
EVT_CALL(PlaySoundAtActor, LVar8, SOUND_03D2)
EVT_CALL(RandInt, 3, LVar0)
EVT_ADD(LVar0, 3)
EVT_WAIT(LVar0)
@ -1887,7 +1887,7 @@ EvtScript N(vanish) = {
EVT_WAIT(5)
EVT_THREAD
EVT_WAIT(10)
EVT_CALL(PlaySoundAtActor, LVar8, SOUND_2DB)
EVT_CALL(PlaySoundAtActor, LVar8, SOUND_02DB)
EVT_END_THREAD
EVT_THREAD
EVT_CALL(FreezeBattleState, TRUE)

4
src/battle/area/isk_part_2/actor/chain_chomp.c
View File

@ -700,13 +700,13 @@ EvtScript N(EVS_TakeTurn) = {
EVT_END_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ChainChomp_SlowBite)
EVT_WAIT(15)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_10F)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_HURT)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_CALL(PlaySound, SOUND_10F)
EVT_CALL(PlaySound, SOUND_ACTOR_HURT)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ChainChomp_Idle)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)

22
src/battle/area/isk_part_2/actor/tutankoopa.c
View File

@ -629,7 +629,7 @@ EvtScript N(EVS_Attack_ThrowShell) = {
EVT_CALL(JumpPartTo, ACTOR_SELF, LVar9, LVar0, LVar1, LVar2, 5, TRUE)
EVT_WAIT(8)
EVT_CALL(SetAnimation, ACTOR_SELF, LVar9, ANIM_BuzzyBeetle_Anim05)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2F9)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02F9)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
@ -1002,7 +1002,7 @@ EvtScript N(EVS_Move_SummonChomp) = {
EVT_GOTO(0)
EVT_END_IF
EVT_END_THREAD
EVT_CALL(PlaySound, SOUND_26B)
EVT_CALL(PlaySound, SOUND_026B)
EVT_LABEL(10)
EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_GateOpenAmount, LVarD)
EVT_CALL(TranslateModel, 31, 0, LVarD, 0)
@ -1012,7 +1012,7 @@ EvtScript N(EVS_Move_SummonChomp) = {
EVT_IF_LT(LVarD, 60)
EVT_GOTO(10)
EVT_END_IF
EVT_CALL(StopSound, SOUND_26B)
EVT_CALL(StopSound, SOUND_026B)
EVT_WAIT(10)
// create the chomp and have him exit the gate
EVT_CALL(SummonEnemy, EVT_PTR(N(SummonedChomp)), FALSE)
@ -1099,7 +1099,7 @@ EvtScript N(EVS_Move_SummonChomp) = {
EVT_GOTO(40)
EVT_END_IF
EVT_END_THREAD
EVT_CALL(PlaySound, SOUND_26B)
EVT_CALL(PlaySound, SOUND_026B)
EVT_LABEL(50)
EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_GateOpenAmount, LVarD)
EVT_CALL(TranslateModel, 31, 0, LVarD, 0)
@ -1109,8 +1109,8 @@ EvtScript N(EVS_Move_SummonChomp) = {
EVT_IF_GT(LVarD, 0)
EVT_GOTO(50)
EVT_END_IF
EVT_CALL(StopSound, SOUND_26B)
EVT_CALL(PlaySound, SOUND_26C)
EVT_CALL(StopSound, SOUND_026B)
EVT_CALL(PlaySound, SOUND_026C)
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.5))
EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_HasSummoned, TRUE)
EVT_RETURN
@ -1163,10 +1163,10 @@ EvtScript N(EVS_LevitateToHomePos) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.1))
EVT_CALL(SetGoalPos, ACTOR_SELF, 97, 70, 15)
EVT_CALL(JumpToGoal, ACTOR_SELF, 45, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A)
EVT_THREAD
EVT_WAIT(1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B4)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_B)
EVT_END_THREAD
EVT_WAIT(5)
EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Stunned, FALSE)
@ -1183,10 +1183,10 @@ EvtScript N(EVS_GetBackUp) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A)
EVT_THREAD
EVT_WAIT(1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B4)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_B)
EVT_END_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Idle)
EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(TutankoopaAnims)))
@ -1240,7 +1240,7 @@ EvtScript N(EVS_Tutankoopa_Death) = {
EVT_CALL(GetActorPos, ACTOR_ENEMY1, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 10)
EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, SOUND_DEATH)
EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, SOUND_ACTOR_DEATH)
EVT_SET(LVar3, 0)
EVT_LOOP(12)
EVT_CALL(SetActorRotation, ACTOR_ENEMY1, LVar3, 0, 0)

4
src/battle/area/kgr/actor/fuzzipede.c
View File

@ -925,9 +925,9 @@ EvtScript N(8021C004) = {
EVT_THREAD
EVT_WAIT(5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE)
EVT_WAIT(30)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SRAW_16_A)
EVT_END_THREAD
EVT_THREAD
EVT_CALL(FreezeBattleState, TRUE)

2
src/battle/area/kkj/actor/kammy_koopa.c
View File

@ -501,7 +501,7 @@ EvtScript N(onDeath) = {
EVT_SUB(LVar2, 1)
EVT_CALL(SetPartPos, ACTOR_SELF, PRT_2, LVar0, LVar1, LVar2)
EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_2, ACTOR_PART_FLAG_INVISIBLE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_SET(LVar1, 0)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8))

2
src/battle/area/kmr_part_2/actor/blue_goomba_1.c
View File

@ -498,7 +498,7 @@ EvtScript N(doDeath_8021B388) = {
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar2, LVar3, LVar4)
EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar2, LVar3, LVar4, 0, 0, 0, 0, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH)
EVT_CALL(DropStarPoints, ACTOR_SELF)
EVT_SET(LVar3, 0)
EVT_LOOP(12)

14
src/battle/area/kmr_part_2/actor/goomba_king.c
View File

@ -497,7 +497,7 @@ EvtScript N(80221CD4) = {
EVT_CASE_OR_EQ(5)
EVT_THREAD
EVT_WAIT(12)
EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_3, SOUND_301)
EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_3, SOUND_0301)
EVT_END_THREAD
EVT_THREAD
EVT_WAIT(10)
@ -517,7 +517,7 @@ EvtScript N(80221CD4) = {
EVT_END_THREAD
EVT_THREAD
EVT_WAIT(5)
EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_4, SOUND_301)
EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_4, SOUND_0301)
EVT_END_THREAD
EVT_THREAD
EVT_WAIT(3)
@ -537,7 +537,7 @@ EvtScript N(80221CD4) = {
EVT_END_THREAD
EVT_THREAD
EVT_WAIT(17)
EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_5, SOUND_301)
EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_5, SOUND_0301)
EVT_END_THREAD
EVT_THREAD
EVT_WAIT(15)
@ -566,7 +566,7 @@ EvtScript N(80221CD4) = {
EVT_END_SWITCH
EVT_THREAD
EVT_WAIT(12)
EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_3, SOUND_301)
EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_3, SOUND_0301)
EVT_END_THREAD
EVT_THREAD
EVT_WAIT(10)
@ -586,7 +586,7 @@ EvtScript N(80221CD4) = {
EVT_END_THREAD
EVT_THREAD
EVT_WAIT(5)
EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_4, SOUND_301)
EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_4, SOUND_0301)
EVT_END_THREAD
EVT_THREAD
EVT_WAIT(3)
@ -606,7 +606,7 @@ EvtScript N(80221CD4) = {
EVT_END_THREAD
EVT_THREAD
EVT_WAIT(17)
EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_5, SOUND_301)
EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY3, PRT_TREE_5, SOUND_0301)
EVT_END_THREAD
EVT_THREAD
EVT_WAIT(15)
@ -742,7 +742,7 @@ EvtScript N(doDeath_80222F50) = {
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar2, LVar3, LVar4)
EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar2, LVar3, LVar4, 0, 0, 0, 0, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH)
EVT_CALL(DropStarPoints, ACTOR_SELF)
EVT_SET(LVar3, 0)
EVT_LOOP(12)

4
src/battle/area/kmr_part_2/actor/goomnut_tree.c
View File

@ -350,7 +350,7 @@ EvtScript N(80223DBC) = {
EVT_IF_EQ(LVar0, 0)
EVT_CALL(SetGoalPos, ACTOR_SELF, 10, 0, 10)
EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_2, 1, FALSE)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_301)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_0301)
EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_2, EVT_FLOAT(0.8))
EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, PRT_2, EVT_FLOAT(4.0))
EVT_CALL(FallPartTo, ACTOR_SELF, PRT_2, 10, 20, 10, 20)
@ -364,7 +364,7 @@ EvtScript N(80223DBC) = {
EVT_END_LOOP
EVT_RETURN
EVT_END_IF
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_301)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_0301)
EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_2, EVT_FLOAT(0.8))
EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, PRT_2, EVT_FLOAT(4.0))
EVT_CALL(GetStatusFlags, ACTOR_ENEMY0, LVar0)

2
src/battle/area/kmr_part_2/actor/red_goomba_1.c
View File

@ -482,7 +482,7 @@ EvtScript N(doDeath_8021D0C4) = {
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar2, LVar3, LVar4)
EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar2, LVar3, LVar4, 0, 0, 0, 0, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH)
EVT_CALL(DropStarPoints, ACTOR_SELF)
EVT_SET(LVar3, 0)
EVT_LOOP(12)

2
src/battle/area/kmr_part_3/actor/egg_jr_troopa.c
View File

@ -172,7 +172,7 @@ EvtScript N(80224658) = {
EVT_ADD(LVar1, 10)
EVT_ADD(LVar2, 10)
EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0)
EVT_CALL(PlaySound, SOUND_DEATH)
EVT_CALL(PlaySound, SOUND_ACTOR_DEATH)
EVT_CALL(DropStarPoints, ACTOR_SELF)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)

22
src/battle/area/kmr_part_3/actor/final_jr_troopa.c
View File

@ -212,7 +212,7 @@ EvtScript N(8022C6D4) = {
EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2)
EVT_IF_EQ(LVar2, MOVE_SPOOK)
EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_263)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0263)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 30)
EVT_CALL(ShowEmote, 0x00000000, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5)
@ -243,7 +243,7 @@ EvtScript N(8022C804) = {
EVT_END_LOOP
EVT_END_THREAD
EVT_WAIT(32)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_300)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0300)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 15)
EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 40, 0)
@ -322,7 +322,7 @@ EvtScript N(8022CC74) = {
EVT_ADD(LVar1, 10)
EVT_ADD(LVar2, 10)
EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0)
EVT_CALL(PlaySound, SOUND_DEATH)
EVT_CALL(PlaySound, SOUND_ACTOR_DEATH)
EVT_CALL(DropStarPoints, ACTOR_SELF)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)
@ -1197,7 +1197,7 @@ EvtScript N(80230794) = {
EVT_ADD(LVar0, LVar1)
EVT_ADD(LVar0, 50)
EVT_SET(LVar1, 200)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_366)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0366)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_NO_CONTACT, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
EVT_CASE_EQ(6)
@ -1304,8 +1304,8 @@ EvtScript N(8023106C) = {
EVT_ADD(LVar1, LVar4)
EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, LVar5, 30, 0)
EVT_WAIT(30)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2F8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02F8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3)
EVT_ADD(LVar2, 50)
EVT_PLAY_EFFECT(EFFECT_SPARKLES, 1, LVar1, LVar2, LVar3, 10, 0)
@ -1319,9 +1319,9 @@ EvtScript N(8023106C) = {
EVT_THREAD
EVT_WAIT(5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE)
EVT_WAIT(30)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SRAW_16_A)
EVT_END_THREAD
EVT_THREAD
EVT_CALL(FreezeBattleState, TRUE)
@ -1435,7 +1435,7 @@ EvtScript N(802318F8) = {
EVT_IF_EQ(LVar1, 0)
EVT_GOTO(0)
EVT_END_IF
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301)
EVT_CALL(HideHealthBar, ACTOR_SELF)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.2))
@ -1461,7 +1461,7 @@ EvtScript N(802318F8) = {
EVT_SUB(LVar0, 5)
EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_WAIT(15)
EVT_CALL(PlaySound, SOUND_DEATH)
EVT_CALL(PlaySound, SOUND_ACTOR_DEATH)
EVT_CALL(DropStarPoints, ACTOR_SELF)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)
@ -1514,7 +1514,7 @@ EvtScript N(802318F8) = {
EVT_SUB(LVar0, 5)
EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_WAIT(15)
EVT_CALL(PlaySound, SOUND_DEATH)
EVT_CALL(PlaySound, SOUND_ACTOR_DEATH)
EVT_CALL(DropStarPoints, ACTOR_SELF)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)

2
src/battle/area/kmr_part_3/actor/jr_troopa.c
View File

@ -158,7 +158,7 @@ EvtScript N(80222C78) = {
EVT_ADD(LVar1, 10)
EVT_ADD(LVar2, 10)
EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0)
EVT_CALL(PlaySound, SOUND_DEATH)
EVT_CALL(PlaySound, SOUND_ACTOR_DEATH)
EVT_CALL(DropStarPoints, ACTOR_SELF)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)

6
src/battle/area/kmr_part_3/actor/mage_jr_troopa.c
View File

@ -142,7 +142,7 @@ EvtScript N(8022A750) = {
EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2)
EVT_IF_EQ(LVar2, MOVE_SPOOK)
EVT_CALL(SetActorVar, ACTOR_SELF, 3, 1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_263)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0263)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 30)
EVT_CALL(ShowEmote, 0x00000000, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5)
@ -173,7 +173,7 @@ EvtScript N(8022A880) = {
EVT_END_LOOP
EVT_END_THREAD
EVT_WAIT(32)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_300)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0300)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 15)
EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 40, 0)
@ -564,7 +564,7 @@ EvtScript N(8022BF1C) = {
EVT_SUB(LVar0, 5)
EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_WAIT(15)
EVT_CALL(PlaySound, SOUND_DEATH)
EVT_CALL(PlaySound, SOUND_ACTOR_DEATH)
EVT_CALL(DropStarPoints, ACTOR_SELF)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)

8
src/battle/area/kmr_part_3/actor/para_jr_troopa.c
View File

@ -130,7 +130,7 @@ EvtScript N(80225F7C) = {
EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2)
EVT_IF_EQ(LVar2, MOVE_SPOOK)
EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_263)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0263)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 30)
EVT_CALL(ShowEmote, 0x00000000, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5)
@ -161,7 +161,7 @@ EvtScript N(802260AC) = {
EVT_END_LOOP
EVT_END_THREAD
EVT_WAIT(32)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_300)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0300)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 15)
EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 40, 0)
@ -540,7 +540,7 @@ EvtScript N(802279B0) = {
EVT_IF_EQ(LVar1, 0)
EVT_GOTO(0)
EVT_END_IF
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(HideHealthBar, ACTOR_SELF)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2)
@ -567,7 +567,7 @@ EvtScript N(802279B0) = {
EVT_SUB(LVar0, 5)
EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_WAIT(15)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH)
EVT_CALL(DropStarPoints, ACTOR_SELF)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)

8
src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c
View File

@ -123,7 +123,7 @@ EvtScript N(80228084) = {
EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2)
EVT_IF_EQ(LVar2, MOVE_SPOOK)
EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_263)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0263)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 30)
EVT_CALL(ShowEmote, 0x00000000, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5)
@ -154,7 +154,7 @@ EvtScript N(802281B4) = {
EVT_END_LOOP
EVT_END_THREAD
EVT_WAIT(32)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_300)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0300)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 15)
EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 40, 0)
@ -638,7 +638,7 @@ EvtScript N(8022A018) = {
EVT_IF_EQ(LVar1, 0)
EVT_GOTO(0)
EVT_END_IF
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(HideHealthBar, ACTOR_SELF)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2)
@ -665,7 +665,7 @@ EvtScript N(8022A018) = {
EVT_SUB(LVar0, 5)
EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_WAIT(15)
EVT_CALL(PlaySound, SOUND_DEATH)
EVT_CALL(PlaySound, SOUND_ACTOR_DEATH)
EVT_CALL(DropStarPoints, ACTOR_SELF)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)

4
src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c
View File

@ -413,7 +413,7 @@ EvtScript N(takeTurn_8021CDFC) = {
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_QUADRATIC_OUT)
EVT_THREAD
EVT_LOOP(4)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DF)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_FLY)
EVT_WAIT(4)
EVT_END_LOOP
EVT_END_THREAD
@ -504,7 +504,7 @@ EvtScript N(8021D614) = {
EVT_ELSE
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Hurt)
EVT_END_IF
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0301, 0)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_SET(LVar1, 0)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8))

6
src/battle/area/kpa2/actor/bowser_intro.c
View File

@ -346,7 +346,7 @@ EvtScript N(attackClawSwipe) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpMock)
EVT_WAIT(25)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Swipe)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35E)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035E)
EVT_WAIT(3)
EVT_WAIT(2)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -417,9 +417,9 @@ EvtScript N(attackFireBreath) = {
EVT_CALL(N(UnkFireBreathFXFunc), LVarF)
EVT_THREAD
EVT_CALL(N(StartRumbleWithParams), 50, 148)
EVT_CALL(PlaySound, SOUND_3BD)
EVT_CALL(PlaySound, SOUND_03BD)
EVT_WAIT(70)
EVT_CALL(PlaySound, SOUND_3BD | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_CALL(PlaySound, SOUND_03BD | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_END_THREAD
EVT_CALL(SetNpcAnimation, NPC_BTL_COMPANION, ANIM_ParadePeach_Weep)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)

14
src/battle/area/kpa2/actor/bowser_phase_1.c
View File

@ -503,7 +503,7 @@ EvtScript N(onDeath) = {
EVT_ADD(LVar1, 10)
EVT_ADD(LVar2, 10)
EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH)
EVT_CALL(DropStarPoints, ACTOR_SELF)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_SET(LVar3, 0)
@ -755,7 +755,7 @@ EvtScript N(recover) = {
EVT_END_IF
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish)
EVT_CALL(N(FadeBackgroundToBlack))
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2126)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_CAST_RECOVER)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3)
EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -785,9 +785,9 @@ EvtScript N(recover) = {
EVT_THREAD
EVT_WAIT(5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE)
EVT_WAIT(30)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SRAW_16_A)
EVT_END_THREAD
EVT_THREAD
EVT_CALL(FreezeBattleState, TRUE)
@ -1241,7 +1241,7 @@ EvtScript N(attackClawSwipe) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpMock)
EVT_WAIT(25)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Swipe)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35E)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035E)
EVT_WAIT(3)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
@ -1503,9 +1503,9 @@ EvtScript N(attackFlameBreath) = {
EVT_END_IF
EVT_THREAD
EVT_CALL(N(StartRumbleWithParams), 50, 148)
EVT_CALL(PlaySound, SOUND_3BD)
EVT_CALL(PlaySound, SOUND_03BD)
EVT_WAIT(70)
EVT_CALL(PlaySound, SOUND_3BD | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_CALL(PlaySound, SOUND_03BD | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_END_THREAD
EVT_WAIT(10)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)

16
src/battle/area/kpa2/actor/bowser_phase_2.c
View File

@ -606,7 +606,7 @@ EvtScript N(recover) = {
EVT_END_IF
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish)
EVT_CALL(N(FadeBackgroundToBlack))
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2126)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_CAST_RECOVER)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3)
EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -636,9 +636,9 @@ EvtScript N(recover) = {
EVT_THREAD
EVT_WAIT(5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE)
EVT_WAIT(30)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SRAW_16_A)
EVT_END_THREAD
EVT_THREAD
EVT_CALL(FreezeBattleState, TRUE)
@ -1094,7 +1094,7 @@ EvtScript N(attackClawSwipe) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpMock)
EVT_WAIT(25)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Swipe)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35E)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035E)
EVT_WAIT(3)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
@ -1361,9 +1361,9 @@ EvtScript N(attackFlameBreath) = {
EVT_END_IF
EVT_THREAD
EVT_CALL(N(StartRumbleWithParams), 50, 148)
EVT_CALL(PlaySound, SOUND_3BD)
EVT_CALL(PlaySound, SOUND_03BD)
EVT_WAIT(70)
EVT_CALL(PlaySound, SOUND_3BD | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_CALL(PlaySound, SOUND_03BD | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_END_THREAD
EVT_WAIT(10)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -1514,7 +1514,7 @@ EvtScript N(attackLightningBlast) = {
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3EF)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EF)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish)
EVT_CALL(N(FadeBackgroundToBlack))
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
@ -1551,7 +1551,7 @@ EvtScript N(attackLightningBlast) = {
EVT_CALL(RemoveEffect, LVarF)
EVT_CALL(RemoveEffect, LVarE)
EVT_END_IF
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2127)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_LIGHTNING)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_THREAD
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, 0, LVar1)

20
src/battle/area/kpa2/actor/bowser_phase_3.c
View File

@ -538,7 +538,7 @@ EvtScript N(onDeath) = {
EVT_CALL(MoveBattleCamOver, 15)
EVT_END_IF
EVT_WAIT(30)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2128)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_POWER_DOWN)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Hurt)
EVT_THREAD
EVT_CALL(MakeLerp, 0, 80, 8, EASING_QUADRATIC_OUT)
@ -594,7 +594,7 @@ EvtScript N(onDeath) = {
EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_HurtStill)
EVT_WAIT(15)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2129)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_COLLAPSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_DefeatedIdle)
EVT_THREAD
EVT_CALL(N(StartRumbleWithParams), 180, 16)
@ -865,7 +865,7 @@ EvtScript N(recover) = {
EVT_END_IF
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish)
EVT_CALL(N(FadeBackgroundToBlack))
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2126)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_CAST_RECOVER)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3)
EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -895,9 +895,9 @@ EvtScript N(recover) = {
EVT_THREAD
EVT_WAIT(5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE)
EVT_WAIT(30)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SRAW_16_A)
EVT_END_THREAD
EVT_THREAD
EVT_CALL(FreezeBattleState, TRUE)
@ -1327,7 +1327,7 @@ EvtScript N(attackClawSwipe) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpMock)
EVT_WAIT(25)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Swipe)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35E)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035E)
EVT_WAIT(3)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
@ -1594,9 +1594,9 @@ EvtScript N(attackFlameBreath) = {
EVT_END_IF
EVT_THREAD
EVT_CALL(N(StartRumbleWithParams), 50, 148)
EVT_CALL(PlaySound, SOUND_3BD)
EVT_CALL(PlaySound, SOUND_03BD)
EVT_WAIT(70)
EVT_CALL(PlaySound, SOUND_3BD | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_CALL(PlaySound, SOUND_03BD | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_END_THREAD
EVT_WAIT(10)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -1747,7 +1747,7 @@ EvtScript N(attackLightningBlast) = {
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3EF)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EF)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish)
EVT_CALL(N(FadeBackgroundToBlack))
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
@ -1784,7 +1784,7 @@ EvtScript N(attackLightningBlast) = {
EVT_CALL(RemoveEffect, LVarF)
EVT_CALL(RemoveEffect, LVarE)
EVT_END_IF
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2127)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_LIGHTNING)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_THREAD
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, 0, LVar1)

2
src/battle/area/kpa4/actor/bombshell_bill.c
View File

@ -298,7 +298,7 @@ EvtScript N(playExplosionEffects) = {
EVT_ADD(LVar1, 16)
EVT_ADD(LVar2, 2)
EVT_PLAY_EFFECT(EFFECT_BLAST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(3.0), 30, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2078)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SRAW_20_A)
EVT_CALL(StartRumble, 11)
EVT_THREAD
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0))

2
src/battle/area/kpa4/actor/bombshell_bill_blaster.c
View File

@ -205,7 +205,7 @@ EvtScript N(bulletShot) = {
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.0))
EVT_END_THREAD
EVT_CALL(StartRumble, 9)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2C8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02C8)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_SUB(LVar0, 33)
EVT_ADD(LVar1, 19)

10
src/battle/area/kzn2/actor/lava_bud.c
View File

@ -564,7 +564,7 @@ EvtScript N(summonPetitPiranha) = {
EVT_CALL(SetActorPos, LVar5, LVar0, LVar1, LVar2)
EVT_SUB(LVar0, 30)
EVT_SUB(LVar1, 15)
EVT_CALL(PlaySoundAtActor, LVar5, SOUND_3C9)
EVT_CALL(PlaySoundAtActor, LVar5, SOUND_03C9)
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar9)
EVT_IF_EQ(LVar9, 1)
EVT_CALL(GetActorPos, LVar5, LVar0, LVar1, LVar2)
@ -647,7 +647,7 @@ EvtScript N(onDeath) = {
EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_FIREY, FALSE)
EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_2, ACTOR_EVENT_FLAG_FIREY, FALSE)
EVT_WAIT(29)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C7)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C7)
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0)
EVT_IF_EQ(LVar0, 1)
EVT_CALL(OverrideBattleDmaDest, VINE_1_BASE)
@ -678,7 +678,7 @@ EvtScript N(onDeath) = {
EVT_CALL(SetActorVar, ACTOR_SELF, 7, ANIM_LavaBud_Anim0F)
EVT_CALL(SetActorVar, ACTOR_SELF, 8, ANIM_LavaBud_Anim09)
EVT_WAIT(29)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C7)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C7)
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0)
EVT_IF_EQ(LVar0, 1)
EVT_CALL(OverrideBattleDmaDest, VINE_1_BASE)
@ -889,7 +889,7 @@ EvtScript N(onHit) = {
EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_FIREY, FALSE)
EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_2, ACTOR_EVENT_FLAG_FIREY, FALSE)
EVT_WAIT(29)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C7)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C7)
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0)
EVT_IF_EQ(LVar0, 1)
EVT_CALL(OverrideBattleDmaDest, VINE_1_BASE)
@ -1021,7 +1021,7 @@ EvtScript N(attackPetitSpit) = {
EVT_CALL(SetGoalPos, LVar5, LVar0, LVar1, LVar2)
EVT_CALL(SetActorSpeed, LVar5, EVT_FLOAT(6.0))
EVT_CALL(SetActorJumpGravity, LVar5, EVT_FLOAT(1.8))
EVT_CALL(PlaySoundAtActor, LVar5, SOUND_3CB)
EVT_CALL(PlaySoundAtActor, LVar5, SOUND_03CB)
EVT_CALL(SetTargetActor, LVar5, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, LVar5)
EVT_CALL(EnemyTestTarget, LVar5, LVar9, 0, 0, 1, BS_FLAGS1_10)

52
src/battle/area/kzn2/actor/lava_piranha.c
View File

@ -664,9 +664,9 @@ EvtScript N(spawnColorado) = {
EVT_CALL(SpeakToPlayer, NPC_BTL_COMPANION, -1, -1, 0, MSG_CH5_0104)
EVT_THREAD
EVT_LOOP(9)
EVT_CALL(PlaySoundAtNpc, NPC_BTL_COMPANION, SOUND_20BA, SOUND_SPACE_MODE_0)
EVT_CALL(PlaySoundAtNpc, NPC_BTL_COMPANION, SOUND_ACTOR_STEP_A, SOUND_SPACE_MODE_0)
EVT_WAIT(2)
EVT_CALL(PlaySoundAtNpc, NPC_BTL_COMPANION, SOUND_3B4, SOUND_SPACE_MODE_0)
EVT_CALL(PlaySoundAtNpc, NPC_BTL_COMPANION, SOUND_ACTOR_STEP_B, SOUND_SPACE_MODE_0)
EVT_WAIT(2)
EVT_END_LOOP
EVT_END_THREAD
@ -674,7 +674,7 @@ EvtScript N(spawnColorado) = {
EVT_CALL(SetNpcAnimationSpeed, NPC_BTL_COMPANION, EVT_FLOAT(2.0))
EVT_CALL(SetNpcSpeed, NPC_BTL_COMPANION, EVT_FLOAT(10.0))
EVT_CALL(NpcMoveTo, NPC_BTL_COMPANION, 70, 0, 0)
EVT_CALL(PlaySoundAtNpc, NPC_BTL_COMPANION, SOUND_E8, SOUND_SPACE_MODE_0)
EVT_CALL(PlaySoundAtNpc, NPC_BTL_COMPANION, SOUND_TOUCH_LAVA, SOUND_SPACE_MODE_0)
EVT_CALL(SetNpcAnimationSpeed, NPC_BTL_COMPANION, EVT_FLOAT(1.0))
EVT_CALL(SetNpcJumpscale, NPC_BTL_COMPANION, EVT_FLOAT(1.0))
EVT_CALL(SetNpcAnimation, NPC_BTL_COMPANION, ANIM_BattleKolorado_Injured)
@ -705,9 +705,9 @@ EvtScript N(spawnColorado) = {
EVT_CALL(NpcJump0, NPC_BTL_COMPANION, 50, 0, 0, 12)
EVT_THREAD
EVT_LOOP(4)
EVT_CALL(PlaySoundAtNpc, NPC_BTL_COMPANION, SOUND_20BA, SOUND_SPACE_MODE_0)
EVT_CALL(PlaySoundAtNpc, NPC_BTL_COMPANION, SOUND_ACTOR_STEP_A, SOUND_SPACE_MODE_0)
EVT_WAIT(2)
EVT_CALL(PlaySoundAtNpc, NPC_BTL_COMPANION, SOUND_3B4, SOUND_SPACE_MODE_0)
EVT_CALL(PlaySoundAtNpc, NPC_BTL_COMPANION, SOUND_ACTOR_STEP_B, SOUND_SPACE_MODE_0)
EVT_WAIT(2)
EVT_END_LOOP
EVT_END_THREAD
@ -715,7 +715,7 @@ EvtScript N(spawnColorado) = {
EVT_CALL(SetNpcSpeed, NPC_BTL_COMPANION, EVT_FLOAT(8.0))
EVT_CALL(NpcMoveTo, NPC_BTL_COMPANION, -60, 0, 0)
EVT_CALL(SpeakToPlayer, NPC_BTL_COMPANION, ANIM_BattleKolorado_Shout, ANIM_BattleKolorado_ShoutStill, 5, MSG_CH5_0106)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_174)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0174)
EVT_CALL(SetNpcAnimation, NPC_BTL_COMPANION, ANIM_BattleKolorado_Run)
EVT_CALL(SetNpcSpeed, NPC_BTL_COMPANION, EVT_FLOAT(6.0))
EVT_CALL(NpcMoveTo, NPC_BTL_COMPANION, -300, 0, 0)
@ -1101,7 +1101,7 @@ EvtScript N(takeTurn) = {
EVT_END_LOOP
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 15)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3BB)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03BB)
EVT_SET(LVar0, ACTOR_ENEMY0)
EVT_EXEC_WAIT(N(ignite))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaPiranha_Anim04)
@ -1150,7 +1150,7 @@ EvtScript N(attackFlameSpew) = {
EVT_WAIT(14)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaPiranha_Anim05)
EVT_WAIT(10)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C1)
EVT_WAIT(45)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaPiranha_Anim06)
EVT_CALL(GetPartOffset, ACTOR_SELF, PRT_MAIN, LVar0, LVar1, LVar2)
@ -1161,7 +1161,7 @@ EvtScript N(attackFlameSpew) = {
EVT_SUB(LVar3, 40)
EVT_SET(LVar4, -10)
EVT_PLAY_EFFECT(EFFECT_63, 1, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 20, 20, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C3)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C3)
EVT_WAIT(19)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, LVar4, LVar5)
EVT_PLAY_EFFECT(EFFECT_EMBERS, 0, LVar3, 0, LVar5, 50, 50, EVT_FLOAT(1.0), 40, 55, EVT_FLOAT(1.0), EVT_FLOAT(1.0), 0)
@ -1232,7 +1232,7 @@ EvtScript N(attackFireStream) = {
EVT_WAIT(14)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaPiranha_Anim0E)
EVT_WAIT(10)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C1)
EVT_WAIT(45)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaPiranha_Anim08)
EVT_CALL(GetPartOffset, ACTOR_SELF, PRT_MAIN, LVar0, LVar1, LVar2)
@ -1241,7 +1241,7 @@ EvtScript N(attackFireStream) = {
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, LVar4, LVar5)
EVT_PLAY_EFFECT(EFFECT_63, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 16, 40, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C4)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C4)
EVT_WAIT(15)
EVT_THREAD
EVT_WAIT(24)
@ -1301,7 +1301,7 @@ API_CALLABLE(N(UpdateSong)) {
// play 'end battle' song
if (isInitialCall) {
sfx_play_sound(SOUND_D4);
sfx_play_sound(SOUND_JINGLE_WON_BATTLE);
bgm_set_song(0, SONG_BATTLE_END, 0, 500, 8);
return ApiStatus_BLOCK;
}
@ -1383,9 +1383,9 @@ EvtScript N(onDeath) = {
EVT_CALL(PlayModelAnimation, VINE_2, VINE_2_BASE)
EVT_WAIT(4)
EVT_THREAD
EVT_CALL(PlaySound, SOUND_3BC)
EVT_CALL(PlaySound, SOUND_LRAW_03BC)
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 119, EVT_FLOAT(0.3))
EVT_CALL(PlaySound, SOUND_3BC | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_CALL(PlaySound, SOUND_LRAW_03BC | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_END_THREAD
EVT_CALL(N(StartRumbleWithParams), 80, 234)
EVT_CALL(HideHealthBar, ACTOR_SELF)
@ -1396,7 +1396,7 @@ EvtScript N(onDeath) = {
EVT_CALL(LoadBattleDmaData, 10)
EVT_CALL(PlayModelAnimation, VINE_0, VINE_0_BASE)
EVT_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C6)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C6)
EVT_WAIT(35)
EVT_SET(LVar0, 0)
EVT_SET(LVar1, 0)
@ -1466,7 +1466,7 @@ EvtScript N(onDeath) = {
EVT_CALL(SetAnimatedModelRootPosition, VINE_2, 0, -250, 0)
EVT_CALL(SetActorPos, ACTOR_SELF, 100, 0, 0)
EVT_CALL(DropStarPoints, ACTOR_SELF)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH)
EVT_CALL(ForceHomePos, ACTOR_SELF, 61, 61, 0)
EVT_WAIT(65)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19)
@ -1481,15 +1481,15 @@ EvtScript N(onDeath) = {
EVT_END_THREAD
EVT_WAIT(80)
EVT_THREAD
EVT_CALL(PlaySound, SOUND_3BC)
EVT_CALL(PlaySound, SOUND_LRAW_03BC)
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 165, EVT_FLOAT(1.2))
EVT_CALL(PlaySound, SOUND_3BC | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_CALL(PlaySound, SOUND_LRAW_03BC | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_END_THREAD
EVT_CALL(N(StartRumbleWithParams), 80, 300)
EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE)
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp)
EVT_WAIT(20)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_263)
EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0263)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 20)
EVT_PLAY_EFFECT(EFFECT_EMOTE, 2, 0, LVar0, LVar1, LVar2, 20, 315, 30, 0, 0)
@ -1589,7 +1589,7 @@ EvtScript N(onDeath) = {
EVT_CALL(EnableModel, 85, TRUE)
EVT_CALL(EnableModel, 87, TRUE)
EVT_CALL(EnableModel, 88, TRUE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C5)
EVT_PLAY_EFFECT(EFFECT_EMBERS, 0, 100, 0, 0, 70, 80, EVT_FLOAT(2.5), 80, 55, EVT_FLOAT(2.0), EVT_FLOAT(2.0), 0)
EVT_CALL(LoadAnimatedModel, VINE_4, EVT_PTR(N(anim1)))
EVT_CALL(PlayModelAnimation, VINE_4, EVT_PTR(N(anim1_8021A364)))
@ -1653,14 +1653,14 @@ EvtScript N(onDeath) = {
EVT_CALL(LoadBattleDmaData, 35)
EVT_CALL(PlayModelAnimation, VINE_3, VINE_3_BASE)
EVT_THREAD
EVT_CALL(PlaySound, SOUND_3BC)
EVT_CALL(PlaySound, SOUND_LRAW_03BC)
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 100, EVT_FLOAT(0.5))
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 8, EVT_FLOAT(0.2))
EVT_CALL(PlaySound, SOUND_3BC | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_CALL(PlaySound, SOUND_LRAW_03BC | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_END_THREAD
EVT_CALL(N(StartRumbleWithParams), 80, 216)
EVT_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3CC)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03CC)
EVT_CALL(GetActorVar, ACTOR_SELF, 5, LVar0)
EVT_IF_EQ(LVar0, 0)
EVT_CALL(OverrideBattleDmaDest, VINE_0_BASE)
@ -1681,7 +1681,7 @@ EvtScript N(onDeath) = {
EVT_PLAY_EFFECT(EFFECT_EMBERS, 0, 105, 60, 2, 80, 60, EVT_FLOAT(1.8), 90, 100, EVT_FLOAT(1.5), EVT_FLOAT(1.5), 0)
EVT_END_IF
EVT_WAIT(121)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3CD)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03CD)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaPiranha_Anim0A)
EVT_CALL(OverrideBattleDmaDest, VINE_0_BASE)
EVT_CALL(LoadBattleDmaData, 11)
@ -1792,7 +1792,7 @@ EvtScript N(onDeath) = {
EVT_WAIT(3)
EVT_CALL(SetActorPos, ACTOR_SELF, -60, 0, 0)
EVT_CALL(DropStarPoints, ACTOR_SELF)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH)
EVT_WAIT(15)
EVT_CALL(GetActorVar, ACTOR_SELF, 6, LVar0)
EVT_IF_NE(LVar0, 0)
@ -2039,7 +2039,7 @@ EvtScript N(doOnHit) = {
EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_FIREY, FALSE)
EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_2, ACTOR_EVENT_FLAG_FIREY, FALSE)
EVT_WAIT(29)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3C8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C8)
EVT_CALL(OverrideBattleDmaDest, VINE_0_BASE)
EVT_CALL(LoadBattleDmaData, 13)
EVT_CALL(PlayModelAnimation, VINE_0, VINE_0_BASE)

4
src/battle/area/kzn2/actor/petit_piranha.c
View File

@ -278,7 +278,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_PetitPiranha_Anim03)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(2.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0))
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3CA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03CA)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 20)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -287,7 +287,7 @@ EvtScript N(takeTurn) = {
EVT_END_IF
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3CB)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03CB)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)

4
src/battle/area/mac/actor/chan.c
View File

@ -183,7 +183,7 @@ EvtScript N(8021A12C) = {
EVT_SUB(LVar1, 24)
EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_SET(LVar1, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0301, 0)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8))
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE)
@ -587,7 +587,7 @@ EvtScript N(takeTurn_8021B81C) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Chan_Still)
EVT_WAIT(8)
EVT_END_IF
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0301, 0)
EVT_CALL(GetBattlePhase, LVar0)
EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_05)

24
src/battle/area/mac/actor/lee.c
View File

@ -268,7 +268,7 @@ EvtScript N(flyingTackle) = {
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Lee_Crouch)
EVT_WAIT(20)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2CB, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_02CB, 0)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
@ -385,7 +385,7 @@ EvtScript N(8021E118) = {
EVT_IF_GT(LVarC, 0)
EVT_SET(LVarC, 0)
EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(0.5))
EVT_CALL(SetActorSounds, LVarA, ACTOR_SOUND_JUMP, SOUND_301, 0)
EVT_CALL(SetActorSounds, LVarA, ACTOR_SOUND_JUMP, SOUND_0301, 0)
EVT_CALL(SetGoalPos, LVarA, LVarB, LVarC, LVarD)
EVT_CALL(JumpToGoal, LVarA, 15, FALSE, TRUE, FALSE)
EVT_CALL(ResetActorSounds, LVarA, ACTOR_SOUND_JUMP)
@ -1026,7 +1026,7 @@ EvtScript N(EVS_Move_Tattle) = {
EVT_CALL(func_802CAE50, 2, LVar0, LVar1, LVar2)
EVT_CALL(func_802CABE8, 2, 0, LVar3, 100, 4)
EVT_WAIT(2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_282)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0282)
EVT_CALL(SetCamFlag80, CAM_TATTLE, TRUE)
EVT_WAIT(10)
EVT_CALL(ActorSpeak, MSG_EnemyTattle_Mario, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Talk, ANIM_BattleGoombario_Idle)
@ -3160,7 +3160,7 @@ EvtScript N(takeTurn_80226004) = {
EVT_CALL(AddBattleCamZoom, -75)
EVT_CALL(MoveBattleCamOver, LVarA)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_289)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0289)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_FLAG(LVar0, STATUS_FLAG_SHRINK)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -3555,15 +3555,15 @@ EvtScript N(takeTurn_802270BC) = {
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetPartScale, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))
EVT_CALL(LandJump, ACTOR_SELF)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_29A)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(AddGoalPos, ACTOR_SELF, -15, 0, 0)
EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_29A)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A)
EVT_CALL(AddGoalPos, ACTOR_SELF, -10, 0, 0)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_29A)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A)
EVT_IF_EQ(LVarA, 5)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
@ -3669,19 +3669,19 @@ EvtScript N(takeTurn_802270BC) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.4))
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_29A)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A)
EVT_ADD(LVar0, 30)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_29A)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A)
EVT_ADD(LVar0, 20)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_29A)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A)
EVT_ADD(LVar0, 10)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 4, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_29A)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_029A)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Idle)
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
@ -3998,7 +3998,7 @@ EvtScript N(takeTurn_80228B78) = {
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_2C5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02C5)
EVT_THREAD
EVT_LOOP(15)
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 1, 0, 0)

2
src/battle/area/mac/actor/master1.c
View File

@ -275,7 +275,7 @@ EvtScript N(takeTurn_8022AA54) = {
EVT_RETURN
EVT_END_CASE_GROUP
EVT_END_SWITCH
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED)
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 6, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SWITCH(LVar0)

18
src/battle/area/mac/actor/master2.c
View File

@ -279,7 +279,7 @@ EvtScript N(singleStrike2) = {
EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0)
EVT_CALL(RunToGoal, ACTOR_SELF, 5, FALSE)
EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 8, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)
@ -305,7 +305,7 @@ EvtScript N(singleStrike2) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedMidair)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedLand)
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
EVT_WAIT(3)
@ -314,7 +314,7 @@ EvtScript N(singleStrike2) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedMidair)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B4)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_B)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedLand)
EVT_WAIT(20)
EVT_END_CASE_GROUP
@ -345,7 +345,7 @@ EvtScript N(doubleStrike2) = {
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 1)
EVT_WAIT(10)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B9)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03B9)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
@ -386,14 +386,14 @@ EvtScript N(doubleStrike2) = {
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0))
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5))
EVT_END_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_10)
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_JUMP)
EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedUppercut)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.9))
@ -407,7 +407,7 @@ EvtScript N(doubleStrike2) = {
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2))
EVT_END_THREAD
EVT_WAIT(2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 6, BS_FLAGS1_SP_EVT_ACTIVE)
@ -435,7 +435,7 @@ EvtScript N(doubleStrike2) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedMidair)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 30, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedLand)
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
EVT_WAIT(3)
@ -444,7 +444,7 @@ EvtScript N(doubleStrike2) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedMidair)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B4)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_B)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedLand)
EVT_WAIT(20)
EVT_END_CASE_GROUP

36
src/battle/area/mac/actor/master3.c
View File

@ -306,7 +306,7 @@ EvtScript N(singleStrike3) = {
EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0)
EVT_CALL(RunToGoal, ACTOR_SELF, 5, FALSE)
EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_ENABLE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 10, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)
@ -332,7 +332,7 @@ EvtScript N(singleStrike3) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedMidair)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedLand)
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
EVT_WAIT(3)
@ -341,7 +341,7 @@ EvtScript N(singleStrike3) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedMidair)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B4)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_B)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedLand)
EVT_WAIT(20)
EVT_END_CASE_GROUP
@ -372,7 +372,7 @@ EvtScript N(doubleStrike3) = {
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 1)
EVT_WAIT(10)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B9)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03B9)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
@ -413,14 +413,14 @@ EvtScript N(doubleStrike3) = {
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0))
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5))
EVT_END_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 6, BS_FLAGS1_10)
EVT_WAIT(15)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_JUMP)
EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedUppercut)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.9))
@ -434,7 +434,7 @@ EvtScript N(doubleStrike3) = {
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2))
EVT_END_THREAD
EVT_WAIT(2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 7, BS_FLAGS1_SP_EVT_ACTIVE)
@ -462,7 +462,7 @@ EvtScript N(doubleStrike3) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedMidair)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 30, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedLand)
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
EVT_WAIT(3)
@ -471,7 +471,7 @@ EvtScript N(doubleStrike3) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedMidair)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B4)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_B)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedLand)
EVT_WAIT(20)
EVT_END_CASE_GROUP
@ -503,7 +503,7 @@ EvtScript N(tripleStrike3) = {
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 1)
EVT_WAIT(10)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B9)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03B9)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
@ -544,7 +544,7 @@ EvtScript N(tripleStrike3) = {
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0))
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5))
EVT_END_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_10)
@ -553,7 +553,7 @@ EvtScript N(tripleStrike3) = {
EVT_THREAD
EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_WAIT(5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_JUMP)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedUppercut)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.5))
EVT_CALL(JumpToGoal, ACTOR_SELF, 25, FALSE, TRUE, FALSE)
@ -566,7 +566,7 @@ EvtScript N(tripleStrike3) = {
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2))
EVT_END_THREAD
EVT_WAIT(2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3ED)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 6, 0)
@ -589,7 +589,7 @@ EvtScript N(tripleStrike3) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedMidair)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 30, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedLand)
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
EVT_WAIT(3)
@ -604,7 +604,7 @@ EvtScript N(tripleStrike3) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedPunch)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B4)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_B)
EVT_WAIT(10)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedKick)
EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
@ -624,7 +624,7 @@ EvtScript N(tripleStrike3) = {
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5))
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2))
EVT_END_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3EE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB)
EVT_WAIT(2)
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 7, BS_FLAGS1_SP_EVT_ACTIVE)
@ -652,7 +652,7 @@ EvtScript N(tripleStrike3) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedMidair)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 30, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedLand)
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
EVT_WAIT(3)
@ -661,7 +661,7 @@ EvtScript N(tripleStrike3) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedMidair)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B4)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_B)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedLand)
EVT_WAIT(20)
EVT_END_CASE_GROUP

14
src/battle/area/nok/actor/kent_c_koopa.c
View File

@ -631,7 +631,7 @@ EvtScript N(EVS_Attack_ShellToss) = {
EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0)
EVT_END_THREAD
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_370)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0370)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KentCKoopa_Anim0A)
EVT_WAIT(10)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 3, BS_FLAGS1_10)
@ -655,7 +655,7 @@ EvtScript N(EVS_Attack_ShellToss) = {
EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
EVT_CALL(StopSound, SOUND_370)
EVT_CALL(StopSound, SOUND_0370)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KentCKoopa_Anim0C)
EVT_WAIT(8)
EVT_CALL(YieldTurn)
@ -756,7 +756,7 @@ EvtScript N(EVS_Attack_ShellToss) = {
EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
EVT_CALL(StopSound, SOUND_370)
EVT_CALL(StopSound, SOUND_0370)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KentCKoopa_Anim0C)
EVT_WAIT(8)
EVT_CALL(YieldTurn)
@ -806,7 +806,7 @@ EvtScript N(EVS_Attack_ShellToss) = {
EVT_END_IF
EVT_END_THREAD
EVT_CALL(ResetAllActorSounds, ACTOR_SELF)
EVT_CALL(StopSound, SOUND_370)
EVT_CALL(StopSound, SOUND_0370)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KentCKoopa_Anim0C)
EVT_WAIT(8)
EVT_CALL(YieldTurn)
@ -841,7 +841,7 @@ EvtScript N(EVS_Attack_HeavyStomp) = {
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KentCKoopa_Anim01)
EVT_WAIT(8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E7)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LARGE_ACTOR_JUMP)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(6)
@ -1171,7 +1171,7 @@ API_CALLABLE(N(UnusedFunc)) {
}
EvtScript N(EVS_DropDummyCoin) = {
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, LVar5, SOUND_212)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, LVar5, SOUND_COIN_BOUNCE)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar6, LVar7, LVar8)
EVT_CALL(SetPartPos, ACTOR_SELF, LVar5, LVar6, 35, LVar8)
EVT_CALL(N(GetCoinTrajectory), LVar6, LVar8, LVar0, LVar1, LVar2, LVar3)
@ -1188,7 +1188,7 @@ EvtScript N(EVS_DropDummyCoin) = {
EVT_WAIT(1)
EVT_END_LOOP
// give coin to player
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, LVar5, SOUND_211)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, LVar5, SOUND_COIN_PICKUP)
EVT_CALL(AddCoin, 1)
EVT_RETURN
EVT_END

8
src/battle/area/omo2/actor/general_guy.c
View File

@ -333,7 +333,7 @@ EvtScript N(attack_throw_bomb) = {
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_SWITCH(LVar0)
EVT_CASE_EQ(HIT_RESULT_MISS)
EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, PRT_2, SOUND_2F9)
EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, PRT_2, SOUND_02F9)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -350,7 +350,7 @@ EvtScript N(attack_throw_bomb) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN
EVT_CASE_EQ(HIT_RESULT_LUCKY)
EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, PRT_2, SOUND_2F9)
EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, PRT_2, SOUND_02F9)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -376,7 +376,7 @@ EvtScript N(attack_throw_bomb) = {
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
EVT_RETURN
EVT_END_SWITCH
EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, PRT_2, SOUND_2F9)
EVT_CALL(PlaySoundAtPart, ACTOR_ENEMY0, PRT_2, SOUND_02F9)
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, PRT_2, EVT_FLOAT(14.0))
EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_2, EVT_FLOAT(0.1))
@ -445,7 +445,7 @@ EvtScript N(attack_lightning_shot) = {
EVT_CALL(GetModelCenter, 39)
EVT_THREAD
EVT_LOOP(4)
EVT_CALL(PlaySoundAtActor, LVar8, SOUND_3D2)
EVT_CALL(PlaySoundAtActor, LVar8, SOUND_03D2)
EVT_CALL(RandInt, 3, LVar0)
EVT_ADD(LVar0, 3)
EVT_WAIT(LVar0)

2
src/battle/area/omo2/actor/light_bulb.c
View File

@ -382,7 +382,7 @@ API_CALLABLE(func_80218250_52B8F0) {
}
EvtScript N(onDeath) = {
EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY2, SOUND_3AE)
EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY2, SOUND_03AE)
EVT_CALL(func_80218250_52B8F0)
EVT_CALL(EnableModel, 39, FALSE)
EVT_CALL(EnableModel, 41, FALSE)

4
src/battle/area/omo2/actor/toy_tank.c
View File

@ -738,7 +738,7 @@ EvtScript N(start_battle_with_tank) = {
EvtScript N(onDeath) = {
EVT_WAIT(15)
EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, SOUND_36F)
EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, SOUND_036F)
EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_fall_apart))
EVT_CALL(GetActorVar, ACTOR_SELF, 5, LVar0)
EVT_IF_NE(LVar0, 0)
@ -756,7 +756,7 @@ EvtScript N(onDeath) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14)
EVT_CALL(BattleCamTargetActor, ACTOR_ENEMY0)
EVT_CALL(MoveBattleCamOver, 60)
EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, SOUND_34E)
EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, SOUND_034E)
EVT_CALL(SetActorJumpGravity, ACTOR_ENEMY0, EVT_FLOAT(0.6))
EVT_CALL(SetActorDispOffset, ACTOR_ENEMY0, 0, 0, 0)
EVT_CALL(GetActorPos, ACTOR_ENEMY0, LVar0, LVar1, LVar2)

38
src/battle/area/omo2_1/actor/shy_squad.c
View File

@ -996,7 +996,7 @@ EvtScript N(onHit) = {
EVT_WAIT(1)
EVT_END_LOOP
EVT_END_SWITCH
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH)
EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0)
EVT_SET(LVar8, 0)
EVT_LOOP(12)
@ -1095,7 +1095,7 @@ EvtScript N(onDeath) = {
EVT_END_LOOP
EVT_CALL(GetPartOffset, ACTOR_SELF, LVar0, LVar1, LVar2, LVar3)
EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH)
EVT_CALL(DropStarPoints, ACTOR_SELF)
EVT_SET(LVar3, 0)
EVT_LOOP(12)
@ -1127,11 +1127,11 @@ EvtScript N(attack) = {
EVT_SUB(LVar0, LVar1)
EVT_SWITCH(LVar0)
EVT_CASE_EQ(1)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B)
EVT_CASE_LT(5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3EB)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EB)
EVT_CASE_DEFAULT
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3EC)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EC)
EVT_END_SWITCH
EVT_SET(LVar0, 2)
EVT_SET(LVar1, ANIM_ShySquadGuy_Anim03)
@ -1202,12 +1202,12 @@ EvtScript N(attack) = {
EVT_SUB(LVar0, LVar1)
EVT_SWITCH(LVar0)
EVT_CASE_EQ(1)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0)
EVT_CASE_LT(5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3EB)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EB)
EVT_CASE_DEFAULT
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3EC)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EC)
EVT_END_SWITCH
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
EVT_CALL(SetActorYaw, ACTOR_SELF, 180)
@ -1226,7 +1226,7 @@ EvtScript N(attack) = {
EVT_CALL(GetActorVar, ACTOR_SELF, N(ACTOR_VARS_GUYS_KILLED), LVar0)
EVT_SUB(LVarE, LVar0)
EVT_SET(LVarD, LVarE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3AD)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_03AD)
EVT_LOOP(LVarD)
EVT_IF_GT(LVarE, 1)
EVT_SET(LVar0, BS_FLAGS1_40)
@ -1252,7 +1252,7 @@ EvtScript N(attack) = {
EVT_END_IF
EVT_WAIT(10)
EVT_END_LOOP
EVT_CALL(StopSound, SOUND_3AD)
EVT_CALL(StopSound, SOUND_LRAW_03AD)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 30)
EVT_WAIT(20)
@ -1261,12 +1261,12 @@ EvtScript N(attack) = {
EVT_SUB(LVar0, LVar1)
EVT_SWITCH(LVar0)
EVT_CASE_EQ(1)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0)
EVT_CASE_LT(5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3EB)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EB)
EVT_CASE_DEFAULT
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3EC)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EC)
EVT_END_SWITCH
EVT_SET(LVar1, ANIM_ShySquadGuy_Anim04)
EVT_EXEC_WAIT(N(move_squad_to_home))
@ -1327,7 +1327,7 @@ EvtScript N(flee) = {
EVT_SUB(LVar0, LVar1)
EVT_SWITCH(LVar0)
EVT_CASE_EQ(1)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0)
EVT_CASE_LT(4)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SHY_GUY_SCREAMS3)
@ -1339,7 +1339,7 @@ EvtScript N(flee) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, 240, 0, 0)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, TRUE)
EVT_WAIT(30)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_1E2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_01E2)
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 6, EVT_FLOAT(2.5))
EVT_CALL(GetActorVar, ACTOR_SELF, N(ACTOR_VARS_GUYS_KILLED), LVar0)
EVT_IF_LT(LVar0, 14)
@ -1348,19 +1348,19 @@ EvtScript N(flee) = {
EVT_CALL(ActorSpeak, MSG_CH4_0068, ACTOR_ENEMY0, PRT_MAIN, -1, -1)
EVT_END_IF
EVT_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_1E2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_01E2)
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(2.0))
EVT_WAIT(12)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_1E2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_01E2)
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(2.0))
EVT_END_THREAD
EVT_CALL(EndActorSpeech, ACTOR_ENEMY0, PRT_MAIN, -1, -1)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE)
EVT_WAIT(40)
EVT_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_173)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0173)
EVT_WAIT(20)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_174)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0174)
EVT_END_THREAD
EVT_SET(LVar0, 2)
EVT_SET(LVar1, ANIM_ShySquadGuy_Anim08)

26
src/battle/area/omo2_2/actor/stilt_guy.c
View File

@ -283,10 +283,10 @@ EvtScript N(init) = {
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar1)
EVT_IF_EQ(LVar1, 0)
EVT_SET(LVar0, 10)
EVT_CALL(PlaySound, SOUND_305)
EVT_CALL(PlaySound, SOUND_0305)
EVT_ELSE
EVT_SET(LVar0, 50)
EVT_CALL(PlaySound, SOUND_306)
EVT_CALL(PlaySound, SOUND_0306)
EVT_END_IF
EVT_SUB(LVar2, 13)
EVT_CALL(SetPartPos, ACTOR_SELF, PRT_8, LVar0, 200, LVar2)
@ -683,7 +683,7 @@ EvtScript N(attack) = {
EVT_SET(LVar1, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.5))
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EF)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 18, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2066)
@ -717,7 +717,7 @@ EvtScript N(attack) = {
EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.5))
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EF)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE)
EVT_WAIT(2)
@ -775,7 +775,7 @@ EvtScript N(fallOff) = {
EVT_END_LOOP
EVT_CALL(SetPartFlags, ACTOR_SELF, PRT_2, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_4 | ACTOR_PART_FLAG_NO_TARGET)
EVT_END_THREAD
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_301)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_0301)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5))
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0))
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2)
@ -1080,8 +1080,8 @@ EvtScript N(shy_guy_attack1) = {
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EF, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_02EF, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim04)
@ -1119,9 +1119,9 @@ EvtScript N(shy_guy_attack1) = {
EVT_END_SWITCH
EVT_THREAD
EVT_WAIT(3)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EF)
EVT_END_THREAD
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim04)
@ -1162,7 +1162,7 @@ EvtScript N(shy_guy_attack2) = {
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_234)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim09)
EVT_WAIT(20)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim03)
@ -1173,7 +1173,7 @@ EvtScript N(shy_guy_attack2) = {
EVT_SET(LVar1, 0)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim04)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
@ -1272,8 +1272,8 @@ EvtScript N(shy_guy_attack2) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8))
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_CHEERING)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_CHEERING | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim09)
EVT_WAIT(10)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Red_Anim07)

22
src/battle/area/omo2_3/actor/shy_stack.c
View File

@ -371,7 +371,7 @@ EvtScript N(init) = {
EVT_CALL(SetPartPos, ACTOR_SELF, PRT_11, LVar0, 200, 0)
EVT_THREAD
EVT_WAIT(5)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_14, SOUND_301)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_14, SOUND_0301)
EVT_END_THREAD
EVT_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_14, ANIM_ShyGuy_Red_Anim0A)
@ -384,7 +384,7 @@ EvtScript N(init) = {
EVT_END_THREAD
EVT_THREAD
EVT_WAIT(36)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_13, SOUND_301)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_13, SOUND_0301)
EVT_END_THREAD
EVT_THREAD
EVT_WAIT(31)
@ -409,7 +409,7 @@ EvtScript N(init) = {
EVT_END_THREAD
EVT_THREAD
EVT_WAIT(67)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_12, SOUND_301)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_12, SOUND_0301)
EVT_END_THREAD
EVT_THREAD
EVT_WAIT(62)
@ -442,7 +442,7 @@ EvtScript N(init) = {
EVT_END_THREAD
EVT_THREAD
EVT_WAIT(98)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_11, SOUND_301)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_11, SOUND_0301)
EVT_END_THREAD
EVT_THREAD
EVT_WAIT(93)
@ -1031,7 +1031,7 @@ EvtScript N(fall_apart) = {
};
EvtScript N(lower_actor_pos) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 18)
EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -1157,7 +1157,7 @@ EvtScript N(doSpinSmashHit) = {
EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_10, ACTOR_PART_FLAG_NO_TARGET, TRUE)
EVT_CALL(GetPartOffset, ACTOR_SELF, PRT_10, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 10)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_10, SOUND_DEATH)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_10, SOUND_ACTOR_DEATH)
EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0)
EVT_SET(LVar0, 0)
EVT_LOOP(12)
@ -1226,7 +1226,7 @@ EvtScript N(80235168) = {
EVT_WAIT(20)
EVT_CALL(GetPartOffset, ACTOR_SELF, PRT_10, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 10)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_10, SOUND_DEATH)
EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_10, SOUND_ACTOR_DEATH)
EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0)
EVT_SET(LVar0, 0)
EVT_LOOP(12)
@ -1270,9 +1270,9 @@ EvtScript N(takeTurn) = {
EVT_WAIT(20)
EVT_ADD(LVar0, 4)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2E7)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E7)
EVT_WAIT(5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2E8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E8)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVarF)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
@ -1475,9 +1475,9 @@ EvtScript N(onSpinSmashLaunchDeath) = {
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 10)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH)
EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0)
EVT_CALL(PlaySound, SOUND_DEATH)
EVT_CALL(PlaySound, SOUND_ACTOR_DEATH)
EVT_CALL(DropStarPoints, ACTOR_SELF)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_SET(LVar3, 0)

2
src/battle/area/omo2_4/actor/signal_guy.c
View File

@ -154,7 +154,7 @@ EvtScript N(handleEvent) = {
EVT_PLAY_EFFECT(EFFECT_SWEAT, 0, LVar0, LVar1, LVar2, 10, 45, 4, 0)
EVT_WAIT(6)
EVT_END_LOOP
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_MarshalGuy_Anim0C)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))

42
src/battle/area/omo3/actor/big_lantern_ghost.c
View File

@ -431,16 +431,16 @@ EvtScript N(handleEvent) = {
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_HIT_SOUND_COUNTER), LVar0)
EVT_SWITCH(LVar0)
EVT_CASE_EQ(0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3A3)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03A3)
EVT_CALL(AddActorVar, ACTOR_SELF, N(VAR_HIT_SOUND_COUNTER), 1)
EVT_CASE_EQ(1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3A4)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03A4)
EVT_CALL(AddActorVar, ACTOR_SELF, N(VAR_HIT_SOUND_COUNTER), 1)
EVT_CASE_EQ(2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3A5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03A5)
EVT_CALL(AddActorVar, ACTOR_SELF, N(VAR_HIT_SOUND_COUNTER), 1)
EVT_CASE_EQ(3)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3A6)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03A6)
EVT_CALL(AddActorVar, ACTOR_SELF, N(VAR_HIT_SOUND_COUNTER), 1)
EVT_CASE_DEFAULT
EVT_END_SWITCH
@ -547,7 +547,7 @@ EvtScript N(attackHeavyJump) = {
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim01)
EVT_WAIT(8)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_3E7, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_LARGE_ACTOR_JUMP, 0)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
EVT_CASE_OR_EQ(6)
@ -564,7 +564,7 @@ EvtScript N(attackHeavyJump) = {
EVT_SET(LVar1, 0)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37D)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_037D)
EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP)
EVT_SUB(LVar0, 15)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0))
@ -574,7 +574,7 @@ EvtScript N(attackHeavyJump) = {
EVT_SUB(LVar0, 10)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37D)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_037D)
EVT_WAIT(8)
EVT_IF_EQ(LVarA, 5)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
@ -601,7 +601,7 @@ EvtScript N(attackHeavyJump) = {
EVT_SWITCH(LVarF)
EVT_CASE_OR_EQ(HIT_RESULT_HIT)
EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37D)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_037D)
EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(SetBattleCamZoom, 320)
@ -618,12 +618,12 @@ EvtScript N(attackHeavyJump) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0))
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 12, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37D)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_037D)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim01)
EVT_ADD(LVar0, 20)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37D)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_037D)
EVT_WAIT(8)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 20)
@ -662,7 +662,7 @@ EvtScript N(attackLightBeam) = {
EVT_CALL(SetBattleCamOffsetZ, 35)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EB)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EB)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim0F)
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_LANTERN_BRIGHTNESS), LVar5)
EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_LANTERN_BRIGHTNESS), 11)
@ -721,13 +721,13 @@ EvtScript N(attackLightBeam) = {
EVT_WAIT(10)
EVT_SWITCH(LVar0)
EVT_CASE_EQ(0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3AA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03AA)
EVT_CASE_EQ(1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3A9)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03A9)
EVT_CASE_EQ(2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3A8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03A8)
EVT_CASE_EQ(3)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3A7)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03A7)
EVT_END_SWITCH
EVT_END_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim14)
@ -770,12 +770,12 @@ EvtScript N(extinguish) = {
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 20)
EVT_WAIT(20)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3CF)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03CF)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim0F)
EVT_WAIT(8)
EVT_THREAD
EVT_WAIT(2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3D0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03D0)
EVT_END_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim0E)
EVT_WAIT(5)
@ -786,13 +786,13 @@ EvtScript N(extinguish) = {
EVT_WAIT(10)
EVT_SWITCH(LVar0)
EVT_CASE_EQ(4)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3AA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03AA)
EVT_CASE_EQ(3)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3A9)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03A9)
EVT_CASE_EQ(2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3A8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03A8)
EVT_CASE_EQ(1)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3A7)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03A7)
EVT_END_SWITCH
EVT_END_THREAD
EVT_WAIT(14)

4
src/battle/area/pra2/actor/crystal_bit.c
View File

@ -297,7 +297,7 @@ EvtScript N(handleEvent) = {
EVT_CALL(GetAnimation, ACTOR_SELF, PRT_MAIN, LVar1)
EVT_EXEC_WAIT(EVS_Enemy_Hit)
EVT_CALL(HideHealthBar, ACTOR_SELF)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8))
EVT_CALL(GetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar1, 0, LVar3)
@ -359,7 +359,7 @@ EvtScript N(handleEvent) = {
EVT_END_IF
EVT_EXEC_WAIT(EVS_Enemy_BurnHit)
EVT_CALL(HideHealthBar, ACTOR_SELF)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8))
EVT_CALL(GetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar1, 0, LVar3)

36
src/battle/area/pra2/actor/crystal_king.c
View File

@ -955,7 +955,7 @@ EvtScript N(AttackIcyBreath) = {
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim1C)
EVT_WAIT(3)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35D)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035D)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
@ -980,7 +980,7 @@ EvtScript N(AttackIcyBreath) = {
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 30, EVT_FLOAT(0.3))
EVT_END_THREAD
EVT_WAIT(30)
EVT_CALL(StopSound, SOUND_35D)
EVT_CALL(StopSound, SOUND_035D)
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
@ -1009,7 +1009,7 @@ EvtScript N(AttackIcyBreath) = {
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 50, EVT_FLOAT(0.3))
EVT_END_THREAD
EVT_WAIT(60)
EVT_CALL(StopSound, SOUND_35D)
EVT_CALL(StopSound, SOUND_035D)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim15)
EVT_WAIT(2)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -1052,7 +1052,7 @@ EvtScript N(AttackIceBolt) = {
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim1C)
EVT_WAIT(3)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2E0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E0)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
@ -1284,7 +1284,7 @@ EvtScript N(MakeIllusions) = {
EVT_CALL(SetAnimation, LVar0, 1, ANIM_CrystalKing_Anim00)
EVT_CALL(SetAnimation, LVar0, 1, ANIM_CrystalKing_Anim09)
EVT_CALL(UseIdleAnimation, LVar0, TRUE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2DF)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DF)
EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_CLONE1_ID), LVar0)
EVT_CALL(EnableActorBlur, LVar0, IDLE_SCRIPT_DISABLE)
@ -1505,7 +1505,7 @@ EvtScript N(SummonCrystalBits) = {
EVT_CALL(SetPartScale, LVar0, 1, EVT_FLOAT(0.4), EVT_FLOAT(0.4), EVT_FLOAT(0.4))
EVT_END_IF
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim1F)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2DE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DE)
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_BIT3_ID), LVar0)
EVT_SETF(LVar1, EVT_FLOAT(42.0))
EVT_SETF(LVar2, EVT_FLOAT(85.0))
@ -1605,7 +1605,7 @@ EvtScript N(AttackIcyBreathWithClones) = {
EVT_CALL(SetAnimation, LVarA, 1, ANIM_CrystalKing_Anim1C)
EVT_CALL(SetAnimation, LVarB, 1, ANIM_CrystalKing_Anim1C)
EVT_WAIT(3)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35D)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035D)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
@ -1656,7 +1656,7 @@ EvtScript N(AttackIcyBreathWithClones) = {
EVT_CALL(func_80218280_6609D0, LVarF)
EVT_END_IF
EVT_WAIT(30)
EVT_CALL(StopSound, SOUND_35D)
EVT_CALL(StopSound, SOUND_035D)
EVT_IF_EQ(LVar5, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
@ -1715,7 +1715,7 @@ EvtScript N(AttackIcyBreathWithClones) = {
EVT_CALL(func_80218280_6609D0, LVarF)
EVT_END_IF
EVT_WAIT(60)
EVT_CALL(StopSound, SOUND_35D)
EVT_CALL(StopSound, SOUND_035D)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim15)
EVT_CALL(SetAnimation, LVarA, 1, ANIM_CrystalKing_Anim15)
EVT_CALL(SetAnimation, LVarB, 1, ANIM_CrystalKing_Anim15)
@ -1769,7 +1769,7 @@ EvtScript N(MoveBitToTarget) = {
};
EvtScript N(RemoveCrystalBit) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3D9)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03D9)
EVT_SET(LVarA, LVar0)
EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_INVISIBLE, FALSE)
EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_NO_SHADOW, FALSE)
@ -1803,7 +1803,7 @@ EvtScript N(RemoveCrystalBit) = {
};
EvtScript N(AttackWithCrystalBit) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3D9)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03D9)
EVT_SET(LVarA, LVar0)
EVT_CALL(SetPartFlagBits, LVarA, 1, ACTOR_PART_FLAG_INVISIBLE, FALSE)
EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_NO_SHADOW, FALSE)
@ -1856,7 +1856,7 @@ EvtScript N(NormalAttack) = {
EVT_THREAD
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 30, EVT_FLOAT(0.2))
EVT_END_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3AF)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03AF)
EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_BIT1_ID), LVar0)
EVT_CALL(ActorExists, LVar0, LVar1)
EVT_IF_EQ(LVar1, TRUE)
@ -2012,24 +2012,24 @@ EvtScript N(Heal) = {
EVT_THREAD
EVT_WAIT(5)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE)
EVT_WAIT(30)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SRAW_16_A)
EVT_END_THREAD
EVT_IF_EQ(LFlag0, TRUE)
EVT_THREAD
EVT_WAIT(5)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_206D)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_214)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_HEART_BOUNCE)
EVT_WAIT(30)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_25C)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_SRAW_16_A)
EVT_END_THREAD
EVT_THREAD
EVT_WAIT(5)
EVT_CALL(PlaySoundAtActor, LVarB, SOUND_206D)
EVT_CALL(PlaySoundAtActor, LVarB, SOUND_214)
EVT_CALL(PlaySoundAtActor, LVarB, SOUND_HEART_BOUNCE)
EVT_WAIT(30)
EVT_CALL(PlaySoundAtActor, LVarB, SOUND_25C)
EVT_CALL(PlaySoundAtActor, LVarB, SOUND_SRAW_16_A)
EVT_END_THREAD
EVT_END_IF
EVT_IF_EQ(LFlag0, FALSE)

6
src/battle/area/sam2/actor/monstar.c
View File

@ -382,8 +382,8 @@ EvtScript N(attack) = {
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 60)
EVT_WAIT(60)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_36E)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_036E)
EVT_THREAD
EVT_WAIT(10)
EVT_LOOP(18)
@ -545,7 +545,7 @@ EvtScript N(OnDeath) = {
EVT_ADD(LVar1, 10)
EVT_ADD(LVar2, 10)
EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH)
EVT_CALL(DropStarPoints, ACTOR_SELF)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_SET(LVar3, 0)

14
src/battle/area/tik2/actor/blooper.c
View File

@ -29,7 +29,7 @@ EvtScript N(FloatToPos) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC)
EVT_CALL(FallToGoal, ACTOR_SELF, 8)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC)
EVT_SET(LVar7, LVar4)
EVT_ADD(LVar7, LVar4)
EVT_ADD(LVar7, LVar0)
@ -52,7 +52,7 @@ EvtScript N(FloatToPos) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3))
EVT_CALL(FallToGoal, ACTOR_SELF, 8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC)
EVT_SET(LVar7, LVar0)
EVT_ADD(LVar7, LVar0)
EVT_ADD(LVar7, LVar4)
@ -75,7 +75,7 @@ EvtScript N(FloatToPos) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3))
EVT_CALL(FallToGoal, ACTOR_SELF, 8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0))
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, EASING_CUBIC_OUT)
@ -410,7 +410,7 @@ EvtScript N(attackSpinDrop) = {
EVT_SET(LVar1, 100)
EVT_SET(LVar3, 15)
EVT_EXEC_WAIT(N(FloatToPos))
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DD)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DD)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVarF)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
@ -514,7 +514,7 @@ EvtScript N(attackInkBlast) = {
EVT_CALL(MoveBattleCamOver, 50)
EVT_END_THREAD
EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC)
EVT_SET(LVar7, LVar4)
EVT_ADD(LVar7, LVar0)
EVT_MULF(LVar7, EVT_FLOAT(0.5))
@ -534,7 +534,7 @@ EvtScript N(attackInkBlast) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3))
EVT_CALL(FallToGoal, ACTOR_SELF, 8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0))
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -2, EASING_CUBIC_OUT)
@ -549,7 +549,7 @@ EvtScript N(attackInkBlast) = {
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 40, 0)
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -40)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DE)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5)
EVT_ADD(LVar3, 1)
EVT_SUB(LVar4, 27)

18
src/battle/area/tik2/actor/blooper_baby.c
View File

@ -29,7 +29,7 @@ EvtScript N(FloatToPos) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC)
EVT_CALL(FallToGoal, ACTOR_SELF, 8)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35F)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035F)
EVT_SET(LVar7, LVar4)
EVT_ADD(LVar7, LVar4)
EVT_ADD(LVar7, LVar0)
@ -52,7 +52,7 @@ EvtScript N(FloatToPos) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3))
EVT_CALL(FallToGoal, ACTOR_SELF, 8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35F)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035F)
EVT_SET(LVar7, LVar0)
EVT_ADD(LVar7, LVar0)
EVT_ADD(LVar7, LVar4)
@ -75,7 +75,7 @@ EvtScript N(FloatToPos) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3))
EVT_CALL(FallToGoal, ACTOR_SELF, 8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35F)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035F)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0))
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, EASING_CUBIC_OUT)
@ -211,7 +211,7 @@ ActorBlueprint NAMESPACE = {
EvtScript N(init) = {
EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn)))
EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent)))
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35F)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035F)
EVT_CALL(N(StartRumbleWithParams), 80, 20)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BabyBlooper_Anim00)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BabyBlooper_Anim01)
@ -224,7 +224,7 @@ EvtScript N(init) = {
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(0.3))
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(FlyToGoal, ACTOR_SELF, 8, 0, EASING_LINEAR)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35F)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035F)
EVT_CALL(N(StartRumbleWithParams), 80, 20)
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0)
EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar1)
@ -407,7 +407,7 @@ EvtScript N(takeTurn) = {
EVT_EXEC_WAIT(N(FloatToPos))
EVT_THREAD
EVT_WAIT(2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301)
EVT_END_THREAD
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVarF)
@ -495,7 +495,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE)
EVT_BREAK_LOOP
EVT_END_IF
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0)
EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0))
EVT_SET(LFlag0, FALSE)
EVT_LOOP(2)
@ -563,13 +563,13 @@ EvtScript N(takeTurn) = {
EVT_CALL(GetLastDamage, ACTOR_PLAYER, LVar3)
EVT_IF_NE(LVar3, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_ADD(LVar1, 10)
EVT_CALL(N(SpawnDrainHealthStartFX), LVar0, LVar1, LVar2, LVar3)
EVT_THREAD
EVT_WAIT(15)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SRAW_16_A)
EVT_CALL(N(SpawnDrainHealthContinueFX), LVar0, LVar1, LVar2, LVar3)
EVT_END_THREAD
EVT_ADD(LVar0, 20)

16
src/battle/area/tik2/actor/electro_blooper.c
View File

@ -34,7 +34,7 @@ EvtScript N(FloatToPos) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC)
EVT_CALL(FallToGoal, ACTOR_SELF, 8)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC)
EVT_SET(LVar7, LVar4)
EVT_ADD(LVar7, LVar4)
EVT_ADD(LVar7, LVar0)
@ -57,7 +57,7 @@ EvtScript N(FloatToPos) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3))
EVT_CALL(FallToGoal, ACTOR_SELF, 8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC)
EVT_SET(LVar7, LVar0)
EVT_ADD(LVar7, LVar0)
EVT_ADD(LVar7, LVar4)
@ -80,7 +80,7 @@ EvtScript N(FloatToPos) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3))
EVT_CALL(FallToGoal, ACTOR_SELF, 8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0))
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, EASING_CUBIC_OUT)
@ -572,7 +572,7 @@ EvtScript N(attackSpinDrop) = {
EVT_SET(LVar1, 100)
EVT_SET(LVar3, 15)
EVT_EXEC_WAIT(N(FloatToPos))
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DD)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DD)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVarF)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
@ -773,7 +773,7 @@ EvtScript N(attackInkBlast) = {
EVT_CALL(MoveBattleCamOver, 80)
EVT_END_THREAD
EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC)
EVT_SET(LVar7, LVar4)
EVT_ADD(LVar7, LVar0)
EVT_MULF(LVar7, EVT_FLOAT(0.5))
@ -793,7 +793,7 @@ EvtScript N(attackInkBlast) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3))
EVT_CALL(FallToGoal, ACTOR_SELF, 8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0))
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -2, EASING_CUBIC_OUT)
@ -808,7 +808,7 @@ EvtScript N(attackInkBlast) = {
EVT_CALL(MoveBattleCamOver, 10)
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 40, 0)
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -40)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DE)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5)
EVT_ADD(LVar3, 1)
EVT_SUB(LVar4, 28)
@ -865,7 +865,7 @@ EvtScript N(charge) = {
EVT_END_IF
EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, LVar3, -1, 0)
EVT_CALL(SetActorVar, ACTOR_SELF, 1, LVarF)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35C)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035C)
EVT_CALL(SetPartEventFlags, ACTOR_SELF, PRT_2, ACTOR_EVENT_FLAG_ATTACK_CHARGED | ACTOR_EVENT_FLAG_ELECTRIFIED)
EVT_CALL(func_8026ED20, ACTOR_SELF, PRT_MAIN, 1)
EVT_CALL(SetActorPaletteEffect, ACTOR_SELF, PRT_MAIN, PAL_ADJUST_STATIC)

20
src/battle/area/tik2/actor/super_blooper.c
View File

@ -39,7 +39,7 @@ EvtScript N(FloatToPos) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC)
EVT_CALL(FallToGoal, ACTOR_SELF, 8)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC)
EVT_SET(LVar7, LVar4)
EVT_ADD(LVar7, LVar4)
EVT_ADD(LVar7, LVar0)
@ -62,7 +62,7 @@ EvtScript N(FloatToPos) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3))
EVT_CALL(FallToGoal, ACTOR_SELF, 8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC)
EVT_SET(LVar7, LVar0)
EVT_ADD(LVar7, LVar0)
EVT_ADD(LVar7, LVar4)
@ -85,7 +85,7 @@ EvtScript N(FloatToPos) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3))
EVT_CALL(FallToGoal, ACTOR_SELF, 8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0))
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, EASING_CUBIC_OUT)
@ -502,7 +502,7 @@ EvtScript N(attackSpinDrop) = {
EVT_SET(LVar1, 100)
EVT_SET(LVar3, 15)
EVT_EXEC_WAIT(N(FloatToPos))
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DD)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DD)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVarF)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
@ -592,7 +592,7 @@ EvtScript N(attackInkBlast) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC)
EVT_CALL(FallToGoal, ACTOR_SELF, 8)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC)
EVT_SET(LVar7, LVar4)
EVT_ADD(LVar7, LVar0)
EVT_MULF(LVar7, EVT_FLOAT(0.5))
@ -612,7 +612,7 @@ EvtScript N(attackInkBlast) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3))
EVT_CALL(FallToGoal, ACTOR_SELF, 8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DC)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0))
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -2, EASING_CUBIC_OUT)
@ -625,7 +625,7 @@ EvtScript N(attackInkBlast) = {
EVT_CALL(FlyToGoal, ACTOR_SELF, 16, 0, EASING_LINEAR)
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 40, 0)
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -40)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DE)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5)
EVT_ADD(LVar3, 1)
EVT_SUB(LVar4, 30)
@ -716,12 +716,12 @@ EvtScript N(makeBabies) = {
EVT_WAIT(10)
EVT_CALL(ActorExists, ACTOR_ENEMY1, LVar1)
EVT_IF_EQ(LVar1, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3D9)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03D9)
EVT_CALL(SummonEnemy, EVT_PTR(N(formation_baby_1)), FALSE)
EVT_END_IF
EVT_CALL(ActorExists, ACTOR_ENEMY2, LVar1)
EVT_IF_EQ(LVar1, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3D9)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03D9)
EVT_CALL(SummonEnemy, EVT_PTR(N(formation_baby_2)), FALSE)
EVT_END_IF
EVT_WAIT(2)
@ -776,7 +776,7 @@ EvtScript N(attackEnragedDrops) = {
EVT_SET(LVar1, 100)
EVT_SET(LVar3, 15)
EVT_EXEC_WAIT(N(FloatToPos))
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3DD)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DD)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVarF)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)

16
src/battle/area/trd_part_2/actor/common_koopa_bros.inc.c
View File

@ -528,7 +528,7 @@ EvtScript N(HandleCommand) = {
EVT_WAIT(12)
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_JUMP)
EVT_THREAD
EVT_SET(LVar0, 0)
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 18, 0)
@ -542,7 +542,7 @@ EvtScript N(HandleCommand) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(3.0))
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A)
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetTargetOffset, ACTOR_SELF, PRT_MAIN, -5, 36)
@ -571,11 +571,11 @@ EvtScript N(HandleCommand) = {
EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_TowerHeight, LVar0)
EVT_SWITCH(LVar0)
EVT_CASE_EQ(4)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_356)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0356)
EVT_CASE_EQ(3)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_355)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0355)
EVT_CASE_EQ(2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_354)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0354)
EVT_END_SWITCH
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_SHELL_SPIN)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -605,7 +605,7 @@ EvtScript N(HandleCommand) = {
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_END_THREAD
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_037C)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE)
EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_TowerHeight, LVar0)
@ -770,7 +770,7 @@ EvtScript N(HandleCommand) = {
EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_ENTER_SHELL)
EVT_WAIT(10)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_353)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0353)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_SHELL_SPIN)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(N(SpawnSpinEffect), LVar0, LVar1, LVar2, 30)
@ -797,7 +797,7 @@ EvtScript N(HandleCommand) = {
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_END_THREAD
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_037C)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE)
EVT_CALL(EnableActorBlur, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0))

46
src/battle/area/trd_part_2/actor/fake_bowser.c
View File

@ -474,42 +474,42 @@ EvtScript N(EVS_AnimBowser_DeathMain) = {
EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_HEAD, EVT_FLOAT(0.5))
EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_HEAD, LVar0, LVar1, LVar2, 60, TRUE)
EVT_WAIT(30)
EVT_CALL(PlaySoundAtModel, MODEL_k1, SOUND_1E2, SOUND_SPACE_MODE_0)
EVT_CALL(PlaySoundAtModel, MODEL_k1, SOUND_01E2, SOUND_SPACE_MODE_0)
EVT_THREAD
EVT_SET_GROUP(EVT_GROUP_00)
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0))
EVT_END_THREAD
EVT_CALL(N(StartRumbleWithParams), 100, 20)
EVT_WAIT(20)
EVT_CALL(PlaySoundAtModel, MODEL_u1, SOUND_1E2, SOUND_SPACE_MODE_0)
EVT_CALL(PlaySoundAtModel, MODEL_u1, SOUND_01E2, SOUND_SPACE_MODE_0)
EVT_THREAD
EVT_SET_GROUP(EVT_GROUP_00)
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.5))
EVT_END_THREAD
EVT_CALL(N(StartRumbleWithParams), 150, 20)
EVT_WAIT(30)
EVT_CALL(PlaySoundAtModel, MODEL_p1, SOUND_1E2, SOUND_SPACE_MODE_0)
EVT_CALL(PlaySoundAtModel, MODEL_p1, SOUND_01E2, SOUND_SPACE_MODE_0)
EVT_THREAD
EVT_SET_GROUP(EVT_GROUP_00)
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.0))
EVT_END_THREAD
EVT_CALL(N(StartRumbleWithParams), 100, 20)
EVT_WAIT(30)
EVT_CALL(PlaySoundAtModel, MODEL_d1, SOUND_1E2, SOUND_SPACE_MODE_0)
EVT_CALL(PlaySoundAtModel, MODEL_d1, SOUND_01E2, SOUND_SPACE_MODE_0)
EVT_THREAD
EVT_SET_GROUP(EVT_GROUP_00)
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.7))
EVT_END_THREAD
EVT_CALL(N(StartRumbleWithParams), 70, 20)
EVT_WAIT(20)
EVT_CALL(PlaySoundAtModel, MODEL_s1, SOUND_1E2, SOUND_SPACE_MODE_0)
EVT_CALL(PlaySoundAtModel, MODEL_s1, SOUND_01E2, SOUND_SPACE_MODE_0)
EVT_THREAD
EVT_SET_GROUP(EVT_GROUP_00)
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.0))
EVT_END_THREAD
EVT_CALL(N(StartRumbleWithParams), 100, 20)
EVT_WAIT(20)
EVT_CALL(PlaySoundAtModel, MODEL_km1, SOUND_1E2, SOUND_SPACE_MODE_0)
EVT_CALL(PlaySoundAtModel, MODEL_km1, SOUND_01E2, SOUND_SPACE_MODE_0)
EVT_CALL(N(StartRumbleWithParams), 60, 20)
EVT_THREAD
EVT_SET_GROUP(EVT_GROUP_00)
@ -1483,9 +1483,9 @@ EvtScript N(EVS_FakeBowser_TakeTurn) = {
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_SET(ArrayVar(0), ANIM_BEGIN_IDLE)
EVT_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20FD)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_FAKE_BOWSER_SWING)
EVT_WAIT(22)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20FE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_FAKE_BOWSER_STRIKE)
EVT_END_THREAD
EVT_SET(ArrayVar(0), ANIM_BEGIN_STRIKE)
EVT_WAIT(24)
@ -1603,9 +1603,9 @@ EvtScript N(EVS_FakeBowser_HandlePhase) = {
EVT_WAIT(30)
EVT_CALL(ActorSpeak, MSG_CH1_00FD, ACTOR_SELF, PRT_TARGET, -1, -1)
EVT_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20FD)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_FAKE_BOWSER_SWING)
EVT_WAIT(22)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20FE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_FAKE_BOWSER_STRIKE)
EVT_END_THREAD
EVT_SET(ArrayVar(0), ANIM_BEGIN_STRIKE)
EVT_WAIT(30)
@ -1686,13 +1686,13 @@ EvtScript N(EVS_KoopaBrosEnter) = {
EVT_CALL(EnableGroup, MODEL_ashi, FALSE)
EVT_THREAD
EVT_WAIT(23)
EVT_CALL(PlaySoundAtActor, GREEN_ACTOR, SOUND_301)
EVT_CALL(PlaySoundAtActor, GREEN_ACTOR, SOUND_0301)
EVT_WAIT(5)
EVT_CALL(PlaySoundAtActor, YELLOW_ACTOR, SOUND_301)
EVT_CALL(PlaySoundAtActor, YELLOW_ACTOR, SOUND_0301)
EVT_WAIT(5)
EVT_CALL(PlaySoundAtActor, BLACK_ACTOR, SOUND_301)
EVT_CALL(PlaySoundAtActor, BLACK_ACTOR, SOUND_0301)
EVT_WAIT(5)
EVT_CALL(PlaySoundAtActor, RED_ACTOR, SOUND_301)
EVT_CALL(PlaySoundAtActor, RED_ACTOR, SOUND_0301)
EVT_END_THREAD
EVT_THREAD
EVT_CALL(SetAnimation, GREEN_ACTOR, 1, ANIM_KoopaBros_Green_Land)
@ -1701,7 +1701,7 @@ EvtScript N(EVS_KoopaBrosEnter) = {
EVT_CALL(SetActorJumpGravity, GREEN_ACTOR, EVT_FLOAT(1.5))
EVT_CALL(SetActorSounds, GREEN_ACTOR, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(FallToGoal, GREEN_ACTOR, 30)
EVT_CALL(PlaySoundAtActor, GREEN_ACTOR, SOUND_3E9)
EVT_CALL(PlaySoundAtActor, GREEN_ACTOR, SOUND_03E9)
EVT_CALL(ResetActorSounds, GREEN_ACTOR, ACTOR_SOUND_JUMP)
EVT_CALL(ForceHomePos, GREEN_ACTOR, 20, 0, 0)
EVT_CALL(SetAnimation, GREEN_ACTOR, 1, ANIM_KoopaBros_Green_IdleCrouch)
@ -1714,7 +1714,7 @@ EvtScript N(EVS_KoopaBrosEnter) = {
EVT_CALL(SetActorJumpGravity, YELLOW_ACTOR, EVT_FLOAT(1.5))
EVT_CALL(SetActorSounds, YELLOW_ACTOR, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(FallToGoal, YELLOW_ACTOR, 30)
EVT_CALL(PlaySoundAtActor, YELLOW_ACTOR, SOUND_3E9)
EVT_CALL(PlaySoundAtActor, YELLOW_ACTOR, SOUND_03E9)
EVT_CALL(ResetActorSounds, YELLOW_ACTOR, ACTOR_SOUND_JUMP)
EVT_CALL(ForceHomePos, YELLOW_ACTOR, 60, 0, -5)
EVT_CALL(SetAnimation, YELLOW_ACTOR, 1, ANIM_KoopaBros_Yellow_IdleCrouch)
@ -1727,7 +1727,7 @@ EvtScript N(EVS_KoopaBrosEnter) = {
EVT_CALL(SetActorJumpGravity, BLACK_ACTOR, EVT_FLOAT(1.5))
EVT_CALL(SetActorSounds, BLACK_ACTOR, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(FallToGoal, BLACK_ACTOR, 30)
EVT_CALL(PlaySoundAtActor, BLACK_ACTOR, SOUND_3E9)
EVT_CALL(PlaySoundAtActor, BLACK_ACTOR, SOUND_03E9)
EVT_CALL(ResetActorSounds, BLACK_ACTOR, ACTOR_SOUND_JUMP)
EVT_CALL(ForceHomePos, BLACK_ACTOR, 100, 0, -10)
EVT_CALL(SetAnimation, BLACK_ACTOR, 1, ANIM_KoopaBros_Black_IdleCrouch)
@ -1740,7 +1740,7 @@ EvtScript N(EVS_KoopaBrosEnter) = {
EVT_CALL(SetActorJumpGravity, RED_ACTOR, EVT_FLOAT(1.5))
EVT_CALL(SetActorSounds, RED_ACTOR, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(FallToGoal, RED_ACTOR, 30)
EVT_CALL(PlaySoundAtActor, RED_ACTOR, SOUND_3E9)
EVT_CALL(PlaySoundAtActor, RED_ACTOR, SOUND_03E9)
EVT_CALL(ResetActorSounds, RED_ACTOR, ACTOR_SOUND_JUMP)
EVT_CALL(ForceHomePos, RED_ACTOR, 140, 0, -15)
EVT_CALL(SetAnimation, RED_ACTOR, 1, ANIM_KoopaBros_Red_IdleCrouch)
@ -1946,7 +1946,7 @@ EvtScript N(EVS_BuildTowerWithKoopa) = {
EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.6))
EVT_CALL(JumpToGoal, LVarA, 20, FALSE, FALSE, FALSE)
EVT_CALL(N(PlayLandOnTowerFX), LVarA)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_3E9)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_03E9)
EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5)
EVT_SUB(LVar3, 15)
EVT_CALL(SetActorPos, LVarA, LVar3, LVar4, LVar5)
@ -2098,7 +2098,7 @@ EvtScript N(EVS_BuildTowerWithKoopa) = {
EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.6))
EVT_CALL(JumpToGoal, LVarA, 20, FALSE, FALSE, FALSE)
EVT_CALL(N(PlayLandOnTowerFX), LVarA)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_3E9)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_03E9)
EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5)
EVT_SUB(LVar3, 15)
EVT_CALL(SetActorPos, LVarA, LVar3, LVar4, LVar5)
@ -2165,7 +2165,7 @@ EvtScript N(EVS_BuildTowerWithKoopa) = {
EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.6))
EVT_CALL(JumpToGoal, LVarA, 20, FALSE, FALSE, FALSE)
EVT_CALL(N(PlayLandOnTowerFX), LVarA)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_3E9)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_03E9)
EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5)
EVT_SUB(LVar3, 15)
EVT_CALL(SetActorPos, LVarA, LVar3, LVar4, LVar5)
@ -2298,7 +2298,7 @@ EvtScript N(EVS_UpdateTowerWithKoopa) = {
EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.6))
EVT_CALL(JumpToGoal, LVarA, 20, FALSE, FALSE, FALSE)
EVT_CALL(N(PlayLandOnTowerFX), LVarA)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_3E9)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_03E9)
EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5)
EVT_SUB(LVar3, 15)
EVT_CALL(SetActorPos, LVarA, LVar3, LVar4, LVar5)
@ -2380,7 +2380,7 @@ EvtScript N(EVS_UpdateTowerWithKoopa) = {
EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.6))
EVT_CALL(JumpToGoal, LVarA, 20, FALSE, FALSE, FALSE)
EVT_CALL(N(PlayLandOnTowerFX), LVarA)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_3E9)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_03E9)
EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5)
EVT_SUB(LVar3, 15)
EVT_CALL(SetActorPos, LVarA, LVar3, LVar4, LVar5)

2
src/battle/btl_evt_library.c
View File

@ -1748,7 +1748,7 @@ EvtScript EVS_Enemy_DeathWithoutRemove = {
EVT_ADD(LVar1, 10)
EVT_ADD(LVar2, 10)
EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_DEATH)
EVT_CALL(DropStarPoints, ACTOR_SELF)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_SET(LVar3, 0)

6
src/battle/common/actor/albino_dino.inc.c
View File

@ -260,9 +260,9 @@ EvtScript N(takeTurn) = {
EVT_EXEC_GET_TID(N(stamp), LVar9)
EVT_THREAD
EVT_LOOP(3)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_30B)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_030B)
EVT_WAIT(4)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2FD)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02FD)
EVT_WAIT(4)
EVT_END_LOOP
EVT_END_THREAD
@ -323,7 +323,7 @@ EvtScript N(takeTurn) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0))
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2FD)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02FD)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_AlbinoDino_Idle)
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(1.0))
EVT_WAIT(10)

16
src/battle/common/actor/anti_guy.inc.c
View File

@ -261,8 +261,8 @@ EvtScript N(802220FC) = {
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EF, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_02EF, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim04)
@ -300,9 +300,9 @@ EvtScript N(802220FC) = {
EVT_END_SWITCH
EVT_THREAD
EVT_WAIT(3)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EF)
EVT_END_THREAD
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim04)
@ -343,7 +343,7 @@ EvtScript N(80222824) = {
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_234)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim09)
EVT_WAIT(20)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim03)
@ -354,7 +354,7 @@ EvtScript N(80222824) = {
EVT_SET(LVar1, 0)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim04)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
@ -453,8 +453,8 @@ EvtScript N(80222824) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8))
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_CHEERING)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_CHEERING | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim09)
EVT_WAIT(10)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim07)

18
src/battle/common/actor/bandit.inc.c
View File

@ -236,15 +236,15 @@ EvtScript N(EVS_DropCoin) = {
EVT_CALL(AddVectorPolar, LVar1, LVar3, EVT_FLOAT(40.0), LVar0)
EVT_CALL(SetGoalPos, LVarA, LVar1, 0, LVar3)
EVT_CALL(JumpToGoal, LVarA, 20, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_212)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_COIN_BOUNCE)
EVT_CALL(AddVectorPolar, LVar1, LVar3, EVT_FLOAT(20.0), LVar0)
EVT_CALL(SetGoalPos, LVarA, LVar1, 0, LVar3)
EVT_CALL(JumpToGoal, LVarA, 10, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_212)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_COIN_BOUNCE)
EVT_CALL(AddVectorPolar, LVar1, LVar3, EVT_FLOAT(10.0), LVar0)
EVT_CALL(SetGoalPos, LVarA, LVar1, 0, LVar3)
EVT_CALL(JumpToGoal, LVarA, 5, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_212)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_COIN_BOUNCE)
EVT_LOOP(0)
EVT_CALL(GetBattleFlags, LVar1)
EVT_IF_FLAG(LVar1, BS_FLAGS1_PARTNER_ACTING)
@ -272,13 +272,13 @@ EvtScript N(EVS_DropCoin) = {
EVT_IF_LT(LVar4, 30)
EVT_CALL(SetGoalPos, LVarA, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, LVarA, 5, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_212)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_COIN_BOUNCE)
EVT_ELSE
EVT_SET(LVar4, LVar3)
EVT_ADD(LVar3, 30)
EVT_CALL(SetGoalPos, LVarA, LVar3, LVar1, LVar2)
EVT_CALL(JumpToGoal, LVarA, 0, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_212)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_COIN_BOUNCE)
EVT_END_IF
EVT_ELSE
EVT_SET(LVar4, LVar3)
@ -286,12 +286,12 @@ EvtScript N(EVS_DropCoin) = {
EVT_IF_LT(LVar4, 30)
EVT_CALL(SetGoalPos, LVarA, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, LVarA, 5, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_212)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_COIN_BOUNCE)
EVT_ELSE
EVT_SUB(LVar3, 30)
EVT_CALL(SetGoalPos, LVarA, LVar3, LVar1, LVar2)
EVT_CALL(JumpToGoal, LVarA, 0, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_212)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_COIN_BOUNCE)
EVT_END_IF
EVT_END_IF
EVT_GOTO(5)
@ -302,7 +302,7 @@ EvtScript N(EVS_DropCoin) = {
EVT_CALL(JumpToGoal, LVarA, 15, FALSE, FALSE, FALSE)
EVT_CALL(GetGoalPos, LVarA, LVar0, LVar1, LVar2)
EVT_PLAY_EFFECT(EFFECT_SMALL_GOLD_SPARKLE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 0, 0)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_211)
EVT_CALL(PlaySoundAtActor, LVarA, SOUND_COIN_PICKUP)
EVT_CALL(GetActorVar, LVarA, AVAR_Coin_NumCoins, LVar0)
EVT_CALL(AddCoin, LVar0)
EVT_CALL(RemoveActor, LVarA)
@ -677,7 +677,7 @@ EvtScript N(EVS_TakeTurn) = {
EVT_THREAD
EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_NumCoins, LVar0)
EVT_LOOP(LVar0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_212)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_COIN_BOUNCE)
EVT_WAIT(1)
EVT_END_LOOP
EVT_END_THREAD

2
src/battle/common/actor/bill_blaster.inc.c
View File

@ -221,7 +221,7 @@ EvtScript N(EVS_Move_FireBullet) = {
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.0))
EVT_END_THREAD
EVT_CALL(StartRumble, 9)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2C8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02C8)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_SUB(LVar0, 33)
EVT_ADD(LVar1, 19)

16
src/battle/common/actor/blue_shy_guy.inc.c
View File

@ -250,8 +250,8 @@ EvtScript N(8021B504) = {
EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_SET(LVarA, LVar0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_2EF, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_02EF, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Blue_Anim04)
@ -289,9 +289,9 @@ EvtScript N(8021B504) = {
EVT_END_SWITCH
EVT_THREAD
EVT_WAIT(3)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2EF)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02EF)
EVT_END_THREAD
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Blue_Anim04)
@ -332,7 +332,7 @@ EvtScript N(8021BC2C) = {
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(MoveBattleCamOver, 20)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_234)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0234)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Blue_Anim09)
EVT_WAIT(20)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Blue_Anim03)
@ -343,7 +343,7 @@ EvtScript N(8021BC2C) = {
EVT_SET(LVar1, 0)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_20BA, SOUND_3B4)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Blue_Anim04)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0))
@ -442,8 +442,8 @@ EvtScript N(8021BC2C) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8))
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_349 | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_CHEERING)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_CHEERING | SOUND_ID_TRIGGER_CHANGE_SOUND)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Blue_Anim09)
EVT_WAIT(10)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Blue_Anim07)

4
src/battle/common/actor/bob_omb.inc.c
View File

@ -169,7 +169,7 @@ EvtScript N(EVS_Ignite) = {
EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(EVS_HandleEvent_Ignited)))
EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_EXPLODE_ON_CONTACT, TRUE)
EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_Ignited)))
EVT_CALL(PlayLoopingSoundAtActor, ACTOR_SELF, 0, SOUND_80000001)
EVT_CALL(PlayLoopingSoundAtActor, ACTOR_SELF, 0, SOUND_LOOP_01)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_WalkLit)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(2.0))
@ -625,7 +625,7 @@ EvtScript N(EVS_Attack_Blast) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
EVT_CALL(BattleCamTargetActor, ACTOR_SELF)
EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE)
EVT_CALL(PlayLoopingSoundAtActor, ACTOR_SELF, 0, SOUND_80000001)
EVT_CALL(PlayLoopingSoundAtActor, ACTOR_SELF, 0, SOUND_LOOP_01)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_OR_EQ(HIT_RESULT_MISS)

2
src/battle/common/actor/bony_beetle.inc.c
View File

@ -878,7 +878,7 @@ EvtScript N(8021B7C8) = {
EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_SET(LVar1, 0)
EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0301)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8))
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)

2
src/battle/common/actor/bullet_bill.inc.c
View File

@ -306,7 +306,7 @@ EvtScript N(EVS_MakeExplosionFX) = {
EVT_ADD(LVar1, 16)
EVT_ADD(LVar2, 2)
EVT_PLAY_EFFECT(EFFECT_BLAST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(3.0), 30, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2078)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SRAW_20_A)
EVT_CALL(StartRumble, 11)
EVT_THREAD
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0))

4
src/battle/common/actor/buzzy_beetle.inc.c
View File

@ -185,7 +185,7 @@ EvtScript N(fallOff) = {
EVT_SUB(LVar1, 24)
EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_SET(LVar1, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0301, 0)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8))
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE)
@ -585,7 +585,7 @@ EvtScript N(takeTurn_ceiling) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BuzzyBeetle_Anim0E)
EVT_WAIT(8)
EVT_END_IF
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0301, 0)
EVT_CALL(GetBattlePhase, LVar0)
EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_05)

6
src/battle/common/actor/bzzap.inc.c
View File

@ -485,7 +485,7 @@ EvtScript N(attackSwarmSting) = {
EVT_WAIT(40)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bzzap_Anim01)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
EVT_CALL(PlaySound, SOUND_358)
EVT_CALL(PlaySound, SOUND_0358)
EVT_SET(LVar0, 2)
EVT_EXEC_GET_TID(N(8021B77C), LVarA)
EVT_WAIT(11)
@ -612,7 +612,7 @@ EvtScript N(attackSwarmSting) = {
EVT_WAIT(30)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_WAIT(30)
EVT_CALL(StopSound, SOUND_358)
EVT_CALL(StopSound, SOUND_0358)
EVT_CALL(YieldTurn)
EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE)
EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE)
@ -721,7 +721,7 @@ EvtScript N(attackSwarmSting) = {
EVT_ADD(LVar2, 100)
EVT_CALL(FlyPartTo, ACTOR_SELF, PRT_6, LVar0, LVar1, LVar2, 0, 10, EASING_LINEAR)
EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_6, ACTOR_PART_FLAG_INVISIBLE, TRUE)
EVT_CALL(StopSound, SOUND_358)
EVT_CALL(StopSound, SOUND_0358)
EVT_CALL(YieldTurn)
EVT_END_CASE_GROUP
EVT_END_SWITCH

4
src/battle/common/actor/dark_koopa.inc.c
View File

@ -811,7 +811,7 @@ EvtScript N(standUp) = {
EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(0.5))
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_JUMP)
EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_ToppleStruggle)
EVT_SET(LVar0, 0)
@ -827,7 +827,7 @@ EvtScript N(standUp) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(3.0))
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A)
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0)

6
src/battle/common/actor/dark_paratroopa.inc.c
View File

@ -581,7 +581,7 @@ EvtScript N(fall) = {
EVT_SUB(LVar2, 2)
EVT_CALL(SetPartPos, ACTOR_SELF, PRT_3, LVar0, LVar1, LVar2)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_Hurt)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_301, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0301, 0)
EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVarA)
EVT_IF_EQ(LVarA, 0)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@ -1363,7 +1363,7 @@ EvtScript N(koopa_standUp) = {
EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(0.5))
EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0)
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_JUMP)
EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_ToppleStruggle)
EVT_SET(LVar0, 0)
@ -1379,7 +1379,7 @@ EvtScript N(koopa_standUp) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(3.0))
EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_STEP_A)
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0)

Some files were not shown because too many files have changed in this diff Show More