diff --git a/include/common_structs.h b/include/common_structs.h index 1203b5cfc1..a74aaab0f7 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -1247,7 +1247,7 @@ typedef struct MessagePrintState { /* 0x519 */ u8 volume; /* 0x51A */ u8 speechPan; // just pan? /* 0x51B */ char unk_51B[0x1]; - /* 0x51C */ u16 speechVolumePitch; + /* 0x51C */ u16 speechPitchShift; /* 0x51E */ char unk_51E[0x2]; /* 0x520 */ s32 speechSoundIDA; /* 0x524 */ s32 speechSoundIDB; @@ -2496,9 +2496,9 @@ typedef struct PartnerDMAData { } PartnerDMAData; // size = 0x14 typedef struct MsgVoice { - /* 0x00 */ s32 unk_00; - /* 0x04 */ s32 unk_04; - /* 0x08 */ s32 unk_08; + /* 0x00 */ s32 voiceA; + /* 0x04 */ s32 voiceB; + /* 0x08 */ s32 pitchShift; } MsgVoice; // size = 0x0C typedef struct Rect { diff --git a/include/enums.h b/include/enums.h index 926d71b425..c1c7e1a29b 100644 --- a/include/enums.h +++ b/include/enums.h @@ -523,26 +523,32 @@ enum EasingType { }; enum SoundIDs { - SOUND_0 = 0x00000000, - SOUND_1 = 0x00000001, - SOUND_2 = 0x00000002, - SOUND_3 = 0x00000003, - SOUND_4 = 0x00000004, + SOUND_NONE = 0x00000000, + SOUND_OPEN_POPUP_1 = 0x00000001, + SOUND_OPEN_POPUP_2 = 0x00000002, + SOUND_LOWER_STATUS_BAR = 0x00000003, + SOUND_RAISE_STATUS_BAR = 0x00000004, SOUND_MENU_BADGE_EQUIP = 0x00000005, SOUND_MENU_BADGE_UNEQUIP = 0x00000006, - SOUND_MENU_START_TUTORIAL = 0x00000009, - SOUND_A = 0x0000000A, - SOUND_B = 0x0000000B, - SOUND_D = 0x0000000D, - SOUND_E = 0x0000000E, - SOUND_F = 0x0000000F, - SOUND_10 = 0x00000010, - SOUND_NORMAL_VOICE_A = 0x00000011, - SOUND_NORMAL_VOICE_B = 0x00000012, - SOUND_14 = 0x00000014, - SOUND_BOWSER_VOICE_A = 0x00000017, - SOUND_BOWSER_VOICE_B = 0x00000018, - SOUND_STAR_VOICE = 0x0000001B, + SOUND_MENU_SHOW_CHOICE = 0x00000009, + SOUND_CHIME_BEGIN_AMBUSH = 0x0000000A, + SOUND_CHIME_SOLVED_PUZZLE = 0x0000000B, + SOUND_ACTIVATE_COMPUTER = 0x0000000C, // unused + SOUND_PARTNER_PUT_AWAY = 0x0000000D, + SOUND_PARTNER_GET_OUT = 0x0000000E, + SOUND_PARTNER_SWAP_BATTLE_POS = 0x0000000F, + SOUND_SAVE_CONFIRM = 0x00000010, + SOUND_MSG_VOICE_1A = 0x00000011, + SOUND_MSG_VOICE_1B = 0x00000012, + SOUND_MSG_VOICE_2A = 0x00000013, + SOUND_MSG_VOICE_2B = 0x00000014, + SOUND_MSG_VOICE_3A = 0x00000015, + SOUND_MSG_VOICE_3B = 0x00000016, + SOUND_MSG_VOICE_4A = 0x00000017, + SOUND_MSG_VOICE_4B = 0x00000018, + SOUND_MSG_VOICE_5A = 0x00000019, + SOUND_MSG_VOICE_5B = 0x0000001A, + SOUND_MSG_VOICE_STAR = 0x0000001B, SOUND_21 = 0x00000021, SOUND_22 = 0x00000022, SOUND_23 = 0x00000023, @@ -660,10 +666,10 @@ enum SoundIDs { SOUND_B1 = 0x000000B1, SOUND_B2 = 0x000000B2, SOUND_B4 = 0x000000B4, - SOUND_BOO_VANISH = 0x000000C1, - SOUND_C2 = 0x000000C2, - SOUND_BOO_APPEAR = 0x000000C3, - SOUND_C4 = 0x000000C4, + SOUND_BOO_VANISH_A = 0x000000C1, + SOUND_BOO_VANISH_B = 0x000000C2, + SOUND_BOO_APPEAR_A = 0x000000C3, + SOUND_BOO_APPEAR_B = 0x000000C4, SOUND_MENU_OPEN = 0x000000C5, SOUND_MENU_CLOSE = 0x000000C6, SOUND_MENU_CHANGE_SELECTION = 0x000000C7, @@ -5664,28 +5670,30 @@ enum MsgEffectFlags { }; enum MsgStyles { - MSG_STYLE_RIGHT = 0x01, - MSG_STYLE_LEFT = 0x02, - MSG_STYLE_CENTER = 0x03, - MSG_STYLE_TATTLE = 0x04, - MSG_STYLE_CHOICE = 0x05, - MSG_STYLE_INSPECT = 0x06, - MSG_STYLE_SIGN = 0x07, - MSG_STYLE_LAMPPOST = 0x08, - MSG_STYLE_POSTCARD = 0x09, - MSG_STYLE_POPUP = 0x0A, - MSG_STYLE_B = 0x0B, - MSG_STYLE_UPGRADE = 0x0C, - MSG_STYLE_NARRATE = 0x0D, - MSG_STYLE_EPILOGUE = 0x0E, - MSG_STYLE_F = 0x0F + MSG_STYLE_NONE = 0x0, + MSG_STYLE_RIGHT = 0x1, + MSG_STYLE_LEFT = 0x2, + MSG_STYLE_CENTER = 0x3, + MSG_STYLE_TATTLE = 0x4, + MSG_STYLE_CHOICE = 0x5, + MSG_STYLE_INSPECT = 0x6, + MSG_STYLE_SIGN = 0x7, + MSG_STYLE_LAMPPOST = 0x8, + MSG_STYLE_POSTCARD = 0x9, + MSG_STYLE_POPUP = 0xA, + MSG_STYLE_B = 0xB, + MSG_STYLE_UPGRADE = 0xC, + MSG_STYLE_NARRATE = 0xD, + MSG_STYLE_EPILOGUE = 0xE, + MSG_STYLE_F = 0xF }; enum MsgFonts { MSG_FONT_NORMAL = 0, MSG_FONT_MENU = 1, + MSG_FONT_2 = 2, MSG_FONT_TITLE = 3, - MSG_FONT_SUBTITLE = 4 + MSG_FONT_SUBTITLE = 4, }; enum MsgVoices { diff --git a/src/1A5830.c b/src/1A5830.c index 1ace4fc994..35f2e011f1 100644 --- a/src/1A5830.c +++ b/src/1A5830.c @@ -717,7 +717,7 @@ HitResult calc_enemy_damage_target(Actor* attacker) { func_80267018(target, 1); - if (attacker->actorTypeData1[5] != SOUND_0) { + if (attacker->actorTypeData1[5] != SOUND_NONE) { sfx_play_sound_at_position(attacker->actorTypeData1[5], SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z); } diff --git a/src/415D90.c b/src/415D90.c index f25d4b19f2..c3e2155bd1 100644 --- a/src/415D90.c +++ b/src/415D90.c @@ -2452,7 +2452,7 @@ void btl_state_update_player_menu(void) { D_802ACC6C--; } else if (!(gBattleStatus.flags1 & BS_FLAGS1_TUTORIAL_BATTLE) && (gGameStatusPtr->pressedButtons[0] & BUTTON_Z)) { if (func_802A58D0() && battleStatus->hustleTurns != 1) { - sfx_play_sound(SOUND_F); + sfx_play_sound(SOUND_PARTNER_SWAP_BATTLE_POS); battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_MAIN] = battle_menu_submenuIDs[BattleMenu_CurPos + BattleMenu_HomePos]; btl_main_menu_destroy(); btl_set_state(BATTLE_STATE_SWITCH_TO_PARTNER); @@ -3771,7 +3771,7 @@ void btl_state_update_partner_menu(void) { D_802ACC6C--; } else if (!(gBattleStatus.flags1 & BS_FLAGS1_TUTORIAL_BATTLE) && (gGameStatusPtr->pressedButtons[0] & BUTTON_Z)) { if (can_btl_state_update_switch_to_player()) { - sfx_play_sound(SOUND_F); + sfx_play_sound(SOUND_PARTNER_SWAP_BATTLE_POS); battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_MAIN] = battle_menu_submenuIDs[BattleMenu_CurPos + BattleMenu_HomePos]; btl_main_menu_destroy(); btl_set_state(BATTLE_STATE_SWITCH_TO_PLAYER); diff --git a/src/7fd10_len_b40.c b/src/7fd10_len_b40.c index 24da5b19cb..9bbf910d42 100644 --- a/src/7fd10_len_b40.c +++ b/src/7fd10_len_b40.c @@ -386,14 +386,14 @@ void check_input_status_bar(void) { open_status_bar_long(); if (!is_picking_up_item()) { - sfx_play_sound(SOUND_3); + sfx_play_sound(SOUND_LOWER_STATUS_BAR); } } } else if (!(playerStatus->curButtons & (Z_TRIG | R_TRIG)) && (pressedButtons & BUTTON_C_UP) && func_800E9860()) { close_status_bar(); if (!is_picking_up_item()) { - sfx_play_sound(SOUND_4); + sfx_play_sound(SOUND_RAISE_STATUS_BAR); } } } diff --git a/src/8a860_len_3f30.c b/src/8a860_len_3f30.c index e7904d2c03..77f7ab7c16 100644 --- a/src/8a860_len_3f30.c +++ b/src/8a860_len_3f30.c @@ -236,20 +236,20 @@ void func_800F16CC(void) { case POPUP_MENU_TAKE_FROM_CHEST: case POPUP_MENU_USEKEY: set_window_update(WINDOW_ID_14, (s32) basic_window_update); - sfx_play_sound(SOUND_1); + sfx_play_sound(SOUND_OPEN_POPUP_1); set_window_update(WINDOW_ID_19, (s32) basic_window_update); break; case POPUP_MENU_SWITCH_PARTNER: case POPUP_MENU_UPGRADE_PARTNER: set_window_update(WINDOW_ID_14, (s32) basic_window_update); - sfx_play_sound(SOUND_2); + sfx_play_sound(SOUND_OPEN_POPUP_2); set_window_update(WINDOW_ID_19, (s32) basic_window_update); break; case POPUP_MENU_READ_DIARY_PAGE: case POPUP_MENU_READ_POSTCARD: case POPUP_MENU_POST_OFFICE: set_window_update(WINDOW_ID_14, (s32) basic_window_update); - sfx_play_sound(SOUND_1); + sfx_play_sound(SOUND_OPEN_POPUP_1); break; } set_window_update(WINDOW_ID_21, (s32) basic_window_update); @@ -730,20 +730,20 @@ s32 popup_menu_update(void) { case POPUP_MENU_TAKE_FROM_CHEST: case POPUP_MENU_USEKEY: set_window_update(WINDOW_ID_14, (s32)basic_window_update); - sfx_play_sound(SOUND_1); + sfx_play_sound(SOUND_OPEN_POPUP_1); set_window_update(WINDOW_ID_19, (s32)basic_window_update); break; case POPUP_MENU_SWITCH_PARTNER: case POPUP_MENU_UPGRADE_PARTNER: set_window_update(WINDOW_ID_14, (s32)basic_window_update); - sfx_play_sound(SOUND_2); + sfx_play_sound(SOUND_OPEN_POPUP_2); set_window_update(WINDOW_ID_19, (s32)basic_window_update); break; case POPUP_MENU_READ_DIARY_PAGE: case POPUP_MENU_READ_POSTCARD: case POPUP_MENU_POST_OFFICE: set_window_update(WINDOW_ID_14, (s32)basic_window_update); - sfx_play_sound(SOUND_1); + sfx_play_sound(SOUND_OPEN_POPUP_1); break; } set_window_update(WINDOW_ID_21, WINDOW_UPDATE_SHOW); diff --git a/src/audio/sfx.c b/src/audio/sfx.c index 97f23a97bc..ad7596904d 100644 --- a/src/audio/sfx.c +++ b/src/audio/sfx.c @@ -39,8 +39,8 @@ 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_8014F504[] = { SOUND_BOO_VANISH, SOUND_C2 }; -s32 D_8014F50C[] = { SOUND_BOO_APPEAR, SOUND_C4 }; +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 }; diff --git a/src/battle/area/flo2/actor/huff_n_puff.c b/src/battle/area/flo2/actor/huff_n_puff.c index 39156fc0fe..f82d548e13 100644 --- a/src/battle/area/flo2/actor/huff_n_puff.c +++ b/src/battle/area/flo2/actor/huff_n_puff.c @@ -2948,7 +2948,7 @@ EvtScript N(attackGroundSlam) = { EVT_ELSE EVT_SET(LVar2, 14) EVT_END_IF - EVT_CALL(SetActorSounds, ArrayVar(0), ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ArrayVar(0), ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalPos, ArrayVar(0), LVar1, LVar2, LVar3) EVT_CALL(FlyToGoal, ArrayVar(0), 20, 0, EASING_CUBIC_IN) EVT_CALL(ResetActorSounds, ArrayVar(0), ACTOR_SOUND_FLY) @@ -2963,7 +2963,7 @@ EvtScript N(attackGroundSlam) = { EVT_ELSE EVT_SET(LVar2, 14) EVT_END_IF - EVT_CALL(SetActorSounds, ArrayVar(1), ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ArrayVar(1), ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalPos, ArrayVar(1), LVar1, LVar2, LVar3) EVT_CALL(FlyToGoal, ArrayVar(1), 20, 0, EASING_CUBIC_IN) EVT_CALL(ResetActorSounds, ArrayVar(1), ACTOR_SOUND_FLY) @@ -2978,7 +2978,7 @@ EvtScript N(attackGroundSlam) = { EVT_ELSE EVT_SET(LVar2, 14) EVT_END_IF - EVT_CALL(SetActorSounds, ArrayVar(2), ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ArrayVar(2), ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalPos, ArrayVar(2), LVar1, LVar2, LVar3) EVT_CALL(FlyToGoal, ArrayVar(2), 20, 0, EASING_CUBIC_IN) EVT_CALL(ResetActorSounds, ArrayVar(2), ACTOR_SOUND_FLY) @@ -2993,7 +2993,7 @@ EvtScript N(attackGroundSlam) = { EVT_ELSE EVT_SET(LVar2, 14) EVT_END_IF - EVT_CALL(SetActorSounds, ArrayVar(3), ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ArrayVar(3), ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalPos, ArrayVar(3), LVar1, LVar2, LVar3) EVT_CALL(FlyToGoal, ArrayVar(3), 20, 0, EASING_CUBIC_IN) EVT_CALL(ResetActorSounds, ArrayVar(3), ACTOR_SOUND_FLY) @@ -3008,7 +3008,7 @@ EvtScript N(attackGroundSlam) = { EVT_ELSE EVT_SET(LVar2, 14) EVT_END_IF - EVT_CALL(SetActorSounds, ArrayVar(4), ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ArrayVar(4), ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalPos, ArrayVar(4), LVar1, LVar2, LVar3) EVT_CALL(FlyToGoal, ArrayVar(4), 20, 0, EASING_CUBIC_IN) EVT_CALL(ResetActorSounds, ArrayVar(4), ACTOR_SOUND_FLY) @@ -3023,7 +3023,7 @@ EvtScript N(attackGroundSlam) = { EVT_ELSE EVT_SET(LVar2, 14) EVT_END_IF - EVT_CALL(SetActorSounds, ArrayVar(5), ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ArrayVar(5), ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalPos, ArrayVar(5), LVar1, LVar2, LVar3) EVT_CALL(FlyToGoal, ArrayVar(5), 20, 0, EASING_CUBIC_IN) EVT_CALL(ResetActorSounds, ArrayVar(5), ACTOR_SOUND_FLY) @@ -3038,7 +3038,7 @@ EvtScript N(attackGroundSlam) = { EVT_ELSE EVT_SET(LVar2, 14) EVT_END_IF - EVT_CALL(SetActorSounds, ArrayVar(6), ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ArrayVar(6), ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalPos, ArrayVar(6), LVar1, LVar2, LVar3) EVT_CALL(FlyToGoal, ArrayVar(6), 20, 0, EASING_CUBIC_IN) EVT_CALL(ResetActorSounds, ArrayVar(6), ACTOR_SOUND_FLY) @@ -3053,7 +3053,7 @@ EvtScript N(attackGroundSlam) = { EVT_ELSE EVT_SET(LVar2, 14) EVT_END_IF - EVT_CALL(SetActorSounds, ArrayVar(7), ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ArrayVar(7), ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalPos, ArrayVar(7), LVar1, LVar2, LVar3) EVT_CALL(FlyToGoal, ArrayVar(7), 20, 0, EASING_CUBIC_IN) EVT_CALL(ResetActorSounds, ArrayVar(7), ACTOR_SOUND_FLY) @@ -3068,7 +3068,7 @@ EvtScript N(attackGroundSlam) = { EVT_ELSE EVT_SET(LVar2, 14) EVT_END_IF - EVT_CALL(SetActorSounds, ArrayVar(8), ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ArrayVar(8), ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalPos, ArrayVar(8), LVar1, LVar2, LVar3) EVT_CALL(FlyToGoal, ArrayVar(8), 20, 0, EASING_CUBIC_IN) EVT_CALL(ResetActorSounds, ArrayVar(8), ACTOR_SOUND_FLY) @@ -3083,13 +3083,13 @@ EvtScript N(attackGroundSlam) = { EVT_ELSE EVT_SET(LVar2, 14) EVT_END_IF - EVT_CALL(SetActorSounds, ArrayVar(9), ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ArrayVar(9), ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalPos, ArrayVar(9), LVar1, LVar2, LVar3) EVT_CALL(FlyToGoal, ArrayVar(9), 20, 0, EASING_CUBIC_IN) EVT_CALL(ResetActorSounds, ArrayVar(9), ACTOR_SOUND_FLY) EVT_END_THREAD EVT_END_IF - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_THREAD EVT_WAIT(3) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E9) diff --git a/src/battle/area/iwa/actor/buzzar.c b/src/battle/area/iwa/actor/buzzar.c index f6afea4f3c..ba094d97d6 100644 --- a/src/battle/area/iwa/actor/buzzar.c +++ b/src/battle/area/iwa/actor/buzzar.c @@ -811,7 +811,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F2) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -45, -20, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) @@ -840,7 +840,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F2) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -15, -10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) @@ -898,7 +898,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F2) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -15, -10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) @@ -1058,7 +1058,7 @@ EvtScript N(EVS_Attack_ClawSwipe) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F2) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -45, -20, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) @@ -1084,7 +1084,7 @@ EvtScript N(EVS_Attack_ClawSwipe) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F2) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -5, -10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) diff --git a/src/battle/area/kgr/actor/fuzzipede.c b/src/battle/area/kgr/actor/fuzzipede.c index 38cd6aa5bf..cd040ad3f8 100644 --- a/src/battle/area/kgr/actor/fuzzipede.c +++ b/src/battle/area/kgr/actor/fuzzipede.c @@ -579,7 +579,7 @@ EvtScript N(8021A6D8) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzipede_Anim12) EVT_WAIT(10) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DA) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -745,7 +745,7 @@ EvtScript N(8021B22C) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzipede_Anim12) EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DB) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_MISS) diff --git a/src/battle/area/kmr_part_3/actor/final_jr_troopa.c b/src/battle/area/kmr_part_3/actor/final_jr_troopa.c index d8c320829f..713c0c629e 100644 --- a/src/battle/area/kmr_part_3/actor/final_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/final_jr_troopa.c @@ -839,7 +839,7 @@ EvtScript N(8022ED10) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_SUB(LVar0, 80) @@ -879,7 +879,7 @@ EvtScript N(8022ED10) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) @@ -925,7 +925,7 @@ EvtScript N(8022F468) = { EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(10) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 6, BS_FLAGS1_10) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(6) diff --git a/src/battle/area/kmr_part_3/actor/para_jr_troopa.c b/src/battle/area/kmr_part_3/actor/para_jr_troopa.c index ec7ea7ef98..5ea762f84f 100644 --- a/src/battle/area/kmr_part_3/actor/para_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/para_jr_troopa.c @@ -419,7 +419,7 @@ EvtScript N(takeTurn_80226F58) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_SUB(LVar0, 80) @@ -458,7 +458,7 @@ EvtScript N(takeTurn_80226F58) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) @@ -541,7 +541,7 @@ EvtScript N(802279B0) = { EVT_GOTO(0) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(HideHealthBar, ACTOR_SELF) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.2)) diff --git a/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c b/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c index e4364f4438..5c1436cce3 100644 --- a/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c @@ -468,7 +468,7 @@ EvtScript N(takeTurn_8022936C) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_SUB(LVar0, 80) @@ -507,7 +507,7 @@ EvtScript N(takeTurn_8022936C) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) @@ -639,7 +639,7 @@ EvtScript N(8022A018) = { EVT_GOTO(0) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(HideHealthBar, ACTOR_SELF) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.2)) diff --git a/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c b/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c index 02653a9252..1e0fbd61aa 100644 --- a/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c +++ b/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c @@ -395,7 +395,7 @@ EvtScript N(takeTurn_8021CDFC) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_Paragoomba_Dive) @@ -403,7 +403,7 @@ EvtScript N(takeTurn_8021CDFC) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_SUB(LVar0, 80) EVT_SET(LVar1, 20) @@ -445,7 +445,7 @@ EvtScript N(takeTurn_8021CDFC) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_Paragoomba_Dive) @@ -453,7 +453,7 @@ EvtScript N(takeTurn_8021CDFC) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_Paragoomba_Dive) diff --git a/src/battle/area/kpa2/actor/bowser_phase_1.c b/src/battle/area/kpa2/actor/bowser_phase_1.c index 394e18dea0..a80cb07dc0 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_1.c +++ b/src/battle/area/kpa2/actor/bowser_phase_1.c @@ -1028,7 +1028,7 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) EVT_SET(LVar1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 18, FALSE, TRUE, FALSE) EVT_THREAD @@ -1171,7 +1171,7 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 40) EVT_SET(LVar1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 18, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) diff --git a/src/battle/area/kpa2/actor/bowser_phase_2.c b/src/battle/area/kpa2/actor/bowser_phase_2.c index 4caacb746e..bacb30dab0 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_2.c +++ b/src/battle/area/kpa2/actor/bowser_phase_2.c @@ -881,7 +881,7 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) EVT_SET(LVar1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 18, FALSE, TRUE, FALSE) EVT_THREAD @@ -1024,7 +1024,7 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 40) EVT_SET(LVar1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 18, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) diff --git a/src/battle/area/kpa2/actor/bowser_phase_3.c b/src/battle/area/kpa2/actor/bowser_phase_3.c index 0488f9f969..1ea2f792df 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_3.c +++ b/src/battle/area/kpa2/actor/bowser_phase_3.c @@ -1114,7 +1114,7 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) EVT_SET(LVar1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 18, FALSE, TRUE, FALSE) EVT_THREAD @@ -1257,7 +1257,7 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 40) EVT_SET(LVar1, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 18, FALSE, TRUE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) diff --git a/src/battle/area/kpa4/actor/bombshell_bill.c b/src/battle/area/kpa4/actor/bombshell_bill.c index 40008a8b0a..d31378744e 100644 --- a/src/battle/area/kpa4/actor/bombshell_bill.c +++ b/src/battle/area/kpa4/actor/bombshell_bill.c @@ -121,7 +121,7 @@ EvtScript N(init) = { EVT_CALL(SetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_CALL(CopyStatusEffects, LVar0, ACTOR_SELF) EVT_CALL(CopyBuffs, LVar0, ACTOR_SELF) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(GetActorPos, LVar0, LVar1, LVarB, LVarC) EVT_SUB(LVar1, 90) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.01)) diff --git a/src/battle/area/mac/actor/chan.c b/src/battle/area/mac/actor/chan.c index dedde44e0c..773c626eb1 100644 --- a/src/battle/area/mac/actor/chan.c +++ b/src/battle/area/mac/actor/chan.c @@ -740,7 +740,7 @@ EvtScript N(takeTurn_Chan) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Chan_ShellSpin) EVT_WAIT(20) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 2, BS_FLAGS1_10) EVT_SWITCH(LVar0) diff --git a/src/battle/area/mac/actor/lee.c b/src/battle/area/mac/actor/lee.c index fd955c2a44..ad9984eb8d 100644 --- a/src/battle/area/mac/actor/lee.c +++ b/src/battle/area/mac/actor/lee.c @@ -1424,7 +1424,7 @@ EvtScript N(takeTurn_80221200) = { EVT_RETURN EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleKooper_EnterShell) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_NONE) EVT_WAIT(15) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleKooper_ShellSpinSlowest) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_200C) @@ -1473,7 +1473,7 @@ EvtScript N(takeTurn_80221200) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_200A) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 15) EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_ZERO, 0, ACTOR_DECORATION_GREY_SMOKE_TRAIL) @@ -1825,7 +1825,7 @@ EvtScript N(takeTurn_802229C4) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBombette_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBombette_Brace) EVT_WAIT(15) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2020) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) @@ -2196,7 +2196,7 @@ EvtScript N(80223B74) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Still) EVT_WAIT(3) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_01) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2004) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_FlyFast) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 10, 0) @@ -2257,7 +2257,7 @@ EvtScript N(80223B74) = { EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_SWITCH - EVT_CALL(PlaySound, SOUND_0) + EVT_CALL(PlaySound, SOUND_NONE) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(0) EVT_CASE_OR_EQ(2) @@ -3540,7 +3540,7 @@ EvtScript N(takeTurn_802270BC) = { EVT_CALL(SetPartScale, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.5), EVT_FLOAT(1.5), EVT_FLOAT(1.5)) EVT_END_SWITCH EVT_END_THREAD - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2034) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_THREAD @@ -3630,7 +3630,7 @@ EvtScript N(takeTurn_802270BC) = { EVT_CALL(SetPartScale, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.8), EVT_FLOAT(1.8), EVT_FLOAT(1.8)) EVT_END_SWITCH EVT_END_THREAD - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2034) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_THREAD @@ -4249,7 +4249,7 @@ EvtScript N(copyPartner) = { EVT_GOTO(1) EVT_END_IF EVT_END_THREAD - EVT_CALL(SetActorSounds, LVarA, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, LVarA, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_SWITCH(LVar5) EVT_CASE_EQ(8) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) diff --git a/src/battle/area/nok/actor/kent_c_koopa.c b/src/battle/area/nok/actor/kent_c_koopa.c index 4c68d1850f..84045680c1 100644 --- a/src/battle/area/nok/actor/kent_c_koopa.c +++ b/src/battle/area/nok/actor/kent_c_koopa.c @@ -630,7 +630,7 @@ EvtScript N(EVS_Attack_ShellToss) = { EVT_WAIT(2) 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_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_370) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KentCKoopa_Anim0A) EVT_WAIT(10) diff --git a/src/battle/area/omo2_1/actor/shy_squad.c b/src/battle/area/omo2_1/actor/shy_squad.c index 7f3cebb22f..d7b4b76b0c 100644 --- a/src/battle/area/omo2_1/actor/shy_squad.c +++ b/src/battle/area/omo2_1/actor/shy_squad.c @@ -1355,7 +1355,7 @@ EvtScript N(flee) = { 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_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_WAIT(40) EVT_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_173) diff --git a/src/battle/area/trd_part_2/actor/common_koopa_bros.inc.c b/src/battle/area/trd_part_2/actor/common_koopa_bros.inc.c index f1f0843228..8892511da5 100644 --- a/src/battle/area/trd_part_2/actor/common_koopa_bros.inc.c +++ b/src/battle/area/trd_part_2/actor/common_koopa_bros.inc.c @@ -527,7 +527,7 @@ EvtScript N(HandleCommand) = { EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_WAIT(12) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) EVT_THREAD EVT_SET(LVar0, 0) @@ -606,7 +606,7 @@ EvtScript N(HandleCommand) = { EVT_END_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + 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) EVT_SWITCH(LVar0) @@ -698,7 +698,7 @@ EvtScript N(HandleCommand) = { EVT_CASE_EQ(AVAL_Koopa_State_PosB) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) EVT_END_SWITCH - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, -160, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) @@ -798,7 +798,7 @@ EvtScript N(HandleCommand) = { EVT_END_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + 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)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/area/trd_part_2/actor/fake_bowser.c b/src/battle/area/trd_part_2/actor/fake_bowser.c index bacb240649..60a7c08acf 100644 --- a/src/battle/area/trd_part_2/actor/fake_bowser.c +++ b/src/battle/area/trd_part_2/actor/fake_bowser.c @@ -1639,7 +1639,7 @@ EvtScript N(EVS_KoopaBrosEnter) = { EVT_CALL(SetAnimation, GREEN_ACTOR, 1, ANIM_KoopaBros_Green_Launched) EVT_THREAD EVT_CALL(SetActorJumpGravity, GREEN_ACTOR, EVT_FLOAT(0.4)) - EVT_CALL(SetActorSounds, GREEN_ACTOR, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, GREEN_ACTOR, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetGoalPos, GREEN_ACTOR, -300, 250, 0) EVT_CALL(JumpToGoal, GREEN_ACTOR, 50, FALSE, TRUE, FALSE) EVT_END_THREAD @@ -1649,7 +1649,7 @@ EvtScript N(EVS_KoopaBrosEnter) = { EVT_CALL(SetAnimation, YELLOW_ACTOR, 1, ANIM_KoopaBros_Yellow_Launched) EVT_THREAD EVT_CALL(SetActorJumpGravity, YELLOW_ACTOR, EVT_FLOAT(0.4)) - EVT_CALL(SetActorSounds, YELLOW_ACTOR, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, YELLOW_ACTOR, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetGoalPos, YELLOW_ACTOR, -200, 250, 0) EVT_CALL(JumpToGoal, YELLOW_ACTOR, 50, FALSE, TRUE, FALSE) EVT_END_THREAD @@ -1659,7 +1659,7 @@ EvtScript N(EVS_KoopaBrosEnter) = { EVT_CALL(SetAnimation, BLACK_ACTOR, 1, ANIM_KoopaBros_Black_Launched) EVT_THREAD EVT_CALL(SetActorJumpGravity, BLACK_ACTOR, EVT_FLOAT(0.4)) - EVT_CALL(SetActorSounds, BLACK_ACTOR, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, BLACK_ACTOR, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetGoalPos, BLACK_ACTOR, 0, 250, 0) EVT_CALL(JumpToGoal, BLACK_ACTOR, 50, FALSE, TRUE, FALSE) EVT_END_THREAD @@ -1669,7 +1669,7 @@ EvtScript N(EVS_KoopaBrosEnter) = { EVT_CALL(SetAnimation, RED_ACTOR, 1, ANIM_KoopaBros_Red_Launched) EVT_THREAD EVT_CALL(SetActorJumpGravity, RED_ACTOR, EVT_FLOAT(0.4)) - EVT_CALL(SetActorSounds, RED_ACTOR, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, RED_ACTOR, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetGoalPos, RED_ACTOR, 150, 250, 0) EVT_CALL(JumpToGoal, RED_ACTOR, 50, FALSE, TRUE, FALSE) EVT_END_THREAD @@ -1699,7 +1699,7 @@ EvtScript N(EVS_KoopaBrosEnter) = { EVT_CALL(SetActorPos, GREEN_ACTOR, 20, 250, 0) EVT_CALL(SetGoalPos, GREEN_ACTOR, 20, 0, 0) EVT_CALL(SetActorJumpGravity, GREEN_ACTOR, EVT_FLOAT(1.5)) - EVT_CALL(SetActorSounds, GREEN_ACTOR, ACTOR_SOUND_JUMP, SOUND_0, 0) + 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(ResetActorSounds, GREEN_ACTOR, ACTOR_SOUND_JUMP) @@ -1712,7 +1712,7 @@ EvtScript N(EVS_KoopaBrosEnter) = { EVT_CALL(SetActorPos, YELLOW_ACTOR, 60, 250, -5) EVT_CALL(SetGoalPos, YELLOW_ACTOR, 60, 0, -5) EVT_CALL(SetActorJumpGravity, YELLOW_ACTOR, EVT_FLOAT(1.5)) - EVT_CALL(SetActorSounds, YELLOW_ACTOR, ACTOR_SOUND_JUMP, SOUND_0, 0) + 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(ResetActorSounds, YELLOW_ACTOR, ACTOR_SOUND_JUMP) @@ -1725,7 +1725,7 @@ EvtScript N(EVS_KoopaBrosEnter) = { EVT_CALL(SetActorPos, BLACK_ACTOR, 100, 250, -10) EVT_CALL(SetGoalPos, BLACK_ACTOR, 100, 0, -10) EVT_CALL(SetActorJumpGravity, BLACK_ACTOR, EVT_FLOAT(1.5)) - EVT_CALL(SetActorSounds, BLACK_ACTOR, ACTOR_SOUND_JUMP, SOUND_0, 0) + 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(ResetActorSounds, BLACK_ACTOR, ACTOR_SOUND_JUMP) @@ -1738,7 +1738,7 @@ EvtScript N(EVS_KoopaBrosEnter) = { EVT_CALL(SetActorPos, RED_ACTOR, 140, 250, -15) EVT_CALL(SetGoalPos, RED_ACTOR, 140, 0, -15) EVT_CALL(SetActorJumpGravity, RED_ACTOR, EVT_FLOAT(1.5)) - EVT_CALL(SetActorSounds, RED_ACTOR, ACTOR_SOUND_JUMP, SOUND_0, 0) + 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(ResetActorSounds, RED_ACTOR, ACTOR_SOUND_JUMP) diff --git a/src/battle/common/actor/bandit.inc.c b/src/battle/common/actor/bandit.inc.c index 483e6eb985..14d605a354 100644 --- a/src/battle/common/actor/bandit.inc.c +++ b/src/battle/common/actor/bandit.inc.c @@ -232,7 +232,7 @@ EvtScript N(EVS_DropCoin) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_ADD(LVar2, 30) EVT_CALL(SetActorPos, LVarA, LVar1, LVar2, LVar3) - EVT_CALL(SetActorSounds, LVarA, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, LVarA, ACTOR_SOUND_JUMP, SOUND_NONE, 0) 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) @@ -541,7 +541,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 35, 0, 0) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20C2) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) diff --git a/src/battle/common/actor/bony_beetle.inc.c b/src/battle/common/actor/bony_beetle.inc.c index 45f2709556..94d585bd06 100644 --- a/src/battle/common/actor/bony_beetle.inc.c +++ b/src/battle/common/actor/bony_beetle.inc.c @@ -442,7 +442,7 @@ EvtScript N(attackShellToss) = { EVT_WAIT(15) EVT_LABEL(100) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -691,7 +691,7 @@ EvtScript N(attackSpikeBounce) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 5, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -879,7 +879,7 @@ EvtScript N(8021B7C8) = { EVT_SET(LVar1, 0) EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_301) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + 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) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) diff --git a/src/battle/common/actor/bullet_bill.inc.c b/src/battle/common/actor/bullet_bill.inc.c index 3c970745ee..0c530e83b8 100644 --- a/src/battle/common/actor/bullet_bill.inc.c +++ b/src/battle/common/actor/bullet_bill.inc.c @@ -129,7 +129,7 @@ EvtScript N(EVS_Init) = { EVT_CALL(SetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_CALL(CopyStatusEffects, LVar0, ACTOR_SELF) EVT_CALL(CopyBuffs, LVar0, ACTOR_SELF) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(GetActorPos, LVar0, LVar1, LVarB, LVarC) EVT_SUB(LVar1, 90) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.01)) diff --git a/src/battle/common/actor/buzzy_beetle.inc.c b/src/battle/common/actor/buzzy_beetle.inc.c index 5027bd62a2..3c1a326f27 100644 --- a/src/battle/common/actor/buzzy_beetle.inc.c +++ b/src/battle/common/actor/buzzy_beetle.inc.c @@ -738,7 +738,7 @@ EvtScript N(takeTurn) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BuzzyBeetle_Anim05) EVT_WAIT(20) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 2, BS_FLAGS1_10) EVT_SWITCH(LVar0) diff --git a/src/battle/common/actor/cleft.inc.c b/src/battle/common/actor/cleft.inc.c index 66d4ea3692..67bf4b1271 100644 --- a/src/battle/common/actor/cleft.inc.c +++ b/src/battle/common/actor/cleft.inc.c @@ -460,7 +460,7 @@ EvtScript N(80219BA0) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Cleft_Anim00) EVT_WAIT(8) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D1) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 2, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) diff --git a/src/battle/common/actor/dark_koopa.inc.c b/src/battle/common/actor/dark_koopa.inc.c index a8c3308801..0104bfe498 100644 --- a/src/battle/common/actor/dark_koopa.inc.c +++ b/src/battle/common/actor/dark_koopa.inc.c @@ -599,7 +599,7 @@ EvtScript N(attackShellToss) = { EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, 3, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -810,7 +810,7 @@ EvtScript N(standUp) = { EVT_WAIT(20) 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_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_ToppleStruggle) diff --git a/src/battle/common/actor/dark_paratroopa.inc.c b/src/battle/common/actor/dark_paratroopa.inc.c index 9f34ce40a2..a7ab4b52ad 100644 --- a/src/battle/common/actor/dark_paratroopa.inc.c +++ b/src/battle/common/actor/dark_paratroopa.inc.c @@ -449,7 +449,7 @@ EvtScript N(takeTurn) = { EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_ParaTroopa_Dark_Windup) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -458,7 +458,7 @@ EvtScript N(takeTurn) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR) EVT_WAIT(6) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 25) EVT_SET(LVar1, 0) @@ -518,7 +518,7 @@ EvtScript N(takeTurn) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_ParaTroopa_Dark_Windup) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -527,7 +527,7 @@ EvtScript N(takeTurn) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR) EVT_WAIT(6) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_ParaTroopa_Dark_ShellDive) @@ -1151,7 +1151,7 @@ EvtScript N(koopa_attackShellToss) = { EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, 3, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -1362,7 +1362,7 @@ EvtScript N(koopa_standUp) = { EVT_WAIT(20) 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_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_ToppleStruggle) diff --git a/src/battle/common/actor/duplighost.inc.c b/src/battle/common/actor/duplighost.inc.c index 6fd2e6ec00..413c4969ef 100644 --- a/src/battle/common/actor/duplighost.inc.c +++ b/src/battle/common/actor/duplighost.inc.c @@ -694,7 +694,7 @@ EvtScript N(copyPartner) = { EVT_GOTO(1) EVT_END_IF EVT_END_THREAD - EVT_CALL(SetActorSounds, LVarA, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, LVarA, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_SWITCH(LVar5) EVT_CASE_EQ(8) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) diff --git a/src/battle/common/actor/duplighost/ghost_bombette.inc.c b/src/battle/common/actor/duplighost/ghost_bombette.inc.c index 1e768cad7c..81a66379e7 100644 --- a/src/battle/common/actor/duplighost/ghost_bombette.inc.c +++ b/src/battle/common/actor/duplighost/ghost_bombette.inc.c @@ -257,7 +257,7 @@ EvtScript N(bombette_takeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBombette_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBombette_Brace) EVT_WAIT(15) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2020) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) diff --git a/src/battle/common/actor/duplighost/ghost_bow.inc.c b/src/battle/common/actor/duplighost/ghost_bow.inc.c index 5376d31701..15e8145b03 100644 --- a/src/battle/common/actor/duplighost/ghost_bow.inc.c +++ b/src/battle/common/actor/duplighost/ghost_bow.inc.c @@ -230,7 +230,7 @@ EvtScript N(bow_takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOO_APPEAR) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOO_APPEAR_A) EVT_THREAD EVT_SET(LVar0, 200) EVT_LOOP(20) @@ -259,7 +259,7 @@ EvtScript N(bow_takeTurn) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOO_VANISH) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOO_VANISH_A) EVT_SET(LVar0, 55) EVT_LOOP(20) EVT_ADD(LVar0, 10) @@ -297,7 +297,7 @@ EvtScript N(bow_takeTurn) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBow_Idle) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOO_APPEAR) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOO_APPEAR_A) EVT_THREAD EVT_SET(LVar0, 200) EVT_LOOP(20) @@ -312,7 +312,7 @@ EvtScript N(bow_takeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBow_Run) EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBow_Idle) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOO_VANISH) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOO_VANISH_A) EVT_CALL(YieldTurn) EVT_SET(LVar0, 55) EVT_LOOP(20) @@ -389,7 +389,7 @@ EvtScript N(bow_takeTurn) = { EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOO_APPEAR) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOO_APPEAR_A) EVT_THREAD EVT_SET(LVar0, 200) EVT_LOOP(20) @@ -404,7 +404,7 @@ EvtScript N(bow_takeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBow_Run) EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBow_Idle) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOO_VANISH) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOO_VANISH_A) EVT_CALL(YieldTurn) EVT_SET(LVar0, 55) EVT_LOOP(20) diff --git a/src/battle/common/actor/duplighost/ghost_goombario.inc.c b/src/battle/common/actor/duplighost/ghost_goombario.inc.c index 9f5e076533..4899ef0bc7 100644 --- a/src/battle/common/actor/duplighost/ghost_goombario.inc.c +++ b/src/battle/common/actor/duplighost/ghost_goombario.inc.c @@ -354,7 +354,7 @@ EvtScript N(EVS_Move_Headbonk) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 5) EVT_CALL(SetJumpAnimations, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_200D) EVT_CALL(N(UnkFunc62), LVarA, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) diff --git a/src/battle/common/actor/duplighost/ghost_kooper.inc.c b/src/battle/common/actor/duplighost/ghost_kooper.inc.c index afcff4b9ad..728f9702c9 100644 --- a/src/battle/common/actor/duplighost/ghost_kooper.inc.c +++ b/src/battle/common/actor/duplighost/ghost_kooper.inc.c @@ -381,7 +381,7 @@ EvtScript N(kooper_takeTurn) = { EVT_RETURN EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleKooper_EnterShell) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_NONE) EVT_WAIT(15) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleKooper_ShellSpinSlowest) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_200C) @@ -430,7 +430,7 @@ EvtScript N(kooper_takeTurn) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_200A) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 15) EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_ZERO, 0, ACTOR_DECORATION_GREY_SMOKE_TRAIL) diff --git a/src/battle/common/actor/duplighost/ghost_parakarry.inc.c b/src/battle/common/actor/duplighost/ghost_parakarry.inc.c index 36e6b56007..79bcc87832 100644 --- a/src/battle/common/actor/duplighost/ghost_parakarry.inc.c +++ b/src/battle/common/actor/duplighost/ghost_parakarry.inc.c @@ -247,7 +247,7 @@ EvtScript N(parakarry_doTakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Still) EVT_WAIT(3) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_01) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2004) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_FlyFast) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 10, 0) @@ -308,7 +308,7 @@ EvtScript N(parakarry_doTakeTurn) = { EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_SWITCH - EVT_CALL(PlaySound, SOUND_0) + EVT_CALL(PlaySound, SOUND_NONE) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) diff --git a/src/battle/common/actor/duplighost/ghost_sushie.inc.c b/src/battle/common/actor/duplighost/ghost_sushie.inc.c index 10886969dc..9b46c69116 100644 --- a/src/battle/common/actor/duplighost/ghost_sushie.inc.c +++ b/src/battle/common/actor/duplighost/ghost_sushie.inc.c @@ -295,7 +295,7 @@ EvtScript N(sushie_takeTurn) = { EVT_CALL(SetPartScale, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.5), EVT_FLOAT(1.5), EVT_FLOAT(1.5)) EVT_END_SWITCH EVT_END_THREAD - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2034) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_THREAD @@ -385,7 +385,7 @@ EvtScript N(sushie_takeTurn) = { EVT_CALL(SetPartScale, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.8), EVT_FLOAT(1.8), EVT_FLOAT(1.8)) EVT_END_SWITCH EVT_END_THREAD - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2034) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_THREAD diff --git a/src/battle/common/actor/ember.inc.c b/src/battle/common/actor/ember.inc.c index 0a4f5f2f80..dba29c6b49 100644 --- a/src/battle/common/actor/ember.inc.c +++ b/src/battle/common/actor/ember.inc.c @@ -673,7 +673,7 @@ EvtScript N(8021CBC8) = { EVT_CASE_OR_EQ(5) EVT_SET(LVarA, LVar0) EVT_WAIT(10) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2CF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) @@ -707,7 +707,7 @@ EvtScript N(8021CBC8) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_WAIT(5) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2CF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) diff --git a/src/battle/common/actor/groove_guy.inc.c b/src/battle/common/actor/groove_guy.inc.c index 83d7f7beaf..d4383b378e 100644 --- a/src/battle/common/actor/groove_guy.inc.c +++ b/src/battle/common/actor/groove_guy.inc.c @@ -754,7 +754,7 @@ EvtScript N(80226DEC) = { EVT_END_LOOP EVT_CALL(SetActorYaw, LVarB, 0) EVT_END_THREAD - EVT_CALL(SetActorSounds, LVarB, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, LVarB, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_THREAD EVT_LOOP(2) EVT_CALL(PlaySoundAtActor, LVarB, SOUND_2E2) @@ -800,7 +800,7 @@ EvtScript N(802271A0) = { EVT_SET(LVar1, LVar4) EVT_SET(LVar2, LVar5) EVT_CALL(SetActorPos, LVarB, LVar0, LVar1, LVar2) - EVT_CALL(SetActorSounds, LVarB, ACTOR_SOUND_WALK, SOUND_380, SOUND_0) + EVT_CALL(SetActorSounds, LVarB, ACTOR_SOUND_WALK, SOUND_380, SOUND_NONE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetActorSpeed, LVarB, EVT_FLOAT(4.0)) diff --git a/src/battle/common/actor/hurt_plant.inc.c b/src/battle/common/actor/hurt_plant.inc.c index c402b41104..2f7edf86ea 100644 --- a/src/battle/common/actor/hurt_plant.inc.c +++ b/src/battle/common/actor/hurt_plant.inc.c @@ -293,7 +293,7 @@ EvtScript N(takeTurn_8021E33C) = { EVT_ADD(LVar0, 27) EVT_SET(LVar1, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_LABEL(123) diff --git a/src/battle/common/actor/hyper_cleft.inc.c b/src/battle/common/actor/hyper_cleft.inc.c index 7a921d2392..9bdcd11439 100644 --- a/src/battle/common/actor/hyper_cleft.inc.c +++ b/src/battle/common/actor/hyper_cleft.inc.c @@ -183,7 +183,7 @@ EvtScript N(80220DC0) = { EVT_END_LOOP EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2DA) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -750,7 +750,7 @@ EvtScript N(80223310) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Cleft_Hyper_Anim00) EVT_WAIT(8) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D1) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) diff --git a/src/battle/common/actor/hyper_paragoomba.inc.c b/src/battle/common/actor/hyper_paragoomba.inc.c index 9abbfda65e..a5bdc6f62f 100644 --- a/src/battle/common/actor/hyper_paragoomba.inc.c +++ b/src/battle/common/actor/hyper_paragoomba.inc.c @@ -244,7 +244,7 @@ EvtScript N(8021B678) = { EVT_END_LOOP EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -252,7 +252,7 @@ EvtScript N(8021B678) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -678,7 +678,7 @@ EvtScript N(takeTurn_8021D1DC) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_Paragoomba_Hyper_Dive) @@ -686,7 +686,7 @@ EvtScript N(takeTurn_8021D1DC) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_SUB(LVar0, 80) EVT_SET(LVar1, 20) @@ -728,7 +728,7 @@ EvtScript N(takeTurn_8021D1DC) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_Paragoomba_Hyper_Dive) @@ -736,7 +736,7 @@ EvtScript N(takeTurn_8021D1DC) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_Paragoomba_Hyper_Dive) diff --git a/src/battle/common/actor/koopa_troopa.inc.c b/src/battle/common/actor/koopa_troopa.inc.c index ebf8f8ea2e..d448934801 100644 --- a/src/battle/common/actor/koopa_troopa.inc.c +++ b/src/battle/common/actor/koopa_troopa.inc.c @@ -473,7 +473,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(20) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_ToppleStruggle) EVT_SET(LVar0, 0) @@ -526,7 +526,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) diff --git a/src/battle/common/actor/koopatrol.inc.c b/src/battle/common/actor/koopatrol.inc.c index 3aa535ce05..4dc0cc2d66 100644 --- a/src/battle/common/actor/koopatrol.inc.c +++ b/src/battle/common/actor/koopatrol.inc.c @@ -657,7 +657,7 @@ EvtScript N(attackShellToss) = { EVT_WAIT(10) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_MAIN, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Koopatrol_Anim0F) EVT_SET(LVar0, 0) @@ -711,7 +711,7 @@ EvtScript N(attackShellToss) = { EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 4, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -859,7 +859,7 @@ EvtScript N(attackShellMissile) = { EVT_END_LOOP EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_37C) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 4, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -1093,7 +1093,7 @@ EvtScript N(summonFriend) = { EVT_CALL(SetActorPos, LVar0, LVar1, LVar2, LVar3) EVT_CALL(SetGoalToIndex, LVar0, LVarA) EVT_CALL(PlaySoundAtActor, LVar0, SOUND_20D3) - EVT_CALL(SetActorSounds, LVar0, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, LVar0, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(SetAnimation, LVar0, 1, ANIM_Koopatrol_Anim06) EVT_CALL(SetActorSpeed, LVar0, EVT_FLOAT(6.0)) EVT_CALL(RunToGoal, LVar0, 0, FALSE) diff --git a/src/battle/common/actor/lava_bubble.inc.c b/src/battle/common/actor/lava_bubble.inc.c index 8ce804a3ea..6b3563f672 100644 --- a/src/battle/common/actor/lava_bubble.inc.c +++ b/src/battle/common/actor/lava_bubble.inc.c @@ -570,7 +570,7 @@ EvtScript N(fireballs_Player) = { EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_WAIT(10) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2CF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) @@ -604,7 +604,7 @@ EvtScript N(fireballs_Player) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_WAIT(5) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2CF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) diff --git a/src/battle/common/actor/medi_guy.inc.c b/src/battle/common/actor/medi_guy.inc.c index 58728aba9d..62cf2cbab4 100644 --- a/src/battle/common/actor/medi_guy.inc.c +++ b/src/battle/common/actor/medi_guy.inc.c @@ -282,7 +282,7 @@ EvtScript N(flyingAttack) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2F9) EVT_THREAD EVT_WAIT(5) @@ -328,7 +328,7 @@ EvtScript N(flyingAttack) = { EVT_SET(LVarA, LVar0) EVT_SET(LVarB, LVar1) EVT_SET(LVarC, LVar2) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2F9) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -370,7 +370,7 @@ EvtScript N(healOneAlly) = { EVT_CALL(GetActorPos, LVar0, LVar1, LVar2, LVar3) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2F8) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_NONE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_MediGuy_Anim05) EVT_ADD(LVar2, 50) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 1, LVar1, LVar2, LVar3, 10, 0) diff --git a/src/battle/common/actor/paragloomba.inc.c b/src/battle/common/actor/paragloomba.inc.c index d28b0ae588..f83e1c23c3 100644 --- a/src/battle/common/actor/paragloomba.inc.c +++ b/src/battle/common/actor/paragloomba.inc.c @@ -400,7 +400,7 @@ EvtScript N(takeTurn) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_Paragoomba_Dark_Dive) @@ -408,7 +408,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_SUB(LVar0, 80) EVT_SET(LVar1, 20) @@ -450,7 +450,7 @@ EvtScript N(takeTurn) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_Paragoomba_Dark_Dive) @@ -458,7 +458,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_Paragoomba_Dark_Dive) diff --git a/src/battle/common/actor/paragoomba.inc.c b/src/battle/common/actor/paragoomba.inc.c index eabb94f7cf..9f55ee8d3a 100644 --- a/src/battle/common/actor/paragoomba.inc.c +++ b/src/battle/common/actor/paragoomba.inc.c @@ -402,7 +402,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_Paragoomba_Dive) @@ -410,7 +410,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_SUB(LVar0, 80) EVT_SET(LVar1, 20) @@ -452,7 +452,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_Paragoomba_Dive) @@ -460,7 +460,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_Paragoomba_Dive) diff --git a/src/battle/common/actor/paratroopa.inc.c b/src/battle/common/actor/paratroopa.inc.c index f1aabb435e..56a3ab27d8 100644 --- a/src/battle/common/actor/paratroopa.inc.c +++ b/src/battle/common/actor/paratroopa.inc.c @@ -460,7 +460,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_ParaTroopa_Windup) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -469,7 +469,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR) EVT_WAIT(6) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 25) EVT_SET(LVar1, 0) @@ -529,7 +529,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_ParaTroopa_Windup) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -538,7 +538,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR) EVT_WAIT(6) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_UNUSED_2C1) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_ParaTroopa_ShellDive) @@ -1030,7 +1030,7 @@ EvtScript N(EVS_Downed_TakeTurn) = { EVT_WAIT(20) EVT_CALL(SetAnimationRate, ACTOR_SELF, PRT_DOWNED, EVT_FLOAT(1.0)) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_DOWNED, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_DOWNED, ANIM_KoopaTroopa_ToppleStruggle) EVT_SET(LVar0, 0) @@ -1083,7 +1083,7 @@ EvtScript N(EVS_Downed_TakeTurn) = { EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) diff --git a/src/battle/common/actor/piranha_plant.inc.c b/src/battle/common/actor/piranha_plant.inc.c index fc9ee768f9..5df9634a83 100644 --- a/src/battle/common/actor/piranha_plant.inc.c +++ b/src/battle/common/actor/piranha_plant.inc.c @@ -302,7 +302,7 @@ EvtScript N(takeTurn_8021DCD4) = { EVT_END_IF EVT_SET(LVar1, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_0, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, FALSE, FALSE) EVT_LABEL(123) diff --git a/src/battle/common/actor/spear_guy.inc.c b/src/battle/common/actor/spear_guy.inc.c index 5cc770c229..5f4047bc8a 100644 --- a/src/battle/common/actor/spear_guy.inc.c +++ b/src/battle/common/actor/spear_guy.inc.c @@ -688,7 +688,7 @@ EvtScript N(summonBackup) = { EVT_CALL(GetGoalPos, LVarB, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 220) EVT_CALL(SetActorPos, LVarB, LVar0, 0, 0) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2FA) EVT_WAIT(15) diff --git a/src/battle/common/actor/spike_top.inc.c b/src/battle/common/actor/spike_top.inc.c index 5f93640e20..0a58619a28 100644 --- a/src/battle/common/actor/spike_top.inc.c +++ b/src/battle/common/actor/spike_top.inc.c @@ -745,7 +745,7 @@ EvtScript N(spikeTop_TakeTurn_Floor) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikeTop_Anim0A) EVT_WAIT(20) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_10) EVT_SWITCH(LVar0) diff --git a/src/battle/common/actor/spiny.inc.c b/src/battle/common/actor/spiny.inc.c index 855ed35e5d..f6695e41f2 100644 --- a/src/battle/common/actor/spiny.inc.c +++ b/src/battle/common/actor/spiny.inc.c @@ -426,7 +426,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_Lakitu_Anim0C) EVT_WAIT(10) EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_2, SOUND_2C7) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_2, ACTOR_SOUND_WALK, 0, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 4, BS_FLAGS1_10) EVT_SWITCH(LVarA) diff --git a/src/battle/move/jump/attack.c b/src/battle/move/jump/attack.c index 4f54dece51..c325443dbc 100644 --- a/src/battle/move/jump/attack.c +++ b/src/battle/move/jump/attack.c @@ -75,10 +75,10 @@ EvtScript N(EVS_UseMove0_ImplA) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -107,7 +107,7 @@ EvtScript N(EVS_UseMove0_ImplA) = { EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -126,10 +126,10 @@ EvtScript N(EVS_UseMove0_ImplB) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -162,7 +162,7 @@ EvtScript N(EVS_UseMove0_ImplB) = { EVT_CALL(func_802752AC, 3, 5) EVT_CALL(EnablePlayerBlur, BLUR_RESET) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -181,10 +181,10 @@ EvtScript N(EVS_UseMove0_ImplC) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -215,7 +215,7 @@ EvtScript N(EVS_UseMove0_ImplC) = { EVT_CALL(func_80275F00, 25, 4) EVT_CALL(EnablePlayerBlur, BLUR_RESET) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -264,7 +264,7 @@ EvtScript N(EVS_UseMove1_ImplA) = { EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) EVT_CALL(func_80274A18, LVarA, 0) EVT_CALL(N(GetJumpDamage)) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVarF, 48) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -287,7 +287,7 @@ EvtScript N(EVS_UseMove1_ImplB) = { EVT_CALL(func_802752AC, 3, 1) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_34) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 4, 48) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -308,7 +308,7 @@ EvtScript N(EVS_UseMove1_ImplC) = { EVT_CALL(func_80275F00, LVarA, 0) EVT_SET(LVarA, 4) EVT_CALL(func_80275F00, LVarA, 1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, 48) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -345,10 +345,10 @@ EvtScript N(EVS_UseMove2_ImplA) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -377,7 +377,7 @@ EvtScript N(EVS_UseMove2_ImplA) = { EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -396,10 +396,10 @@ EvtScript N(EVS_UseMove2_ImplB) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -432,7 +432,7 @@ EvtScript N(EVS_UseMove2_ImplB) = { EVT_CALL(func_802752AC, 3, 5) EVT_CALL(EnablePlayerBlur, BLUR_RESET) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -453,10 +453,10 @@ EvtScript N(EVS_UseMove2_ImplC) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -487,7 +487,7 @@ EvtScript N(EVS_UseMove2_ImplC) = { EVT_CALL(func_80275F00, 25, 4) EVT_CALL(EnablePlayerBlur, BLUR_RESET) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -529,10 +529,10 @@ EvtScript N(EVS_802A4018) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -561,7 +561,7 @@ EvtScript N(EVS_802A4018) = { EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) diff --git a/src/battle/move/jump/auto_jump.c b/src/battle/move/jump/auto_jump.c index 93777210e8..9a651d06a5 100644 --- a/src/battle/move/jump/auto_jump.c +++ b/src/battle/move/jump/auto_jump.c @@ -50,10 +50,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -82,7 +82,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -101,10 +101,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -137,7 +137,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(func_802752AC, 3, 5) EVT_CALL(EnablePlayerBlur, BLUR_ENABLE) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -156,10 +156,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -190,7 +190,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(func_80275F00, 25, 4) EVT_CALL(EnablePlayerBlur, BLUR_ENABLE) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) diff --git a/src/battle/move/jump/auto_multibounce.c b/src/battle/move/jump/auto_multibounce.c index 411edab365..5e55a3e143 100644 --- a/src/battle/move/jump/auto_multibounce.c +++ b/src/battle/move/jump/auto_multibounce.c @@ -44,14 +44,14 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 112) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 112) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 48) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) @@ -111,18 +111,18 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 112) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 240) EVT_END_IF EVT_CASE_DEFAULT EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 48) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 240) EVT_END_IF EVT_END_SWITCH @@ -186,14 +186,14 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 112) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 112) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 48) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) @@ -258,18 +258,18 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 112) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 240) EVT_END_IF EVT_CASE_DEFAULT EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 48) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 240) EVT_END_IF EVT_END_SWITCH @@ -333,14 +333,14 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 112) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 112) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 48) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) @@ -398,18 +398,18 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 112) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 240) EVT_END_IF EVT_CASE_DEFAULT EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 48) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 240) EVT_END_IF EVT_END_SWITCH diff --git a/src/battle/move/jump/d_down_jump.c b/src/battle/move/jump/d_down_jump.c index 58df5dd3d8..2aa0288f74 100644 --- a/src/battle/move/jump/d_down_jump.c +++ b/src/battle/move/jump/d_down_jump.c @@ -58,11 +58,11 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15A) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 1, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 1, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -94,7 +94,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(N(func_802A10E4_781A04), LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210A) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 1, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -116,10 +116,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 2, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 2, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -155,7 +155,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(N(func_802A10E4_781A04), LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210B) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 2, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -177,10 +177,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 3, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 3, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -214,7 +214,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(N(func_802A10E4_781A04), LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_210C) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 3, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) diff --git a/src/battle/move/jump/demo_power_bounce.c b/src/battle/move/jump/demo_power_bounce.c index f454db09e0..d8c525aec9 100644 --- a/src/battle/move/jump/demo_power_bounce.c +++ b/src/battle/move/jump/demo_power_bounce.c @@ -80,10 +80,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -153,14 +153,14 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 64) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 224) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 32) EVT_END_SWITCH EVT_SWITCH(LVarF) @@ -216,10 +216,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -289,14 +289,14 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 64) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 224) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 32) EVT_END_SWITCH EVT_SWITCH(LVarF) @@ -352,10 +352,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -421,14 +421,14 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 64) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 224) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 32) EVT_END_SWITCH EVT_SWITCH(LVarF) diff --git a/src/battle/move/jump/dizzy_stomp.c b/src/battle/move/jump/dizzy_stomp.c index fb830fad8c..1f9e6c7324 100644 --- a/src/battle/move/jump/dizzy_stomp.c +++ b/src/battle/move/jump/dizzy_stomp.c @@ -37,10 +37,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 75), 1, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 75), 1, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -69,7 +69,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 100), 1, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -88,10 +88,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 75), 2, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 75), 2, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -124,7 +124,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(func_802752AC, 3, 5) EVT_CALL(EnablePlayerBlur, BLUR_ENABLE) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 100), 2, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -143,10 +143,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 75), 3, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 75), 3, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -177,7 +177,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(func_80275F00, 25, 4) EVT_CALL(EnablePlayerBlur, BLUR_ENABLE) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 100), 3, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) diff --git a/src/battle/move/jump/earthquake_jump.c b/src/battle/move/jump/earthquake_jump.c index c5676eb631..1867bb2e2d 100644 --- a/src/battle/move/jump/earthquake_jump.c +++ b/src/battle/move/jump/earthquake_jump.c @@ -99,10 +99,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_END_IF EVT_SWITCH(LVarB) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 48) EVT_END_SWITCH EVT_LABEL(2) @@ -203,14 +203,14 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVarB) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 64) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 224) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 32) EVT_END_SWITCH EVT_SWITCH(LVarF) @@ -319,10 +319,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_END_IF EVT_SWITCH(LVarB) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 48) EVT_END_SWITCH EVT_LABEL(2) @@ -429,14 +429,14 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVarB) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 64) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 224) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 32) EVT_END_SWITCH EVT_SWITCH(LVarF) @@ -545,10 +545,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_END_IF EVT_SWITCH(LVarB) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 48) EVT_END_SWITCH EVT_LABEL(2) @@ -651,14 +651,14 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVarB) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 64) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 224) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 32) EVT_END_SWITCH EVT_SWITCH(LVarF) diff --git a/src/battle/move/jump/mega_jump.c b/src/battle/move/jump/mega_jump.c index d85865cc8d..b6da44599e 100644 --- a/src/battle/move/jump/mega_jump.c +++ b/src/battle/move/jump/mega_jump.c @@ -57,10 +57,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, 112) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 5, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -85,10 +85,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 8, 112) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -113,10 +113,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 10, 112) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 7, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) diff --git a/src/battle/move/jump/multibounce.c b/src/battle/move/jump/multibounce.c index 55216873ba..421c0744bf 100644 --- a/src/battle/move/jump/multibounce.c +++ b/src/battle/move/jump/multibounce.c @@ -57,14 +57,14 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 112) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 112) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 48) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) @@ -124,18 +124,18 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 112) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 240) EVT_END_IF EVT_CASE_DEFAULT EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 48) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 240) EVT_END_IF EVT_END_SWITCH @@ -208,14 +208,14 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 112) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 112) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 48) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) @@ -280,18 +280,18 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 112) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 240) EVT_END_IF EVT_CASE_DEFAULT EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 48) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 240) EVT_END_IF EVT_END_SWITCH @@ -364,14 +364,14 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 112) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 112) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 48) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_235) @@ -429,18 +429,18 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 112) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 240) EVT_END_IF EVT_CASE_DEFAULT EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 48) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 240) EVT_END_IF EVT_END_SWITCH diff --git a/src/battle/move/jump/power_bounce.c b/src/battle/move/jump/power_bounce.c index 110dc7db1e..cbbe201431 100644 --- a/src/battle/move/jump/power_bounce.c +++ b/src/battle/move/jump/power_bounce.c @@ -99,10 +99,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -173,14 +173,14 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 64) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 224) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 32) EVT_END_SWITCH EVT_SWITCH(LVarF) @@ -241,10 +241,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -315,14 +315,14 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 64) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 224) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 32) EVT_END_SWITCH EVT_SWITCH(LVarF) @@ -383,10 +383,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -453,14 +453,14 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 64) EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 224) EVT_END_IF EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, 32) EVT_END_SWITCH EVT_SWITCH(LVarF) diff --git a/src/battle/move/jump/power_jump.c b/src/battle/move/jump/power_jump.c index 34d6abf72c..4533139722 100644 --- a/src/battle/move/jump/power_jump.c +++ b/src/battle/move/jump/power_jump.c @@ -51,10 +51,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 4, 112) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -79,10 +79,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, 112) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 4, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -107,10 +107,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 8, 112) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 5, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) diff --git a/src/battle/move/jump/shrink_stomp.c b/src/battle/move/jump/shrink_stomp.c index 42566805f0..e721e5de61 100644 --- a/src/battle/move/jump/shrink_stomp.c +++ b/src/battle/move/jump/shrink_stomp.c @@ -37,10 +37,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 75), 1, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 75), 1, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) diff --git a/src/battle/move/jump/sleep_stomp.c b/src/battle/move/jump/sleep_stomp.c index 769b3b87f9..46f42e17ec 100644 --- a/src/battle/move/jump/sleep_stomp.c +++ b/src/battle/move/jump/sleep_stomp.c @@ -37,10 +37,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 75), 1, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 75), 1, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -69,7 +69,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 100), 1, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -88,10 +88,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 75), 2, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 75), 2, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -124,7 +124,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(func_802752AC, 3, 5) EVT_CALL(EnablePlayerBlur, BLUR_ENABLE) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 100), 2, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) @@ -143,10 +143,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 75), 3, 80) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 75), 3, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -177,7 +177,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(func_80275F00, 25, 4) EVT_CALL(EnablePlayerBlur, BLUR_ENABLE) EVT_WAIT(1) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 100), 3, 224) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) diff --git a/src/battle/move/jump/super_jump.c b/src/battle/move/jump/super_jump.c index 061281e105..7d5712e1d5 100644 --- a/src/battle/move/jump/super_jump.c +++ b/src/battle/move/jump/super_jump.c @@ -53,10 +53,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 5, 112) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 4, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -81,10 +81,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 7, 112) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15B, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 5, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -108,10 +108,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(DidActionSucceed, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 9, 112) EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15C, SOUND_NONE) EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, 48) EVT_END_SWITCH EVT_SWITCH(LVar0) diff --git a/src/battle/partner/bombette.c b/src/battle/partner/bombette.c index 651ec31002..48fbbadca2 100644 --- a/src/battle/partner/bombette.c +++ b/src/battle/partner/bombette.c @@ -938,7 +938,7 @@ EvtScript N(bodySlam) = { EVT_CALL(AddGoalPos, ACTOR_PARTNER, -10, 0, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBombette_BodySlam) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(6.0)) - EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBombette_Idle) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_51) diff --git a/src/battle/partner/bow.c b/src/battle/partner/bow.c index 49da1b2534..b117d10fe1 100644 --- a/src/battle/partner/bow.c +++ b/src/battle/partner/bow.c @@ -400,7 +400,7 @@ EvtScript N(executeAction) = { EvtScript N(returnHome2) = { EVT_CALL(PartnerYieldTurn) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_04) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_VANISH) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_VANISH_A) EVT_THREAD EVT_SET(LVar0, 200) EVT_LOOP(20) @@ -414,7 +414,7 @@ EvtScript N(returnHome2) = { EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Run) EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Idle) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_APPEAR) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_APPEAR_A) EVT_SET(LVar0, 55) EVT_LOOP(20) EVT_ADD(LVar0, 10) @@ -429,7 +429,7 @@ EvtScript N(returnHome2) = { EvtScript N(returnHome) = { EVT_CALL(PartnerYieldTurn) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_51) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_VANISH) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_VANISH_A) EVT_THREAD EVT_SET(LVar0, 200) EVT_LOOP(20) @@ -443,7 +443,7 @@ EvtScript N(returnHome) = { EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Run) EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Idle) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_APPEAR) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_APPEAR_A) EVT_SET(LVar0, 55) EVT_LOOP(20) EVT_ADD(LVar0, 10) @@ -492,7 +492,7 @@ EvtScript N(smack) = { EVT_CALL(action_command_smack_start, 0, LVar0, 3, 0) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_VANISH) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_VANISH_A) EVT_CALL(SetPartAlpha, ACTOR_PARTNER, -1, 55) EVT_CALL(InitTargetIterator) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) @@ -509,7 +509,7 @@ EvtScript N(smack) = { EVT_CALL(SetBattleCamOffsetZ, 9) EVT_CALL(func_8024EDA4) EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_APPEAR) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_APPEAR_A) EVT_SET(LVar0, 55) EVT_LOOP(5) EVT_ADD(LVar0, 40) @@ -1004,7 +1004,7 @@ EvtScript N(fanSmack) = { EVT_CALL(action_command_smack_start, 0, LVar0, 3, 1) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_VANISH) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_VANISH_A) EVT_CALL(SetPartAlpha, ACTOR_PARTNER, -1, 55) EVT_CALL(InitTargetIterator) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) @@ -1020,7 +1020,7 @@ EvtScript N(fanSmack) = { EVT_CALL(SetBattleCamOffsetZ, 9) EVT_CALL(func_8024EDA4) EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_APPEAR) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOO_APPEAR_A) EVT_SET(LVar0, 55) EVT_LOOP(5) EVT_ADD(LVar0, 40) diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c index 935556b103..b8994467fb 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -974,7 +974,7 @@ EvtScript N(headbonk1) = { EVT_ADD(LVar0, 1) EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -1022,7 +1022,7 @@ EvtScript N(headbonk1) = { EVT_CALL(N(StopChargeAndGet)) EVT_ADD(LVar0, 1) EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(returnHome2)) EVT_RETURN @@ -1079,7 +1079,7 @@ EvtScript N(headbonk2) = { EVT_ADD(LVar0, 2) EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -1129,7 +1129,7 @@ EvtScript N(headbonk2) = { EVT_CALL(N(StopChargeAndGet)) EVT_ADD(LVar0, 2) EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(returnHome2)) EVT_RETURN @@ -1186,7 +1186,7 @@ EvtScript N(headbonk3) = { EVT_ADD(LVar0, 3) EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -1245,7 +1245,7 @@ EvtScript N(headbonk3) = { EVT_CALL(N(StopChargeAndGet)) EVT_ADD(LVar0, 3) EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_CALL(func_80269550, LVarF) EVT_EXEC_WAIT(N(returnHome2)) EVT_RETURN @@ -1306,7 +1306,7 @@ EvtScript N(multibonk) = { EVT_ADD(LVar0, 3) EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -1406,7 +1406,7 @@ EvtScript N(multibonk) = { EVT_CALL(PartnerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVar0, LVarD, BS_FLAGS1_SP_EVT_ACTIVE) EVT_SET(LFlag0, FALSE) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_CALL(func_80269550, LVarE) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/partner/kooper.c b/src/battle/partner/kooper.c index 9d098bc86f..1c61bca3cf 100644 --- a/src/battle/partner/kooper.c +++ b/src/battle/partner/kooper.c @@ -548,7 +548,7 @@ EvtScript N(shellToss) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_Idle) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_EnterShell) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_WAIT(15) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest) EVT_LOOP(30) @@ -630,7 +630,7 @@ EvtScript N(shellToss) = { EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_ZERO, 0, ACTOR_DECORATION_GREY_SMOKE_TRAIL) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, LVarA) - EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 2, BS_FLAGS1_10) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) @@ -678,7 +678,7 @@ EvtScript N(shellToss) = { EVT_CASE_DEFAULT EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_EXPLODE_CONTACT | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_SHOCK_CONTACT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_FLAG_80, 0, LVarE, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -717,7 +717,7 @@ EvtScript N(powerShell) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_Idle) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_EnterShell) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_WAIT(15) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest) EVT_LOOP(30) @@ -805,7 +805,7 @@ EvtScript N(powerShell) = { EVT_ADD(LVar0, 260) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, LVarA) - EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_ZERO, 1) @@ -840,7 +840,7 @@ EvtScript N(powerShell) = { EVT_CASE_DEFAULT EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_EXPLODE_CONTACT | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_SHOCK_CONTACT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_FLAG_80, 0, LVarE, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_LABEL(12) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar2) EVT_IF_NE(LVar2, -1) @@ -885,7 +885,7 @@ EvtScript N(dizzyShell) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_Idle) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_EnterShell) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_WAIT(15) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_59) @@ -948,7 +948,7 @@ EvtScript N(dizzyShell) = { EVT_ADD(LVar0, 350) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, LVarA) - EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_ZERO, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_ZERO, 1) @@ -1009,7 +1009,7 @@ EvtScript N(dizzyShell) = { EVT_CALL(PartnerAfflictEnemy, LVar0, DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_EXPLODE_CONTACT | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_SHOCK_CONTACT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_FLAG_80, DMG_STATUS_ALWAYS(STATUS_FLAG_DIZZY, 3), 255, 0, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) EVT_END_IF EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_LABEL(12) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar2) EVT_IF_NE(LVar2, -1) @@ -1057,7 +1057,7 @@ EvtScript N(fireShell) = { EVT_CALL(RunToGoal, ACTOR_PARTNER, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_Idle) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_EnterShell) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_WAIT(15) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_59) @@ -1196,7 +1196,7 @@ EvtScript N(fireShell) = { EVT_ADD(LVar0, 350) EVT_CALL(SetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, LVarA) - EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, PRT_ZERO, 1) EVT_WAIT(20) @@ -1242,7 +1242,7 @@ EvtScript N(fireShell) = { EVT_CASE_DEFAULT EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_FIRE | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_EXPLODE_CONTACT | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_SHOCK_CONTACT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_FLAG_80, 0, LVarF, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_LABEL(12) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, -1) @@ -1287,7 +1287,7 @@ EvtScript N(shellTossOnFirstStrike) = { EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(16.0)) - EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(RunToGoal, ACTOR_PARTNER, 0) EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 2, BS_FLAGS1_10) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) @@ -1341,11 +1341,11 @@ EvtScript N(shellTossOnFirstStrike) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar2) EVT_CASE_EQ(MOVE_SHELL_TOSS1) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_CASE_EQ(MOVE_SHELL_TOSS2) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_CASE_EQ(MOVE_SHELL_TOSS3) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_END_SWITCH EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) diff --git a/src/battle/partner/parakarry.c b/src/battle/partner/parakarry.c index f065361584..ae4692eaaa 100644 --- a/src/battle/partner/parakarry.c +++ b/src/battle/partner/parakarry.c @@ -994,7 +994,7 @@ EvtScript N(skyDive) = { EVT_CASE_DEFAULT EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT, 0, LVarE, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -1072,7 +1072,7 @@ EvtScript N(shellShot) = { EVT_CASE_DEFAULT EVT_SET(LVar0, HIT_RESULT_NO_DAMAGE) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_LABEL(10) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -1271,7 +1271,7 @@ EvtScript N(airRaid) = { EVT_CASE_DEFAULT EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_FLAG_80, 0, LVarF, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_WAIT(5) EVT_LABEL(11) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) diff --git a/src/battle/partner/twink.c b/src/battle/partner/twink.c index 8e0e2297b3..827b892351 100644 --- a/src/battle/partner/twink.c +++ b/src/battle/partner/twink.c @@ -241,7 +241,7 @@ EvtScript N(executeAction) = { EVT_CALL(AddGoalPos, ACTOR_PARTNER, 0, 10, 0) EVT_CALL(FlyToGoal, ACTOR_PARTNER, 5, 0, EASING_LINEAR) EVT_WAIT(2) - EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_FLY, SOUND_0, SOUND_0) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_JUMP_3E2) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_52) EVT_CALL(AddGoalPos, ACTOR_PARTNER, -40, 15, 0) diff --git a/src/entity/SaveBlock.c b/src/entity/SaveBlock.c index 05a22ca418..c878e59001 100644 --- a/src/entity/SaveBlock.c +++ b/src/entity/SaveBlock.c @@ -124,7 +124,7 @@ void entity_SaveBlock_show_choice_message(void) { void entity_SaveBlock_show_result_message(void) { msg_printer_load_msg(MSG_Menus_SaveComplete, SaveBlockResultPrinter); - sfx_play_sound(SOUND_10); + sfx_play_sound(SOUND_SAVE_CONFIRM); } void entity_SaveBlock_wait_for_close_result(Entity* entity) { diff --git a/src/filemenu/filemenu_msg.c b/src/filemenu/filemenu_msg.c index 1895ac375a..d4424f82d3 100644 --- a/src/filemenu/filemenu_msg.c +++ b/src/filemenu/filemenu_msg.c @@ -9,7 +9,7 @@ s32 msg_get_print_char_width(s32 character, s32 charset, s32 variation, f32 msgS extern Addr charset_standard_OFFSET; #endif -extern MessageCharset* gMsgCharsets[5]; +extern MessageCharset* MsgCharsets[5]; extern PAL_BIN D_802F4560[80][8]; extern u8 filemenu_glyphBuffer[20][0x80]; @@ -510,7 +510,7 @@ s32 filemenu_draw_char(s32 c, s32 x, s32 y, s32 flag1, s32 color, s32 flag2) { filemenu_charset_raster_id = 0; } - charset = gMsgCharsets[filemenu_charset]; + charset = MsgCharsets[filemenu_charset]; texSizeX = charset->texSize.x; texSizeY = charset->texSize.y; charRasterSize = charset->charRasterSize; diff --git a/src/msg.c b/src/msg.c index 65911ac375..6013725bb3 100644 --- a/src/msg.c +++ b/src/msg.c @@ -84,7 +84,7 @@ SHIFT_BSS IMG_BIN D_80159B50[0x200]; SHIFT_BSS PAL_BIN D_8015C7E0[0x10]; SHIFT_BSS MessagePrintState gMessagePrinters[3]; -extern s16 D_802EB644[22]; +extern s16 MsgStyleVerticalLineOffsets[]; extern IMG_BIN ui_msg_bubble_left_png[]; extern IMG_BIN ui_msg_bubble_mid_png[]; @@ -111,10 +111,10 @@ extern IMG_BIN ui_msg_star_silhouette_png[]; extern IMG_BIN D_802ED550[]; extern PAL_BIN D_802ED670[]; -extern IMG_BIN D_802ED970[]; -extern IMG_BIN D_802EE8D0[]; -extern MessageCharset* gMsgCharsets[5]; -extern IMG_BIN D_802F39D0[]; +extern IMG_BIN MsgCharImgTitle[]; +extern IMG_BIN MsgCharImgNormal[]; +extern MessageCharset* MsgCharsets[5]; +extern IMG_BIN MsgCharImgSubtitle[]; extern PAL_BIN D_802F4560[80][8]; extern s32 gMessageBoxFrameParts[2][16]; @@ -124,14 +124,14 @@ extern PAL_BIN ui_point_right_pal[]; MessageNumber gMsgNumbers[] = { { - .rasters = &D_802EE8D0[0x800], + .rasters = &MsgCharImgNormal[0x800], .texSize = 128, .texWidth = 16, .texHeight = 16, .digitWidth = {11, 8, 11, 11, 11, 11, 11, 11, 11, 11}, .fixedWidth = 11 }, { - .rasters = &D_802EE8D0[0x800], + .rasters = &MsgCharImgNormal[0x800], .texSize = 128, .texWidth = 16, .texHeight = 16, @@ -274,11 +274,11 @@ void load_font_data(Addr offset, u16 size, void* dest) { void load_font(s32 font) { if (font != D_80155C98) { if (font == 0) { - load_font_data(charset_standard_OFFSET, 0x5100, D_802EE8D0); + load_font_data(charset_standard_OFFSET, 0x5100, MsgCharImgNormal); load_font_data(charset_standard_pal_OFFSET, 0x500, D_802F4560); } else if (font == 1) { - load_font_data(charset_title_OFFSET, 0xF60, D_802ED970); - load_font_data(charset_subtitle_OFFSET, 0xB88, D_802F39D0); + load_font_data(charset_title_OFFSET, 0xF60, MsgCharImgTitle); + load_font_data(charset_subtitle_OFFSET, 0xB88, MsgCharImgSubtitle); load_font_data(charset_credits_pal_OFFSET, 0x80, D_802F4560); } } @@ -655,7 +655,7 @@ void msg_play_speech_sound(MessagePrintState* printer, u8 character) { if (printer->stateFlags & MSG_STATE_FLAG_800000 && !(printer->delayFlags & (MSG_DELAY_FLAG_2 | MSG_DELAY_FLAG_4)) && printer->volume != 0) { volTemp = (f32)printer->volume / 100.0; - pitchShift = ((character % 20) * 10) + (printer->speechVolumePitch - baseShift); + pitchShift = ((character % 20) * 10) + (printer->speechPitchShift - baseShift); volume = ((rand_int(15) + 78) * volTemp); if (volume > 255) { @@ -672,8 +672,8 @@ void msg_play_speech_sound(MessagePrintState* printer, u8 character) { extern s32 gItemIconRasterOffsets[]; extern s32 gItemIconPaletteOffsets[]; -extern s32 D_802EB5C0[]; -extern s32 D_802EB5F0[]; +extern s32 MsgLetterRasterOffsets[]; +extern s32 MsgLetterPaletteOffsets[]; extern MsgVoice MsgVoices[]; #if VERSION_IQUE @@ -746,7 +746,7 @@ void msg_copy_to_print_buffer(MessagePrintState* printer, s32 arg1, s32 arg2) { printer->lineEndPos[printer->curLine] = printer->curLinePos; printer->curLine++; *printBuf++ = MSG_CHAR_PRINT_NEXT; - printer->nextLinePos = printer->curLinePos + (gMsgCharsets[printer->font]->newLineY + D_802EB644[printer->style]) * printer->lineCount; + printer->nextLinePos = printer->curLinePos + (MsgCharsets[printer->font]->newLineY + MsgStyleVerticalLineOffsets[printer->style]) * printer->lineCount; printer->windowState = MSG_WINDOW_STATE_SCROLLING; printer->delayFlags |= MSG_DELAY_FLAG_1; } @@ -771,8 +771,8 @@ void msg_copy_to_print_buffer(MessagePrintState* printer, s32 arg1, s32 arg2) { if (nextArg != MSG_CHAR_UNK_C3) { printer->stateFlags |= MSG_STATE_FLAG_80; } - printer->speechSoundIDA = SOUND_NORMAL_VOICE_A; - printer->speechSoundIDB = SOUND_NORMAL_VOICE_B; + printer->speechSoundIDA = SOUND_MSG_VOICE_1A; + printer->speechSoundIDB = SOUND_MSG_VOICE_1B; printer->windowState = MSG_WINDOW_STATE_OPENING; break; case MSG_STYLE_CHOICE: @@ -835,10 +835,10 @@ void msg_copy_to_print_buffer(MessagePrintState* printer, s32 arg1, s32 arg2) { romAddr = charset_ROM_START + ((s32)charset_postcard_pal_OFFSET + 5); dma_copy(romAddr, romAddr + 0x20, printer->letterBackgroundPal); printer->letterContentImg = heap_malloc(charset_letter_content_1_png_width * charset_letter_content_1_png_height); - romAddr = charset_ROM_START + D_802EB5C0[arg]; + romAddr = charset_ROM_START + MsgLetterRasterOffsets[arg]; dma_copy(romAddr, romAddr + (charset_letter_content_1_png_width * charset_letter_content_1_png_height), printer->letterContentImg); printer->letterContentPal = heap_malloc(0x200); - romAddr = charset_ROM_START + D_802EB5F0[arg]; + romAddr = charset_ROM_START + MsgLetterPaletteOffsets[arg]; dma_copy(romAddr, romAddr + 0x200, printer->letterContentPal); break; case MSG_STYLE_POPUP: @@ -926,7 +926,7 @@ void msg_copy_to_print_buffer(MessagePrintState* printer, s32 arg1, s32 arg2) { printer->curLine++; *printBuf++ = MSG_CHAR_PRINT_NEXT; arg = *srcBuf++; - printer->nextLinePos = printer->curLinePos + (gMsgCharsets[printer->font]->newLineY + D_802EB644[printer->style]) * arg; + printer->nextLinePos = printer->curLinePos + (MsgCharsets[printer->font]->newLineY + MsgStyleVerticalLineOffsets[printer->style]) * arg; printer->windowState = MSG_WINDOW_STATE_SCROLLING; printer->delayFlags |= MSG_DELAY_FLAG_1; printer->lineCount = 0; @@ -1089,7 +1089,7 @@ void msg_copy_to_print_buffer(MessagePrintState* printer, s32 arg1, s32 arg2) { *printBuf++ = *srcBuf++; break; case MSG_READ_FUNC_END_CHOICE: - sfx_play_sound_with_params(SOUND_MENU_START_TUTORIAL, 0, 0, 0); + sfx_play_sound_with_params(SOUND_MENU_SHOW_CHOICE, 0, 0, 0); printer->maxOption = *srcBuf++; printer->madeChoice = 0; printer->curOption = 0; @@ -1243,9 +1243,9 @@ void msg_copy_to_print_buffer(MessagePrintState* printer, s32 arg1, s32 arg2) { case MSG_READ_FUNC_VOICE: arg = *srcBuf++; printer->speechSoundType = arg; - printer->speechSoundIDA = MsgVoices[arg].unk_00; - printer->speechSoundIDB = MsgVoices[arg].unk_04; - printer->speechVolumePitch = MsgVoices[arg].unk_08; + printer->speechSoundIDA = MsgVoices[arg].voiceA; + printer->speechSoundIDB = MsgVoices[arg].voiceB; + printer->speechPitchShift = MsgVoices[arg].pitchShift; break; case MSG_READ_FUNC_VOLUME: printer->volume = *srcBuf++; @@ -1373,7 +1373,7 @@ void initialize_printer(MessagePrintState* printer, s32 arg1, s32 arg2) { printer->fadeOutCounter = 0; printer->windowSize.y = 0; printer->windowSize.x = 0; - printer->speechVolumePitch = 0; + printer->speechPitchShift = 0; printer->speechSoundIDA = 0; printer->speechSoundIDB = 0; printer->varBufferReadPos = 0; @@ -1586,7 +1586,7 @@ s32 msg_get_print_char_width(s32 character, s32 charset, s32 variation, f32 msgS if (overrideCharWidth != 0) { charWidth = overrideCharWidth; } else if (flags != 0) { - u8* charWidthTable = gMsgCharsets[charset]->rasters[variation].charWidthTable; + u8* charWidthTable = MsgCharsets[charset]->rasters[variation].charWidthTable; if (charWidthTable != NULL && character != MSG_CHAR_READ_SPACE @@ -1594,10 +1594,10 @@ s32 msg_get_print_char_width(s32 character, s32 charset, s32 variation, f32 msgS && character != MSG_CHAR_READ_HALF_SPACE) { charWidth = charWidthTable[character]; } else { - charWidth = gMsgCharsets[charset]->rasters[variation].monospaceWidth; + charWidth = MsgCharsets[charset]->rasters[variation].monospaceWidth; } } else { - charWidth = gMsgCharsets[charset]->rasters[variation].monospaceWidth; + charWidth = MsgCharsets[charset]->rasters[variation].monospaceWidth; } if (character == MSG_CHAR_READ_SPACE) { @@ -1629,7 +1629,7 @@ s32 msg_get_draw_char_width(s32 character, s32 charset, s32 variation, f32 msgSc if (overrideCharWidth != 0) { baseWidth = overrideCharWidth; } else if (flags & MSG_PRINT_FLAG_100) { - u8* charWidthTable = gMsgCharsets[charset]->rasters[variation].charWidthTable; + u8* charWidthTable = MsgCharsets[charset]->rasters[variation].charWidthTable; if (charWidthTable != NULL && character != MSG_CHAR_PRINT_SPACE @@ -1637,10 +1637,10 @@ s32 msg_get_draw_char_width(s32 character, s32 charset, s32 variation, f32 msgSc && character != MSG_CHAR_PRINT_HALF_SPACE) { baseWidth = charWidthTable[character]; } else { - baseWidth = gMsgCharsets[charset]->rasters[variation].monospaceWidth; + baseWidth = MsgCharsets[charset]->rasters[variation].monospaceWidth; } } else { - baseWidth = gMsgCharsets[charset]->rasters[variation].monospaceWidth; + baseWidth = MsgCharsets[charset]->rasters[variation].monospaceWidth; } if (character == MSG_CHAR_PRINT_SPACE) { @@ -1943,7 +1943,7 @@ void get_msg_properties(s32 msgID, s32* height, s32* width, s32* maxLineChars, s *width = maxLineWidth; } if (height != NULL) { - *height = lineCount * gMsgCharsets[font]->newLineY; + *height = lineCount * MsgCharsets[font]->newLineY; } if (maxLineChars != NULL) { *maxLineChars = maxCharsPerLine; @@ -2478,8 +2478,8 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit switch (msg_drawState->printBuffer[msg_drawState->drawBufferPos]) { case MSG_CHAR_PRINT_ENDL: msg_drawState->nextPos[0] = 0; - msg_drawState->nextPos[1] += (s32)((msg_drawState->msgScale.y * gMsgCharsets[msg_drawState->font]->newLineY) + - D_802EB644[printer->style]); + msg_drawState->nextPos[1] += (s32)((msg_drawState->msgScale.y * MsgCharsets[msg_drawState->font]->newLineY) + + MsgStyleVerticalLineOffsets[printer->style]); if (msg_drawState->printModeFlags & MSG_PRINT_FLAG_40) { msg_drawState->printModeFlags |= MSG_PRINT_FLAG_80; } @@ -3347,7 +3347,7 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit (u16) posX)); } - msgCharset = gMsgCharsets[msg_drawState->font]; + msgCharset = MsgCharsets[msg_drawState->font]; charPosY = (s8) msgCharset->rasters[msg_drawState->fontVariant].baseHeightOffset + (msg_drawState->nextPos[1] + (msg_drawState->textStartPos[1] + (printer->windowBasePos.y + posY)) - additionalOffsetY); @@ -3357,7 +3357,7 @@ void appendGfx_message(MessagePrintState* printer, s16 posX, s16 posY, u16 addit (msg_drawState->clipX[0] < charPosX + (s32)(msg_drawState->msgScale.x * msgCharset->rasters[msg_drawState->fontVariant].monospaceWidth)) && (msg_drawState->clipY[0] < charPosY + (s32)(msg_drawState->msgScale.y * msgCharset->newLineY + - D_802EB644[printer->style]))) { + MsgStyleVerticalLineOffsets[printer->style]))) { palette = msg_drawState->textColor; phi_s2_5 = sp8E; if (msg_drawState->effectFlags & MSG_FX_FLAG_BLUR) { @@ -3671,7 +3671,7 @@ void msg_reset_gfx_state(void) { INCLUDE_ASM(s32, "msg", msg_draw_char); #else void msg_draw_char(MessagePrintState* printer, MessageDrawState* drawState, s32 charIndex, s32 palette, s32 posX, s32 posY) { - MessageCharset* messageCharset = gMsgCharsets[drawState->font]; + MessageCharset* messageCharset = MsgCharsets[drawState->font]; s32 fontVariant = drawState->fontVariant; s32 clipUly = drawState->clipY[0]; @@ -4236,10 +4236,10 @@ void msg_draw_frame(s32 posX, s32 posY, s32 sizeX, s32 sizeY, s32 style, s32 pal } void msg_get_glyph(s32 font, s32 variation, s32 charIndex, s32 palette, MesasgeFontGlyphData* out) { - out->raster = &gMsgCharsets[font]->rasters[variation].raster[(u16)gMsgCharsets[font]->charRasterSize * charIndex]; + out->raster = &MsgCharsets[font]->rasters[variation].raster[(u16)MsgCharsets[font]->charRasterSize * charIndex]; out->palette = D_802F4560[palette]; - out->texSize.x = gMsgCharsets[font]->texSize.x; - out->texSize.y = gMsgCharsets[font]->texSize.y; + out->texSize.x = MsgCharsets[font]->texSize.x; + out->texSize.y = MsgCharsets[font]->texSize.y; out->charWidth = msg_get_draw_char_width(charIndex, font, variation, 1.0f, 0, 0); out->charHeight = out->texSize.y; } diff --git a/src/msg_data.c b/src/msg_data.c index 554ca10741..0fff5d82ec 100644 --- a/src/msg_data.c +++ b/src/msg_data.c @@ -1,163 +1,359 @@ #include "common.h" +#include "ld_addrs.h" -extern IMG_BIN D_802ED970[]; -extern IMG_BIN D_802F39D0[]; -extern IMG_BIN D_802EE8D0[]; +extern IMG_BIN MsgCharImgTitle[]; +extern IMG_BIN MsgCharImgSubtitle[]; +extern IMG_BIN MsgCharImgNormal[]; -u8 D_802EB3D0[] = { - 11, 8, 8, 10, 9, 9, 9, 4, - 8, 8, 9, 9, 5, 9, 5, 10, - 9, 7, 9, 9, 9, 9, 9, 9, - 9, 9, 5, 5, 8, 9, 8, 9, - 10, 9, 9, 9, 9, 9, 9, 9, - 9, 7, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 7, 9, 6, 7, 9, - 6, 9, 8, 8, 9, 8, 8, 8, - 7, 4, 7, 8, 4, 9, 8, 7, - 9, 8, 8, 8, 8, 8, 8, 9, - 8, 8, 8, 7, 3, 7, 10, 7, - 9, 9, 9, 9, 9, 9, 9, 9, - 9, 7, 7, 7, 8, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 8, 8, 8, 8, 8, - 6, 6, 6, 7, 9, 7, 7, 7, - 8, 8, 8, 8, 8, 6, 9, 7, - 11, 11, 11, 11, 12, 12, 11, 11, - 13, 13, 14, 14, 12, 13, 13, 13, - 13, 16, 9, 9, 5, 5, 0, 0, +u8 MsgCharWidthNormal[] = { + [MSG_CHAR_NOTE] 11, + [MSG_CHAR_EXCLAMTION] 8, + [MSG_CHAR_BACKSLASH] 8, + [MSG_CHAR_HASH] 10, + [MSG_CHAR_DOLLAR] 9, + [MSG_CHAR_PERCENT] 9, + [MSG_CHAR_AND] 9, + [MSG_CHAR_APOSTROPHE] 4, + [MSG_CHAR_LPAREN] 8, + [MSG_CHAR_RPAREN] 8, + [MSG_CHAR_TIMES] 9, + [MSG_CHAR_PLUS] 9, + [MSG_CHAR_COMMA] 5, + [MSG_CHAR_MINUS] 9, + [MSG_CHAR_PERIOD] 5, + [MSG_CHAR_FORWARDSLASH] 10, + [MSG_CHAR_DIGIT_0] 9, + [MSG_CHAR_DIGIT_1] 7, + [MSG_CHAR_DIGIT_2] 9, + [MSG_CHAR_DIGIT_3] 9, + [MSG_CHAR_DIGIT_4] 9, + [MSG_CHAR_DIGIT_5] 9, + [MSG_CHAR_DIGIT_6] 9, + [MSG_CHAR_DIGIT_7] 9, + [MSG_CHAR_DIGIT_8] 9, + [MSG_CHAR_DIGIT_9] 9, + [MSG_CHAR_COLON] 5, + [MSG_CHAR_SEMICOLON] 5, + [MSG_CHAR_LESS_THAN] 8, + [MSG_CHAR_EQUAL] 9, + [MSG_CHAR_GREATER_THAN] 8, + [MSG_CHAR_QUESTION] 9, + [MSG_CHAR_AT] 10, + [MSG_CHAR_UPPER_A] 9, + [MSG_CHAR_UPPER_B] 9, + [MSG_CHAR_UPPER_C] 9, + [MSG_CHAR_UPPER_D] 9, + [MSG_CHAR_UPPER_E] 9, + [MSG_CHAR_UPPER_F] 9, + [MSG_CHAR_UPPER_G] 9, + [MSG_CHAR_UPPER_H] 9, + [MSG_CHAR_UPPER_I] 7, + [MSG_CHAR_UPPER_J] 9, + [MSG_CHAR_UPPER_K] 9, + [MSG_CHAR_UPPER_L] 9, + [MSG_CHAR_UPPER_M] 9, + [MSG_CHAR_UPPER_N] 9, + [MSG_CHAR_UPPER_O] 9, + [MSG_CHAR_UPPER_P] 9, + [MSG_CHAR_UPPER_Q] 9, + [MSG_CHAR_UPPER_R] 9, + [MSG_CHAR_UPPER_S] 9, + [MSG_CHAR_UPPER_T] 9, + [MSG_CHAR_UPPER_U] 9, + [MSG_CHAR_UPPER_V] 9, + [MSG_CHAR_UPPER_W] 9, + [MSG_CHAR_UPPER_X] 9, + [MSG_CHAR_UPPER_Y] 9, + [MSG_CHAR_UPPER_Z] 9, + [MSG_CHAR_LBRACKET] 7, + [MSG_CHAR_YEN] 9, + [MSG_CHAR_RBRACKET] 6, + [MSG_CHAR_CARET] 7, + [MSG_CHAR_UNDERSCORE] 9, + [MSG_CHAR_BACKTICK] 6, + [MSG_CHAR_LOWER_A] 9, + [MSG_CHAR_LOWER_B] 8, + [MSG_CHAR_LOWER_C] 8, + [MSG_CHAR_LOWER_D] 9, + [MSG_CHAR_LOWER_E] 8, + [MSG_CHAR_LOWER_F] 8, + [MSG_CHAR_LOWER_G] 8, + [MSG_CHAR_LOWER_H] 7, + [MSG_CHAR_LOWER_I] 4, + [MSG_CHAR_LOWER_J] 7, + [MSG_CHAR_LOWER_K] 8, + [MSG_CHAR_LOWER_L] 4, + [MSG_CHAR_LOWER_M] 9, + [MSG_CHAR_LOWER_N] 8, + [MSG_CHAR_LOWER_O] 7, + [MSG_CHAR_LOWER_P] 9, + [MSG_CHAR_LOWER_Q] 8, + [MSG_CHAR_LOWER_R] 8, + [MSG_CHAR_LOWER_S] 8, + [MSG_CHAR_LOWER_T] 8, + [MSG_CHAR_LOWER_U] 8, + [MSG_CHAR_LOWER_V] 8, + [MSG_CHAR_LOWER_W] 9, + [MSG_CHAR_LOWER_X] 8, + [MSG_CHAR_LOWER_Y] 8, + [MSG_CHAR_LOWER_Z] 8, + [MSG_CHAR_LCURLY] 7, + [MSG_CHAR_PIPE] 3, + [MSG_CHAR_RCURLY] 7, + [MSG_CHAR_TILDA] 10, + [MSG_CHAR_DEGREE] 7, + [MSG_CHAR_UPPER_A_GRAVE] 9, + [MSG_CHAR_UPPER_A_ACUTE] 9, + [MSG_CHAR_UPPER_A_CIRCUMFLEX] 9, + [MSG_CHAR_UPPER_A_UMLAUT] 9, + [MSG_CHAR_UPPER_C_CEDILLA] 9, + [MSG_CHAR_UPPER_E_GRAVE] 9, + [MSG_CHAR_UPPER_E_ACUTE] 9, + [MSG_CHAR_UPPER_E_CIRCUMFLEX] 9, + [MSG_CHAR_UPPER_E_UMLAUT] 9, + [MSG_CHAR_UPPER_I_GRAVE] 7, + [MSG_CHAR_UPPER_I_ACUTE] 7, + [MSG_CHAR_UPPER_I_CIRCUMFLEX] 7, + [MSG_CHAR_UPPER_I_UMLAUT] 8, + [MSG_CHAR_UPPER_N_TILDE] 9, + [MSG_CHAR_UPPER_O_GRAVE] 9, + [MSG_CHAR_UPPER_O_ACUTE] 9, + [MSG_CHAR_UPPER_O_CIRCUMFLEX] 9, + [MSG_CHAR_UPPER_O_UMLAUT] 9, + [MSG_CHAR_UPPER_U_GRAVE] 9, + [MSG_CHAR_UPPER_U_ACUTE] 9, + [MSG_CHAR_UPPER_U_CIRCUMFLEX] 9, + [MSG_CHAR_UPPER_U_UMLAUT] 9, + [MSG_CHAR_SHARP_S] 9, + [MSG_CHAR_LOWER_A_GRAVE] 9, + [MSG_CHAR_LOWER_A_ACUTE] 9, + [MSG_CHAR_LOWER_A_CIRCUMFLEX] 9, + [MSG_CHAR_LOWER_A_UMLAUT] 9, + [MSG_CHAR_LOWER_C_CEDILLA] 8, + [MSG_CHAR_LOWER_E_GRAVE] 8, + [MSG_CHAR_LOWER_E_ACUTE] 8, + [MSG_CHAR_LOWER_E_CIRCUMFLEX] 8, + [MSG_CHAR_LOWER_E_UMLAUT] 8, + [MSG_CHAR_LOWER_I_GRAVE] 6, + [MSG_CHAR_LOWER_I_ACUTE] 6, + [MSG_CHAR_LOWER_I_CIRCUMFLEX] 6, + [MSG_CHAR_LOWER_I_UMLAUT] 7, + [MSG_CHAR_LOWER_N_TILDE] 9, + [MSG_CHAR_LOWER_O_GRAVE] 7, + [MSG_CHAR_LOWER_O_ACUTE] 7, + [MSG_CHAR_LOWER_O_CIRCUMFLEX] 7, + [MSG_CHAR_LOWER_O_UMLAUT] 8, + [MSG_CHAR_LOWER_U_GRAVE] 8, + [MSG_CHAR_LOWER_U_ACUTE] 8, + [MSG_CHAR_LOWER_U_CIRCUMFLEX] 8, + [MSG_CHAR_LOWER_U_UMLAUT] 8, + [MSG_CHAR_INVERTED_EXCLAMTION] 6, + [MSG_CHAR_INVERTED_QUESTION] 9, + [MSG_CHAR_FEM_ORDINAL] 7, + [MSG_CHAR_HEART] 11, + [MSG_CHAR_STAR] 11, + [MSG_CHAR_UP] 11, + [MSG_CHAR_DOWN] 11, + [MSG_CHAR_LEFT] 12, + [MSG_CHAR_RIGHT] 12, + [MSG_CHAR_CIRCLE] 11, + [MSG_CHAR_CROSS] 11, + [MSG_CHAR_BUTTON_A] 13, + [MSG_CHAR_BUTTON_B] 13, + [MSG_CHAR_BUTTON_L] 14, + [MSG_CHAR_BUTTON_R] 14, + [MSG_CHAR_BUTTON_Z] 12, + [MSG_CHAR_BUTTON_C_UP] 13, + [MSG_CHAR_BUTTON_C_DOWN] 13, + [MSG_CHAR_BUTTON_C_LEFT] 13, + [MSG_CHAR_BUTTON_C_RIGHT] 13, + [MSG_CHAR_BUTTON_START] 16, + [MSG_CHAR_DOUBLE_QUOTE_OPEN] 9, + [MSG_CHAR_DOUBLE_QUOTE_CLOSE] 9, + [MSG_CHAR_SINGLE_QUOTE_OPEN] 5, + [MSG_CHAR_SINGLE_QUOTE_CLOSE] 5, }; -MessageCharData D_802EB478[] = { +MessageCharData MsgCharDataNormal[] = { { - .raster = D_802EE8D0, - .charWidthTable = D_802EB3D0, + .raster = MsgCharImgNormal, + .charWidthTable = MsgCharWidthNormal, .monospaceWidth = 10, .baseHeightOffset = 0, }, { - .raster = D_802EE8D0, - .charWidthTable = D_802EB3D0, + .raster = MsgCharImgNormal, + .charWidthTable = MsgCharWidthNormal, .monospaceWidth = 10, - .baseHeightOffset = 0xFE, + .baseHeightOffset = -2, }, { - .raster = D_802EE8D0, - .charWidthTable = D_802EB3D0, + .raster = MsgCharImgNormal, + .charWidthTable = MsgCharWidthNormal, .monospaceWidth = 10, .baseHeightOffset = 0, }, { - .raster = D_802EE8D0, - .charWidthTable = D_802EB3D0, + .raster = MsgCharImgNormal, + .charWidthTable = MsgCharWidthNormal, .monospaceWidth = 10, .baseHeightOffset = 0, }, {} }; -MessageCharData D_802EB4B4[] = { +MessageCharData MsgCharDataMenu[] = { { - .raster = D_802EE8D0, - .charWidthTable = D_802EB3D0, + .raster = MsgCharImgNormal, + .charWidthTable = MsgCharWidthNormal, .monospaceWidth = 9, - .baseHeightOffset = 0xFE, + .baseHeightOffset = -2, }, { - .raster = D_802EE8D0, - .charWidthTable = D_802EB3D0, + .raster = MsgCharImgNormal, + .charWidthTable = MsgCharWidthNormal, .monospaceWidth = 9, .baseHeightOffset = 0, }, { - .raster = D_802EE8D0, - .charWidthTable = D_802EB3D0, + .raster = MsgCharImgNormal, + .charWidthTable = MsgCharWidthNormal, .monospaceWidth = 9, .baseHeightOffset = 0, }, { - .raster = D_802EE8D0, - .charWidthTable = D_802EB3D0, + .raster = MsgCharImgNormal, + .charWidthTable = MsgCharWidthNormal, .monospaceWidth = 9, .baseHeightOffset = 0, }, {} }; -MessageCharset D_802EB4F0 = { +MessageCharset MsgCharsetNormal = { .texSize = { 16, 16 }, .unk_02 = 14, .newLineY = 16, .charRasterSize = 128, - .rasters = D_802EB478 + .rasters = MsgCharDataNormal }; -MessageCharset D_802EB4FC = { +MessageCharset MsgCharsetMenu = { .texSize = { 16, 16 }, .unk_02 = 14, .newLineY = 16, .charRasterSize = 128, - .rasters = D_802EB4B4 + .rasters = MsgCharDataMenu }; -u8 D_802EB508[] = { +u8 MsgCharWidthTitle[] = { 8, 8, 8, 9, 8, 8, 8, 8, 5, 8, 9, 8,10, 8, 8, 9, 8, 9, 8, 8, 8, 8,10, 9, 9, 8, 4, 3, 4, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,10, - 10, 0, 0, 0 + 10 }; -u8 D_802EB534[] = { +u8 MsgCharWidthSubtitle[] = { 9, 9, 8, 8, 7, 7, 8, 7, 3, 7, 7, 7, 8, 7, 8, 8, 8, 7, 7, 8, 7, 7, 8, 8, 8, 7, 4, 3, 4, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 0, 0, 0 + 8 }; -MessageCharData D_802EB560[] = { +MessageCharData MsgCharDataTitle[] = { { - .raster = D_802ED970, - .charWidthTable = D_802EB508, + .raster = MsgCharImgTitle, + .charWidthTable = MsgCharWidthTitle, .monospaceWidth = 14, .baseHeightOffset = 0, }, {} }; -MessageCharData D_802EB578[] = { +MessageCharData MsgCharDataSubtitle[] = { { - .raster = D_802F39D0, - .charWidthTable = D_802EB534, + .raster = MsgCharImgSubtitle, + .charWidthTable = MsgCharWidthSubtitle, .monospaceWidth = 10, .baseHeightOffset = 0, }, {} }; -MessageCharset D_802EB590 = { +MessageCharset MsgCharsetTitle = { .texSize = { 12, 15 }, .unk_02 = 14, .newLineY = 16, .charRasterSize = 96, - .rasters = D_802EB560 + .rasters = MsgCharDataTitle }; -MessageCharset D_802EB59C = { +MessageCharset MsgCharsetSubtitle = { .texSize = { 12, 12 }, .unk_02 = 10, .newLineY = 10, .charRasterSize = 72, - .rasters = D_802EB578 + .rasters = MsgCharDataSubtitle }; -MessageCharset* gMsgCharsets[] = { - &D_802EB4F0, - &D_802EB4FC, - &D_802EB4FC, - &D_802EB590, - &D_802EB59C +MessageCharset* MsgCharsets[] = { + [MSG_FONT_NORMAL] &MsgCharsetNormal, + [MSG_FONT_MENU] &MsgCharsetMenu, + [MSG_FONT_2] &MsgCharsetMenu, + [MSG_FONT_TITLE] &MsgCharsetTitle, + [MSG_FONT_SUBTITLE] &MsgCharsetSubtitle, + NULL +}; + +s32 MsgLetterRasterOffsets[] = { + 0x0000D178, 0x0000ED78, 0x00010978, 0x00012578, + 0x00014178, 0x00015D78, 0x00017978, 0x00019578, + 0x0001B178, 0x0001CD78, 0x0001E978, 0x00020578, +}; + +s32 MsgLetterPaletteOffsets[] = { + 0x0000EB78, 0x00010778, 0x00012378, 0x00013F78, + 0x00015B78, 0x00017778, 0x00019378, 0x0001AF78, + 0x0001CB78, 0x0001E778, 0x00020378, 0x00021F78, +}; + +MsgVoice MsgVoices[] = { + [MSG_VOICE_NORMAL] { + .voiceA = SOUND_MSG_VOICE_1A, + .voiceB = SOUND_MSG_VOICE_1B, + .pitchShift = 0 + }, + [MSG_VOICE_BOWSER] { + .voiceA = SOUND_MSG_VOICE_4A, + .voiceB = SOUND_MSG_VOICE_4B, + .pitchShift = -50 + }, + [MSG_VOICE_STAR] { + .voiceA = SOUND_MSG_VOICE_STAR, + .voiceB = SOUND_MSG_VOICE_STAR, + .pitchShift = 0 + }, +}; + +s16 MsgStyleVerticalLineOffsets[] = { + [MSG_STYLE_NONE] 0, + [MSG_STYLE_RIGHT] -4, + [MSG_STYLE_LEFT] -4, + [MSG_STYLE_CENTER] -4, + [MSG_STYLE_TATTLE] -4, + [MSG_STYLE_CHOICE] 0, + [MSG_STYLE_INSPECT] -4, + [MSG_STYLE_SIGN] -4, + [MSG_STYLE_LAMPPOST] -4, + [MSG_STYLE_POSTCARD] 0, + [MSG_STYLE_POPUP] 0, + [MSG_STYLE_B] 0, + [MSG_STYLE_UPGRADE] 0, + [MSG_STYLE_NARRATE] -4, + [MSG_STYLE_EPILOGUE] -4, + [MSG_STYLE_F] 0, }; diff --git a/src/msg_data_2.c b/src/msg_img.c similarity index 82% rename from src/msg_data_2.c rename to src/msg_img.c index fcedbfac74..f55c36a325 100644 --- a/src/msg_data_2.c +++ b/src/msg_img.c @@ -1,40 +1,5 @@ #include "common.h" -s32 D_802EB5C0[] = { - 0x0000D178, 0x0000ED78, 0x00010978, 0x00012578, 0x00014178, 0x00015D78, 0x00017978, 0x00019578, 0x0001B178, 0x0001CD78, 0x0001E978, 0x00020578 -}; - -s32 D_802EB5F0[] = { - 0x0000EB78, 0x00010778, 0x00012378, 0x00013F78, 0x00015B78, 0x00017778, 0x00019378, 0x0001AF78, 0x0001CB78, 0x0001E778, 0x00020378, 0x00021F78 -}; - -MsgVoice MsgVoices[] = { - { - .unk_00 = SOUND_NORMAL_VOICE_A, - .unk_04 = SOUND_NORMAL_VOICE_B, - .unk_08 = 0 - }, - { - .unk_00 = SOUND_BOWSER_VOICE_A, - .unk_04 = SOUND_BOWSER_VOICE_B, - .unk_08 = -50 - }, - { - .unk_00 = SOUND_STAR_VOICE, - .unk_04 = SOUND_STAR_VOICE, - .unk_08 = 0 - }, -}; - -s16 D_802EB644[] = { - 0, -4, -4, -4, - -4, 0, -4, -4, - -4, 0, 0, 0, - 0, -4, -4, 0, - 0, 0, 0, 0, - 0, 0 -}; - #include "ui/msg/bubble_left.png.inc.c" #include "ui/msg/bubble_mid.png.inc.c" #include "ui/msg/bubble_right.png.inc.c" @@ -110,9 +75,9 @@ unsigned char ui_msg_palettes[16][32] = { #include "ui/msg/star.png.inc.c" #include "ui/msg/star_silhouette.png.inc.c" -BSS IMG_BIN D_802ED970[0xF60]; -BSS IMG_BIN D_802EE8D0[0x5100]; -BSS IMG_BIN D_802F39D0[0xB88]; +BSS IMG_BIN MsgCharImgTitle[0xF60]; +BSS IMG_BIN MsgCharImgNormal[0x5100]; +BSS IMG_BIN MsgCharImgSubtitle[0xB88]; BSS char MSG_unused[8]; BSS PAL_BIN D_802F4560[80][8]; diff --git a/src/pause/pause_main.c b/src/pause/pause_main.c index fa44aab125..ec8fab53cb 100644 --- a/src/pause/pause_main.c +++ b/src/pause/pause_main.c @@ -660,7 +660,7 @@ void pause_init(void) { } set_window_update(WINDOW_ID_PAUSE_TUTORIAL, WINDOW_UPDATE_SHOW); - sfx_play_sound(SOUND_MENU_START_TUTORIAL); + sfx_play_sound(SOUND_MENU_SHOW_CHOICE); } update_window_hierarchy(WINDOW_ID_PAUSE_CURSOR, 0x40); diff --git a/src/world/area_arn/arn_05/arn_05_3_npc.c b/src/world/area_arn/arn_05/arn_05_3_npc.c index 0806ed7ecf..61924a802f 100644 --- a/src/world/area_arn/arn_05/arn_05_3_npc.c +++ b/src/world/area_arn/arn_05/arn_05_3_npc.c @@ -366,7 +366,7 @@ EvtScript N(EVS_Scene_TubbaRaid) = { EVT_CALL(InterpNpcYaw, NPC_Boo_03, 90, 1) EVT_CALL(InterpNpcYaw, NPC_Boo_05, 90, 1) EVT_WAIT(20 * DT) - EVT_CALL(PlaySound, SOUND_BOO_APPEAR) + EVT_CALL(PlaySound, SOUND_BOO_APPEAR_A) EVT_SETF(LVar0, EVT_FLOAT(240.0)) EVT_LOOP(20 * DT) EVT_SUBF(LVar0, EVT_FLOAT(240.0 / (s32) (20 * DT))) @@ -381,7 +381,7 @@ EvtScript N(EVS_Scene_TubbaRaid) = { EVT_CALL(EnableNpcShadow, NPC_Boo_01, FALSE) EVT_CALL(EnableNpcShadow, NPC_Boo_02, FALSE) EVT_CALL(EnableNpcShadow, NPC_Boo_05, FALSE) - EVT_CALL(PlaySound, SOUND_BOO_VANISH) + EVT_CALL(PlaySound, SOUND_BOO_VANISH_A) EVT_SETF(LVar0, EVT_FLOAT(0.0)) EVT_LOOP(20 * DT) EVT_ADDF(LVar0, EVT_FLOAT(240.0 / (s32) (20 * DT))) @@ -440,7 +440,7 @@ EvtScript N(EVS_Scene_TubbaRaid) = { EVT_CALL(ShowEmote, NPC_Boo_01, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(ShowEmote, NPC_Boo_02, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_THREAD - EVT_CALL(PlaySound, SOUND_BOO_APPEAR) + EVT_CALL(PlaySound, SOUND_BOO_APPEAR_A) EVT_WAIT(20 * DT) EVT_SETF(LVar0, EVT_FLOAT(240.0)) EVT_LOOP(20 * DT) @@ -561,7 +561,7 @@ EvtScript N(EVS_Scene_TubbaRaid) = { EVT_CALL(EnableNpcShadow, NPC_Boo_01, TRUE) EVT_CALL(EnableNpcShadow, NPC_Boo_02, TRUE) EVT_CALL(EnableNpcShadow, NPC_Boo_05, TRUE) - EVT_CALL(PlaySound, SOUND_BOO_VANISH) + EVT_CALL(PlaySound, SOUND_BOO_VANISH_A) EVT_SETF(LVar0, EVT_FLOAT(0.0)) EVT_LOOP(20 * DT) EVT_ADDF(LVar0, EVT_FLOAT(250.0 / (s32) (20 * DT))) diff --git a/src/world/area_end/end_00/end_00_4_allies.c b/src/world/area_end/end_00/end_00_4_allies.c index d4db36f73b..02396e1452 100644 --- a/src/world/area_end/end_00/end_00_4_allies.c +++ b/src/world/area_end/end_00/end_00_4_allies.c @@ -6,7 +6,7 @@ EvtScript N(EVS_ParadePhase_Luigi) = { EVT_WAIT(80 * DT) EVT_THREAD EVT_LOOP(9 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi, SOUND_NORMAL_VOICE_A, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi, SOUND_MSG_VOICE_1A, SOUND_SPACE_MODE_0) EVT_WAIT(15) EVT_END_LOOP EVT_END_THREAD @@ -20,7 +20,7 @@ EvtScript N(EVS_ParadePhase_Luigi) = { EVT_THREAD EVT_WAIT(10 * DT) EVT_LOOP(4 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi, SOUND_14, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi, SOUND_MSG_VOICE_2B, SOUND_SPACE_MODE_0) EVT_WAIT(15) EVT_END_LOOP EVT_END_THREAD diff --git a/src/world/area_isk/isk_05/isk_05_3_npc.c b/src/world/area_isk/isk_05/isk_05_3_npc.c index 568816c312..84d9acb712 100644 --- a/src/world/area_isk/isk_05/isk_05_3_npc.c +++ b/src/world/area_isk/isk_05/isk_05_3_npc.c @@ -161,7 +161,7 @@ EvtScript N(EVS_NpcIdle_StoneChomp) = { EVT_WAIT(1) EVT_GOTO(100) EVT_END_IF - EVT_CALL(PlaySound, SOUND_A) + EVT_CALL(PlaySound, SOUND_CHIME_BEGIN_AMBUSH) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, 0) EVT_THREAD EVT_WAIT(5) diff --git a/src/world/area_isk/isk_07/isk_07_3_npc.c b/src/world/area_isk/isk_07/isk_07_3_npc.c index e52ac99afe..10596e44f6 100644 --- a/src/world/area_isk/isk_07/isk_07_3_npc.c +++ b/src/world/area_isk/isk_07/isk_07_3_npc.c @@ -41,7 +41,7 @@ EvtScript N(EVS_NpcDefeat_Pokey_01) = { EVT_CALL(N(IsLastEnemy)) EVT_IF_EQ(LVar1, TRUE) EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySound, SOUND_B) + EVT_CALL(PlaySound, SOUND_CHIME_SOLVED_PUZZLE) EVT_WAIT(30) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) diff --git a/src/world/area_isk/isk_07/isk_07_7_ambush.c b/src/world/area_isk/isk_07/isk_07_7_ambush.c index 69eea326df..7d393cd7f2 100644 --- a/src/world/area_isk/isk_07/isk_07_7_ambush.c +++ b/src/world/area_isk/isk_07/isk_07_7_ambush.c @@ -18,7 +18,7 @@ EvtScript N(EVS_SetupSarcophagi) = { EVT_WAIT(1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySound, SOUND_A) + EVT_CALL(PlaySound, SOUND_CHIME_BEGIN_AMBUSH) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(1.0)) EVT_CALL(SetNpcYaw, NPC_Pokey_01, 105) diff --git a/src/world/area_kmr/kmr_11/kmr_11_5_entity.c b/src/world/area_kmr/kmr_11/kmr_11_5_entity.c index 0bf3bbfa64..50f49a88dc 100644 --- a/src/world/area_kmr/kmr_11/kmr_11_5_entity.c +++ b/src/world/area_kmr/kmr_11/kmr_11_5_entity.c @@ -63,7 +63,7 @@ EvtScript N(EVS_Interact_SwitchBush) = { }; EvtScript N(EVS_OnBreak_SpecialBrick) = { - EVT_CALL(PlaySound, SOUND_B) + EVT_CALL(PlaySound, SOUND_CHIME_SOLVED_PUZZLE) EVT_CALL(PlaySoundAt, SOUND_2108, SOUND_SPACE_MODE_0, 665, 35, 70) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 665, 48, 70, 10) EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 665, 35, 70, 45, ITEM_SUPER_SHROOM, MAKE_ENTITY_END) diff --git a/src/world/area_kpa/kpa_82/kpa_82_3_npc.c b/src/world/area_kpa/kpa_82/kpa_82_3_npc.c index 867c148187..85144d0d05 100644 --- a/src/world/area_kpa/kpa_82/kpa_82_3_npc.c +++ b/src/world/area_kpa/kpa_82/kpa_82_3_npc.c @@ -190,7 +190,7 @@ EvtScript N(EVS_SetDoorRots) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(StopSound, SOUND_0) + EVT_CALL(StopSound, SOUND_NONE) EVT_RETURN EVT_END }; @@ -210,7 +210,7 @@ EvtScript N(EVS_CloseDoors) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(StopSound, SOUND_0) + EVT_CALL(StopSound, SOUND_NONE) EVT_RETURN EVT_END }; diff --git a/src/world/area_mac/mac_02/npc/bootler.inc.c b/src/world/area_mac/mac_02/npc/bootler.inc.c index 1fc7db3979..b720abf4dc 100644 --- a/src/world/area_mac/mac_02/npc/bootler.inc.c +++ b/src/world/area_mac/mac_02/npc/bootler.inc.c @@ -1,9 +1,9 @@ EvtScript N(D_8024ACA4_82DF64) = { EVT_IF_EQ(LVar0, EVT_FLOAT(0.0)) - EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_VANISH, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_VANISH_A, SOUND_SPACE_MODE_0) EVT_SETF(LVar1, EVT_FLOAT(24.0)) EVT_ELSE - EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_APPEAR, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_APPEAR_A, SOUND_SPACE_MODE_0) EVT_SETF(LVar1, EVT_FLOAT(-24.0)) EVT_END_IF EVT_LOOP(10) diff --git a/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c b/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c index f679c4c068..7debc9022f 100644 --- a/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c +++ b/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c @@ -59,7 +59,7 @@ EvtScript N(D_80248298_84AE68) = { EVT_CALL(RotateModel, MODEL_hkai1, LVar0, 0, 1, 0) EVT_CALL(RotateModel, MODEL_hkai2, LVar0, 0, 1, 0) EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_hk, SOUND_1AC, SOUND_SPACE_MODE_0) - EVT_CALL(PlaySound, SOUND_A) + EVT_CALL(PlaySound, SOUND_CHIME_BEGIN_AMBUSH) EVT_RETURN EVT_END }; diff --git a/src/world/area_mim/mim_10/mim_10_4_npc.c b/src/world/area_mim/mim_10/mim_10_4_npc.c index 6930978372..f2ca9e741c 100644 --- a/src/world/area_mim/mim_10/mim_10_4_npc.c +++ b/src/world/area_mim/mim_10/mim_10_4_npc.c @@ -128,7 +128,7 @@ EvtScript N(EVS_Scene_BootlersInvitation) = { EVT_WAIT(20 * DT) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_VANISH, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_VANISH_A, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, EVT_FLOAT(0.0)) EVT_LOOP(20 * DT) EVT_ADDF(LVar0, EVT_FLOAT(VAR_1)) @@ -153,7 +153,7 @@ EvtScript N(EVS_Scene_BootlersInvitation) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_WAIT(30 * DT) EVT_CALL(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Talk, ANIM_Bootler_Idle, 0, MSG_CH3_0001) - EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_APPEAR, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_APPEAR_A, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, EVT_FLOAT(240.0)) EVT_LOOP(20 * DT) EVT_SUBF(LVar0, EVT_FLOAT(VAR_1)) diff --git a/src/world/area_mim/mim_11/mim_11_3_gate.c b/src/world/area_mim/mim_11/mim_11_3_gate.c index 768ed8ab7a..7ff6b5aa71 100644 --- a/src/world/area_mim/mim_11/mim_11_3_gate.c +++ b/src/world/area_mim/mim_11/mim_11_3_gate.c @@ -42,7 +42,7 @@ EvtScript N(D_80242560_BB95D0) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SetMusicTrack, 0, SONG_BOOS_MANSION, 0, 8) - EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_VANISH, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_VANISH_A, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, EVT_FLOAT(0.0)) EVT_LOOP(90 * DT) EVT_ADDF(LVar0, EVT_FLOAT(2.6667 / DT)) @@ -65,7 +65,7 @@ EvtScript N(D_80242560_BB95D0) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Talk, ANIM_Bootler_Idle, 0, MSG_CH3_002A) - EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_APPEAR, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_APPEAR_A, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, EVT_FLOAT(240.0)) EVT_LOOP(90 * DT) EVT_SUBF(LVar0, EVT_FLOAT(2.6667 / DT)) diff --git a/src/world/area_mim/mim_12/mim_12_5_gate.c b/src/world/area_mim/mim_12/mim_12_5_gate.c index db407185a6..bc530e523f 100644 --- a/src/world/area_mim/mim_12/mim_12_5_gate.c +++ b/src/world/area_mim/mim_12/mim_12_5_gate.c @@ -326,7 +326,7 @@ EvtScript N(EVS_Scene_UnlockGate) = { EVT_CALL(EnablePartnerAI) EVT_CALL(SetNpcPos, NPC_GateBoo_01, -103, 65, 64) EVT_CALL(SetNpcPos, NPC_GateBoo_02, -45, 65, -66) - EVT_CALL(PlaySoundAtNpc, NPC_GateBoo_01, SOUND_BOO_VANISH, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_GateBoo_01, SOUND_BOO_VANISH_A, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, EVT_FLOAT(0.0)) EVT_LOOP(20 * DT) EVT_ADDF(LVar0, EVT_FLOAT(240.0 / (s32)(20 * DT))) @@ -356,7 +356,7 @@ EvtScript N(EVS_Scene_UnlockGate) = { EVT_EXEC_WAIT(N(EVS_StartGustyMusic)) EVT_EXEC_WAIT(N(EVS_HaveBoosCloseGate)) EVT_WAIT(10 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_GateBoo_01, SOUND_BOO_APPEAR, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_GateBoo_01, SOUND_BOO_APPEAR_A, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, EVT_FLOAT(240.0)) EVT_LOOP(20 * DT) EVT_SUBF(LVar0, EVT_FLOAT(240.0 / (s32)(20 * DT))) diff --git a/src/world/area_nok/nok_13/nok_13_3_entity.c b/src/world/area_nok/nok_13/nok_13_3_entity.c index 540e3ba0ee..bc8298dac3 100644 --- a/src/world/area_nok/nok_13/nok_13_3_entity.c +++ b/src/world/area_nok/nok_13/nok_13_3_entity.c @@ -20,7 +20,7 @@ EvtScript N(EVS_BreakBlock_Second) = { EvtScript N(EVS_BreakBlock_Third) = { EVT_IF_EQ(AB_NOK_1, 2) - EVT_CALL(PlaySound, SOUND_B) + EVT_CALL(PlaySound, SOUND_CHIME_SOLVED_PUZZLE) EVT_CALL(PlaySoundAt, SOUND_2108, 0, 40, 60, -285) EVT_SET(AB_NOK_1, 3) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 40, 73, -285, 10) diff --git a/src/world/area_obk/obk_09/obk_09_3_meet_bow.c b/src/world/area_obk/obk_09/obk_09_3_meet_bow.c index 3635905fec..dd0c48a25b 100644 --- a/src/world/area_obk/obk_09/obk_09_3_meet_bow.c +++ b/src/world/area_obk/obk_09/obk_09_3_meet_bow.c @@ -45,7 +45,7 @@ EvtScript N(EVS_Scene_MeetBow) = { EVT_CALL(SetNpcPos, NPC_Bootler, 30, 70, -75) EVT_CALL(SetNpcYaw, NPC_Bow, 270) EVT_CALL(SetNpcYaw, NPC_Bootler, 270) - EVT_CALL(PlaySoundAtNpc, NPC_Bow, SOUND_BOO_VANISH, SOUND_SPACE_MODE_0) + EVT_CALL(PlaySoundAtNpc, NPC_Bow, SOUND_BOO_VANISH_A, SOUND_SPACE_MODE_0) EVT_SETF(LVar0, EVT_FLOAT(0.0)) EVT_LOOP(20 * DT) EVT_ADDF(LVar0, EVT_FLOAT(240.0 / (s32)(20 * DT))) diff --git a/src/world/area_pra/pra_31/pra_31_4_puzzle.c b/src/world/area_pra/pra_31/pra_31_4_puzzle.c index 431c2612c7..03212f288c 100644 --- a/src/world/area_pra/pra_31/pra_31_4_puzzle.c +++ b/src/world/area_pra/pra_31/pra_31_4_puzzle.c @@ -318,7 +318,7 @@ EvtScript N(EVS_Scene_PuzzleSolved) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySound, SOUND_B) + EVT_CALL(PlaySound, SOUND_CHIME_SOLVED_PUZZLE) EVT_WAIT(40) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 325, 0, 0) EVT_CALL(SetPanTarget, CAM_DEFAULT, 325, 0, 0) diff --git a/src/world/area_sam/sam_04/sam_04_4_npc.c b/src/world/area_sam/sam_04/sam_04_4_npc.c index 3fd50996d4..2a1025b1b9 100644 --- a/src/world/area_sam/sam_04/sam_04_4_npc.c +++ b/src/world/area_sam/sam_04/sam_04_4_npc.c @@ -67,7 +67,7 @@ EvtScript N(EVS_ItemPrompt_Scarf) = { EVT_CALL(PlaySoundAt, SOUND_2043, 0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 10) EVT_WAIT(20) - EVT_CALL(PlaySound, SOUND_B) + EVT_CALL(PlaySound, SOUND_CHIME_SOLVED_PUZZLE) EVT_SET(LVar0, 0) EVT_EXEC_WAIT(N(EVS_Scene_SnowmenSpeak)) EVT_END_IF @@ -107,7 +107,7 @@ EvtScript N(EVS_ItemPrompt_Bucket) = { EVT_CALL(PlaySoundAt, SOUND_2043, 0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 10) EVT_WAIT(20) - EVT_CALL(PlaySound, SOUND_B) + EVT_CALL(PlaySound, SOUND_CHIME_SOLVED_PUZZLE) EVT_SET(LVar0, 1) EVT_EXEC_WAIT(N(EVS_Scene_SnowmenSpeak)) EVT_END_IF diff --git a/src/world/area_sbk/sbk_20/sbk_20_2_entity.c b/src/world/area_sbk/sbk_20/sbk_20_2_entity.c index 4a533ddecc..323326564b 100644 --- a/src/world/area_sbk/sbk_20/sbk_20_2_entity.c +++ b/src/world/area_sbk/sbk_20/sbk_20_2_entity.c @@ -7,7 +7,7 @@ EvtScript N(EVS_OnHitInertBlock) = { EVT_SWITCH(MV_BlockHitCounter) EVT_CASE_EQ(1) EVT_IF_EQ(GF_SBK20_ItemBlock_Mushroom, FALSE) - EVT_CALL(PlaySound, SOUND_B) + EVT_CALL(PlaySound, SOUND_CHIME_SOLVED_PUZZLE) EVT_CALL(PlaySoundAt, SOUND_2108, SOUND_SPACE_MODE_0, -80, 60, -200) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, -80, 73, -200, 10) EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -80, 60, -200, 0, ITEM_MUSHROOM, MAKE_ENTITY_END) @@ -15,7 +15,7 @@ EvtScript N(EVS_OnHitInertBlock) = { EVT_END_IF EVT_CASE_EQ(10) EVT_IF_EQ(GF_SBK20_ItemBlock_SuperShroom, FALSE) - EVT_CALL(PlaySound, SOUND_B) + EVT_CALL(PlaySound, SOUND_CHIME_SOLVED_PUZZLE) EVT_CALL(PlaySoundAt, SOUND_2108, SOUND_SPACE_MODE_0, -180, 60, -200) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, -180, 73, -200, 10) EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -180, 60, -200, 0, ITEM_SUPER_SHROOM, MAKE_ENTITY_END) @@ -23,7 +23,7 @@ EvtScript N(EVS_OnHitInertBlock) = { EVT_END_IF EVT_CASE_EQ(100) EVT_IF_EQ(GF_SBK20_ItemBlock_UltraShroom, FALSE) - EVT_CALL(PlaySound, SOUND_B) + EVT_CALL(PlaySound, SOUND_CHIME_SOLVED_PUZZLE) EVT_CALL(PlaySoundAt, SOUND_2108, SOUND_SPACE_MODE_0, -130, 60, -150) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, -130, 73, -150, 10) EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -130, 60, -150, 0, ITEM_ULTRA_SHROOM, MAKE_ENTITY_END) diff --git a/src/world/area_tik/tik_09/tik_09_2_main.c b/src/world/area_tik/tik_09/tik_09_2_main.c index fe11dc0596..0e71f15ed0 100644 --- a/src/world/area_tik/tik_09/tik_09_2_main.c +++ b/src/world/area_tik/tik_09/tik_09_2_main.c @@ -8,7 +8,7 @@ EvtScript N(EVS_CloseGates) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) - EVT_CALL(PlaySound, SOUND_A) + EVT_CALL(PlaySound, SOUND_CHIME_BEGIN_AMBUSH) EVT_CALL(PlaySoundAtCollider, COLLIDER_o59, SOUND_26B, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 60, 0, 25, EASING_COS_IN_OUT) EVT_LOOP(0) diff --git a/src/world/area_tik/tik_09/tik_09_4_entity.c b/src/world/area_tik/tik_09/tik_09_4_entity.c index 006ffc8767..9a6fd25600 100644 --- a/src/world/area_tik/tik_09/tik_09_4_entity.c +++ b/src/world/area_tik/tik_09/tik_09_4_entity.c @@ -18,7 +18,7 @@ EvtScript N(EVS_SpawnSwitch) = { EVT_END_IF EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(InterpCamTargetPos, 0, 1, -10, -10, 10, 20) - EVT_CALL(PlaySound, SOUND_B) + EVT_CALL(PlaySound, SOUND_CHIME_SOLVED_PUZZLE) EVT_CALL(PlaySoundAt, SOUND_301, SOUND_SPACE_MODE_0, -10, 200, 10) EVT_CALL(MakeLerp, 200, -10, 25, EASING_QUADRATIC_IN) EVT_LOOP(0) diff --git a/src/world/area_trd/trd_01/trd_01_3_npc.c b/src/world/area_trd/trd_01/trd_01_3_npc.c index 2e3f56846a..18e84034cf 100644 --- a/src/world/area_trd/trd_01/trd_01_3_npc.c +++ b/src/world/area_trd/trd_01/trd_01_3_npc.c @@ -123,7 +123,7 @@ EvtScript N(EVS_NpcDefeat_KoopaTroopa_01) = { EVT_CASE_EQ(OUTCOME_PLAYER_WON) EVT_SET(GF_TRD01_Defeated_KoopaGuard, TRUE) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlaySound, SOUND_B) + EVT_CALL(PlaySound, SOUND_CHIME_SOLVED_PUZZLE) EVT_CALL(MakeItemEntity, ITEM_KOOPA_FORTRESS_KEY, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_TOSS_NEVER_VANISH, GF_TRD01_Item_FortressKey) EVT_EXEC(N(EVS_FocusCamOnLock)) EVT_CALL(DoNpcDefeat) diff --git a/src/world/area_trd/trd_07/trd_07_3_magic_doors.c b/src/world/area_trd/trd_07/trd_07_3_magic_doors.c index 795a4cc272..645cac21ed 100644 --- a/src/world/area_trd/trd_07/trd_07_3_magic_doors.c +++ b/src/world/area_trd/trd_07/trd_07_3_magic_doors.c @@ -209,7 +209,7 @@ EvtScript N(EVS_RaiseMagicDoors) = { EVT_SUSPEND_GROUP(EVT_GROUP_01) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) - EVT_CALL(PlaySound, SOUND_A) + EVT_CALL(PlaySound, SOUND_CHIME_BEGIN_AMBUSH) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) @@ -252,7 +252,7 @@ EvtScript N(EVS_RaiseMagicDoors) = { EvtScript N(EVS_LowerMagicDoors) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(15) - EVT_CALL(PlaySound, SOUND_B) + EVT_CALL(PlaySound, SOUND_CHIME_SOLVED_PUZZLE) EVT_WAIT(15) EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) diff --git a/src/world/partner/kooper.c b/src/world/partner/kooper.c index 06c7681b5d..de4e4c123b 100644 --- a/src/world/partner/kooper.c +++ b/src/world/partner/kooper.c @@ -426,7 +426,7 @@ API_CALLABLE(N(UseAbility)) { fx_damage_stars(3, kooper->pos.x, kooper->pos.y + kooper->collisionHeight, kooper->pos.z, sin_deg(kooper->yaw), -1.0f, -cos_deg(kooper->yaw), 1); - sfx_play_sound_at_npc(SOUND_0, SOUND_SPACE_MODE_0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_NONE, SOUND_SPACE_MODE_0, NPC_PARTNER); script->USE_STATE = SHELL_TOSS_STATE_RETURN; break; } @@ -438,7 +438,7 @@ API_CALLABLE(N(UseAbility)) { fx_damage_stars(3, kooper->pos.x, kooper->pos.y + kooper->collisionHeight, kooper->pos.z, sin_deg(kooper->yaw), -1.0f, -cos_deg(kooper->yaw), 1); - sfx_play_sound_at_npc(SOUND_0, SOUND_SPACE_MODE_0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_NONE, SOUND_SPACE_MODE_0, NPC_PARTNER); script->USE_STATE = SHELL_TOSS_STATE_RETURN; break; } @@ -450,7 +450,7 @@ API_CALLABLE(N(UseAbility)) { fx_damage_stars(3, kooper->pos.x, kooper->pos.y + kooper->collisionHeight, kooper->pos.z, sin_deg(kooper->yaw), -1.0f, -cos_deg(kooper->yaw), 1); - sfx_play_sound_at_npc(SOUND_0, SOUND_SPACE_MODE_0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_NONE, SOUND_SPACE_MODE_0, NPC_PARTNER); script->USE_STATE = SHELL_TOSS_STATE_RETURN; break; } @@ -475,7 +475,7 @@ API_CALLABLE(N(UseAbility)) { if ((kooper->flags & NPC_FLAG_COLLIDING_WITH_NPC)) { script->USE_STATE = SHELL_TOSS_STATE_RETURN; kooper->moveSpeed = 0.0f; - sfx_play_sound_at_npc(SOUND_0, SOUND_SPACE_MODE_0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_NONE, SOUND_SPACE_MODE_0, NPC_PARTNER); break; } @@ -483,7 +483,7 @@ API_CALLABLE(N(UseAbility)) { sfx_play_sound_at_npc(SOUND_286, SOUND_SPACE_MODE_0, NPC_PARTNER); fx_damage_stars(3, kooper->pos.x, kooper->pos.y + kooper->collisionHeight, kooper->pos.z, sin_deg(kooper->yaw), -1.0f, -cos_deg(kooper->yaw), 1); - sfx_play_sound_at_npc(SOUND_0, SOUND_SPACE_MODE_0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_NONE, SOUND_SPACE_MODE_0, NPC_PARTNER); script->USE_STATE = SHELL_TOSS_STATE_PICKUP; N(ShellTossHoldTime) = 8; kooper->moveSpeed -= 4.0; @@ -492,7 +492,7 @@ API_CALLABLE(N(UseAbility)) { kooper->planarFlyDist += 1.0; } } else if (ShellTossHitboxState == SHELL_TOSS_HITBOX_HIT_ENEMY) { - sfx_play_sound_at_npc(SOUND_0, SOUND_SPACE_MODE_0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_NONE, SOUND_SPACE_MODE_0, NPC_PARTNER); script->USE_STATE = SHELL_TOSS_STATE_HOLD; N(ShellTossHoldTime) = 30; kooper->moveSpeed = 0.0f; @@ -501,7 +501,7 @@ API_CALLABLE(N(UseAbility)) { label2: script->USE_STATE = SHELL_TOSS_STATE_RETURN; kooper->moveSpeed = 0.0f; - sfx_play_sound_at_npc(SOUND_0, SOUND_SPACE_MODE_0, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_NONE, SOUND_SPACE_MODE_0, NPC_PARTNER); } else if (kooper->planarFlyDist > 105.0f) { kooper->moveSpeed -= 4.0; if (kooper->moveSpeed < 0.01) { diff --git a/src/world/partners.c b/src/world/partners.c index a979300de8..476beb0c80 100644 --- a/src/world/partners.c +++ b/src/world/partners.c @@ -667,7 +667,7 @@ void _use_partner_ability(void) { switch (PartnerCommandState) { case 0: // put away current partner disable_player_input(); - sfx_play_sound(SOUND_D); + sfx_play_sound(SOUND_PARTNER_PUT_AWAY); kill_script_by_ID(wPartnerCurrentScriptID); wPartnerCurrentScript = start_script(wPartner->putAway, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; @@ -684,7 +684,7 @@ void _use_partner_ability(void) { partner_free_npc(); playerData->curPartner = wCurrentPartnerId = NextPartnerID; create_partner_npc(); - sfx_play_sound(SOUND_E); + sfx_play_sound(SOUND_PARTNER_GET_OUT); wPartner->init(wPartnerNpc); PartnerCommandState += 1; // fallthrough @@ -746,7 +746,7 @@ void _use_partner_ability(void) { switch (PartnerCommandState) { case 0: // put away current partner disable_player_input(); - sfx_play_sound(SOUND_D); + sfx_play_sound(SOUND_PARTNER_PUT_AWAY); kill_script_by_ID(wPartnerCurrentScriptID); wPartnerCurrentScript = start_script(wPartner->putAway, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; diff --git a/ver/ique/asm/nonmatchings/msg/appendGfx_message.s b/ver/ique/asm/nonmatchings/msg/appendGfx_message.s index be786dee67..507b86f457 100644 --- a/ver/ique/asm/nonmatchings/msg/appendGfx_message.s +++ b/ver/ique/asm/nonmatchings/msg/appendGfx_message.s @@ -380,9 +380,9 @@ glabel appendGfx_message /* BD250 80126370 9482003C */ lhu $v0, 0x3C($a0) /* BD254 80126374 A4800042 */ sh $zero, 0x42($a0) /* BD258 80126378 00021080 */ sll $v0, $v0, 2 -/* BD25C 8012637C 3C01802F */ lui $at, %hi(gMsgCharsets) +/* BD25C 8012637C 3C01802F */ lui $at, %hi(MsgCharsets) /* BD260 80126380 00220821 */ addu $at, $at, $v0 -/* BD264 80126384 8C22B5A8 */ lw $v0, %lo(gMsgCharsets)($at) +/* BD264 80126384 8C22B5A8 */ lw $v0, %lo(MsgCharsets)($at) /* BD268 80126388 90420003 */ lbu $v0, 0x3($v0) /* BD26C 8012638C C4820014 */ lwc1 $f2, 0x14($a0) /* BD270 80126390 44820000 */ mtc1 $v0, $f0 @@ -392,9 +392,9 @@ glabel appendGfx_message /* BD280 801263A0 46001082 */ mul.s $f2, $f2, $f0 /* BD284 801263A4 00000000 */ nop /* BD288 801263A8 00021040 */ sll $v0, $v0, 1 -/* BD28C 801263AC 3C01802F */ lui $at, %hi(D_802EB644) +/* BD28C 801263AC 3C01802F */ lui $at, %hi(MsgStyleVerticalLineOffsets) /* BD290 801263B0 00220821 */ addu $at, $at, $v0 -/* BD294 801263B4 8422B644 */ lh $v0, %lo(D_802EB644)($at) +/* BD294 801263B4 8422B644 */ lh $v0, %lo(MsgStyleVerticalLineOffsets)($at) /* BD298 801263B8 44820000 */ mtc1 $v0, $f0 /* BD29C 801263BC 00000000 */ nop /* BD2A0 801263C0 46800020 */ cvt.s.w $f0, $f0 @@ -3378,9 +3378,9 @@ glabel appendGfx_message /* BFEB8 80128FD8 00441021 */ addu $v0, $v0, $a0 /* BFEBC 80128FDC 00021080 */ sll $v0, $v0, 2 /* BFEC0 80128FE0 97C4045C */ lhu $a0, 0x45C($fp) -/* BFEC4 80128FE4 3C08802F */ lui $t0, %hi(gMsgCharsets) +/* BFEC4 80128FE4 3C08802F */ lui $t0, %hi(MsgCharsets) /* BFEC8 80128FE8 01034021 */ addu $t0, $t0, $v1 -/* BFECC 80128FEC 8D08B5A8 */ lw $t0, %lo(gMsgCharsets)($t0) +/* BFECC 80128FEC 8D08B5A8 */ lw $t0, %lo(MsgCharsets)($t0) /* BFED0 80128FF0 00982021 */ addu $a0, $a0, $t8 /* BFED4 80128FF4 8D030008 */ lw $v1, 0x8($t0) /* BFED8 80128FF8 97B8008E */ lhu $t8, 0x8E($sp) @@ -3433,9 +3433,9 @@ glabel appendGfx_message /* BFF94 801290B4 46001082 */ mul.s $f2, $f2, $f0 /* BFF98 801290B8 00000000 */ nop /* BFF9C 801290BC 00021040 */ sll $v0, $v0, 1 -/* BFFA0 801290C0 3C01802F */ lui $at, %hi(D_802EB644) +/* BFFA0 801290C0 3C01802F */ lui $at, %hi(MsgStyleVerticalLineOffsets) /* BFFA4 801290C4 00220821 */ addu $at, $at, $v0 -/* BFFA8 801290C8 8422B644 */ lh $v0, %lo(D_802EB644)($at) +/* BFFA8 801290C8 8422B644 */ lh $v0, %lo(MsgStyleVerticalLineOffsets)($at) /* BFFAC 801290CC 44820000 */ mtc1 $v0, $f0 /* BFFB0 801290D0 00000000 */ nop /* BFFB4 801290D4 46800020 */ cvt.s.w $f0, $f0 diff --git a/ver/ique/asm/nonmatchings/msg/msg_copy_to_print_buffer.s b/ver/ique/asm/nonmatchings/msg/msg_copy_to_print_buffer.s index 1559494f89..8089a95ca6 100644 --- a/ver/ique/asm/nonmatchings/msg/msg_copy_to_print_buffer.s +++ b/ver/ique/asm/nonmatchings/msg/msg_copy_to_print_buffer.s @@ -276,12 +276,12 @@ glabel msg_copy_to_print_buffer /* B9A28 80122B48 92830508 */ lbu $v1, 0x508($s4) /* B9A2C 80122B4C 00021080 */ sll $v0, $v0, 2 /* B9A30 80122B50 00031840 */ sll $v1, $v1, 1 -/* B9A34 80122B54 3C01802F */ lui $at, %hi(gMsgCharsets) +/* B9A34 80122B54 3C01802F */ lui $at, %hi(MsgCharsets) /* B9A38 80122B58 00220821 */ addu $at, $at, $v0 -/* B9A3C 80122B5C 8C22B5A8 */ lw $v0, %lo(gMsgCharsets)($at) -/* B9A40 80122B60 3C01802F */ lui $at, %hi(D_802EB644) +/* B9A3C 80122B5C 8C22B5A8 */ lw $v0, %lo(MsgCharsets)($at) +/* B9A40 80122B60 3C01802F */ lui $at, %hi(MsgStyleVerticalLineOffsets) /* B9A44 80122B64 00230821 */ addu $at, $at, $v1 -/* B9A48 80122B68 8423B644 */ lh $v1, %lo(D_802EB644)($at) +/* B9A48 80122B68 8423B644 */ lh $v1, %lo(MsgStyleVerticalLineOffsets)($at) /* B9A4C 80122B6C 90440003 */ lbu $a0, 0x3($v0) /* B9A50 80122B70 24020006 */ addiu $v0, $zero, 0x6 /* B9A54 80122B74 A28204F8 */ sb $v0, 0x4F8($s4) @@ -467,9 +467,9 @@ glabel msg_copy_to_print_buffer /* B9CFC 80122E1C 00108080 */ sll $s0, $s0, 2 /* B9D00 80122E20 0040302D */ daddu $a2, $v0, $zero /* B9D04 80122E24 AE82054C */ sw $v0, 0x54C($s4) -/* B9D08 80122E28 3C03802F */ lui $v1, %hi(D_802EB5C0) +/* B9D08 80122E28 3C03802F */ lui $v1, %hi(MsgLetterRasterOffsets) /* B9D0C 80122E2C 00701821 */ addu $v1, $v1, $s0 -/* B9D10 80122E30 8C63B5C0 */ lw $v1, %lo(D_802EB5C0)($v1) +/* B9D10 80122E30 8C63B5C0 */ lw $v1, %lo(MsgLetterRasterOffsets)($v1) /* B9D14 80122E34 3C080011 */ lui $t0, %hi(charset_ROM_START) /* B9D18 80122E38 2508E120 */ addiu $t0, $t0, %lo(charset_ROM_START) /* B9D1C 80122E3C 00682021 */ addu $a0, $v1, $t0 @@ -479,9 +479,9 @@ glabel msg_copy_to_print_buffer /* B9D2C 80122E4C 24040200 */ addiu $a0, $zero, 0x200 /* B9D30 80122E50 0040302D */ daddu $a2, $v0, $zero /* B9D34 80122E54 AE820550 */ sw $v0, 0x550($s4) -/* B9D38 80122E58 3C03802F */ lui $v1, %hi(D_802EB5F0) +/* B9D38 80122E58 3C03802F */ lui $v1, %hi(MsgLetterPaletteOffsets) /* B9D3C 80122E5C 00701821 */ addu $v1, $v1, $s0 -/* B9D40 80122E60 8C63B5F0 */ lw $v1, %lo(D_802EB5F0)($v1) +/* B9D40 80122E60 8C63B5F0 */ lw $v1, %lo(MsgLetterPaletteOffsets)($v1) /* B9D44 80122E64 3C080011 */ lui $t0, %hi(charset_ROM_START) /* B9D48 80122E68 2508E120 */ addiu $t0, $t0, %lo(charset_ROM_START) /* B9D4C 80122E6C 00682021 */ addu $a0, $v1, $t0 @@ -633,12 +633,12 @@ glabel msg_copy_to_print_buffer /* B9F48 80123068 92830508 */ lbu $v1, 0x508($s4) /* B9F4C 8012306C 00021080 */ sll $v0, $v0, 2 /* B9F50 80123070 00031840 */ sll $v1, $v1, 1 -/* B9F54 80123074 3C01802F */ lui $at, %hi(gMsgCharsets) +/* B9F54 80123074 3C01802F */ lui $at, %hi(MsgCharsets) /* B9F58 80123078 00220821 */ addu $at, $at, $v0 -/* B9F5C 8012307C 8C22B5A8 */ lw $v0, %lo(gMsgCharsets)($at) -/* B9F60 80123080 3C01802F */ lui $at, %hi(D_802EB644) +/* B9F5C 8012307C 8C22B5A8 */ lw $v0, %lo(MsgCharsets)($at) +/* B9F60 80123080 3C01802F */ lui $at, %hi(MsgStyleVerticalLineOffsets) /* B9F64 80123084 00230821 */ addu $at, $at, $v1 -/* B9F68 80123088 8423B644 */ lh $v1, %lo(D_802EB644)($at) +/* B9F68 80123088 8423B644 */ lh $v1, %lo(MsgStyleVerticalLineOffsets)($at) /* B9F6C 8012308C 90440003 */ lbu $a0, 0x3($v0) /* B9F70 80123090 24020006 */ addiu $v0, $zero, 0x6 /* B9F74 80123094 A28204F8 */ sb $v0, 0x4F8($s4) diff --git a/ver/ique/asm/nonmatchings/msg/msg_draw_char.s b/ver/ique/asm/nonmatchings/msg/msg_draw_char.s index cebc66699a..9dd1c8f37f 100644 --- a/ver/ique/asm/nonmatchings/msg/msg_draw_char.s +++ b/ver/ique/asm/nonmatchings/msg/msg_draw_char.s @@ -55,9 +55,9 @@ glabel msg_draw_char /* C16EC 8012A80C C6060018 */ lwc1 $f6, 0x18($s0) /* C16F0 8012A810 C602001C */ lwc1 $f2, 0x1C($s0) /* C16F4 8012A814 00021080 */ sll $v0, $v0, 2 -/* C16F8 8012A818 3C09802F */ lui $t1, %hi(gMsgCharsets) +/* C16F8 8012A818 3C09802F */ lui $t1, %hi(MsgCharsets) /* C16FC 8012A81C 01224821 */ addu $t1, $t1, $v0 -/* C1700 8012A820 8D29B5A8 */ lw $t1, %lo(gMsgCharsets)($t1) +/* C1700 8012A820 8D29B5A8 */ lw $t1, %lo(MsgCharsets)($t1) /* C1704 8012A824 8FA3003C */ lw $v1, 0x3C($sp) /* C1708 8012A828 91220000 */ lbu $v0, 0x0($t1) /* C170C 8012A82C 8E070004 */ lw $a3, 0x4($s0) diff --git a/ver/ique/symbol_addrs.txt b/ver/ique/symbol_addrs.txt index 02a1c24aeb..975616fd64 100644 --- a/ver/ique/symbol_addrs.txt +++ b/ver/ique/symbol_addrs.txt @@ -535,7 +535,7 @@ filemenu_set_cursor_alpha = 0x80242dec; // segment:filemenu gSaveSlotHasData = 0x80076684; gSaveSlotMetadata = 0x80076624; -gMsgCharsets = 0x802eb5a8; +MsgCharsets = 0x802eb5a8; load_font_data = 0x80121ae8; D_802F4560 = 0x802f4558; @@ -562,14 +562,14 @@ gDisplayContext = 0x8009924c; gAnimModelFogEnabled = 0x801521c4; D_801536C0 = 0x80151e40; general_heap_malloc = 0x8002a8f8; -D_802EE8D0 = 0x802ee8d0; -D_802ED970 = 0x802ed970; -D_802F39D0 = 0x802f39d0; +MsgCharImgNormal = 0x802ee8d0; +MsgCharImgTitle = 0x802ed970; +MsgCharImgSubtitle = 0x802f39d0; sfx_play_sound_with_params = 0x80148248; heap_malloc = 0x8002a9b4; D_80159180 = 0x8015b500; -D_802ED970 = 0x802ed970; -D_802F39D0 = 0x802f39d0; +MsgCharImgTitle = 0x802ed970; +MsgCharImgSubtitle = 0x802f39d0; charset_postcard_png = 0x00054fa8; charset_postcard_pal + 5 = 0x00056e70; D_80159B50 = 0x8015bed0; diff --git a/ver/ique/undefined_syms.txt b/ver/ique/undefined_syms.txt index 63b80c7a1b..fbd4efa563 100644 --- a/ver/ique/undefined_syms.txt +++ b/ver/ique/undefined_syms.txt @@ -1118,7 +1118,7 @@ HES_OptionMonoOff = 0x80242358; HES_OptionStereoOn = 0x80242384; HES_OptionStereoOff = 0x802423b0; HES_FilenameSpace = 0x80241fbc; -gMsgCharsets = 0x802eb5a8; +MsgCharsets = 0x802eb5a8; D_802F4560 = 0x802f4558; HES_134F60_135120 = 0x80242b74; HES_FilenameCaret = 0x80241f70; @@ -1129,7 +1129,7 @@ CircularShadowA = 0x802e98bc; CircularShadowB = 0x802e98e0; SquareShadow = 0x802e9904; evt_get_variable_index = 0x802c7da8; -D_802EE8D0 = 0x802ee8d0; +MsgCharImgNormal = 0x802ee8d0; charset_postcard_png = 0x00054fa8; ui_msg_star_silhouette_png = 0x802ed8d0; ui_msg_rewind_arrow_png = 0x802ed550; @@ -1193,17 +1193,17 @@ ui_msg_sign_fill_png = 0x802eccf0; ui_msg_lamppost_pal = 0x802ecd30; ui_msg_sign_pal = 0x802ecd10; ui_msg_sign_fill_png = 0x802eccf0; -D_802EB644 = 0x802eb644; +MsgStyleVerticalLineOffsets = 0x802eb644; ui_msg_bubble_left_png = 0x802eb670; ui_msg_bubble_mid_png = 0x802eba70; ui_msg_bubble_right_png = 0x802ebb70; ui_msg_arrow_png = 0x802ebf70; mdl_clearRenderTasks = 0x802b7e00; charset_postcard_pal = 0x00056e6b; -D_802ED970 = 0x802ed970; -D_802F39D0 = 0x802f39d0; -D_802EB5C0 = 0x802eb5c0; -D_802EB5F0 = 0x802eb5f0; +MsgCharImgTitle = 0x802ed970; +MsgCharImgSubtitle = 0x802f39d0; +MsgLetterRasterOffsets = 0x802eb5c0; +MsgLetterPaletteOffsets = 0x802eb5f0; MsgVoices = 0x802eb620; ui_msg_star_png = 0x802ed690; ui_point_right_pal = 0x800f9fc0; diff --git a/ver/pal/undefined_syms.txt b/ver/pal/undefined_syms.txt index 910372a226..ddd88f9e55 100644 --- a/ver/pal/undefined_syms.txt +++ b/ver/pal/undefined_syms.txt @@ -890,7 +890,7 @@ action_command_whirlwind_start = 0x802A91E0; action_command_power_shock_start = 0x802A9210; action_command_hammer_start = 0x802A9258; action_command_water_block_start = 0x802A9398; -gMsgCharsets = 0x802F18A8; +MsgCharsets = 0x802F18A8; D_802F4560 = 0x802FA860; heap_generalHead = 0x802FB800; heap_spriteHead = 0x8034F800; diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index bf4e685b3e..b66275e524 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -963,13 +963,13 @@ segments: vram: 0x802EB3D0 subsegments: - [auto, c, msg_data] - - [auto, c, msg_data_2] + - [auto, c, msg_img] - [auto, .data, msg_data] - - start: 0x10CE00 + - start: 0x10CEB0 type: .data - name: msg_data_2 + name: msg_img subsegments: - - [0x10CEB0, ci4, ui/msg/bubble_left, 32, 64, ui/msg/bubble_left] + - [auto, ci4, ui/msg/bubble_left, 32, 64, ui/msg/bubble_left] - [auto, ci4, ui/msg/bubble_mid, 8, 64, ui/msg/bubble_left] - [auto, ci4, ui/msg/bubble_right, 32, 64, ui/msg/bubble_left] - [auto, ci4, ui/msg/arrow, 16, 16, ui/msg/bubble_left] diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index ec35a0d531..9d0113a504 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -27188,15 +27188,15 @@ SaveBlockResultPrinter = 0x802EB39C; // SwitchToLink = 0x802EB3A0; // TriggerBlockVanishEffect = 0x802EB3B0; // HeartBlockPrinterClosed = 0x802EB3C0; // -D_802EB3D0 = 0x802EB3D0; // -gMsgCharsets = 0x802EB5A8; // -D_802EB5C0 = 0x802EB5C0; // -D_802EB5F0 = 0x802EB5F0; // +MsgCharWidthNormal = 0x802EB3D0; // +MsgCharsets = 0x802EB5A8; // +MsgLetterRasterOffsets = 0x802EB5C0; // +MsgLetterPaletteOffsets = 0x802EB5F0; // MsgVoices = 0x802EB620; // -D_802EB644 = 0x802EB644; // -D_802ED970 = 0x802ED970; // -D_802EE8D0 = 0x802EE8D0; // -D_802F39D0 = 0x802F39D0; // +MsgStyleVerticalLineOffsets = 0x802EB644; // +MsgCharImgTitle = 0x802ED970; // +MsgCharImgNormal = 0x802EE8D0; // +MsgCharImgSubtitle = 0x802F39D0; // D_802F4560 = 0x802F4560; // heap_generalHead = 0x802FB800; // heap_spriteHead = 0x8034F800; //