diff --git a/include/common_structs.h b/include/common_structs.h index 4cb6682c39..94441d2c4b 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -317,32 +317,32 @@ typedef struct PlayerData { /* 0x008 */ s8 maxBP; /* 0x009 */ s8 level; /* 0x00A */ b8 hasActionCommands; - /* 0x00B */ char unk_0B; + /* 0x00B */ char pad_00B; /* 0x00C */ s16 coins; /* 0x00E */ s8 fortressKeyCount; /* 0x00F */ u8 starPieces; /* 0x010 */ s8 starPoints; - /* 0x011 */ char unk_11; + /* 0x011 */ s8 unused_011; /* 0x012 */ s8 curPartner; - /* 0x013 */ char unk_13; + /* 0x013 */ char pad_013; /* 0x014 */ struct PartnerData partners[12]; /* 0x074 */ s16 keyItems[32]; /* 0x0B4 */ s16 badges[128]; /* 0x1B4 */ s16 invItems[10]; /* 0x1C8 */ s16 storedItems[32]; /* 0x208 */ s16 equippedBadges[64]; - /* 0x288 */ s8 unk_288; + /* 0x288 */ s8 unused_288; /* 0x289 */ s8 merleeSpellType; /* 0x28A */ s8 merleeCastsLeft; - /* 0x28B */ char unk_28B; + /* 0x28B */ char pad_28B; /* 0x28C */ s16 merleeTurnCount; /* 0x28E */ s8 maxStarPower; - /* 0x28F */ char unk_28F; - /* 0x290 */ s16 specialBarsFilled; + /* 0x28F */ char pad_28F; + /* 0x290 */ s16 starPower; /* 0x292 */ s8 starBeamLevel; - /* 0x293 */ char unk_293; + /* 0x293 */ char pad_293; /* 0x294 */ u16 actionCommandAttempts; - /* 0x296 */ s16 actionCommandSuccesses; + /* 0x296 */ u16 actionCommandSuccesses; /* 0x298 */ u16 hitsTaken; /* 0x29A */ u16 hitsBlocked; /* 0x29C */ u16 playerFirstStrikes; @@ -350,14 +350,14 @@ typedef struct PlayerData { /* 0x2A0 */ u16 powerBounces; /* 0x2A2 */ u16 battlesCount; /* 0x2A4 */ u16 battlesWon; - /* 0x2A6 */ s16 unk_2A6; - /* 0x2A8 */ s16 battlesFled; + /* 0x2A6 */ u16 fleeAttempts; + /* 0x2A8 */ u16 battlesFled; /* 0x2AA */ u16 trainingsDone; /* 0x2AC */ s32 walkingStepsTaken; /* 0x2B0 */ s32 runningStepsTaken; /* 0x2B4 */ u32 totalCoinsEarned; /* 0x2B8 */ s16 idleFrameCounter; /* frames with no inputs, overflows ever ~36 minutes of idling */ - /* 0x2BA */ char unk_2BA[2]; + /* 0x2BA */ char pad_2BA[2]; /* 0x2BC */ u32 frameCounter; /* increases by 2 per frame */ /* 0x2C0 */ u16 quizzesAnswered; /* 0x2C2 */ u16 quizzesCorrect; @@ -372,27 +372,17 @@ typedef struct PlayerData { /* 0x336 */ u16 smashGamePlays; /* 0x338 */ u32 smashGameTotal; /* all-time winnings, max = 99999 */ /* 0x33C */ u16 smashGameRecord; - /* 0x33E */ char unk_33E[2]; - /* 0x340 */ char unk_340[0xE0]; - /* 0x420 */ s32 starPoints2; - /* 0x424 */ char unk_464[4]; + /* 0x33E */ char pad_33E[2]; + /* 0x340 */ char reserved[0xE8]; // unused } PlayerData; // size = 0x428 -typedef union { - struct { - /* 0x0 */ s16 genericFlagIndex; - /* 0x2 */ char unk_2; - } bytes; - s32 flags; -} TriggerFlags; - typedef struct Trigger { - /* 0x00 */ TriggerFlags flags; + /* 0x00 */ s32 flags; /* 0x04 */ s32 varIndex; /* 0x08 */ union { - s32 colliderID; - Vec4f* pos; - } location; + /* */ s32 colliderID; + /* */ Vec4f* pos; + /* */ } location; /* 0x0C */ s32 (*onActivateFunc)(struct Trigger*); /* 0x10 */ EvtScript* onTriggerEvt; /* 0x14 */ struct Evt* runningScript; @@ -660,32 +650,34 @@ typedef struct MusicProximityTrigger { /* 0x14 */ s32 manualActivationFlag; } MusicProximityTrigger; // size = 0x18 -typedef struct UiStatus { - /* 0x00 */ s32 hpIconIndices[2]; - /* 0x08 */ s32 fpIconIndices[2]; - /* 0x10 */ s32 coinIconIndex; - /* 0x14 */ s32 coinSparkleIconIndex; - /* 0x18 */ s32 starpointsIconIndex; - /* 0x1C */ s32 starpointsShineIconIndex; - /* 0x20 */ s32 iconIndex8; - /* 0x24 */ s32 iconIndex9; - /* 0x28 */ s32 iconIndexA; - /* 0x2C */ s32 iconIndexB; - /* 0x30 */ s32 starIconIndex; - /* 0x34 */ s16 drawPosX; /* overall x-offset for whole UI */ - /* 0x36 */ s16 drawPosY; /* modulated as it appears, goes away */ +typedef struct StatusBar { + /* 0x00 */ s32 hpIconHIDs[2]; + /* 0x08 */ s32 fpIconHIDs[2]; + /* 0x10 */ s32 coinIconHID; + /* 0x14 */ s32 coinSparkleHID; + /* 0x18 */ s32 spIconHID; + /* 0x1C */ s32 spShineHID; + /* 0x20 */ s32 hpTimesHID; + /* 0x24 */ s32 fpTimesHID; + /* 0x28 */ s32 spTimesHID; + /* 0x2C */ s32 coinTimesHID; + /* 0x30 */ s32 starIconHID; + /* 0x34 */ s16 drawPosX; // base position of the whole bar + /* 0x36 */ s16 drawPosY; // base position of the whole bar, animated when it appears /* 0x38 */ s16 showTimer; - /* 0x3A */ s8 hidden; - /* 0x3B */ s8 unk_3B[2]; + /* 0x3A */ b8 hidden; + /* 0x3B */ b8 unk_3B; + /* 0x3C */ b8 unk_3C; /* 0x3D */ s8 displayHP; /* 0x3E */ s8 displayFP; /* 0x3F */ char unk_3F; /* 0x40 */ s16 displayCoins; /* 0x42 */ s16 displayStarpoints; /* 0x44 */ s8 ignoreChanges; /* set != 0 to prevent automatic opening from HP/FP changes */ - /* 0x45 */ s8 unk_45[2]; + /* 0x45 */ s8 openInputDisabled; + /* 0x45 */ s8 alwaysShown; // when set, the status bar will always be shown. used while browsing a shop. /* 0x47 */ s8 disabled; /* set != 0 for menu to be disabled completely */ - /* 0x48 */ s16 displaySP; + /* 0x48 */ s16 displayStarPower; /* 0x4A */ s8 hpBlinking; /* bool */ /* 0x4B */ s8 hpBlinkCounter; /* 0x4C */ s8 hpBlinkTimer; /* until stop */ @@ -704,12 +696,15 @@ typedef struct UiStatus { /* 0x59 */ s8 unk_59; /* 0x5A */ s8 spBarsToBlink; /* how many sp bars to blink */ /* 0x5B */ char unk_5B; - /* 0x5C */ s32 iconIndex10; - /* 0x60 */ s32 iconIndex11; + /* 0x5C */ s32 coinCountTimesHID; + /* 0x60 */ s32 coinCountIconHID; /* 0x64 */ s32 iconIndex12; /* 0x68 */ s32 iconIndex13; - /* 0x6C */ s8 unk_6C[4]; -} UiStatus; // size = 0x70 + /* 0x6C */ s8 coinCounterHideTime; + /* 0x6D */ s8 unk_6D; + /* 0x6E */ s8 unk_6E; + /* 0x6F */ char unk_6F; +} StatusBar; // size = 0x70 typedef struct CameraInitData { /* 0x00 */ s16 flags; @@ -979,8 +974,8 @@ typedef struct BattleStatus { /* 0x21C */ s32 stickX; /* 0x220 */ s32 stickY; /* 0x224 */ s32 inputBitmask; - /* 0x228 */ s32 dpadX; /* 0-360 */ - /* 0x22C */ s32 dpadY; /* 0-60 */ + /* 0x228 */ s32 stickAngle; /* 0-360 */ + /* 0x22C */ s32 stickMagnitude; /* 0-60 */ /* 0x230 */ s32 holdInputBuffer[64]; /* 0x330 */ s32 pushInputBuffer[64]; /* 0x430 */ s8 holdInputBufferPos; @@ -1956,7 +1951,7 @@ typedef struct Actor { /* 0x40C */ s8 targetListLength; /* 0x40D */ s8 targetIndexList[MAX_ENEMY_ACTORS]; /* into targetData */ /* 0x425 */ s8 selectedTargetIndex; /* into target index list */ - /* 0x426 */ s8 targetPartIndex; + /* 0x426 */ s8 targetPartID; /* 0x427 */ char unk_427[1]; /* 0x428 */ s16 targetActorID; /* 0x42A */ char unk_42A[2]; @@ -2000,8 +1995,8 @@ typedef struct PlayerStatus { /* 0x00B */ char unk_0B; /* 0x00C */ s8 peachDisguise; /* 0x00D */ s8 availableDisguiseType; ///< set in main map scripts - /* 0x00E */ u8 alpha1; - /* 0x00F */ u8 alpha2; + /* 0x00E */ u8 curAlpha; + /* 0x00F */ u8 prevAlpha; /* 0x010 */ s16 blinkTimer; /* 0x012 */ s16 moveFrames; /* 0x014 */ s8 enableCollisionOverlapsCheck; diff --git a/include/dead.h b/include/dead.h index 902964ce9e..1851fb6e02 100644 --- a/include/dead.h +++ b/include/dead.h @@ -74,13 +74,13 @@ #define spawn_surface_effects dead_spawn_surface_effects #define get_item_entity dead_get_item_entity #define gOverrideFlags dead_gOverrideFlags -#define set_message_msg dead_set_message_msg +#define set_message_text_var dead_set_message_text_var #define gPlayerData dead_gPlayerData #define gPartnerPopupProperties dead_gPartnerPopupProperties #define increment_status_bar_disabled dead_increment_status_bar_disabled #define decrement_status_bar_disabled dead_decrement_status_bar_disabled #define sync_status_bar dead_sync_status_bar -#define set_max_SP dead_set_max_SP +#define set_max_star_power dead_set_max_star_power #define get_current_map_settings dead_get_current_map_settings #define gGameStatusPtr dead_gGameStatusPtr #define guTranslateF dead_guTranslateF diff --git a/include/effects.h b/include/effects.h index 9fcd2aa00c..20d68ad5a1 100644 --- a/include/effects.h +++ b/include/effects.h @@ -1799,37 +1799,44 @@ typedef struct Effect65FXData { /* 0x2AC */ f32 pathLength[30]; } Effect65FXData; // size = 0x324 +#define TUBBA_MINI_HEART_COUNT 25 + +enum HeartSwarmFXTypes { + FX_HEART_SWARM_HIT = 0, + FX_HEART_SWARM_MISS = 1, +}; + typedef struct TubbaHeartAttackFXData { - /* 0x000 */ s32 unk_00; - /* 0x004 */ f32 unk_04; - /* 0x008 */ f32 unk_08; - /* 0x00C */ f32 unk_0C; - /* 0x010 */ s32 unk_10; - /* 0x014 */ s32 unk_14; - /* 0x018 */ s32 unk_18; - /* 0x01C */ s32 unk_1C; - /* 0x020 */ s32 unk_20; - /* 0x024 */ s32 unk_24; - /* 0x028 */ f32 unk_28; - /* 0x02C */ f32 unk_2C[25]; - /* 0x090 */ f32 unk_90[25]; - /* 0x0F4 */ f32 unk_F4[25]; - /* 0x158 */ f32 unk_158[25]; - /* 0x1BC */ f32 unk_1BC[25]; - /* 0x220 */ f32 unk_220[25]; - /* 0x284 */ f32 unk_284[25]; - /* 0x2E8 */ f32 unk_2E8[25]; - /* 0x34C */ f32 unk_34C[25]; - /* 0x3B0 */ f32 unk_3B0[25]; - /* 0x414 */ f32 unk_414[25]; - /* 0x478 */ f32 unk_478[25]; - /* 0x4DC */ f32 unk_4DC[25]; - /* 0x540 */ f32 unk_540[25]; - /* 0x5A4 */ f32 unk_5A4[25]; - /* 0x608 */ f32 unk_608[25]; - /* 0x66C */ s32 unk_66C[25]; - /* 0x6D0 */ s32 unk_6D0[25]; - /* 0x734 */ s32 unk_734[25]; + /* 0x000 */ s32 type; + /* 0x004 */ f32 centerX; + /* 0x008 */ f32 centerY; + /* 0x00C */ f32 centerZ; + /* 0x010 */ s32 timeLeft; + /* 0x014 */ s32 lifetime; + /* 0x018 */ s32 primR; + /* 0x01C */ s32 primG; + /* 0x020 */ s32 primB; + /* 0x024 */ s32 primA; + /* 0x028 */ f32 overallScale; + /* 0x02C */ f32 posX[TUBBA_MINI_HEART_COUNT]; + /* 0x090 */ f32 posY[TUBBA_MINI_HEART_COUNT]; + /* 0x0F4 */ f32 posZ[TUBBA_MINI_HEART_COUNT]; + /* 0x158 */ f32 initialX[TUBBA_MINI_HEART_COUNT]; + /* 0x1BC */ f32 initialY[TUBBA_MINI_HEART_COUNT]; + /* 0x220 */ f32 initialZ[TUBBA_MINI_HEART_COUNT]; + /* 0x284 */ f32 finalX[TUBBA_MINI_HEART_COUNT]; + /* 0x2E8 */ f32 finalY[TUBBA_MINI_HEART_COUNT]; + /* 0x34C */ f32 finalZ[TUBBA_MINI_HEART_COUNT]; + /* 0x3B0 */ f32 scaleX[TUBBA_MINI_HEART_COUNT]; + /* 0x414 */ f32 scaleY[TUBBA_MINI_HEART_COUNT]; + /* 0x478 */ f32 rotZ[TUBBA_MINI_HEART_COUNT]; + /* 0x4DC */ f32 rotXY[TUBBA_MINI_HEART_COUNT]; + /* 0x540 */ f32 shrinkVelX[TUBBA_MINI_HEART_COUNT]; + /* 0x5A4 */ f32 shrinkVelY[TUBBA_MINI_HEART_COUNT]; + /* 0x608 */ f32 shrinkVelZ[TUBBA_MINI_HEART_COUNT]; + /* 0x66C */ s32 appearDelay[TUBBA_MINI_HEART_COUNT]; + /* 0x6D0 */ s32 state[TUBBA_MINI_HEART_COUNT]; + /* 0x734 */ s32 stateTime[TUBBA_MINI_HEART_COUNT]; } TubbaHeartAttackFXData; // size = 0x798 #define MAX_WHIRLWIND_SEGMENTS 8 @@ -2313,7 +2320,7 @@ typedef struct BreakingJunkFXData { enum { FX_BUFF_DATA_WATER_BLOCK = 0, FX_BUFF_DATA_CLOUD_NINE = 1, - FX_BUFF_DATA_TURBO_CHARGE = 2 + FX_BUFF_DATA_TURBO_CHARGE = 2, }; typedef struct BuffData { diff --git a/include/enums.h b/include/enums.h index c3d48f9c73..c44d99e463 100644 --- a/include/enums.h +++ b/include/enums.h @@ -593,7 +593,7 @@ enum SoundIDs { SOUND_LRAW_TROMP_ROLL = 0x00000052, SOUND_ISK_DRAINING_SAND = 0x00000053, // #looping SOUND_ISK_FLIP_STAIRS = 0x00000054, - SOUND_LENS_FLARE = 0x00000055, + SOUND_LARGE_LENS_FLARE = 0x00000055, SOUND_LRAW_ISK_LOWER_STAIRS = 0x00000056, SOUND_ISK_STAIR_DROP_THUD = 0x00000057, SOUND_ISK_STAIRS_EMERGE_RUMBLE = 0x00000058, @@ -727,8 +727,7 @@ enum SoundIDs { SOUND_ACTOR_HURT = 0x0000010F, SOUND_HIT_RATTLE = 0x00000110, SOUND_HEART_BLOCK = 0x00000131, - SOUND_0132 = 0x00000132, // #unused - SOUND_0133 = 0x00000133, // #unused + SOUND_UNUSED_HEAL_BLOCK = 0x00000133, // #unused SOUND_ASCENDING_CHIMES = 0x00000134, // #unused SOUND_DESCENDING_CHIMES = 0x00000135, // #unused SOUND_STAR_CARD_APPEARS = 0x00000137, @@ -753,13 +752,13 @@ enum SoundIDs { SOUND_SEARCH_BUSH = 0x00000153, SOUND_PLAYER_CHARGE = 0x00000156, SOUND_BLOCK_SHATTER = 0x00000158, - SOUND_0159 = 0x00000159, // #unused + SOUND_SMALL_BOING = 0x00000159, // #spring #boing #unused SOUND_ACTOR_JUMPED_1 = 0x0000015A, // #unused SOUND_ACTOR_JUMPED_2 = 0x0000015B, // #unused SOUND_ACTOR_JUMPED_3 = 0x0000015C, // #unused SOUND_PLAYER_RUN_IN_PLACE = 0x0000015D, SOUND_PLAYER_RUN_AWAY = 0x0000015E, - SOUND_PLAYER_JUMP = 0x00000160, + SOUND_LONG_PLAYER_JUMP = 0x00000160, SOUND_PLAYER_LONG_FALL = 0x00000161, SOUND_TRIP = 0x00000162, SOUND_ENTER_PIPE = 0x00000163, @@ -972,18 +971,19 @@ enum SoundIDs { SOUND_LRAW_WATER_FLOWING_4 = 0x00000276, // #water #flowing SOUND_GOOMBARIO_HEADBONK = 0x00000281, // #descending #falling SOUND_TATTLE_WINDOW_OPEN = 0x00000282, - SOUND_0283 = 0x00000283, - SOUND_0284 = 0x00000284, - SOUND_0286 = 0x00000286, + SOUND_KOOPER_SHELL_KICK = 0x00000283, + SOUND_KOOPER_SHELL_SWIRL = 0x00000284, + SOUND_KOOPER_PICKUP = 0x00000286, SOUND_LRAW_BOMBETTE_FUSE = 0x00000287, - SOUND_0288 = 0x00000288, - SOUND_0289 = 0x00000289, - SOUND_028A = 0x0000028A, - SOUND_028B = 0x0000028B, - SOUND_028C = 0x0000028C, - SOUND_028E = 0x0000028E, - SOUND_028F = 0x0000028F, - SOUND_0290 = 0x00000290, + SOUND_LAKILESTER_HURRICANE_WIND = 0x00000288, + SOUND_WATT_CHARGE = 0x00000289, + SOUND_WATT_POWER_SHOCK = 0x0000028A, + SOUND_WATT_TURBO_CHARGE = 0x0000028B, + SOUND_WATT_MEGA_DISCHARGE = 0x0000028C, + SOUND_WATT_WHOOSH_SHOCK = 0x0000028D, // #unused + SOUND_ROARING_FIRE = 0x0000028E, + SOUND_FIRE_SHELL_LAUNCH = 0x0000028F, + SOUND_DIZZY_SHELL_LAUNCH = 0x00000290, SOUND_BOW_SPOOK = 0x00000291, SOUND_BOOTLER_SPOOK = 0x00000292, SOUND_BOOTLER_HIDE = 0x00000293, @@ -1007,8 +1007,8 @@ enum SoundIDs { SOUND_TWINK_FLY_B = 0x000002AA, SOUND_PARAGOOMBA_DIVE = 0x000002C1, SOUND_HURT_PLANT_BITE = 0x000002C4, - SOUND_LAKILESTER_SUMMON_SPINY = 0x000002C5, - SOUND_LAKILESTER_THROW_SPINY = 0x000002C6, + SOUND_SPIKE_SUMMON_SPINY = 0x000002C5, + SOUND_SPIKE_THROW_SPINY = 0x000002C6, SOUND_SPINY_SPIN_UP = 0x000002C7, SOUND_BULLET_BILL_FIRE = 0x000002C8, SOUND_BULLET_BILL_MOTION = 0x000002C9, @@ -1027,14 +1027,14 @@ enum SoundIDs { SOUND_DAYZEE_STEP = 0x000002D6, SOUND_DAYZEE_SONG = 0x000002D7, SOUND_POWER_UP = 0x000002D8, - SOUND_02D9 = 0x000002D9, - SOUND_02DA = 0x000002DA, - SOUND_02DB = 0x000002DB, - SOUND_02DC = 0x000002DC, - SOUND_02DD = 0x000002DD, - SOUND_02DE = 0x000002DE, - SOUND_02DF = 0x000002DF, - SOUND_02E0 = 0x000002E0, + SOUND_HYPER_CLEFT_LAND = 0x000002D9, + SOUND_HYPER_CLEFT_CHARGE = 0x000002DA, + SOUND_MAGIKOOPA_VANISH = 0x000002DB, + SOUND_MAGIKOOPA_WAND_STRIKE = 0x000002DC, + SOUND_MAGIKOOPA_POWER_UP = 0x000002DD, + SOUND_SUMMON_CRYSTAL_BITS = 0x000002DE, // #windy #chimes + SOUND_SUMMON_CRYSTAL_CLONES = 0x000002DF, + SOUND_CRYSTAL_KING_ICE_BOLT = 0x000002E0, SOUND_SKY_GUY_BALLOON_POP = 0x000002E1, SOUND_GROOVE_GUY_TWIRL = 0x000002E2, SOUND_GROOVE_GUY_LEAP = 0x000002E3, @@ -1057,24 +1057,24 @@ enum SoundIDs { SOUND_AI_ALERT_A = 0x000002F4, SOUND_AI_ALERT_B = 0x000002F5, SOUND_TWEESTER_LAUNCH = 0x000002F6, - SOUND_02F7 = 0x000002F7, - SOUND_02F8 = 0x000002F8, - SOUND_02F9 = 0x000002F9, - SOUND_02FA = 0x000002FA, - SOUND_02FB = 0x000002FB, - SOUND_02FC = 0x000002FC, - SOUND_02FD = 0x000002FD, + SOUND_SENTINEL_PICKUP = 0x000002F7, + SOUND_GATHER_SMALL = 0x000002F8, + SOUND_TOSS = 0x000002F9, + SOUND_SPEAR_GUY_DANCE_1 = 0x000002FA, + SOUND_SPEAR_GUY_DANCE_2 = 0x000002FB, + SOUND_SPEAR_GUY_RIP_SKIRT = 0x000002FC, + SOUND_ALBINO_DINO_STEP_B = 0x000002FD, SOUND_CLOSE_SHELL = 0x000002FF, - SOUND_JR_TROOPA_TRANSFORM = 0x00000300, + SOUND_JR_TROOPA_NEW_POWER = 0x00000300, SOUND_FALL_QUICK = 0x00000301, SOUND_FALL_LONG = 0x00000302, SOUND_LARGE_FALL_QUICK = 0x00000303, SOUND_LARGE_FALL_LONG = 0x00000304, // unused - SOUND_0305 = 0x00000305, - SOUND_0306 = 0x00000306, - SOUND_0309 = 0x00000309, - SOUND_030A = 0x0000030A, - SOUND_030B = 0x0000030B, + SOUND_LONG_FLUTTER_FALL_A = 0x00000305, + SOUND_LONG_FLUTTER_FALL_B = 0x00000306, + SOUND_SPEAR_STAB = 0x00000309, + SOUND_SPEAR_THROW = 0x0000030A, // #whoosh + SOUND_ALBINO_DINO_STEP_A = 0x0000030B, SOUND_SHY_GUY_SCREAMS1 = 0x0000030C, SOUND_SHY_GUY_SCREAMS2 = 0x0000030D, SOUND_SHY_GUY_SCREAMS3 = 0x0000030E, @@ -1096,11 +1096,12 @@ enum SoundIDs { SOUND_BURROW_SURFACE = 0x00000321, SOUND_BURROW_DIG = 0x00000322, SOUND_MOLE_POP = 0x00000323, - SOUND_0327 = 0x00000327, - SOUND_0328 = 0x00000328, - SOUND_032B = 0x0000032B, - SOUND_032C = 0x0000032C, - SOUND_032D = 0x0000032D, + SOUND_MALLET_SWING = 0x00000327, + SOUND_BLASTER_FIRE = 0x00000328, + SOUND_CREEPY_LAUGH = 0x00000329, // #unused + SOUND_SKID = 0x0000032B, + SOUND_NPC_JUMP = 0x0000032C, + SOUND_LOWER_NPC_JUMP = 0x0000032D, SOUND_LRAW_SENTINEL_ALARM = 0x0000032E, SOUND_SNORE_INHALE_A = 0x0000032F, SOUND_SNORE_INHALE_B = 0x00000330, @@ -1127,77 +1128,80 @@ enum SoundIDs { SOUND_POKEY_LEAN_BACK = 0x00000345, SOUND_POKEY_EMERGE_FROM_GROUND = 0x00000346, SOUND_LRAW_CHEERING = 0x00000349, - SOUND_034A = 0x0000034A, - SOUND_034E = 0x0000034E, + SOUND_SHORT_CLAP = 0x0000034A, + SOUND_MULTI_CLAP = 0x0000034B, // #unused + SOUND_TOY_TANK_EXPLODE = 0x0000034E, // #explosion + SOUND_SLOT_REELS = 0x00000350, // #unused SOUND_ACTOR_FLIGHT = 0x00000351, - SOUND_0353 = 0x00000353, - SOUND_0354 = 0x00000354, - SOUND_0355 = 0x00000355, - SOUND_0356 = 0x00000356, - SOUND_0357 = 0x00000357, - SOUND_0358 = 0x00000358, + SOUND_KOOPA_BROS_SPINUP = 0x00000353, + SOUND_KOOPA_BROS_TOWER_SPIN_1 = 0x00000354, + SOUND_KOOPA_BROS_TOWER_SPIN_2 = 0x00000355, + SOUND_KOOPA_BROS_TOWER_SPIN_3 = 0x00000356, + SOUND_BZZAP_BUZZ = 0x00000357, // #looping + SOUND_MINI_BZZAP_BUZZ = 0x00000358, SOUND_EMBER_FLY = 0x00000359, // #looping - SOUND_035B = 0x0000035B, - SOUND_CHARGE_LIGHTNING = 0x0000035C, - SOUND_035D = 0x0000035D, - SOUND_035E = 0x0000035E, - SOUND_035F = 0x0000035F, - SOUND_0361 = 0x00000361, - SOUND_0362 = 0x00000362, - SOUND_0363 = 0x00000363, - SOUND_0364 = 0x00000364, - SOUND_0365 = 0x00000365, + SOUND_HUFF_N_PUFF_FIRE_LIGHTNING = 0x0000035B, // #electric #boom #echoing + SOUND_CHARGE_LIGHTNING = 0x0000035C, // #electric #ascending + SOUND_HEAVY_WIND_LOOP = 0x0000035D, // #looping #windy + SOUND_HEAVY_NPC_SWIPE = 0x0000035E, + SOUND_BABY_BLOOPER_MOVE = 0x0000035F, + SOUND_PUT_ON_CAP = 0x00000361, + SOUND_BECOME_STONE = 0x00000362, + SOUND_WINTERY_JINGLE = 0x00000363, + SOUND_SHEEP_STAMPEDE = 0x00000364, + SOUND_THUNDER_BOLT = 0x00000365, SOUND_LIGHTNING_STRIKE = 0x00000366, - SOUND_0367 = 0x00000367, - SOUND_0368 = 0x00000368, - SOUND_0369 = 0x00000369, - SOUND_036B = 0x0000036B, + SOUND_FRIGHT_JAR = 0x00000367, + SOUND_MYSTERY_REEL = 0x00000368, + SOUND_HUSTLE_WHISTLE = 0x00000369, + SOUND_SMALL_GLASS_BREAK = 0x00000369, // #unused + SOUND_CRYSTAL_KING_DISAPPEAR = 0x0000036B, SOUND_LRAW_SHY_GUY_CROWD_1 = 0x0000036C, SOUND_LRAW_SHY_GUY_CROWD_2 = 0x0000036D, - SOUND_036E = 0x0000036E, - SOUND_036F = 0x0000036F, - SOUND_0370 = 0x00000370, - SOUND_0371 = 0x00000371, - SOUND_0372 = 0x00000372, - SOUND_0373 = 0x00000373, - SOUND_0374 = 0x00000374, - SOUND_0375 = 0x00000375, - SOUND_0376 = 0x00000376, - SOUND_0377 = 0x00000377, - SOUND_0378 = 0x00000378, - SOUND_0379 = 0x00000379, + SOUND_MONSTAR_STAR_STORM = 0x0000036E, + SOUND_TOY_TANK_FALL_APART = 0x0000036F, + SOUND_KENT_C_SHELL_TOSS_LOOP = 0x00000370, // #looping + SOUND_PLAYER_SPINNING = 0x00000371, + SOUND_LIFE_SHROOM_CHIME = 0x00000372, + SOUND_REVIVAL_MAGIC = 0x00000373, // #magic #chimes + SOUND_PLAYER_REVIVE = 0x00000374, + SOUND_REPEL_GEL_APPLY = 0x00000375, + SOUND_REPEL_GEL_VANISH = 0x00000376, + SOUND_PLANT_FIRE_FLOWER = 0x00000377, + SOUND_RECOVERY_SHMMER = 0x00000378, + SOUND_VOLT_SHROOM_APPLY = 0x00000379, SOUND_HIT_PLAYER_SHOCK = 0x0000037A, SOUND_HIT_SHOCK = 0x0000037B, - SOUND_037C = 0x0000037C, - SOUND_037D = 0x0000037D, - SOUND_037E = 0x0000037E, - SOUND_SHYGUY_FLY = 0x00000380, - SOUND_0381 = 0x00000381, - SOUND_0382 = 0x00000382, - SOUND_0383 = 0x00000383, - SOUND_0384 = 0x00000384, - SOUND_0385 = 0x00000385, - SOUND_0386 = 0x00000386, - SOUND_0387 = 0x00000387, + SOUND_KOOPA_LAUNCH_SHELL = 0x0000037C, + SOUND_LANTERN_GHOST_STEP = 0x0000037D, + SOUND_TOY_TANK_STEP = 0x0000037E, + SOUND_SHY_GUY_FLY = 0x00000380, + SOUND_GOURMET_GUY_SHOCK_1 = 0x00000381, + SOUND_GOURMET_GUY_SHOCK_2 = 0x00000382, + SOUND_GOURMET_GUY_SHOCK_3 = 0x00000383, + SOUND_GOURMET_GUY_RUN = 0x00000384, + SOUND_GOURMET_GUY_LAUNCH = 0x00000385, + SOUND_BIG_DRUM_A = 0x00000386, + SOUND_BIG_DRUM_B = 0x00000387, SOUND_LRAW_OMO_SLOT_MACHINE = 0x00000388, - SOUND_0389 = 0x00000389, - SOUND_038A = 0x0000038A, - SOUND_038B = 0x0000038B, - SOUND_038C = 0x0000038C, - SOUND_038D = 0x0000038D, - SOUND_038E = 0x0000038E, - SOUND_0390 = 0x00000390, - SOUND_LRAW_SPINNING_FLOWER = 0x00000391, - SOUND_0392 = 0x00000392, + SOUND_SAM_POND_CRACK_1 = 0x00000389, + SOUND_SAM_POND_CRACK_2 = 0x0000038A, + SOUND_SAM_POND_SHATTER = 0x0000038B, + SOUND_SAM_SNOWMAN_JUMP = 0x0000038C, + SOUND_SAM_SNOWMEN_RAISE_WALL = 0x0000038D, + SOUND_SAM_SNOWMEN_OPEN_PASSAGE = 0x0000038E, + SOUND_TOSS_PLAYER = 0x00000390, + SOUND_LRAW_SPINNING_FLOWER = 0x00000391, + SOUND_MUNCHLESIA_CHEW = 0x00000392, SOUND_MUNCHLESIA_SPIT = 0x00000393, SOUND_OVEN_TIMER_TICKING = 0x00000394, // #looping SOUND_GENERAL_WHISTLE = 0x00000395, - SOUND_0396 = 0x00000396, - SOUND_0397 = 0x00000397, - SOUND_0398 = 0x00000398, - SOUND_0399 = 0x00000399, - SOUND_039A = 0x0000039A, - SOUND_039B = 0x0000039B, + SOUND_ICE_SHATTER = 0x00000396, + SOUND_PENGUIN_WHISTLE = 0x00000397, // identical to SOUND_GENERAL_WHISTLE + SOUND_DRAG_PLAYER = 0x00000398, // #looping #windy #scraping + SOUND_SAM07_RAISE_FLOOR = 0x00000399, // #ascending + SOUND_SAM07_LOWER_FLOOR = 0x0000039A, // #descending + SOUND_SAM08_RAISE_FLOOR = 0x0000039B, // #ascending SOUND_SAM_STAIRS_ACTIVATE = 0x0000039C, SOUND_SAM_STAIRS_LOUD_THUD = 0x0000039D, SOUND_LRAW_SAM_STAIRS_RISE = 0x0000039E, @@ -1215,36 +1219,38 @@ enum SoundIDs { SOUND_LANTERN_GHOST_DARKEN_4 = 0x000003AA, SOUND_PIRANHA_BREATH = 0x000003AB, SOUND_GOOMBA_BROS_STEP = 0x000003AC, - SOUND_LRAW_FIGHTING = 0x000003AD, - SOUND_03AE = 0x000003AE, - SOUND_03AF = 0x000003AF, - SOUND_03B0 = 0x000003B0, - SOUND_03B1 = 0x000003B1, - SOUND_03B2 = 0x000003B2, - SOUND_03B3 = 0x000003B3, + SOUND_LRAW_FIGHTING = 0x000003AD, + SOUND_TANK_BULB_SHATTER = 0x000003AE, + SOUND_CRYSTAL_KING_INHALE = 0x000003AF, + SOUND_HUFF_N_PUFF_INHALE = 0x000003B0, // #looping + SOUND_PIRANHA_SPIN = 0x000003B1, + SOUND_PIRANHA_CHOMP = 0x000003B2, + SOUND_HUFF_N_PUFF_REAR_UP = 0x000003B3, SOUND_ACTOR_STEP_B = 0x000003B4, SOUND_FAKE_BOWSER_BLAST = 0x000003B5, // large blasting sound when the fake bowser robot is destroyed SOUND_SHY_GUY_STEP_A = 0x000003B6, SOUND_SHY_GUY_STEP_B = 0x000003B7, - SOUND_03B9 = 0x000003B9, - SOUND_03BB = 0x000003BB, - SOUND_LRAW_RUMBLE = 0x000003BC, - SOUND_03BD = 0x000003BD, - SOUND_03BE = 0x000003BE, - SOUND_03C0 = 0x000003C0, - SOUND_03C1 = 0x000003C1, - SOUND_03C3 = 0x000003C3, - SOUND_03C4 = 0x000003C4, - SOUND_03C5 = 0x000003C5, - SOUND_03C6 = 0x000003C6, - SOUND_03C7 = 0x000003C7, - SOUND_03C8 = 0x000003C8, - SOUND_03C9 = 0x000003C9, - SOUND_03CA = 0x000003CA, - SOUND_03CB = 0x000003CB, - SOUND_03CC = 0x000003CC, - SOUND_03CD = 0x000003CD, - SOUND_03CE = 0x000003CE, + SOUND_MASTER_LEAP = 0x000003B9, + SOUND_BUBBLE_DOWN = 0x000003BA, // #unused #descending + SOUND_LAVA_PIRANHA_RECOVER = 0x000003BB, + SOUND_LRAW_RUMBLE = 0x000003BC, + SOUND_BOWSER_FIRE_BREATH_LOOP = 0x000003BD, // #looping #wind #rumble + SOUND_FAKE_BOWSER_LONG_WALK = 0x000003BE, // #rattle + SOUND_HUFF_N_PUFF_EMERGE = 0x000003C0, + SOUND_LAVA_PIRANHA_INHALE = 0x000003C1, + SOUND_LAVA_PIRANHA_SHRIVEL = 0x000003C2, // #unused + SOUND_LAVA_PIRANHA_SPIT_FIRE = 0x000003C3, + SOUND_LAVA_PIRANHA_FIRE_BREATH = 0x000003C4, + SOUND_LAVA_PIRANHA_EMERGE = 0x000003C5, + SOUND_LAVA_PIRANHA_DEFEAT = 0x000003C6, + SOUND_LAVA_BUD_WITHER = 0x000003C7, + SOUND_LAVA_PIRANHA_WITHER = 0x000003C8, + SOUND_LAVA_BUD_SPIT_PETIT = 0x000003C9, + SOUND_PETIT_PIRANHA_ASCEND = 0x000003CA, + SOUND_PETIT_PIRANHA_DIVE = 0x000003CB, + SOUND_LAVA_PIRANHA_WRITHE = 0x000003CC, + SOUND_LAVA_PIRANHA_COLLAPSE = 0x000003CD, + SOUND_PIRANHA_STEP = 0x000003CE, SOUND_LANTERN_GHOST_INHALE = 0x000003CF, SOUND_LANTERN_GHOST_BLOW = 0x000003D0, SOUND_HUFF_N_PUFF_FLY = 0x000003D1, @@ -1253,13 +1259,13 @@ enum SoundIDs { SOUND_OPEN_SHELL = 0x000003D4, SOUND_RUFF_PUFF_FLY_A = 0x000003D5, SOUND_RUFF_PUFF_FLY_B = 0x000003D6, - SOUND_03D9 = 0x000003D9, + SOUND_LIGHT_THROW = 0x000003D9, SOUND_SQUEEZE = 0x000003DB, - SOUND_03DC = 0x000003DC, - SOUND_03DD = 0x000003DD, - SOUND_03DE = 0x000003DE, - SOUND_03E0 = 0x000003E0, - SOUND_03E1 = 0x000003E1, + SOUND_BLOOPER_MOVE = 0x000003DC, + SOUND_BLOOPER_FALL = 0x000003DD, + SOUND_BLOOPER_SQUIRT = 0x000003DE, + SOUND_LEECH = 0x000003E0, + SOUND_AI_FOUND_PLAYER_JUMP = 0x000003E1, SOUND_ACTOR_JUMP = 0x000003E2, SOUND_ACTOR_TRIP = 0x000003E3, SOUND_ACTOR_TWITCH = 0x000003E4, @@ -1267,13 +1273,13 @@ enum SoundIDs { SOUND_BIG_POWER_UP = 0x000003E6, SOUND_LARGE_ACTOR_JUMP = 0x000003E7, SOUND_MOLE_THROW = 0x000003E8, - SOUND_03E9 = 0x000003E9, - SOUND_03EA = 0x000003EA, - SOUND_03EB = 0x000003EB, - SOUND_03EC = 0x000003EC, - SOUND_03ED = 0x000003ED, - SOUND_03EE = 0x000003EE, - SOUND_03EF = 0x000003EF, + SOUND_KOOPA_BROS_LAND = 0x000003E9, + SOUND_FAKE_BOWSER_STEP = 0x000003EA, + SOUND_SMALL_CROWD_WALK = 0x000003EB, + SOUND_LARGE_CROWD_WALK = 0x000003EC, + SOUND_MASTER_SMACK = 0x000003ED, // #electric #impact + SOUND_MASTER_PUNCH = 0x000003EE, + SOUND_BOWSER_CHARGE_LIGHTNING = 0x000003EF, SOUND_DANGER = 0x000003F1, SOUND_PERIL = 0x000003F2, SOUND_DING = 0x000003F3, @@ -1282,17 +1288,17 @@ enum SoundIDs { SOUND_DRIP = 0x000003F6, STONE_STONE_CHOMP_STEP = 0x000003F9, SOUND_THROW = 0x000003FA, - SOUND_03FB = 0x000003FB, - SOUND_03FC = 0x000003FC, - SOUND_2003 = 0x00002003, - SOUND_2004 = 0x00002004, - SOUND_2005 = 0x00002005, - SOUND_2006 = 0x00002006, - SOUND_2009 = 0x00002009, - SOUND_200A = 0x0000200A, - SOUND_200B = 0x0000200B, - SOUND_200C = 0x0000200C, - SOUND_200D = 0x0000200D, + SOUND_PLAYER_COLLAPSE = 0x000003FB, + SOUND_LUCKY = 0x000003FC, + SOUND_GOOMBARIO_GATHERING = 0x00002003, + SOUND_PARAKARRY_PREDIVE = 0x00002004, + SOUND_PARAKARRY_DIVE = 0x00002005, + SOUND_PARAKARRY_SHELL_SHOT = 0x00002006, + SOUND_PARAKARRY_FLAP = 0x00002009, + SOUND_PARAKARRY_AIR_RAID_1 = 0x0000200A, // #whoosh + SOUND_PARAKARRY_AIR_RAID_2 = 0x0000200B, // #whoosh #echoing + SOUND_KOOPER_SHELL_SPINUP = 0x0000200C, + SOUND_GOOMBARIO_JUMP = 0x0000200D, SOUND_BOW_VANISH = 0x0000200E, SOUND_BOW_APPEAR = 0x0000200F, SOUND_EGG_MISSILE_BLAST = 0x00002010, @@ -1304,25 +1310,25 @@ enum SoundIDs { SOUND_BOMBETTE_BLAST_LV1 = 0x00002016, SOUND_BOMBETTE_BLAST_LV2 = 0x00002017, SOUND_BOMBETTE_BLAST_LV3 = 0x00002018, - SOUND_2019 = 0x00002019, - SOUND_201A = 0x0000201A, - SOUND_201B = 0x0000201B, - SOUND_201C = 0x0000201C, - SOUND_201D = 0x0000201D, - SOUND_201E = 0x0000201E, - SOUND_201F = 0x0000201F, - SOUND_2020 = 0x00002020, - SOUND_2021 = 0x00002021, - SOUND_2022 = 0x00002022, - SOUND_2023 = 0x00002023, - SOUND_2024 = 0x00002024, + SOUND_BOW_SMACK = 0x00002019, + SOUND_BOW_FAN_SMACK = 0x0000201A, + SOUND_LAKILESTER_THROW_SPINY_A = 0x0000201B, + SOUND_LAKILESTER_THROW_SPINY_B = 0x0000201C, + SOUND_LAKILESTER_MAKE_CLOUD_NINE = 0x0000201D, + SOUND_LAKILESTER_HURRICANE_INHALE = 0x0000201E, + SOUND_LAKILESTER_HURRICANE_EXHALE = 0x0000201F, + SOUND_BOMBETTE_BODY_SLAM = 0x00002020, + SOUND_SHELL_SPIN = 0x00002021, + SOUND_FAN_SMACK_HIT = 0x00002022, // #windy + SOUND_FAN_SMACK_END = 0x00002023, // #windy + SOUND_WATT_MEGA_CHARGE_WAVE = 0x00002024, SOUND_DIZZY_SHELL = 0x00002026, SOUND_SHUFFLE_CARD_A = 0x0000202A, SOUND_SHUFFLE_CARD_B = 0x0000202B, SOUND_FIRE_FLOWER_A = 0x0000202C, SOUND_FIRE_FLOWER_B = 0x0000202D, SOUND_SNOWMAN_DOLL_JUMP = 0x0000202E, - SOUND_202F = 0x0000202F, // unused + SOUND_NOISE_RUSH = 0x0000202F, // unused SOUND_POW_BLOCK = 0x00002030, SOUND_INFLICT_SLEEP = 0x00002031, SOUND_INFLICT_STATUS = 0x00002032, @@ -1333,12 +1339,12 @@ enum SoundIDs { SOUND_WHALE_CLOSE_MOUTH = 0x00002037, SOUND_TUBBA_SNORE_INHALE = 0x00002038, SOUND_TUBBA_SNORE_EXHALE = 0x00002039, - SOUND_KPA_BRIDGE_COLLAPSE_A = 0x0000203A, - SOUND_KPA_BRIDGE_COLLAPSE_B = 0x0000203B, - SOUND_203C = 0x0000203C, - SOUND_203D = 0x0000203D, - SOUND_203E = 0x0000203E, - SOUND_203F = 0x0000203F, + SOUND_KPA_BRIDGE_COLLAPSE_A = 0x0000203A, + SOUND_KPA_BRIDGE_COLLAPSE_B = 0x0000203B, + SOUND_KPA_ARENA_EXPLODING = 0x0000203C, + SOUND_OBK_STAIRS_DROP = 0x0000203D, + SOUND_SHY_GUY_OUCH = 0x0000203E, + SOUND_SHY_GUY_RUN_AWAY = 0x0000203F, SOUND_KPA_FLIP_BRIDGE_PANEL = 0x00002040, SOUND_STAR_SPIRIT_APPEAR_A = 0x00002041, SOUND_STAR_SPIRIT_APPEAR_B = 0x00002042, @@ -1347,10 +1353,10 @@ enum SoundIDs { SOUND_STAR_SPIRIT_DEPART_1 = 0x00002045, SOUND_STAR_SPIRIT_DEPART_2 = 0x00002046, SOUND_STAR_SPIRIT_DEPART_3 = 0x00002047, - SOUND_2049 = 0x00002049, + SOUND_DARK_TOAD_DISPEL = 0x00002049, SOUND_OPEN_MAGIC_CHEST = 0x0000204A, SOUND_CLOSE_MAGIC_CHEST = 0x0000204B, - SOUND_204C = 0x0000204C, // unused + SOUND_QUICK_HINGE = 0x0000204C, // unused SOUND_FLO_MOVE_PILLAR = 0x0000204D, SOUND_WISH_ASCENDING = 0x00002051, SOUND_UP_AND_AWAY_SEND_AWAY = 0x00002052, @@ -1368,32 +1374,33 @@ enum SoundIDs { SOUND_CHAIN_CHOMP_BITE = 0x00002061, SOUND_CHAIN_CHOMP_THUD = 0x00002062, SOUND_CHAIN_RATTLE = 0x00002063, - SOUND_2064 = 0x00002064, - SOUND_2065 = 0x00002065, - SOUND_2066 = 0x00002066, - SOUND_2067 = 0x00002067, - SOUND_2069 = 0x00002069, - SOUND_206A = 0x0000206A, - SOUND_206B = 0x0000206B, - SOUND_206D = 0x0000206D, - SOUND_206E = 0x0000206E, - SOUND_206F = 0x0000206F, - SOUND_2070 = 0x00002070, + SOUND_SHY_STACK_SQUISH = 0x00002064, + SOUND_STILT_GUY_UNFOLD = 0x00002065, + SOUND_STILT_GUY_STEP = 0x00002066, + SOUND_STILTS_FALL = 0x00002067, // #woody + SOUND_TANK_BULB_FIRE = 0x00002069, // #electric + SOUND_TOY_TANK_OPEN_HATCH = 0x0000206A, + SOUND_TOY_TANK_CLOSE_HATCH = 0x0000206B, + SOUND_WOODEN_BLOCK = 0x0000206C, // #unused + SOUND_RECOVER_HEART = 0x0000206D, // #magic + SOUND_FUZZY_RUMBLE = 0x0000206E, + SOUND_FUZZY_SHAKE = 0x0000206F, + SOUND_FUZZY_DIVIDE = 0x00002070, SOUND_UP_AND_AWAY_CAPTURE = 0x00002071, - SOUND_2072 = 0x00002072, - SOUND_2073 = 0x00002073, - SOUND_2074 = 0x00002074, - SOUND_2075 = 0x00002075, + SOUND_YOSHI = 0x00002072, + SOUND_HIT_WHACKA = 0x00002073, + SOUND_MAGIC_ASCENDING = 0x00002074, // #magic #ascending + SOUND_MAGIC_DESCENDING = 0x00002075, // #magic #descending SOUND_BOMB_BLAST = 0x00002076, SOUND_BULLET_BILL_EXPLODE_A = 0x00002078, SOUND_BULLET_BILL_EXPLODE_B = 0x00002079, - SOUND_207A = 0x0000207A, - SOUND_207B = 0x0000207B, - SOUND_207C = 0x0000207C, - SOUND_207D = 0x0000207D, - SOUND_207E = 0x0000207E, - SOUND_207F = 0x0000207F, - SOUND_JUMP_2081 = 0x00002081, + SOUND_KAMMY_SUMMON_MAGIC = 0x0000207A, + SOUND_KAMMY_SUMMON_BLOCK = 0x0000207B, + SOUND_KAMMY_RAISE_OBJECT = 0x0000207C, + SOUND_KAMMY_LOWER_OBJECT = 0x0000207D, + SOUND_TWINK_ATTACK = 0x0000207E, + SOUND_TWINK_FLY_A = 0x0000207F, + SOUND_QUICK_PLAYER_JUMP = 0x00002081, SOUND_JUMP_8BIT_MARIO = 0x00002082, SOUND_STAR_BOX_LAUNCHER = 0x00002085, SOUND_SPRING = 0x00002086, @@ -1425,85 +1432,87 @@ enum SoundIDs { SOUND_IWA_SLIDE_GATE = 0x000020A2, SOUND_CREAKY_WINDOW_OPEN = 0x000020A3, SOUND_CREAKY_WINDOW_CLOSE = 0x000020A4, - SOUND_20A5 = 0x000020A5, - SOUND_20A6 = 0x000020A6, - SOUND_20A7 = 0x000020A7, - SOUND_20A8 = 0x000020A8, - SOUND_20AB = 0x000020AB, - SOUND_20AC = 0x000020AC, - SOUND_20AD = 0x000020AD, - SOUND_20AE = 0x000020AE, - SOUND_20B1 = 0x000020B1, - SOUND_20B2 = 0x000020B2, - SOUND_20B3 = 0x000020B3, - SOUND_20B4 = 0x000020B4, - SOUND_20B6 = 0x000020B6, - SOUND_20B7 = 0x000020B7, - SOUND_20B8 = 0x000020B8, - SOUND_20B9 = 0x000020B9, + SOUND_TRAIN_DOOR_OPEN = 0x000020A5, + SOUND_TRAIN_DOOR_CLOSE = 0x000020A6, + SOUND_TURN_MECHANISM = 0x000020A7, + SOUND_CAPSULE_OPEN = 0x000020A8, + SOUND_FLIP_PANEL = 0x000020AB, + SOUND_CLOSE_PANEL = 0x000020AC, + SOUND_WATER_SPLASH = 0x000020AD, + SOUND_BREAK_CRATE = 0x000020AE, // #boing + SOUND_HOLLOW_RISING = 0x000020AF, // #unused + SOUND_HOLLOW_FALLING = 0x000020B0, // #unused + SOUND_PIRANHA_SPIN_1 = 0x000020B1, + SOUND_PIRANHA_SPIN_2 = 0x000020B2, + SOUND_PIRANHA_TENSE = 0x000020B3, + SOUND_HEAVY_NPC_STEP_B = 0x000020B4, + SOUND_HUFF_N_PUFF_JIGGLE = 0x000020B6, + SOUND_HUFF_N_PUFF_WOBBLE = 0x000020B7, + SOUND_GHOST_TRANSFORM = 0x000020B8, + SOUND_JR_TROOPA_TRANSFORM = 0x000020B9, SOUND_ACTOR_STEP_A = 0x000020BA, - SOUND_20BB = 0x000020BB, - SOUND_20BC = 0x000020BC, + SOUND_MASTER_FLUTTER = 0x000020BB, + SOUND_MASTER_KICK = 0x000020BC, SOUND_MASTER_STANCE_CHANGE = 0x000020BD, - SOUND_20BE = 0x000020BE, - SOUND_20BF = 0x000020BF, - SOUND_20C1 = 0x000020C1, - SOUND_20C2 = 0x000020C2, - SOUND_20C3 = 0x000020C3, - SOUND_20C4 = 0x000020C4, - SOUND_20C5 = 0x000020C5, - SOUND_20C6 = 0x000020C6, + SOUND_MASTER_FLIP = 0x000020BE, + SOUND_LAVA_BUD_RECOVER = 0x000020BF, + SOUND_SMALL_NPC_STEP = 0x000020C1, + SOUND_BANDIT_STEAL = 0x000020C2, + SOUND_DISAPPOINTED = 0x000020C3, + SOUND_CLUBBA_STEP = 0x000020C4, + SOUND_CLUBBA_SWING = 0x000020C5, + SOUND_MBUSH_STEP = 0x000020C6, SOUND_TUBBA_HEART_JUMP = 0x000020C8, - SOUND_20C9 = 0x000020C9, - SOUND_20CA = 0x000020CA, - SOUND_20CB = 0x000020CB, - SOUND_20CC = 0x000020CC, - SOUND_20CD = 0x000020CD, - SOUND_20CE = 0x000020CE, - SOUND_20CF = 0x000020CF, - SOUND_20D0 = 0x000020D0, - SOUND_20D1 = 0x000020D1, - SOUND_20D2 = 0x000020D2, - SOUND_20D3 = 0x000020D3, + SOUND_MBUSH_LEAP = 0x000020C9, + SOUND_BZZAP_STING = 0x000020CA, + SOUND_MINI_BZZAP_STING = 0x000020CB, + SOUND_BZZAP_CALL_SWARM = 0x000020CC, + SOUND_BONY_BEETLE_STEP = 0x000020CD, + SOUND_BONY_BEETLE_EXTEND_SPIKES = 0x000020CE, + SOUND_BONY_BEETLE_RETRACT_SPIKES = 0x000020CF, + SOUND_CLEFT_STEP = 0x000020D0, + SOUND_CLEFT_TACKLE = 0x000020D1, + SOUND_LAKITU_THROW_SPINY = 0x000020D2, + SOUND_SHELL_TOSS = 0x000020D3, SOUND_SPELL_CAST1 = 0x000020D4, SOUND_SPELL_CAST2 = 0x000020D5, SOUND_SPELL_CAST3 = 0x000020D6, SOUND_SPELL_CAST4 = 0x000020D7, SOUND_SPELL_CAST5 = 0x000020D8, // unused SOUND_FUZZIPEDE_MOTION = 0x000020D9, - SOUND_20DA = 0x000020DA, - SOUND_20DB = 0x000020DB, - SOUND_20DC = 0x000020DC, + SOUND_FUZZIPEDE_LEAP = 0x000020DA, // #boing #spring #bounce + SOUND_FUZZIPEDE_STRIKE = 0x000020DB, // #boing #spring + SOUND_COMMAND_LOSS = 0x000020DC, SOUND_GOOMBA_STEP = 0x000020DD, - SOUND_20DE = 0x000020DE, + SOUND_PIRANHA_BITE = 0x000020DE, SOUND_PARAGOOMBA_FLY = 0x000020DF, SOUND_PARAGOOMBA_PREDIVE = 0x000020E0, - SOUND_20E1 = 0x000020E1, - SOUND_20E2 = 0x000020E2, - SOUND_20E3 = 0x000020E3, - SOUND_20E4 = 0x000020E4, - SOUND_20E5 = 0x000020E5, - SOUND_20E6 = 0x000020E6, - SOUND_LEVITATE = 0x000020E7, + SOUND_TUTANKOOPA_MAGIC = 0x000020E1, + SOUND_JR_TOOPA_JUMP = 0x000020E2, + SOUND_ACTOR_WITHER = 0x000020E3, + SOUND_ACTOR_COLLAPSE = 0x000020E4, + SOUND_KNOCKOUT_CHIRPING = 0x000020E5, // #bird #chirping + SOUND_TUTANKOOPA_LEVITATE = 0x000020E6, + SOUND_SPOOKY_LEVITATE = 0x000020E7, SOUND_ILLUSION_DISSOLVE = 0x000020E8, - SOUND_20E9 = 0x000020E9, - SOUND_20EA = 0x000020EA, - SOUND_20EB = 0x000020EB, - SOUND_20EC = 0x000020EC, - SOUND_20ED = 0x000020ED, - SOUND_20EE = 0x000020EE, - SOUND_20EF = 0x000020EF, - SOUND_20F0 = 0x000020F0, - SOUND_20F1 = 0x000020F1, - SOUND_20F2 = 0x000020F2, - SOUND_20F3 = 0x000020F3, - SOUND_20F4 = 0x000020F4, - SOUND_20F5 = 0x000020F5, - SOUND_20F6 = 0x000020F6, - SOUND_20F7 = 0x000020F7, - SOUND_20F9 = 0x000020F9, - SOUND_20FB = 0x000020FB, - SOUND_20FC = 0x000020FC, + SOUND_HEAVY_NPC_FALLING = 0x000020E9, // #falling + SOUND_HEAVY_NPC_LANDING = 0x000020EA, // #echoing #thud #impact + SOUND_TUTANKOOPA_DEBRIS_FALL = 0x000020EB, // #falling + SOUND_HEAVY_NPC_STEP_A = 0x000020EC, + SOUND_GOOMBA_KING_SPIN = 0x000020ED, + SOUND_GULPIT_LICK = 0x000020EE, + SOUND_BUZZAR_FLAP = 0x000020EF, + SOUND_BUZZAR_WHIRLWIND = 0x000020F0, // #windy + SOUND_BUZZAR_WINDUP = 0x000020F1, + SOUND_BUZZAR_DIVE = 0x000020F2, + SOUND_SMALL_LENS_FLARE = 0x000020F3, + SOUND_BUZZAR_THROW = 0x000020F4, + SOUND_BUZZAR_GRAB = 0x000020F5, + SOUND_HEAVY_NPC_STEP_C = 0x000020F6, + SOUND_TUBBAS_HEART_CHARGE = 0x000020F7, + SOUND_TUBBAS_HEART_SWARM_ATTACK = 0x000020F9, + SOUND_TUBBAS_HEART_SWARM_DISPERSE = 0x000020FB, + SOUND_TUBBAS_HEART_SWARM_VANISH = 0x000020FC, SOUND_FAKE_BOWSER_SWING = 0x000020FD, SOUND_FAKE_BOWSER_STRIKE = 0x000020FE, SOUND_FILE_MENU_MOVE_CURSOR = 0x00002101, @@ -1533,11 +1542,11 @@ enum SoundIDs { SOUND_SPIN_SMASH_1 = 0x0000211E, SOUND_SPIN_SMASH_2 = 0x0000211F, SOUND_SPIN_SMASH_3 = 0x00002120, - SOUND_2121 = 0x00002121, - SOUND_2122 = 0x00002122, - SOUND_2123 = 0x00002123, - SOUND_2124 = 0x00002124, - SOUND_2125 = 0x00002125, + SOUND_BOWSER_STAR_ROD_USE = 0x00002121, + SOUND_BOWSER_STAR_ROD_DRAIN_WAVE = 0x00002122, + SOUND_BOWSER_STAR_ROD_GATHER = 0x00002123, + SOUND_BOWSER_STAR_ROD_SHOCKWAVE = 0x00002124, + SOUND_BOWSER_STAR_ROD_ENCHANT = 0x00002125, SOUND_BOWSER_CAST_RECOVER = 0x00002126, SOUND_BOWSER_LIGHTNING = 0x00002127, SOUND_BOWSER_POWER_DOWN = 0x00002128, @@ -1895,9 +1904,9 @@ enum EncounterOutcomes { }; enum MerleeSpellType { - MERLEE_SPELL_0 = 0, - MERLEE_SPELL_1 = 1, - MERLEE_SPELL_2 = 2, + MERLEE_SPELL_NONE = 0, + MERLEE_SPELL_ATK_BOOST = 1, + MERLEE_SPELL_DEF_BOOST = 2, MERLEE_SPELL_EXP_BOOST = 3, MERLEE_SPELL_COIN_BOOST = 4, }; @@ -1936,9 +1945,9 @@ enum SpeechFlags { typedef enum HitResult { HIT_RESULT_BACKFIRE = -1, HIT_RESULT_HIT = 0, - HIT_RESULT_1 = 1, // KILL? + HIT_RESULT_NICE = 1, HIT_RESULT_NO_DAMAGE = 2, - HIT_RESULT_3 = 3, + HIT_RESULT_NICE_NO_DAMAGE = 3, HIT_RESULT_LANDED_ON_SPIKE = 4, HIT_RESULT_LUCKY = 5, HIT_RESULT_MISS = 6, @@ -2688,20 +2697,20 @@ enum ItemEntityFlags { ITEM_ENTITY_FLAG_CAM3 = 0x00000008, ITEM_ENTITY_FLAG_10 = 0x00000010, ITEM_ENTITY_FLAG_HIDDEN = 0x00000040, // do not render; player cant pickup - ITEM_ENTITY_FLAG_80 = 0x00000080, + ITEM_ENTITY_FLAG_JUST_SPAWNED = 0x00000080, ITEM_ENTITY_FLAG_AUTO_COLLECT = 0x00000100, ITEM_ENTITY_FLAG_NEVER_VANISH = 0x00000200, ITEM_ENTITY_FLAG_SAVE_ON_TOUCH = 0x00000400, // sets bound game flag when the item is touched - ITEM_ENTITY_FLAG_800 = 0x00000800, + ITEM_ENTITY_FLAG_SAVE_ON_INIT = 0x00000800, ITEM_ENTITY_FLAG_1000 = 0x00001000, ITEM_ENTITY_FLAG_NO_GRAVITY = 0x00002000, ITEM_ENTITY_RESIZABLE = 0x00004000, ITEM_ENTITY_FLAG_8000 = 0x00008000, ITEM_ENTITY_FLAG_TOSS_LOWER = 0x00010000, - ITEM_ENTITY_FLAG_20000 = 0x00020000, - ITEM_ENTITY_FLAG_40000 = 0x00040000, + ITEM_ENTITY_FLAG_ODD_SPAWN_PARITY = 0x00020000, // every other item entity spawned will have this set + ITEM_ENTITY_FLAG_FULLSIZE = 0x00040000, ITEM_ENTITY_FLAG_TRANSPARENT = 0x00080000, - ITEM_ENTITY_FLAG_100000 = 0x00100000, + ITEM_ENTITY_FLAG_INVISIBLE = 0x00100000, // spawned with ITEM_SPAWN_MODE_INVISIBLE ITEM_ENTITY_FLAG_CANT_COLLECT = 0x00200000, ITEM_ENTITY_FLAG_400000 = 0x00400000, ITEM_ENTITY_FLAG_800000 = 0x00800000, @@ -2898,6 +2907,26 @@ enum EventSupressFlags { SUPPRESS_EVENT_FLAG_10000 = 0x10000, // usage is a bug? }; +// combination used for hammer-based attacks +#define SUPPRESS_EVENTS_HAMMER \ + SUPPRESS_EVENT_SPIKY_TOP \ + | SUPPRESS_EVENT_SHOCK_CONTACT \ + | SUPPRESS_EVENT_BURN_CONTACT + +// combination used for mostly for kooper's attacks +#define SUPPRESS_EVENTS_KOOPER_TEST \ + SUPPRESS_EVENT_SPIKY_FRONT \ + | SUPPRESS_EVENT_BURN_CONTACT + +// combination used for mostly for kooper's attacks +#define SUPPRESS_EVENTS_KOOPER_DAMAGE \ + SUPPRESS_EVENT_SPIKY_TOP \ + | SUPPRESS_EVENT_EXPLODE_CONTACT \ + | SUPPRESS_EVENT_SPIKY_FRONT \ + | SUPPRESS_EVENT_SHOCK_CONTACT \ + | SUPPRESS_EVENT_BURN_CONTACT \ + | SUPPRESS_EVENT_ALT_SPIKY + enum PartnerActions { PARTNER_ACTION_NONE = 0, // generic state PARTNER_ACTION_USE = 1, // generic state @@ -3136,14 +3165,14 @@ enum PopupState { POPUP_STATE_MINUS_3 = -3, POPUP_STATE_MINUS_4 = -4, POPUP_STATE_MINUS_5 = -5, - POPUP_STATE_MINUS_6 = -6, + POPUP_STATE_CHOSE_SWAP = -6, POPUP_STATE_MINUS_7 = -7, POPUP_STATE_MINUS_8 = -8, }; enum PopupResult { - POPUP_RESULT_MINUS_1 = -1, - POPUP_RESULT_MINUS_2 = -2, + POPUP_RESULT_INVALID = -1, + POPUP_RESULT_SWAP_MENU = -2, POPUP_RESULT_CHOOSING = 0, POPUP_RESULT_CANCEL = 255, }; @@ -3523,18 +3552,22 @@ enum BattleStatusFlags1 { BS_FLAGS1_MENU_OPEN = 0x00000002, BS_FLAGS1_TATTLE_OPEN = 0x00000004, BS_FLAGS1_SHOW_PLAYER_DECORATIONS = 0x00000008, // enables effects for Frozen, Water Block, and Cloud Nine to appear and follow the player - BS_FLAGS1_10 = 0x00000010, // enable attack bonuses (power plus, etc) - BS_FLAGS1_SP_EVT_ACTIVE = 0x00000020, // enable special events (other than hit/death/immune?) - BS_FLAGS1_40 = 0x00000040, - BS_FLAGS1_80 = 0x00000080, + // Enables attack bonuses like Power Plus and Merlee ATK boost. + // Almost always used with TestTarget functions when not called with DAMAGE_TYPE_TRIGGER_LUCKY. + BS_FLAGS1_INCLUDE_POWER_UPS = 0x00000010, + // Current hit may trigger special events on the target (other than hit/death/immune) + // These include FLIP_TRIGGER, FALL_TRIGGER, BURN_HIT, SPIN_SMASH_HIT, etc. + // This has no bearing on contact hazard events which affect the attacker like SPIKE_CONTACT or BURN_CONTACT. + BS_FLAGS1_TRIGGER_EVENTS = 0x00000020, + BS_FLAGS1_NICE_HIT = 0x00000040, + BS_FLAGS1_NO_RATING = 0x00000080, // prevents 'Nice!' or 'Super!' messages from appearing BS_FLAGS1_EXECUTING_MOVE = 0x00000100, - BS_FLAGS1_200 = 0x00000200, - BS_FLAGS1_400 = 0x00000400, // UNUSED - BS_FLAGS1_FORCE_HIT_IMMUNE = 0x00000800, + BS_FLAGS1_SUPER_HIT = 0x00000200, // only works for partners and items, NOT player hits + BS_FLAGS1_FORCE_IMMUNE_HIT = 0x00000800, BS_FLAGS1_AUTO_SUCCEED_ACTION = 0x00001000, BS_FLAGS1_2000 = 0x00002000, BS_FLAGS1_4000 = 0x00004000, - BS_FLAGS1_8000 = 0x00008000, + BS_FLAGS1_FREE_ACTION_COMMAND = 0x00008000, BS_FLAGS1_10000 = 0x00010000, BS_FLAGS1_DISABLE_CELEBRATION = 0x00020000, BS_FLAGS1_BATTLE_FLED = 0x00040000, // used both when the player flees sucessfully or an enemy flees @@ -3557,16 +3590,16 @@ enum BattleStatusFlags2 { BS_FLAGS2_AWARDING_STAR_POINTS = 0x00000001, // star points move to the center of the screen BS_FLAGS2_PLAYER_TURN_USED = 0x00000002, // set after player has used their action for this turn BS_FLAGS2_PARTNER_TURN_USED = 0x00000004, // set after partner has used their action for this turn - BS_FLAGS2_8 = 0x00000008, - BS_FLAGS2_10 = 0x00000010, + BS_FLAGS2_OVERRIDE_INACTIVE_PLAYER = 0x00000008, // override inactive player animations and effects + BS_FLAGS2_OVERRIDE_INACTIVE_PARTNER = 0x00000010, // override inactive partner animations and effects BS_FLAGS2_CANT_FLEE = 0x00000020, BS_FLAGS2_PEACH_BATTLE = 0x00000040, BS_FLAGS2_STORED_TURBO_CHARGE_TURN = 0x00000100, // prevents turbo charge turns from decrementing on begin player turn BS_FLAGS2_DOING_JUMP_TUTORIAL = 0x00000200, - BS_FLAGS2_400 = 0x00000400, + BS_FLAGS2_FINAL_BOWSER_PART_1 = 0x00000400, // no other use for this flag, purpose unknown BS_FLAGS2_NO_TARGET_AVAILABLE = 0x00001000, BS_FLAGS2_IGNORE_DARKNESS = 0x00004000, - BS_FLAGS2_10000 = 0x00010000, + BS_FLAGS2_HIDE_BUFF_COUNTERS = 0x00010000, // hide turn counters for partner buffs (Cloud Nine, Water Block, etc) BS_FLAGS2_NO_PLAYER_PAL_ADJUST = 0x00100000, BS_FLAGS2_IS_FIRST_STRIKE = 0x01000000, BS_FLAGS2_DONT_STOP_MUSIC = 0x02000000, // don't stop playing the current song when the battle ends @@ -4099,11 +4132,23 @@ enum BattleMessages { // states after INIT are different for each type of battle message enum BattleMessageStates { + // generic INIT state shared by all message types BTL_MSG_STATE_INIT = 0, - BTL_MSG_STATE_1 = 1, - BTL_MSG_STATE_2 = 2, - BTL_MSG_STATE_3 = 3, - BTL_MSG_STATE_4 = 4, + // states for popup messages like BTL_MSG_MERLEE_ATK_UP or BTL_MSG_ENEMY_ASLEEP + BTL_MSG_STATE_POPUP_PRE_DELAY = 1, + BTL_MSG_STATE_POPUP_DELAY = 2, + BTL_MSG_STATE_POPUP_POST_DELAY = 3, + BTL_MSG_STATE_POPUP_DISPOSE = 4, + // states for action tip messages + BTL_MSG_STATE_ACTION_TIP_DELAY = 1, + BTL_MSG_STATE_ACTION_TIP_DISPOSE = 2, + // states for error messages like BTL_MSG_NO_JUMP_TARGET or BTL_MSG_CANT_SELECT_NOW + BTL_MSG_STATE_ERROR_PRE_DELAY = 1, + BTL_MSG_STATE_ERROR_DELAY = 2, + BTL_MSG_STATE_ERROR_POST_DELAY = 3, + BTL_MSG_STATE_ERROR_DISPOSE = 4, + // states for command disable notifications like BTL_MSG_ITEMS_DISABLED + BTL_MSG_STATE_DISABLED_DELAY = 1, }; // BattleMenuState @@ -4233,25 +4278,25 @@ enum DebuffTypes { }; enum GlobalOverrides { - GLOBAL_OVERRIDES_DISABLE_RENDER_WORLD = 0x00000002, - GLOBAL_OVERRIDES_DISABLE_DRAW_FRAME = 0x00000008, - GLOBAL_OVERRIDES_10 = 0x00000010, - GLOBAL_OVERRIDES_ENABLE_TRANSITION_STENCIL = 0x00000020, - GLOBAL_OVERRIDES_40 = 0x00000040, - GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION = 0x00000080, - GLOBAL_OVERRIDES_DISABLE_BATTLES = 0x00000100, - GLOBAL_OVERRIDES_200 = 0x00000200, - GLOBAL_OVERRIDES_400 = 0x00000400, - GLOBAL_OVERRIDES_800 = 0x00000800, - GLOBAL_OVERRIDES_1000 = 0x00001000, - GLOBAL_OVERRIDES_2000 = 0x00002000, - GLOBAL_OVERRIDES_4000 = 0x00004000, - GLOBAL_OVERRIDES_8000 = 0x00008000, - GLOBAL_OVERRIDES_WINDOWS_IN_FRONT_OF_CURTAINS = 0x00010000, - GLOBAL_OVERRIDES_20000 = 0x00020000, - GLOBAL_OVERRIDES_DISABLE_MENUS = 0x00040000, - GLOBAL_OVERRIDES_MESSAGES_IN_FRONT_OF_CURTAINS = 0x00100000, - GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS = 0x00200000, + GLOBAL_OVERRIDES_DISABLE_RENDER_WORLD = 0x00000002, + GLOBAL_OVERRIDES_DISABLE_DRAW_FRAME = 0x00000008, + GLOBAL_OVERRIDES_MESSAGES_OVER_FRONTUI = 0x00000010, + GLOBAL_OVERRIDES_SOFT_RESET = 0x00000020, // unused but functional + GLOBAL_OVERRIDES_40 = 0x00000040, + GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION = 0x00000080, + GLOBAL_OVERRIDES_DISABLE_BATTLES = 0x00000100, + GLOBAL_OVERRIDES_200 = 0x00000200, + GLOBAL_OVERRIDES_400 = 0x00000400, + GLOBAL_OVERRIDES_800 = 0x00000800, + GLOBAL_OVERRIDES_PREV_DISABLE_BATTLES = 0x00001000, + GLOBAL_OVERRIDES_PREV_200 = 0x00002000, + GLOBAL_OVERRIDES_PREV_400 = 0x00004000, + GLOBAL_OVERRIDES_PREV_800 = 0x00008000, + GLOBAL_OVERRIDES_WINDOWS_OVER_CURTAINS = 0x00010000, + GLOBAL_OVERRIDES_DONT_RESUME_SONG_AFTER_BATTLE = 0x00020000, + GLOBAL_OVERRIDES_DISABLE_MENUS = 0x00040000, + GLOBAL_OVERRIDES_MESSAGES_OVER_CURTAINS = 0x00100000, + GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS = 0x00200000, }; #define MODEL_FLAGS_MASK_FFF0 (\ @@ -4582,13 +4627,18 @@ typedef enum SurfaceInteractMode { SURFACE_INTERACT_LAND = 2, } SurfaceInteractMode; +// flags that can be set on colliders +// passed into collision queries to selectively ignore certain types of objects or colliders enum ColliderFlags { COLLIDER_FLAGS_UPPER_MASK = 0x7FFFFE00, // map data dumper needs this to be first COLLIDER_FLAGS_SURFACE_TYPE_MASK = 0x000000FF, COLLIDER_FLAG_SAFE_FLOOR = 0x00000100, - COLLIDER_FLAG_IGNORE_SHELL = 0x00008000, - COLLIDER_FLAG_IGNORE_PLAYER = 0x00010000, - COLLIDER_FLAG_80000 = 0x00080000, // test version of DOCK walls? + COLLIDER_FLAG_IGNORE_SHELL = 0x00008000, // colliders marked with this flag are not solid for shells + COLLIDER_FLAG_IGNORE_PLAYER = 0x00010000, // colliders marked with this flag are not solid for player or partners + COLLIDER_FLAG_IGNORE_NPC = 0x00020000, // colliders marked with this flag are not solid for npcs or item entities + COLLISION_IGNORE_ENTITIES = 0x00040000, // used for collision queries, not set for colliders + COLLIDER_FLAG_DOCK_WALL = 0x00080000, + COLLISION_ONLY_ENTITIES = 0x00100000, // used for collision queries, not set for colliders COLLIDER_FLAG_HAS_MODEL_PARENT = 0x80000000 }; @@ -4599,13 +4649,12 @@ enum ColliderFlagsModifyMode { MODIFY_COLLIDER_FLAGS_SET_SURFACE = 3, }; -enum CollisionChannels { - COLLISION_CHANNEL_8000 = 0x00008000, - COLLISION_CHANNEL_10000 = 0x00010000, - COLLISION_CHANNEL_20000 = 0x00020000, - COLLISION_IGNORE_ENTITIES = 0x00040000, - COLLISION_CHANNEL_80000 = 0x00080000, - COLLISION_ONLY_ENTITIES = 0x00100000, +enum PlayerCollisionTests { + PLAYER_COLLISION_0 = 0, + PLAYER_COLLISION_1 = 1, + PLAYER_COLLISION_2 = 2, + PLAYER_COLLISION_3 = 3, + PLAYER_COLLISION_4 = 4, }; enum CameraFlags { @@ -4622,8 +4671,8 @@ enum CameraFlags { enum CameraMoveFlags { CAMERA_MOVE_IGNORE_PLAYER_Y = 0x00000001, - CAMERA_MOVE_FLAG_2 = 0x00000002, - CAMERA_MOVE_FLAG_4 = 0x00000004, + CAMERA_MOVE_NO_INTERP_Y = 0x00000002, + CAMERA_MOVE_ACCEL_INTERP_Y = 0x00000004, }; enum CameraUpdateType { @@ -4798,8 +4847,8 @@ enum ModelAnimatorFlags { }; enum ShopFlags { - SHOP_FLAG_1 = 0x00000001, - SHOP_FLAG_8 = 0x00000008, + SHOP_FLAG_SHOWING_ITEM_INFO = 0x1, + SHOP_FLAG_INTERACT_SCRIPT_RUNNING = 0x8, }; enum { diff --git a/include/functions.h b/include/functions.h index 3f65633514..386c75bdc3 100644 --- a/include/functions.h +++ b/include/functions.h @@ -208,7 +208,7 @@ s32 draw_box(s32 flags, WindowStyle windowStyle, s32 posX, s32 posY, s32 posZ, s void* drawContentsArg0, Matrix4f rotScaleMtx, s32 translateX, s32 translateY, Matrix4f outMtx); s32 get_msg_width(s32 msgID, u16 charset); -s32 partner_player_can_pause(void); +s32 partner_can_open_world_menus(void); s32 disable_player_static_collisions(void); s32 disable_player_input(void); void func_80027088(s32); @@ -380,7 +380,7 @@ void btl_popup_messages_update(void); void btl_popup_messages_draw_world_geometry(void); void func_80255FD8(void); -void set_actor_pal_effect(Actor* actor, s32 arg1); +void set_actor_glow_pal(Actor* actor, s32 arg1); void btl_set_popup_duration(s32 duration); void switch_to_partner(s32 arg0); @@ -619,7 +619,7 @@ void suggest_player_anim_always_forward(AnimID anim); void suggest_player_anim_allow_backward(AnimID anim); void subtract_hp(s32 amt); void draw_status_ui(void); -void open_status_bar_long(void); +void open_status_bar_slowly(void); void suspend_all_group(s32 groupFlags); void kill_script(Evt* instanceToKill); @@ -795,8 +795,8 @@ void basic_ai_loiter_init(Evt* script, MobileAISettings* aiSettings, EnemyDetect void PatrolAI_LoiterInit(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territory); s32 func_80263230(Actor*, Actor*); -void set_part_pal_effect(ActorPart*, s32); -void func_80266E40(Actor*); +void set_part_glow_pal(ActorPart*, s32); +void clear_actor_static_pal_adjustments(Actor*); void set_actor_flash_mode(Actor* actor, s32 arg1); void remove_player_buffs(s32); s32 is_actor_health_bar_visible(Actor*); @@ -823,7 +823,7 @@ void draw_msg(s32 msgID, s32 posX, s32 posY, s32 opacity, s32 palette, u8 style) void get_background_color_blend(u8* r, u8* g, u8* b, u8* a); s32 entity_base_block_idle(Entity* entity); -void add_SP(s32 amt); +void add_star_power(s32 amt); s32 recover_hp(s32 amt); s32 recover_fp(s32 amt); s32 entity_can_collide_with_jumping_player(Entity* entity); @@ -929,14 +929,14 @@ s32 func_800E06D8(void); void func_800E01DC(void); void collision_lateral_peach(void); void func_800E5520(void); -void func_800E6B68(void); -void func_800E9810(void); -void func_800E983C(void); -void func_800E984C(void); -s32 func_800E9860(void); +void clear_world_menus(void); +void setup_status_bar_for_battle(void); +void enable_status_bar_input(void); +void disable_status_bar_input(void); +b32 can_control_status_bar(void); void status_bar_respond_to_changes(void); -void func_800E98EC(void); -void func_800E9900(void); +void status_bar_always_show_on(void); +void status_bar_always_show_off(void); void func_800F0C9C(void); void func_800F0CB0(s32, f32, f32, f32); void func_800F0D5C(void); @@ -948,10 +948,10 @@ s32 get_stored_count(void); s32 get_item_empty_count(void); void shop_open_item_select_popup(s32 mode); void hide_coin_counter(void); -void set_message_msg(s32 msgID, s32 index); -void set_message_value(s32 value, s32 index); +void set_message_text_var(s32 msgID, s32 index); +void set_message_int_var(s32 value, s32 index); s32 store_item(s32 itemID); -void open_status_bar_short(void); +void open_status_bar_quickly(void); void show_immune_bonk(f32 x, f32 y, f32 z, s32, s32, s32); void show_primary_damage_popup(f32 x, f32 y, f32 z, s32 attack, s32 a); s32 dispatch_damage_event_partner(s32 damageAmount, s32 event, s32 stopMotion); @@ -1015,7 +1015,7 @@ void status_bar_draw_number(s32 iconID, s32 x, s32 y, s32 value, s32 numDigits); void status_bar_draw_stat(s32 id, s32 x, s32 y, s32, s32); void set_background_size(s16, s16, s16, s16); void read_background_size(BackgroundHeader*); -void set_max_SP(s8); +void set_max_star_power(s8); void sync_status_bar(void); void create_cameras_a(void); void func_80045AC0(void); diff --git a/include/macros.h b/include/macros.h index 46a7d68f3e..a6a5c41751 100644 --- a/include/macros.h +++ b/include/macros.h @@ -104,6 +104,9 @@ #define MAX_STAR_PIECES 222 +#define SP_PER_BAR 256 +#define SP_PER_SEG 32 + #define SCREEN_WIDTH 320 #define SCREEN_HEIGHT 240 diff --git a/include/npc.h b/include/npc.h index 1f006d4010..94ceb3cf06 100644 --- a/include/npc.h +++ b/include/npc.h @@ -371,6 +371,12 @@ typedef struct Encounter { /* 0x4A */ char unk_4C[2]; } Encounter; // size = 0x4C +typedef struct FieldStatus { + /* 0x00 */ s8 status; + /* 0x01 */ char pad_01; + /* 0x02 */ s16 duration; +} FieldStatus; + typedef struct EncounterStatus { /* 0x000 */ s32 flags; /* 0x004 */ s8 firstStrikeType; /* 0 = none, 1 = player, 2 = enemy */ @@ -396,7 +402,7 @@ typedef struct EncounterStatus { /* 0x01F */ u8 curEntryIndex; /* 0x020 */ s8 mapID; /* 0x021 */ s8 resetMapEncounterFlags; - /* 0x021 */ char unk_22[2]; + /* 0x022 */ char unk_22[2]; /* 0x024 */ s32* npcGroupList; /* 0x028 */ Encounter* encounterList[24]; /* 0x088 */ Encounter* curEncounter; @@ -405,18 +411,10 @@ typedef struct EncounterStatus { /* 0x094 */ s32 unk_94; /* 0x098 */ s32 fadeOutAccel; /* 0x09C */ s32 battleStartCountdown; - /* 0x0A0 */ s8 dizzyAttackStatus; - /* 0x0A1 */ char unk_A1[0x1]; - /* 0x0A2 */ s16 dizzyAttackDuration; - /* 0x0A4 */ s8 unk_A4; - /* 0x0A5 */ char unk_A5[0x1]; - /* 0x0A6 */ s16 unk_A6; - /* 0x0A8 */ s8 unk_A8; - /* 0x0A9 */ char unk_A9[0x1]; - /* 0x0AA */ s16 unk_AA; - /* 0x0AC */ s8 unk_AC; - /* 0x0AD */ char unk_AD[0x1]; - /* 0x0AE */ s16 unk_AE; + /* 0x0A0 */ FieldStatus dizzyAttack; + /* 0x0A4 */ FieldStatus unusedAttack1; + /* 0x0A8 */ FieldStatus unusedAttack2; + /* 0x0AC */ FieldStatus unusedAttack3; /* 0x0B0 */ s32 defeatFlags[60][12]; /* 0xFB0 */ s16 recentMaps[2]; /* 0xFB4 */ char unk_FB4[4]; diff --git a/include/script_api/map.h b/include/script_api/map.h index d12cb12092..ab2a0f73d3 100644 --- a/include/script_api/map.h +++ b/include/script_api/map.h @@ -35,6 +35,6 @@ extern EvtScript EnterSplitDoubleDoor; extern EvtScript BaseExitDoor; extern EvtScript BaseEnterDoor; extern EvtScript EnterPostPipe; -extern EvtScript ItemShopInteract; +extern EvtScript EVS_ShopOwnerDialog; #endif diff --git a/include/variables.h b/include/variables.h index 0b6aa8dc69..2b91df2589 100644 --- a/include/variables.h +++ b/include/variables.h @@ -123,7 +123,7 @@ extern s32 bMarioDefendAnims[]; extern s32 bPeachIdleAnims[]; extern PartnerStatus gPartnerStatus; -extern UiStatus gUIStatus; +extern StatusBar gStatusBar; extern PlayerStatus gPlayerStatus; extern PlayerSpinState gPlayerSpinState; extern PlayerData gPlayerData; diff --git a/src/23680.c b/src/23680.c index 6f92b9d493..9182b3e443 100644 --- a/src/23680.c +++ b/src/23680.c @@ -141,7 +141,7 @@ void spawn_drops(Enemy* enemy) { } } - if (is_ability_active(ABILITY_HEART_FINDER) != 0) { + if (is_ability_active(ABILITY_HEART_FINDER)) { dropCount += 1 + rand_int(2); } if (enemy->flags & ENEMY_FLAG_NO_DROPS) { @@ -195,7 +195,7 @@ void spawn_drops(Enemy* enemy) { } } - if (is_ability_active(ABILITY_FLOWER_FINDER) != 0) { + if (is_ability_active(ABILITY_FLOWER_FINDER)) { dropCount += 1 + rand_int(2); } if (enemy->flags & ENEMY_FLAG_NO_DROPS) { @@ -253,7 +253,7 @@ void spawn_drops(Enemy* enemy) { } dropCount = dropCount + encounter->coinsEarned; - if (is_ability_active(ABILITY_PAY_OFF) != 0) { + if (is_ability_active(ABILITY_PAY_OFF)) { dropCount += encounter->damageTaken / 2; encounter->damageTaken = 0; } @@ -261,7 +261,7 @@ void spawn_drops(Enemy* enemy) { encounter->hasMerleeCoinBonus = FALSE; dropCount *= 3; } - if (is_ability_active(ABILITY_MONEY_MONEY) != 0) { + if (is_ability_active(ABILITY_MONEY_MONEY)) { dropCount *= 2; } if (dropCount > 20) { @@ -458,7 +458,7 @@ s32 basic_ai_check_player_dist(EnemyDetectVolume* territory, Enemy* enemy, f32 r y = npc->pos.y + npc->collisionHeight * 0.5; z = npc->pos.z; dist = dist2D(npc->pos.x, npc->pos.z, playerStatus->pos.x, playerStatus->pos.z); - if (npc_test_move_simple_with_slipping(COLLISION_CHANNEL_10000 | COLLISION_IGNORE_ENTITIES, + if (npc_test_move_simple_with_slipping(COLLIDER_FLAG_IGNORE_PLAYER | COLLISION_IGNORE_ENTITIES, &x, &y, &z, dist, atan2(npc->pos.x, npc->pos.z, playerStatus->pos.x, playerStatus->pos.z), 0.1f, 0.1f)) { @@ -716,7 +716,7 @@ void basic_ai_found_player_jump_init(Evt* script, MobileAISettings* npcAISetting Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - ai_enemy_play_sound(npc, SOUND_03E1, 0); + ai_enemy_play_sound(npc, SOUND_AI_FOUND_PLAYER_JUMP, 0); npc->curAnim = enemy->animList[ENEMY_ANIM_INDEX_JUMP]; npc->jumpVel = 10.0f; npc->jumpScale = 2.5f; @@ -814,7 +814,7 @@ void basic_ai_chase(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume npc_move_heading(npc, npc->moveSpeed, npc->yaw); if (npc->moveSpeed > 8.0 && !(gGameStatusPtr->frameCounter % 5)) { - ai_enemy_play_sound(npc, SOUND_20C1, 0); + ai_enemy_play_sound(npc, SOUND_SMALL_NPC_STEP, 0); } if (npc->duration > 0) { diff --git a/src/39210_len_aa0.c b/src/39210_len_aa0.c index 7556eaaa74..482dae72c4 100644 --- a/src/39210_len_aa0.c +++ b/src/39210_len_aa0.c @@ -62,7 +62,7 @@ void npc_follow_init(Npc* npc, s32 targetNpcID, FollowAnims* anims, f32 walkSpee npc->jumpVel = 0.0f; npc->flags |= NPC_FLAG_GRAVITY; npc->flags &= ~NPC_FLAG_IGNORE_PLAYER_COLLISION; - npc->collisionChannel = COLLISION_CHANNEL_10000; + npc->collisionChannel = COLLIDER_FLAG_IGNORE_PLAYER; } void npc_update_npc_tracking(Npc* npc) { diff --git a/src/77480.c b/src/77480.c index 2a858c6085..669bace533 100644 --- a/src/77480.c +++ b/src/77480.c @@ -56,7 +56,7 @@ void render_conversation_prompt(void); void clear_conversation_prompt(void); void check_for_interactables(void); void render_interact_prompt(void); -void func_800E0B14(void); +void clear_interact_prompt(void); void update_partner_timers(void); void player_update_sprite(void); s32 get_player_back_anim(s32 arg0); @@ -221,7 +221,7 @@ s32 player_raycast_down(f32* x, f32* y, f32* z, f32* length) { } } - colliderID = test_ray_colliders(0x10000, *x, *y, *z, 0, -1.0f, 0, &hitX, &hitY, &hitZ, &hitDepth, &hitNx, &hitNy, &hitNz); + colliderID = test_ray_colliders(COLLIDER_FLAG_IGNORE_PLAYER, *x, *y, *z, 0, -1.0f, 0, &hitX, &hitY, &hitZ, &hitDepth, &hitNx, &hitNy, &hitNz); if (colliderID >= 0) { ret = colliderID; } @@ -338,7 +338,7 @@ s32 player_raycast_up_corner(f32* x, f32* y, f32* z, f32* length) { sy2 = sy = *y; sz2 = sz = *z; hitDepth = *length; - hitID = test_ray_colliders(0x10000, sx, sy, sz, 0.0f, 1.0f, 0.0f, &hitX, &hitY, &hitZ, &hitDepth, &hitNx, &hitNy, &hitNz); + hitID = test_ray_colliders(COLLIDER_FLAG_IGNORE_PLAYER, sx, sy, sz, 0.0f, 1.0f, 0.0f, &hitX, &hitY, &hitZ, &hitDepth, &hitNx, &hitNy, &hitNz); if (hitID >= 0 && *length > hitDepth) { *length = hitDepth; ret = hitID; @@ -449,17 +449,17 @@ s32 player_raycast_general(s32 mode, f32 startX, f32 startY, f32 startZ, f32 dir } else { ret = entityID | COLLISION_WITH_ENTITY_BIT; } - } else if (mode == 3) { + } else if (mode == PLAYER_COLLISION_3) { ret = test_ray_colliders(COLLIDER_FLAG_IGNORE_SHELL, startX, startY, startZ, dirX, dirY, dirZ, hitX, hitY, hitZ, hitDepth, hitNx, hitNy, hitNz); } - if (mode == 1 || mode == 3) { + if (mode == PLAYER_COLLISION_1 || mode == PLAYER_COLLISION_3) { return ret; } - if (mode == 4) { - ignoreFlags = COLLISION_CHANNEL_80000; + if (mode == PLAYER_COLLISION_4) { + ignoreFlags = COLLIDER_FLAG_DOCK_WALL; } else { ignoreFlags = COLLIDER_FLAG_IGNORE_PLAYER; } @@ -475,8 +475,8 @@ s32 player_raycast_general(s32 mode, f32 startX, f32 startY, f32 startZ, f32 dir nAngleZ = 180.0f - atan2(0, 0, *hitNz * 100.0, *hitNy * 100.0); nAngleX = 180.0f - atan2(0, 0, *hitNx * 100.0, *hitNy * 100.0); - if (!(nAngleZ == 90.0f && nAngleX == 90.0f || fabs(nAngleZ) >= 30.0 || fabs(nAngleX) >= 30.0)) { - ret = -1; + if (!((nAngleZ == 90.0f && nAngleX == 90.0f) || fabs(nAngleZ) >= 30.0 || fabs(nAngleX) >= 30.0)) { + ret = NO_COLLIDER; } } @@ -515,7 +515,7 @@ s32 player_test_move_without_slipping(PlayerStatus* playerStatus, f32* x, f32* y dx = radius * sinTheta; ret = NO_COLLIDER; - raycastID = player_raycast_general(0, *x, *y + 0.1, *z, sinTheta, 0, cosTheta, &hitX, &hitY, &hitZ, &hitDepth, &hitNx, &hitNy, &hitNz); + raycastID = player_raycast_general(PLAYER_COLLISION_0, *x, *y + 0.1, *z, sinTheta, 0, cosTheta, &hitX, &hitY, &hitZ, &hitDepth, &hitNx, &hitNy, &hitNz); if (raycastID >= 0 && hitDepth <= depth) { *hasClimbableStep = TRUE; } @@ -524,7 +524,7 @@ s32 player_test_move_without_slipping(PlayerStatus* playerStatus, f32* x, f32* y hitDepth = depth; dz = radius * cosTheta; - raycastID = player_raycast_general(0, *x, *y + height, *z, sinTheta, 0, cosTheta, &hitX, &hitY, &hitZ, &hitDepth, &hitNx, &hitNy, &hitNz); + raycastID = player_raycast_general(PLAYER_COLLISION_0, *x, *y + height, *z, sinTheta, 0, cosTheta, &hitX, &hitY, &hitZ, &hitDepth, &hitNx, &hitNy, &hitNz); targetDx = 0.0f; targetDz = 0.0f; @@ -583,7 +583,7 @@ s32 player_test_move_with_slipping(PlayerStatus* playerStatus, f32* x, f32* y, f targetDx = length * sinTheta; targetDz = length * cosTheta; - hitID = player_raycast_general(0, *x, *y + height, *z, sinTheta, 0, cosTheta, &hitX, &hitY, &hitZ, &hitDepth, &hitNx, &hitNy, &hitNz); + hitID = player_raycast_general(PLAYER_COLLISION_0, *x, *y + height, *z, sinTheta, 0, cosTheta, &hitX, &hitY, &hitZ, &hitDepth, &hitNx, &hitNy, &hitNz); if (hitID >= 0 && (depthDiff = hitDepth, depthDiff <= length + radius)) { depthDiff -= (length + radius); dx = depthDiff * sinTheta; @@ -594,7 +594,7 @@ s32 player_test_move_with_slipping(PlayerStatus* playerStatus, f32* x, f32* y, f ret = hitID; } else { height = playerStatus->colliderHeight * 0.75; - hitID = player_raycast_general(0, *x, *y + height, *z, sinTheta, 0, cosTheta, &hitX, &hitY, &hitZ, &hitDepth, &hitNx, &hitNy, &hitNz); + hitID = player_raycast_general(PLAYER_COLLISION_0, *x, *y + height, *z, sinTheta, 0, cosTheta, &hitX, &hitY, &hitZ, &hitDepth, &hitNx, &hitNy, &hitNz); if (hitID >= 0 && (depthDiff = hitDepth, depthDiff <= length + radius)) { depthDiff -= (length + radius); dx = depthDiff * sinTheta; @@ -792,8 +792,8 @@ void player_reset_data(void) { reset_player_status(); playerStatus->shadowID = create_shadow_type(SHADOW_VARYING_CIRCLE, playerStatus->pos.x, playerStatus->pos.y, playerStatus->pos.z); - func_800E6B68(); - func_800E0B14(); + clear_world_menus(); + clear_interact_prompt(); clear_conversation_prompt(); clear_pulse_stone_icon(); clear_ispy_icon(); @@ -909,7 +909,7 @@ void update_player_blink(void) { if (playerStatus->blinkTimer > 0) { playerStatus->blinkTimer--; - alpha = &playerStatus->alpha1; + alpha = &playerStatus->curAlpha; if (!(gGameStatusPtr->frameCounter & 1)) { if (outtaSight) { phi_v1 = 192; @@ -923,10 +923,10 @@ void update_player_blink(void) { if (!playerStatus->blinkTimer) { if (outtaSight) { - playerStatus->alpha1 = 128; + playerStatus->curAlpha = 128; playerStatus->flags |= PS_FLAG_HAZARD_INVINCIBILITY; } else { - playerStatus->alpha1 = 255; + playerStatus->curAlpha = 255; playerStatus->flags &= ~PS_FLAG_HAZARD_INVINCIBILITY; } } else { @@ -1096,7 +1096,7 @@ s32 has_valid_conversation_npc(void) { s32 cond; if (npc != NULL && !(npc->flags & NPC_FLAG_10000000)) { - cond = (playerStatus->flags & (PS_FLAG_HAS_CONVERSATION_NPC | PS_FLAG_INPUT_DISABLED)) == PS_FLAG_HAS_CONVERSATION_NPC; + cond = !(playerStatus->flags & PS_FLAG_INPUT_DISABLED) && (playerStatus->flags & PS_FLAG_HAS_CONVERSATION_NPC); ret = cond; } return ret; @@ -1230,7 +1230,8 @@ void check_for_interactables(void) { break; } } else if ( - ((playerStatus->flags & (PS_FLAG_HAS_CONVERSATION_NPC | PS_FLAG_INPUT_DISABLED)) == PS_FLAG_HAS_CONVERSATION_NPC) + (!(playerStatus->flags & PS_FLAG_INPUT_DISABLED)) + && (playerStatus->flags & PS_FLAG_HAS_CONVERSATION_NPC) && (npc != NULL) && (npc->flags & NPC_FLAG_10000000) ) { @@ -1306,7 +1307,7 @@ void render_interact_prompt(void) { } } -void func_800E0B14(void) { +void clear_interact_prompt(void) { InteractNotificationCallback = NULL; gPlayerStatusPtr->animFlags &= ~PA_FLAG_INTERACT_PROMPT_AVAILABLE; } @@ -1491,8 +1492,8 @@ void render_player_model(void) { get_screen_coords(gCurrentCamID, playerStatus->pos.x, playerStatus->pos.y, playerStatus->pos.z, &x, &y, &z); if (!(playerStatus->flags & PS_FLAG_SPINNING)) { - if (playerStatus->alpha1 != playerStatus->alpha2) { - if (playerStatus->alpha1 < 254) { + if (playerStatus->curAlpha != playerStatus->prevAlpha) { + if (playerStatus->curAlpha < 254) { if (!(playerStatus->animFlags & PA_FLAG_MAP_HAS_SWITCH)) { renderModeTemp = RENDER_MODE_SURFACE_XLU_LAYER1; } else { @@ -1500,7 +1501,7 @@ void render_player_model(void) { } playerStatus->renderMode = renderModeTemp; - set_player_imgfx_comp(PLAYER_SPRITE_MAIN, -1, IMGFX_SET_ALPHA, 0, 0, 0, playerStatus->alpha1, 0); + set_player_imgfx_comp(PLAYER_SPRITE_MAIN, -1, IMGFX_SET_ALPHA, 0, 0, 0, playerStatus->curAlpha, 0); } else { playerStatus->renderMode = RENDER_MODE_ALPHATEST; @@ -1508,11 +1509,11 @@ void render_player_model(void) { } } - playerStatus->alpha2 = playerStatus->alpha1; + playerStatus->prevAlpha = playerStatus->curAlpha; } else { playerStatus->renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; - playerStatus->alpha2 = 0; + playerStatus->prevAlpha = 0; } if (!(playerStatus->animFlags & PA_FLAG_INVISIBLE)) { @@ -1727,7 +1728,7 @@ void update_player_shadow(void) { } shadow->pos.y = y; - shadow->alpha = (f64)playerStatus->alpha1 / 2; + shadow->alpha = (f64)playerStatus->curAlpha / 2; if (!(gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_IS_PEACH)) { set_standard_shadow_scale(shadow, shadowScale); diff --git a/src/7B440.c b/src/7B440.c index 3ac2f0f862..a48cadc887 100644 --- a/src/7B440.c +++ b/src/7B440.c @@ -67,8 +67,8 @@ void reset_player_status(void) { playerStatus->availableDisguiseType = 1; playerStatus->renderMode = RENDER_MODE_ALPHATEST; - playerStatus->alpha1 = 255; - playerStatus->alpha2 = 255; + playerStatus->curAlpha = 255; + playerStatus->prevAlpha = 255; gGameStatusPtr->peachFlags &= ~PEACH_STATUS_FLAG_8; gGameStatusPtr->peachFlags &= ~PEACH_STATUS_FLAG_DEPRESSED; diff --git a/src/7bb60_len_41b0.c b/src/7BB60.c similarity index 97% rename from src/7bb60_len_41b0.c rename to src/7BB60.c index 25b891d39b..1302703353 100644 --- a/src/7bb60_len_41b0.c +++ b/src/7BB60.c @@ -538,7 +538,7 @@ void collision_main_lateral(void) { gCameras[CAM_DEFAULT].targetPos.x = playerStatus->pos.x; gCameras[CAM_DEFAULT].targetPos.y = playerStatus->pos.y; gCameras[CAM_DEFAULT].targetPos.z = playerStatus->pos.z; - if (playerStatus->alpha1 != 128) { + if (playerStatus->curAlpha != 128) { collision_check_player_intersecting_world(0, 0, atan2(0.0f, 0.0f, playerStatus->pushVel.x, playerStatus->pushVel.z)); } @@ -710,12 +710,12 @@ void collision_main_lateral(void) { test1Y = playerY; test1Z = playerZ; yaw = clamp_angle(yaw2 - 35.0); - test1 = player_test_lateral_overlap(0, playerStatus, &test1X, &test1Y, &test1Z, 0.0f, yaw); + test1 = player_test_lateral_overlap(PLAYER_COLLISION_0, playerStatus, &test1X, &test1Y, &test1Z, 0.0f, yaw); test2X = playerX; test2Z = playerY; test2Y = playerZ; yaw = clamp_angle(yaw2 + 35.0); - test2 = player_test_lateral_overlap(0, playerStatus, &test2X, &test2Z, &test2Y, 0.0f, yaw); + test2 = player_test_lateral_overlap(PLAYER_COLLISION_0, playerStatus, &test2X, &test2Z, &test2Y, 0.0f, yaw); if (test1 < 0) { if (test2 < 0) { @@ -823,7 +823,7 @@ void collision_check_player_overlaps(void) { f32 y = playerStatus->pos.y; f32 z = playerStatus->pos.z; - player_test_lateral_overlap(0, &gPlayerStatus, &x, &y, &z, overlapPush, playerStatus->overlapPushYaw); + player_test_lateral_overlap(PLAYER_COLLISION_0, &gPlayerStatus, &x, &y, &z, overlapPush, playerStatus->overlapPushYaw); overlapPush -= playerStatus->runSpeed / 10.0f; playerStatus->pos.x = x; @@ -1014,7 +1014,7 @@ void collision_lava_reset_check_additional_overlaps(void) { y = playerStatus->pos.y + (playerStatus->colliderHeight * 0.75f); x = playerStatus->pos.x; z = playerStatus->pos.z; - player_test_lateral_overlap(0, &gPlayerStatus, &x, &y, &z, 0.0f, temp_f0); + player_test_lateral_overlap(PLAYER_COLLISION_0, &gPlayerStatus, &x, &y, &z, 0.0f, temp_f0); playerStatus->pos.x = x; playerStatus->pos.z = z; @@ -1022,7 +1022,7 @@ void collision_lava_reset_check_additional_overlaps(void) { y = playerStatus->pos.y + (playerStatus->colliderHeight * 0.75f); x = playerStatus->pos.x; z = playerStatus->pos.z; - player_test_lateral_overlap(0, &gPlayerStatus, &x, &y, &z, 0.0f, temp_f0); + player_test_lateral_overlap(PLAYER_COLLISION_0, &gPlayerStatus, &x, &y, &z, 0.0f, temp_f0); playerStatus->pos.x = x; playerStatus->pos.z = z; @@ -1030,7 +1030,7 @@ void collision_lava_reset_check_additional_overlaps(void) { x = playerStatus->pos.x; y = playerStatus->pos.y; z = playerStatus->pos.z; - player_test_lateral_overlap(0, &gPlayerStatus, &x, &y, &z, 0.0f, temp_f0); + player_test_lateral_overlap(PLAYER_COLLISION_0, &gPlayerStatus, &x, &y, &z, 0.0f, temp_f0); playerStatus->pos.x = x; playerStatus->pos.z = z; @@ -1038,7 +1038,7 @@ void collision_lava_reset_check_additional_overlaps(void) { x = playerStatus->pos.x; y = playerStatus->pos.y; z = playerStatus->pos.z; - player_test_lateral_overlap(0, &gPlayerStatus, &x, &y, &z, 0.0f, temp_f0); + player_test_lateral_overlap(PLAYER_COLLISION_0, &gPlayerStatus, &x, &y, &z, 0.0f, temp_f0); playerStatus->pos.x = x; playerStatus->pos.z = z; @@ -1046,7 +1046,7 @@ void collision_lava_reset_check_additional_overlaps(void) { x = playerStatus->pos.x; y = playerStatus->pos.y; z = playerStatus->pos.z; - player_test_lateral_overlap(0, &gPlayerStatus, &x, &y, &z, 0.0f, temp_f0); + player_test_lateral_overlap(PLAYER_COLLISION_0, &gPlayerStatus, &x, &y, &z, 0.0f, temp_f0); playerStatus->pos.x = x; playerStatus->pos.z = z; temp_f0 = clamp_angle(playerStatus->targetYaw - 90.0); @@ -1054,7 +1054,7 @@ void collision_lava_reset_check_additional_overlaps(void) { x = playerStatus->pos.x; y = playerStatus->pos.y; z = playerStatus->pos.z; - player_test_lateral_overlap(0, &gPlayerStatus, &x, &y, &z, 0.0f, temp_f0); + player_test_lateral_overlap(PLAYER_COLLISION_0, &gPlayerStatus, &x, &y, &z, 0.0f, temp_f0); playerStatus->pos.x = x; playerStatus->pos.z = z; @@ -1062,7 +1062,7 @@ void collision_lava_reset_check_additional_overlaps(void) { x = playerStatus->pos.x; y = playerStatus->pos.y; z = playerStatus->pos.z; - player_test_lateral_overlap(0, &gPlayerStatus, &x, &y, &z, 0.0f, temp_f0); + player_test_lateral_overlap(PLAYER_COLLISION_0, &gPlayerStatus, &x, &y, &z, 0.0f, temp_f0); playerStatus->pos.x = x; playerStatus->pos.z = z; } diff --git a/src/7E9D0.c b/src/7E9D0.c index 9e73a99e95..7b987baa9b 100644 --- a/src/7E9D0.c +++ b/src/7E9D0.c @@ -163,9 +163,9 @@ s32 phys_adjust_cam_on_landing(void) { gCameras[CAM_DEFAULT].moveFlags &= ~CAMERA_MOVE_IGNORE_PLAYER_Y; } } else if (partnerStatus->partnerActionState != PARTNER_ACTION_NONE && partnerStatus->actingPartner == PARTNER_PARAKARRY) { - gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_FLAG_2; + gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_NO_INTERP_Y; } else { - gCameras[CAM_DEFAULT].moveFlags &= ~CAMERA_MOVE_FLAG_2; + gCameras[CAM_DEFAULT].moveFlags &= ~CAMERA_MOVE_NO_INTERP_Y; } return ret; @@ -233,7 +233,7 @@ void phys_update_action_state(void) { if (playerStatus->camResetDelay != 0) { playerStatus->camResetDelay--; if (playerStatus->camResetDelay == 0) { - gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_FLAG_4; + gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_ACCEL_INTERP_Y; } } @@ -676,7 +676,7 @@ s32 peach_disguise_check_overlaps(void) { f32 x = playerStatus->pos.x + (dx * radius); f32 y = playerStatus->pos.y + 4.0f; f32 z = playerStatus->pos.z - (dy * radius); - hitID = player_test_lateral_overlap(3, playerStatus, &x, &y, &z, 4.0f, yaw); + hitID = player_test_lateral_overlap(PLAYER_COLLISION_3, playerStatus, &x, &y, &z, 4.0f, yaw); if (hitID >= 0) { break; } diff --git a/src/8a860_len_3f30.c b/src/8a860_len_3f30.c index 77f7ab7c16..96c14ec35d 100644 --- a/src/8a860_len_3f30.c +++ b/src/8a860_len_3f30.c @@ -87,12 +87,12 @@ SHIFT_BSS s8 D_8010D693; SHIFT_BSS s32 gPopupWorker; SHIFT_BSS s8 PopupNotDipping; SHIFT_BSS s8 PopupDipMode; -SHIFT_BSS s8 D_8010D69A; +SHIFT_BSS s8 PopupMenu_WasStatusBarIgnoringChanges; SHIFT_BSS PopupMenu* gPopupMenu; SHIFT_BSS MessagePrintState* D_8010D6A0; SHIFT_BSS s32 D_8010D6A4; -s8 func_800E98D4(void); +s8 status_bar_is_ignoring_changes(void); enum PopupTypes { POPUP_TYPE_USE_ITEM, @@ -214,7 +214,7 @@ void destroy_popup_menu(void) { gPopupMenu->popupType == POPUP_TYPE_UPGRADE_PARTNER || gPopupMenu->popupType == POPUP_TYPE_USE_KEY ) && !gGameStatusPtr->isBattle) { - if (D_8010D69A == 0) { + if (!PopupMenu_WasStatusBarIgnoringChanges) { status_bar_respond_to_changes(); } close_status_bar(); @@ -929,7 +929,7 @@ s32 popup_menu_update(void) { if (PopupNotBattle && (gGameStatusPtr->pressedButtons[0] & buttons)) { sfx_play_sound(SOUND_MENU_BACK); - gPopupState = POPUP_STATE_MINUS_6; + gPopupState = POPUP_STATE_CHOSE_SWAP; break; } } @@ -998,8 +998,8 @@ s32 popup_menu_update(void) { gPopupState = POPUP_STATE_MINUS_5; gPopupMenu->result = POPUP_RESULT_CANCEL; return 255; - case POPUP_STATE_MINUS_6: - gPopupMenu->result = POPUP_RESULT_MINUS_2; + case POPUP_STATE_CHOSE_SWAP: + gPopupMenu->result = POPUP_RESULT_SWAP_MENU; return 255; case POPUP_STATE_MINUS_7: case POPUP_STATE_MINUS_5: @@ -1023,7 +1023,7 @@ s32 popup_menu_update(void) { break; case POPUP_STATE_ALREADY_HAVE_PARTNER_BEGIN: gPopupState = POPUP_STATE_ALREADY_HAVE_PARTNER_SHOW; - gPopupMenu->result = POPUP_RESULT_MINUS_1; + gPopupMenu->result = POPUP_RESULT_INVALID; return 0; case POPUP_STATE_ALREADY_HAVE_PARTNER_SHOW: set_window_update(WINDOW_ID_14, WINDOW_UPDATE_HIDE); @@ -1225,7 +1225,7 @@ void popup_menu_draw_menu_contents(s32* userData, s32 baseX, s32 baseY, s32 widt case POPUP_STATE_10: case POPUP_STATE_CHOSE_WORLD: case POPUP_STATE_CHOSE_BATTLE: - case POPUP_STATE_MINUS_6: + case POPUP_STATE_CHOSE_SWAP: case POPUP_STATE_MINUS_7: case POPUP_STATE_MINUS_8: case POPUP_STATE_CHOOSING: @@ -1357,7 +1357,7 @@ void popup_menu_draw_menu_contents(s32* userData, s32 baseX, s32 baseY, s32 widt } else { msgPal = MSG_PAL_STANDARD; } - set_message_value(gPopupMenu->userIndex[t] + 1, 0); + set_message_int_var(gPopupMenu->userIndex[t] + 1, 0); draw_msg(MSG_Menus_00CD, x + 8, y, PopupMenu_Alpha, msgPal, DRAW_MSG_STYLE_MENU); break; case POPUP_MENU_READ_POSTCARD: @@ -1853,9 +1853,9 @@ void create_standard_popup_menu(PopupMenu* popup) { s32 initialPos; s32 numEntries; - D_8010D69A = func_800E98D4(); + PopupMenu_WasStatusBarIgnoringChanges = status_bar_is_ignoring_changes(); status_bar_ignore_changes(); - open_status_bar_short(); + open_status_bar_quickly(); gPopupMenu = popup; popup->result = POPUP_RESULT_CHOOSING; popup->dipMode = 0; @@ -1908,7 +1908,7 @@ void create_shop_popup_menu(PopupMenu* popup) { popup->result = POPUP_RESULT_CHOOSING; popup->dipMode = 0; popup->titleNumber = 0; - D_8010D69A = func_800E98D4(); + PopupMenu_WasStatusBarIgnoringChanges = status_bar_is_ignoring_changes(); PopupDipMode = 0; PopupNotDipping = TRUE; if (gPopupMenu->popupType >= POPUP_MENU_DOUBLE_DIP) { @@ -1952,7 +1952,7 @@ void create_battle_popup_menu(PopupMenu* popup) { popup->result = POPUP_RESULT_CHOOSING; D_8010D693 = popup->titleNumber; - D_8010D69A = func_800E98D4(); + PopupMenu_WasStatusBarIgnoringChanges = status_bar_is_ignoring_changes(); PopupDipMode = 0; PopupNotDipping = TRUE; if (gPopupMenu->popupType >= POPUP_MENU_DOUBLE_DIP) { diff --git a/src/audio/e0b30_len_b80.c b/src/audio/e0b30_len_b80.c index 576f08d0a4..7227476b3a 100644 --- a/src/audio/e0b30_len_b80.c +++ b/src/audio/e0b30_len_b80.c @@ -397,8 +397,8 @@ void bgm_pop_battle_song(void) { MusicSettings* musicSetting = gMusicSettings; if (gGameStatusPtr->demoState == DEMO_STATE_NONE) { - if (gOverrideFlags & GLOBAL_OVERRIDES_20000) { - gOverrideFlags &= ~GLOBAL_OVERRIDES_20000; + if (gOverrideFlags & GLOBAL_OVERRIDES_DONT_RESUME_SONG_AFTER_BATTLE) { + gOverrideFlags &= ~GLOBAL_OVERRIDES_DONT_RESUME_SONG_AFTER_BATTLE; } else { musicSetting->flags |= MUSIC_SETTINGS_FLAG_8; _bgm_set_song(0, musicSetting->savedSongID, musicSetting->savedVariation, 0, 8); @@ -410,13 +410,15 @@ void bgm_pop_battle_song(void) { void bgm_push_battle_song(void) { MusicSettings* musicSetting = gMusicSettings; - if (gGameStatusPtr->demoState == DEMO_STATE_NONE && !(gOverrideFlags & GLOBAL_OVERRIDES_20000)) { - snd_ambient_pause(0, 250); - musicSetting->savedSongID = musicSetting->songID; - musicSetting->savedVariation = musicSetting->variation; - musicSetting->savedSongName = musicSetting->songName; - musicSetting->flags |= MUSIC_SETTINGS_FLAG_4; - bgm_set_song(0, musicSetting->battleSongID, musicSetting->battleVariation, 500, 8); + if (gGameStatusPtr->demoState == DEMO_STATE_NONE) { + if (!(gOverrideFlags & GLOBAL_OVERRIDES_DONT_RESUME_SONG_AFTER_BATTLE)) { + snd_ambient_pause(0, 250); + musicSetting->savedSongID = musicSetting->songID; + musicSetting->savedVariation = musicSetting->variation; + musicSetting->savedSongName = musicSetting->songName; + musicSetting->flags |= MUSIC_SETTINGS_FLAG_4; + bgm_set_song(0, musicSetting->battleSongID, musicSetting->battleVariation, 500, 8); + } } } diff --git a/src/audio/sfx_player.c b/src/audio/sfx_player.c index 83566a8336..324b7bc871 100644 --- a/src/audio/sfx_player.c +++ b/src/audio/sfx_player.c @@ -120,7 +120,7 @@ s32 CUSTOM_ECHO_PARAMS_3[] = { AlUnkGemini D_80078370[] = { { - .sound1 = SOUND_034A, + .sound1 = SOUND_SHORT_CLAP, .sound2 = SOUND_LRAW_CHEERING, .flags = 1 } diff --git a/src/battle/16C8E0.c b/src/battle/16C8E0.c index 5526862dab..737a7e09d6 100644 --- a/src/battle/16C8E0.c +++ b/src/battle/16C8E0.c @@ -107,7 +107,7 @@ void tattle_cam_post_render(Camera*); void btl_draw_enemy_health_bars(void); void btl_update_starpoints_display(void); -void get_dpad_input_radial(f32* angle, f32* magnitude) { +void get_stick_input_radial(f32* angle, f32* magnitude) { BattleStatus* battleStatus = &gBattleStatus; f32 maxMagnitude = 60.0f; f32 stickX = battleStatus->stickX; @@ -249,8 +249,8 @@ void btl_update(void) { BattleStatus* battleStatus = &gBattleStatus; PlayerData* playerData = &gPlayerData; Actor* partner = battleStatus->partnerActor; - f32 dpadAngle; - f32 dpadMagnitude; + f32 outAngle; + f32 outMagnitude; s32 cond; if (battleStatus->inputBitmask != -1) { @@ -273,9 +273,9 @@ void btl_update(void) { } } - get_dpad_input_radial(&dpadAngle, &dpadMagnitude); - battleStatus->dpadX = dpadAngle; - battleStatus->dpadY = dpadMagnitude; + get_stick_input_radial(&outAngle, &outMagnitude); + battleStatus->stickAngle = outAngle; + battleStatus->stickMagnitude = outMagnitude; battleStatus->pushInputBuffer[battleStatus->inputBufferPos] = battleStatus->curButtonsPressed; battleStatus->holdInputBuffer[battleStatus->inputBufferPos] = battleStatus->curButtonsDown; @@ -1124,7 +1124,7 @@ void btl_delete_actor(Actor* actor) { if (actor->takeTurnScript != NULL) { kill_script_by_ID(actor->takeTurnScriptID); } - set_actor_pal_effect(actor, GLOW_PAL_OFF); + set_actor_glow_pal(actor, GLOW_PAL_OFF); part = actor->partsTable; diff --git a/src/battle/181810.c b/src/battle/181810.c index c05a66b99d..cd11aff3eb 100644 --- a/src/battle/181810.c +++ b/src/battle/181810.c @@ -156,7 +156,7 @@ API_CALLABLE(ActorSpeak) { msg_printer_set_origin_pos(gSpeakingActorPrintCtx, screenX, screenY); script->functionTemp[0] = 0; - gOverrideFlags |= GLOBAL_OVERRIDES_10; + gOverrideFlags |= GLOBAL_OVERRIDES_MESSAGES_OVER_FRONTUI; if (gSpeakingActorTalkAnim >= 0) { set_actor_anim_by_ref(actor, part, gSpeakingActorTalkAnim); } @@ -196,7 +196,7 @@ API_CALLABLE(ActorSpeak) { if (gSpeakingActorPrintIsDone == TRUE) { decrement_status_bar_disabled(); - gOverrideFlags &= ~GLOBAL_OVERRIDES_10; + gOverrideFlags &= ~GLOBAL_OVERRIDES_MESSAGES_OVER_FRONTUI; return ApiStatus_DONE1; } } @@ -263,7 +263,7 @@ API_CALLABLE(EndActorSpeech) { if (gSpeakingActorPrintIsDone == TRUE) { decrement_status_bar_disabled(); - gOverrideFlags &= ~GLOBAL_OVERRIDES_10; + gOverrideFlags &= ~GLOBAL_OVERRIDES_MESSAGES_OVER_FRONTUI; return ApiStatus_DONE1; } } diff --git a/src/battle/190B20.c b/src/battle/190B20.c index 29c25d7c1c..3ba7085542 100644 --- a/src/battle/190B20.c +++ b/src/battle/190B20.c @@ -587,7 +587,7 @@ s32 func_80263064(Actor* actor, Actor* targetActor, b32 unused) { } actor->targetActorID = target->actorID = targetActor->actorID; - actor->targetPartIndex = target->partID = partData->index; + actor->targetPartID = target->partID = partData->index; target->truePos.x = x; target->truePos.y = y; target->truePos.z = z; @@ -1000,7 +1000,7 @@ s32 count_power_plus(s32 damageType) { u8 moveID = gItemTable[gPlayerData.equippedBadges[i]].moveID; if (gMoveTable[moveID].category == MOVE_TYPE_ATTACK_UP && moveID == MOVE_POWER_PLUS) { - if (gBattleStatus.flags1 & BS_FLAGS1_10 || damageType & DAMAGE_TYPE_JUMP) { + if (gBattleStatus.flags1 & BS_FLAGS1_INCLUDE_POWER_UPS || damageType & DAMAGE_TYPE_JUMP) { count++; } } @@ -2685,7 +2685,7 @@ void clear_part_pal_adjustment(ActorPart* part) { } // TODO: improve match -void func_80266E40(Actor* actor) { +void clear_actor_static_pal_adjustments(Actor* actor) { ActorPart* part = actor->partsTable; s8 e = ACTOR_PAL_ADJUST_BLEND_PALETTES_UNIFORM_INTERVALS; s8 f = ACTOR_PAL_ADJUST_BLEND_PALETTES_VARYING_INTERVALS; @@ -2694,10 +2694,11 @@ void func_80266E40(Actor* actor) { DecorationTable* decorations = part->decorationTable; do { - if (!(part->flags & (ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION | ACTOR_PART_FLAG_INVISIBLE)) && - (part->idleAnimations != NULL) && - !(part->flags & ACTOR_PART_FLAG_NO_DECORATIONS)) - { + if (!(part->flags & ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION) + && !(part->flags & ACTOR_PART_FLAG_INVISIBLE) + && (part->idleAnimations != NULL) + && !(part->flags & ACTOR_PART_FLAG_NO_DECORATIONS) + ) { if (decorations->paletteAdjustment != e && decorations->paletteAdjustment != f) { decorations->paletteAdjustment = ACTOR_PAL_ADJUST_NONE; } @@ -2707,19 +2708,19 @@ void func_80266E40(Actor* actor) { } } -void set_part_pal_effect(ActorPart* part, s32 palEffect) { +void set_part_glow_pal(ActorPart* part, s32 glowState) { if (part->idleAnimations != NULL && !(part->flags & ACTOR_PART_FLAG_NO_DECORATIONS)) { DecorationTable* decorations = part->decorationTable; - if (decorations->glowState != palEffect) { - decorations->glowState = palEffect; + if (decorations->glowState != glowState) { + decorations->glowState = glowState; decorations->glowUnk1 = 0; decorations->glowStateChanged = TRUE; } } } -void set_actor_pal_effect(Actor* actor, s32 palEffect) { +void set_actor_glow_pal(Actor* actor, s32 glowState) { ActorPart* part; for (part = actor->partsTable; part != NULL; part = part->nextPart) { @@ -2727,18 +2728,18 @@ void set_actor_pal_effect(Actor* actor, s32 palEffect) { && (part->idleAnimations != NULL) && !(part->flags & ACTOR_PART_FLAG_NO_DECORATIONS) ) { - set_part_pal_effect(part, palEffect); + set_part_glow_pal(part, glowState); } } } -void clear_part_pal_effect(ActorPart* part) { +void clear_part_glow_pal(ActorPart* part) { if (part->idleAnimations != NULL && !(part->flags & ACTOR_PART_FLAG_NO_DECORATIONS)) { part->decorationTable->glowState = GLOW_PAL_OFF; } } -void clear_actor_pal_effect(Actor* actor) { +void clear_actor_glow_pal(Actor* actor) { ActorPart* part; for (part = actor->partsTable; part != NULL; part = part->nextPart) { diff --git a/src/battle/1A5830.c b/src/battle/1A5830.c index 044146b09f..5e7f8252f6 100644 --- a/src/battle/1A5830.c +++ b/src/battle/1A5830.c @@ -343,7 +343,7 @@ HitResult calc_enemy_damage_target(Actor* attacker) { && !has_enchanted_part(attacker)) // enchanted attacks ignore electrified defenders { madeElectricContact = TRUE; - gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; + gBattleStatus.flags1 |= BS_FLAGS1_TRIGGER_EVENTS; } // ------------------------------------------------------------------------ @@ -473,7 +473,7 @@ HitResult calc_enemy_damage_target(Actor* attacker) { break; } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { func_80266970(target); } @@ -520,7 +520,7 @@ HitResult calc_enemy_damage_target(Actor* attacker) { } } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { if (event == EVENT_HIT_COMBO) { event = EVENT_HIT; } @@ -534,11 +534,11 @@ HitResult calc_enemy_damage_target(Actor* attacker) { event = EVENT_HIT_COMBO; } - if (!(gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE)) { + if (!(gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS)) { clear_part_pal_adjustment(targetPart); } - if ((gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) + if ((gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) && (battleStatus->curAttackElement & (DAMAGE_TYPE_POW | DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_JUMP)) && (targetPart->eventFlags & ACTOR_EVENT_FLAG_FLIPABLE) ) { @@ -550,7 +550,7 @@ HitResult calc_enemy_damage_target(Actor* attacker) { } } - if (!(gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) + if (!(gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) && (battleStatus->curAttackElement & (DAMAGE_TYPE_POW | DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_JUMP)) && (targetPart->eventFlags & ACTOR_EVENT_FLAG_FLIPABLE) ) { @@ -562,7 +562,7 @@ HitResult calc_enemy_damage_target(Actor* attacker) { } } - if ((gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) + if ((gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) && (battleStatus->curAttackElement & (DAMAGE_TYPE_FIRE | DAMAGE_TYPE_BLAST | DAMAGE_TYPE_4000)) ) { if (event == EVENT_HIT) { @@ -594,7 +594,7 @@ HitResult calc_enemy_damage_target(Actor* attacker) { // try inflicting status effect - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS && battleStatus->lastAttackDamage >= 0 && event != EVENT_DEATH && event != EVENT_SPIN_SMASH_DEATH @@ -683,7 +683,7 @@ HitResult calc_enemy_damage_target(Actor* attacker) { if (actorClass == ACTOR_CLASS_PARTNER && battleStatus->lastAttackDamage > 0 - && gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE + && gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS && !(target->flags & ACTOR_FLAG_NO_DMG_APPLY)) { inflict_partner_ko(target, STATUS_KEY_DAZE, battleStatus->lastAttackDamage); @@ -850,7 +850,7 @@ s32 dispatch_damage_event_actor(Actor* actor, s32 damageAmount, s32 originalEven battleStatus->lastAttackDamage += hpChange; actor->lastDamageTaken = battleStatus->lastAttackDamage; battleStatus->curDamageSource = DMG_SRC_DEFAULT; - if (battleStatus->flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { + if (battleStatus->flags1 & BS_FLAGS1_TRIGGER_EVENTS) { if (dispatchEvent == EVENT_HIT_COMBO) { dispatchEvent = EVENT_HIT; } @@ -2597,7 +2597,7 @@ ApiStatus SetTargetActor(Evt* script, s32 isInitialCall) { targetActorID = evt_get_variable(script, *args++); actor = get_actor(actorID); actor->targetActorID = targetActorID; - actor->targetPartIndex = 1; + actor->targetPartID = 1; return ApiStatus_DONE2; } @@ -2845,35 +2845,38 @@ ApiStatus EnemyDamageTarget(Evt* script, s32 isInitialCall) { battleStatus->curAttackDamage = evt_get_variable(script, *args++); battleFlagsModifier = *args++; - if (battleFlagsModifier & BS_FLAGS1_10) { - gBattleStatus.flags1 |= BS_FLAGS1_10; - gBattleStatus.flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; - } else if (battleFlagsModifier & BS_FLAGS1_SP_EVT_ACTIVE) { - gBattleStatus.flags1 &= ~BS_FLAGS1_10; - gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; + // BS_FLAGS1_INCLUDE_POWER_UPS and BS_FLAGS1_TRIGGER_EVENTS are mutually exclusive + if (battleFlagsModifier & BS_FLAGS1_INCLUDE_POWER_UPS) { + gBattleStatus.flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; + } else if (battleFlagsModifier & BS_FLAGS1_TRIGGER_EVENTS) { + gBattleStatus.flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 |= BS_FLAGS1_TRIGGER_EVENTS; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_10; - gBattleStatus.flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; + gBattleStatus.flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; } - if (battleFlagsModifier & BS_FLAGS1_40) { - gBattleStatus.flags1 |= BS_FLAGS1_40; + if (battleFlagsModifier & BS_FLAGS1_NICE_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_NICE_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_40; + gBattleStatus.flags1 &= ~BS_FLAGS1_NICE_HIT; } - if (battleFlagsModifier & BS_FLAGS1_200) { - gBattleStatus.flags1 |= BS_FLAGS1_200; + + if (battleFlagsModifier & BS_FLAGS1_SUPER_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_SUPER_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_200; + gBattleStatus.flags1 &= ~BS_FLAGS1_SUPER_HIT; } - if (battleFlagsModifier & BS_FLAGS1_80) { - gBattleStatus.flags1 |= BS_FLAGS1_80; + + if (battleFlagsModifier & BS_FLAGS1_NO_RATING) { + gBattleStatus.flags1 |= BS_FLAGS1_NO_RATING; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_80; + gBattleStatus.flags1 &= ~BS_FLAGS1_NO_RATING; } battleStatus->curTargetID = actor->targetActorID; - battleStatus->curTargetPart = actor->targetPartIndex; + battleStatus->curTargetPart = actor->targetPartID; battleStatus->statusChance = battleStatus->curAttackStatus & 0xFF; if (battleStatus->statusChance == STATUS_KEY_NEVER) { @@ -2911,7 +2914,7 @@ ApiStatus EnemyFollowupAfflictTarget(Evt* script, s32 isInitialCall) { outVar = *args++; battleStatus->curTargetID = actor->targetActorID; - battleStatus->curTargetPart = actor->targetPartIndex; + battleStatus->curTargetPart = actor->targetPartID; battleStatus->statusChance = battleStatus->curAttackStatus; if (battleStatus->statusChance == STATUS_KEY_NEVER) { @@ -2955,37 +2958,37 @@ ApiStatus EnemyTestTarget(Evt* script, s32 isInitialCall) { battleStatus->curAttackDamage = evt_get_variable(script, *args++); battleFlagsModifier = *args++; - if (battleFlagsModifier & BS_FLAGS1_10) { - gBattleStatus.flags1 |= BS_FLAGS1_10; - gBattleStatus.flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; - } else if (battleFlagsModifier & BS_FLAGS1_SP_EVT_ACTIVE) { - gBattleStatus.flags1 &= ~BS_FLAGS1_10; - gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; + if (battleFlagsModifier & BS_FLAGS1_INCLUDE_POWER_UPS) { + gBattleStatus.flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; + } else if (battleFlagsModifier & BS_FLAGS1_TRIGGER_EVENTS) { + gBattleStatus.flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 |= BS_FLAGS1_TRIGGER_EVENTS; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_10; - gBattleStatus.flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; + gBattleStatus.flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; } - if (battleFlagsModifier & BS_FLAGS1_40) { - gBattleStatus.flags1 |= BS_FLAGS1_40; + if (battleFlagsModifier & BS_FLAGS1_NICE_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_NICE_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_40; + gBattleStatus.flags1 &= ~BS_FLAGS1_NICE_HIT; } - if (battleFlagsModifier & BS_FLAGS1_200) { - gBattleStatus.flags1 |= BS_FLAGS1_200; + if (battleFlagsModifier & BS_FLAGS1_SUPER_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_SUPER_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_200; + gBattleStatus.flags1 &= ~BS_FLAGS1_SUPER_HIT; } - if (battleFlagsModifier & BS_FLAGS1_80) { - gBattleStatus.flags1 |= BS_FLAGS1_80; + if (battleFlagsModifier & BS_FLAGS1_NO_RATING) { + gBattleStatus.flags1 |= BS_FLAGS1_NO_RATING; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_80; + gBattleStatus.flags1 &= ~BS_FLAGS1_NO_RATING; } attackStatus = battleStatus->curAttackStatus; battleStatus->curTargetID = actor->targetActorID; - battleStatus->curTargetPart = actor->targetPartIndex; + battleStatus->curTargetPart = actor->targetPartID; battleStatus->statusChance = attackStatus; if ((attackStatus & 0xFF) == 0xFF) { @@ -3357,7 +3360,7 @@ ApiStatus EnableActorGlow(Evt* script, s32 isInitialCall) { } it = it->nextPart; } - set_actor_pal_effect(actor, GLOW_PAL_OFF); + set_actor_glow_pal(actor, GLOW_PAL_OFF); } return ApiStatus_DONE2; diff --git a/src/battle/action_cmd.c b/src/battle/action_cmd.c index 0aa13c14bb..068232511c 100644 --- a/src/battle/action_cmd.c +++ b/src/battle/action_cmd.c @@ -287,7 +287,7 @@ void action_command_init_status(void) { void action_command_update(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; - if (gBattleStatus.flags1 & BS_FLAGS1_8000) { + if (gBattleStatus.flags1 & BS_FLAGS1_FREE_ACTION_COMMAND) { action_command_free(); } @@ -522,7 +522,7 @@ void action_command_free(void) { actionCommandStatus->actionCommandID = ACTION_COMMAND_NONE; gBattleStatus.flags1 &= ~BS_FLAGS1_2000; - gBattleStatus.flags1 &= ~BS_FLAGS1_8000; + gBattleStatus.flags1 &= ~BS_FLAGS1_FREE_ACTION_COMMAND; gBattleStatus.flags1 &= ~BS_FLAGS1_4000; close_action_command_instruction_popup(); btl_set_popup_duration(0); diff --git a/src/battle/action_cmd/07.c b/src/battle/action_cmd/07.c index 1c372d10ad..2af443b707 100644 --- a/src/battle/action_cmd/07.c +++ b/src/battle/action_cmd/07.c @@ -3,7 +3,7 @@ #define NAMESPACE action_command_07 -void func_8024FAFC(void); +void btl_message_unlock_box_pos(void); BSS s32 D_802A9620; @@ -32,27 +32,24 @@ API_CALLABLE(N(init)) { hudElement = hud_element_create(&HES_AButton); actionCommandStatus->hudElements[0] = hudElement; hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); - hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, - actionCommandStatus->hudPosY); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(hudElement, 0); // Weird use of an extra temp settles regalloc here. hudElementTemp = hud_element_create(&HES_BlueMeter); hudElement = hudElementTemp; actionCommandStatus->hudElements[1] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, - actionCommandStatus->hudPosY + 28); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(hudElement, 0); hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hudElement = hud_element_create(&HES_RunAwayOK); actionCommandStatus->hudElements[2] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, - actionCommandStatus->hudPosY + 28); + hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(hudElement, 0); hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); - battleStatus->flags1 &= ~BS_FLAGS1_8000; + battleStatus->flags1 &= ~BS_FLAGS1_FREE_ACTION_COMMAND; return ApiStatus_DONE2; } @@ -73,8 +70,8 @@ API_CALLABLE(N(start)) { battleStatus->actionSuccess = 0; battleStatus->actionResult = ACTION_RESULT_FAIL; - battleStatus->flags1 &= ~BS_FLAGS1_8000; - func_8024FAFC(); + battleStatus->flags1 &= ~BS_FLAGS1_FREE_ACTION_COMMAND; + btl_message_unlock_box_pos(); actionCommandStatus->state = 10; return ApiStatus_DONE2; diff --git a/src/battle/action_cmd/air_lift.c b/src/battle/action_cmd/air_lift.c index 2056cdef39..4155f7bfd4 100644 --- a/src/battle/action_cmd/air_lift.c +++ b/src/battle/action_cmd/air_lift.c @@ -77,7 +77,7 @@ API_CALLABLE(N(start)) { mashMeterCutoff = actionCommandStatus->mashMeterCutoffs[actionCommandStatus->mashMeterIntervals - 1]; actionCommandStatus->unk_5C = 0; - battleStatus->flags1 &= ~BS_FLAGS1_8000; + battleStatus->flags1 &= ~BS_FLAGS1_FREE_ACTION_COMMAND; actionCommandStatus->state = 10; battleStatus->unk_82 = mashMeterCutoff; diff --git a/src/battle/action_cmd/break_free.c b/src/battle/action_cmd/break_free.c index 7f8d072996..72472f1c34 100644 --- a/src/battle/action_cmd/break_free.c +++ b/src/battle/action_cmd/break_free.c @@ -88,7 +88,7 @@ API_CALLABLE(N(start)) { actionCommandStatus->thresholdLevel = rand_int(actionCommandStatus->unk_5A); actionCommandStatus->unk_5C = 0; actionCommandStatus->state = 10; - battleStatus->flags1 &= ~BS_FLAGS1_8000; + battleStatus->flags1 &= ~BS_FLAGS1_FREE_ACTION_COMMAND; return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/common/MashActionCommandStart.inc.c b/src/battle/action_cmd/common/MashActionCommandStart.inc.c index 77d4f1f5af..cae983082a 100644 --- a/src/battle/action_cmd/common/MashActionCommandStart.inc.c +++ b/src/battle/action_cmd/common/MashActionCommandStart.inc.c @@ -22,7 +22,7 @@ API_CALLABLE(N(start)) { battleStatus->actionSuccess = 0; battleStatus->actionResult = ACTION_RESULT_NONE; mashMeterCutoff = actionCommandStatus->mashMeterCutoffs[(actionCommandStatus->mashMeterIntervals - 1)]; - battleStatus->flags1 &= ~BS_FLAGS1_8000; + battleStatus->flags1 &= ~BS_FLAGS1_FREE_ACTION_COMMAND; actionCommandStatus->state = 10; battleStatus->unk_82 = mashMeterCutoff; func_80269118(); diff --git a/src/battle/action_cmd/flee.c b/src/battle/action_cmd/flee.c index cce49894e1..8f2874f14e 100644 --- a/src/battle/action_cmd/flee.c +++ b/src/battle/action_cmd/flee.c @@ -84,7 +84,7 @@ API_CALLABLE(N(start)) { battleStatus->actionSuccess = 0; battleStatus->actionResult = ACTION_RESULT_NONE; battleStatus->unk_82 = actionCommandStatus->mashMeterCutoffs[actionCommandStatus->mashMeterIntervals - 1]; - battleStatus->flags1 &= ~BS_FLAGS1_8000; + battleStatus->flags1 &= ~BS_FLAGS1_FREE_ACTION_COMMAND; actionCommandStatus->state = 10; return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/hammer.c b/src/battle/action_cmd/hammer.c index 866f63c670..5d42267aec 100644 --- a/src/battle/action_cmd/hammer.c +++ b/src/battle/action_cmd/hammer.c @@ -101,7 +101,7 @@ API_CALLABLE(N(start)) { battleStatus->actionQuality = 0; battleStatus->actionResult = ACTION_RESULT_FAIL; actionCommandStatus->state = 10; - battleStatus->flags1 &= ~BS_FLAGS1_8000; + battleStatus->flags1 &= ~BS_FLAGS1_FREE_ACTION_COMMAND; func_80269118(); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/hurricane.c b/src/battle/action_cmd/hurricane.c index 4f3ecfde6d..006b070f58 100644 --- a/src/battle/action_cmd/hurricane.c +++ b/src/battle/action_cmd/hurricane.c @@ -82,7 +82,7 @@ API_CALLABLE(N(start)) { battleStatus->actionSuccess = 0; battleStatus->actionResult = ACTION_RESULT_FAIL; actionCommandStatus->state = 10; - battleStatus->flags1 &= ~BS_FLAGS1_8000; + battleStatus->flags1 &= ~BS_FLAGS1_FREE_ACTION_COMMAND; func_80269118(); diff --git a/src/battle/action_cmd/jump.c b/src/battle/action_cmd/jump.c index 420b79fed5..f61fe13778 100644 --- a/src/battle/action_cmd/jump.c +++ b/src/battle/action_cmd/jump.c @@ -5,6 +5,14 @@ extern s32 actionCmdTableJump[]; +enum { + AC_JUMP_STATE_0 = 0, + AC_JUMP_STATE_1 = 1, + AC_JUMP_STATE_10 = 10, + AC_JUMP_STATE_11 = 11, + AC_JUMP_STATE_CLEANUP = 12, +}; + API_CALLABLE(N(init)) { s32 hudElement; ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; @@ -62,14 +70,14 @@ API_CALLABLE(N(start)) { hudElement = actionCommandStatus->hudElements[0]; actionCommandStatus->hudPosX = 50; - battleStatus->flags1 &= ~BS_FLAGS1_8000; + battleStatus->flags1 &= ~BS_FLAGS1_FREE_ACTION_COMMAND; battleStatus->flags1 &= ~BS_FLAGS1_2000; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); if (actionCommandStatus->showHud) { hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); } - actionCommandStatus->state = 10; + actionCommandStatus->state = AC_JUMP_STATE_10; func_80269118(); btl_set_popup_duration(10); return ApiStatus_DONE2; @@ -80,16 +88,16 @@ void N(update)(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; s32 hudElement; - s32 temp_s0_3; + s32 successWindow; switch (actionCommandStatus->state) { - case 0: + case AC_JUMP_STATE_0: if (battleStatus->actionCommandMode == ACTION_COMMAND_MODE_TUTORIAL) { btl_set_popup_duration(99); } - actionCommandStatus->state = 1; + actionCommandStatus->state = AC_JUMP_STATE_1; break; - case 1: + case AC_JUMP_STATE_1: if (battleStatus->actionCommandMode == ACTION_COMMAND_MODE_TUTORIAL) { btl_set_popup_duration(99); } @@ -114,28 +122,29 @@ void N(update)(void) { } } break; - case 10: + case AC_JUMP_STATE_10: if (battleStatus->actionCommandMode == ACTION_COMMAND_MODE_TUTORIAL) { btl_set_popup_duration(99); } - temp_s0_3 = battleStatus->actionCmdDifficultyTable[actionCommandStatus->difficulty]; - if (((actionCommandStatus->prepareTime - temp_s0_3) - 2) <= 0) { + successWindow = battleStatus->actionCmdDifficultyTable[actionCommandStatus->difficulty]; + if (((actionCommandStatus->prepareTime - successWindow) - 2) <= 0) { hud_element_set_script(actionCommandStatus->hudElements[0], &HES_AButtonDown); } - if ((battleStatus->curButtonsPressed & BUTTON_A) && (actionCommandStatus->autoSucceed == 0)) { + if ((battleStatus->curButtonsPressed & BUTTON_A) && !actionCommandStatus->autoSucceed) { actionCommandStatus->wrongButtonPressed = TRUE; battleStatus->actionResult = ACTION_RESULT_EARLY; } - if ((actionCommandStatus->prepareTime - temp_s0_3) > 0) { + if ((actionCommandStatus->prepareTime - successWindow) > 0) { actionCommandStatus->prepareTime -= 1; break; } actionCommandStatus->frameCounter = battleStatus->actionCmdDifficultyTable[actionCommandStatus->difficulty]; battleStatus->actionSuccess = -1; - actionCommandStatus->state = 11; - case 11: + actionCommandStatus->state = AC_JUMP_STATE_11; + // fall through + case AC_JUMP_STATE_11: if (battleStatus->actionCommandMode == ACTION_COMMAND_MODE_TUTORIAL) { btl_set_popup_duration(99); } @@ -153,9 +162,9 @@ void N(update)(void) { } if (battleStatus->actionSuccess < 0) { - if (((battleStatus->curButtonsPressed & BUTTON_A)&& + if (((battleStatus->curButtonsPressed & BUTTON_A) && !actionCommandStatus->wrongButtonPressed) || - (actionCommandStatus->autoSucceed != 0)) { + actionCommandStatus->autoSucceed) { battleStatus->actionSuccess = 1; battleStatus->actionResult = ACTION_RESULT_SUCCESS; gBattleStatus.flags1 |= BS_FLAGS1_2000; @@ -170,14 +179,14 @@ void N(update)(void) { btl_set_popup_duration(0); } actionCommandStatus->frameCounter = 5; - actionCommandStatus->state = 12; + actionCommandStatus->state = AC_JUMP_STATE_CLEANUP; break; } - actionCommandStatus->frameCounter -= 1; + actionCommandStatus->frameCounter--; break; - case 12: + case AC_JUMP_STATE_CLEANUP: if (actionCommandStatus->frameCounter != 0) { - actionCommandStatus->frameCounter -= 1; + actionCommandStatus->frameCounter--; break; } action_command_free(); diff --git a/src/battle/action_cmd/mega_shock.c b/src/battle/action_cmd/mega_shock.c index e3d274492c..f7992b6257 100644 --- a/src/battle/action_cmd/mega_shock.c +++ b/src/battle/action_cmd/mega_shock.c @@ -83,7 +83,7 @@ API_CALLABLE(N(start)) { battleStatus->actionSuccess = 0; battleStatus->actionResult = ACTION_RESULT_FAIL; actionCommandStatus->state = 10; - battleStatus->flags1 &= ~BS_FLAGS1_8000; + battleStatus->flags1 &= ~BS_FLAGS1_FREE_ACTION_COMMAND; func_80269118(); result = ApiStatus_DONE2; diff --git a/src/battle/action_cmd/power_shock.c b/src/battle/action_cmd/power_shock.c index e61c53b165..9223969254 100644 --- a/src/battle/action_cmd/power_shock.c +++ b/src/battle/action_cmd/power_shock.c @@ -90,7 +90,7 @@ API_CALLABLE(N(start)) { battleStatus->actionSuccess = 0; battleStatus->actionResult = ACTION_RESULT_FAIL; actionCommandStatus->state = 10; - battleStatus->flags1 &= ~BS_FLAGS1_8000; + battleStatus->flags1 &= ~BS_FLAGS1_FREE_ACTION_COMMAND; func_80269118(); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/spiny_surge.c b/src/battle/action_cmd/spiny_surge.c index 6d5b5bd4d0..e6a7d523cb 100644 --- a/src/battle/action_cmd/spiny_surge.c +++ b/src/battle/action_cmd/spiny_surge.c @@ -79,7 +79,7 @@ API_CALLABLE(N(start)) { actionCommandStatus->barFillWidth = 0; battleStatus->actionSuccess = 0; actionCommandStatus->state = 10; - battleStatus->flags1 &= ~BS_FLAGS1_8000; + battleStatus->flags1 &= ~BS_FLAGS1_FREE_ACTION_COMMAND; func_80269118(); diff --git a/src/battle/action_cmd/squirt.c b/src/battle/action_cmd/squirt.c index 1a0b25ae2a..57f68f940e 100644 --- a/src/battle/action_cmd/squirt.c +++ b/src/battle/action_cmd/squirt.c @@ -67,7 +67,7 @@ API_CALLABLE(N(start)) { battleStatus->actionSuccess = 0; battleStatus->actionResult = ACTION_RESULT_FAIL; actionCommandStatus->state = 10; - battleStatus->flags1 &= ~BS_FLAGS1_8000; + battleStatus->flags1 &= ~BS_FLAGS1_FREE_ACTION_COMMAND; func_80269118(); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/stop_leech.c b/src/battle/action_cmd/stop_leech.c index 94d6e25086..be19002bb4 100644 --- a/src/battle/action_cmd/stop_leech.c +++ b/src/battle/action_cmd/stop_leech.c @@ -61,7 +61,7 @@ API_CALLABLE(N(start)) { battleStatus->actionSuccess = 0; battleStatus->actionResult = ACTION_RESULT_FAIL; actionCommandStatus->state = 10; - battleStatus->flags1 &= ~BS_FLAGS1_8000; + battleStatus->flags1 &= ~BS_FLAGS1_FREE_ACTION_COMMAND; return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/tidal_wave.c b/src/battle/action_cmd/tidal_wave.c index f6f86cdf85..00b131a133 100644 --- a/src/battle/action_cmd/tidal_wave.c +++ b/src/battle/action_cmd/tidal_wave.c @@ -71,7 +71,7 @@ API_CALLABLE(N(start)) { battleStatus->actionQuality = 0; battleStatus->actionResult = ACTION_RESULT_FAIL; actionCommandStatus->state = 10; - battleStatus->flags1 &= ~BS_FLAGS1_8000; + battleStatus->flags1 &= ~BS_FLAGS1_FREE_ACTION_COMMAND; func_80269118(); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/water_block.c b/src/battle/action_cmd/water_block.c index 4d5e47776c..c18fbd9cde 100644 --- a/src/battle/action_cmd/water_block.c +++ b/src/battle/action_cmd/water_block.c @@ -236,7 +236,7 @@ API_CALLABLE(N(start)) { battleStatus->actionSuccess = 0; battleStatus->actionResult = ACTION_RESULT_FAIL; actionCommandStatus->state = 10; - battleStatus->flags1 &= ~BS_FLAGS1_8000; + battleStatus->flags1 &= ~BS_FLAGS1_FREE_ACTION_COMMAND; func_80269118(); return ApiStatus_DONE2; } @@ -394,7 +394,7 @@ void N(update)(void) { } if (((battleStatus->pushInputBuffer[pos] & BUTTON_A) && !actionCommandStatus->wrongButtonPressed) || - (actionCommandStatus->autoSucceed != 0)) { + actionCommandStatus->autoSucceed) { actionCommandStatus->unk_5C = 1; battleStatus->actionQuality++; break; @@ -469,7 +469,7 @@ void N(update)(void) { } if (((battleStatus->pushInputBuffer[pos] & BUTTON_A) && !actionCommandStatus->wrongButtonPressed) || - (actionCommandStatus->autoSucceed != 0)) { + actionCommandStatus->autoSucceed) { actionCommandStatus->unk_5C = 1; battleStatus->actionQuality++; break; @@ -543,7 +543,7 @@ void N(update)(void) { } if (((battleStatus->pushInputBuffer[pos] & BUTTON_A) && !actionCommandStatus->wrongButtonPressed) || - (actionCommandStatus->autoSucceed != 0)) { + actionCommandStatus->autoSucceed) { actionCommandStatus->unk_5C = 1; battleStatus->actionQuality++; break; diff --git a/src/battle/action_cmd/whirlwind.c b/src/battle/action_cmd/whirlwind.c index 4349027453..682f901a09 100644 --- a/src/battle/action_cmd/whirlwind.c +++ b/src/battle/action_cmd/whirlwind.c @@ -143,7 +143,7 @@ API_CALLABLE(N(start)) { battleStatus->actionQuality = 3; } actionCommandStatus->state = 10; - gBattleStatus.flags1 &= ~BS_FLAGS1_8000; + gBattleStatus.flags1 &= ~BS_FLAGS1_FREE_ACTION_COMMAND; return ApiStatus_DONE2; } diff --git a/src/battle/actor_api.c b/src/battle/actor_api.c index 2726364fb8..81c6199012 100644 --- a/src/battle/actor_api.c +++ b/src/battle/actor_api.c @@ -363,7 +363,7 @@ ApiStatus SetGoalToTarget(Evt* script, s32 isInitialCall) { } actor = get_actor(actorID); - set_goal_pos_to_part(&actor->state, actor->targetActorID, actor->targetPartIndex); + set_goal_pos_to_part(&actor->state, actor->targetActorID, actor->targetPartID); return ApiStatus_DONE2; } @@ -379,7 +379,7 @@ ApiStatus SetPartGoalToTarget(Evt* script, s32 isInitialCall) { } actor = get_actor(actorID); - set_part_goal_to_actor_part(get_actor_part(actor, partID)->movement, actor->targetActorID, actor->targetPartIndex); + set_part_goal_to_actor_part(get_actor_part(actor, partID)->movement, actor->targetActorID, actor->targetPartID); return ApiStatus_DONE2; } @@ -2365,7 +2365,7 @@ ApiStatus InitTargetIterator(Evt* script, s32 isInitialCall) { SelectableTarget* selectableTarget = &actor->targetData[actor->targetIndexList[actor->selectedTargetIndex]]; actor->targetActorID = selectableTarget->actorID; - actor->targetPartIndex = selectableTarget->partID; + actor->targetPartID = selectableTarget->partID; return ApiStatus_DONE2; } @@ -2375,7 +2375,7 @@ ApiStatus SetOwnerTarget(Evt* script, s32 isInitialCall) { Actor* actor = get_actor(script->owner1.enemyID); s16 actorID = evt_get_variable(script, *args++); - actor->targetPartIndex = evt_get_variable(script, *args++); + actor->targetPartID = evt_get_variable(script, *args++); actor->targetActorID = actorID; return ApiStatus_DONE2; @@ -2395,7 +2395,7 @@ ApiStatus ChooseNextTarget(Evt* script, s32 isInitialCall) { actor->selectedTargetIndex = 0; target = &actor->targetData[actor->targetIndexList[0]]; actor->targetActorID = target->actorID; - actor->targetPartIndex = target->partID; + actor->targetPartID = target->partID; return ApiStatus_DONE2; } @@ -2403,7 +2403,7 @@ ApiStatus ChooseNextTarget(Evt* script, s32 isInitialCall) { actor->selectedTargetIndex = actor->targetListLength - 1; target = &actor->targetData[actor->targetIndexList[actor->selectedTargetIndex]]; actor->targetActorID = target->actorID; - actor->targetPartIndex = target->partID; + actor->targetPartID = target->partID; return ApiStatus_DONE2; } @@ -2430,7 +2430,7 @@ ApiStatus ChooseNextTarget(Evt* script, s32 isInitialCall) { actor->selectedTargetIndex = curIdx; target = &actor->targetData[actor->targetIndexList[actor->selectedTargetIndex]]; actor->targetActorID = target->actorID; - actor->targetPartIndex = target->partID; + actor->targetPartID = target->partID; evt_set_variable(script, temp, retVal); return ApiStatus_DONE2; @@ -2497,7 +2497,7 @@ s32 func_8026E558(Evt* script, s32 isInitialCall) { if (target->column == column && target->layer == layer && target->row < row) { actor->targetActorID = target->actorID; - actor->targetPartIndex = target->partID; + actor->targetPartID = target->partID; outVal = 0; } } @@ -2508,7 +2508,7 @@ s32 func_8026E558(Evt* script, s32 isInitialCall) { if (target->column == column && target->layer == layer && target->row < row) { actor->targetActorID = target->actorID; - actor->targetPartIndex = target->partID; + actor->targetPartID = target->partID; outVal = 0; } } @@ -2519,7 +2519,7 @@ s32 func_8026E558(Evt* script, s32 isInitialCall) { if (target->column == column && target->layer == layer && target->row < row) { actor->targetActorID = target->actorID; - actor->targetPartIndex = target->partID; + actor->targetPartID = target->partID; outVal = 0; } } @@ -2543,7 +2543,7 @@ ApiStatus GetOwnerTarget(Evt* script, s32 isInitialCall) { s32 partID = *args++; evt_set_variable(script, actorID, actor->targetActorID); - evt_set_variable(script, partID, actor->targetPartIndex); + evt_set_variable(script, partID, actor->targetPartID); return ApiStatus_DONE2; } @@ -2700,7 +2700,7 @@ ApiStatus func_8026EDE4(Evt* script, s32 isInitialCall) { actor = get_actor(actorID); actorPart = get_actor_part(actor, partID); - set_part_pal_effect(actorPart, temp_s3); + set_part_glow_pal(actorPart, temp_s3); return ApiStatus_DONE2; } @@ -2779,7 +2779,7 @@ ApiStatus UseIdleAnimation(Evt* script, s32 isInitialCall) { if (!useIdle) { actor->flags &= ~ACTOR_FLAG_USING_IDLE_ANIM; actor->flags &= ~ACTOR_FLAG_SHOW_STATUS_ICONS; - func_80266E40(actor); + clear_actor_static_pal_adjustments(actor); } else { actor->flags |= ACTOR_FLAG_USING_IDLE_ANIM; } @@ -2801,7 +2801,7 @@ ApiStatus func_8026F1A0(Evt* script, s32 isInitialCall) { if (temp_s0_3 == 0) { actor->flags &= ~ACTOR_FLAG_SHOW_STATUS_ICONS; - func_80266E40(actor); + clear_actor_static_pal_adjustments(actor); } return ApiStatus_DONE2; diff --git a/src/battle/actor_rendering.c b/src/battle/actor_rendering.c index 98e55841b7..ffe7b312de 100644 --- a/src/battle/actor_rendering.c +++ b/src/battle/actor_rendering.c @@ -1007,7 +1007,9 @@ void appendGfx_npc_actor(b32 isPartner, s32 actorIndex) { } while (0); // required to match if (isPartner) { - if ((gBattleStatus.flags2 & (BS_FLAGS2_10 | BS_FLAGS2_PARTNER_TURN_USED)) == BS_FLAGS2_PARTNER_TURN_USED) { + if (!(gBattleStatus.flags2 & (BS_FLAGS2_OVERRIDE_INACTIVE_PARTNER)) + && (gBattleStatus.flags2 & BS_FLAGS2_PARTNER_TURN_USED) + ) { do { if (actor->koStatus == 0) { part->curAnimation = get_npc_anim_for_status(part->idleAnimations, STATUS_KEY_INACTIVE); @@ -1017,7 +1019,7 @@ void appendGfx_npc_actor(b32 isPartner, s32 actorIndex) { } while (0); // required to match set_actor_pal_adjustment(actor, ACTOR_PAL_ADJUST_PLAYER_DEBUFF); palChanged = TRUE; - set_actor_pal_effect(actor, GLOW_PAL_OFF); + set_actor_glow_pal(actor, GLOW_PAL_OFF); decorChanged = TRUE; } if (isPartner && (gPlayerData.curPartner == PARTNER_WATT)) { @@ -1029,7 +1031,7 @@ void appendGfx_npc_actor(b32 isPartner, s32 actorIndex) { } if (actor->isGlowing) { if (!decorChanged) { - set_actor_pal_effect(actor, GLOW_PAL_ON); + set_actor_glow_pal(actor, GLOW_PAL_ON); } decorChanged = TRUE; } @@ -1061,7 +1063,7 @@ void appendGfx_npc_actor(b32 isPartner, s32 actorIndex) { set_actor_pal_adjustment(actor, ACTOR_PAL_ADJUST_NONE); } if (!decorChanged && !(part->flags & ACTOR_PART_FLAG_HAS_PAL_EFFECT)) { - set_actor_pal_effect(actor, GLOW_PAL_OFF); + set_actor_glow_pal(actor, GLOW_PAL_OFF); } // adjust idle animation for status @@ -1552,7 +1554,7 @@ void appendGfx_player_actor(void* arg0) { } } - if (!(gBattleStatus.flags2 & BS_FLAGS2_10000) + if (!(gBattleStatus.flags2 & BS_FLAGS2_HIDE_BUFF_COUNTERS) && !(gBattleStatus.flags1 & BS_FLAGS1_TATTLE_OPEN) && (player->flags & ACTOR_FLAG_SHOW_STATUS_ICONS) ) { @@ -1628,12 +1630,13 @@ void appendGfx_player_actor(void* arg0) { lastAnim = playerParts->curAnimation; } while (0); // required to match - if (((((gBattleStatus.flags2 & (BS_FLAGS2_8 | BS_FLAGS2_PLAYER_TURN_USED)) == BS_FLAGS2_PLAYER_TURN_USED) + if ((((!(gBattleStatus.flags2 & BS_FLAGS2_OVERRIDE_INACTIVE_PLAYER) + && (gBattleStatus.flags2 & BS_FLAGS2_PLAYER_TURN_USED)) && (partner != NULL)) || (battleStatus->outtaSightActive > 0)) && !(player->flags & ACTOR_FLAG_NO_INACTIVE_ANIM) - && !((partner != NULL) && (partner->flags & ACTOR_FLAG_NO_ATTACK))) - { + && !((partner != NULL) && (partner->flags & ACTOR_FLAG_NO_ATTACK)) + ) { if (!(gBattleStatus.flags2 & BS_FLAGS2_NO_PLAYER_PAL_ADJUST)) { if ((player->debuff != STATUS_KEY_FEAR) && (player->debuff != STATUS_KEY_PARALYZE) @@ -1665,7 +1668,7 @@ void appendGfx_player_actor(void* arg0) { } palChanged = TRUE; - set_actor_pal_effect(player, GLOW_PAL_OFF); + set_actor_glow_pal(player, GLOW_PAL_OFF); decorChanged = TRUE; } } @@ -1678,7 +1681,7 @@ void appendGfx_player_actor(void* arg0) { if (!palChanged) { set_actor_pal_adjustment(player, ACTOR_PAL_ADJUST_NONE); } - set_actor_pal_effect(player, GLOW_PAL_OFF); + set_actor_glow_pal(player, GLOW_PAL_OFF); palChanged = TRUE; enable_status_debuff(player->hudElementDataIndex); decorChanged = TRUE; @@ -1722,7 +1725,7 @@ void appendGfx_player_actor(void* arg0) { } if (battleStatus->turboChargeTurnsLeft != 0) { if (!decorChanged) { - set_actor_pal_effect(player, GLOW_PAL_ON); + set_actor_glow_pal(player, GLOW_PAL_ON); } decorChanged = TRUE; } @@ -1736,7 +1739,7 @@ void appendGfx_player_actor(void* arg0) { set_actor_pal_adjustment(player, ACTOR_PAL_ADJUST_NONE); } if (!decorChanged) { - set_actor_pal_effect(player, GLOW_PAL_OFF); + set_actor_glow_pal(player, GLOW_PAL_OFF); } if (player->flags & ACTOR_FLAG_USING_IDLE_ANIM) { if (battleStatus->hustleTurns != 0) { diff --git a/src/battle/actors.yaml b/src/battle/actors.yaml index 7c4df3064d..d4c68a6dd3 100644 --- a/src/battle/actors.yaml +++ b/src/battle/actors.yaml @@ -189,8 +189,8 @@ level: 10 nameMsg: MSG_EnemyName_Cleft tattleMsg: MSG_EnemyTattle_Cleft - walkSound: [ SOUND_20D0, SOUND_20D0 ] - flySound: [ SOUND_20D0, SOUND_20D0 ] + walkSound: [ SOUND_CLEFT_STEP, SOUND_CLEFT_STEP ] + flySound: [ SOUND_CLEFT_STEP, SOUND_CLEFT_STEP ] jumpSound: SOUND_ACTOR_JUMP hurtSound: SOUND_ACTOR_HURT stepDelay: [ 30, 30 ] @@ -211,8 +211,8 @@ level: 9 nameMsg: MSG_EnemyName_Bandit tattleMsg: MSG_EnemyTattle_Bandit - walkSound: [ SOUND_20C1, SOUND_20C1 ] - flySound: [ SOUND_20C1, SOUND_20C1 ] + walkSound: [ SOUND_SMALL_NPC_STEP, SOUND_SMALL_NPC_STEP ] + flySound: [ SOUND_SMALL_NPC_STEP, SOUND_SMALL_NPC_STEP ] jumpSound: SOUND_ACTOR_JUMP hurtSound: SOUND_ACTOR_HURT stepDelay: [ 30, 30 ] @@ -321,8 +321,8 @@ level: 15 nameMsg: MSG_EnemyName_HyperCleft tattleMsg: MSG_EnemyTattle_HyperCleft - walkSound: [ SOUND_20D0, SOUND_20D0 ] - flySound: [ SOUND_20D0, SOUND_20D0 ] + walkSound: [ SOUND_CLEFT_STEP, SOUND_CLEFT_STEP ] + flySound: [ SOUND_CLEFT_STEP, SOUND_CLEFT_STEP ] jumpSound: SOUND_ACTOR_JUMP hurtSound: SOUND_ACTOR_HURT stepDelay: [ 30, 30 ] @@ -332,8 +332,8 @@ level: 13 nameMsg: MSG_EnemyName_Clubba tattleMsg: MSG_EnemyTattle_Clubba - walkSound: [ SOUND_20C4, SOUND_20C4 ] - flySound: [ SOUND_20C4, SOUND_20C4 ] + walkSound: [ SOUND_CLUBBA_STEP, SOUND_CLUBBA_STEP ] + flySound: [ SOUND_CLUBBA_STEP, SOUND_CLUBBA_STEP ] jumpSound: SOUND_ACTOR_JUMP hurtSound: SOUND_ACTOR_HURT stepDelay: [ 30, 30 ] @@ -377,7 +377,7 @@ nameMsg: MSG_EnemyName_MediGuy tattleMsg: MSG_EnemyTattle_MediGuy walkSound: [ SOUND_NONE, SOUND_NONE ] - flySound: [ SOUND_SHYGUY_FLY, SOUND_NONE ] + flySound: [ SOUND_SHY_GUY_FLY, SOUND_NONE ] jumpSound: SOUND_ACTOR_JUMP hurtSound: SOUND_ACTOR_HURT stepDelay: [ 30, 30 ] @@ -431,8 +431,8 @@ level: 16 nameMsg: MSG_EnemyName_MBush tattleMsg: MSG_EnemyTattle_MBush - walkSound: [ SOUND_20C6, SOUND_20C6 ] - flySound: [ SOUND_20C6, SOUND_20C6 ] + walkSound: [ SOUND_MBUSH_STEP, SOUND_MBUSH_STEP ] + flySound: [ SOUND_MBUSH_STEP, SOUND_MBUSH_STEP ] jumpSound: SOUND_ACTOR_JUMP hurtSound: SOUND_ACTOR_HURT stepDelay: [ 30, 30 ] @@ -497,7 +497,7 @@ level: 17 nameMsg: MSG_EnemyName_PutridPiranha tattleMsg: MSG_EnemyTattle_PutridPiranha - walkSound: [ SOUND_03CE, SOUND_03CE ] + walkSound: [ SOUND_PIRANHA_STEP, SOUND_PIRANHA_STEP ] flySound: [ SOUND_NONE, SOUND_NONE ] jumpSound: SOUND_NONE hurtSound: SOUND_NONE @@ -541,8 +541,8 @@ level: 19 nameMsg: MSG_EnemyName_Bzzap tattleMsg: MSG_EnemyTattle_Bzzap - walkSound: [ SOUND_0357, SOUND_NONE ] - flySound: [ SOUND_0357, SOUND_NONE ] + walkSound: [ SOUND_BZZAP_BUZZ, SOUND_NONE ] + flySound: [ SOUND_BZZAP_BUZZ, SOUND_NONE ] jumpSound: SOUND_ACTOR_JUMP hurtSound: SOUND_ACTOR_HURT stepDelay: [ 30, 30 ] @@ -596,8 +596,8 @@ level: 22 nameMsg: MSG_EnemyName_Gulpit tattleMsg: MSG_EnemyTattle_Gulpit - walkSound: [ SOUND_20C4, SOUND_20C4 ] - flySound: [ SOUND_20C4, SOUND_20C4 ] + walkSound: [ SOUND_CLUBBA_STEP, SOUND_CLUBBA_STEP ] + flySound: [ SOUND_CLUBBA_STEP, SOUND_CLUBBA_STEP ] jumpSound: SOUND_ACTOR_JUMP hurtSound: SOUND_ACTOR_HURT stepDelay: [ 30, 30 ] @@ -618,8 +618,8 @@ level: 23 nameMsg: MSG_EnemyName_WhiteClubba tattleMsg: MSG_EnemyTattle_WhiteClubba - walkSound: [ SOUND_20C4, SOUND_20C4 ] - flySound: [ SOUND_20C4, SOUND_20C4 ] + walkSound: [ SOUND_CLUBBA_STEP, SOUND_CLUBBA_STEP ] + flySound: [ SOUND_CLUBBA_STEP, SOUND_CLUBBA_STEP ] jumpSound: SOUND_ACTOR_JUMP hurtSound: SOUND_ACTOR_HURT stepDelay: [ 30, 30 ] @@ -629,7 +629,7 @@ level: 22 nameMsg: MSG_EnemyName_FrostPiranha tattleMsg: MSG_EnemyTattle_FrostPiranha - walkSound: [ SOUND_03CE, SOUND_03CE ] + walkSound: [ SOUND_PIRANHA_STEP, SOUND_PIRANHA_STEP ] flySound: [ SOUND_NONE, SOUND_NONE ] jumpSound: SOUND_NONE hurtSound: SOUND_ACTOR_HURT @@ -750,7 +750,7 @@ level: 23 nameMsg: MSG_EnemyName_AlbinoDino tattleMsg: MSG_EnemyTattle_AlbinoDino - walkSound: [ SOUND_030B, SOUND_02FD ] + walkSound: [ SOUND_ALBINO_DINO_STEP_A, SOUND_ALBINO_DINO_STEP_B ] flySound: [ SOUND_NONE, SOUND_NONE ] jumpSound: SOUND_ACTOR_JUMP hurtSound: SOUND_ACTOR_HURT @@ -772,8 +772,8 @@ level: 25 nameMsg: MSG_EnemyName_BonyBeetle tattleMsg: MSG_EnemyTattle_BonyBeetle - walkSound: [ SOUND_20CD, SOUND_20CD ] - flySound: [ SOUND_20CD, SOUND_20CD ] + walkSound: [ SOUND_BONY_BEETLE_STEP, SOUND_BONY_BEETLE_STEP ] + flySound: [ SOUND_BONY_BEETLE_STEP, SOUND_BONY_BEETLE_STEP ] jumpSound: SOUND_ACTOR_JUMP hurtSound: SOUND_ACTOR_HURT stepDelay: [ 30, 30 ] @@ -1499,7 +1499,7 @@ level: 41 nameMsg: MSG_EnemyName_JrTroopa tattleMsg: MSG_NONE - walkSound: [ SOUND_20C1, SOUND_20C1 ] + walkSound: [ SOUND_SMALL_NPC_STEP, SOUND_SMALL_NPC_STEP ] flySound: [ SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT ] jumpSound: SOUND_ACTOR_JUMP hurtSound: SOUND_ACTOR_HURT @@ -1510,7 +1510,7 @@ level: 44 nameMsg: MSG_EnemyName_JrTroopa tattleMsg: MSG_EnemyTattle_JrTroopa1 - walkSound: [ SOUND_20C1, SOUND_20C1 ] + walkSound: [ SOUND_SMALL_NPC_STEP, SOUND_SMALL_NPC_STEP ] flySound: [ SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT ] jumpSound: SOUND_ACTOR_JUMP hurtSound: SOUND_ACTOR_HURT @@ -1521,7 +1521,7 @@ level: 52 nameMsg: MSG_EnemyName_JrTroopa tattleMsg: MSG_EnemyTattle_JrTroopa2 - walkSound: [ SOUND_20C1, SOUND_20C1 ] + walkSound: [ SOUND_SMALL_NPC_STEP, SOUND_SMALL_NPC_STEP ] flySound: [ SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT ] jumpSound: SOUND_ACTOR_JUMP hurtSound: SOUND_ACTOR_HURT @@ -1532,7 +1532,7 @@ level: 59 nameMsg: MSG_EnemyName_JrTroopa tattleMsg: MSG_EnemyTattle_JrTroopa3 - walkSound: [ SOUND_20C1, SOUND_20C1 ] + walkSound: [ SOUND_SMALL_NPC_STEP, SOUND_SMALL_NPC_STEP ] flySound: [ SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT ] jumpSound: SOUND_ACTOR_JUMP hurtSound: SOUND_ACTOR_HURT @@ -1543,7 +1543,7 @@ level: 65 nameMsg: MSG_EnemyName_JrTroopa tattleMsg: MSG_EnemyTattle_JrTroopa4 - walkSound: [ SOUND_20C1, SOUND_20C1 ] + walkSound: [ SOUND_SMALL_NPC_STEP, SOUND_SMALL_NPC_STEP ] flySound: [ SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT ] jumpSound: SOUND_ACTOR_JUMP hurtSound: SOUND_ACTOR_HURT @@ -1554,7 +1554,7 @@ level: 74 nameMsg: MSG_EnemyName_JrTroopa tattleMsg: MSG_EnemyTattle_JrTroopa5 - walkSound: [ SOUND_20C1, SOUND_20C1 ] + walkSound: [ SOUND_SMALL_NPC_STEP, SOUND_SMALL_NPC_STEP ] flySound: [ SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT ] jumpSound: SOUND_ACTOR_JUMP hurtSound: SOUND_ACTOR_HURT @@ -1565,7 +1565,7 @@ level: 74 nameMsg: MSG_EnemyName_JrTroopa tattleMsg: MSG_EnemyTattle_JrTroopa5 - walkSound: [ SOUND_20C1, SOUND_20C1 ] + walkSound: [ SOUND_SMALL_NPC_STEP, SOUND_SMALL_NPC_STEP ] flySound: [ SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT ] jumpSound: SOUND_ACTOR_JUMP hurtSound: SOUND_ACTOR_HURT @@ -1576,7 +1576,7 @@ level: 74 nameMsg: MSG_EnemyName_JrTroopa tattleMsg: MSG_EnemyTattle_JrTroopa5 - walkSound: [ SOUND_20C1, SOUND_20C1 ] + walkSound: [ SOUND_SMALL_NPC_STEP, SOUND_SMALL_NPC_STEP ] flySound: [ SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT ] jumpSound: SOUND_ACTOR_JUMP hurtSound: SOUND_ACTOR_HURT @@ -1609,7 +1609,7 @@ level: 49 nameMsg: MSG_EnemyName_GoombaKing tattleMsg: MSG_EnemyTattle_GoombaKing - walkSound: [ SOUND_20EC, SOUND_20EC ] + walkSound: [ SOUND_HEAVY_NPC_STEP_A, SOUND_HEAVY_NPC_STEP_A ] flySound: [ SOUND_NONE, SOUND_NONE ] jumpSound: SOUND_NONE hurtSound: SOUND_ACTOR_HURT @@ -1688,7 +1688,7 @@ level: 0 nameMsg: MSG_EnemyName_FakeBowser tattleMsg: MSG_EnemyTattle_FakeBowser - walkSound: [ SOUND_03EA, SOUND_03EA ] + walkSound: [ SOUND_FAKE_BOWSER_STEP, SOUND_FAKE_BOWSER_STEP ] flySound: [ SOUND_NONE, SOUND_NONE ] jumpSound: SOUND_NONE hurtSound: SOUND_NONE @@ -1766,7 +1766,7 @@ nameMsg: MSG_EnemyName_Buzzar tattleMsg: MSG_EnemyTattle_Buzzar walkSound: [ SOUND_NONE, SOUND_NONE ] - flySound: [ SOUND_20EF, SOUND_20EF ] + flySound: [ SOUND_BUZZAR_FLAP, SOUND_BUZZAR_FLAP ] jumpSound: SOUND_NONE hurtSound: SOUND_NONE stepDelay: [ -14, -14 ] @@ -1798,7 +1798,7 @@ level: 70 nameMsg: MSG_EnemyName_TubbaBlubba tattleMsg: MSG_EnemyTattle_TubbaBlubba - walkSound: [ SOUND_20F6, SOUND_20F6 ] + walkSound: [ SOUND_HEAVY_NPC_STEP_C, SOUND_HEAVY_NPC_STEP_C ] flySound: [ SOUND_NONE, SOUND_NONE ] jumpSound: SOUND_NONE hurtSound: SOUND_NONE @@ -1809,7 +1809,7 @@ level: 0 nameMsg: MSG_EnemyName_TubbaBlubba tattleMsg: MSG_EnemyTattle_TubbaBlubbaInvincible - walkSound: [ SOUND_20F6, SOUND_20F6 ] + walkSound: [ SOUND_HEAVY_NPC_STEP_C, SOUND_HEAVY_NPC_STEP_C ] flySound: [ SOUND_NONE, SOUND_NONE ] jumpSound: SOUND_NONE hurtSound: SOUND_NONE @@ -1831,7 +1831,7 @@ level: 0 nameMsg: MSG_EnemyName_StiltGuy tattleMsg: MSG_EnemyTattle_StiltGuy - walkSound: [ SOUND_2066, SOUND_2066 ] + walkSound: [ SOUND_STILT_GUY_STEP, SOUND_STILT_GUY_STEP ] flySound: [ SOUND_NONE, SOUND_NONE ] jumpSound: SOUND_NONE hurtSound: SOUND_ACTOR_HURT @@ -1875,7 +1875,7 @@ level: 0 nameMsg: MSG_EnemyName_GeneralGuy tattleMsg: MSG_EnemyTattle_GeneralGuy - walkSound: [ SOUND_037E, SOUND_037E ] + walkSound: [ SOUND_TOY_TANK_STEP, SOUND_TOY_TANK_STEP ] flySound: [ SOUND_NONE, SOUND_NONE ] jumpSound: SOUND_NONE hurtSound: SOUND_ACTOR_HURT @@ -1952,7 +1952,7 @@ level: 42 nameMsg: MSG_EnemyName_BigLanternGhost tattleMsg: MSG_EnemyTattle_BigLanternGhost - walkSound: [ SOUND_037D, SOUND_037D ] + walkSound: [ SOUND_LANTERN_GHOST_STEP, SOUND_LANTERN_GHOST_STEP ] flySound: [ SOUND_NONE, SOUND_NONE ] jumpSound: SOUND_NONE hurtSound: SOUND_NONE @@ -2041,7 +2041,7 @@ level: 55 nameMsg: MSG_EnemyName_KentCKoopa tattleMsg: MSG_EnemyTattle_KentCKoopa - walkSound: [ SOUND_20EC, SOUND_20EC ] + walkSound: [ SOUND_HEAVY_NPC_STEP_A, SOUND_HEAVY_NPC_STEP_A ] flySound: [ SOUND_NONE, SOUND_NONE ] jumpSound: SOUND_NONE hurtSound: SOUND_NONE diff --git a/src/battle/area/arn/actor/tubba_blubba.c b/src/battle/area/arn/actor/tubba_blubba.c index 46fe243a2a..a16ad993e1 100644 --- a/src/battle/area/arn/actor/tubba_blubba.c +++ b/src/battle/area/arn/actor/tubba_blubba.c @@ -291,7 +291,7 @@ EvtScript N(EVS_Attack_SlamFist) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim15) EVT_WAIT(8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035E) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_SWIPE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim16) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim17) @@ -306,9 +306,9 @@ EvtScript N(EVS_Attack_SlamFist) = { EVT_CALL(StartRumble, BTL_RUMBLE_LONG) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(15.0)) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING) EVT_END_IF - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -338,7 +338,7 @@ EvtScript N(EVS_Attack_SlamFist) = { EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK) EVT_CALL(SetDamageSource, DMG_SRC_TUBBA_SMASH) EVT_END_IF - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_FIST_POUND, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_FIST_POUND, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 200) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -378,7 +378,7 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_WAIT(8) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim0B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_LARGE_ACTOR_JUMP, 0) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -395,7 +395,7 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 23, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING) EVT_PLAY_EFFECT(EFFECT_SHOCKWAVE, 0, LVar0, 0, LVar2, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim0D) EVT_THREAD @@ -443,9 +443,9 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar5) EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK) EVT_CALL(SetDamageSource, DMG_SRC_CRUSH) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING) EVT_END_IF - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_BODY_SLAM, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_BODY_SLAM, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 200) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) diff --git a/src/battle/area/arn/actor/tubbas_heart.c b/src/battle/area/arn/actor/tubbas_heart.c index 90db955e49..be009d6420 100644 --- a/src/battle/area/arn/actor/tubbas_heart.c +++ b/src/battle/area/arn/actor/tubbas_heart.c @@ -326,7 +326,7 @@ EvtScript N(EVS_ReturnHome) = { EvtScript N(EVS_TakeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_NE(LVar0, HIT_RESULT_MISS) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Flags, LVar0) EVT_IF_NOT_FLAG(LVar0, AVAL_Flag_TauntBow) @@ -431,7 +431,7 @@ EvtScript N(EVS_Attack_Leap) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TubbasHeart_Anim16) EVT_WAIT(5) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TubbasHeart_Anim15) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -468,7 +468,7 @@ EvtScript N(EVS_Attack_Leap) = { EVT_END_SWITCH EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_LEAP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_LEAP, BS_FLAGS1_TRIGGER_EVENTS) EVT_SET(LVarF, LVar0) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -525,7 +525,7 @@ EvtScript N(EVS_Move_Charge) = { EVT_END_IF EVT_PLAY_EFFECT(EFFECT_GATHER_MAGIC, 1, LVar0, LVar1, LVar2, LVar3, 60, 0) EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, LVar3, 60, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F7) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_TUBBAS_HEART_CHARGE) EVT_WAIT(60) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) @@ -589,15 +589,15 @@ EvtScript N(EVS_Attack_DarkSwarm) = { EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_ChargedEffectID, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(DefaultAnims))) EVT_END_IF - EVT_CALL(PlaySound, SOUND_20F9) + EVT_CALL(PlaySound, SOUND_TUBBAS_HEART_SWARM_ATTACK) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 5) - EVT_PLAY_EFFECT(EFFECT_TUBBA_HEART_ATTACK, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 200, 0) + EVT_PLAY_EFFECT(EFFECT_TUBBA_HEART_ATTACK, FX_HEART_SWARM_MISS, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 200, 0) EVT_WAIT(145) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -608,10 +608,10 @@ EvtScript N(EVS_Attack_DarkSwarm) = { EVT_END_SWITCH EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 5) - EVT_PLAY_EFFECT(EFFECT_TUBBA_HEART_ATTACK, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 200, 0) + EVT_PLAY_EFFECT(EFFECT_TUBBA_HEART_ATTACK, FX_HEART_SWARM_HIT, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 200, 0) EVT_THREAD EVT_WAIT(160) - EVT_CALL(PlaySound, SOUND_20FC) + EVT_CALL(PlaySound, SOUND_TUBBAS_HEART_SWARM_VANISH) EVT_END_THREAD EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Flail) @@ -630,11 +630,11 @@ EvtScript N(EVS_Attack_DarkSwarm) = { EVT_WAIT(22) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_20FB) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_TUBBAS_HEART_SWARM_DISPERSE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SWARM, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SWARM, BS_FLAGS1_TRIGGER_EVENTS) EVT_RETURN EVT_END }; diff --git a/src/battle/area/dgb/actor/tubba_blubba.c b/src/battle/area/dgb/actor/tubba_blubba.c index 45f86e6528..7c15df8cc7 100644 --- a/src/battle/area/dgb/actor/tubba_blubba.c +++ b/src/battle/area/dgb/actor/tubba_blubba.c @@ -312,7 +312,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -416,7 +416,7 @@ EvtScript N(EVS_Attack_SlamFist) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim15) EVT_WAIT(8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035E) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_SWIPE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim16) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim17) @@ -432,9 +432,9 @@ EvtScript N(EVS_Attack_SlamFist) = { EVT_CALL(StartRumble, BTL_RUMBLE_LONG) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(15.0)) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING) EVT_END_IF - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -461,7 +461,7 @@ EvtScript N(EVS_Attack_SlamFist) = { EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK) EVT_CALL(SetDamageSource, DMG_SRC_TUBBA_SMASH) EVT_END_IF - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_FIST_POUND, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_FIST_POUND, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 200) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) @@ -501,7 +501,7 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_WAIT(8) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim10) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_LARGE_ACTOR_JUMP, 0) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -518,7 +518,7 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 23, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim12) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -561,14 +561,14 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 16, FALSE, TRUE, FALSE) EVT_END_SWITCH EVT_WAIT(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar5) EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK) EVT_CALL(SetDamageSource, DMG_SRC_CRUSH) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING) EVT_END_IF - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_BODY_SLAM, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_BODY_SLAM, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 200) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) diff --git a/src/battle/area/dig/actor/tubba_blubba.c b/src/battle/area/dig/actor/tubba_blubba.c index d5a7f37a67..e34bdca82d 100644 --- a/src/battle/area/dig/actor/tubba_blubba.c +++ b/src/battle/area/dig/actor/tubba_blubba.c @@ -183,7 +183,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_DISABLE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -287,9 +287,9 @@ EvtScript N(EVS_Attack_SlamFist) = { EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(15.0)) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING) EVT_END_IF - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -315,7 +315,7 @@ EvtScript N(EVS_Attack_SlamFist) = { EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK) EVT_CALL(SetDamageSource, DMG_SRC_TUBBA_SMASH) EVT_END_IF - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_FIST_POUND, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_FIST_POUND, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_SWITCH(LVarF) @@ -349,7 +349,7 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim0F) EVT_WAIT(8) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim10) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -367,7 +367,7 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_CALL(PlaySound, SOUND_ACTOR_JUMP) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 23, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim12) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -408,14 +408,14 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 16, FALSE, TRUE, FALSE) EVT_END_SWITCH EVT_WAIT(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar5) EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK) EVT_CALL(SetDamageSource, DMG_SRC_CRUSH) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING) EVT_END_IF - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_BODY_SLAM, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_BODY_SLAM, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_SET(LVarF, LVar0) diff --git a/src/battle/area/dig/script/dig_01.c b/src/battle/area/dig/script/dig_01.c index 75abfb13c4..0aa8038473 100644 --- a/src/battle/area/dig/script/dig_01.c +++ b/src/battle/area/dig/script/dig_01.c @@ -18,7 +18,7 @@ API_CALLABLE(N(SetupDemoPlayerMove)) { player->selectedTargetIndex = 0; selectableTarget = &player->targetData[player->targetIndexList[player->selectedTargetIndex]]; player->targetActorID = selectableTarget->actorID; - player->targetPartIndex = selectableTarget->partID; + player->targetPartID = selectableTarget->partID; return ApiStatus_DONE2; } diff --git a/src/battle/area/dig/script/dig_02.c b/src/battle/area/dig/script/dig_02.c index 6ee44f3703..2b7e6edc18 100644 --- a/src/battle/area/dig/script/dig_02.c +++ b/src/battle/area/dig/script/dig_02.c @@ -16,7 +16,7 @@ API_CALLABLE(N(SetupDemoPlayerMove)) { player->selectedTargetIndex = 1; selectableTarget = &player->targetData[player->targetIndexList[player->selectedTargetIndex]]; player->targetActorID = selectableTarget->actorID; - player->targetPartIndex = selectableTarget->partID; + player->targetPartID = selectableTarget->partID; return ApiStatus_DONE2; } diff --git a/src/battle/area/dig/script/dig_03.c b/src/battle/area/dig/script/dig_03.c index 7f6530ec5a..69a7626195 100644 --- a/src/battle/area/dig/script/dig_03.c +++ b/src/battle/area/dig/script/dig_03.c @@ -16,7 +16,7 @@ API_CALLABLE(N(SetupDemoPlayerMove)) { partner->selectedTargetIndex = 0; selectableTarget = &partner->targetData[partner->targetIndexList[partner->selectedTargetIndex]]; partner->targetActorID = selectableTarget->actorID; - partner->targetPartIndex = selectableTarget->partID; + partner->targetPartID = selectableTarget->partID; return ApiStatus_DONE2; } diff --git a/src/battle/area/dig/script/dig_04.c b/src/battle/area/dig/script/dig_04.c index 6bdc119dd1..929f34042e 100644 --- a/src/battle/area/dig/script/dig_04.c +++ b/src/battle/area/dig/script/dig_04.c @@ -21,7 +21,7 @@ API_CALLABLE(N(SetupDemoPlayerMove)) { player->selectedTargetIndex = 0; selectableTarget = &player->targetData[player->targetIndexList[player->selectedTargetIndex]]; player->targetActorID = selectableTarget->actorID; - player->targetPartIndex = selectableTarget->partID; + player->targetPartID = selectableTarget->partID; return ApiStatus_DONE2; } diff --git a/src/battle/area/flo2/actor/huff_n_puff.c b/src/battle/area/flo2/actor/huff_n_puff.c index 86aa429121..c0aa101ef3 100644 --- a/src/battle/area/flo2/actor/huff_n_puff.c +++ b/src/battle/area/flo2/actor/huff_n_puff.c @@ -612,7 +612,7 @@ EvtScript N(EVS_TrySpawningRuffPuff) = { EVT_RETURN EVT_END_IF EVT_CALL(GetBattleFlags, LVar0) - EVT_IF_FLAG(LVar0, BS_FLAGS1_40 | BS_FLAGS1_200) + EVT_IF_FLAG(LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT) EVT_IF_GT(LVar9, 8) EVT_SET(LVar9, 8) EVT_END_IF @@ -647,7 +647,7 @@ EvtScript N(EVS_TrySpawningRuffPuff) = { EVT_EXEC_WAIT(N(EVS_UpdateSize)) EVT_SET(LVarA, 0) EVT_CALL(GetBattleFlags, LVar0) - EVT_IF_FLAG(LVar0, BS_FLAGS1_40 | BS_FLAGS1_200) + EVT_IF_FLAG(LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT) EVT_SET(LVar0, LVar9) EVT_IF_GT(LVar0, 1) EVT_SET(LVarA, LVar0) @@ -1388,7 +1388,7 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 40, -20, EASING_SIN_OUT) EVT_WAIT(10) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LARGE_ACTOR_JUMP) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1456,15 +1456,15 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_DIV(LVar0, LVar1) EVT_SWITCH(LVar0) EVT_CASE_LE(20) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_SHOCK_CONTACT, 0, DMG_SLAM, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_SHOCK_CONTACT, 0, DMG_SLAM, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_LE(40) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_SHOCK_CONTACT, 0, DMG_SLAM, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_SHOCK_CONTACT, 0, DMG_SLAM, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_LE(60) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_SHOCK_CONTACT, 0, DMG_SLAM, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_SHOCK_CONTACT, 0, DMG_SLAM, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_LE(80) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_SHOCK_CONTACT, 0, DMG_SLAM, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_SHOCK_CONTACT, 0, DMG_SLAM, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_DEFAULT - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_SHOCK_CONTACT, 0, DMG_SLAM, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_SHOCK_CONTACT, 0, DMG_SLAM, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -1605,7 +1605,7 @@ EvtScript N(EVS_Move_HealOrSlam) = { EVT_END_IF EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03B0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HUFF_N_PUFF_INHALE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim1A) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FACE, ANIM_HuffNPuff_Anim1B) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_ARMS, ANIM_HuffNPuff_Anim1C) @@ -1640,14 +1640,14 @@ EvtScript N(EVS_Move_HealOrSlam) = { EVT_GOTO(0) EVT_END_IF EVT_CALL(RemoveEffect, LVar8) - EVT_CALL(StopSound, SOUND_03B0) + EVT_CALL(StopSound, SOUND_HUFF_N_PUFF_INHALE) EVT_CALL(StopSound, SOUND_BIG_POWER_UP) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim17) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FACE, ANIM_HuffNPuff_Anim18) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_ARMS, ANIM_HuffNPuff_Anim19) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_RECOVER_HEART) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1715,7 +1715,7 @@ EvtScript N(EVS_Move_HurricaneBreath) = { EVT_GOTO(1) EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03B0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HUFF_N_PUFF_INHALE) EVT_THREAD EVT_WAIT(15) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BIG_POWER_UP) @@ -1728,7 +1728,7 @@ EvtScript N(EVS_Move_HurricaneBreath) = { EVT_CALL(SetBattleCamOffsetZ, 20) EVT_CALL(MoveBattleCamOver, 180) EVT_WAIT(90) - EVT_CALL(StopSound, SOUND_03B0) + EVT_CALL(StopSound, SOUND_HUFF_N_PUFF_INHALE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim1D) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FACE, ANIM_HuffNPuff_Anim1D) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_ARMS, ANIM_HuffNPuff_Anim1E) @@ -1736,10 +1736,10 @@ EvtScript N(EVS_Move_HurricaneBreath) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FACE, ANIM_HuffNPuff_Anim21) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_ARMS, ANIM_HuffNPuff_Anim22) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_WIND_LOOP) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 15) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SET(LVarA, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -1802,7 +1802,7 @@ EvtScript N(EVS_Move_HurricaneBreath) = { EVT_WAIT(LVar0) EVT_END_LOOP EVT_WAIT(20) - EVT_CALL(StopSound, SOUND_035D) + EVT_CALL(StopSound, SOUND_HEAVY_WIND_LOOP) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF @@ -1955,23 +1955,23 @@ EvtScript N(EVS_Move_HurricaneBreath) = { EVT_WAIT(110) EVT_SET(LVar1, 0) EVT_END_IF - EVT_CALL(StopSound, SOUND_035D) + EVT_CALL(StopSound, SOUND_HEAVY_WIND_LOOP) EVT_WAIT(2) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_WIND_6, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_WIND_6, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(1) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_WIND_5, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_WIND_5, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_WIND_4, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_WIND_4, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(3) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_WIND_3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_WIND_3, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(4) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_WIND_2, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_WIND_2, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_DEFAULT - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_WIND_1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_WIND_1, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -2095,7 +2095,7 @@ EvtScript N(EVS_Attack_GroundLightning) = { EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar3, 1, LVar2, LVar4, 1, LVar5, EVT_FLOAT(4.0), 30, 0) EVT_END_LOOP EVT_WAIT(10) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -2113,7 +2113,7 @@ EvtScript N(EVS_Attack_GroundLightning) = { EVT_WAIT(2) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_GROUND_LIGHTNING, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_GROUND_LIGHTNING, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -2237,8 +2237,8 @@ EvtScript N(EVS_Attack_DirectLightning) = { EVT_END_IF EVT_END_THREAD EVT_CALL(StopSound, SOUND_CHARGE_LIGHTNING) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035B) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HUFF_N_PUFF_FIRE_LIGHTNING) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_EQ(HIT_RESULT_LUCKY) EVT_CALL(GetActorPos, ACTOR_SELF, LVarA, LVarB, LVarC) @@ -2351,7 +2351,7 @@ EvtScript N(EVS_Attack_DirectLightning) = { EVT_WAIT(2) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_DIRECT_LIGHTNING, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_DIRECT_LIGHTNING, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -2380,7 +2380,7 @@ EvtScript N(EVS_Attack_GroupSlam) = { EVT_CALL(SetBattleCamOffsetZ, 5) EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03B3) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HUFF_N_PUFF_REAR_UP) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim1A) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FACE, ANIM_HuffNPuff_Anim1B) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_ARMS, ANIM_HuffNPuff_Anim1C) @@ -2388,7 +2388,7 @@ EvtScript N(EVS_Attack_GroupSlam) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim1D) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FACE, ANIM_HuffNPuff_Anim1E) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_ARMS, ANIM_HuffNPuff_Anim1F) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B6) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HUFF_N_PUFF_JIGGLE) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_ScaleX, LVar0) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_ScaleY, LVar1) EVT_SET(LVarF, 0) @@ -2402,7 +2402,7 @@ EvtScript N(EVS_Attack_GroupSlam) = { EVT_ADD(LVarF, 1) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B6) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HUFF_N_PUFF_JIGGLE) EVT_LOOP(20) EVT_CALL(N(CosInterpMinMax), LVarF, LVar2, EVT_FLOAT(1.0), EVT_FLOAT(1.2), 10, 0, 0) EVT_CALL(N(CosInterpMinMax), LVarF, LVar3, EVT_FLOAT(1.0), EVT_FLOAT(0.8), 10, 0, 0) @@ -2485,7 +2485,7 @@ EvtScript N(EVS_Attack_GroupSlam) = { EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_THREAD EVT_WAIT(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_FALLING) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_ScaleY, LVar4) @@ -2494,7 +2494,7 @@ EvtScript N(EVS_Attack_GroupSlam) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar1, LVar4, LVar3) EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, EASING_CUBIC_IN) EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SHOCKWAVE, 3, LVar0, 0, LVar2, 0) EVT_THREAD @@ -2511,7 +2511,7 @@ EvtScript N(EVS_Attack_GroupSlam) = { EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_ScaleX, LVar0) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_ScaleY, LVar1) EVT_SET(LVarF, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B7) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HUFF_N_PUFF_WOBBLE) EVT_LOOP(20) EVT_CALL(N(CosInterpMinMax), LVarF, LVar2, EVT_FLOAT(1.0), EVT_FLOAT(1.5), 10, 0, 0) EVT_CALL(N(CosInterpMinMax), LVarF, LVar3, EVT_FLOAT(1.0), EVT_FLOAT(0.5), 10, 0, 0) @@ -2522,7 +2522,7 @@ EvtScript N(EVS_Attack_GroupSlam) = { EVT_ADD(LVarF, 1) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B7) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HUFF_N_PUFF_WOBBLE) EVT_LOOP(20) EVT_CALL(N(CosInterpMinMax), LVarF, LVar2, EVT_FLOAT(1.0), EVT_FLOAT(1.2), 10, 0, 0) EVT_CALL(N(CosInterpMinMax), LVarF, LVar3, EVT_FLOAT(1.0), EVT_FLOAT(0.8), 10, 0, 0) @@ -2597,7 +2597,7 @@ EvtScript N(EVS_Attack_GroupSlam) = { // have each Tuff Puff oscillate after slamming into the ground FOR_CHILDREN_ORDERED(HNP_IMPACT_JIGGLE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SET(LVarA, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -2653,7 +2653,7 @@ EvtScript N(EVS_Attack_GroupSlam) = { EVT_WAIT(2) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_NO_CONTACT, 0, 0, LVarA, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_NO_CONTACT, 0, 0, LVarA, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -2868,7 +2868,7 @@ EvtScript N(EVS_Attack_TuffPuffSwarm) = { // have each Tuff Puff squeeze the player FOR_CHILDREN_ORDERED(HNP_SQUEEZE_PLAYER) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -2971,7 +2971,7 @@ EvtScript N(EVS_Attack_TuffPuffSwarm) = { EVT_WAIT(2) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, 0, 1, BS_FLAGS1_40) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, 0, 1, BS_FLAGS1_NICE_HIT) EVT_ADD(LVar3, 1) EVT_END_IF EVT_IF_GT(LVar3, 1) @@ -3001,7 +3001,7 @@ EvtScript N(EVS_Attack_TuffPuffSwarm) = { EVT_WAIT(2) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_UNBLOCKABLE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, 0, 2, BS_FLAGS1_40) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_UNBLOCKABLE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, 0, 2, BS_FLAGS1_NICE_HIT) EVT_ADD(LVarD, 1) EVT_END_IF EVT_CALL(GetActionSuccessCopy, LVar0) @@ -3030,7 +3030,7 @@ EvtScript N(EVS_Attack_TuffPuffSwarm) = { EVT_END_IF EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_HIT) - EVT_CASE_OR_EQ(HIT_RESULT_1) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) diff --git a/src/battle/area/flo2/actor/monty_mole_boss.c b/src/battle/area/flo2/actor/monty_mole_boss.c index 0cae9a68bd..c3d3fbfce9 100644 --- a/src/battle/area/flo2/actor/monty_mole_boss.c +++ b/src/battle/area/flo2/actor/monty_mole_boss.c @@ -390,7 +390,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_END_IF EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_ROCK, SOUND_MOLE_THROW) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_ROCK, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 3, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -422,7 +422,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_ROCK, ANIM_MontyMole_Dark_Anim0F) EVT_CALL(FlyPartTo, ACTOR_SELF, PRT_ROCK, LVar0, LVar1, LVar2, 0, 20, EASING_LINEAR) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 3, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) diff --git a/src/battle/area/flo2/actor/spike.c b/src/battle/area/flo2/actor/spike.c index 18064f710b..063682ff42 100644 --- a/src/battle/area/flo2/actor/spike.c +++ b/src/battle/area/flo2/actor/spike.c @@ -294,7 +294,7 @@ EvtScript N(EVS_Attack_SpinyToss) = { EVT_SETF(LVar3, EVT_FLOAT(1.0)) EVT_END_IF EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 0, LVar0, LVar1, LVar2, LVar3, 30, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LAKILESTER_SUMMON_SPINY) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPIKE_SUMMON_SPINY) EVT_THREAD EVT_LOOP(15) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 1, 0, 0) @@ -315,9 +315,9 @@ EvtScript N(EVS_Attack_SpinyToss) = { EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleLakilester_ThrowSpiny) EVT_WAIT(3) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SPINY_BALL, SOUND_LAKILESTER_THROW_SPINY) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SPINY_BALL, SOUND_SPIKE_THROW_SPINY) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_SPINY_BALL, ACTOR_SOUND_JUMP, SOUND_NONE, SOUND_NONE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -364,7 +364,7 @@ EvtScript N(EVS_Attack_SpinyToss) = { EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_SPINY_BALL, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_END_THREAD EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SPINY_TOSS, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SPINY_TOSS, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) diff --git a/src/battle/area/hos/actor/goombario_tutor.c b/src/battle/area/hos/actor/goombario_tutor.c index c02c1504e1..984316bf24 100644 --- a/src/battle/area/hos/actor/goombario_tutor.c +++ b/src/battle/area/hos/actor/goombario_tutor.c @@ -235,7 +235,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetDamageSource, DMG_SRC_TUTORIAL_GOOMBARIO) EVT_END_IF EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(CloseActionCommandInfo) EVT_SET(LVarF, LVar0) EVT_SWITCH(LVarF) diff --git a/src/battle/area/hos/actor/magikoopa.c b/src/battle/area/hos/actor/magikoopa.c index bc59a96282..47ca883769 100644 --- a/src/battle/area/hos/actor/magikoopa.c +++ b/src/battle/area/hos/actor/magikoopa.c @@ -272,7 +272,7 @@ EvtScript N(EVS_Idle) = { EvtScript N(EVS_KnockDownCheck) = { EVT_CALL(GetBattleFlags, LVar0) EVT_IF_NOT_FLAG(LVar0, BS_FLAGS1_PARTNER_ACTING) - EVT_IF_FLAG(LVar0, BS_FLAGS1_40 | BS_FLAGS1_200) + EVT_IF_FLAG(LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_ShouldKnockDown, TRUE) EVT_END_IF EVT_ELSE @@ -283,7 +283,7 @@ EvtScript N(EVS_KnockDownCheck) = { EVT_CASE_OR_EQ(MOVE_HEADBONK3) EVT_CASE_OR_EQ(MOVE_MULTIBONK) EVT_CALL(GetBattleFlags, LVar0) - EVT_IF_FLAG(LVar0, BS_FLAGS1_40 | BS_FLAGS1_200) + EVT_IF_FLAG(LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_ShouldKnockDown, TRUE) EVT_END_IF EVT_END_CASE_GROUP @@ -840,7 +840,7 @@ EvtScript N(EVS_Move_HealOne) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, LVarB, SOUND_206D) + EVT_CALL(PlaySoundAtActor, LVarB, SOUND_RECOVER_HEART) EVT_CALL(PlaySoundAtActor, LVarB, SOUND_HEART_BOUNCE) EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, LVarB, SOUND_STAR_BOUNCE_A) @@ -933,7 +933,7 @@ EvtScript N(EVS_Move_HealAll) = { EVT_IF_EQ(LFlag0, FALSE) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, LVar0, SOUND_206D) + EVT_CALL(PlaySoundAtActor, LVar0, SOUND_RECOVER_HEART) EVT_CALL(PlaySoundAtActor, LVar0, SOUND_HEART_BOUNCE) EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, LVar0, SOUND_STAR_BOUNCE_A) @@ -1027,7 +1027,7 @@ EvtScript N(EVS_Attack_MagicBlast) = { EVT_PLAY_EFFECT(EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0) EVT_END_IF EVT_WAIT(30) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar9, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar9, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar9) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1155,10 +1155,10 @@ EvtScript N(EVS_Attack_MagicBlast) = { EVT_WAIT(18) EVT_IF_EQ(LFlag0, TRUE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT, 0, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT, 0, 0, 0, BS_FLAGS1_TRIGGER_EVENTS) EVT_ELSE EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_MAGIC_BLAST, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_MAGIC_BLAST, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_IF EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -1591,7 +1591,7 @@ EvtScript N(EVS_Move_TryBoostAttack) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, LVar8, SOUND_02DD) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_MAGIKOOPA_POWER_UP) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) @@ -1704,7 +1704,7 @@ EvtScript N(EVS_Move_TryBoostDefense) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, LVar8, SOUND_02DD) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_MAGIKOOPA_POWER_UP) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) @@ -1935,7 +1935,7 @@ EvtScript N(EVS_Move_TryTransparent) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, LVar8, SOUND_02DB) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_MAGIKOOPA_VANISH) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) diff --git a/src/battle/area/isk_part_2/actor/chain_chomp.c b/src/battle/area/isk_part_2/actor/chain_chomp.c index 39edb4f040..45d88ec58e 100644 --- a/src/battle/area/isk_part_2/actor/chain_chomp.c +++ b/src/battle/area/isk_part_2/actor/chain_chomp.c @@ -615,7 +615,7 @@ EvtScript N(EVS_Chomp_SpinSmashHit) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.1)) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -700,7 +700,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ChainChomp_SlowBite) EVT_WAIT(15) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_HURT) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -780,7 +780,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(2) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_SELF, PRT_TARGET, LVar0, LVar1, LVar2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_CHOMP_BITE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_CHOMP_BITE, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVarF) EVT_CASE_DEFAULT EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) diff --git a/src/battle/area/isk_part_2/actor/tutankoopa.c b/src/battle/area/isk_part_2/actor/tutankoopa.c index ab87331fad..e69f9b7acf 100644 --- a/src/battle/area/isk_part_2/actor/tutankoopa.c +++ b/src/battle/area/isk_part_2/actor/tutankoopa.c @@ -489,7 +489,7 @@ EvtScript N(EVS_TemporaryKnockout) = { EVT_RETURN EVT_END_IF EVT_CALL(HideHealthBar, ACTOR_SELF) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E3) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_WITHER) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Hurt) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.9)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -506,14 +506,14 @@ EvtScript N(EVS_TemporaryKnockout) = { EVT_CALL(SetPartScale, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(StartRumble, BTL_RUMBLE_LONG) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_COLLAPSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Fall) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(3.0)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 40) EVT_PLAY_EFFECT(EFFECT_STARS_ORBITING, 0, LVar0, LVar1, LVar2, 20, 4, LVarF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Dizzy) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) EVT_WAIT(30) EVT_CALL(RemoveEffect, LVarF) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Stunned, TRUE) @@ -630,9 +630,9 @@ EvtScript N(EVS_Attack_ThrowShell) = { EVT_CALL(JumpPartTo, ACTOR_SELF, LVar9, LVar0, LVar1, LVar2, 5, TRUE) EVT_WAIT(8) EVT_CALL(SetAnimation, ACTOR_SELF, LVar9, ANIM_BuzzyBeetle_Anim05) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02F9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_TOSS) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -669,7 +669,7 @@ EvtScript N(EVS_Attack_ThrowShell) = { EVT_CALL(SetPartJumpGravity, ACTOR_SELF, LVar9, EVT_FLOAT(0.2)) EVT_CALL(FlyPartTo, ACTOR_SELF, LVar9, LVar0, LVar1, LVar2, 0, 30, EASING_LINEAR) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar8, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_THROW_SHELL, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar8, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_THROW_SHELL, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 55) @@ -714,7 +714,7 @@ EvtScript N(EVS_Attack_DropDebris) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_TUTANKOOPA_MAGIC) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Shout) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) @@ -722,7 +722,7 @@ EvtScript N(EVS_Attack_DropDebris) = { EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 70) - EVT_CALL(PlaySound, SOUND_LEVITATE) + EVT_CALL(PlaySound, SOUND_SPOOKY_LEVITATE) EVT_PLAY_EFFECT(EFFECT_CHOMP_DROP, 0, 0, 60, 0, EVT_FLOAT(0.2), 0, EVT_FLOAT(1.4), 255, EVT_FLOAT(0.1), 150, 0) EVT_WAIT(15) EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) @@ -730,14 +730,14 @@ EvtScript N(EVS_Attack_DropDebris) = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Flail) EVT_WAIT(49) - EVT_CALL(PlaySound, SOUND_20E9) + EVT_CALL(PlaySound, SOUND_HEAVY_NPC_FALLING) EVT_WAIT(5) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Toss) EVT_WAIT(8) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Crouch) EVT_WAIT(5) EVT_CALL(StartRumble, BTL_RUMBLE_PLAYER_EXTREME) - EVT_CALL(PlaySound, SOUND_20EA) + EVT_CALL(PlaySound, SOUND_HEAVY_NPC_LANDING) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(4.0)) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Question) @@ -747,10 +747,10 @@ EvtScript N(EVS_Attack_DropDebris) = { EVT_CALL(PlaySound, SOUND_ILLUSION_DISSOLVE) EVT_ELSE EVT_WAIT(50) - EVT_CALL(PlaySound, SOUND_20E9) + EVT_CALL(PlaySound, SOUND_HEAVY_NPC_FALLING) EVT_WAIT(18) EVT_CALL(StartRumble, BTL_RUMBLE_PLAYER_EXTREME) - EVT_CALL(PlaySound, SOUND_20EA) + EVT_CALL(PlaySound, SOUND_HEAVY_NPC_LANDING) EVT_WAIT(20) EVT_CALL(PlaySound, SOUND_ILLUSION_DISSOLVE) EVT_END_IF @@ -795,7 +795,7 @@ EvtScript N(EVS_DropDebris_Self) = { EVT_CALL(SetPartPos, ACTOR_SELF, PRT_DEBRIS_3, LVar0, LVar3, LVar2) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_DEBRIS_3, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_DEBRIS_3, ANIM_Tutankoopa_RockStill) - EVT_CALL(PlaySound, SOUND_20EB) + EVT_CALL(PlaySound, SOUND_TUTANKOOPA_DEBRIS_FALL) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, PRT_DEBRIS_3, EVT_FLOAT(8.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_DEBRIS_3, EVT_FLOAT(0.3)) EVT_CALL(FallPartTo, ACTOR_SELF, PRT_DEBRIS_3, LVar0, LVar1, LVar2, 20) @@ -813,14 +813,14 @@ EvtScript N(EVS_DropDebris_Self) = { EVT_END_IF EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_HittingSelf, TRUE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, DMG_DROP_DEBRIS_SELF, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, DMG_DROP_DEBRIS_SELF, BS_FLAGS1_TRIGGER_EVENTS) EVT_RETURN EVT_END }; EvtScript N(EVS_DropDebris_Players) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -830,7 +830,7 @@ EvtScript N(EVS_DropDebris_Players) = { EVT_SUB(LVar0, 150) EVT_CALL(RandInt, 90, LVar1) EVT_SUB(LVar0, 40) - EVT_CALL(PlaySound, SOUND_20EB) + EVT_CALL(PlaySound, SOUND_TUTANKOOPA_DEBRIS_FALL) EVT_CALL(SpawnFallingRock, LVar0, 0, LVar1) EVT_CALL(RandInt, 5, LVar0) EVT_ADD(LVar0, 5) @@ -838,14 +838,14 @@ EvtScript N(EVS_DropDebris_Players) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarB, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarB, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarB) EVT_CASE_EQ(HIT_RESULT_MISS) EVT_RETURN EVT_CASE_DEFAULT EVT_CALL(FreezeBattleState, TRUE) EVT_THREAD - EVT_CALL(PlaySound, SOUND_20EB) + EVT_CALL(PlaySound, SOUND_TUTANKOOPA_DEBRIS_FALL) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -873,14 +873,14 @@ EvtScript N(EVS_DropDebris_Players) = { EVT_CALL(SetPartPos, ACTOR_SELF, PRT_DEBRIS_2, LVar4, LVar7, LVar6) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_DEBRIS_2, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_DEBRIS_2, ANIM_Tutankoopa_RockStill) - EVT_CALL(PlaySound, SOUND_20EB) + EVT_CALL(PlaySound, SOUND_TUTANKOOPA_DEBRIS_FALL) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, PRT_DEBRIS_2, EVT_FLOAT(8.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_DEBRIS_2, EVT_FLOAT(0.3)) EVT_CALL(FallPartTo, ACTOR_SELF, PRT_DEBRIS_2, LVar4, LVar5, LVar6, 20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_DEBRIS_1, ANIM_Tutankoopa_RockShatter) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_DROP_DEBRIS_PARTNER, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_DROP_DEBRIS_PARTNER, BS_FLAGS1_TRIGGER_EVENTS) EVT_WAIT(20) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_DEBRIS_2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(FreezeBattleState, FALSE) @@ -895,7 +895,7 @@ EvtScript N(EVS_DropDebris_Players) = { EVT_SUB(LVar0, 150) EVT_CALL(RandInt, 90, LVar1) EVT_SUB(LVar0, 40) - EVT_CALL(PlaySound, SOUND_20EB) + EVT_CALL(PlaySound, SOUND_TUTANKOOPA_DEBRIS_FALL) EVT_CALL(SpawnFallingRock, LVar0, 0, LVar1) EVT_CALL(RandInt, 5, LVar0) EVT_ADD(LVar0, 5) @@ -914,18 +914,18 @@ EvtScript N(EVS_DropDebris_Players) = { EVT_CALL(SetPartPos, ACTOR_SELF, PRT_DEBRIS_2, LVar4, LVar7, LVar6) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_DEBRIS_2, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_DEBRIS_2, ANIM_Tutankoopa_RockStill) - EVT_CALL(PlaySound, SOUND_20EB) + EVT_CALL(PlaySound, SOUND_TUTANKOOPA_DEBRIS_FALL) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, PRT_DEBRIS_2, EVT_FLOAT(8.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_DEBRIS_2, EVT_FLOAT(0.3)) EVT_CALL(FallPartTo, ACTOR_SELF, PRT_DEBRIS_2, LVar4, LVar5, LVar6, 20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_DEBRIS_1, ANIM_Tutankoopa_RockShatter) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_DROP_DEBRIS_PARTNER, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_DROP_DEBRIS_PARTNER, BS_FLAGS1_TRIGGER_EVENTS) EVT_WAIT(20) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_DEBRIS_2, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(FreezeBattleState, FALSE) EVT_END_THREAD - EVT_CALL(PlaySound, SOUND_20EB) + EVT_CALL(PlaySound, SOUND_TUTANKOOPA_DEBRIS_FALL) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -941,7 +941,7 @@ EvtScript N(EVS_DropDebris_Players) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_DEBRIS_1, ANIM_Tutankoopa_RockShatter) EVT_WAIT(2) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_DROP_DEBRIS_PLAYER, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_DROP_DEBRIS_PLAYER, BS_FLAGS1_TRIGGER_EVENTS) EVT_WAIT(19) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_DEBRIS_1, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_IF_EQ(LVar0, HIT_RESULT_10) @@ -1152,7 +1152,7 @@ EvtScript N(EVS_LevitateToHomePos) = { EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Unknown, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_13) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_TUTANKOOPA_MAGIC) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Tutankoopa_Levitate) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) @@ -1160,7 +1160,7 @@ EvtScript N(EVS_LevitateToHomePos) = { EVT_WAIT(45) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 60) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E6) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_TUTANKOOPA_LEVITATE) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.1)) EVT_CALL(SetGoalPos, ACTOR_SELF, 97, 70, 15) EVT_CALL(JumpToGoal, ACTOR_SELF, 45, FALSE, TRUE, FALSE) diff --git a/src/battle/area/iwa/actor/buzzar.c b/src/battle/area/iwa/actor/buzzar.c index e6a98808e8..60b3d92956 100644 --- a/src/battle/area/iwa/actor/buzzar.c +++ b/src/battle/area/iwa/actor/buzzar.c @@ -344,11 +344,11 @@ EvtScript N(EVS_Attack_WindBlast) = { EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Buzzar_Anim02) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_COS_IN_OUT) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_NO_CONTACT, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_NO_CONTACT, 0, 1, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVarA) EVT_CASE_EQ(HIT_RESULT_MISS) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_NO_CONTACT, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_NO_CONTACT, 0, 1, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVarA) EVT_CASE_EQ(HIT_RESULT_MISS) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -357,7 +357,7 @@ EvtScript N(EVS_Attack_WindBlast) = { EVT_WAIT(15) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Buzzar_Anim13) EVT_WAIT(6) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_WHIRLWIND) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 50) EVT_THREAD @@ -393,7 +393,7 @@ EvtScript N(EVS_Attack_WindBlast) = { EVT_WAIT(15) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Buzzar_Anim13) EVT_WAIT(6) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_WHIRLWIND) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_CALL(action_command_whirlwind_start, 0, 88 * DT, 3) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) @@ -437,7 +437,7 @@ EvtScript N(EVS_Attack_WindBlast) = { EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_UNBLOCKABLE | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_UNBLOCKABLE | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Buzzar_Anim01) EVT_WAIT(25) @@ -458,7 +458,7 @@ EvtScript N(EVS_Attack_WindBlast) = { EVT_WAIT(15) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Buzzar_Anim13) EVT_WAIT(6) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_WHIRLWIND) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_CALL(action_command_whirlwind_start, 0, 88 * DT, 3) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) @@ -515,14 +515,14 @@ EvtScript N(EVS_Attack_WindBlast) = { EVT_CALL(GetActionQuality, LVar1) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_UNBLOCKABLE | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_UNBLOCKABLE | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(ActorExists, ACTOR_PARTNER, LVar0) EVT_IF_EQ(LVar0, TRUE) EVT_WAIT(3) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_UNBLOCKABLE | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_UNBLOCKABLE | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Buzzar_Anim01) EVT_WAIT(25) @@ -583,7 +583,7 @@ EvtScript N(EVS_Attack_FeatherFling) = { EVT_ADD(LVar0, 24) EVT_ADD(LVar1, 24) EVT_PLAY_EFFECT(EFFECT_SHINY_FLARE, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.6), 0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F3) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SMALL_LENS_FLARE) EVT_WAIT(10) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_FEATHER_1, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_FEATHER_2, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) @@ -611,8 +611,8 @@ EvtScript N(EVS_Attack_FeatherFling) = { EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_FEATHER_2, EVT_FLOAT(0.1)) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, PRT_FEATHER_3, EVT_FLOAT(6.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_FEATHER_3, EVT_FLOAT(0.1)) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F4) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 2, BS_FLAGS1_10) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_THROW) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -680,7 +680,7 @@ EvtScript N(EVS_Attack_FeatherFling) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(FlyPartTo, ACTOR_SELF, PRT_FEATHER_1, LVar0, LVar1, LVar2, 6, 0, EASING_LINEAR) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_FEATHER, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_FEATHER, BS_FLAGS1_TRIGGER_EVENTS) EVT_SET(LVarF, LVar0) EVT_SWITCH(LVarF) EVT_CASE_DEFAULT @@ -814,7 +814,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = { EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Buzzar_Anim02) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_COS_IN_OUT) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 4, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 4, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -823,13 +823,13 @@ EvtScript N(EVS_Attack_GrappleDrop) = { EVT_CALL(SetBattleCamZoom, 240) EVT_CALL(SetBattleCamOffsetZ, -10) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_WINDUP) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) 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(PlaySoundAtActor, ACTOR_SELF, SOUND_20F2) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_DIVE) 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) @@ -852,20 +852,20 @@ EvtScript N(EVS_Attack_GrappleDrop) = { EVT_CALL(SetBattleCamZoom, 240) EVT_CALL(SetBattleCamOffsetZ, -10) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_WINDUP) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) 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(PlaySoundAtActor, ACTOR_SELF, SOUND_20F2) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_DIVE) 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)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Buzzar_Anim18) EVT_CALL(FlyToGoal, ACTOR_SELF, 8, -5, EASING_LINEAR) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_DROP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_DROP, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 40, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) @@ -910,13 +910,13 @@ EvtScript N(EVS_Attack_GrappleDrop) = { EVT_CALL(SetBattleCamTarget, LVar0, LVar1, LVar2) EVT_CALL(MoveBattleCamOver, 20) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_WINDUP) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) 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(PlaySoundAtActor, ACTOR_SELF, SOUND_20F2) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_DIVE) 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) @@ -924,9 +924,9 @@ EvtScript N(EVS_Attack_GrappleDrop) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Buzzar_Anim18) EVT_CALL(FlyToGoal, ACTOR_SELF, 8, -5, EASING_LINEAR) EVT_IF_EQ(LVarA, HIT_RESULT_HIT_STATIC) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_DROP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_DROP, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_GRAB) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Buzzar_Anim16) EVT_CALL(N(StartRumbleWithParams), 180, 20) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) @@ -994,7 +994,7 @@ EvtScript N(EVS_Attack_GrappleDrop) = { EVT_CALL(PlayerFallToGoal, 24) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_DROP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_DROP, BS_FLAGS1_TRIGGER_EVENTS) EVT_SET(LVarF, LVar0) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -1064,19 +1064,19 @@ EvtScript N(EVS_Attack_ClawSwipe) = { EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Buzzar_Anim02) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -15, EASING_COS_IN_OUT) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_WINDUP) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) 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(PlaySoundAtActor, ACTOR_SELF, SOUND_20F2) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_DIVE) 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) @@ -1096,13 +1096,13 @@ EvtScript N(EVS_Attack_ClawSwipe) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_WINDUP) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) 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(PlaySoundAtActor, ACTOR_SELF, SOUND_20F2) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BUZZAR_DIVE) 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) @@ -1110,7 +1110,7 @@ EvtScript N(EVS_Attack_ClawSwipe) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Buzzar_Anim18) EVT_CALL(FlyToGoal, ACTOR_SELF, 8, 0, EASING_LINEAR) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SWIPE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SWIPE, BS_FLAGS1_TRIGGER_EVENTS) EVT_SET(LVarF, LVar0) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/area/kgr/actor/fuzzipede.c b/src/battle/area/kgr/actor/fuzzipede.c index 0ac2884fee..b6ff586aa5 100644 --- a/src/battle/area/kgr/actor/fuzzipede.c +++ b/src/battle/area/kgr/actor/fuzzipede.c @@ -603,9 +603,9 @@ EvtScript N(EVS_Attack_Leap) = { EVT_EXEC_WAIT(EVS_Enemy_HopToPos) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzipede_Anim12) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_FUZZIPEDE_LEAP) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -667,7 +667,7 @@ EvtScript N(EVS_Attack_Leap) = { EVT_WAIT(1) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_LEAP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_LEAP, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -767,9 +767,9 @@ EvtScript N(EVS_Attack_DisableTackle) = { EVT_EXEC_WAIT(EVS_Enemy_HopToPos) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzipede_Anim12) EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_FUZZIPEDE_STRIKE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -837,7 +837,7 @@ EvtScript N(EVS_Attack_DisableTackle) = { EVT_WAIT(1) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_DISABLE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_DISABLE, BS_FLAGS1_TRIGGER_EVENTS) EVT_THREAD EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) EVT_WAIT(1) @@ -900,7 +900,7 @@ EvtScript N(EVS_Attack_DisableTackle) = { EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_CommandLossState, AVAL_LossState_ShowMessage) EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 0, 0) EVT_CALL(N(StartRumbleWithParams), 200, 10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_COMMAND_LOSS) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzipede_Anim13) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzipede_Anim04) @@ -947,7 +947,7 @@ EvtScript N(EVS_Recover) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzipede_Anim04) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_RECOVER_HEART) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_STAR_BOUNCE_A) diff --git a/src/battle/area/kkj/actor/kammy_koopa.c b/src/battle/area/kkj/actor/kammy_koopa.c index 77c6ed5690..9e23daa3ad 100644 --- a/src/battle/area/kkj/actor/kammy_koopa.c +++ b/src/battle/area/kkj/actor/kammy_koopa.c @@ -130,21 +130,21 @@ EvtScript N(EVS_Init) = { EVT_END }; -s32 N(unknownCounter) = 0; +s32 N(BobPhase) = 0; -API_CALLABLE(N(unknownFunction)) { +API_CALLABLE(N(AddFlightBobbing)) { Actor* actor = get_actor(script->owner1.actorID); - N(unknownCounter) += 9; - N(unknownCounter) = clamp_angle(N(unknownCounter)); - actor->verticalRenderOffset = sin_rad(DEG_TO_RAD(N(unknownCounter))) * 3.0f; + N(BobPhase) += 9; + N(BobPhase) = clamp_angle(N(BobPhase)); + actor->verticalRenderOffset = sin_rad(DEG_TO_RAD(N(BobPhase))) * 3.0f; return ApiStatus_DONE2; } EvtScript N(EVS_Idle) = { EVT_LOOP(0) - EVT_CALL(N(unknownFunction)) + EVT_CALL(N(AddFlightBobbing)) EVT_WAIT(1) EVT_END_LOOP EVT_RETURN @@ -185,7 +185,6 @@ EvtScript N(EVS_HandleEvent) = { }; #include "world/common/todo/SetEntityPositionF.inc.c" - #include "world/common/todo/GetEntityPosition.inc.c" API_CALLABLE(N(BlockAppear)) { @@ -271,7 +270,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleKammy_Anim07) EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_207A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_KAMMY_SUMMON_MAGIC) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 25) EVT_ADD(LVar1, 40) @@ -281,7 +280,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetBattleCamTarget, 80, 95, 15) EVT_CALL(SetBattleCamZoom, 340) EVT_CALL(MoveBattleCamOver, 60) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_207B) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_KAMMY_SUMMON_BLOCK) EVT_SUB(LVar0, 15) EVT_ADD(LVar1, 30) EVT_SET(LVar3, LVar1) @@ -301,7 +300,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_THREAD EVT_CALL(N(FadeInScreenBlur)) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_207C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_KAMMY_RAISE_OBJECT) EVT_CALL(N(GetEntityPosition), LVar9, LVar2, LVar3, LVar4) EVT_CALL(MakeLerp, LVar3, 300, 20, EASING_QUADRATIC_IN) EVT_LOOP(0) @@ -328,7 +327,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(5) EVT_CALL(N(FadeOutScreenBlur)) EVT_END_CHILD_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_207D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_KAMMY_LOWER_OBJECT) EVT_SET(LVar5, LVar1) EVT_ADD(LVar5, 200) EVT_CALL(N(SetEntityPositionF), LVar9, LVar0, LVar5, LVar2) @@ -358,7 +357,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_END_CHILD_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleKammy_Anim05) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_BLOCK_DROP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_BLOCK_DROP, BS_FLAGS1_TRIGGER_EVENTS) EVT_SET(LVarF, LVar0) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -517,13 +516,13 @@ EvtScript N(EVS_Death) = { 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) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_COLLAPSE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_01) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SEEING_STARS) diff --git a/src/battle/area/kmr_part_2/actor/blue_goomba_1.c b/src/battle/area/kmr_part_2/actor/blue_goomba_1.c index da5145eb15..1a60db6450 100644 --- a/src/battle/area/kmr_part_2/actor/blue_goomba_1.c +++ b/src/battle/area/kmr_part_2/actor/blue_goomba_1.c @@ -318,7 +318,7 @@ EvtScript N(EVS_TakeTurn_Inner) = { EVT_WAIT(5) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Blue_Midair) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -430,7 +430,7 @@ EvtScript N(EVS_TakeTurn_Inner) = { EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.3), EVT_FLOAT(0.5), EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_END_SWITCH - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_HEADBONK, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_HEADBONK, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) diff --git a/src/battle/area/kmr_part_2/actor/blue_goomba_2.c b/src/battle/area/kmr_part_2/actor/blue_goomba_2.c index 196d598b49..bbdbb9b221 100644 --- a/src/battle/area/kmr_part_2/actor/blue_goomba_2.c +++ b/src/battle/area/kmr_part_2/actor/blue_goomba_2.c @@ -309,7 +309,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(5) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Blue_Midair) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -421,7 +421,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.3), EVT_FLOAT(0.5), EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_END_SWITCH - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_HEADBONK, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_HEADBONK, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) diff --git a/src/battle/area/kmr_part_2/actor/goomba_king.c b/src/battle/area/kmr_part_2/actor/goomba_king.c index ab45c40772..487ae5907e 100644 --- a/src/battle/area/kmr_part_2/actor/goomba_king.c +++ b/src/battle/area/kmr_part_2/actor/goomba_king.c @@ -240,13 +240,13 @@ EvtScript A(EVS_Lee_ShockKnockback) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.4)) EVT_CALL(AddGoalPos, ACTOR_SELF, 30, 0, 0) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_B) EVT_CALL(AddGoalPos, ACTOR_SELF, 15, 0, 0) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_B) EVT_CALL(AddGoalPos, ACTOR_SELF, 5, 0, 0) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_B) EVT_RETURN EVT_END }; @@ -414,9 +414,9 @@ EvtScript N(EVS_Attack_SpinSwipe) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaKing_Idle) EVT_WAIT(8) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20ED) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GOOMBA_KING_SPIN) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20ED) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GOOMBA_KING_SPIN) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaKing_Kick) EVT_SET(LVar0, 0) @@ -426,7 +426,7 @@ EvtScript N(EVS_Attack_SpinSwipe) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 2, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -458,7 +458,7 @@ EvtScript N(EVS_Attack_SpinSwipe) = { EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarA, 0, 0, 0, DMG_SPIN, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarA, 0, 0, 0, DMG_SPIN, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) @@ -490,7 +490,7 @@ EvtScript N(EVS_Attack_GroundStomp) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_B) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaKing_Still) @@ -505,7 +505,7 @@ EvtScript N(EVS_Attack_GroundStomp) = { EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -15, 135, 0, 85, 0) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, 100, 103, 0, 70, 0) EVT_END_THREAD - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 2, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -641,7 +641,7 @@ EvtScript N(EVS_Attack_GroundStomp) = { EVT_WAIT(24) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_STOMP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_STOMP, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_EQ(HIT_RESULT_10) EVT_RETURN diff --git a/src/battle/area/kmr_part_2/actor/goomnut_tree.c b/src/battle/area/kmr_part_2/actor/goomnut_tree.c index 5451ea4d50..ad0701ee14 100644 --- a/src/battle/area/kmr_part_2/actor/goomnut_tree.c +++ b/src/battle/area/kmr_part_2/actor/goomnut_tree.c @@ -393,7 +393,7 @@ EvtScript N(EVS_DropNutOnGoombas) = { EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(SetOwnerTarget, ACTOR_KING, PRT_BIG_NUT) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, ((DAMAGE_TYPE_IGNORE_DEFENSE)), 0, 0, DMG_TO_KING, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, ((DAMAGE_TYPE_IGNORE_DEFENSE)), 0, 0, DMG_TO_KING, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(ActorExists, ACTOR_RED_GOOMBA, LVar0) EVT_IF_EQ(LVar0, 0) EVT_CALL(GetPartOffset, ACTOR_SELF, PRT_BIG_NUT, LVar0, LVar1, LVar2) @@ -422,7 +422,7 @@ EvtScript N(EVS_DropNutOnGoombas) = { EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_BIG_NUT, LVar0, LVar1, LVar2, 20, TRUE) EVT_CALL(SetOwnerTarget, ACTOR_RED_GOOMBA, PRT_MAIN) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, ((DAMAGE_TYPE_IGNORE_DEFENSE)), 0, 0, DMG_TO_RED_GOOMBA, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, ((DAMAGE_TYPE_IGNORE_DEFENSE)), 0, 0, DMG_TO_RED_GOOMBA, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(ActorExists, ACTOR_BLUE_GOOMBA, LVar0) EVT_IF_EQ(LVar0, 0) EVT_CALL(GetPartOffset, ACTOR_SELF, PRT_BIG_NUT, LVar0, LVar1, LVar2) @@ -451,7 +451,7 @@ EvtScript N(EVS_DropNutOnGoombas) = { EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_BIG_NUT, LVar0, LVar1, LVar2, 20, TRUE) EVT_CALL(SetOwnerTarget, ACTOR_BLUE_GOOMBA, PRT_MAIN) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, ((DAMAGE_TYPE_IGNORE_DEFENSE)), 0, 0, DMG_TO_BLUE_GOOMBA, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, ((DAMAGE_TYPE_IGNORE_DEFENSE)), 0, 0, DMG_TO_BLUE_GOOMBA, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(GetPartOffset, ACTOR_SELF, PRT_BIG_NUT, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 20) EVT_SET(LVar1, 20) diff --git a/src/battle/area/kmr_part_2/actor/red_goomba_1.c b/src/battle/area/kmr_part_2/actor/red_goomba_1.c index 519c3e882d..f67cd3e033 100644 --- a/src/battle/area/kmr_part_2/actor/red_goomba_1.c +++ b/src/battle/area/kmr_part_2/actor/red_goomba_1.c @@ -316,7 +316,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(5) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Red_Midair) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -428,7 +428,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.3), EVT_FLOAT(0.5), EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_END_SWITCH - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_HEADBONK, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_HEADBONK, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) diff --git a/src/battle/area/kmr_part_2/actor/red_goomba_2.c b/src/battle/area/kmr_part_2/actor/red_goomba_2.c index f3e60d92f9..7630075307 100644 --- a/src/battle/area/kmr_part_2/actor/red_goomba_2.c +++ b/src/battle/area/kmr_part_2/actor/red_goomba_2.c @@ -309,7 +309,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(5) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GoombaBros_Red_Midair) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -421,7 +421,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.3), EVT_FLOAT(0.5), EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_END_SWITCH - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_HEADBONK, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_HEADBONK, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) diff --git a/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c b/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c index 6d1f98f290..a84c44e96f 100644 --- a/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c @@ -198,7 +198,7 @@ EvtScript N(EVS_JrTroopa_Death) = { EVT_CALL(SetBattleCamOffsetZ, 15) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, ANIM_JrTroopa_Collapse) EVT_WAIT(12) EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, ANIM_JrTroopa_Defeated) @@ -413,7 +413,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(5) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Jump) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 2, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_CASE_OR_EQ(HIT_RESULT_MISS) @@ -467,7 +467,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_END_THREAD EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_LEAP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_LEAP, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_DEFAULT EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) @@ -513,7 +513,7 @@ EvtScript N(EVS_HandlePhase) = { EVT_WAIT(10) EVT_CALL(ActorSpeak, MSG_CH1_0128, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_PointTalk, ANIM_JrTroopa_PointTapFoot) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_ChargeArmsUp) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JR_TROOPA_TRANSFORM) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 16) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, 1, 30, 0) 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 d192aa21a8..5fa81b09eb 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 @@ -282,7 +282,7 @@ EvtScript N(EVS_SetupFearReaction) = { }; EvtScript N(EVS_TransformFX) = { - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JR_TROOPA_TRANSFORM) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) @@ -301,7 +301,7 @@ EvtScript N(EVS_TransformFX) = { EVT_END_LOOP EVT_END_THREAD EVT_WAIT(32) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JR_TROOPA_TRANSFORM) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JR_TROOPA_NEW_POWER) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 40, 0) @@ -388,7 +388,7 @@ EvtScript N(EVS_JrTroopa_BaseDeath) = { EVT_CALL(SetBattleCamOffsetZ, 15) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, ANIM_JrTroopa_Collapse) EVT_WAIT(12) EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, ANIM_JrTroopa_Defeated) @@ -720,7 +720,7 @@ EvtScript N(EVS_Attack_Leap) = { EVT_SET(LVar0, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 8, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 8, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarF) EVT_CASE_EQ(HIT_RESULT_LUCKY) EVT_THREAD @@ -768,7 +768,7 @@ EvtScript N(EVS_Attack_Leap) = { EVT_ADD(LVar0, 50) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E2, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_JR_TOOPA_JUMP, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_BASE, ANIM_JrTroopa_Jump) EVT_WAIT(2) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_BASE, ANIM_JrTroopa_Midair) @@ -809,7 +809,7 @@ EvtScript N(EVS_Attack_Leap) = { EVT_ADD(LVar0, 50) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, 0, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E2, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_JR_TOOPA_JUMP, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_BASE, ANIM_JrTroopa_Jump) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -821,7 +821,7 @@ EvtScript N(EVS_Attack_Leap) = { EVT_END_THREAD EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_LEAP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_LEAP, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -863,7 +863,7 @@ EvtScript N(EVS_Attack_Swoop) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_LINEAR) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 6, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 6, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -925,7 +925,7 @@ EvtScript N(EVS_Attack_Swoop) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_SpikedParaJrTroopa_Dive) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SWOOP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SWOOP, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0) @@ -963,7 +963,7 @@ EvtScript N(EVS_Attack_SpikeDive) = { EVT_WAIT(10) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 6, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 6, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1050,7 +1050,7 @@ EvtScript N(EVS_Attack_SpikeDive) = { EVT_END_LOOP EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_SPIKE_DIVE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_SPIKE_DIVE, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_THREAD @@ -1114,7 +1114,7 @@ EvtScript N(EVS_Attack_MagicSpell) = { EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, LVar5, 30, 0) EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAGE, ANIM_MageJrTroopa_SwingStaff) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_NO_CONTACT, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_NO_CONTACT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_EQ(HIT_RESULT_MISS) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPELL_CAST2) @@ -1179,7 +1179,7 @@ EvtScript N(EVS_Attack_MagicSpell) = { EVT_ADD(LVar1, LVar7) EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 15, 0) EVT_WAIT(15) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, (DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT), 0, 0, DMG_SPELL, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, (DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT), 0, 0, DMG_SPELL, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -1235,7 +1235,7 @@ EvtScript N(EVS_Attack_LightningBolt) = { EVT_ADD(LVar0, 50) EVT_SET(LVar1, 200) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LIGHTNING_STRIKE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_NO_CONTACT, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_NO_CONTACT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_EQ(HIT_RESULT_MISS) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -1297,7 +1297,7 @@ EvtScript N(EVS_Attack_LightningBolt) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, 0, LVar5) EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 18, 0) EVT_WAIT(14) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, (DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT), 0, SUPPRESS_EVENT_FLAG_10000, DMG_LIGHTNING, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, (DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT), 0, SUPPRESS_EVENT_FLAG_10000, DMG_LIGHTNING, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MakeLerp, 200, 0, 60, EASING_LINEAR) EVT_LABEL(2) @@ -1341,7 +1341,7 @@ EvtScript N(EVS_Move_HealSelf) = { EVT_ADD(LVar1, LVar4) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, LVar5, 30, 0) EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02F8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GATHER_SMALL) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_ADD(LVar2, 50) @@ -1355,7 +1355,7 @@ EvtScript N(EVS_Move_HealSelf) = { EVT_DIV(LVar0, 100) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_RECOVER_HEART) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_STAR_BOUNCE_A) @@ -1506,7 +1506,7 @@ EvtScript N(EVS_JrTroopa_Death) = { EVT_CALL(SetBattleCamOffsetZ, 15) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_BASE, ANIM_JrTroopa_Defeated) EVT_WAIT(60) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, TRUE) @@ -1559,7 +1559,7 @@ EvtScript N(EVS_JrTroopa_Death) = { EVT_CALL(SetBattleCamOffsetZ, 15) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_BASE, ANIM_JrTroopa_Defeated) EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_BASE, EVT_PTR(N(DefeatedAnims))) EVT_WAIT(60) diff --git a/src/battle/area/kmr_part_3/actor/jr_troopa.c b/src/battle/area/kmr_part_3/actor/jr_troopa.c index f2df2b70bc..56f81cd5dd 100644 --- a/src/battle/area/kmr_part_3/actor/jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/jr_troopa.c @@ -186,7 +186,7 @@ EvtScript N(EVS_JrTroopa_Death) = { EVT_CALL(SetBattleCamOffsetZ, 15) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, ANIM_JrTroopa_Collapse) EVT_WAIT(12) EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, ANIM_JrTroopa_Defeated) @@ -328,9 +328,9 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(5) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Jump) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20E2, 0) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_JR_TOOPA_JUMP, 0) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_AttackDamage, LVar1) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, LVar1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, LVar1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_EQ(6) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -370,7 +370,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_WAIT(2) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_AttackDamage, LVar1) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, LVar1, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -481,7 +481,7 @@ EvtScript N(EVS_HandlePhase) = { EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE) EVT_EXEC_WAIT(N(EVS_Cam_FocusOnJrTroopa)) EVT_CALL(ActorSpeak, MSG_CH0_00B3, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_Talk, ANIM_JrTroopa_Idle) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JR_TROOPA_TRANSFORM) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_JrTroopa_ChargeArmsUp) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 16) diff --git a/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c b/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c index ea992e61e5..bb2a742f2c 100644 --- a/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c @@ -181,7 +181,7 @@ EvtScript N(EVS_SetupFearReaction) = { }; EvtScript N(EVS_Transform) = { - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JR_TROOPA_TRANSFORM) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) @@ -200,7 +200,7 @@ EvtScript N(EVS_Transform) = { EVT_END_LOOP EVT_END_THREAD EVT_WAIT(32) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JR_TROOPA_TRANSFORM) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JR_TROOPA_NEW_POWER) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 40, 0) @@ -413,7 +413,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_BASE, ANIM_MageJrTroopa_SwingStaff) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_NO_CONTACT, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_NO_CONTACT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -462,7 +462,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_ADD(LVar1, LVar7) EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, 15, 0) EVT_WAIT(15) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, (DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT), 0, 0, DMG_SPELL, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, (DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT), 0, 0, DMG_SPELL, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_DamageBrag_State, LVar0) @@ -594,7 +594,7 @@ EvtScript N(EVS_JrTroopa_Death) = { EVT_CALL(SetBattleCamOffsetZ, 15) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAGE, ANIM_JrTroopa_Defeated) EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAGE, EVT_PTR(N(DefeatedAnims))) EVT_WAIT(60) 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 6ac521a0be..dec415fa38 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 @@ -160,7 +160,7 @@ EvtScript N(EVS_SetupFearReaction) = { }; EvtScript N(EVS_Transform) = { - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JR_TROOPA_TRANSFORM) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) @@ -179,7 +179,7 @@ EvtScript N(EVS_Transform) = { EVT_END_LOOP EVT_END_THREAD EVT_WAIT(32) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JR_TROOPA_TRANSFORM) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JR_TROOPA_NEW_POWER) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 40, 0) @@ -413,7 +413,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_LINEAR) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 5, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 5, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -475,7 +475,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_END_SWITCH EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_DIVE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_DIVE, BS_FLAGS1_TRIGGER_EVENTS) EVT_SET(LVarF, LVar0) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -585,7 +585,7 @@ EvtScript N(EVS_JrTroopa_Death) = { EVT_CALL(SetBattleCamOffsetZ, 15) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_JrTroopa_Defeated) EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_FLYING, EVT_PTR(N(DefeatedAnims))) EVT_WAIT(60) 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 865ce43053..5f6cdd5b5a 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 @@ -159,7 +159,7 @@ EvtScript N(EVS_SetupFearReaction) = { }; EvtScript N(EVS_Transform) = { - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JR_TROOPA_TRANSFORM) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) @@ -178,7 +178,7 @@ EvtScript N(EVS_Transform) = { EVT_END_LOOP EVT_END_THREAD EVT_WAIT(32) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JR_TROOPA_TRANSFORM) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JR_TROOPA_NEW_POWER) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 40, 0) @@ -466,7 +466,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_LINEAR) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 6, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 6, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -528,7 +528,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_END_SWITCH EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_DIVE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_DIVE, BS_FLAGS1_TRIGGER_EVENTS) EVT_SET(LVarF, LVar0) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -693,7 +693,7 @@ EvtScript N(EVS_JrTroopa_Death) = { EVT_CALL(SetBattleCamOffsetZ, 15) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_KNOCKOUT_CHIRPING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_JrTroopa_Defeated) EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_FLYING, EVT_PTR(N(DefeatedAnims))) EVT_WAIT(60) 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 51beadeccd..8b846b771f 100644 --- a/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c +++ b/src/battle/area/kmr_part_3/actor/tutorial_paragoomba.c @@ -389,7 +389,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_LINEAR) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -465,7 +465,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_END_SWITCH EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_AIR_KICK, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_AIR_KICK, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) diff --git a/src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c b/src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c index 865142dbd9..1211aebb51 100644 --- a/src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c +++ b/src/battle/area/kmr_part_3/actor/tutorial_spiked_goomba.c @@ -324,7 +324,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(5) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikedGoomba_Midair) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -436,7 +436,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.3), EVT_FLOAT(0.5), EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_END_SWITCH - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SPIKEBONK, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SPIKEBONK, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) diff --git a/src/battle/area/kpa2/actor/final_bowser_1.c b/src/battle/area/kpa2/actor/final_bowser_1.c index c4a8ee402a..be9dbb9a83 100644 --- a/src/battle/area/kpa2/actor/final_bowser_1.c +++ b/src/battle/area/kpa2/actor/final_bowser_1.c @@ -207,7 +207,7 @@ EvtScript N(EVS_Init) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(EVS_TakeTurn))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(EVS_Idle))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(EVS_HandleEvent))) - EVT_CALL(SetBattleFlagBits2, BS_FLAGS2_400 | BS_FLAGS2_DONT_STOP_MUSIC, TRUE) + EVT_CALL(SetBattleFlagBits2, BS_FLAGS2_FINAL_BOWSER_PART_1 | BS_FLAGS2_DONT_STOP_MUSIC, TRUE) EVT_RETURN EVT_END }; @@ -467,7 +467,7 @@ EvtScript N(EVS_StarRodCast) = { EVT_ADD(LVar0, 22) EVT_ADD(LVar1, 135) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2123) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_GATHER) EVT_ADD(LVar2, 10) EVT_CALL(N(StarRodAppearEffect), LVar0, LVar1, LVar2, EVT_FLOAT(2.5), EVT_FLOAT(0.075)) EVT_END_THREAD @@ -475,7 +475,7 @@ EvtScript N(EVS_StarRodCast) = { EVT_ADD(LVar0, 9) EVT_ADD(LVar1, 54) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2123) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_GATHER) EVT_ADD(LVar2, 10) EVT_CALL(N(StarRodAppearEffect), LVar0, LVar1, LVar2, EVT_FLOAT(2.5), EVT_FLOAT(0.03)) EVT_END_THREAD @@ -497,7 +497,7 @@ EvtScript N(EVS_StarRodCast) = { EVT_SUB(LVar2, 3) EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, EVT_FLOAT(0.6), LVarD, 0) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2121) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_USE) EVT_WAIT(30) EVT_CALL(RemoveEffect, LVarF) EVT_CALL(RemoveEffect, LVarE) @@ -520,7 +520,7 @@ EvtScript N(EVS_StarRodCast) = { EVT_ADD(LVar2, 12) EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 3, LVar0, LVar1, LVar2, 42, 48, 15, 60, 0) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2125) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_ENCHANT) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(N(StarRodPowerUpEffect), LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) @@ -538,7 +538,7 @@ EvtScript N(EVS_StarRodCast) = { EVT_ADD(LVar1, 24) EVT_END_IF EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 15, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2124) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_SHOCKWAVE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 39) EVT_WAIT(30) @@ -579,8 +579,8 @@ EvtScript N(EVS_PlayFootstepSounds) = { EVT_CALL(GetAnimation, ACTOR_SELF, PRT_MAIN, LVar7) EVT_IF_NE(LVar7, ANIM_BattleBowser_Walk) EVT_IF_EQ(LVar3, ANIM_BattleBowser_Walk) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_B) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_C) EVT_END_IF EVT_SET(LVar3, LVar7) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -595,8 +595,8 @@ EvtScript N(EVS_PlayFootstepSounds) = { EVT_END_IF EVT_END_IF EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_B) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_C) EVT_SET(LVar3, LVar7) EVT_RETURN EVT_END @@ -657,7 +657,7 @@ EvtScript N(EVS_Recover) = { EVT_DIV(LVar0, 100) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_RECOVER_HEART) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_STAR_BOUNCE_A) @@ -901,7 +901,7 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_WAIT(3) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Jump) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.2)) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -956,7 +956,7 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_IF_NOT_FLAG(LVarF, STATUS_FLAG_SHRINK) EVT_CALL(SetDamageSource, DMG_SRC_CRUSH) EVT_END_IF - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_SET(LVar0, -1) EVT_CALL(GetBattleFlags, LVar1) EVT_IF_NOT_FLAG(LVar1, BS_FLAGS1_ATK_BLOCKED) @@ -971,7 +971,7 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_IF_NE(LVar0, -1) EVT_CALL(LandJump, ACTOR_SELF) EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_CommandLossState, AVAL_LossState_KnockAway) EVT_EXEC(N(EVS_ManageCommandLoss)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -979,7 +979,7 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 14) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) @@ -1018,21 +1018,21 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_CommandLossState, AVAL_LossState_ShowMessage) EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.75), 0, 0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(3.0), 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_C) EVT_WAIT(4) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_StompOnce) EVT_WAIT(2) EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.75), 0, 0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(3.0), 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_C) EVT_WAIT(4) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_StompOnce) EVT_WAIT(2) EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.75), 0, 0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(3.0), 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_C) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Mock) EVT_WAIT(20) @@ -1055,7 +1055,7 @@ EvtScript N(EVS_Attack_BodySlam) = { 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) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 14) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) @@ -1122,9 +1122,9 @@ EvtScript N(EVS_Attack_ClawSwipe) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpMock) EVT_WAIT(25) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Swipe) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035E) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_SWIPE) EVT_WAIT(3) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1151,11 +1151,11 @@ EvtScript N(EVS_Attack_ClawSwipe) = { EVT_IF_FLAG(LVar0, ACTOR_EVENT_FLAG_STAR_ROD_ENCHANTED) EVT_SET(LVar0, DMG_BOOSTED_CLAW_SWIPE) EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_LEFT) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 100), LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 100), LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_ELSE EVT_SET(LVar0, DMG_CLAW_SWIPE) EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_LEFT) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 100), LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 100), LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_IF EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -1203,7 +1203,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) EVT_WAIT(10) EVT_CALL(N(FadeBackgroundDarken)) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2121) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_USE) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1229,7 +1229,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { EVT_WAIT(10) EVT_CALL(RemoveEffect, LVarF) EVT_CALL(RemoveEffect, LVarE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2122) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_DRAIN_WAVE) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1247,12 +1247,12 @@ EvtScript N(EVS_UseDrainingShockwave) = { EVT_END_THREAD EVT_WAIT(8) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarB, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarB, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarB) EVT_CASE_EQ(HIT_RESULT_MISS) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Idle) @@ -1274,7 +1274,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { EVT_ELSE EVT_SET(LVar1, DMG_SHOCKWAVE_P) EVT_END_IF - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(RemovePlayerBuffs, PLAYER_BUFF_PARTNER_GLOWING) EVT_IF_NE(LVarA, HIT_RESULT_LUCKY) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Idle) @@ -1296,7 +1296,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { EVT_ELSE EVT_SET(LVar1, DMG_SHOCKWAVE_P) EVT_END_IF - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(FreezeBattleState, FALSE) EVT_END_THREAD EVT_WAIT(2) @@ -1307,7 +1307,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { EVT_ELSE EVT_SET(LVar1, DMG_SHOCKWAVE) EVT_END_IF - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(RemovePlayerBuffs, PLAYER_BUFF_JUMP_CHARGE | PLAYER_BUFF_HAMMER_CHARGE | PLAYER_BUFF_STONE | PLAYER_BUFF_HUSTLE | PLAYER_BUFF_STATIC | PLAYER_BUFF_TRANSPARENT | PLAYER_BUFF_CLOUD_NINE | PLAYER_BUFF_TURBO_CHARGE | PLAYER_BUFF_WATER_BLOCK | PLAYER_BUFF_PARTNER_GLOWING | 0xFFEFC04) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -1392,13 +1392,13 @@ EvtScript N(EVS_Attack_FireBreath) = { EVT_END_IF EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 50, 148) - EVT_CALL(PlaySound, SOUND_03BD) + EVT_CALL(PlaySound, SOUND_BOWSER_FIRE_BREATH_LOOP) EVT_WAIT(70) - EVT_CALL(PlaySound, SOUND_03BD | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_BOWSER_FIRE_BREATH_LOOP | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_WAIT(10) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1426,7 +1426,7 @@ EvtScript N(EVS_Attack_FireBreath) = { EVT_ELSE EVT_SET(LVar0, DMG_FIRE_BREATH) EVT_END_IF - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_FIRE, SUPPRESS_EVENT_ALL, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_FIRE, SUPPRESS_EVENT_ALL, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -1546,7 +1546,7 @@ EvtScript N(EVS_Attack_LightningBlast) = { EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_CHARGE_LIGHTNING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) EVT_CALL(N(FadeBackgroundDarken)) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) @@ -1560,7 +1560,7 @@ EvtScript N(EVS_Attack_LightningBlast) = { EVT_ADD(LVar0, 22) EVT_SUB(LVar2, 3) EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, LVar0, 135, LVar2, EVT_FLOAT(1.5), LVarF, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2121) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_USE) EVT_SUB(LVar2, 3) EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 135, LVar2, EVT_FLOAT(1.5), LVarE, 0) EVT_WAIT(30) @@ -1576,7 +1576,7 @@ EvtScript N(EVS_Attack_LightningBlast) = { EVT_ADD(LVar0, 9) EVT_SUB(LVar2, 3) EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, LVar0, 54, LVar2, EVT_FLOAT(0.6), LVarF, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2121) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_USE) EVT_SUB(LVar2, 3) EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, EVT_FLOAT(0.6), LVarE, 0) EVT_WAIT(30) @@ -1589,7 +1589,7 @@ EvtScript N(EVS_Attack_LightningBlast) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, 0, LVar1) EVT_CALL(N(UnkLightningBoltFxFunc1), LVar0, LVar1) EVT_END_THREAD - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1614,10 +1614,10 @@ EvtScript N(EVS_Attack_LightningBlast) = { EVT_CALL(GetPartEventFlags, ACTOR_SELF, PRT_MAIN, LVar0) EVT_IF_FLAG(LVar0, ACTOR_EVENT_FLAG_STAR_ROD_ENCHANTED) EVT_SET(LVar0, DMG_BOOSTED_LIGHTNING_BLAST) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT, 0, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_ELSE EVT_SET(LVar0, DMG_LIGHTNING_BLAST) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT, 0, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_IF EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/area/kpa2/actor/final_bowser_2.c b/src/battle/area/kpa2/actor/final_bowser_2.c index 3556cef98a..d88a9a75a6 100644 --- a/src/battle/area/kpa2/actor/final_bowser_2.c +++ b/src/battle/area/kpa2/actor/final_bowser_2.c @@ -727,7 +727,7 @@ EvtScript N(EVS_StarRodCast) = { EVT_ADD(LVar0, 22) EVT_ADD(LVar1, 135) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2123) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_GATHER) EVT_ADD(LVar2, 10) EVT_CALL(N(StarRodAppearEffect), LVar0, LVar1, LVar2, EVT_FLOAT(2.5), EVT_FLOAT(0.075)) EVT_END_THREAD @@ -735,7 +735,7 @@ EvtScript N(EVS_StarRodCast) = { EVT_ADD(LVar0, 9) EVT_ADD(LVar1, 54) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2123) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_GATHER) EVT_ADD(LVar2, 10) EVT_CALL(N(StarRodAppearEffect), LVar0, LVar1, LVar2, EVT_FLOAT(2.5), EVT_FLOAT(0.03)) EVT_END_THREAD @@ -757,7 +757,7 @@ EvtScript N(EVS_StarRodCast) = { EVT_SUB(LVar2, 3) EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, EVT_FLOAT(0.6), LVarD, 0) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2121) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_USE) EVT_WAIT(30) EVT_CALL(RemoveEffect, LVarF) EVT_CALL(RemoveEffect, LVarE) @@ -780,7 +780,7 @@ EvtScript N(EVS_StarRodCast) = { EVT_ADD(LVar2, 12) EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 3, LVar0, LVar1, LVar2, 42, 48, 15, 60, 0) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2125) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_ENCHANT) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(N(StarRodPowerUpEffect), LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) @@ -798,7 +798,7 @@ EvtScript N(EVS_StarRodCast) = { EVT_ADD(LVar1, 24) EVT_END_IF EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 15, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2124) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_SHOCKWAVE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 39) EVT_WAIT(30) @@ -839,8 +839,8 @@ EvtScript N(EVS_PlayFootstepSounds) = { EVT_CALL(GetAnimation, ACTOR_SELF, PRT_MAIN, LVar7) EVT_IF_NE(LVar7, ANIM_BattleBowser_Walk) EVT_IF_EQ(LVar3, ANIM_BattleBowser_Walk) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_B) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_C) EVT_END_IF EVT_SET(LVar3, LVar7) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -855,8 +855,8 @@ EvtScript N(EVS_PlayFootstepSounds) = { EVT_END_IF EVT_END_IF EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_B) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_C) EVT_SET(LVar3, LVar7) EVT_RETURN EVT_END @@ -917,7 +917,7 @@ EvtScript N(EVS_Recover) = { EVT_DIV(LVar0, 100) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_RECOVER_HEART) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_STAR_BOUNCE_A) @@ -1135,7 +1135,7 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_WAIT(3) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Jump) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.2)) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1190,7 +1190,7 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_IF_NOT_FLAG(LVarF, STATUS_FLAG_SHRINK) EVT_CALL(SetDamageSource, DMG_SRC_CRUSH) EVT_END_IF - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_SET(LVar0, -1) EVT_CALL(GetBattleFlags, LVar1) EVT_IF_NOT_FLAG(LVar1, BS_FLAGS1_ATK_BLOCKED) @@ -1205,7 +1205,7 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_IF_NE(LVar0, -1) EVT_CALL(LandJump, ACTOR_SELF) EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_CommandLossState, AVAL_LossState_KnockAway) EVT_EXEC(N(EVS_ManageCommandLoss)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1213,7 +1213,7 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 14) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) @@ -1252,21 +1252,21 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_CommandLossState, AVAL_LossState_ShowMessage) EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.75), 0, 0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(3.0), 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_C) EVT_WAIT(4) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_StompOnce) EVT_WAIT(2) EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.75), 0, 0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(3.0), 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_C) EVT_WAIT(4) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_StompOnce) EVT_WAIT(2) EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.75), 0, 0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(3.0), 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_C) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Mock) EVT_WAIT(20) @@ -1289,7 +1289,7 @@ EvtScript N(EVS_Attack_BodySlam) = { 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) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 14) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) @@ -1356,9 +1356,9 @@ EvtScript N(EVS_Attack_ClawSwipe) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpMock) EVT_WAIT(25) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Swipe) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035E) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_SWIPE) EVT_WAIT(3) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1385,11 +1385,11 @@ EvtScript N(EVS_Attack_ClawSwipe) = { EVT_IF_FLAG(LVar0, ACTOR_EVENT_FLAG_STAR_ROD_ENCHANTED) EVT_SET(LVar0, DMG_BOOSTED_CLAW_SWIPE) EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_LEFT) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 100), LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 100), LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_ELSE EVT_SET(LVar0, DMG_CLAW_SWIPE) EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_LEFT) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 100), LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 100), LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_IF EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -1437,7 +1437,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) EVT_WAIT(10) EVT_CALL(N(FadeBackgroundDarken)) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2121) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_USE) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1463,7 +1463,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { EVT_WAIT(10) EVT_CALL(RemoveEffect, LVarF) EVT_CALL(RemoveEffect, LVarE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2122) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_DRAIN_WAVE) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1481,12 +1481,12 @@ EvtScript N(EVS_UseDrainingShockwave) = { EVT_END_THREAD EVT_WAIT(8) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarB, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarB, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarB) EVT_CASE_EQ(HIT_RESULT_MISS) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Idle) @@ -1508,7 +1508,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { EVT_ELSE EVT_SET(LVar1, DMG_SHOCKWAVE_P) EVT_END_IF - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(RemovePlayerBuffs, PLAYER_BUFF_PARTNER_GLOWING) EVT_IF_NE(LVarA, HIT_RESULT_LUCKY) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Idle) @@ -1530,7 +1530,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { EVT_ELSE EVT_SET(LVar1, DMG_SHOCKWAVE_P) EVT_END_IF - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(FreezeBattleState, FALSE) EVT_END_THREAD EVT_WAIT(2) @@ -1541,7 +1541,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { EVT_ELSE EVT_SET(LVar1, DMG_SHOCKWAVE) EVT_END_IF - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(RemovePlayerBuffs, PLAYER_BUFF_JUMP_CHARGE | PLAYER_BUFF_HAMMER_CHARGE | PLAYER_BUFF_STONE | PLAYER_BUFF_HUSTLE | PLAYER_BUFF_STATIC | PLAYER_BUFF_TRANSPARENT | PLAYER_BUFF_CLOUD_NINE | PLAYER_BUFF_TURBO_CHARGE | PLAYER_BUFF_WATER_BLOCK | PLAYER_BUFF_PARTNER_GLOWING | 0xFFEFC04) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -1626,13 +1626,13 @@ EvtScript N(EVS_Attack_FireBreath) = { EVT_END_IF EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 50, 148) - EVT_CALL(PlaySound, SOUND_03BD) + EVT_CALL(PlaySound, SOUND_BOWSER_FIRE_BREATH_LOOP) EVT_WAIT(70) - EVT_CALL(PlaySound, SOUND_03BD | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_BOWSER_FIRE_BREATH_LOOP | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_WAIT(10) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1660,7 +1660,7 @@ EvtScript N(EVS_Attack_FireBreath) = { EVT_ELSE EVT_SET(LVar0, DMG_FIRE_BREATH) EVT_END_IF - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_FIRE, SUPPRESS_EVENT_ALL, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_FIRE, SUPPRESS_EVENT_ALL, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -1780,7 +1780,7 @@ EvtScript N(EVS_Attack_LightningBlast) = { EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_CHARGE_LIGHTNING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) EVT_CALL(N(FadeBackgroundDarken)) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) @@ -1794,7 +1794,7 @@ EvtScript N(EVS_Attack_LightningBlast) = { EVT_ADD(LVar0, 22) EVT_SUB(LVar2, 3) EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, LVar0, 135, LVar2, EVT_FLOAT(1.5), LVarF, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2121) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_USE) EVT_SUB(LVar2, 3) EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 135, LVar2, EVT_FLOAT(1.5), LVarE, 0) EVT_WAIT(30) @@ -1810,7 +1810,7 @@ EvtScript N(EVS_Attack_LightningBlast) = { EVT_ADD(LVar0, 9) EVT_SUB(LVar2, 3) EVT_PLAY_EFFECT(EFFECT_LIGHT_RAYS, 2, LVar0, 54, LVar2, EVT_FLOAT(0.6), LVarF, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2121) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_USE) EVT_SUB(LVar2, 3) EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 54, LVar2, EVT_FLOAT(0.6), LVarE, 0) EVT_WAIT(30) @@ -1823,7 +1823,7 @@ EvtScript N(EVS_Attack_LightningBlast) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, 0, LVar1) EVT_CALL(N(UnkLightningBoltFxFunc1), LVar0, LVar1) EVT_END_THREAD - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1848,10 +1848,10 @@ EvtScript N(EVS_Attack_LightningBlast) = { EVT_CALL(GetPartEventFlags, ACTOR_SELF, PRT_MAIN, LVar0) EVT_IF_FLAG(LVar0, ACTOR_EVENT_FLAG_STAR_ROD_ENCHANTED) EVT_SET(LVar0, DMG_BOOSTED_LIGHTNING_BLAST) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT, 0, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_ELSE EVT_SET(LVar0, DMG_LIGHTNING_BLAST) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT, 0, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_IF EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/area/kpa2/actor/hallway_bowser.c b/src/battle/area/kpa2/actor/hallway_bowser.c index 12995b1cd5..d3b6b59be0 100644 --- a/src/battle/area/kpa2/actor/hallway_bowser.c +++ b/src/battle/area/kpa2/actor/hallway_bowser.c @@ -617,7 +617,7 @@ EvtScript N(EVS_StarRodCast) = { EVT_ADD(LVar0, 15) EVT_ADD(LVar1, 90) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2123) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_GATHER) EVT_ADD(LVar2, 10) EVT_CALL(N(StarRodAppearEffect), LVar0, LVar1, LVar2, EVT_FLOAT(2.5), EVT_FLOAT(0.05)) EVT_END_THREAD @@ -625,7 +625,7 @@ EvtScript N(EVS_StarRodCast) = { EVT_ADD(LVar0, 6) EVT_ADD(LVar1, 36) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2123) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_GATHER) EVT_ADD(LVar2, 10) EVT_CALL(N(StarRodAppearEffect), LVar0, LVar1, LVar2, EVT_FLOAT(2.5), EVT_FLOAT(0.02)) EVT_END_THREAD @@ -647,7 +647,7 @@ EvtScript N(EVS_StarRodCast) = { EVT_SUB(LVar2, 3) EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 36, LVar2, EVT_FLOAT(0.4), LVarD, 0) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2121) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_USE) EVT_WAIT(30) EVT_CALL(RemoveEffect, LVarF) EVT_CALL(RemoveEffect, LVarE) @@ -670,7 +670,7 @@ EvtScript N(EVS_StarRodCast) = { EVT_ADD(LVar2, 12) EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 3, LVar0, LVar1, LVar2, 28, 32, 10, 60, 0) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2125) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_ENCHANT) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(N(StarRodPowerUpEffect), LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) @@ -688,7 +688,7 @@ EvtScript N(EVS_StarRodCast) = { EVT_ADD(LVar1, 16) EVT_END_IF EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 15, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2124) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_SHOCKWAVE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 39) EVT_WAIT(30) @@ -729,8 +729,8 @@ EvtScript N(EVS_PlayFootstepSounds) = { EVT_CALL(GetAnimation, ACTOR_SELF, PRT_MAIN, LVar7) EVT_IF_NE(LVar7, ANIM_BattleBowser_Walk) EVT_IF_EQ(LVar3, ANIM_BattleBowser_Walk) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_B) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_C) EVT_END_IF EVT_SET(LVar3, LVar7) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -745,8 +745,8 @@ EvtScript N(EVS_PlayFootstepSounds) = { EVT_END_IF EVT_END_IF EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_B) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_C) EVT_SET(LVar3, LVar7) EVT_RETURN EVT_END @@ -807,7 +807,7 @@ EvtScript N(EVS_Recover) = { EVT_DIV(LVar0, 100) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_RECOVER_HEART) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_STAR_BOUNCE_A) @@ -1049,7 +1049,7 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_WAIT(3) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Jump) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.2)) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1104,7 +1104,7 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_IF_NOT_FLAG(LVarF, ACTOR_EVENT_FLAG_STAR_ROD_ENCHANTED) EVT_CALL(SetDamageSource, DMG_SRC_CRUSH) EVT_END_IF - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_SET(LVar0, -1) EVT_CALL(GetBattleFlags, LVar1) EVT_IF_NOT_FLAG(LVar1, BS_FLAGS1_ATK_BLOCKED) @@ -1119,7 +1119,7 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_IF_NE(LVar0, -1) EVT_CALL(LandJump, ACTOR_SELF) EVT_CALL(N(StartRumbleWithParams), 80, 14) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_CommandLossState, AVAL_LossState_KnockAway) EVT_EXEC(N(EVS_ManageCommandLoss)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1127,7 +1127,7 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 14) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) @@ -1166,21 +1166,21 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_CommandLossState, AVAL_LossState_ShowMessage) EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.5), 0, 0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(2.0), 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_C) EVT_WAIT(4) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_StompOnce) EVT_WAIT(2) EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.5), 0, 0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(2.0), 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_C) EVT_WAIT(4) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Idle) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_StompOnce) EVT_WAIT(2) EVT_PLAY_EFFECT(EFFECT_FIREWORK, 0, LVar1, 0, LVar3, EVT_FLOAT(0.5), 0, 0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar1, 0, LVar3, EVT_FLOAT(2.0), 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_C) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Mock) EVT_WAIT(20) @@ -1203,7 +1203,7 @@ EvtScript N(EVS_Attack_BodySlam) = { 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) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 14) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(3.0)) @@ -1270,9 +1270,9 @@ EvtScript N(EVS_Attack_ClawSwipe) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpMock) EVT_WAIT(25) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Swipe) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035E) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_SWIPE) EVT_WAIT(3) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1299,11 +1299,11 @@ EvtScript N(EVS_Attack_ClawSwipe) = { EVT_IF_FLAG(LVar0, ACTOR_EVENT_FLAG_ENCHANTED) EVT_SET(LVar0, DMG_BOOSTED_CLAW_SWIPE) EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_LEFT) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 100), LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 100), LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_ELSE EVT_SET(LVar0, DMG_CLAW_SWIPE) EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_LEFT) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 100), LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 100), LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_IF EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) @@ -1353,7 +1353,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Brandish) EVT_WAIT(10) EVT_CALL(N(FadeBackgroundDarken)) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2121) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_USE) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1379,7 +1379,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { EVT_WAIT(10) EVT_CALL(RemoveEffect, LVarF) EVT_CALL(RemoveEffect, LVarE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2122) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_DRAIN_WAVE) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1397,12 +1397,12 @@ EvtScript N(EVS_UseDrainingShockwave) = { EVT_END_THREAD EVT_WAIT(8) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarB, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarB, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarB) EVT_CASE_EQ(HIT_RESULT_MISS) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Idle) @@ -1424,7 +1424,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { EVT_ELSE EVT_SET(LVar1, DMG_SHOCKWAVE_P) EVT_END_IF - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(RemovePlayerBuffs, PLAYER_BUFF_PARTNER_GLOWING) EVT_IF_NE(LVarA, HIT_RESULT_LUCKY) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Idle) @@ -1446,7 +1446,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { EVT_ELSE EVT_SET(LVar1, DMG_SHOCKWAVE_P) EVT_END_IF - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(FreezeBattleState, FALSE) EVT_END_THREAD EVT_WAIT(2) @@ -1457,7 +1457,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { EVT_ELSE EVT_SET(LVar1, DMG_SHOCKWAVE) EVT_END_IF - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(RemovePlayerBuffs, PLAYER_BUFF_JUMP_CHARGE | PLAYER_BUFF_HAMMER_CHARGE | PLAYER_BUFF_STONE | PLAYER_BUFF_HUSTLE | PLAYER_BUFF_STATIC | PLAYER_BUFF_TRANSPARENT | PLAYER_BUFF_CLOUD_NINE | PLAYER_BUFF_TURBO_CHARGE | PLAYER_BUFF_WATER_BLOCK | PLAYER_BUFF_PARTNER_GLOWING | 0xFFEFC04) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -1535,13 +1535,13 @@ EvtScript N(EVS_Attack_FireBreath) = { EVT_END_IF EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 50, 148) - EVT_CALL(PlaySound, SOUND_03BD) + EVT_CALL(PlaySound, SOUND_BOWSER_FIRE_BREATH_LOOP) EVT_WAIT(70) - EVT_CALL(PlaySound, SOUND_03BD | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_BOWSER_FIRE_BREATH_LOOP | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_WAIT(10) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1569,7 +1569,7 @@ EvtScript N(EVS_Attack_FireBreath) = { EVT_ELSE EVT_SET(LVar0, DMG_FIRE_BREATH) EVT_END_IF - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_FIRE, SUPPRESS_EVENT_ALL, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_FIRE, SUPPRESS_EVENT_ALL, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) diff --git a/src/battle/area/kpa2/actor/intro_bowser.c b/src/battle/area/kpa2/actor/intro_bowser.c index 3f84428d9e..8852f9f49d 100644 --- a/src/battle/area/kpa2/actor/intro_bowser.c +++ b/src/battle/area/kpa2/actor/intro_bowser.c @@ -354,7 +354,7 @@ EvtScript N(EVS_Attack_ClawSwipe) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_RearUpMock) EVT_WAIT(25) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Swipe) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035E) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_SWIPE) EVT_WAIT(3) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -362,11 +362,11 @@ EvtScript N(EVS_Attack_ClawSwipe) = { EVT_IF_LT(LVar1, 3) EVT_SET(LVar0, DMG_CLAW_SWIPE) EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_LEFT) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_ELSE EVT_SET(LVar0, DMG_MEGA_CLAW_SWIPE) EVT_CALL(SetDamageSource, DMG_SRC_LAST_SLAP_LEFT) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_IF EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) @@ -425,9 +425,9 @@ EvtScript N(EVS_Attack_FireBreath) = { EVT_CALL(N(SetBowserFireBreathScales), LVarF) EVT_THREAD EVT_CALL(N(StartRumbleWithParams), 50, 148) - EVT_CALL(PlaySound, SOUND_03BD) + EVT_CALL(PlaySound, SOUND_BOWSER_FIRE_BREATH_LOOP) EVT_WAIT(70) - EVT_CALL(PlaySound, SOUND_03BD | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_BOWSER_FIRE_BREATH_LOOP | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_BTL_COMPANION, ANIM_ParadePeach_Weep) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) @@ -437,7 +437,7 @@ EvtScript N(EVS_Attack_FireBreath) = { EVT_WAIT(30) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_FIRE, SUPPRESS_EVENT_ALL, 0, DMG_FIRE_BREATH, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_FIRE, SUPPRESS_EVENT_ALL, 0, DMG_FIRE_BREATH, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -546,7 +546,7 @@ EvtScript N(EVS_StarRodCast) = { EVT_ADD(LVar0, 15) EVT_ADD(LVar1, 90) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2123) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_GATHER) EVT_ADD(LVar2, 10) EVT_CALL(N(StarRodAppearEffect), LVar0, LVar1, LVar2, EVT_FLOAT(2.5), EVT_FLOAT(0.05)) EVT_END_THREAD @@ -554,7 +554,7 @@ EvtScript N(EVS_StarRodCast) = { EVT_ADD(LVar0, 6) EVT_ADD(LVar1, 36) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2123) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_GATHER) EVT_ADD(LVar2, 10) EVT_CALL(N(StarRodAppearEffect), LVar0, LVar1, LVar2, EVT_FLOAT(2.5), EVT_FLOAT(0.02)) EVT_END_THREAD @@ -576,7 +576,7 @@ EvtScript N(EVS_StarRodCast) = { EVT_SUB(LVar2, 3) EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, 36, LVar2, EVT_FLOAT(0.4), LVarD, 0) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2121) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_USE) EVT_WAIT(30) EVT_CALL(RemoveEffect, LVarF) EVT_CALL(RemoveEffect, LVarE) @@ -599,7 +599,7 @@ EvtScript N(EVS_StarRodCast) = { EVT_ADD(LVar2, 12) EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 3, LVar0, LVar1, LVar2, 28, 32, 10, 60, 0) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2125) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_ENCHANT) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(N(StarRodPowerUpEffect), LVar0, LVar1, LVar2, EVT_FLOAT(0.8)) @@ -617,7 +617,7 @@ EvtScript N(EVS_StarRodCast) = { EVT_ADD(LVar1, 16) EVT_END_IF EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 15, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2124) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOWSER_STAR_ROD_SHOCKWAVE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 15) @@ -664,8 +664,8 @@ EvtScript N(EVS_PlayFootstepSounds) = { EVT_CALL(GetAnimation, ACTOR_SELF, PRT_MAIN, LVar7) EVT_IF_NE(LVar7, ANIM_BattleBowser_Walk) EVT_IF_EQ(LVar3, ANIM_BattleBowser_Walk) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_B) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_C) EVT_END_IF EVT_SET(LVar3, LVar7) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -680,8 +680,8 @@ EvtScript N(EVS_PlayFootstepSounds) = { EVT_END_IF EVT_END_IF EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F6) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_B) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_C) EVT_SET(LVar3, LVar7) EVT_RETURN EVT_END diff --git a/src/battle/area/kpa2/actor/unused_bowser.c b/src/battle/area/kpa2/actor/unused_bowser.c index 0b0772c596..8fe35737ac 100644 --- a/src/battle/area/kpa2/actor/unused_bowser.c +++ b/src/battle/area/kpa2/actor/unused_bowser.c @@ -293,7 +293,7 @@ EvtScript N(EVS_Attack_ClawSwipe) = { EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Swipe) EVT_WAIT(3) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -315,7 +315,7 @@ EvtScript N(EVS_Attack_ClawSwipe) = { EVT_END_SWITCH EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_DamageMultiplier, LVar0) EVT_MUL(LVar0, DMG_CLAW_SWIPE) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -356,7 +356,7 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_PreJump) EVT_WAIT(3) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Jump) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -400,7 +400,7 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Land) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_DamageMultiplier, LVar0) EVT_MUL(LVar0, DMG_BODY_SLAM) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -458,7 +458,7 @@ EvtScript N(EVS_Attack_FireBreath) = { EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_FireBreathLoop) EVT_WAIT(30) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -478,7 +478,7 @@ EvtScript N(EVS_Attack_FireBreath) = { EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_DamageMultiplier, LVar0) EVT_MUL(LVar0, DMG_FIRE_BREATH) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_FIRE, SUPPRESS_EVENT_ALL, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_FIRE, SUPPRESS_EVENT_ALL, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -530,7 +530,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { EVT_CALL(N(FadeBackgroundLighten)) EVT_END_THREAD EVT_WAIT(8) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_EQ(HIT_RESULT_MISS) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Idle) @@ -545,7 +545,7 @@ EvtScript N(EVS_UseDrainingShockwave) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC, 0, 0, DMG_SHOCKWAVE_P, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC, 0, 0, DMG_SHOCKWAVE_P, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(FreezeBattleState, FALSE) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBowser_Idle) @@ -564,11 +564,11 @@ EvtScript N(EVS_UseDrainingShockwave) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC, 0, 0, DMG_SHOCKWAVE_P, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC, 0, 0, DMG_SHOCKWAVE_P, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(FreezeBattleState, FALSE) EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC, 0, STATUS_FLAG_POISON, DMG_SHOCKWAVE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_COSMIC, 0, STATUS_FLAG_POISON, DMG_SHOCKWAVE, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(RemovePlayerBuffs, PLAYER_BUFF_JUMP_CHARGE | PLAYER_BUFF_HAMMER_CHARGE | PLAYER_BUFF_STONE | PLAYER_BUFF_HUSTLE | PLAYER_BUFF_STATIC | PLAYER_BUFF_TRANSPARENT | PLAYER_BUFF_CLOUD_NINE | PLAYER_BUFF_TURBO_CHARGE | PLAYER_BUFF_WATER_BLOCK | PLAYER_BUFF_PARTNER_GLOWING | 0xFFEFC04) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/area/kpa4/actor/bombshell_bill.c b/src/battle/area/kpa4/actor/bombshell_bill.c index 15261c19e0..2c397efbcf 100644 --- a/src/battle/area/kpa4/actor/bombshell_bill.c +++ b/src/battle/area/kpa4/actor/bombshell_bill.c @@ -253,7 +253,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, -2, 0) EVT_WAIT(15) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_19) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 6, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 6, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -288,7 +288,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_EXEC_WAIT(N(EVS_MakeExplosionFX)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, DMG_IMPACT, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, DMG_IMPACT, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(YieldTurn) EVT_SET_CONST(LVar0, PRT_MAIN) diff --git a/src/battle/area/kzn2/actor/lava_bud.c b/src/battle/area/kzn2/actor/lava_bud.c index 3ce4d6a0f3..2e0ec245a5 100644 --- a/src/battle/area/kzn2/actor/lava_bud.c +++ b/src/battle/area/kzn2/actor/lava_bud.c @@ -431,7 +431,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_ELSE EVT_SET(LVar0, ACTOR_BUD_2) EVT_END_IF - EVT_CALL(PlaySoundAtActor, LVar0, SOUND_20BF) + EVT_CALL(PlaySoundAtActor, LVar0, SOUND_LAVA_BUD_RECOVER) EVT_EXEC_WAIT(A(lava_piranha_EVS_Ignite)) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Bud_WhichVine, LVar0) EVT_LOAD_BUD_ANIM(LVar0, VINE_ANIM_BUD_RECOVER) @@ -524,7 +524,7 @@ EvtScript N(EVS_Move_SummonPetit) = { EVT_CALL(SetActorPos, LVar5, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) EVT_SUB(LVar1, 15) - EVT_CALL(PlaySoundAtActor, LVar5, SOUND_03C9) + EVT_CALL(PlaySoundAtActor, LVar5, SOUND_LAVA_BUD_SPIT_PETIT) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Bud_WhichVine, LVar9) EVT_IF_EQ(LVar9, VINE_1) EVT_CALL(GetActorPos, LVar5, LVar0, LVar1, LVar2) @@ -597,7 +597,7 @@ EvtScript N(EVS_Death) = { EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_FIREY, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_TARGET, ACTOR_EVENT_FLAG_FIREY, FALSE) EVT_WAIT(29) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C7) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LAVA_BUD_WITHER) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Bud_WhichVine, LVar0) EVT_LOAD_BUD_ANIM(LVar0, VINE_ANIM_BUD_STUN) EVT_EXEC_WAIT(N(EVS_PlayAnimForVine)) @@ -618,7 +618,7 @@ EvtScript N(EVS_Death) = { EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Common_UnkAnim1, ANIM_LavaBud_Anim0F) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Common_UnkAnim2, ANIM_LavaBud_Anim09) EVT_WAIT(29) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C7) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LAVA_BUD_WITHER) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Bud_WhichVine, LVar0) EVT_LOAD_BUD_ANIM(LVar0, VINE_ANIM_BUD_STUN) EVT_EXEC_WAIT(N(EVS_PlayAnimForVine)) @@ -749,7 +749,7 @@ EvtScript N(EVS_Hit) = { EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_FIREY, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_TARGET, ACTOR_EVENT_FLAG_FIREY, FALSE) EVT_WAIT(29) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C7) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LAVA_BUD_WITHER) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Bud_WhichVine, LVar0) EVT_LOAD_BUD_ANIM(LVar0, VINE_ANIM_BUD_STUN) EVT_EXEC_WAIT(N(EVS_PlayAnimForVine)) @@ -846,10 +846,10 @@ EvtScript N(EVS_Attack_SpitPetit) = { EVT_CALL(SetGoalPos, LVar5, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, LVar5, EVT_FLOAT(6.0)) EVT_CALL(SetActorJumpGravity, LVar5, EVT_FLOAT(1.8)) - EVT_CALL(PlaySoundAtActor, LVar5, SOUND_03CB) + EVT_CALL(PlaySoundAtActor, LVar5, SOUND_PETIT_PIRANHA_DIVE) EVT_CALL(SetTargetActor, LVar5, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, LVar5) - EVT_CALL(EnemyTestTarget, LVar5, LVar9, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, LVar5, LVar9, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar9) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -877,7 +877,7 @@ EvtScript N(EVS_Attack_SpitPetit) = { EVT_CALL(SetGoalToTarget, LVar5) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar9, DAMAGE_TYPE_FIRE, SUPPRESS_EVENT_ALL, 0, DMG_PETIT_SPIT, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar9, DAMAGE_TYPE_FIRE, SUPPRESS_EVENT_ALL, 0, DMG_PETIT_SPIT, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar9) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) diff --git a/src/battle/area/kzn2/actor/lava_piranha.c b/src/battle/area/kzn2/actor/lava_piranha.c index e235fe8dbb..562f595e0d 100644 --- a/src/battle/area/kzn2/actor/lava_piranha.c +++ b/src/battle/area/kzn2/actor/lava_piranha.c @@ -1153,7 +1153,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_END_LOOP EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03BB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LAVA_PIRANHA_RECOVER) EVT_SET(LVar0, ACTOR_BOSS) EVT_EXEC_WAIT(N(EVS_Ignite)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaPiranha_Anim04) @@ -1202,7 +1202,7 @@ EvtScript N(EVS_Attack_SpitFire) = { EVT_WAIT(14) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaPiranha_Anim05) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LAVA_PIRANHA_INHALE) EVT_WAIT(45) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaPiranha_Anim06) EVT_CALL(GetPartOffset, ACTOR_SELF, PRT_MAIN, LVar0, LVar1, LVar2) @@ -1213,14 +1213,14 @@ EvtScript N(EVS_Attack_SpitFire) = { EVT_SUB(LVar3, 40) EVT_SET(LVar4, -10) EVT_PLAY_EFFECT(EFFECT_63, 1, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 20, 20, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C3) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LAVA_PIRANHA_SPIT_FIRE) EVT_WAIT(19) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_PLAY_EFFECT(EFFECT_EMBERS, 0, LVar3, 0, LVar5, 50, 50, EVT_FLOAT(1.0), 40, 55, EVT_FLOAT(1.0), EVT_FLOAT(1.0), 0) EVT_CALL(OverrideBattleDmaDest, VINE_0_BASE) EVT_CALL(LoadBattleDmaData, VINE_ANIM_BOSS_POST_ATTACK) EVT_CALL(PlayModelAnimation, VINE_0, VINE_0_BASE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_FIRE, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_FIRE, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1241,7 +1241,7 @@ EvtScript N(EVS_Attack_SpitFire) = { EVT_END_SWITCH EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_FIRE, SUPPRESS_EVENT_ALL, 0, DMG_SPIT_FIRE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_FIRE, SUPPRESS_EVENT_ALL, 0, DMG_SPIT_FIRE, BS_FLAGS1_TRIGGER_EVENTS) EVT_SET(LVarF, LVar0) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -1284,7 +1284,7 @@ EvtScript N(EVS_Attack_FireBreath) = { EVT_WAIT(14) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaPiranha_Anim0E) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LAVA_PIRANHA_INHALE) EVT_WAIT(45) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaPiranha_Anim08) EVT_CALL(GetPartOffset, ACTOR_SELF, PRT_MAIN, LVar0, LVar1, LVar2) @@ -1293,13 +1293,13 @@ EvtScript N(EVS_Attack_FireBreath) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_PLAY_EFFECT(EFFECT_63, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 16, 40, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LAVA_PIRANHA_FIRE_BREATH) EVT_WAIT(15) EVT_THREAD EVT_WAIT(24) EVT_PLAY_EFFECT(EFFECT_EMBERS, 0, LVar3, 0, LVar5, 50, 50, EVT_FLOAT(1.0), 40, 55, EVT_FLOAT(1.0), EVT_FLOAT(1.0), 0) EVT_END_THREAD - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_FIRE, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_FIRE, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1325,7 +1325,7 @@ EvtScript N(EVS_Attack_FireBreath) = { EVT_END_SWITCH EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_FIRE, SUPPRESS_EVENT_ALL, 0, DMG_FIRE_BREATH, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_FIRE, SUPPRESS_EVENT_ALL, 0, DMG_FIRE_BREATH, BS_FLAGS1_TRIGGER_EVENTS) EVT_WAIT(20) EVT_CALL(OverrideBattleDmaDest, VINE_0_BASE) EVT_CALL(LoadBattleDmaData, VINE_ANIM_BOSS_POST_ATTACK) @@ -1448,7 +1448,7 @@ EvtScript N(EVS_Death) = { EVT_CALL(LoadBattleDmaData, VINE_ANIM_BOSS_DEATH_MIDDLE) EVT_CALL(PlayModelAnimation, VINE_0, VINE_0_BASE) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C6) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LAVA_PIRANHA_DEFEAT) EVT_WAIT(35) EVT_SET(LVar0, 0) EVT_SET(LVar1, 0) @@ -1641,7 +1641,7 @@ EvtScript N(EVS_Death) = { EVT_CALL(EnableModel, MODEL_h08, TRUE) EVT_CALL(EnableModel, MODEL_h10, TRUE) EVT_CALL(EnableModel, MODEL_h11, TRUE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LAVA_PIRANHA_EMERGE) EVT_PLAY_EFFECT(EFFECT_EMBERS, 0, 100, 0, 0, 70, 80, EVT_FLOAT(2.5), 80, 55, EVT_FLOAT(2.0), EVT_FLOAT(2.0), 0) EVT_CALL(LoadAnimatedModel, SHATTER_GROUND, EVT_PTR(N(anim1))) EVT_CALL(PlayModelAnimation, SHATTER_GROUND, EVT_PTR(N(anim1_8021A364))) @@ -1712,7 +1712,7 @@ EvtScript N(EVS_Death) = { EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 216) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03CC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LAVA_PIRANHA_WRITHE) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Common_PiranhaState, LVar0) EVT_IF_EQ(LVar0, PIRANHA_STATE_STUNNED) EVT_CALL(OverrideBattleDmaDest, VINE_0_BASE) @@ -1733,7 +1733,7 @@ EvtScript N(EVS_Death) = { EVT_PLAY_EFFECT(EFFECT_EMBERS, 0, 105, 60, 2, 80, 60, EVT_FLOAT(1.8), 90, 100, EVT_FLOAT(1.5), EVT_FLOAT(1.5), 0) EVT_END_IF EVT_WAIT(121) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03CD) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LAVA_PIRANHA_COLLAPSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaPiranha_Anim0A) EVT_CALL(OverrideBattleDmaDest, VINE_0_BASE) EVT_CALL(LoadBattleDmaData, VINE_ANIM_BOSS_DEATH_COLLAPSE) @@ -1832,7 +1832,7 @@ EvtScript N(EVS_Death) = { EVT_END_LOOP EVT_END_THREAD EVT_WAIT(212) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaPiranha_Anim0F) EVT_CALL(SetAnimation, ACTOR_BUD_1, PRT_MAIN, ANIM_LavaBud_Anim0F) EVT_CALL(SetAnimation, ACTOR_BUD_2, PRT_MAIN, ANIM_LavaBud_Anim0F) @@ -2104,7 +2104,7 @@ EvtScript N(EVS_Hit_Inner) = { EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_FIREY, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_TARGET, ACTOR_EVENT_FLAG_FIREY, FALSE) EVT_WAIT(29) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03C8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LAVA_PIRANHA_WITHER) EVT_CALL(OverrideBattleDmaDest, VINE_0_BASE) EVT_CALL(LoadBattleDmaData, VINE_ANIM_BOSS_STUN) EVT_CALL(PlayModelAnimation, VINE_0, VINE_0_BASE) diff --git a/src/battle/area/kzn2/actor/petit_piranha.c b/src/battle/area/kzn2/actor/petit_piranha.c index 6f2e7e0191..8106badff5 100644 --- a/src/battle/area/kzn2/actor/petit_piranha.c +++ b/src/battle/area/kzn2/actor/petit_piranha.c @@ -284,7 +284,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_PetitPiranha_Anim03) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(2.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03CA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PETIT_PIRANHA_ASCEND) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -293,7 +293,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_END_IF EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03CB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PETIT_PIRANHA_DIVE) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -336,7 +336,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar9, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar9, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar9) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -364,7 +364,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(2) EVT_SET(LVar8, DMG_IMPACT) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar9, DAMAGE_TYPE_FIRE, SUPPRESS_EVENT_ALL, 0, LVar8, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar9, DAMAGE_TYPE_FIRE, SUPPRESS_EVENT_ALL, 0, LVar8, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar9) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) diff --git a/src/battle/area/mac/actor/chan.c b/src/battle/area/mac/actor/chan.c index caaa58f409..39769b1204 100644 --- a/src/battle/area/mac/actor/chan.c +++ b/src/battle/area/mac/actor/chan.c @@ -613,7 +613,7 @@ EvtScript N(EVS_TakeTurn_Ceiling) = { EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_END_IF - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, DMG_CEILING_DROP, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, DMG_CEILING_DROP, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -673,7 +673,7 @@ EvtScript N(EVS_TakeTurn_Ceiling) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_CEILING_DROP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_CEILING_DROP, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -754,12 +754,12 @@ EvtScript N(EVS_TakeTurn_Ground) = { EVT_WAIT(5) EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Chan_ShellSpin) EVT_WAIT(20) 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_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_TOSS) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -808,7 +808,7 @@ EvtScript N(EVS_TakeTurn_Ground) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(14.0)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_SHELL_TOSS, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_SHELL_TOSS, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -916,7 +916,7 @@ EvtScript N(EVS_HandleEvent_Initial) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_CALL(GetBattleFlags, LVar0) - EVT_IF_NOT_FLAG(LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_IF_NOT_FLAG(LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_BREAK_SWITCH EVT_END_IF EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) diff --git a/src/battle/area/mac/actor/lee.c b/src/battle/area/mac/actor/lee.c index 730023a558..fe175e443f 100644 --- a/src/battle/area/mac/actor/lee.c +++ b/src/battle/area/mac/actor/lee.c @@ -359,7 +359,7 @@ EvtScript N(EVS_Attack_FlyingTackle) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Lee_Crouch) EVT_WAIT(20) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_DUPLIGHOST_LEAP, 0) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -403,7 +403,7 @@ EvtScript N(EVS_Attack_FlyingTackle) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 12, FALSE, TRUE, FALSE) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_FLYING_LEAP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_FLYING_LEAP, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -607,7 +607,7 @@ EvtScript N(EVS_Move_CopyPartner) = { EVT_WAIT(15) EVT_CALL(ActorSpeak, MSG_MAC_Gate_0027, ACTOR_SELF, PRT_MAIN, ANIM_Lee_Talk, ANIM_Lee_Walk) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GHOST_TRANSFORM) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Lee_RaisedArmsTalk) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) diff --git a/src/battle/area/mac/actor/lee_bombette.inc.c b/src/battle/area/mac/actor/lee_bombette.inc.c index eaef0fd181..c215715bd9 100644 --- a/src/battle/area/mac/actor/lee_bombette.inc.c +++ b/src/battle/area/mac/actor/lee_bombette.inc.c @@ -222,8 +222,8 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBombette_Brace) EVT_WAIT(15) 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_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOMBETTE_BODY_SLAM) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -272,13 +272,13 @@ EvtScript N(EVS_TakeTurn) = { EVT_SWITCH(LVar9) EVT_CASE_EQ(PARTNER_RANK_NORMAL) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_SUPER) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 3, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_ULTRA) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/area/mac/actor/lee_bow.inc.c b/src/battle/area/mac/actor/lee_bow.inc.c index a6ddbc7833..4d896b6571 100644 --- a/src/battle/area/mac/actor/lee_bow.inc.c +++ b/src/battle/area/mac/actor/lee_bow.inc.c @@ -279,7 +279,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(10) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_WAIT(15) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -345,7 +345,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_END_SWITCH EVT_SET(LVar7, LVar8) EVT_LOOP(LVar7) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2019) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOW_SMACK) EVT_ADD(LVarA, 1) EVT_CALL(SetPartScale, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.4), EVT_FLOAT(1.4), EVT_FLOAT(1.0)) EVT_IF_EQ(LFlag0, FALSE) @@ -377,13 +377,13 @@ EvtScript N(EVS_TakeTurn) = { EVT_SWITCH(LVar9) EVT_CASE_EQ(PARTNER_RANK_NORMAL) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_CASE_EQ(PARTNER_RANK_SUPER) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_CASE_EQ(PARTNER_RANK_ULTRA) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_END_SWITCH EVT_WAIT(8) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBow_Idle) diff --git a/src/battle/area/mac/actor/lee_goombario.inc.c b/src/battle/area/mac/actor/lee_goombario.inc.c index 993e3f8184..fad74c8502 100644 --- a/src/battle/area/mac/actor/lee_goombario.inc.c +++ b/src/battle/area/mac/actor/lee_goombario.inc.c @@ -328,7 +328,7 @@ EvtScript N(EVS_Attack_Headbonk) = { 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(N(UnkFunc62), LVarA, 0) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -361,11 +361,11 @@ EvtScript N(EVS_Attack_Headbonk) = { EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Copy_PartnerLevel, LVar9) EVT_SWITCH(LVar9) EVT_CASE_EQ(PARTNER_RANK_NORMAL) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_CASE_EQ(PARTNER_RANK_SUPER) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_10) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_CASE_EQ(PARTNER_RANK_ULTRA) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 3, BS_FLAGS1_10) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_END_SWITCH EVT_CALL(GetActorHP, ACTOR_PLAYER, LVar0) EVT_IF_EQ(LVar0, 0) @@ -439,11 +439,11 @@ EvtScript N(EVS_Attack_Headbonk) = { EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Copy_PartnerLevel, LVar9) EVT_SWITCH(LVar9) EVT_CASE_EQ(PARTNER_RANK_NORMAL) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_SUPER) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_ULTRA) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 3, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_LABEL(100) EVT_SWITCH(LVar0) diff --git a/src/battle/area/mac/actor/lee_kooper.inc.c b/src/battle/area/mac/actor/lee_kooper.inc.c index 0b133def6f..d5225df4ee 100644 --- a/src/battle/area/mac/actor/lee_kooper.inc.c +++ b/src/battle/area/mac/actor/lee_kooper.inc.c @@ -348,7 +348,7 @@ EvtScript N(EVS_TakeTurn) = { 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) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_KOOPER_SHELL_SPINUP) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 75) @@ -393,14 +393,14 @@ EvtScript N(EVS_TakeTurn) = { EVT_END_SWITCH EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_200A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAKARRY_AIR_RAID_1) 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) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -455,13 +455,13 @@ EvtScript N(EVS_TakeTurn) = { EVT_SWITCH(LVar9) EVT_CASE_EQ(PARTNER_RANK_NORMAL) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 2, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_SUPER) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 3, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_ULTRA) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 5, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/area/mac/actor/lee_lakilester.inc.c b/src/battle/area/mac/actor/lee_lakilester.inc.c index d869080fbd..c9893dc00a 100644 --- a/src/battle/area/mac/actor/lee_lakilester.inc.c +++ b/src/battle/area/mac/actor/lee_lakilester.inc.c @@ -276,7 +276,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_SETF(LVar3, EVT_FLOAT(1.0)) EVT_END_IF EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 0, LVar0, LVar1, LVar2, LVar3, 30, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LAKILESTER_SUMMON_SPINY) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPIKE_SUMMON_SPINY) EVT_THREAD EVT_LOOP(15) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 1, 0, 0) @@ -298,8 +298,8 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleLakilester_ThrowSpiny) EVT_WAIT(3) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_SPINY, ACTOR_SOUND_JUMP, SOUND_NONE, SOUND_NONE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_201B) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LAKILESTER_THROW_SPINY_A) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -345,13 +345,13 @@ EvtScript N(EVS_TakeTurn) = { EVT_SWITCH(LVar9) EVT_CASE_EQ(PARTNER_RANK_NORMAL) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 3, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_SUPER) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 4, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_ULTRA) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 5, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/area/mac/actor/lee_parakarry.inc.c b/src/battle/area/mac/actor/lee_parakarry.inc.c index 52b6d57250..8aac3e5f44 100644 --- a/src/battle/area/mac/actor/lee_parakarry.inc.c +++ b/src/battle/area/mac/actor/lee_parakarry.inc.c @@ -241,7 +241,7 @@ EvtScript N(EVS_Attack_SkyDive) = { EVT_WAIT(3) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_01) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2004) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAKARRY_PREDIVE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_FlyFast) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 10, 0) EVT_CALL(FlyToGoal, ACTOR_SELF, 5, 0, EASING_LINEAR) @@ -252,12 +252,12 @@ EvtScript N(EVS_Attack_SkyDive) = { EVT_END_THREAD EVT_CALL(AddGoalPos, ACTOR_SELF, 40, 15, 0) EVT_CALL(FlyToGoal, ACTOR_SELF, 20, -20, EASING_QUARTIC_OUT) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2005) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAKARRY_DIVE) EVT_CALL(EnableActorBlur, ACTOR_SELF, ACTOR_BLUR_ENABLE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Dive) EVT_CALL(FlyToGoal, ACTOR_SELF, 5, 0, EASING_LINEAR) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -293,13 +293,13 @@ EvtScript N(EVS_Attack_SkyDive) = { EVT_SWITCH(LVar9) EVT_CASE_EQ(PARTNER_RANK_NORMAL) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_SUPER) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 3, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_ULTRA) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_CALL(PlaySound, SOUND_NONE) EVT_SWITCH(LVar0) diff --git a/src/battle/area/mac/actor/lee_sushie.inc.c b/src/battle/area/mac/actor/lee_sushie.inc.c index 6d2e77336c..0dad631d92 100644 --- a/src/battle/area/mac/actor/lee_sushie.inc.c +++ b/src/battle/area/mac/actor/lee_sushie.inc.c @@ -236,7 +236,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(15) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Tense2) EVT_WAIT(15) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -403,13 +403,13 @@ EvtScript N(EVS_TakeTurn) = { EVT_SWITCH(LVarA) EVT_CASE_EQ(PARTNER_RANK_NORMAL) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 3, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_SUPER) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 4, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_ULTRA) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/area/mac/actor/lee_watt.inc.c b/src/battle/area/mac/actor/lee_watt.inc.c index ae3f76ed94..cf99d9eb41 100644 --- a/src/battle/area/mac/actor/lee_watt.inc.c +++ b/src/battle/area/mac/actor/lee_watt.inc.c @@ -360,7 +360,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleWatt_Strain) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(FlyToGoal, ACTOR_SELF, 5, 0, EASING_COS_IN_OUT) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -393,7 +393,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(AddBattleCamZoom, -75) EVT_CALL(MoveBattleCamOver, LVarA) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0289) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_WATT_CHARGE) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -427,13 +427,13 @@ EvtScript N(EVS_TakeTurn) = { EVT_SWITCH(LVar9) EVT_CASE_EQ(PARTNER_RANK_NORMAL) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE, SUPPRESS_EVENT_ALL, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE, SUPPRESS_EVENT_ALL, 0, 3, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_SUPER) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE, SUPPRESS_EVENT_ALL, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE, SUPPRESS_EVENT_ALL, 0, 4, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_ULTRA) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE, SUPPRESS_EVENT_ALL, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE, SUPPRESS_EVENT_ALL, 0, 5, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/area/mac/actor/master1.c b/src/battle/area/mac/actor/master1.c index 2ed714c9b9..3b7a4533d5 100644 --- a/src/battle/area/mac/actor/master1.c +++ b/src/battle/area/mac/actor/master1.c @@ -245,9 +245,9 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_Idle) EVT_WAIT(10) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_FLUTTER) EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_FLUTTER) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_WindupLoop) EVT_WAIT(10) @@ -258,7 +258,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 8, TRUE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -287,9 +287,9 @@ EvtScript N(EVS_TakeTurn) = { EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_SMACK) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_STRIKE, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_STRIKE, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -366,7 +366,7 @@ EvtScript N(EVS_HandleEvent) = { EVT_RETURN EVT_END_IF EVT_CALL(GetBattleFlags, LVar0) - EVT_IF_FLAG(LVar0, BS_FLAGS1_40 | BS_FLAGS1_200) + EVT_IF_FLAG(LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT) EVT_CALL(GetLastDamage, ACTOR_SELF, LVar0) EVT_IF_GT(LVar0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_WasHit, TRUE) diff --git a/src/battle/area/mac/actor/master2.c b/src/battle/area/mac/actor/master2.c index af41c4d43d..f939236c60 100644 --- a/src/battle/area/mac/actor/master2.c +++ b/src/battle/area/mac/actor/master2.c @@ -264,9 +264,9 @@ EvtScript N(EVS_Attack_StrikeOnce) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedPunch) EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedKick) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BC) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_10) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_KICK) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_FLUTTER) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -295,15 +295,15 @@ EvtScript N(EVS_Attack_StrikeOnce) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0) EVT_CALL(RunToGoal, ACTOR_SELF, 5, FALSE) EVT_CALL(EnableActorBlur, ACTOR_SELF, ACTOR_BLUR_DISABLE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_SMACK) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_FLUTTER) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_STRIKE_ONCE, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_STRIKE_ONCE, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_FLUTTER) EVT_THREAD EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 20, 0) EVT_SET(LVar0, 0) @@ -361,9 +361,9 @@ EvtScript N(EVS_Attack_StrikeTwice) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 1) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03B9) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_10) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_LEAP) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_FLUTTER) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -402,10 +402,10 @@ EvtScript N(EVS_Attack_StrikeTwice) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_SMACK) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_FLUTTER) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_STRIKE_TWICE_1, BS_FLAGS1_10) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_STRIKE_TWICE_1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_THREAD @@ -423,17 +423,17 @@ EvtScript N(EVS_Attack_StrikeTwice) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) EVT_END_THREAD EVT_WAIT(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_SMACK) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_FLUTTER) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_STRIKE_TWICE_2, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_STRIKE_TWICE_2, BS_FLAGS1_TRIGGER_EVENTS) EVT_WAIT(15) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_FLIP) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_FLUTTER) EVT_THREAD EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 10, 0) EVT_SET(LVar0, 0) @@ -511,7 +511,7 @@ EvtScript N(EVS_HandlePhase) = { EVT_WAIT(15) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_OpenMouth) EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GHOST_TRANSFORM) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0) @@ -593,7 +593,7 @@ EvtScript N(EVS_HandleEvent) = { EVT_RETURN EVT_END_IF EVT_CALL(GetBattleFlags, LVar0) - EVT_IF_FLAG(LVar0, BS_FLAGS1_40 | BS_FLAGS1_200) + EVT_IF_FLAG(LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT) EVT_CALL(GetLastDamage, ACTOR_SELF, LVar0) EVT_IF_GT(LVar0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_WasHit, TRUE) diff --git a/src/battle/area/mac/actor/master3.c b/src/battle/area/mac/actor/master3.c index 1262a36a15..29c1fa1d98 100644 --- a/src/battle/area/mac/actor/master3.c +++ b/src/battle/area/mac/actor/master3.c @@ -296,9 +296,9 @@ EvtScript N(EVS_Attack_StrikeOnce) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedPunch) EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_AscendedKick) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BC) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_10) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_KICK) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_FLUTTER) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -327,15 +327,15 @@ EvtScript N(EVS_Attack_StrikeOnce) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 0, 0) EVT_CALL(RunToGoal, ACTOR_SELF, 5, FALSE) EVT_CALL(EnableActorBlur, ACTOR_SELF, ACTOR_BLUR_DISABLE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_SMACK) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_FLUTTER) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_STRIKE_ONCE, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_STRIKE_ONCE, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_FLUTTER) EVT_THREAD EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 20, 0) EVT_SET(LVar0, 0) @@ -393,9 +393,9 @@ EvtScript N(EVS_Attack_StrikeTwice) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 1) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03B9) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_10) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_LEAP) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_FLUTTER) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -434,10 +434,10 @@ EvtScript N(EVS_Attack_StrikeTwice) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_SMACK) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_FLUTTER) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_STRIKE_TWICE_1, BS_FLAGS1_10) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_STRIKE_TWICE_1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_THREAD @@ -455,17 +455,17 @@ EvtScript N(EVS_Attack_StrikeTwice) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) EVT_END_THREAD EVT_WAIT(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_SMACK) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_FLUTTER) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_STRIKE_TWICE_2, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_STRIKE_TWICE_2, BS_FLAGS1_TRIGGER_EVENTS) EVT_WAIT(15) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_FLIP) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_FLUTTER) EVT_THREAD EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 10, 0) EVT_SET(LVar0, 0) @@ -524,9 +524,9 @@ EvtScript N(EVS_Attack_StrikeThrice) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 1) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03B9) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_10) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_LEAP) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_FLUTTER) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 0, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -565,10 +565,10 @@ EvtScript N(EVS_Attack_StrikeThrice) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(1.0)) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_SMACK) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_FLUTTER) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_STRIKE_THRICE_1, BS_FLAGS1_10) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_STRIKE_THRICE_1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_THREAD @@ -587,8 +587,8 @@ EvtScript N(EVS_Attack_StrikeThrice) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) EVT_END_THREAD EVT_WAIT(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03ED) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_SMACK) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_FLUTTER) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_STRIKE_THRICE_2, 0) EVT_THREAD @@ -645,17 +645,17 @@ EvtScript N(EVS_Attack_StrikeThrice) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_PUNCH) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_FLUTTER) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_STRIKE_THRICE_3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_STRIKE_THRICE_3, BS_FLAGS1_TRIGGER_EVENTS) EVT_WAIT(15) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_FLIP) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MASTER_FLUTTER) EVT_THREAD EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 10, 0) EVT_SET(LVar0, 0) @@ -790,7 +790,7 @@ EvtScript N(EVS_Attack_SpiritStrike) = { EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_SPIRIT, LVar0, LVar1, LVar2, 10, TRUE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_SPIRIT, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SPIRIT_STRIKE, BS_FLAGS1_10) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SPIRIT_STRIKE, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -825,7 +825,7 @@ EvtScript N(EVS_Attack_FlyingGrab) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 30, 0, EASING_LINEAR) EVT_WAIT(10000) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_FLYING_GRAB, BS_FLAGS1_10) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_FLYING_GRAB, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -902,7 +902,7 @@ EvtScript N(EVS_HandlePhase) = { EVT_WAIT(15) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_TheMaster_OpenMouth) EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GHOST_TRANSFORM) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0) @@ -992,7 +992,7 @@ EvtScript N(EVS_HandleEvent) = { EVT_RETURN EVT_END_IF EVT_CALL(GetBattleFlags, LVar0) - EVT_IF_FLAG(LVar0, BS_FLAGS1_40 | BS_FLAGS1_200) + EVT_IF_FLAG(LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT) EVT_CALL(GetLastDamage, ACTOR_SELF, LVar0) EVT_IF_GT(LVar0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_WasHit, TRUE) diff --git a/src/battle/area/nok/actor/kent_c_koopa.c b/src/battle/area/nok/actor/kent_c_koopa.c index 4d88b6e1cf..d36b0dcfee 100644 --- a/src/battle/area/nok/actor/kent_c_koopa.c +++ b/src/battle/area/nok/actor/kent_c_koopa.c @@ -467,13 +467,13 @@ EvtScript N(EVS_HandleEvent) = { EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_FlipResistance, LVar0) EVT_IF_EQ(LVar0, 0) EVT_CALL(GetBattleFlags, LVarD) - EVT_IF_FLAG(LVarD, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_IF_FLAG(LVarD, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_FlipResistance, 2) EVT_END_IF EVT_EXEC_WAIT(N(EVS_FlipOver)) EVT_ELSE EVT_CALL(GetBattleFlags, LVarD) - EVT_IF_FLAG(LVarD, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_IF_FLAG(LVarD, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_FlipResistance, 2) EVT_CALL(GetLastDamage, ACTOR_SELF, LVar0) EVT_IF_GT(LVar0, 0) @@ -631,15 +631,15 @@ EvtScript N(EVS_Attack_ShellToss) = { EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_THREAD EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0370) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_KENT_C_SHELL_TOSS_LOOP) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KentCKoopa_Anim0A) EVT_WAIT(10) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 3, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarB, 0, 0, 3, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarB, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarB) EVT_CASE_EQ(6) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) @@ -655,7 +655,7 @@ EvtScript N(EVS_Attack_ShellToss) = { EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) - EVT_CALL(StopSound, SOUND_0370) + EVT_CALL(StopSound, SOUND_KENT_C_SHELL_TOSS_LOOP) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KentCKoopa_Anim0C) EVT_WAIT(8) EVT_CALL(YieldTurn) @@ -721,7 +721,7 @@ EvtScript N(EVS_Attack_ShellToss) = { EVT_IF_NOT_FLAG(LVarE, STATUS_FLAG_SHRINK) EVT_CALL(SetDamageSource, DMG_SRC_CRUSH) EVT_END_IF - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, SUPPRESS_EVENT_ALL, 0, DMG_SHELL_TOSS_PLAYER, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, SUPPRESS_EVENT_ALL, 0, DMG_SHELL_TOSS_PLAYER, BS_FLAGS1_TRIGGER_EVENTS) EVT_SET(LVarA, 0) EVT_IF_NOT_FLAG(LVarE, STATUS_FLAG_SHRINK) EVT_CALL(GetBattleFlags, LVar0) @@ -743,7 +743,7 @@ EvtScript N(EVS_Attack_ShellToss) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetDamageSource, DMG_SRC_CRUSH_PARTNER) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_SHELL_TOSS_PARTNER, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_SHELL_TOSS_PARTNER, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(GetBattleFlags, LVar0) EVT_IF_NOT_FLAG(LVar0, BS_FLAGS1_ATK_BLOCKED) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -756,7 +756,7 @@ EvtScript N(EVS_Attack_ShellToss) = { EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) - EVT_CALL(StopSound, SOUND_0370) + EVT_CALL(StopSound, SOUND_KENT_C_SHELL_TOSS_LOOP) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KentCKoopa_Anim0C) EVT_WAIT(8) EVT_CALL(YieldTurn) @@ -806,7 +806,7 @@ EvtScript N(EVS_Attack_ShellToss) = { EVT_END_IF EVT_END_THREAD EVT_CALL(ResetAllActorSounds, ACTOR_SELF) - EVT_CALL(StopSound, SOUND_0370) + EVT_CALL(StopSound, SOUND_KENT_C_SHELL_TOSS_LOOP) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KentCKoopa_Anim0C) EVT_WAIT(8) EVT_CALL(YieldTurn) @@ -842,7 +842,7 @@ EvtScript N(EVS_Attack_HeavyStomp) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KentCKoopa_Anim01) EVT_WAIT(8) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LARGE_ACTOR_JUMP) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -861,7 +861,7 @@ EvtScript N(EVS_Attack_HeavyStomp) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_A) EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) @@ -873,7 +873,7 @@ EvtScript N(EVS_Attack_HeavyStomp) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 12, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_A) EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) @@ -885,7 +885,7 @@ EvtScript N(EVS_Attack_HeavyStomp) = { EVT_SUB(LVar0, 10) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_A) EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) @@ -941,7 +941,7 @@ EvtScript N(EVS_Attack_HeavyStomp) = { EVT_IF_NOT_FLAG(LVarF, STATUS_FLAG_SHRINK) EVT_CALL(SetDamageSource, DMG_SRC_CRUSH) EVT_END_IF - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, SUPPRESS_EVENT_ALL, 0, DMG_HEAVY_STOMP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, SUPPRESS_EVENT_ALL, 0, DMG_HEAVY_STOMP, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -955,7 +955,7 @@ EvtScript N(EVS_Attack_HeavyStomp) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarE) EVT_IF_NOT_FLAG(LVarE, STATUS_FLAG_SHRINK) EVT_CALL(LandJump, ACTOR_SELF) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_A) EVT_END_IF EVT_END_IF EVT_END_IF @@ -977,7 +977,7 @@ EvtScript N(EVS_Attack_HeavyStomp) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 12, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_A) EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) @@ -989,7 +989,7 @@ EvtScript N(EVS_Attack_HeavyStomp) = { EVT_ADD(LVar0, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_STEP_A) EVT_THREAD EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) @@ -1004,7 +1004,7 @@ EvtScript N(EVS_Attack_HeavyStomp) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_EXEC_WAIT(N(EVS_KentC_GoHome)) - EVT_CASE_EQ(HIT_RESULT_3) + EVT_CASE_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) diff --git a/src/battle/area/omo2/actor/general_guy.c b/src/battle/area/omo2/actor/general_guy.c index d8249472ea..7964cb062e 100644 --- a/src/battle/area/omo2/actor/general_guy.c +++ b/src/battle/area/omo2/actor/general_guy.c @@ -315,7 +315,7 @@ EvtScript N(EVS_Attack_ThrowBomb) = { EVT_CALL(MoveBattleCamOver, 30) EVT_END_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_206A) + EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_TOY_TANK_OPEN_HATCH) EVT_CALL(SetAnimation, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim0B) EVT_CALL(SetPartFlagBits, ACTOR_GENERAL, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(AS_ToyTank_OpenHatch)) @@ -338,10 +338,10 @@ EvtScript N(EVS_Attack_ThrowBomb) = { EVT_CALL(SetPartPos, ACTOR_SELF, PRT_BOMB, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_BOMB, ANIM_GeneralGuyBomb_Anim01) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_BOMB, ACTOR_PART_FLAG_INVISIBLE, FALSE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 4, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_EQ(HIT_RESULT_MISS) - EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_BOMB, SOUND_02F9) + EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_BOMB, SOUND_TOSS) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -353,12 +353,12 @@ EvtScript N(EVS_Attack_ThrowBomb) = { EVT_CALL(SetAnimation, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim02) EVT_CALL(SetPartFlagBits, ACTOR_GENERAL, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(AS_ToyTank_CloseHatch)) - EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_206B) + EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_TOY_TANK_CLOSE_HATCH) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_CASE_EQ(HIT_RESULT_LUCKY) - EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_BOMB, SOUND_02F9) + EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_BOMB, SOUND_TOSS) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -379,12 +379,12 @@ EvtScript N(EVS_Attack_ThrowBomb) = { EVT_CALL(SetAnimation, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim02) EVT_CALL(SetPartFlagBits, ACTOR_GENERAL, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(AS_ToyTank_CloseHatch)) - EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_206B) + EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_TOY_TANK_CLOSE_HATCH) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN EVT_END_SWITCH - EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_BOMB, SOUND_02F9) + EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_BOMB, SOUND_TOSS) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, PRT_BOMB, EVT_FLOAT(14.0)) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_BOMB, EVT_FLOAT(0.1)) @@ -395,7 +395,7 @@ EvtScript N(EVS_Attack_ThrowBomb) = { EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_BOMB, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_BLAST | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_BOMB_TOSS, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_BLAST | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_BOMB_TOSS, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -406,7 +406,7 @@ EvtScript N(EVS_Attack_ThrowBomb) = { EVT_CALL(SetAnimation, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim02) EVT_CALL(SetPartFlagBits, ACTOR_GENERAL, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(AS_ToyTank_CloseHatch)) - EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_206B) + EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_TOY_TANK_CLOSE_HATCH) EVT_RETURN EVT_END_IF EVT_END_CASE_GROUP @@ -414,7 +414,7 @@ EvtScript N(EVS_Attack_ThrowBomb) = { EVT_CALL(SetAnimation, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim02) EVT_CALL(SetPartFlagBits, ACTOR_GENERAL, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(AS_ToyTank_CloseHatch)) - EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_206B) + EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_TOY_TANK_CLOSE_HATCH) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -433,7 +433,7 @@ EvtScript N(EVS_Attack_ShootLightning) = { EVT_CALL(SetBattleCamOffsetZ, 30) EVT_CALL(MoveBattleCamOver, 40) EVT_WAIT(40) - EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_206A) + EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_TOY_TANK_OPEN_HATCH) EVT_CALL(SetAnimation, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim0B) EVT_CALL(SetPartFlagBits, ACTOR_GENERAL, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(AS_ToyTank_OpenHatch)) @@ -461,28 +461,28 @@ EvtScript N(EVS_Attack_ShootLightning) = { EVT_END_THREAD EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 40, 0) EVT_WAIT(40) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT, 0, 5, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_EQ(HIT_RESULT_MISS) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetModelCenter, MODEL_kyu3) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, 0, LVar5) - EVT_CALL(PlaySound, SOUND_2069) + EVT_CALL(PlaySound, SOUND_TANK_BULB_FIRE) EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 18, 0) EVT_WAIT(12) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT, 0, 2, BS_FLAGS1_TRIGGER_EVENTS) EVT_IF_NE(LVar0, HIT_RESULT_MISS) EVT_CALL(GetModelCenter, MODEL_kyu3) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, LVar4, LVar5) - EVT_CALL(PlaySound, SOUND_2069) + EVT_CALL(PlaySound, SOUND_TANK_BULB_FIRE) EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 18, 0) EVT_CALL(SetActorVar, ACTOR_TANK, AVAR_Tank_UsingBulbAttack, FALSE) EVT_WAIT(12) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_LIGHTNING_PARTNER, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_LIGHTNING_PARTNER, BS_FLAGS1_TRIGGER_EVENTS) EVT_ELSE EVT_CALL(SetActorVar, ACTOR_TANK, AVAR_Tank_UsingBulbAttack, FALSE) EVT_WAIT(20) @@ -495,7 +495,7 @@ EvtScript N(EVS_Attack_ShootLightning) = { EVT_CALL(SetAnimation, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim02) EVT_CALL(SetPartFlagBits, ACTOR_GENERAL, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(AS_ToyTank_CloseHatch)) - EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_206B) + EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_TOY_TANK_CLOSE_HATCH) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -504,7 +504,7 @@ EvtScript N(EVS_Attack_ShootLightning) = { EVT_CALL(GetModelCenter, MODEL_kyu3) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, 0, LVar5) - EVT_CALL(PlaySound, SOUND_2069) + EVT_CALL(PlaySound, SOUND_TANK_BULB_FIRE) EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 18, 0) EVT_WAIT(12) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -512,7 +512,7 @@ EvtScript N(EVS_Attack_ShootLightning) = { EVT_CALL(GetModelCenter, MODEL_kyu3) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, 0, LVar5) - EVT_CALL(PlaySound, SOUND_2069) + EVT_CALL(PlaySound, SOUND_TANK_BULB_FIRE) EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 18, 0) EVT_CALL(SetActorVar, ACTOR_TANK, AVAR_Tank_UsingBulbAttack, FALSE) EVT_WAIT(12) @@ -524,7 +524,7 @@ EvtScript N(EVS_Attack_ShootLightning) = { EVT_CALL(SetAnimation, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim02) EVT_CALL(SetPartFlagBits, ACTOR_GENERAL, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(AS_ToyTank_CloseHatch)) - EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_206B) + EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_TOY_TANK_CLOSE_HATCH) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -533,11 +533,11 @@ EvtScript N(EVS_Attack_ShootLightning) = { EVT_CALL(GetModelCenter, MODEL_kyu3) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, LVar4, LVar5) - EVT_CALL(PlaySound, SOUND_2069) + EVT_CALL(PlaySound, SOUND_TANK_BULB_FIRE) EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 18, 0) EVT_WAIT(12) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_LIGHTNING_PLAYER, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_LIGHTNING_PLAYER, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -549,7 +549,7 @@ EvtScript N(EVS_Attack_ShootLightning) = { EVT_CALL(SetAnimation, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim02) EVT_CALL(SetPartFlagBits, ACTOR_GENERAL, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(AS_ToyTank_CloseHatch)) - EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_206B) + EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_TOY_TANK_CLOSE_HATCH) EVT_RETURN EVT_END_IF EVT_END_CASE_GROUP @@ -558,12 +558,12 @@ EvtScript N(EVS_Attack_ShootLightning) = { EVT_CALL(GetModelCenter, MODEL_kyu3) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar3, LVar4, LVar5) - EVT_CALL(PlaySound, SOUND_2069) + EVT_CALL(PlaySound, SOUND_TANK_BULB_FIRE) EVT_PLAY_EFFECT(EFFECT_LIGHTNING_BOLT, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0), 18, 0) EVT_CALL(SetActorVar, ACTOR_TANK, AVAR_Tank_UsingBulbAttack, FALSE) EVT_WAIT(12) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_LIGHTNING_PARTNER, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_LIGHTNING_PARTNER, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(GetActorVar, ACTOR_TANK, AVAR_Tank_ModulateDarkness, LVar0) EVT_IF_TRUE(LVar0) EVT_CALL(SetDarknessMode, BTL_DARKNESS_MODE_3) @@ -572,7 +572,7 @@ EvtScript N(EVS_Attack_ShootLightning) = { EVT_CALL(SetAnimation, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim02) EVT_CALL(SetPartFlagBits, ACTOR_GENERAL, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(AS_ToyTank_CloseHatch)) - EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_206B) + EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_TOY_TANK_CLOSE_HATCH) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN diff --git a/src/battle/area/omo2/actor/light_bulb.c b/src/battle/area/omo2/actor/light_bulb.c index 4766bc5fa8..a9a0914947 100644 --- a/src/battle/area/omo2/actor/light_bulb.c +++ b/src/battle/area/omo2/actor/light_bulb.c @@ -320,7 +320,7 @@ API_CALLABLE(N(SpawnShatterFX)) { } EvtScript N(EVS_Death) = { - EVT_CALL(PlaySoundAtActor, ACTOR_BULB, SOUND_03AE) + EVT_CALL(PlaySoundAtActor, ACTOR_BULB, SOUND_TANK_BULB_SHATTER) EVT_CALL(N(SpawnShatterFX)) EVT_CALL(EnableModel, MODEL_kyu3, FALSE) EVT_CALL(EnableModel, MODEL_kyu1, FALSE) diff --git a/src/battle/area/omo2/actor/toy_tank.c b/src/battle/area/omo2/actor/toy_tank.c index 01b240c84c..0e157afc95 100644 --- a/src/battle/area/omo2/actor/toy_tank.c +++ b/src/battle/area/omo2/actor/toy_tank.c @@ -249,7 +249,7 @@ EvtScript N(EVS_HandleEvent) = { EVT_CALL(SetEnemyTargetOffset, ACTOR_SELF, PRT_2, 0, 35) EVT_CALL(SetPartFlagBits, ACTOR_GENERAL, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(AS_ToyTank_CloseHatch)) - EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_206B) + EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_TOY_TANK_CLOSE_HATCH) EVT_CASE_OR_EQ(EVENT_HIT) EVT_CASE_OR_EQ(EVENT_BURN_HIT) EVT_EXEC_WAIT(N(EVS_Hit)) @@ -257,7 +257,7 @@ EvtScript N(EVS_HandleEvent) = { EVT_CALL(SetEnemyTargetOffset, ACTOR_SELF, PRT_2, 0, 35) EVT_CALL(SetPartFlagBits, ACTOR_GENERAL, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(AS_ToyTank_CloseHatch)) - EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_206B) + EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_TOY_TANK_CLOSE_HATCH) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_EXEC_WAIT(N(EVS_Hit)) @@ -265,15 +265,15 @@ EvtScript N(EVS_HandleEvent) = { EVT_CALL(SetEnemyTargetOffset, ACTOR_SELF, PRT_2, 0, 35) EVT_CALL(SetPartFlagBits, ACTOR_GENERAL, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(AS_ToyTank_CloseHatch)) - EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_206B) + EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_TOY_TANK_CLOSE_HATCH) EVT_CASE_EQ(EVENT_ZERO_DAMAGE) EVT_CALL(func_8026E914, LVar0, LVar1) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(AS_ToyTank_CloseHatch)) - EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_206B) + EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_TOY_TANK_CLOSE_HATCH) EVT_WAIT(30) EVT_CASE_EQ(EVENT_IMMUNE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(AS_ToyTank_CloseHatch)) - EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_206B) + EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_TOY_TANK_CLOSE_HATCH) EVT_WAIT(30) EVT_CASE_EQ(EVENT_AIR_LIFT_FAILED) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(AS_ToyTank_CloseHatch)) @@ -513,7 +513,7 @@ EvtScript N(EVS_BeginWave_StiltGuys) = { EVT_WAIT(2) EVT_CALL(SetOwnerTarget, LVar0, 1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar1, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, DMG_SCENE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar1, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, DMG_SCENE, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(SetAnimation, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim10) EVT_WAIT(16) EVT_CALL(SetAnimation, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim04) @@ -753,7 +753,7 @@ EvtScript N(EVS_BeginWave_Tank) = { EVT_CALL(SetEnemyTargetOffset, ACTOR_SELF, PRT_2, 0, 35) EVT_CALL(SetPartFlagBits, ACTOR_GENERAL, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(AS_ToyTank_CloseHatch)) - EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_206B) + EVT_CALL(PlaySoundAtPart, ACTOR_GENERAL, PRT_MAIN, SOUND_TOY_TANK_CLOSE_HATCH) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(EnableBattleStatusBar, TRUE) @@ -764,7 +764,7 @@ EvtScript N(EVS_BeginWave_Tank) = { EvtScript N(EVS_Death) = { EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_TANK, SOUND_036F) + EVT_CALL(PlaySoundAtActor, ACTOR_TANK, SOUND_TOY_TANK_FALL_APART) EVT_CALL(PlayModelAnimation, 0, EVT_PTR(AS_ToyTank_FallApart)) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Tank_BulbGlowEffect, LVar0) EVT_IF_NE(LVar0, NULL) @@ -782,7 +782,7 @@ EvtScript N(EVS_Death) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_GENERAL) EVT_CALL(MoveBattleCamOver, 60) - EVT_CALL(PlaySoundAtActor, ACTOR_TANK, SOUND_034E) + EVT_CALL(PlaySoundAtActor, ACTOR_TANK, SOUND_TOY_TANK_EXPLODE) EVT_CALL(SetActorJumpGravity, ACTOR_GENERAL, EVT_FLOAT(0.6)) EVT_CALL(SetActorDispOffset, ACTOR_GENERAL, 0, 0, 0) EVT_CALL(GetActorPos, ACTOR_GENERAL, LVar0, LVar1, LVar2) @@ -794,7 +794,7 @@ EvtScript N(EVS_Death) = { EVT_END_THREAD EVT_CALL(SetGoalPos, ACTOR_GENERAL, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_GENERAL, 50, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_GENERAL, SOUND_20E4) + EVT_CALL(PlaySoundAtActor, ACTOR_GENERAL, SOUND_ACTOR_COLLAPSE) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(SetAnimation, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim10) @@ -814,7 +814,7 @@ EvtScript N(EVS_Death) = { EVT_ADD(LVar0, 10) EVT_ADD(LVar1, 30) EVT_PLAY_EFFECT(EFFECT_STARS_ORBITING, 0, LVar0, LVar1, LVar2, 20, 4, LVarF, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_GENERAL, SOUND_20E5) + EVT_CALL(PlaySoundAtActor, ACTOR_GENERAL, SOUND_KNOCKOUT_CHIRPING) EVT_CALL(DropStarPoints, ACTOR_GENERAL) EVT_WAIT(30) EVT_CALL(RemoveEffect, LVarF) diff --git a/src/battle/area/omo2_1/actor/shy_squad.c b/src/battle/area/omo2_1/actor/shy_squad.c index 99843a173c..4379966073 100644 --- a/src/battle/area/omo2_1/actor/shy_squad.c +++ b/src/battle/area/omo2_1/actor/shy_squad.c @@ -1140,9 +1140,9 @@ EvtScript N(EVS_Attack_Swarm) = { EVT_CASE_EQ(1) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CASE_LT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SMALL_CROWD_WALK) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LARGE_CROWD_WALK) EVT_END_SWITCH EVT_SET(LVar0, PRT_MEMBER_01) EVT_SET(LVar1, ANIM_ShySquadGuy_Anim03) @@ -1184,7 +1184,7 @@ EvtScript N(EVS_Attack_Swarm) = { EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar7) EVT_ADD(LVar0, 1) EVT_END_LOOP - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1215,9 +1215,9 @@ EvtScript N(EVS_Attack_Swarm) = { EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CASE_LT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SMALL_CROWD_WALK) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LARGE_CROWD_WALK) EVT_END_SWITCH EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) @@ -1230,7 +1230,7 @@ EvtScript N(EVS_Attack_Swarm) = { EVT_RETURN EVT_END_CASE_GROUP EVT_CASE_EQ(HIT_RESULT_HIT_STATIC) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_SWARM, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_SWARM, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SET(LVarE, 15) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_NumDefeated, LVar0) @@ -1239,9 +1239,9 @@ EvtScript N(EVS_Attack_Swarm) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_FIGHTING) EVT_LOOP(LVarD) EVT_IF_GT(LVarE, 1) - EVT_SET(LVar0, BS_FLAGS1_40) + EVT_SET(LVar0, BS_FLAGS1_NICE_HIT) EVT_ELSE - EVT_SET(LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_SET(LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_IF EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_SWARM, LVar0) @@ -1274,9 +1274,9 @@ EvtScript N(EVS_Attack_Swarm) = { EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK_INCREMENT, 10, 0) EVT_CASE_LT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SMALL_CROWD_WALK) EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03EC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LARGE_CROWD_WALK) EVT_END_SWITCH EVT_SET(LVar1, ANIM_ShySquadGuy_Anim04) EVT_EXEC_WAIT(N(EVS_MoveSquadHome)) diff --git a/src/battle/area/omo2_2/actor/stilt_guy.c b/src/battle/area/omo2_2/actor/stilt_guy.c index a36d14d4d8..25abc2ed76 100644 --- a/src/battle/area/omo2_2/actor/stilt_guy.c +++ b/src/battle/area/omo2_2/actor/stilt_guy.c @@ -297,10 +297,10 @@ EvtScript N(EVS_Init) = { EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_IN_Order, LVar1) EVT_IF_EQ(LVar1, 0) EVT_SET(LVar0, 10) - EVT_CALL(PlaySound, SOUND_0305) + EVT_CALL(PlaySound, SOUND_LONG_FLUTTER_FALL_A) EVT_ELSE EVT_SET(LVar0, 50) - EVT_CALL(PlaySound, SOUND_0306) + EVT_CALL(PlaySound, SOUND_LONG_FLUTTER_FALL_B) EVT_END_IF EVT_SUB(LVar2, 13) EVT_CALL(SetPartPos, ACTOR_SELF, PRT_UNFOLD_4, LVar0, 200, LVar2) @@ -431,7 +431,7 @@ EvtScript N(EVS_Init) = { EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_UNFOLD_3, 0, 0, 0) EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_UNFOLD_2, 0, 0, 0) EVT_CALL(SetPartRotationOffset, ACTOR_SELF, PRT_UNFOLD_1, 0, 0, 0) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_UNFOLD_1, SOUND_2065) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_UNFOLD_1, SOUND_STILT_GUY_UNFOLD) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_UNFOLD_1, ANIM_StiltGuyUnfold_Anim05) EVT_CALL(EnableActorPaletteEffects, ACTOR_SELF, PRT_UNFOLD_1, TRUE) EVT_CALL(SetActorPaletteSwapParams, ACTOR_SELF, PRT_UNFOLD_1, SPR_PAL_StiltGuyUnfold_Alt, SPR_PAL_StiltGuyUnfold, 0, 36, 0, 255, 0, 0) @@ -615,7 +615,7 @@ EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_RegisterComboHit) = { EVT_CALL(GetBattleFlags, LVar0) EVT_IF_NOT_FLAG(LVar0, BS_FLAGS1_PARTNER_ACTING) - EVT_IF_FLAG(LVar0, BS_FLAGS1_40 | BS_FLAGS1_200) + EVT_IF_FLAG(LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_KnockDownHit, TRUE) EVT_END_IF EVT_ELSE @@ -626,7 +626,7 @@ EvtScript N(EVS_RegisterComboHit) = { EVT_CASE_OR_EQ(MOVE_HEADBONK3) EVT_CASE_OR_EQ(MOVE_MULTIBONK) EVT_CALL(GetBattleFlags, LVar0) - EVT_IF_FLAG(LVar0, BS_FLAGS1_40 | BS_FLAGS1_200) + EVT_IF_FLAG(LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_KnockDownHit, TRUE) EVT_END_IF EVT_END_CASE_GROUP @@ -641,7 +641,7 @@ EvtScript N(EVS_RegisterHit) = { EVT_IF_NOT_FLAG(LVar0, BS_FLAGS1_PARTNER_ACTING) // jump attacks knock down stilts EVT_IF_FLAG(LVarF, DAMAGE_TYPE_JUMP) - EVT_IF_FLAG(LVar0, BS_FLAGS1_40 | BS_FLAGS1_200) + EVT_IF_FLAG(LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_KnockDownHit, TRUE) EVT_END_IF EVT_END_IF @@ -684,7 +684,7 @@ EvtScript N(EVS_Attack_Leap) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_STILTS, ANIM_StiltGuy_Anim04) EVT_WAIT(8) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -703,12 +703,12 @@ EvtScript N(EVS_Attack_Leap) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_HOP) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 18, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2066) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_STILT_GUY_STEP) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 25) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2066) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_STILT_GUY_STEP) EVT_WAIT(15) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -738,7 +738,7 @@ EvtScript N(EVS_Attack_Leap) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_SHOCK_CONTACT, 0, DMG_LEAP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_SHOCK_CONTACT, 0, DMG_LEAP, BS_FLAGS1_TRIGGER_EVENTS) EVT_SET(LVarF, LVar0) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -751,7 +751,7 @@ EvtScript N(EVS_Attack_Leap) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2066) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_STILT_GUY_STEP) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_STILTS, ANIM_StiltGuy_Anim01) EVT_WAIT(8) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) @@ -780,7 +780,7 @@ EvtScript N(EVS_FallDown) = { EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_THREAD EVT_WAIT(6) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_STILTS, SOUND_2067) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_STILTS, SOUND_STILTS_FALL) EVT_END_THREAD EVT_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_STILTS, ANIM_StiltGuy_Anim08) @@ -887,7 +887,7 @@ EvtScript N(EVS_ShyGuy_SpinSmash) = { EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetOwnerTarget, LVar0, LVar1) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, 1, BS_FLAGS1_TRIGGER_EVENTS) EVT_GOTO(1) EVT_LABEL(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) @@ -1092,7 +1092,7 @@ EvtScript N(EVS_ShyGuy_Attack_Tackle) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1151,7 +1151,7 @@ EvtScript N(EVS_ShyGuy_Attack_Tackle) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_GUY, ANIM_ShyGuy_Red_Anim05) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_TACKLE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_TACKLE, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 15) @@ -1197,7 +1197,7 @@ EvtScript N(EVS_ShyGuy_Attack_Vault) = { EVT_SUB(LVar0, 40) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1255,7 +1255,7 @@ EvtScript N(EVS_ShyGuy_Attack_Vault) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(JumpToGoal, ACTOR_SELF, 18, FALSE, TRUE, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_VAULT, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_VAULT, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -1303,10 +1303,10 @@ EvtScript N(EVS_ShyGuy_Attack_Vault) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_COLLAPSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_GUY, ANIM_ShyGuy_Red_Anim10) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20C3) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DISAPPOINTED) EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_GUY, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(RandInt, 100, LVar0) EVT_IF_LT(LVar0, 50) diff --git a/src/battle/area/omo2_3/actor/shy_stack.c b/src/battle/area/omo2_3/actor/shy_stack.c index d1bb82ae19..3859e1b5f6 100644 --- a/src/battle/area/omo2_3/actor/shy_stack.c +++ b/src/battle/area/omo2_3/actor/shy_stack.c @@ -403,7 +403,7 @@ EvtScript N(EVS_Init) = { EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_GUY_4, EVT_FLOAT(1.0)) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_GUY_4, ACTOR_SOUND_JUMP, SOUND_NONE, SOUND_NONE) EVT_CALL(FallPartTo, ACTOR_SELF, PRT_GUY_4, LVar0, 0, 0, 36) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_GUY_4, SOUND_2064) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_GUY_4, SOUND_SHY_STACK_SQUISH) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_GUY_4, ANIM_ShyGuy_Red_Anim07) EVT_END_THREAD EVT_THREAD @@ -417,7 +417,7 @@ EvtScript N(EVS_Init) = { EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_GUY_3, EVT_FLOAT(1.0)) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_GUY_3, ACTOR_SOUND_JUMP, SOUND_NONE, SOUND_NONE) EVT_CALL(FallPartTo, ACTOR_SELF, PRT_GUY_3, LVar0, 18, 0, 32) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_GUY_3, SOUND_2064) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_GUY_3, SOUND_SHY_STACK_SQUISH) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_GUY_3, ANIM_ShyGuy_Red_Anim07) EVT_CALL(SetPartScale, ACTOR_SELF, PRT_GUY_4, EVT_FLOAT(1.1), EVT_FLOAT(0.9), EVT_FLOAT(1.0)) EVT_CALL(SetPartDispOffset, ACTOR_SELF, PRT_GUY_3, 0, -3, 0) @@ -442,7 +442,7 @@ EvtScript N(EVS_Init) = { EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_GUY_2, EVT_FLOAT(1.0)) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_GUY_2, ACTOR_SOUND_JUMP, SOUND_NONE, SOUND_NONE) EVT_CALL(FallPartTo, ACTOR_SELF, PRT_GUY_2, LVar0, 36, 0, 28) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_GUY_2, SOUND_2064) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_GUY_2, SOUND_SHY_STACK_SQUISH) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_GUY_2, ANIM_ShyGuy_Red_Anim07) EVT_CALL(SetPartScale, ACTOR_SELF, PRT_GUY_4, EVT_FLOAT(1.1), EVT_FLOAT(0.9), EVT_FLOAT(1.0)) EVT_CALL(SetPartScale, ACTOR_SELF, PRT_GUY_3, EVT_FLOAT(1.1), EVT_FLOAT(0.9), EVT_FLOAT(1.0)) @@ -475,7 +475,7 @@ EvtScript N(EVS_Init) = { EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_GUY_1, EVT_FLOAT(1.0)) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_GUY_1, ACTOR_SOUND_JUMP, SOUND_NONE, SOUND_NONE) EVT_CALL(FallPartTo, ACTOR_SELF, PRT_GUY_1, LVar0, 54, 0, 24) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_GUY_1, SOUND_2064) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_GUY_1, SOUND_SHY_STACK_SQUISH) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_GUY_1, ANIM_ShyGuy_Red_Anim07) EVT_CALL(SetPartScale, ACTOR_SELF, PRT_GUY_4, EVT_FLOAT(1.1), EVT_FLOAT(0.9), EVT_FLOAT(1.0)) EVT_CALL(SetPartScale, ACTOR_SELF, PRT_GUY_3, EVT_FLOAT(1.1), EVT_FLOAT(0.9), EVT_FLOAT(1.0)) @@ -538,7 +538,7 @@ EvtScript N(EVS_Init) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_GUY_3, ANIM_ShyGuy_Red_Anim09) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_GUY_3, EVT_FLOAT(1.0)) EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_GUY_3, 50, 18, 0, 20, TRUE) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_GUY_3, SOUND_2064) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_GUY_3, SOUND_SHY_STACK_SQUISH) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_GUY_3, ANIM_ShyGuy_Red_Anim07) EVT_CALL(SetPartScale, ACTOR_SELF, PRT_GUY_4, EVT_FLOAT(1.1), EVT_FLOAT(0.9), EVT_FLOAT(1.0)) EVT_CALL(SetPartDispOffset, ACTOR_SELF, PRT_GUY_3, 0, -3, 0) @@ -565,7 +565,7 @@ EvtScript N(EVS_Init) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_GUY_2, ANIM_ShyGuy_Red_Anim09) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_GUY_2, EVT_FLOAT(1.0)) EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_GUY_2, 50, 36, 0, 20, TRUE) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_GUY_2, SOUND_2064) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_GUY_2, SOUND_SHY_STACK_SQUISH) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_GUY_2, ANIM_ShyGuy_Red_Anim07) EVT_CALL(SetPartScale, ACTOR_SELF, PRT_GUY_4, EVT_FLOAT(1.1), EVT_FLOAT(0.9), EVT_FLOAT(1.0)) EVT_CALL(SetPartScale, ACTOR_SELF, PRT_GUY_3, EVT_FLOAT(1.1), EVT_FLOAT(0.9), EVT_FLOAT(1.0)) @@ -612,7 +612,7 @@ EvtScript N(EVS_Init) = { EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_GUY_1, LVar0, LVar1, LVar2, 20, TRUE) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_GUY_1, EVT_FLOAT(0.3)) EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_GUY_1, 50, 54, 0, 30, TRUE) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_GUY_1, SOUND_2064) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_GUY_1, SOUND_SHY_STACK_SQUISH) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_GUY_1, ANIM_ShyGuy_Red_Anim07) EVT_CALL(SetAnimation, ACTOR_GENERAL, PRT_MAIN, ANIM_GeneralGuy_Anim04) EVT_CALL(SetPartScale, ACTOR_SELF, PRT_GUY_4, EVT_FLOAT(1.1), EVT_FLOAT(0.9), EVT_FLOAT(1.0)) @@ -998,7 +998,7 @@ EvtScript N(EVS_SpinSmashHit_Top) = { EVT_END }; -EvtScript N(fall_apart) = { +EvtScript N(EVS_DetachMember) = { EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_DefeatedCount, LVarA) EVT_SWITCH(LVarA) EVT_CASE_EQ(0) @@ -1054,7 +1054,7 @@ EvtScript N(fall_apart) = { EVT_END }; -EvtScript N(lower_actor_pos) = { +EvtScript N(EVS_DropStack) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_FALL_QUICK) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 18) @@ -1095,7 +1095,7 @@ EvtScript N(lower_actor_pos) = { EVT_WAIT(1) EVT_SUB(LVar3, 2) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar3, LVar2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2064) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SHY_STACK_SQUISH) EVT_END_THREAD EVT_RETURN EVT_END @@ -1110,11 +1110,11 @@ EvtScript N(EVS_SpinSmashHit_Stack) = { EVT_CALL(SetPartPos, ACTOR_SELF, PRT_KNOCKOFF, LVar0, LVar1, LVar2) EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_KNOCKOFF, 0, 0, 0) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_KNOCKOFF, ACTOR_PART_FLAG_INVISIBLE, FALSE) - EVT_EXEC_WAIT(N(fall_apart)) + EVT_EXEC_WAIT(N(EVS_DetachMember)) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Anim_Hurt, LVar1) EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1) - EVT_EXEC_WAIT(N(lower_actor_pos)) + EVT_EXEC_WAIT(N(EVS_DropStack)) EVT_CALL(CreateCurrentPosTargetList, TARGET_FLAG_GROUND | TARGET_FLAG_PRIMARY_ONLY | TARGET_FLAG_ALLOW_TARGET_ONLY) EVT_CALL(InitTargetIterator) EVT_LABEL(0) @@ -1207,7 +1207,7 @@ EvtScript N(EVS_SpinSmashLaunch) = { EVT_CALL(N(PrintDebugValue), EVT_PTR("Z"), LVar2) EVT_CALL(SetPartPos, ACTOR_SELF, PRT_KNOCKOFF, LVar0, LVar1, LVar2) EVT_CALL(SetPartRotation, ACTOR_SELF, PRT_KNOCKOFF, 0, 0, 0) - EVT_EXEC_WAIT(N(fall_apart)) + EVT_EXEC_WAIT(N(EVS_DetachMember)) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar1) EVT_SWITCH(LVar1) EVT_CASE_OR_EQ(EVENT_BURN_HIT) @@ -1219,7 +1219,7 @@ EvtScript N(EVS_SpinSmashLaunch) = { EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar1) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_KNOCKOFF, ACTOR_PART_FLAG_INVISIBLE, FALSE) - EVT_EXEC_WAIT(N(lower_actor_pos)) + EVT_EXEC_WAIT(N(EVS_DropStack)) EVT_THREAD EVT_SET(LVar0, 0) EVT_LOOP(30) @@ -1297,7 +1297,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SLINGSHOT_DRAW) EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SLINGSHOT_FIRE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1341,16 +1341,16 @@ EvtScript N(EVS_TakeTurn) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(1) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SHOOT_ONE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SHOOT_ONE, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(2) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SHOOT_TWO, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SHOOT_TWO, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(3) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SHOOT_THREE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SHOOT_THREE, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(4) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SHOOT_FOUR, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SHOOT_FOUR, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_DEFAULT EVT_SWITCH(LVarF) EVT_CASE_EQ(HIT_RESULT_LUCKY) diff --git a/src/battle/area/omo2_5/actor/shy_squad_redux.c b/src/battle/area/omo2_5/actor/shy_squad_redux.c index 40f1fd0717..18bda4b8d3 100644 --- a/src/battle/area/omo2_5/actor/shy_squad_redux.c +++ b/src/battle/area/omo2_5/actor/shy_squad_redux.c @@ -1146,7 +1146,7 @@ EvtScript N(EVS_Attack_Swarm) = { EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar7) EVT_ADD(LVar0, 1) EVT_END_LOOP - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1177,7 +1177,7 @@ EvtScript N(EVS_Attack_Swarm) = { EVT_RETURN EVT_END_CASE_GROUP EVT_CASE_EQ(HIT_RESULT_HIT_STATIC) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_SWARM, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_SWARM, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SET(LVarE, 15) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_NumDefeated, LVar0) @@ -1185,9 +1185,9 @@ EvtScript N(EVS_Attack_Swarm) = { EVT_SET(LVarD, LVarE) EVT_LOOP(LVarD) EVT_IF_GT(LVarE, 1) - EVT_SET(LVar0, BS_FLAGS1_40) + EVT_SET(LVar0, BS_FLAGS1_NICE_HIT) EVT_ELSE - EVT_SET(LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_SET(LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_IF EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_SWARM, LVar0) diff --git a/src/battle/area/omo3/actor/big_lantern_ghost.c b/src/battle/area/omo3/actor/big_lantern_ghost.c index 6ee688968f..6ca3ad6c52 100644 --- a/src/battle/area/omo3/actor/big_lantern_ghost.c +++ b/src/battle/area/omo3/actor/big_lantern_ghost.c @@ -548,7 +548,7 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim01) EVT_WAIT(8) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_LARGE_ACTOR_JUMP, 0) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -564,7 +564,7 @@ EvtScript N(attackHeavyJump) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_037D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LANTERN_GHOST_STEP) EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_SUB(LVar0, 15) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) @@ -574,7 +574,7 @@ EvtScript N(attackHeavyJump) = { EVT_SUB(LVar0, 10) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_037D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LANTERN_GHOST_STEP) EVT_WAIT(8) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -596,12 +596,12 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 16, FALSE, TRUE, FALSE) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_TRIGGER_EVENTS) EVT_SET(LVarF, LVar0) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_037D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LANTERN_GHOST_STEP) EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(SetBattleCamZoom, 320) @@ -618,12 +618,12 @@ EvtScript N(attackHeavyJump) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 12, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_037D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LANTERN_GHOST_STEP) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BigLanternGhost_Anim01) EVT_ADD(LVar0, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_037D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LANTERN_GHOST_STEP) EVT_WAIT(8) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) @@ -682,7 +682,7 @@ EvtScript N(attackLightBeam) = { EVT_PLAY_EFFECT(EFFECT_RADIATING_ENERGY_ORB, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.5), 30, 0) EVT_END_THREAD EVT_WAIT(5) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -690,7 +690,7 @@ EvtScript N(attackLightBeam) = { EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_EQ(HIT_RESULT_MISS) EVT_CASE_DEFAULT @@ -698,20 +698,20 @@ EvtScript N(attackLightBeam) = { EVT_IF_EQ(LVar0, 1) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarD, 0, SUPPRESS_EVENT_ALL, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarD, 0, SUPPRESS_EVENT_ALL, 0, 2, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_IF EVT_END_SWITCH EVT_END_CASE_GROUP EVT_CASE_DEFAULT EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarE, DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarE, DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, 2, BS_FLAGS1_TRIGGER_EVENTS) EVT_WAIT(2) EVT_CALL(ActorExists, ACTOR_PARTNER, LVar0) EVT_IF_EQ(LVar0, 1) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarD, DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarD, DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, 2, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_IF EVT_END_SWITCH EVT_WAIT(40) diff --git a/src/battle/area/pra2/actor/crystal_king.c b/src/battle/area/pra2/actor/crystal_king.c index aa066dd11f..8f7b849544 100644 --- a/src/battle/area/pra2/actor/crystal_king.c +++ b/src/battle/area/pra2/actor/crystal_king.c @@ -441,7 +441,7 @@ EvtScript N(EVS_OnHit) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_HoveringScriptID, LVarA) EVT_KILL_THREAD(LVarA) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E3) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_WITHER) EVT_SET(LVar1, 0) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -940,7 +940,7 @@ EvtScript N(EVS_Attack_IcyBreath) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim13) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_RECOVER_HEART) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -958,8 +958,8 @@ EvtScript N(EVS_Attack_IcyBreath) = { EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim1C) EVT_WAIT(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035D) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_WIND_LOOP) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -983,7 +983,7 @@ EvtScript N(EVS_Attack_IcyBreath) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 30, EVT_FLOAT(0.3)) EVT_END_THREAD EVT_WAIT(30) - EVT_CALL(StopSound, SOUND_035D) + EVT_CALL(StopSound, SOUND_HEAVY_WIND_LOOP) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF @@ -1012,11 +1012,11 @@ EvtScript N(EVS_Attack_IcyBreath) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 50, EVT_FLOAT(0.3)) EVT_END_THREAD EVT_WAIT(60) - EVT_CALL(StopSound, SOUND_035D) + EVT_CALL(StopSound, SOUND_HEAVY_WIND_LOOP) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim15) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_ICE | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_ICE_BREATH, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_ICE | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_ICE_BREATH, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -1037,7 +1037,7 @@ EvtScript N(EVS_Attack_IceBolt) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim13) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_RECOVER_HEART) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1055,8 +1055,8 @@ EvtScript N(EVS_Attack_IceBolt) = { EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim1C) EVT_WAIT(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02E0) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CRYSTAL_KING_ICE_BOLT) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1138,7 +1138,7 @@ EvtScript N(EVS_Attack_IceBolt) = { EVT_END_THREAD EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_ICE | DAMAGE_TYPE_NO_CONTACT, 0, DMG_STATUS_IGNORE_RES(STATUS_FLAG_FROZEN, 2), DMG_ICE_BOLT, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_ICE | DAMAGE_TYPE_NO_CONTACT, 0, DMG_STATUS_IGNORE_RES(STATUS_FLAG_FROZEN, 2), DMG_ICE_BOLT, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -1248,7 +1248,7 @@ EvtScript N(EVS_Move_MakeClones) = { EVT_IF_FLAG(LVar0, AVAL_Flag_HadLowHP) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim1D) EVT_WAIT(20) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LEVITATE) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPOOKY_LEVITATE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar7, LVar8, LVar9) EVT_CALL(MakeLerp, 0, 41, 30, EASING_SIN_OUT) EVT_LABEL(10) @@ -1287,7 +1287,7 @@ EvtScript N(EVS_Move_MakeClones) = { EVT_CALL(SetAnimation, LVar0, PRT_MAIN, ANIM_CrystalKing_Anim00) EVT_CALL(SetAnimation, LVar0, PRT_MAIN, ANIM_CrystalKing_Anim09) EVT_CALL(UseIdleAnimation, LVar0, TRUE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUMMON_CRYSTAL_CLONES) EVT_CALL(EnableActorBlur, ACTOR_SELF, ACTOR_BLUR_ENABLE) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Clone1_ID, LVar0) EVT_CALL(EnableActorBlur, LVar0, ACTOR_BLUR_ENABLE) @@ -1508,7 +1508,7 @@ EvtScript N(EVS_Move_SummonBits) = { EVT_CALL(SetPartScale, LVar0, PRT_MAIN, EVT_FLOAT(0.4), EVT_FLOAT(0.4), EVT_FLOAT(0.4)) EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim1F) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DE) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SUMMON_CRYSTAL_BITS) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_King_PrismBitID, LVar0) EVT_SETF(LVar1, EVT_FLOAT(42.0)) EVT_SETF(LVar2, EVT_FLOAT(85.0)) @@ -1570,9 +1570,9 @@ EvtScript N(EVS_Attack_CloneBreath) = { EVT_CALL(SetAnimation, LVarA, PRT_MAIN, ANIM_CrystalKing_Anim13) EVT_CALL(SetAnimation, LVarB, PRT_MAIN, ANIM_CrystalKing_Anim13) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_206D) - EVT_CALL(PlaySoundAtActor, LVarB, SOUND_206D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_RECOVER_HEART) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_RECOVER_HEART) + EVT_CALL(PlaySoundAtActor, LVarB, SOUND_RECOVER_HEART) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar9) EVT_IF_NOT_FLAG(LVar9, STATUS_FLAG_SHRINK) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1608,8 +1608,8 @@ EvtScript N(EVS_Attack_CloneBreath) = { EVT_CALL(SetAnimation, LVarA, PRT_MAIN, ANIM_CrystalKing_Anim1C) EVT_CALL(SetAnimation, LVarB, PRT_MAIN, ANIM_CrystalKing_Anim1C) EVT_WAIT(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035D) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_WIND_LOOP) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1659,7 +1659,7 @@ EvtScript N(EVS_Attack_CloneBreath) = { EVT_CALL(N(SetBreathColors), LVarF) EVT_END_IF EVT_WAIT(30) - EVT_CALL(StopSound, SOUND_035D) + EVT_CALL(StopSound, SOUND_HEAVY_WIND_LOOP) EVT_IF_EQ(LVar5, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF @@ -1718,13 +1718,13 @@ EvtScript N(EVS_Attack_CloneBreath) = { EVT_CALL(N(SetBreathColors), LVarF) EVT_END_IF EVT_WAIT(60) - EVT_CALL(StopSound, SOUND_035D) + EVT_CALL(StopSound, SOUND_HEAVY_WIND_LOOP) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_CrystalKing_Anim15) EVT_CALL(SetAnimation, LVarA, PRT_MAIN, ANIM_CrystalKing_Anim15) EVT_CALL(SetAnimation, LVarB, PRT_MAIN, ANIM_CrystalKing_Anim15) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_ICE | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_CLONE_BREATH, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_ICE | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_CLONE_BREATH, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -1774,7 +1774,7 @@ EvtScript N(EVS_InhaleBit) = { }; EvtScript N(EVS_RemoveBit) = { - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03D9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LIGHT_THROW) EVT_SET(LVarA, LVar0) EVT_CALL(SetPartFlagBits, LVarA, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_NO_SHADOW, FALSE) @@ -1808,7 +1808,7 @@ EvtScript N(EVS_RemoveBit) = { }; EvtScript N(EVS_SpitSingleBit) = { - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03D9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LIGHT_THROW) EVT_SET(LVarA, LVar0) EVT_CALL(SetPartFlagBits, LVarA, PRT_MAIN, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(SetActorFlagBits, LVarA, ACTOR_FLAG_NO_SHADOW, FALSE) @@ -1861,7 +1861,7 @@ EvtScript N(EVS_Attack_SpitBits) = { EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 30, EVT_FLOAT(0.2)) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03AF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CRYSTAL_KING_INHALE) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_King_CubeBitID, LVar0) EVT_CALL(ActorExists, LVar0, LVar1) EVT_IF_EQ(LVar1, TRUE) @@ -1890,7 +1890,7 @@ EvtScript N(EVS_Attack_SpitBits) = { EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 15) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -2016,7 +2016,7 @@ EvtScript N(EVS_Move_Recover) = { EVT_WAIT(20) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_RECOVER_HEART) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_STAR_BOUNCE_A) @@ -2024,14 +2024,14 @@ EvtScript N(EVS_Move_Recover) = { EVT_IF_EQ(LFlag0, TRUE) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_206D) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_RECOVER_HEART) EVT_CALL(PlaySoundAtActor, LVarA, SOUND_HEART_BOUNCE) EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, LVarA, SOUND_STAR_BOUNCE_A) EVT_END_THREAD EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, LVarB, SOUND_206D) + EVT_CALL(PlaySoundAtActor, LVarB, SOUND_RECOVER_HEART) EVT_CALL(PlaySoundAtActor, LVarB, SOUND_HEART_BOUNCE) EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, LVarB, SOUND_STAR_BOUNCE_A) diff --git a/src/battle/area/sam2/actor/monstar.c b/src/battle/area/sam2/actor/monstar.c index 886d5995ec..cbb3f60301 100644 --- a/src/battle/area/sam2/actor/monstar.c +++ b/src/battle/area/sam2/actor/monstar.c @@ -393,7 +393,7 @@ EvtScript N(EVS_Attack_StarStorm) = { EVT_CALL(MoveBattleCamOver, 60) EVT_WAIT(60) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MONSTAR_CAST_SPELL) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_036E) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MONSTAR_STAR_STORM) EVT_THREAD EVT_WAIT(10) EVT_LOOP(18) @@ -429,7 +429,7 @@ EvtScript N(EVS_Attack_StarStorm) = { EVT_ADD(LVar2, 5) EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 11, LVar0, LVar1, LVar2, EVT_FLOAT(0.8), 160, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Monstar_Release) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 0, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 0, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -457,7 +457,7 @@ EvtScript N(EVS_Attack_StarStorm) = { EVT_WAIT(170) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_STAR_STORM, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_STAR_STORM, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) diff --git a/src/battle/area/tik2/actor/blooper.c b/src/battle/area/tik2/actor/blooper.c index d4d1631561..21196f8c97 100644 --- a/src/battle/area/tik2/actor/blooper.c +++ b/src/battle/area/tik2/actor/blooper.c @@ -34,7 +34,7 @@ EvtScript N(EVS_FloatToPos) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(FallToGoal, ACTOR_SELF, 8) EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BLOOPER_MOVE) EVT_SET(LVar7, LVar4) EVT_ADD(LVar7, LVar4) EVT_ADD(LVar7, LVar0) @@ -57,7 +57,7 @@ EvtScript N(EVS_FloatToPos) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(FallToGoal, ACTOR_SELF, 8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BLOOPER_MOVE) EVT_SET(LVar7, LVar0) EVT_ADD(LVar7, LVar0) EVT_ADD(LVar7, LVar4) @@ -80,7 +80,7 @@ EvtScript N(EVS_FloatToPos) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(FallToGoal, ACTOR_SELF, 8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BLOOPER_MOVE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, EASING_CUBIC_OUT) @@ -415,8 +415,8 @@ EvtScript N(EVS_Attack_SpinDrop) = { EVT_SET(LVar1, 100) EVT_SET(LVar3, 15) EVT_EXEC_WAIT(N(EVS_FloatToPos)) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DD) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BLOOPER_FALL) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -467,7 +467,7 @@ EvtScript N(EVS_Attack_SpinDrop) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 16, FALSE, TRUE, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SPIN_DROP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SPIN_DROP, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) @@ -519,7 +519,7 @@ EvtScript N(EVS_Attack_InkBlast) = { EVT_CALL(MoveBattleCamOver, 50) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BLOOPER_MOVE) EVT_SET(LVar7, LVar4) EVT_ADD(LVar7, LVar0) EVT_MULF(LVar7, EVT_FLOAT(0.5)) @@ -539,7 +539,7 @@ EvtScript N(EVS_Attack_InkBlast) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(FallToGoal, ACTOR_SELF, 8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BLOOPER_MOVE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -2, EASING_CUBIC_OUT) @@ -554,14 +554,14 @@ EvtScript N(EVS_Attack_InkBlast) = { EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 40, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -40) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DE) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BLOOPER_SQUIRT) EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_ADD(LVar3, 1) EVT_SUB(LVar4, 27) EVT_SUB(LVar5, 3) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(SpitInk), LVar0, LVar1, LVar2, LVar3, LVar4, LVar5) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -582,7 +582,7 @@ EvtScript N(EVS_Attack_InkBlast) = { EVT_WAIT(10) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetDamageSource, DMG_SRC_INK_BLAST) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_INK_BLAST, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_INK_BLAST, BS_FLAGS1_TRIGGER_EVENTS) EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Blooper_Anim00) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) diff --git a/src/battle/area/tik2/actor/blooper_baby.c b/src/battle/area/tik2/actor/blooper_baby.c index 5707316a07..51e93ad8c0 100644 --- a/src/battle/area/tik2/actor/blooper_baby.c +++ b/src/battle/area/tik2/actor/blooper_baby.c @@ -39,7 +39,7 @@ EvtScript N(EVS_FloatToPos) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(FallToGoal, ACTOR_SELF, 8) EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035F) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BABY_BLOOPER_MOVE) EVT_SET(LVar7, LVar4) EVT_ADD(LVar7, LVar4) EVT_ADD(LVar7, LVar0) @@ -62,7 +62,7 @@ EvtScript N(EVS_FloatToPos) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(FallToGoal, ACTOR_SELF, 8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035F) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BABY_BLOOPER_MOVE) EVT_SET(LVar7, LVar0) EVT_ADD(LVar7, LVar0) EVT_ADD(LVar7, LVar4) @@ -85,7 +85,7 @@ EvtScript N(EVS_FloatToPos) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(FallToGoal, ACTOR_SELF, 8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035F) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BABY_BLOOPER_MOVE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, EASING_CUBIC_OUT) @@ -221,7 +221,7 @@ ActorBlueprint NAMESPACE = { EvtScript N(EVS_Init) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(EVS_TakeTurn))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(EVS_HandleEvent))) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035F) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BABY_BLOOPER_MOVE) EVT_CALL(N(StartRumbleWithParams), 80, 20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BabyBlooper_Anim00) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BabyBlooper_Anim01) @@ -234,7 +234,7 @@ EvtScript N(EVS_Init) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(FlyToGoal, ACTOR_SELF, 8, 0, EASING_LINEAR) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035F) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BABY_BLOOPER_MOVE) EVT_CALL(N(StartRumbleWithParams), 80, 20) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_HomePosX, LVar0) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_HomePosY, LVar1) @@ -419,7 +419,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(2) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_FALL_QUICK) EVT_END_THREAD - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -453,7 +453,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 16, FALSE, TRUE, FALSE) EVT_IF_EQ(LVarF, 7) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, 0, BS_FLAGS1_40) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, 0, BS_FLAGS1_NICE_HIT) EVT_END_IF EVT_ADD(LVar0, 30) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -505,7 +505,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LEECH) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_SET(LFlag0, FALSE) EVT_LOOP(2) @@ -568,11 +568,11 @@ EvtScript N(EVS_TakeTurn) = { EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_CALL(SetDamageSource, DMG_SRC_LEECH) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_UNBLOCKABLE | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, DMG_LEECH, BS_FLAGS1_40) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_UNBLOCKABLE | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, DMG_LEECH, BS_FLAGS1_NICE_HIT) EVT_CALL(StartRumble, BTL_RUMBLE_HIT_MIN) EVT_CALL(GetLastDamage, ACTOR_PLAYER, LVar3) EVT_IF_NE(LVar3, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_RECOVER_HEART) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) diff --git a/src/battle/area/tik2/actor/electro_blooper.c b/src/battle/area/tik2/actor/electro_blooper.c index 361f4a2f55..48c9428d52 100644 --- a/src/battle/area/tik2/actor/electro_blooper.c +++ b/src/battle/area/tik2/actor/electro_blooper.c @@ -46,7 +46,7 @@ EvtScript N(EVS_FloatToPos) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(FallToGoal, ACTOR_SELF, 8) EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BLOOPER_MOVE) EVT_SET(LVar7, LVar4) EVT_ADD(LVar7, LVar4) EVT_ADD(LVar7, LVar0) @@ -69,7 +69,7 @@ EvtScript N(EVS_FloatToPos) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(FallToGoal, ACTOR_SELF, 8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BLOOPER_MOVE) EVT_SET(LVar7, LVar0) EVT_ADD(LVar7, LVar0) EVT_ADD(LVar7, LVar4) @@ -92,7 +92,7 @@ EvtScript N(EVS_FloatToPos) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(FallToGoal, ACTOR_SELF, 8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BLOOPER_MOVE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, EASING_CUBIC_OUT) @@ -584,8 +584,8 @@ EvtScript N(EVS_Attack_SpinDrop) = { EVT_SET(LVar1, 100) EVT_SET(LVar3, 15) EVT_EXEC_WAIT(N(EVS_FloatToPos)) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DD) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BLOOPER_FALL) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -636,7 +636,7 @@ EvtScript N(EVS_Attack_SpinDrop) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 16, FALSE, TRUE, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SPIN_DROP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SPIN_DROP, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) @@ -682,7 +682,7 @@ EvtScript N(EVS_Attack_ChargedDrop) = { EVT_SET(LVar1, 100) EVT_SET(LVar3, 15) EVT_EXEC_WAIT(N(EVS_FloatToPos)) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_SHOCK, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_SHOCK, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -733,7 +733,7 @@ EvtScript N(EVS_Attack_ChargedDrop) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 16, FALSE, TRUE, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_SHOCK, SUPPRESS_EVENT_SHOCK_CONTACT, 0, DMG_CHARGED_DROP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_SHOCK, SUPPRESS_EVENT_SHOCK_CONTACT, 0, DMG_CHARGED_DROP, BS_FLAGS1_TRIGGER_EVENTS) EVT_IF_NE(LVarF, HIT_RESULT_HIT_STATIC) EVT_EXEC_WAIT(N(EVS_Discharge)) EVT_END_IF @@ -785,7 +785,7 @@ EvtScript N(EVS_Attack_InkBlast) = { EVT_CALL(MoveBattleCamOver, 80) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BLOOPER_MOVE) EVT_SET(LVar7, LVar4) EVT_ADD(LVar7, LVar0) EVT_MULF(LVar7, EVT_FLOAT(0.5)) @@ -805,7 +805,7 @@ EvtScript N(EVS_Attack_InkBlast) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(FallToGoal, ACTOR_SELF, 8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BLOOPER_MOVE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -2, EASING_CUBIC_OUT) @@ -820,14 +820,14 @@ EvtScript N(EVS_Attack_InkBlast) = { EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 40, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -40) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DE) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BLOOPER_SQUIRT) EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_ADD(LVar3, 1) EVT_SUB(LVar4, 28) EVT_SUB(LVar5, 3) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(SpitInk), LVar0, LVar1, LVar2, LVar3, LVar4, LVar5) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -848,7 +848,7 @@ EvtScript N(EVS_Attack_InkBlast) = { EVT_WAIT(10) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetDamageSource, DMG_SRC_INK_BLAST) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_INK_BLAST, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_INK_BLAST, BS_FLAGS1_TRIGGER_EVENTS) EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Blooper_Anim00) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) diff --git a/src/battle/area/tik2/actor/super_blooper.c b/src/battle/area/tik2/actor/super_blooper.c index 94d4186a77..14575f0e58 100644 --- a/src/battle/area/tik2/actor/super_blooper.c +++ b/src/battle/area/tik2/actor/super_blooper.c @@ -53,7 +53,7 @@ EvtScript N(EVS_FloatToPos) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(FallToGoal, ACTOR_SELF, 8) EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BLOOPER_MOVE) EVT_SET(LVar7, LVar4) EVT_ADD(LVar7, LVar4) EVT_ADD(LVar7, LVar0) @@ -76,7 +76,7 @@ EvtScript N(EVS_FloatToPos) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(FallToGoal, ACTOR_SELF, 8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BLOOPER_MOVE) EVT_SET(LVar7, LVar0) EVT_ADD(LVar7, LVar0) EVT_ADD(LVar7, LVar4) @@ -99,7 +99,7 @@ EvtScript N(EVS_FloatToPos) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(FallToGoal, ACTOR_SELF, 8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BLOOPER_MOVE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(FlyToGoal, ACTOR_SELF, LVar3, -2, EASING_CUBIC_OUT) @@ -516,8 +516,8 @@ EvtScript N(EVS_Attack_SpinDrop) = { EVT_SET(LVar1, 100) EVT_SET(LVar3, 15) EVT_EXEC_WAIT(N(EVS_FloatToPos)) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DD) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BLOOPER_FALL) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -566,7 +566,7 @@ EvtScript N(EVS_Attack_SpinDrop) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 16, FALSE, TRUE, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SPIN_DROP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SPIN_DROP, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_STONE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Blooper_Anim04) @@ -606,7 +606,7 @@ EvtScript N(EVS_Attack_InkBlast) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(FallToGoal, ACTOR_SELF, 8) EVT_CALL(GetActorPos, ACTOR_SELF, LVar4, LVar5, LVar6) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BLOOPER_MOVE) EVT_SET(LVar7, LVar4) EVT_ADD(LVar7, LVar0) EVT_MULF(LVar7, EVT_FLOAT(0.5)) @@ -626,7 +626,7 @@ EvtScript N(EVS_Attack_InkBlast) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.3)) EVT_CALL(FallToGoal, ACTOR_SELF, 8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BLOOPER_MOVE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(3.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(FlyToGoal, ACTOR_SELF, 15, -2, EASING_CUBIC_OUT) @@ -639,13 +639,13 @@ EvtScript N(EVS_Attack_InkBlast) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 16, 0, EASING_LINEAR) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 40, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, -40) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DE) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BLOOPER_SQUIRT) EVT_CALL(GetActorPos, ACTOR_SELF, LVar3, LVar4, LVar5) EVT_ADD(LVar3, 1) EVT_SUB(LVar4, 30) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(SpitInk), LVar0, LVar1, LVar2, LVar3, LVar4, LVar5) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -666,7 +666,7 @@ EvtScript N(EVS_Attack_InkBlast) = { EVT_WAIT(10) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetDamageSource, DMG_SRC_INK_BLAST) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_INK_BLAST, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_INK_BLAST, BS_FLAGS1_TRIGGER_EVENTS) EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Blooper_Anim00) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) @@ -729,13 +729,13 @@ EvtScript N(EVS_Move_MakeBabies) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Blooper_Anim03) EVT_WAIT(10) EVT_CALL(ActorExists, ACTOR_ENEMY1, LVar1) - EVT_IF_EQ(LVar1, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03D9) + EVT_IF_FALSE(LVar1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LIGHT_THROW) EVT_CALL(SummonEnemy, EVT_PTR(N(BabyFormation1)), FALSE) EVT_END_IF EVT_CALL(ActorExists, ACTOR_ENEMY2, LVar1) - EVT_IF_EQ(LVar1, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03D9) + EVT_IF_FALSE(LVar1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LIGHT_THROW) EVT_CALL(SummonEnemy, EVT_PTR(N(BabyFormation2)), FALSE) EVT_END_IF EVT_WAIT(2) @@ -790,8 +790,8 @@ EvtScript N(EVS_Attack_RageDrop) = { EVT_SET(LVar1, 100) EVT_SET(LVar3, 15) EVT_EXEC_WAIT(N(EVS_FloatToPos)) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03DD) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BLOOPER_FALL) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -845,7 +845,7 @@ EvtScript N(EVS_Attack_RageDrop) = { EVT_GOTO(0) EVT_END_IF EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_RAGE_DROP, BS_FLAGS1_40) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_RAGE_DROP, BS_FLAGS1_NICE_HIT) EVT_CALL(GetPlayerHP, LVarE) EVT_IF_EQ(LVarE, 0) EVT_GOTO(1) @@ -864,7 +864,7 @@ EvtScript N(EVS_Attack_RageDrop) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_LABEL(0) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_RAGE_DROP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_RAGE_DROP, BS_FLAGS1_TRIGGER_EVENTS) EVT_LABEL(1) EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_STONE) 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 f58f15c60a..7f254c0da2 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 @@ -571,18 +571,18 @@ EvtScript N(HandleCommand) = { EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_TowerHeight, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0356) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_KOOPA_BROS_TOWER_SPIN_3) EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0355) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_KOOPA_BROS_TOWER_SPIN_2) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0354) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_KOOPA_BROS_TOWER_SPIN_1) EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_SHELL_SPIN) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(N(SpawnSpinEffect), LVar0, LVar1, LVar2, 60) EVT_WAIT(60) EVT_THREAD - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_EQ(HIT_RESULT_LUCKY) EVT_WAIT(20) @@ -602,10 +602,10 @@ EvtScript N(HandleCommand) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_TowerHeight, LVar1) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, LVar1, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_037C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_KOOPA_LAUNCH_SHELL) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(EnableActorBlur, ACTOR_SELF, ACTOR_BLUR_ENABLE) EVT_CALL(GetActorVar, BOSS_ACTOR, AVAR_Boss_TowerHeight, LVar0) @@ -668,7 +668,7 @@ EvtScript N(HandleCommand) = { EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_TOP_EXIT_SHELL) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F3) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SMALL_LENS_FLARE) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_POINT) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -770,13 +770,13 @@ EvtScript N(HandleCommand) = { EVT_CALL(RunToGoal, ACTOR_SELF, 10, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_ENTER_SHELL) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0353) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_KOOPA_BROS_SPINUP) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_SHELL_SPIN) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(N(SpawnSpinEffect), LVar0, LVar1, LVar2, 30) EVT_WAIT(30) EVT_THREAD - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_EQ(HIT_RESULT_LUCKY) EVT_WAIT(20) @@ -794,10 +794,10 @@ EvtScript N(HandleCommand) = { EVT_END_IF EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 1, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_037C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_KOOPA_LAUNCH_SHELL) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(EnableActorBlur, ACTOR_SELF, ACTOR_BLUR_ENABLE) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) @@ -827,7 +827,7 @@ EvtScript N(HandleCommand) = { EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_TOP_EXIT_SHELL) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F3) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SMALL_LENS_FLARE) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, THIS_ANIM_POINT) 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 8a8b947dc2..cfa3257cd2 100644 --- a/src/battle/area/trd_part_2/actor/fake_bowser.c +++ b/src/battle/area/trd_part_2/actor/fake_bowser.c @@ -1489,7 +1489,7 @@ EvtScript N(EVS_FakeBowser_TakeTurn) = { EVT_END_THREAD EVT_SET(ArrayVar(0), ANIM_BEGIN_STRIKE) EVT_WAIT(24) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1516,7 +1516,7 @@ EvtScript N(EVS_FakeBowser_TakeTurn) = { EVT_END_SWITCH EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, SUPPRESS_EVENT_ALL, 0, DMG_STRIKE, BS_FLAGS1_40) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, SUPPRESS_EVENT_ALL, 0, DMG_STRIKE, BS_FLAGS1_NICE_HIT) EVT_CALL(GetBattleFlags, LVar0) EVT_IF_FLAG(LVar0, BS_FLAGS1_ATK_BLOCKED) EVT_CALL(GetPlayerHP, LVar0) @@ -1701,7 +1701,7 @@ EvtScript N(EVS_KoopaBrosEnter) = { EVT_CALL(SetActorJumpGravity, GREEN_ACTOR, EVT_FLOAT(1.5)) EVT_CALL(SetActorSounds, GREEN_ACTOR, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(FallToGoal, GREEN_ACTOR, 30) - EVT_CALL(PlaySoundAtActor, GREEN_ACTOR, SOUND_03E9) + EVT_CALL(PlaySoundAtActor, GREEN_ACTOR, SOUND_KOOPA_BROS_LAND) EVT_CALL(ResetActorSounds, GREEN_ACTOR, ACTOR_SOUND_JUMP) EVT_CALL(ForceHomePos, GREEN_ACTOR, 20, 0, 0) EVT_CALL(SetAnimation, GREEN_ACTOR, 1, ANIM_KoopaBros_Green_IdleCrouch) @@ -1714,7 +1714,7 @@ EvtScript N(EVS_KoopaBrosEnter) = { EVT_CALL(SetActorJumpGravity, YELLOW_ACTOR, EVT_FLOAT(1.5)) EVT_CALL(SetActorSounds, YELLOW_ACTOR, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(FallToGoal, YELLOW_ACTOR, 30) - EVT_CALL(PlaySoundAtActor, YELLOW_ACTOR, SOUND_03E9) + EVT_CALL(PlaySoundAtActor, YELLOW_ACTOR, SOUND_KOOPA_BROS_LAND) EVT_CALL(ResetActorSounds, YELLOW_ACTOR, ACTOR_SOUND_JUMP) EVT_CALL(ForceHomePos, YELLOW_ACTOR, 60, 0, -5) EVT_CALL(SetAnimation, YELLOW_ACTOR, 1, ANIM_KoopaBros_Yellow_IdleCrouch) @@ -1727,7 +1727,7 @@ EvtScript N(EVS_KoopaBrosEnter) = { EVT_CALL(SetActorJumpGravity, BLACK_ACTOR, EVT_FLOAT(1.5)) EVT_CALL(SetActorSounds, BLACK_ACTOR, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(FallToGoal, BLACK_ACTOR, 30) - EVT_CALL(PlaySoundAtActor, BLACK_ACTOR, SOUND_03E9) + EVT_CALL(PlaySoundAtActor, BLACK_ACTOR, SOUND_KOOPA_BROS_LAND) EVT_CALL(ResetActorSounds, BLACK_ACTOR, ACTOR_SOUND_JUMP) EVT_CALL(ForceHomePos, BLACK_ACTOR, 100, 0, -10) EVT_CALL(SetAnimation, BLACK_ACTOR, 1, ANIM_KoopaBros_Black_IdleCrouch) @@ -1740,7 +1740,7 @@ EvtScript N(EVS_KoopaBrosEnter) = { EVT_CALL(SetActorJumpGravity, RED_ACTOR, EVT_FLOAT(1.5)) EVT_CALL(SetActorSounds, RED_ACTOR, ACTOR_SOUND_JUMP, SOUND_NONE, 0) EVT_CALL(FallToGoal, RED_ACTOR, 30) - EVT_CALL(PlaySoundAtActor, RED_ACTOR, SOUND_03E9) + EVT_CALL(PlaySoundAtActor, RED_ACTOR, SOUND_KOOPA_BROS_LAND) EVT_CALL(ResetActorSounds, RED_ACTOR, ACTOR_SOUND_JUMP) EVT_CALL(ForceHomePos, RED_ACTOR, 140, 0, -15) EVT_CALL(SetAnimation, RED_ACTOR, 1, ANIM_KoopaBros_Red_IdleCrouch) @@ -1759,7 +1759,7 @@ EvtScript N(EVS_KoopaBrosEnter) = { EVT_ADD(LVar1, 28) EVT_ADD(LVar2, 5) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0) - EVT_CALL(PlaySoundAtActor, GREEN_ACTOR, SOUND_20F3) + EVT_CALL(PlaySoundAtActor, GREEN_ACTOR, SOUND_SMALL_LENS_FLARE) EVT_CALL(SetAnimation, YELLOW_ACTOR, 1, ANIM_KoopaBros_Yellow_ThumbsUp) EVT_WAIT(5) EVT_CALL(GetActorPos, YELLOW_ACTOR, LVar0, LVar1, LVar2) @@ -1767,7 +1767,7 @@ EvtScript N(EVS_KoopaBrosEnter) = { EVT_ADD(LVar1, 28) EVT_ADD(LVar2, 5) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0) - EVT_CALL(PlaySoundAtActor, YELLOW_ACTOR, SOUND_20F3) + EVT_CALL(PlaySoundAtActor, YELLOW_ACTOR, SOUND_SMALL_LENS_FLARE) EVT_CALL(SetAnimation, BLACK_ACTOR, 1, ANIM_KoopaBros_Black_ThumbsUp) EVT_WAIT(5) EVT_CALL(GetActorPos, BLACK_ACTOR, LVar0, LVar1, LVar2) @@ -1775,7 +1775,7 @@ EvtScript N(EVS_KoopaBrosEnter) = { EVT_ADD(LVar1, 28) EVT_ADD(LVar2, 5) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0) - EVT_CALL(PlaySoundAtActor, BLACK_ACTOR, SOUND_20F3) + EVT_CALL(PlaySoundAtActor, BLACK_ACTOR, SOUND_SMALL_LENS_FLARE) EVT_CALL(SetAnimation, RED_ACTOR, 1, ANIM_KoopaBros_Red_ThumbsUp) EVT_WAIT(5) EVT_CALL(GetActorPos, RED_ACTOR, LVar0, LVar1, LVar2) @@ -1783,7 +1783,7 @@ EvtScript N(EVS_KoopaBrosEnter) = { EVT_ADD(LVar1, 28) EVT_ADD(LVar2, 5) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 30, 0) - EVT_CALL(PlaySoundAtActor, RED_ACTOR, SOUND_20F3) + EVT_CALL(PlaySoundAtActor, RED_ACTOR, SOUND_SMALL_LENS_FLARE) EVT_WAIT(30) EVT_CALL(N(PlayKoopaBrosSong)) EVT_CALL(ActorSpeak, MSG_CH1_0107, YELLOW_ACTOR, 1, -1, -1) @@ -1946,7 +1946,7 @@ EvtScript N(EVS_BuildTowerWithKoopa) = { EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, LVarA, 20, FALSE, FALSE, FALSE) EVT_CALL(N(PlayLandOnTowerFX), LVarA) - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_03E9) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_KOOPA_BROS_LAND) EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 15) EVT_CALL(SetActorPos, LVarA, LVar3, LVar4, LVar5) @@ -1972,7 +1972,7 @@ EvtScript N(EVS_BuildTowerWithKoopa) = { EVT_CASE_EQ(RED_ACTOR) EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_PointForward) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_20F3) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_SMALL_LENS_FLARE) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 22) EVT_ADD(LVar1, 19) @@ -2098,7 +2098,7 @@ EvtScript N(EVS_BuildTowerWithKoopa) = { EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, LVarA, 20, FALSE, FALSE, FALSE) EVT_CALL(N(PlayLandOnTowerFX), LVarA) - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_03E9) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_KOOPA_BROS_LAND) EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 15) EVT_CALL(SetActorPos, LVarA, LVar3, LVar4, LVar5) @@ -2165,7 +2165,7 @@ EvtScript N(EVS_BuildTowerWithKoopa) = { EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, LVarA, 20, FALSE, FALSE, FALSE) EVT_CALL(N(PlayLandOnTowerFX), LVarA) - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_03E9) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_KOOPA_BROS_LAND) EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 15) EVT_CALL(SetActorPos, LVarA, LVar3, LVar4, LVar5) @@ -2298,7 +2298,7 @@ EvtScript N(EVS_UpdateTowerWithKoopa) = { EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, LVarA, 20, FALSE, FALSE, FALSE) EVT_CALL(N(PlayLandOnTowerFX), LVarA) - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_03E9) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_KOOPA_BROS_LAND) EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 15) EVT_CALL(SetActorPos, LVarA, LVar3, LVar4, LVar5) @@ -2323,7 +2323,7 @@ EvtScript N(EVS_UpdateTowerWithKoopa) = { EVT_CASE_EQ(RED_ACTOR) EVT_CALL(SetAnimation, LVarA, 1, ANIM_KoopaBros_Red_PointForward) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_20F3) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_SMALL_LENS_FLARE) EVT_CALL(GetActorPos, LVarA, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 22) EVT_ADD(LVar1, 19) @@ -2380,7 +2380,7 @@ EvtScript N(EVS_UpdateTowerWithKoopa) = { EVT_CALL(SetActorJumpGravity, LVarA, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, LVarA, 20, FALSE, FALSE, FALSE) EVT_CALL(N(PlayLandOnTowerFX), LVarA) - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_03E9) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_KOOPA_BROS_LAND) EVT_CALL(GetActorPos, LVarA, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 15) EVT_CALL(SetActorPos, LVarA, LVar3, LVar4, LVar5) diff --git a/src/battle/area/trd_part_3/actor/eldstar.c b/src/battle/area/trd_part_3/actor/eldstar.c index 1b60a04ce2..8ae96565d2 100644 --- a/src/battle/area/trd_part_3/actor/eldstar.c +++ b/src/battle/area/trd_part_3/actor/eldstar.c @@ -179,7 +179,7 @@ API_CALLABLE(N(func_802181B4_4CF364)) { API_CALLABLE(N(AddStarPower)) { PlayerData* playerData = &gPlayerData; - playerData->specialBarsFilled += 32; + playerData->starPower += SP_PER_SEG; return ApiStatus_DONE2; } diff --git a/src/battle/battle.c b/src/battle/battle.c index f3d043e743..342ac34ede 100644 --- a/src/battle/battle.c +++ b/src/battle/battle.c @@ -203,12 +203,12 @@ void setup_demo_player(void) { playerData->invItems[i] = ITEM_NONE; } - playerData->unk_288 = 0; - playerData->merleeSpellType = MERLEE_SPELL_0; + playerData->unused_288 = 0; + playerData->merleeSpellType = MERLEE_SPELL_NONE; playerData->merleeCastsLeft = 0; playerData->merleeTurnCount = 0; playerData->maxStarPower = 0; - playerData->specialBarsFilled = 0; + playerData->starPower = 0; playerData->starBeamLevel = 0; } diff --git a/src/battle/battle.h b/src/battle/battle.h index cb6586e05a..916f5887c3 100644 --- a/src/battle/battle.h +++ b/src/battle/battle.h @@ -97,9 +97,9 @@ enum BattleVars { // document special actor vars referenced from other actors enum CommonActorVars { - AVAR_DryBones_Collapsed = 8, - AVAR_SpearGuy_Generation = 1, - AVAR_JungleFuzzy_Generation = 0, + AVAR_DryBones_Collapsed = 8, + AVAR_SpearGuy_Generation = 1, + AVAR_JungleFuzzy_Generation = 0, }; extern s32 bActorNames[]; diff --git a/src/battle/btl_states_actions.c b/src/battle/btl_states_actions.c index 2b1638c575..07f427fb62 100644 --- a/src/battle/btl_states_actions.c +++ b/src/battle/btl_states_actions.c @@ -28,7 +28,7 @@ BSS s32 RunAwayRewardTotal; BSS s32 RunAwayRewardIncrement; BSS s32 D_8029F264; -s32 dispatch_damage_event_player_0(s32 damageAmount, s32 event); +b32 dispatch_damage_tick_event_player(s32 damageAmount, s32 event); extern ShapeFile gMapShapeData; @@ -50,25 +50,25 @@ void btl_merlee_on_start_turn(void) { if (currentEncounter->curEnemy->flags & ACTOR_FLAG_NO_HEALTH_BAR) { // 46/101 ≈ 45.5% if (temp <= 45) { - playerData->merleeSpellType = MERLEE_SPELL_1; + playerData->merleeSpellType = MERLEE_SPELL_ATK_BOOST; } else if (temp <= 90) { // 45/101 ≈ 44.6% - playerData->merleeSpellType = MERLEE_SPELL_2; + playerData->merleeSpellType = MERLEE_SPELL_DEF_BOOST; } else { // 10/101 ≈ 9.9% playerData->merleeSpellType = MERLEE_SPELL_EXP_BOOST; } } else if (temp <= 30) { // 31/101 ≈ 30.7% - playerData->merleeSpellType = MERLEE_SPELL_1; + playerData->merleeSpellType = MERLEE_SPELL_ATK_BOOST; } else if (temp <= 60) { // 30/101 ≈ 29.7% - playerData->merleeSpellType = MERLEE_SPELL_2; + playerData->merleeSpellType = MERLEE_SPELL_DEF_BOOST; } else if (temp <= 80) { // 20/101 ≈ 19.8% playerData->merleeSpellType = MERLEE_SPELL_EXP_BOOST; } else { // 20/101 ≈ 19.8% playerData->merleeSpellType = MERLEE_SPELL_COIN_BOOST; } } else if (temp <= 30) { // 31/101 ≈ 30.7% - playerData->merleeSpellType = MERLEE_SPELL_1; + playerData->merleeSpellType = MERLEE_SPELL_ATK_BOOST; } else if (temp <= 60) { // 30/101 ≈ 29.7% - playerData->merleeSpellType = MERLEE_SPELL_2; + playerData->merleeSpellType = MERLEE_SPELL_DEF_BOOST; } else if (temp <= 80) { // 20/101 ≈ 19.8% playerData->merleeSpellType = MERLEE_SPELL_EXP_BOOST; } else { // 20/101 ≈ 19.8% @@ -108,25 +108,25 @@ void btl_merlee_on_first_strike(void) { if (currentEncounter->curEnemy->flags & ACTOR_FLAG_NO_HEALTH_BAR) { // 46/101 ≈ 45.5% if (temp <= 45) { - playerData->merleeSpellType = MERLEE_SPELL_1; + playerData->merleeSpellType = MERLEE_SPELL_ATK_BOOST; } else if (temp <= 90) { // 45/101 ≈ 44.6% - playerData->merleeSpellType = MERLEE_SPELL_2; + playerData->merleeSpellType = MERLEE_SPELL_DEF_BOOST; } else { // 10/101 ≈ 9.9% playerData->merleeSpellType = MERLEE_SPELL_EXP_BOOST; } } else if (temp <= 30) { // 31/101 ≈ 30.7% - playerData->merleeSpellType = MERLEE_SPELL_1; + playerData->merleeSpellType = MERLEE_SPELL_ATK_BOOST; } else if (temp <= 60) { // 30/101 ≈ 29.7% - playerData->merleeSpellType = MERLEE_SPELL_2; + playerData->merleeSpellType = MERLEE_SPELL_DEF_BOOST; } else if (temp <= 80) { // 20/101 ≈ 19.8% playerData->merleeSpellType = MERLEE_SPELL_EXP_BOOST; } else { // 20/101 ≈ 19.8% playerData->merleeSpellType = MERLEE_SPELL_COIN_BOOST; } } else if (temp <= 30) { // 31/101 ≈ 30.7% - playerData->merleeSpellType = MERLEE_SPELL_1; + playerData->merleeSpellType = MERLEE_SPELL_ATK_BOOST; } else if (temp <= 60) { // 30/101 ≈ 29.7% - playerData->merleeSpellType = MERLEE_SPELL_2; + playerData->merleeSpellType = MERLEE_SPELL_DEF_BOOST; } else if (temp <= 80) { // 20/101 ≈ 19.8% playerData->merleeSpellType = MERLEE_SPELL_EXP_BOOST; } else { // 20/101 ≈ 19.8% @@ -192,7 +192,7 @@ void btl_state_update_normal_start(void) { Battle* battle; Stage* stage; s32 size; - UiStatus* uiStatus; + StatusBar* statusBar; void* compressedAsset; ModelNode* rootModel; s32 texturesOffset; @@ -256,7 +256,7 @@ void btl_state_update_normal_start(void) { battleStatus->pendingStarPoints = 0; battleStatus->incrementStarPointDelay = 0; battleStatus->damageTaken = 0; - battleStatus->nextMerleeSpellType = MERLEE_SPELL_0; + battleStatus->nextMerleeSpellType = MERLEE_SPELL_NONE; battleStatus->actionCommandMode = ACTION_COMMAND_MODE_NOT_LEARNED; gCameras[CAM_DEFAULT].flags |= CAMERA_FLAG_DISABLED; gCameras[CAM_BATTLE].flags |= CAMERA_FLAG_DISABLED; @@ -302,8 +302,8 @@ void btl_state_update_normal_start(void) { battleStatus->unk_94 = 0; gBattleStatus.flags2 &= ~BS_FLAGS2_PLAYER_TURN_USED; gBattleStatus.flags2 &= ~BS_FLAGS2_PARTNER_TURN_USED; - gBattleStatus.flags2 &= ~BS_FLAGS2_8; - gBattleStatus.flags2 &= ~BS_FLAGS2_10; + gBattleStatus.flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PLAYER; + gBattleStatus.flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PARTNER; gBattleStatus.flags2 &= ~BS_FLAGS2_STORED_TURBO_CHARGE_TURN; gBattleStatus.flags2 &= ~BS_FLAGS2_DOING_JUMP_TUTORIAL; @@ -314,7 +314,7 @@ void btl_state_update_normal_start(void) { BattleScreenFadeAmt = 255; battleStatus->inputBitmask = 0xFFFFF & ~(BUTTON_START | 0xC0); battleStatus->buffEffect = fx_partner_buff(0, 0.0f, 0.0f, 0.0f, 0.0f, 0); - func_800E9810(); + setup_status_bar_for_battle(); gCurrentCameraID = CAM_BATTLE; script = start_script(&EVS_OnBattleInit, EVT_PRIORITY_A, 0); battleStatus->camMovementScript = script; @@ -322,7 +322,7 @@ void btl_state_update_normal_start(void) { gBattleSubState = BTL_SUBSTATE_NORMAL_START_CREATE_ENEMIES; break; case BTL_SUBSTATE_NORMAL_START_CREATE_ENEMIES: - uiStatus = &gUIStatus; + statusBar = &gStatusBar; if (does_script_exist(battleStatus->camMovementScriptID)) { break; } @@ -333,7 +333,7 @@ void btl_state_update_normal_start(void) { battleStatus->controlScriptID = script->id; } - uiStatus->hidden = FALSE; + statusBar->hidden = FALSE; gBattleStatus.flags1 |= BS_FLAGS1_ACTORS_VISIBLE; for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { @@ -360,8 +360,8 @@ void btl_state_update_normal_start(void) { actor->instigatorValue = 0; if (i == 0) { actor->instigatorValue = currentEncounter->instigatorValue; - if (currentEncounter->dizzyAttackStatus == STATUS_KEY_DIZZY) { - inflict_status_set_duration(actor, STATUS_KEY_DIZZY, STATUS_TURN_MOD_DIZZY, currentEncounter->dizzyAttackDuration); + if (currentEncounter->dizzyAttack.status == STATUS_KEY_DIZZY) { + inflict_status_set_duration(actor, STATUS_KEY_DIZZY, STATUS_TURN_MOD_DIZZY, currentEncounter->dizzyAttack.duration); } } } @@ -375,8 +375,8 @@ void btl_state_update_normal_start(void) { actor->instigatorValue = 0; if (i == 0) { actor->instigatorValue = 0; - if (currentEncounter->dizzyAttackStatus == STATUS_KEY_DIZZY) { - inflict_status_set_duration(actor, STATUS_KEY_DIZZY, STATUS_TURN_MOD_DIZZY, currentEncounter->dizzyAttackDuration); + if (currentEncounter->dizzyAttack.status == STATUS_KEY_DIZZY) { + inflict_status_set_duration(actor, STATUS_KEY_DIZZY, STATUS_TURN_MOD_DIZZY, currentEncounter->dizzyAttack.duration); } } @@ -537,8 +537,8 @@ void btl_state_update_begin_turn(void) { if (gBattleSubState == BTL_SUBSTATE_BEGIN_TURN_INIT) { battleStatus->flags2 &= ~BS_FLAGS2_PLAYER_TURN_USED; battleStatus->flags2 &= ~BS_FLAGS2_PARTNER_TURN_USED; - battleStatus->flags2 &= ~BS_FLAGS2_8; - battleStatus->flags2 &= ~BS_FLAGS2_10; + battleStatus->flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PLAYER; + battleStatus->flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PARTNER; battleStatus->merleeAttackBoost = 0; battleStatus->merleeDefenseBoost = 0; battleStatus->flags2 &= ~BS_FLAGS2_IS_FIRST_STRIKE; @@ -850,8 +850,8 @@ back: if (gBattleSubState == BTL_SUBSTATE_BEGIN_PLAYER_TURN_TRY_STATUS_DAMAGE) { if (player->debuff == STATUS_KEY_POISON && player->stoneStatus == 0) { - gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; - dispatch_damage_event_player_0(1, EVENT_HIT); + gBattleStatus.flags1 |= BS_FLAGS1_TRIGGER_EVENTS; + dispatch_damage_tick_event_player(1, EVENT_HIT); } // clear rush flags to initialize @@ -1139,7 +1139,7 @@ void btl_state_update_begin_partner_turn(void) { partner->koStatus = 0; dispatch_event_partner(EVENT_RECOVER_FROM_KO); partner->disableEffect->data.disableX->koDuration = 0; - gBattleStatus.flags2 |= BS_FLAGS2_8; + gBattleStatus.flags2 |= BS_FLAGS2_OVERRIDE_INACTIVE_PLAYER; } } @@ -1161,7 +1161,7 @@ void btl_state_update_begin_partner_turn(void) { partner->handleEventScript = NULL; } - gBattleStatus.flags2 &= ~BS_FLAGS2_8; + gBattleStatus.flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PLAYER; if (btl_check_player_defeated() || btl_check_enemies_defeated()) { return; } @@ -1270,8 +1270,8 @@ void btl_state_update_9(void) { D_8029F258 = 0; gBattleStatus.flags2 &= ~BS_FLAGS2_PLAYER_TURN_USED; gBattleStatus.flags2 &= ~BS_FLAGS2_PARTNER_TURN_USED; - gBattleStatus.flags2 &= ~BS_FLAGS2_8; - gBattleStatus.flags2 &= ~BS_FLAGS2_10; + gBattleStatus.flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PLAYER; + gBattleStatus.flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PARTNER; } if (gBattleSubState == BTL_SUBSTATE_9_1) { @@ -1351,7 +1351,7 @@ void btl_state_update_9(void) { actor->disableEffect->data.disableX->koDuration = 0; } if (actor->debuff == STATUS_KEY_POISON) { - gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; + gBattleStatus.flags1 |= BS_FLAGS1_TRIGGER_EVENTS; dispatch_damage_event_actor_0(actor, 1, EVENT_HIT); D_8029F258 = 20; } @@ -1467,9 +1467,9 @@ void btl_state_update_9(void) { if (D_8029F258 != 0) { D_8029F258--; } else { - if (battleStatus->nextMerleeSpellType == MERLEE_SPELL_2) { + if (battleStatus->nextMerleeSpellType == MERLEE_SPELL_DEF_BOOST) { battleStatus->merleeDefenseBoost = 3; - battleStatus->nextMerleeSpellType = MERLEE_SPELL_0; + battleStatus->nextMerleeSpellType = MERLEE_SPELL_NONE; battleStatus->battlePhase = PHASE_MERLEE_DEFENSE_BONUS; script = start_script(&EVS_Mario_HandlePhase, EVT_PRIORITY_A, 0); player->takeTurnScript = script; @@ -1486,8 +1486,8 @@ void btl_state_update_9(void) { gBattleSubState = BTL_SUBSTATE_9_5; gBattleStatus.flags2 &= ~BS_FLAGS2_PLAYER_TURN_USED; gBattleStatus.flags2 &= ~BS_FLAGS2_PARTNER_TURN_USED; - gBattleStatus.flags2 &= ~BS_FLAGS2_8; - gBattleStatus.flags2 &= ~BS_FLAGS2_10; + gBattleStatus.flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PLAYER; + gBattleStatus.flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PARTNER; } } @@ -1658,7 +1658,7 @@ void btl_state_update_end_turn(void) { } if (gBattleSubState == BTL_SUBSTATE_END_TURN_START_SCRIPTS) { - gBattleStatus.flags2 &= ~BS_FLAGS2_10000; + gBattleStatus.flags2 &= ~BS_FLAGS2_HIDE_BUFF_COUNTERS; player->disableDismissTimer = 0; player->flags |= ACTOR_FLAG_SHOW_STATUS_ICONS | ACTOR_FLAG_USING_IDLE_ANIM; if (partner != NULL) { @@ -1668,9 +1668,9 @@ void btl_state_update_end_turn(void) { btl_set_player_idle_anims(); gBattleStatus.flags1 &= ~BS_FLAGS1_PLAYER_DEFENDING; - playerData->specialBarsFilled += 32; - if (playerData->specialBarsFilled > playerData->maxStarPower * 256) { - playerData->specialBarsFilled = playerData->maxStarPower * 256; + playerData->starPower += SP_PER_SEG; + if (playerData->starPower > playerData->maxStarPower * SP_PER_BAR) { + playerData->starPower = playerData->maxStarPower * SP_PER_BAR; } for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { @@ -1783,8 +1783,8 @@ void btl_state_update_victory(void) { gBattleSubState = BTL_SUBSTATE_VICTORY_CHECK_SWAP; gBattleStatus.flags2 &= ~BS_FLAGS2_PLAYER_TURN_USED; gBattleStatus.flags2 &= ~BS_FLAGS2_PARTNER_TURN_USED; - gBattleStatus.flags2 &= ~BS_FLAGS2_8; - gBattleStatus.flags2 &= ~BS_FLAGS2_10; + gBattleStatus.flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PLAYER; + gBattleStatus.flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PARTNER; gBattleStatus.flags1 &= ~BS_FLAGS1_SHOW_PLAYER_DECORATIONS; if (player->koStatus == STATUS_KEY_DAZE) { @@ -1876,7 +1876,7 @@ void btl_state_update_victory(void) { btl_cam_use_preset(BTL_CAM_DEFAULT); if (battleStatus->nextMerleeSpellType == MERLEE_SPELL_EXP_BOOST) { if (battleStatus->totalStarPoints == 0) { - battleStatus->nextMerleeSpellType = MERLEE_SPELL_0; + battleStatus->nextMerleeSpellType = MERLEE_SPELL_NONE; playerData->merleeTurnCount = 0; playerData->merleeCastsLeft++; } else { @@ -1902,7 +1902,7 @@ void btl_state_update_victory(void) { gBattleSubState = BTL_SUBSTATE_VICTORY_DONE; } else { battleStatus->incrementStarPointDelay = 20; - battleStatus->nextMerleeSpellType = MERLEE_SPELL_0; + battleStatus->nextMerleeSpellType = MERLEE_SPELL_NONE; gBattleSubState = BTL_SUBSTATE_VICTORY_DONE; battleStatus->pendingStarPoints = battleStatus->totalStarPoints + battleStatus->pendingStarPoints + battleStatus->pendingStarPoints; @@ -1956,8 +1956,8 @@ void btl_state_update_end_training_battle(void) { gBattleSubState = BTL_SUBSTATE_END_TRAINING_CHECK_OUTTA_SIGHT; gBattleStatus.flags2 &= ~BS_FLAGS2_PLAYER_TURN_USED; gBattleStatus.flags2 &= ~BS_FLAGS2_PARTNER_TURN_USED; - gBattleStatus.flags2 &= ~BS_FLAGS2_8; - gBattleStatus.flags2 &= ~BS_FLAGS2_10; + gBattleStatus.flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PLAYER; + gBattleStatus.flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PARTNER; if (player->koStatus == STATUS_KEY_DAZE) { dispatch_event_player(EVENT_RECOVER_FROM_KO); @@ -2006,8 +2006,8 @@ void btl_state_update_end_training_battle(void) { battleStatus->stateFreezeCount = 0; gBattleStatus.flags2 &= ~BS_FLAGS2_PLAYER_TURN_USED; gBattleStatus.flags2 &= ~BS_FLAGS2_PARTNER_TURN_USED; - gBattleStatus.flags2 &= ~BS_FLAGS2_8; - gBattleStatus.flags2 &= ~BS_FLAGS2_10; + gBattleStatus.flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PLAYER; + gBattleStatus.flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PARTNER; if (!battleStatus->outtaSightActive) { gBattleSubState = BTL_SUBSTATE_END_TRAINING_RESET_CAM; @@ -2124,7 +2124,7 @@ void btl_state_update_end_battle(void) { if (battleStatus->nextMerleeSpellType == MERLEE_SPELL_COIN_BOOST) { encounterStatus->hasMerleeCoinBonus = TRUE; - battleStatus->nextMerleeSpellType = MERLEE_SPELL_0; + battleStatus->nextMerleeSpellType = MERLEE_SPELL_NONE; } encounterStatus->damageTaken = battleStatus->damageTaken; @@ -2214,8 +2214,12 @@ void btl_state_update_run_away(void) { case BTL_SUBSTATE_RUN_AWAY_EXEC_SCRIPT: battleStatus->stateFreezeCount = 0; gBattleStatus.flags1 &= ~BS_FLAGS1_BATTLE_FLED; - gBattleStatus.flags2 |= BS_FLAGS2_10 | BS_FLAGS2_8 | BS_FLAGS2_PARTNER_TURN_USED | BS_FLAGS2_PLAYER_TURN_USED; - playerData->unk_2A6++; + gBattleStatus.flags2 |= BS_FLAGS2_OVERRIDE_INACTIVE_PARTNER; + gBattleStatus.flags2 |= BS_FLAGS2_OVERRIDE_INACTIVE_PLAYER; + gBattleStatus.flags2 |= BS_FLAGS2_PARTNER_TURN_USED; + gBattleStatus.flags2 |= BS_FLAGS2_PLAYER_TURN_USED; + + playerData->fleeAttempts++; btl_cam_use_preset(BTL_CAM_PRESET_25); btl_cam_target_actor(ACTOR_PLAYER); @@ -2273,7 +2277,7 @@ void btl_state_update_run_away(void) { gBattleSubState = BTL_SUBSTATE_RUN_AWAY_EXEC_POST_FAILURE; } else { currentEncounter->battleOutcome = OUTCOME_PLAYER_FLED; - if (is_ability_active(ABILITY_RUNAWAY_PAY) == 0) { + if (!is_ability_active(ABILITY_RUNAWAY_PAY)) { gBattleSubState = BTL_SUBSTATE_RUN_AWAY_DONE; } else { status_bar_start_blinking_starpoints(); @@ -2377,8 +2381,8 @@ void btl_state_update_defeat(void) { battleStatus->flags1 &= ~BS_FLAGS1_SHOW_PLAYER_DECORATIONS; gBattleStatus.flags2 &= ~BS_FLAGS2_PLAYER_TURN_USED; gBattleStatus.flags2 &= ~BS_FLAGS2_PARTNER_TURN_USED; - gBattleStatus.flags2 &= ~BS_FLAGS2_8; - gBattleStatus.flags2 &= ~BS_FLAGS2_10; + gBattleStatus.flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PLAYER; + gBattleStatus.flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PARTNER; battleStatus->stateFreezeCount = 0; if (player->debuff != 0) { @@ -2473,7 +2477,7 @@ void btl_state_update_change_partner(void) { player->flags &= ~ACTOR_FLAG_SHOW_STATUS_ICONS; partner->flags &= ~ACTOR_FLAG_SHOW_STATUS_ICONS; battleStatus->stateFreezeCount = 0; - gBattleStatus.flags2 |= BS_FLAGS2_10; + gBattleStatus.flags2 |= BS_FLAGS2_OVERRIDE_INACTIVE_PARTNER; btl_cam_use_preset(BTL_CAM_PRESET_19); btl_cam_set_target_pos(-89.0, 40.0, -99.0); btl_cam_set_zoom(372); @@ -2571,15 +2575,15 @@ void btl_state_update_change_partner(void) { if (battleStatus->stateFreezeCount != 0) { break; } - gBattleStatus.flags2 &= ~BS_FLAGS2_10; + gBattleStatus.flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PARTNER; if (!(gBattleStatus.flags1 & BS_FLAGS1_PARTNER_ACTING)) { - if (player_team_is_ability_active(player, ABILITY_QUICK_CHANGE) != FALSE) { + if (player_team_is_ability_active(player, ABILITY_QUICK_CHANGE)) { btl_set_state(BATTLE_STATE_PREPARE_MENU); } else { btl_set_state(BATTLE_STATE_END_PLAYER_TURN); } } else { - if (player_team_is_ability_active(player, ABILITY_QUICK_CHANGE) == FALSE) { + if (!player_team_is_ability_active(player, ABILITY_QUICK_CHANGE)) { btl_set_state(BATTLE_STATE_END_PARTNER_TURN); } else { btl_set_state(BATTLE_STATE_PREPARE_MENU); @@ -2619,7 +2623,7 @@ void btl_state_update_player_move(void) { btl_cam_target_actor(ACTOR_PLAYER); gBattleStatus.flags1 &= ~BS_FLAGS1_SHOW_PLAYER_DECORATIONS; player->statusAfflicted = 0; - gBattleStatus.flags2 |= BS_FLAGS2_8; + gBattleStatus.flags2 |= BS_FLAGS2_OVERRIDE_INACTIVE_PLAYER; gBattleStatus.flags1 &= ~BS_FLAGS1_YIELD_TURN; for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { @@ -2638,9 +2642,9 @@ void btl_state_update_player_move(void) { } if (battleStatus->moveCategory == BTL_MENU_TYPE_JUMP || battleStatus->moveCategory == BTL_MENU_TYPE_SMASH) { - if (battleStatus->nextMerleeSpellType == MERLEE_SPELL_1) { + if (battleStatus->nextMerleeSpellType == MERLEE_SPELL_ATK_BOOST) { battleStatus->merleeAttackBoost = 3; - battleStatus->nextMerleeSpellType = MERLEE_SPELL_0; + battleStatus->nextMerleeSpellType = MERLEE_SPELL_NONE; battleStatus->battlePhase = PHASE_MERLEE_ATTACK_BONUS; script = start_script(&EVS_Mario_HandlePhase, EVT_PRIORITY_A, 0); player->takeTurnScript = script; @@ -2778,7 +2782,7 @@ void btl_state_update_player_move(void) { decrement_status_bar_disabled(); gBattleStatus.flags1 |= BS_FLAGS1_SHOW_PLAYER_DECORATIONS; - gBattleStatus.flags2 &= ~BS_FLAGS2_8; + gBattleStatus.flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PLAYER; if (btl_check_player_defeated()) { return; } @@ -3174,7 +3178,7 @@ void btl_state_update_partner_move(void) { player->flags &= ~ACTOR_FLAG_SHOW_STATUS_ICONS; deduct_current_move_fp(); btl_cam_target_actor(ACTOR_PARTNER); - gBattleStatus.flags2 |= BS_FLAGS2_10; + gBattleStatus.flags2 |= BS_FLAGS2_OVERRIDE_INACTIVE_PARTNER; gBattleStatus.flags1 &= ~BS_FLAGS1_YIELD_TURN; for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { @@ -3420,7 +3424,7 @@ void btl_state_update_end_partner_turn(void) { return; } battleStatus->flags1 &= ~BS_FLAGS1_PARTNER_ACTING; - battleStatus->flags2 &= ~BS_FLAGS2_10; + battleStatus->flags2 &= ~BS_FLAGS2_OVERRIDE_INACTIVE_PARTNER; if (battleStatus->unk_94 < 0) { battleStatus->unk_94 = 0; @@ -3529,7 +3533,7 @@ void btl_state_update_next_enemy(void) { gBattleStatus.flags2 &= ~BS_FLAGS2_PLAYER_TURN_USED; gBattleStatus.flags2 &= ~BS_FLAGS2_PARTNER_TURN_USED; - gBattleStatus.flags2 |= BS_FLAGS2_10000; + gBattleStatus.flags2 |= BS_FLAGS2_HIDE_BUFF_COUNTERS; D_8029F244 = enemy->unk_134; if (enemy->handlePhaseSource != NULL) { @@ -4075,7 +4079,7 @@ void btl_state_update_partner_striking_first(void) { create_current_pos_target_list(partner); target = &partner->targetData[partner->targetIndexList[0]]; partner->targetActorID = target->actorID; - partner->targetPartIndex = target->partID; + partner->targetPartID = target->partID; battleStatus->stateFreezeCount = 0; battleStatus->lastAttackDamage = 0; battleStatus->curDamageSource = DMG_SRC_DEFAULT; diff --git a/src/battle/btl_states_menus.c b/src/battle/btl_states_menus.c index 560fe9c1cd..8d7d1fdf22 100644 --- a/src/battle/btl_states_menus.c +++ b/src/battle/btl_states_menus.c @@ -2550,7 +2550,7 @@ void btl_state_update_player_menu(void) { if (playerActor->targetListLength == 0) { battleStatus->submenuStatus[entryIdx] = -2; } - if (playerData->specialBarsFilled / 256 < moveData->costFP) { + if (playerData->starPower / SP_PER_BAR < moveData->costFP) { battleStatus->submenuStatus[entryIdx] = 0; } if (gBattleStatus.flags2 & BS_FLAGS2_NO_TARGET_AVAILABLE) { @@ -2572,7 +2572,7 @@ void btl_state_update_player_menu(void) { if (playerActor->targetListLength == 0) { battleStatus->submenuStatus[entryIdx] = -2; } - if (playerData->specialBarsFilled / 256 < moveData->costFP) { + if (playerData->starPower / SP_PER_BAR < moveData->costFP) { battleStatus->submenuStatus[entryIdx] = 0; } if (gBattleStatus.flags2 & BS_FLAGS2_NO_TARGET_AVAILABLE) { @@ -2595,7 +2595,7 @@ void btl_state_update_player_menu(void) { if (playerActor->targetListLength == 0) { battleStatus->submenuStatus[entryIdx] = -2; } - if (playerData->specialBarsFilled / 256 < moveData->costFP) { + if (playerData->starPower / SP_PER_BAR < moveData->costFP) { battleStatus->submenuStatus[entryIdx] = 0; } if (gBattleStatus.flags2 & BS_FLAGS2_NO_TARGET_AVAILABLE) { @@ -3494,7 +3494,7 @@ void btl_state_update_player_menu(void) { gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_2; break; case BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_2: - if (popup->result == POPUP_RESULT_MINUS_1) { + if (popup->result == POPUP_RESULT_INVALID) { gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_7; } else if (popup->result != POPUP_RESULT_CHOOSING) { if (popup->result == POPUP_RESULT_CANCEL) { @@ -3553,7 +3553,7 @@ void btl_state_update_player_menu(void) { case BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_7: set_window_update(WINDOW_ID_6, WINDOW_UPDATE_HIDE); set_window_update(WINDOW_ID_7, WINDOW_UPDATE_HIDE); - if (popup->result != POPUP_RESULT_MINUS_1) { + if (popup->result != POPUP_RESULT_INVALID) { set_window_update(WINDOW_ID_6, WINDOW_UPDATE_9); set_window_update(WINDOW_ID_7, WINDOW_UPDATE_9); gBattleSubState = BTL_SUBSTATE_PLAYER_MENU_CHANGE_MEMBER_2; @@ -4084,7 +4084,7 @@ void btl_state_update_partner_menu(void) { gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_2; break; case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_2: - if (popupMenu->result == POPUP_RESULT_MINUS_1) { + if (popupMenu->result == POPUP_RESULT_INVALID) { gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_7; } else if (popupMenu->result != POPUP_RESULT_CHOOSING) { if (popupMenu->result == POPUP_RESULT_CANCEL) { @@ -4135,7 +4135,7 @@ void btl_state_update_partner_menu(void) { btl_main_menu_destroy(); break; case BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_7: - if (popupMenu->result != POPUP_RESULT_MINUS_1) { + if (popupMenu->result != POPUP_RESULT_INVALID) { gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_UNUSED_CHANGE_PARTNER_2; } break; @@ -4361,7 +4361,7 @@ void btl_state_update_partner_menu(void) { gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_2; break; case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_2: - if (popupMenu->result == POPUP_RESULT_MINUS_1) { + if (popupMenu->result == POPUP_RESULT_INVALID) { gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_7; } else if (popupMenu->result != POPUP_RESULT_CHOOSING) { if (popupMenu->result == POPUP_RESULT_CANCEL) { @@ -4420,7 +4420,7 @@ void btl_state_update_partner_menu(void) { case BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_7: set_window_update(WINDOW_ID_6, WINDOW_UPDATE_HIDE); set_window_update(WINDOW_ID_7, WINDOW_UPDATE_HIDE); - if (popupMenu->result != POPUP_RESULT_MINUS_1) { + if (popupMenu->result != POPUP_RESULT_INVALID) { set_window_update(WINDOW_ID_6, WINDOW_UPDATE_9); set_window_update(WINDOW_ID_7, WINDOW_UPDATE_9); gBattleSubState = BTL_SUBSTATE_PARTNER_MENU_CHANGE_PARTNER_2; @@ -5036,7 +5036,7 @@ void btl_state_update_select_target(void) { gBattleStatus.flags1 &= ~BS_FLAGS1_MENU_OPEN; target = &actor->targetData[targetIndexList[actor->selectedTargetIndex]]; actor->targetActorID = target->actorID; - actor->targetPartIndex = target->partID; + actor->targetPartID = target->partID; // free the HUD elements for the target pointers for (i = 0; i < targetListLength; i++) { diff --git a/src/battle/common/actor/albino_dino.inc.c b/src/battle/common/actor/albino_dino.inc.c index dda1e36e33..97cafc4c53 100644 --- a/src/battle/common/actor/albino_dino.inc.c +++ b/src/battle/common/actor/albino_dino.inc.c @@ -264,15 +264,15 @@ EvtScript N(EVS_TakeTurn) = { EVT_EXEC_GET_TID(N(EVS_AddWalkQuakeFX), LVar9) EVT_THREAD EVT_LOOP(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_030B) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ALBINO_DINO_STEP_A) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02FD) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ALBINO_DINO_STEP_B) EVT_WAIT(4) EVT_END_LOOP EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_AlbinoDino_Run) EVT_WAIT(20) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarF, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -317,7 +317,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) // invalid status field has 24% chance, but no status and doesn't have STATUS_FLAG_80000000 set - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 24, DMG_TACKLE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 24, DMG_TACKLE, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -327,7 +327,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02FD) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ALBINO_DINO_STEP_B) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_AlbinoDino_Idle) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 3, EVT_FLOAT(1.0)) EVT_WAIT(10) diff --git a/src/battle/common/actor/amazy_dayzee.inc.c b/src/battle/common/actor/amazy_dayzee.inc.c index f60db765c3..b233abf437 100644 --- a/src/battle/common/actor/amazy_dayzee.inc.c +++ b/src/battle/common/actor/amazy_dayzee.inc.c @@ -292,7 +292,7 @@ EvtScript N(EVS_Attack_Sing) = { EVT_END_LOOP EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Dayzee_Amazy_Anim01) EVT_WAIT(10) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -315,7 +315,7 @@ EvtScript N(EVS_Attack_Sing) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 15), DMG_SING, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 15), DMG_SING, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) diff --git a/src/battle/common/actor/anti_guy.inc.c b/src/battle/common/actor/anti_guy.inc.c index 78e42f0033..62b49f8cc6 100644 --- a/src/battle/common/actor/anti_guy.inc.c +++ b/src/battle/common/actor/anti_guy.inc.c @@ -261,7 +261,7 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -320,7 +320,7 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim05) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_TACKLE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_TACKLE, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 15) @@ -366,7 +366,7 @@ EvtScript N(EVS_Attack_Vault) = { EVT_SUB(LVar0, 40) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -424,7 +424,7 @@ EvtScript N(EVS_Attack_Vault) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(JumpToGoal, ACTOR_SELF, 18, FALSE, TRUE, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_VAULT, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_VAULT, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -472,10 +472,10 @@ EvtScript N(EVS_Attack_Vault) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_COLLAPSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_ShyGuy_Black_Anim10) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20C3) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DISAPPOINTED) EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(RandInt, 100, LVar0) EVT_IF_LT(LVar0, 50) diff --git a/src/battle/common/actor/bandit.inc.c b/src/battle/common/actor/bandit.inc.c index a1996682ff..aaf546e47f 100644 --- a/src/battle/common/actor/bandit.inc.c +++ b/src/battle/common/actor/bandit.inc.c @@ -540,9 +540,9 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 35, 0, 0) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20C2) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BANDIT_STEAL) 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_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -588,7 +588,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_TACKLE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_TACKLE, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -651,7 +651,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bandit_LookUp) EVT_WAIT(20) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20C3) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DISAPPOINTED) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bandit_Sleep) EVT_WAIT(20) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bandit_Run) diff --git a/src/battle/common/actor/bob_omb.inc.c b/src/battle/common/actor/bob_omb.inc.c index 91770eb26b..9940310ea2 100644 --- a/src/battle/common/actor/bob_omb.inc.c +++ b/src/battle/common/actor/bob_omb.inc.c @@ -528,7 +528,7 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_WAIT(5) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Run) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -581,14 +581,14 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HIT_SHOCK) EVT_WAIT(20) EVT_EXEC_WAIT(N(EVS_Explode)) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_BLAST, 0, 0, DMG_EXPLOSION, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_BLAST, 0, 0, DMG_EXPLOSION, BS_FLAGS1_TRIGGER_EVENTS) EVT_RETURN EVT_END_SWITCH EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.1)) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_TACKLE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_TACKLE, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_Idle) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -626,7 +626,7 @@ EvtScript N(EVS_Attack_Blast) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_CALL(PlayLoopingSoundAtActor, ACTOR_SELF, 0, SOUND_LOOP_BOBOMB_FUSE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -674,7 +674,7 @@ EvtScript N(EVS_Attack_Blast) = { EVT_EXEC_WAIT(N(EVS_Explode)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bobomb_BurnStill) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_BLAST | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_EXPLOSION, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_BLAST | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_EXPLOSION, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(15) EVT_SET_CONST(LVar0, PRT_MAIN) diff --git a/src/battle/common/actor/bony_beetle.inc.c b/src/battle/common/actor/bony_beetle.inc.c index 793a20f895..edf63e724f 100644 --- a/src/battle/common/actor/bony_beetle.inc.c +++ b/src/battle/common/actor/bony_beetle.inc.c @@ -257,14 +257,14 @@ EvtScript N(EVS_TrySwitchingSpikyState) = { EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_State, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(AVAL_State_SmoothUpright) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20CE) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BONY_BEETLE_EXTEND_SPIKES) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_State, AVAL_State_SpikyUpright) EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_SPIKY_TOP, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim2E) EVT_WAIT(25) EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(SpikyAnims))) EVT_CASE_EQ(AVAL_State_SpikyUpright) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20CF) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BONY_BEETLE_RETRACT_SPIKES) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_State, AVAL_State_SmoothUpright) EVT_CALL(SetPartEventBits, ACTOR_SELF, PRT_MAIN, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim2F) @@ -440,13 +440,13 @@ EvtScript N(EVS_Attack_ShellToss) = { EVT_WAIT(5) EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim16) EVT_WAIT(15) EVT_LABEL(100) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_TOSS) 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_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -484,7 +484,7 @@ EvtScript N(EVS_Attack_ShellToss) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_SHELL_TOSS, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_SHELL_TOSS, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -682,7 +682,7 @@ EvtScript N(EVS_Attack_SpikeBounce) = { EVT_WAIT(5) EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, LVar1, LVar2, 32, 12, 0, 10, 0) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BonyBeetle_Anim17) EVT_WAIT(15) EVT_LABEL(100) @@ -693,9 +693,9 @@ EvtScript N(EVS_Attack_SpikeBounce) = { EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D3) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_TOSS) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, DMG_SPIKE_BOUNCE, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, DMG_SPIKE_BOUNCE, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -799,7 +799,7 @@ EvtScript N(EVS_Attack_SpikeBounce) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_SPIKE_BOUNCE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_SPIKE_BOUNCE, BS_FLAGS1_TRIGGER_EVENTS) 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/bullet_bill.inc.c b/src/battle/common/actor/bullet_bill.inc.c index f0d0782864..db777f0937 100644 --- a/src/battle/common/actor/bullet_bill.inc.c +++ b/src/battle/common/actor/bullet_bill.inc.c @@ -253,7 +253,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, -2, 0) EVT_WAIT(15) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_19) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 2, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -288,7 +288,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_EXEC_WAIT(N(EVS_MakeExplosionFX)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, DMG_IMPACT, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, DMG_IMPACT, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(YieldTurn) EVT_SET_CONST(LVar0, PRT_MAIN) diff --git a/src/battle/common/actor/buzzy_beetle.inc.c b/src/battle/common/actor/buzzy_beetle.inc.c index ed34915c07..4edcb80363 100644 --- a/src/battle/common/actor/buzzy_beetle.inc.c +++ b/src/battle/common/actor/buzzy_beetle.inc.c @@ -610,7 +610,7 @@ EvtScript N(EVS_TakeTurn_Ceiling) = { EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_END_IF - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, DMG_CEILING_DROP, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, DMG_CEILING_DROP, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -670,7 +670,7 @@ EvtScript N(EVS_TakeTurn_Ceiling) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_CEILING_DROP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_CEILING_DROP, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -751,12 +751,12 @@ EvtScript N(EVS_TakeTurn_Ground) = { EVT_WAIT(5) EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BuzzyBeetle_Anim05) EVT_WAIT(20) 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_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_TOSS) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -805,7 +805,7 @@ EvtScript N(EVS_TakeTurn_Ground) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(14.0)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_SHELL_TOSS, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_SHELL_TOSS, BS_FLAGS1_TRIGGER_EVENTS) 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/bzzap.inc.c b/src/battle/common/actor/bzzap.inc.c index 336f9f7694..e0fa0033fe 100644 --- a/src/battle/common/actor/bzzap.inc.c +++ b/src/battle/common/actor/bzzap.inc.c @@ -344,7 +344,7 @@ EvtScript N(EVS_Attack_Sting) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 52, 10, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_COS_IN) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -358,7 +358,7 @@ EvtScript N(EVS_Attack_Sting) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_QUADRATIC_OUT) EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20CA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BZZAP_STING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bzzap_Anim04) EVT_WAIT(10) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) @@ -386,11 +386,11 @@ EvtScript N(EVS_Attack_Sting) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_QUADRATIC_OUT) EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20CA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BZZAP_STING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bzzap_Anim04) EVT_WAIT(6) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 40), DMG_STING, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 40), DMG_STING, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -484,13 +484,13 @@ EvtScript N(EVS_Attack_CallSwarm) = { EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_SWARM_3, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_SWARM_4, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_SWARM_5, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20CC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BZZAP_CALL_SWARM) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bzzap_Anim05) EVT_WAIT(40) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Bzzap_Anim01) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(PlaySound, SOUND_0358) + EVT_CALL(PlaySound, SOUND_MINI_BZZAP_BUZZ) EVT_SET(LVar0, PRT_SWARM_1) EVT_EXEC_GET_TID(N(EVS_SummonSwarmPart), LVarA) EVT_WAIT(11) @@ -511,13 +511,13 @@ EvtScript N(EVS_Attack_CallSwarm) = { EVT_IF_EQ(LVar0, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_THREAD - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SWARM_1, SOUND_20CB) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SWARM_1, SOUND_MINI_BZZAP_STING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_SWARM_1, ANIM_Bzzap_Anim04) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -30, -20, 1) @@ -536,7 +536,7 @@ EvtScript N(EVS_Attack_CallSwarm) = { EVT_END_THREAD EVT_WAIT(11) EVT_THREAD - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SWARM_2, SOUND_20CB) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SWARM_2, SOUND_MINI_BZZAP_STING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_SWARM_2, ANIM_Bzzap_Anim04) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -30, -20, 1) @@ -555,7 +555,7 @@ EvtScript N(EVS_Attack_CallSwarm) = { EVT_END_THREAD EVT_WAIT(11) EVT_THREAD - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SWARM_3, SOUND_20CB) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SWARM_3, SOUND_MINI_BZZAP_STING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_SWARM_3, ANIM_Bzzap_Anim04) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -30, -20, 1) @@ -574,7 +574,7 @@ EvtScript N(EVS_Attack_CallSwarm) = { EVT_END_THREAD EVT_WAIT(11) EVT_THREAD - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SWARM_4, SOUND_20CB) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SWARM_4, SOUND_MINI_BZZAP_STING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_SWARM_4, ANIM_Bzzap_Anim04) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -30, -20, 1) @@ -593,7 +593,7 @@ EvtScript N(EVS_Attack_CallSwarm) = { EVT_END_THREAD EVT_WAIT(11) EVT_THREAD - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SWARM_5, SOUND_20CB) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SWARM_5, SOUND_MINI_BZZAP_STING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_SWARM_5, ANIM_Bzzap_Anim04) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -30, -20, 1) @@ -617,7 +617,7 @@ EvtScript N(EVS_Attack_CallSwarm) = { EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_WAIT(30) - EVT_CALL(StopSound, SOUND_0358) + EVT_CALL(StopSound, SOUND_MINI_BZZAP_BUZZ) EVT_CALL(YieldTurn) EVT_CALL(EnableIdleScript, ACTOR_SELF, IDLE_SCRIPT_ENABLE) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -625,7 +625,7 @@ EvtScript N(EVS_Attack_CallSwarm) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_THREAD - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SWARM_1, SOUND_20CB) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SWARM_1, SOUND_MINI_BZZAP_STING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_SWARM_1, ANIM_Bzzap_Anim04) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -10, -10, 1) @@ -634,7 +634,7 @@ EvtScript N(EVS_Attack_CallSwarm) = { EVT_CALL(FlyPartTo, ACTOR_SELF, PRT_SWARM_1, LVar0, LVar1, LVar2, 0, -10, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SWARM, BS_FLAGS1_10) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SWARM, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_SWARM_1, ANIM_Bzzap_Anim03) EVT_CALL(SetPartYaw, ACTOR_SELF, PRT_SWARM_1, 180) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -645,7 +645,7 @@ EvtScript N(EVS_Attack_CallSwarm) = { EVT_END_THREAD EVT_WAIT(11) EVT_THREAD - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SWARM_2, SOUND_20CB) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SWARM_2, SOUND_MINI_BZZAP_STING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_SWARM_2, ANIM_Bzzap_Anim04) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -10, -10, 1) @@ -654,7 +654,7 @@ EvtScript N(EVS_Attack_CallSwarm) = { EVT_CALL(FlyPartTo, ACTOR_SELF, PRT_SWARM_2, LVar0, LVar1, LVar2, 0, -10, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SWARM, BS_FLAGS1_40) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SWARM, BS_FLAGS1_NICE_HIT) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_SWARM_2, ANIM_Bzzap_Anim03) EVT_CALL(SetPartYaw, ACTOR_SELF, PRT_SWARM_2, 180) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -665,7 +665,7 @@ EvtScript N(EVS_Attack_CallSwarm) = { EVT_END_THREAD EVT_WAIT(11) EVT_THREAD - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SWARM_3, SOUND_20CB) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SWARM_3, SOUND_MINI_BZZAP_STING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_SWARM_3, ANIM_Bzzap_Anim04) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -10, -10, 1) @@ -674,7 +674,7 @@ EvtScript N(EVS_Attack_CallSwarm) = { EVT_CALL(FlyPartTo, ACTOR_SELF, PRT_SWARM_3, LVar0, LVar1, LVar2, 0, -10, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SWARM, BS_FLAGS1_40) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SWARM, BS_FLAGS1_NICE_HIT) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_SWARM_3, ANIM_Bzzap_Anim03) EVT_CALL(SetPartYaw, ACTOR_SELF, PRT_SWARM_3, 180) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -685,7 +685,7 @@ EvtScript N(EVS_Attack_CallSwarm) = { EVT_END_THREAD EVT_WAIT(11) EVT_THREAD - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SWARM_4, SOUND_20CB) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SWARM_4, SOUND_MINI_BZZAP_STING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_SWARM_4, ANIM_Bzzap_Anim04) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -10, -10, 1) @@ -694,7 +694,7 @@ EvtScript N(EVS_Attack_CallSwarm) = { EVT_CALL(FlyPartTo, ACTOR_SELF, PRT_SWARM_4, LVar0, LVar1, LVar2, 0, -10, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SWARM, BS_FLAGS1_40) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SWARM, BS_FLAGS1_NICE_HIT) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_SWARM_4, ANIM_Bzzap_Anim03) EVT_CALL(SetPartYaw, ACTOR_SELF, PRT_SWARM_4, 180) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -705,7 +705,7 @@ EvtScript N(EVS_Attack_CallSwarm) = { EVT_END_THREAD EVT_WAIT(11) EVT_WAIT(1) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SWARM_5, SOUND_20CB) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SWARM_5, SOUND_MINI_BZZAP_STING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_SWARM_5, ANIM_Bzzap_Anim04) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -10, -10, 1) @@ -714,7 +714,7 @@ EvtScript N(EVS_Attack_CallSwarm) = { EVT_CALL(FlyPartTo, ACTOR_SELF, PRT_SWARM_5, LVar0, LVar1, LVar2, 0, -10, EASING_LINEAR) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SWARM, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SWARM, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -726,7 +726,7 @@ EvtScript N(EVS_Attack_CallSwarm) = { EVT_ADD(LVar2, 100) EVT_CALL(FlyPartTo, ACTOR_SELF, PRT_SWARM_5, LVar0, LVar1, LVar2, 0, 10, EASING_LINEAR) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_SWARM_5, ACTOR_PART_FLAG_INVISIBLE, TRUE) - EVT_CALL(StopSound, SOUND_0358) + EVT_CALL(StopSound, SOUND_MINI_BZZAP_BUZZ) EVT_CALL(YieldTurn) EVT_END_CASE_GROUP EVT_END_SWITCH diff --git a/src/battle/common/actor/cleft.inc.c b/src/battle/common/actor/cleft.inc.c index 80ba03af5a..47a14a06c2 100644 --- a/src/battle/common/actor/cleft.inc.c +++ b/src/battle/common/actor/cleft.inc.c @@ -468,9 +468,9 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Cleft_Anim00) EVT_WAIT(8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CLEFT_TACKLE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, DMG_TACKLE, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, DMG_TACKLE, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -520,7 +520,7 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_TACKLE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_TACKLE, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Cleft_Anim02) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_SWITCH(LVar0) diff --git a/src/battle/common/actor/clubba.inc.c b/src/battle/common/actor/clubba.inc.c index 0874c7a294..3f1a951a8c 100644 --- a/src/battle/common/actor/clubba.inc.c +++ b/src/battle/common/actor/clubba.inc.c @@ -239,12 +239,12 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleClubba_Anim01) EVT_WAIT(10) EVT_END_IF - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20C5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CLUBBA_SWING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleClubba_Anim08) EVT_WAIT(10) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) @@ -267,12 +267,12 @@ EvtScript N(EVS_TakeTurn) = { EVT_END_SWITCH EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleClubba_Anim09) EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20C5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CLUBBA_SWING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleClubba_Anim0A) EVT_WAIT(2) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SWING, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SWING, BS_FLAGS1_TRIGGER_EVENTS) 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/crazee_dayzee.inc.c b/src/battle/common/actor/crazee_dayzee.inc.c index 52225dc771..bac889febc 100644 --- a/src/battle/common/actor/crazee_dayzee.inc.c +++ b/src/battle/common/actor/crazee_dayzee.inc.c @@ -285,7 +285,7 @@ EvtScript N(EVS_Attack_Sing) = { EVT_END_LOOP EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Dayzee_Anim01) EVT_WAIT(10) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -308,7 +308,7 @@ EvtScript N(EVS_Attack_Sing) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 20), DMG_SING, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 20), DMG_SING, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) diff --git a/src/battle/common/actor/dark_koopa.inc.c b/src/battle/common/actor/dark_koopa.inc.c index eab7c1745c..d14ac8e030 100644 --- a/src/battle/common/actor/dark_koopa.inc.c +++ b/src/battle/common/actor/dark_koopa.inc.c @@ -610,14 +610,14 @@ 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(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_ShellSpin) EVT_WAIT(10) 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(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_TOSS) 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_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -669,7 +669,7 @@ EvtScript N(EVS_Attack_ShellToss) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_STATUS_ALWAYS_HITS, SUPPRESS_EVENT_ALL, 0, DMG_SHELL_TOSS, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_STATUS_ALWAYS_HITS, SUPPRESS_EVENT_ALL, 0, DMG_SHELL_TOSS, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -737,13 +737,13 @@ EvtScript N(EVS_Attack_Whirlwind) = { EVT_WAIT(2) EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_ShellSpin) EVT_WAIT(20) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DIZZY_SHELL) EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, WHIRLWIND_DECOR_IDX, ACTOR_DECORATION_WHIRLWIND) EVT_WAIT(40) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, 0, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, 0, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -771,7 +771,7 @@ EvtScript N(EVS_Attack_Whirlwind) = { EVT_END_SWITCH EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_ALL, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 2, 60), 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_ALL, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 2, 60), 0, BS_FLAGS1_TRIGGER_EVENTS) 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/dark_paratroopa.inc.c b/src/battle/common/actor/dark_paratroopa.inc.c index 378fb2830d..e567299573 100644 --- a/src/battle/common/actor/dark_paratroopa.inc.c +++ b/src/battle/common/actor/dark_paratroopa.inc.c @@ -464,7 +464,7 @@ EvtScript N(EVS_TakeTurn_Flying) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -16, EASING_LINEAR) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_01) EVT_WAIT(5) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -554,7 +554,7 @@ EvtScript N(EVS_TakeTurn_Flying) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_ParaTroopa_Dark_ShellDive) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_SKY_DIVE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_SKY_DIVE, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -1168,14 +1168,14 @@ 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(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_ShellSpin) EVT_WAIT(10) 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(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_TOSS) 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_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1227,7 +1227,7 @@ EvtScript N(EVS_Attack_ShellToss) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_STATUS_ALWAYS_HITS, SUPPRESS_EVENT_ALL, 0, DMG_SHELL_TOSS, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_STATUS_ALWAYS_HITS, SUPPRESS_EVENT_ALL, 0, DMG_SHELL_TOSS, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -1295,13 +1295,13 @@ EvtScript N(EVS_Attack_Whirlwind) = { EVT_WAIT(2) EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_Dark_ShellSpin) EVT_WAIT(20) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DIZZY_SHELL) EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, WHIRLWIND_DECOR_IDX, ACTOR_DECORATION_WHIRLWIND) EVT_WAIT(40) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, 0, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, 0, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1329,7 +1329,7 @@ EvtScript N(EVS_Attack_Whirlwind) = { EVT_END_SWITCH EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_ALL, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 2, 60), 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_ALL, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 2, 60), 0, BS_FLAGS1_TRIGGER_EVENTS) 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/dry_bones.inc.c b/src/battle/common/actor/dry_bones.inc.c index d55d555ac3..54a557a26f 100644 --- a/src/battle/common/actor/dry_bones.inc.c +++ b/src/battle/common/actor/dry_bones.inc.c @@ -491,7 +491,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_ELSE EVT_CALL(SetPartScale, ACTOR_SELF, PRT_BONE, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_END_IF - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -539,7 +539,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetPartMoveSpeed, ACTOR_SELF, PRT_BONE, EVT_FLOAT(12.0)) EVT_CALL(RunPartTo, ACTOR_SELF, PRT_BONE, LVar0, LVar1, LVar2, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 4, BS_FLAGS1_TRIGGER_EVENTS) 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.inc.c b/src/battle/common/actor/duplighost.inc.c index 06089a7a79..6975518177 100644 --- a/src/battle/common/actor/duplighost.inc.c +++ b/src/battle/common/actor/duplighost.inc.c @@ -274,7 +274,7 @@ EvtScript N(EVS_Attack_FlyingTackle) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Duplighost_Anim07) EVT_WAIT(20) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_DUPLIGHOST_LEAP, 0) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -317,7 +317,7 @@ EvtScript N(EVS_Attack_FlyingTackle) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 12, FALSE, TRUE, FALSE) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_FLYING_LEAP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_FLYING_LEAP, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -599,7 +599,7 @@ EvtScript N(EVS_CopyPartner) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GHOST_TRANSFORM) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Duplighost_Anim06) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) diff --git a/src/battle/common/actor/duplighost/ghost_bombette.inc.c b/src/battle/common/actor/duplighost/ghost_bombette.inc.c index c1d534fa83..cb593653a5 100644 --- a/src/battle/common/actor/duplighost/ghost_bombette.inc.c +++ b/src/battle/common/actor/duplighost/ghost_bombette.inc.c @@ -260,8 +260,8 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBombette_Brace) EVT_WAIT(15) 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_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOMBETTE_BODY_SLAM) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -310,13 +310,13 @@ EvtScript N(EVS_TakeTurn) = { EVT_SWITCH(LVar9) EVT_CASE_EQ(PARTNER_RANK_NORMAL) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_SUPER) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 3, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_ULTRA) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/common/actor/duplighost/ghost_bow.inc.c b/src/battle/common/actor/duplighost/ghost_bow.inc.c index b9f3c17a37..3060ffbfdf 100644 --- a/src/battle/common/actor/duplighost/ghost_bow.inc.c +++ b/src/battle/common/actor/duplighost/ghost_bow.inc.c @@ -269,7 +269,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(10) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_WAIT(15) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -336,7 +336,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_END_SWITCH EVT_SET(LVar7, LVar8) EVT_LOOP(LVar7) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2019) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOW_SMACK) EVT_ADD(LVarA, 1) EVT_CALL(SetPartScale, ACTOR_SELF, PRT_MAIN, EVT_FLOAT(1.4), EVT_FLOAT(1.4), EVT_FLOAT(1.0)) EVT_IF_EQ(LFlag0, FALSE) @@ -368,13 +368,13 @@ EvtScript N(EVS_TakeTurn) = { EVT_SWITCH(LVar9) EVT_CASE_EQ(PARTNER_RANK_NORMAL) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_CASE_EQ(PARTNER_RANK_SUPER) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_CASE_EQ(PARTNER_RANK_ULTRA) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_END_SWITCH EVT_WAIT(8) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleBow_Idle) diff --git a/src/battle/common/actor/duplighost/ghost_goombario.inc.c b/src/battle/common/actor/duplighost/ghost_goombario.inc.c index 77b12ae9ef..3c35b4188f 100644 --- a/src/battle/common/actor/duplighost/ghost_goombario.inc.c +++ b/src/battle/common/actor/duplighost/ghost_goombario.inc.c @@ -333,9 +333,9 @@ EvtScript N(EVS_Attack_Headbonk) = { 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_NONE, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_200D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GOOMBARIO_JUMP) EVT_CALL(N(UnkFunc62), LVarA, 0) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -368,11 +368,11 @@ EvtScript N(EVS_Attack_Headbonk) = { EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Copy_PartnerLevel, LVar9) EVT_SWITCH(LVar9) EVT_CASE_EQ(PARTNER_RANK_NORMAL) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_CASE_EQ(PARTNER_RANK_SUPER) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_10) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_CASE_EQ(PARTNER_RANK_ULTRA) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 3, BS_FLAGS1_10) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_END_SWITCH EVT_CALL(GetActorHP, ACTOR_PLAYER, LVar0) EVT_IF_EQ(LVar0, 0) @@ -449,11 +449,11 @@ EvtScript N(EVS_Attack_Headbonk) = { EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Copy_PartnerLevel, LVar9) EVT_SWITCH(LVar9) EVT_CASE_EQ(PARTNER_RANK_NORMAL) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_SUPER) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_ULTRA) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 3, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_LABEL(100) EVT_SWITCH(LVar0) diff --git a/src/battle/common/actor/duplighost/ghost_kooper.inc.c b/src/battle/common/actor/duplighost/ghost_kooper.inc.c index 58e1938b92..283f2e33e4 100644 --- a/src/battle/common/actor/duplighost/ghost_kooper.inc.c +++ b/src/battle/common/actor/duplighost/ghost_kooper.inc.c @@ -357,7 +357,7 @@ EvtScript N(EVS_TakeTurn) = { 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) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_KOOPER_SHELL_SPINUP) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_14) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 75) @@ -402,14 +402,14 @@ EvtScript N(EVS_TakeTurn) = { EVT_END_SWITCH EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_200A) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAKARRY_AIR_RAID_1) 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) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -464,13 +464,13 @@ EvtScript N(EVS_TakeTurn) = { EVT_SWITCH(LVar9) EVT_CASE_EQ(PARTNER_RANK_NORMAL) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 2, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_SUPER) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 3, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_ULTRA) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 5, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/common/actor/duplighost/ghost_lakilester.inc.c b/src/battle/common/actor/duplighost/ghost_lakilester.inc.c index af3e240c0f..6362076860 100644 --- a/src/battle/common/actor/duplighost/ghost_lakilester.inc.c +++ b/src/battle/common/actor/duplighost/ghost_lakilester.inc.c @@ -285,7 +285,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_SETF(LVar3, EVT_FLOAT(1.0)) EVT_END_IF EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 0, LVar0, LVar1, LVar2, LVar3, 30, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LAKILESTER_SUMMON_SPINY) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPIKE_SUMMON_SPINY) EVT_THREAD EVT_LOOP(15) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 1, 0, 0) @@ -307,8 +307,8 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleLakilester_ThrowSpiny) EVT_WAIT(3) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_SPINY, ACTOR_SOUND_JUMP, SOUND_NONE, SOUND_NONE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_201B) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LAKILESTER_THROW_SPINY_A) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -354,13 +354,13 @@ EvtScript N(EVS_TakeTurn) = { EVT_SWITCH(LVar9) EVT_CASE_EQ(PARTNER_RANK_NORMAL) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 3, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_SUPER) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 4, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_ULTRA) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, 5, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/common/actor/duplighost/ghost_parakarry.inc.c b/src/battle/common/actor/duplighost/ghost_parakarry.inc.c index 6889a1f382..94c152f5d4 100644 --- a/src/battle/common/actor/duplighost/ghost_parakarry.inc.c +++ b/src/battle/common/actor/duplighost/ghost_parakarry.inc.c @@ -246,7 +246,7 @@ EvtScript N(EVS_Attack_SkyDive) = { EVT_WAIT(3) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_01) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2004) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAKARRY_PREDIVE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_FlyFast) EVT_CALL(AddGoalPos, ACTOR_SELF, 0, 10, 0) EVT_CALL(FlyToGoal, ACTOR_SELF, 5, 0, EASING_LINEAR) @@ -257,12 +257,12 @@ EvtScript N(EVS_Attack_SkyDive) = { EVT_END_THREAD EVT_CALL(AddGoalPos, ACTOR_SELF, 40, 15, 0) EVT_CALL(FlyToGoal, ACTOR_SELF, 20, -20, EASING_QUARTIC_OUT) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2005) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAKARRY_DIVE) EVT_CALL(EnableActorBlur, ACTOR_SELF, ACTOR_BLUR_ENABLE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleParakarry_Dive) EVT_CALL(FlyToGoal, ACTOR_SELF, 5, 0, EASING_LINEAR) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -298,13 +298,13 @@ EvtScript N(EVS_Attack_SkyDive) = { EVT_SWITCH(LVar9) EVT_CASE_EQ(PARTNER_RANK_NORMAL) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 2, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_SUPER) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 3, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_ULTRA) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_CALL(PlaySound, SOUND_NONE) EVT_SWITCH(LVar0) diff --git a/src/battle/common/actor/duplighost/ghost_sushie.inc.c b/src/battle/common/actor/duplighost/ghost_sushie.inc.c index 880b14b1b9..286114b264 100644 --- a/src/battle/common/actor/duplighost/ghost_sushie.inc.c +++ b/src/battle/common/actor/duplighost/ghost_sushie.inc.c @@ -241,7 +241,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(15) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleSushie_Tense2) EVT_WAIT(15) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -408,13 +408,13 @@ EvtScript N(EVS_TakeTurn) = { EVT_SWITCH(LVarA) EVT_CASE_EQ(PARTNER_RANK_NORMAL) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 3, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_SUPER) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 4, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_ULTRA) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, 5, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/common/actor/duplighost/ghost_watt.inc.c b/src/battle/common/actor/duplighost/ghost_watt.inc.c index 5ea28e21cb..8c7fc551d9 100644 --- a/src/battle/common/actor/duplighost/ghost_watt.inc.c +++ b/src/battle/common/actor/duplighost/ghost_watt.inc.c @@ -360,7 +360,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleWatt_Strain) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(FlyToGoal, ACTOR_SELF, 5, 0, EASING_COS_IN_OUT) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -393,7 +393,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(AddBattleCamZoom, -75) EVT_CALL(MoveBattleCamOver, LVarA) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0289) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_WATT_CHARGE) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_SHRINK) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -427,13 +427,13 @@ EvtScript N(EVS_TakeTurn) = { EVT_SWITCH(LVar9) EVT_CASE_EQ(PARTNER_RANK_NORMAL) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE, SUPPRESS_EVENT_ALL, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE, SUPPRESS_EVENT_ALL, 0, 3, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_SUPER) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE, SUPPRESS_EVENT_ALL, 0, 4, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE, SUPPRESS_EVENT_ALL, 0, 4, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PARTNER_RANK_ULTRA) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE, SUPPRESS_EVENT_ALL, 0, 5, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE, SUPPRESS_EVENT_ALL, 0, 5, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/common/actor/ember.inc.c b/src/battle/common/actor/ember.inc.c index 2a0febdb5f..13b0fbfc20 100644 --- a/src/battle/common/actor/ember.inc.c +++ b/src/battle/common/actor/ember.inc.c @@ -481,7 +481,7 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_END_THREAD EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_SIN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Blue_Anim01) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -527,7 +527,7 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_FIRE, 0, 0, DMG_TACKLE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_FIRE, 0, 0, DMG_TACKLE, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -614,7 +614,7 @@ EvtScript N(EVS_Attack_ShootPartner) = { EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Blue_Anim05) EVT_WAIT(30) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -656,7 +656,7 @@ EvtScript N(EVS_Attack_ShootPartner) = { EVT_ADD(LVar5, 2) EVT_EXEC_WAIT(N(EVS_ShootFire)) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, (DAMAGE_TYPE_FIRE | DAMAGE_TYPE_NO_CONTACT), 0, 0, DMG_SHOOT, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, (DAMAGE_TYPE_FIRE | DAMAGE_TYPE_NO_CONTACT), 0, 0, DMG_SHOOT, BS_FLAGS1_TRIGGER_EVENTS) EVT_WAIT(20) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -686,7 +686,7 @@ EvtScript N(EVS_Attack_AirSweep) = { EVT_CALL(N(PlayLavaBubbleFlightSound)) EVT_END_THREAD EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_SIN_OUT) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -746,7 +746,7 @@ EvtScript N(EVS_Attack_AirSweep) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_QUADRATIC_OUT) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_FIRE, 0, 0, DMG_AIR_SWEEP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_FIRE, 0, 0, DMG_AIR_SWEEP, BS_FLAGS1_TRIGGER_EVENTS) 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/forest_fuzzy.inc.c b/src/battle/common/actor/forest_fuzzy.inc.c index ee1e7b04a5..4a2a660a1a 100644 --- a/src/battle/common/actor/forest_fuzzy.inc.c +++ b/src/battle/common/actor/forest_fuzzy.inc.c @@ -258,13 +258,13 @@ EvtScript N(EVS_Move_Clone) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_01) EVT_THREAD EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206E) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_FUZZY_RUMBLE) EVT_WAIT(30) EVT_LOOP(4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206F) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_FUZZY_SHAKE) EVT_WAIT(11) EVT_END_LOOP - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2070) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_FUZZY_DIVIDE) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Forest_Anim0D) EVT_WAIT(130) @@ -337,7 +337,7 @@ EvtScript N(EVS_Attack_Leech) = { EVT_WAIT(1) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 8, 0) EVT_WAIT(5) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -400,18 +400,18 @@ EvtScript N(EVS_Attack_Leech) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Forest_Jump) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) EVT_IF_EQ(LFlag0, TRUE) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 0, BS_FLAGS1_TRIGGER_EVENTS) EVT_RETURN EVT_END_IF EVT_WAIT(10) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Leeching) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LEECH) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Forest_Bite) EVT_WAIT(21) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Forest_Still) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 330) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LEECH) EVT_CALL(SetActorDispOffset, ACTOR_SELF, -3, -2, 0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_WAIT(1) @@ -427,13 +427,13 @@ EvtScript N(EVS_Attack_Leech) = { EVT_WAIT(10) EVT_WAIT(2) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, DMG_LEECH, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, DMG_LEECH, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Forest_Idle) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(GetLastDamage, ACTOR_PLAYER, LVar3) EVT_IF_NE(LVar3, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_RECOVER_HEART) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) diff --git a/src/battle/common/actor/frost_piranha.inc.c b/src/battle/common/actor/frost_piranha.inc.c index 010f827aaa..603876c8b6 100644 --- a/src/battle/common/actor/frost_piranha.inc.c +++ b/src/battle/common/actor/frost_piranha.inc.c @@ -312,9 +312,9 @@ EvtScript N(EVS_Attack_Bite) = { EVT_END_IF EVT_THREAD EVT_WAIT(8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DE) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PIRANHA_BITE) EVT_END_THREAD - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -363,7 +363,7 @@ EvtScript N(EVS_Attack_Bite) = { EVT_WAIT(1) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_BITE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_BITE, BS_FLAGS1_TRIGGER_EVENTS) EVT_SET(LVarF, LVar0) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -442,7 +442,7 @@ EvtScript N(EVS_Attack_FrostBreath) = { EVT_WAIT(1) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LargePiranha_Frost_Anim0C) EVT_WAIT(5) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_ICE, STATUS_FLAG_FROZEN, 1, BS_FLAGS1_10) //@bug malformed status word + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_ICE, STATUS_FLAG_FROZEN, 1, BS_FLAGS1_INCLUDE_POWER_UPS) //@bug malformed status word EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -468,7 +468,7 @@ EvtScript N(EVS_Attack_FrostBreath) = { EVT_END_SWITCH EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_ICE | DAMAGE_TYPE_STATUS_ALWAYS_HITS, SUPPRESS_EVENT_ALL, DMG_STATUS_IGNORE_RES(STATUS_FLAG_FROZEN, 2), 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_ICE | DAMAGE_TYPE_STATUS_ALWAYS_HITS, SUPPRESS_EVENT_ALL, DMG_STATUS_IGNORE_RES(STATUS_FLAG_FROZEN, 2), 0, BS_FLAGS1_TRIGGER_EVENTS) EVT_SET(LVarF, LVar0) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/common/actor/fuzzy.inc.c b/src/battle/common/actor/fuzzy.inc.c index 8b772fc9da..45bbe5173f 100644 --- a/src/battle/common/actor/fuzzy.inc.c +++ b/src/battle/common/actor/fuzzy.inc.c @@ -267,7 +267,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(1) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 8, 0) EVT_WAIT(5) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -330,18 +330,18 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Jump) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) EVT_IF_EQ(LFlag0, TRUE) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 0, BS_FLAGS1_TRIGGER_EVENTS) EVT_RETURN EVT_END_IF EVT_WAIT(10) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Leeching) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LEECH) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Bite) EVT_WAIT(21) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Still) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 330) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LEECH) EVT_CALL(SetActorDispOffset, ACTOR_SELF, -3, -2, 0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_WAIT(1) @@ -356,7 +356,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.6), EVT_FLOAT(1.6), EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, DMG_LEECH, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, DMG_LEECH, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Idle) EVT_SWITCH(LVar0) @@ -365,7 +365,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(GetLastDamage, ACTOR_PLAYER, LVar3) EVT_IF_NE(LVar3, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_RECOVER_HEART) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) diff --git a/src/battle/common/actor/gloomba.inc.c b/src/battle/common/actor/gloomba.inc.c index 29b573bc0a..b5386adef7 100644 --- a/src/battle/common/actor/gloomba.inc.c +++ b/src/battle/common/actor/gloomba.inc.c @@ -308,7 +308,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(5) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Dark_Midair) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -420,7 +420,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.3), EVT_FLOAT(0.5), EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_END_SWITCH - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_HEADBONK, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_HEADBONK, BS_FLAGS1_TRIGGER_EVENTS) 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/goomba.inc.c b/src/battle/common/actor/goomba.inc.c index 7b5d492fc2..bc7a3a2b5f 100644 --- a/src/battle/common/actor/goomba.inc.c +++ b/src/battle/common/actor/goomba.inc.c @@ -317,7 +317,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(5) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Midair) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -429,7 +429,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.3), EVT_FLOAT(0.5), EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_END_SWITCH - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_HEADBONK, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_HEADBONK, BS_FLAGS1_TRIGGER_EVENTS) 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/gray_magikoopa.inc.c b/src/battle/common/actor/gray_magikoopa.inc.c index 691878176c..65f9dbc632 100644 --- a/src/battle/common/actor/gray_magikoopa.inc.c +++ b/src/battle/common/actor/gray_magikoopa.inc.c @@ -328,7 +328,7 @@ EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_KnockDownCheck) = { EVT_CALL(GetBattleFlags, LVar0) EVT_IF_NOT_FLAG(LVar0, BS_FLAGS1_PARTNER_ACTING) - EVT_IF_FLAG(LVar0, BS_FLAGS1_40 | BS_FLAGS1_200) + EVT_IF_FLAG(LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_ShouldKnockDown, TRUE) EVT_END_IF EVT_ELSE @@ -339,7 +339,7 @@ EvtScript N(EVS_KnockDownCheck) = { EVT_CASE_OR_EQ(MOVE_HEADBONK3) EVT_CASE_OR_EQ(MOVE_MULTIBONK) EVT_CALL(GetBattleFlags, LVar0) - EVT_IF_FLAG(LVar0, BS_FLAGS1_40 | BS_FLAGS1_200) + EVT_IF_FLAG(LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_ShouldKnockDown, TRUE) EVT_END_IF EVT_END_CASE_GROUP @@ -563,7 +563,7 @@ EvtScript N(EVS_Attack_MagicBlast) = { EVT_PLAY_EFFECT(EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_FlyingMagikoopa_Gray_Anim02) EVT_WAIT(30) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -617,7 +617,7 @@ EvtScript N(EVS_Attack_MagicBlast) = { EVT_CALL(N(ShrinkActor), LVar0, LVar1, LVar5, LVar3, LVar4, LVar5, 20) EVT_WAIT(18) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_MAGIC_BLAST, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_MAGIC_BLAST, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -638,7 +638,7 @@ EvtScript N(EVS_Attack_WandStrike) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MAGIKOOPA_VANISH) EVT_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_Magikoopa_Gray_Anim02) EVT_SET(LVar0, 200) @@ -669,8 +669,8 @@ EvtScript N(EVS_Attack_WandStrike) = { EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_GROUND, 255) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_Magikoopa_Gray_Anim03) EVT_WAIT(11) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DC) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MAGIKOOPA_WAND_STRIKE) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -704,7 +704,7 @@ EvtScript N(EVS_Attack_WandStrike) = { EVT_END_SWITCH EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_WAND_STRIKE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_WAND_STRIKE, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -892,7 +892,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, LVar8, SOUND_02DB) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_MAGIKOOPA_VANISH) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) diff --git a/src/battle/common/actor/green_magikoopa.inc.c b/src/battle/common/actor/green_magikoopa.inc.c index 3093bdec73..6ebed5b639 100644 --- a/src/battle/common/actor/green_magikoopa.inc.c +++ b/src/battle/common/actor/green_magikoopa.inc.c @@ -330,7 +330,7 @@ EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_KnockDownCheck) = { EVT_CALL(GetBattleFlags, LVar0) EVT_IF_NOT_FLAG(LVar0, BS_FLAGS1_PARTNER_ACTING) - EVT_IF_FLAG(LVar0, BS_FLAGS1_40 | BS_FLAGS1_200) + EVT_IF_FLAG(LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_ShouldKnockDown, TRUE) EVT_END_IF EVT_ELSE @@ -341,7 +341,7 @@ EvtScript N(EVS_KnockDownCheck) = { EVT_CASE_OR_EQ(MOVE_HEADBONK3) EVT_CASE_OR_EQ(MOVE_MULTIBONK) EVT_CALL(GetBattleFlags, LVar0) - EVT_IF_FLAG(LVar0, BS_FLAGS1_40 | BS_FLAGS1_200) + EVT_IF_FLAG(LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_ShouldKnockDown, TRUE) EVT_END_IF EVT_END_CASE_GROUP @@ -565,7 +565,7 @@ EvtScript N(EVS_Attack_MagicBlast) = { EVT_PLAY_EFFECT(EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_FlyingMagikoopa_Green_Anim02) EVT_WAIT(30) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -619,7 +619,7 @@ EvtScript N(EVS_Attack_MagicBlast) = { EVT_CALL(N(ShrinkActor), LVar0, LVar1, LVar5, LVar3, LVar4, LVar5, 20) EVT_WAIT(18) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_MAGIC_BLAST, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_MAGIC_BLAST, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -640,7 +640,7 @@ EvtScript N(EVS_Attack_WandStrike) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MAGIKOOPA_VANISH) EVT_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_Magikoopa_Green_Anim02) EVT_SET(LVar0, 200) @@ -671,8 +671,8 @@ EvtScript N(EVS_Attack_WandStrike) = { EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_GROUND, 255) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_Magikoopa_Green_Anim03) EVT_WAIT(11) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DC) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MAGIKOOPA_WAND_STRIKE) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -706,7 +706,7 @@ EvtScript N(EVS_Attack_WandStrike) = { EVT_END_SWITCH EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_WAND_STRIKE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_WAND_STRIKE, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -894,7 +894,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, LVar8, SOUND_02DD) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_MAGIKOOPA_POWER_UP) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) diff --git a/src/battle/common/actor/groove_guy.inc.c b/src/battle/common/actor/groove_guy.inc.c index 30c96b32e6..2e661323f5 100644 --- a/src/battle/common/actor/groove_guy.inc.c +++ b/src/battle/common/actor/groove_guy.inc.c @@ -274,7 +274,7 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -327,7 +327,7 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_TACKLE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_TACKLE, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -378,7 +378,7 @@ EvtScript N(EVS_Attack_SleepySpin) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -397,7 +397,7 @@ EvtScript N(EVS_Attack_SleepySpin) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 2, 50), 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 2, 50), 0, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -708,7 +708,7 @@ EvtScript N(EVS_PerformSummonDance) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 30) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 30, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_RECOVER_HEART) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_GrooveGuy_Anim0A) EVT_WAIT(8) EVT_RETURN @@ -775,7 +775,7 @@ EvtScript N(EVS_SummonGrooveGuy) = { EVT_END_THREAD EVT_CALL(SetActorSpeed, LVarB, EVT_FLOAT(4.0)) EVT_CALL(RunToGoal, LVarB, 0, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F3) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SMALL_LENS_FLARE) EVT_CALL(SetAnimation, LVarB, PRT_MAIN, ANIM_GrooveGuy_Anim0A) EVT_CALL(GetActorPos, LVarB, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) @@ -812,7 +812,7 @@ EvtScript N(EVS_SummonMediGuy) = { EVT_SET(LVar1, LVar4) EVT_SET(LVar2, LVar5) EVT_CALL(SetActorPos, LVarB, LVar0, LVar1, LVar2) - EVT_CALL(SetActorSounds, LVarB, ACTOR_SOUND_WALK, SOUND_SHYGUY_FLY, SOUND_NONE) + EVT_CALL(SetActorSounds, LVarB, ACTOR_SOUND_WALK, SOUND_SHY_GUY_FLY, 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/gulpit.inc.c b/src/battle/common/actor/gulpit.inc.c index 0fa03b71b7..ab658ada92 100644 --- a/src/battle/common/actor/gulpit.inc.c +++ b/src/battle/common/actor/gulpit.inc.c @@ -287,11 +287,11 @@ EvtScript N(EVS_Attack_Lick) = { EVT_WAIT(10) EVT_THREAD EVT_WAIT(3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EE) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GULPIT_LICK) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Gulpit_Anim04) EVT_WAIT(9) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -313,7 +313,7 @@ EvtScript N(EVS_Attack_Lick) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_LICK, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_LICK, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -346,7 +346,7 @@ EvtScript N(EVS_Attack_SpitRock) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Gulpit_Anim01) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EE) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GULPIT_LICK) EVT_CALL(GetActorVar, LVarA, AVAR_Rock_Type, LVar0) EVT_SET(LVarB, LVar0) EVT_SWITCH(LVarB) @@ -369,8 +369,8 @@ EvtScript N(EVS_Attack_SpitRock) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Gulpit_Anim0A) EVT_SET(LVarA, 3) EVT_END_SWITCH - EVT_CALL(SetPartSounds, ACTOR_SELF, LVarA, ACTOR_SOUND_JUMP, SOUND_03D9, SOUND_NONE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(SetPartSounds, ACTOR_SELF, LVarA, ACTOR_SOUND_JUMP, SOUND_LIGHT_THROW, SOUND_NONE) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -414,10 +414,10 @@ EvtScript N(EVS_Attack_SpitRock) = { EVT_SWITCH(LVarA) EVT_CASE_EQ(PRT_BIG_ROCK) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_BIG_ROCK, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_BIG_ROCK, BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_EQ(PRT_SMALL_ROCK) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SMALL_ROCK, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SMALL_ROCK, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/common/actor/hammer_bro.inc.c b/src/battle/common/actor/hammer_bro.inc.c index 989527a88d..e36619678f 100644 --- a/src/battle/common/actor/hammer_bro.inc.c +++ b/src/battle/common/actor/hammer_bro.inc.c @@ -355,7 +355,7 @@ EvtScript N(EVS_Attack_HammerThrow) = { EVT_ELSE EVT_CALL(SetPartScale, ACTOR_SELF, PRT_HAMMER_1, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_END_IF - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -395,7 +395,7 @@ EvtScript N(EVS_Attack_HammerThrow) = { EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_HAMMER_1, EVT_FLOAT(1.3)) EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_HAMMER_1, LVar0, LVar1, LVar2, 15, TRUE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 50), DMG_HAMMER_THROW, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 50), DMG_HAMMER_THROW, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -511,7 +511,7 @@ EvtScript N(EVS_Attack_HammerSurge) = { EVT_CALL(SetPartScale, ACTOR_SELF, PRT_HAMMER_4, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(SetPartScale, ACTOR_SELF, PRT_HAMMER_5, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_END_IF - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -564,20 +564,20 @@ EvtScript N(EVS_Attack_HammerSurge) = { EVT_END_THREAD EVT_WAIT(21) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_HAMMER_SURGE, BS_FLAGS1_10) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_HAMMER_SURGE, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_WAIT(5) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_HAMMER_SURGE, BS_FLAGS1_40) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_HAMMER_SURGE, BS_FLAGS1_NICE_HIT) EVT_WAIT(5) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_HAMMER_SURGE, BS_FLAGS1_40) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_HAMMER_SURGE, BS_FLAGS1_NICE_HIT) EVT_WAIT(5) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HammerBros_Anim02) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_HAMMER_SURGE, BS_FLAGS1_40) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_HAMMER_SURGE, BS_FLAGS1_NICE_HIT) EVT_WAIT(5) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 50), DMG_HAMMER_SURGE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 50), DMG_HAMMER_SURGE, BS_FLAGS1_TRIGGER_EVENTS) 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/hurt_plant.inc.c b/src/battle/common/actor/hurt_plant.inc.c index 1a8308f298..1d89f13b53 100644 --- a/src/battle/common/actor/hurt_plant.inc.c +++ b/src/battle/common/actor/hurt_plant.inc.c @@ -311,7 +311,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HURT_PLANT_BITE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HurtPlant_Anim06) EVT_WAIT(6) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -334,9 +334,9 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(2) EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_POISON) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_BITE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_BITE, BS_FLAGS1_TRIGGER_EVENTS) EVT_ELSE - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 100), DMG_BITE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 100), DMG_BITE, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_IF EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/common/actor/hyper_cleft.inc.c b/src/battle/common/actor/hyper_cleft.inc.c index 0f656a0e0f..a86bbe8ef6 100644 --- a/src/battle/common/actor/hyper_cleft.inc.c +++ b/src/battle/common/actor/hyper_cleft.inc.c @@ -173,7 +173,7 @@ EvtScript N(EVS_Move_Charge) = { EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.5)) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02D9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HYPER_CLEFT_LAND) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, LVar1, LVar2, 0, 0) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) @@ -197,9 +197,9 @@ EvtScript N(EVS_Move_Charge) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HYPER_CLEFT_CHARGE) 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_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -267,7 +267,7 @@ EvtScript N(EVS_Move_Charge) = { EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_CHARGED, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_CHARGED, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -766,9 +766,9 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Cleft_Hyper_Anim00) EVT_WAIT(8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20D1) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CLEFT_TACKLE) 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_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -818,7 +818,7 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_TACKLE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_TACKLE, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Cleft_Hyper_Anim02) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_SWITCH(LVar0) diff --git a/src/battle/common/actor/hyper_goomba.inc.c b/src/battle/common/actor/hyper_goomba.inc.c index 0e40448648..eb39eb5b55 100644 --- a/src/battle/common/actor/hyper_goomba.inc.c +++ b/src/battle/common/actor/hyper_goomba.inc.c @@ -187,7 +187,7 @@ EvtScript N(EVS_Move_Charge) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -249,7 +249,7 @@ EvtScript N(EVS_Move_Charge) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(15.0)) EVT_CALL(JumpToGoal, ACTOR_SELF, 0, FALSE, TRUE, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_CHARGED, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_CHARGED, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -590,7 +590,7 @@ EvtScript N(EVS_Attack_Headbonk) = { EVT_WAIT(5) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Hyper_Midair) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -702,7 +702,7 @@ EvtScript N(EVS_Attack_Headbonk) = { EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.3), EVT_FLOAT(0.5), EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_END_SWITCH - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_HEADBONK, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_HEADBONK, BS_FLAGS1_TRIGGER_EVENTS) 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/hyper_paragoomba.inc.c b/src/battle/common/actor/hyper_paragoomba.inc.c index 60323c26a7..f39eb236eb 100644 --- a/src/battle/common/actor/hyper_paragoomba.inc.c +++ b/src/battle/common/actor/hyper_paragoomba.inc.c @@ -266,7 +266,7 @@ EvtScript N(EVS_Attack_ChargedDive) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, FALSE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PARAGOOMBA_DIVE) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_NONE, 0) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -341,7 +341,7 @@ EvtScript N(EVS_Attack_ChargedDive) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(15.0)) EVT_CALL(JumpToGoal, ACTOR_SELF, 0, FALSE, FALSE, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_CHARGED_DIVE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_CHARGED_DIVE, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -680,7 +680,7 @@ EvtScript N(EVS_Attack_SkyDive) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_LINEAR) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -756,7 +756,7 @@ EvtScript N(EVS_Attack_SkyDive) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_END_SWITCH EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SKY_DIVE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SKY_DIVE, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -955,7 +955,7 @@ EvtScript N(EVS_Downed_Move_Charge) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1017,7 +1017,7 @@ EvtScript N(EVS_Downed_Move_Charge) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(15.0)) EVT_CALL(JumpToGoal, ACTOR_SELF, 0, FALSE, TRUE, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_CHARGED_BONK, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_CHARGED_BONK, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -1357,7 +1357,7 @@ EvtScript N(EVS_Attack_Headbonk) = { EVT_WAIT(5) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Hyper_Midair) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1469,7 +1469,7 @@ EvtScript N(EVS_Attack_Headbonk) = { EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.3), EVT_FLOAT(0.5), EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_END_SWITCH - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_HEADBONK, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_HEADBONK, BS_FLAGS1_TRIGGER_EVENTS) 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/jungle_fuzzy.inc.c b/src/battle/common/actor/jungle_fuzzy.inc.c index ccd91525bf..1d83154658 100644 --- a/src/battle/common/actor/jungle_fuzzy.inc.c +++ b/src/battle/common/actor/jungle_fuzzy.inc.c @@ -262,13 +262,13 @@ EvtScript N(EVS_Move_Divide) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_01) EVT_THREAD EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206E) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_FUZZY_RUMBLE) EVT_WAIT(30) EVT_LOOP(4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206F) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_FUZZY_SHAKE) EVT_WAIT(11) EVT_END_LOOP - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2070) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_FUZZY_DIVIDE) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Jungle_Anim0D) EVT_WAIT(130) @@ -341,7 +341,7 @@ EvtScript N(EVS_Attack_Leech) = { EVT_WAIT(1) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 8, 0) EVT_WAIT(5) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 2, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -404,19 +404,19 @@ EvtScript N(EVS_Attack_Leech) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Jungle_Jump) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) EVT_IF_EQ(LFlag0, TRUE) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 0, BS_FLAGS1_TRIGGER_EVENTS) EVT_RETURN EVT_END_IF EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar1) EVT_IF_FLAG(LVar1, STATUS_FLAG_STONE) EVT_WAIT(10) EVT_LOOP(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LEECH) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Jungle_Bite) EVT_WAIT(21) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Jungle_Still) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 330) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LEECH) EVT_CALL(SetActorDispOffset, ACTOR_SELF, -3, -2, 0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_WAIT(1) @@ -431,7 +431,7 @@ EvtScript N(EVS_Attack_Leech) = { EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.6), EVT_FLOAT(1.6), EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, DMG_LEECH, BS_FLAGS1_40) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, DMG_LEECH, BS_FLAGS1_NICE_HIT) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 8, 0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -451,7 +451,7 @@ EvtScript N(EVS_Attack_Leech) = { EVT_LOOP(5) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Leeching) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LEECH) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Jungle_Bite) EVT_SET(LFlag0, FALSE) EVT_LOOP(21) @@ -468,7 +468,7 @@ EvtScript N(EVS_Attack_Leech) = { EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Jungle_Still) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 330) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LEECH) EVT_CALL(SetActorDispOffset, ACTOR_SELF, -3, -2, 0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_SET(LFlag0, FALSE) @@ -568,10 +568,10 @@ EvtScript N(EVS_Attack_Leech) = { EVT_BREAK_LOOP EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_UNBLOCKABLE | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, DMG_LEECH, BS_FLAGS1_40) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_UNBLOCKABLE | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, DMG_LEECH, BS_FLAGS1_NICE_HIT) EVT_CALL(GetLastDamage, ACTOR_PLAYER, LVar3) EVT_IF_NE(LVar3, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_RECOVER_HEART) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) diff --git a/src/battle/common/actor/koopa_troopa.inc.c b/src/battle/common/actor/koopa_troopa.inc.c index 793f1852e6..c61ecbd2d9 100644 --- a/src/battle/common/actor/koopa_troopa.inc.c +++ b/src/battle/common/actor/koopa_troopa.inc.c @@ -520,14 +520,14 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(2) EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_CHILD_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_KoopaTroopa_ShellSpin) EVT_WAIT(10) 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(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_TOSS) 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_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -587,7 +587,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_SHELL_TOSS, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_SHELL_TOSS, BS_FLAGS1_TRIGGER_EVENTS) 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/koopatrol.inc.c b/src/battle/common/actor/koopatrol.inc.c index 4f485c8301..8162edf719 100644 --- a/src/battle/common/actor/koopatrol.inc.c +++ b/src/battle/common/actor/koopatrol.inc.c @@ -707,14 +707,14 @@ 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(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Koopatrol_Anim06) EVT_WAIT(10) 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(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_TOSS) 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_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 4, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -774,7 +774,7 @@ EvtScript N(EVS_Attack_ShellToss) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_SHELL_TOSS, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_SHELL_TOSS, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -860,9 +860,9 @@ EvtScript N(EVS_Attack_ChargedToss) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_037C) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_KOOPA_LAUNCH_SHELL) 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_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 4, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -932,7 +932,7 @@ EvtScript N(EVS_Attack_ChargedToss) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarA, 0, SUPPRESS_EVENT_ALL, 0, DMG_CHARGED_TOSS, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarA, 0, SUPPRESS_EVENT_ALL, 0, DMG_CHARGED_TOSS, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -1082,7 +1082,7 @@ EvtScript N(EVS_Move_SummonBackup) = { EVT_WAIT(8) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 30, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_RECOVER_HEART) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Koopatrol_Anim16) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) @@ -1094,7 +1094,7 @@ EvtScript N(EVS_Move_SummonBackup) = { EVT_ADD(LVar1, 200) EVT_CALL(SetActorPos, LVar0, LVar1, LVar2, LVar3) EVT_CALL(SetGoalToIndex, LVar0, LVarA) - EVT_CALL(PlaySoundAtActor, LVar0, SOUND_20D3) + EVT_CALL(PlaySoundAtActor, LVar0, SOUND_SHELL_TOSS) 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)) diff --git a/src/battle/common/actor/lakitu.inc.c b/src/battle/common/actor/lakitu.inc.c index 4579249726..d03bcd2c05 100644 --- a/src/battle/common/actor/lakitu.inc.c +++ b/src/battle/common/actor/lakitu.inc.c @@ -318,9 +318,9 @@ EvtScript N(EVS_Attack_SpinyToss) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Lakitu_Anim01) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_SPINY_BALL, ANIM_Lakitu_Anim0C) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SPINY_BALL, SOUND_20D2) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SPINY_BALL, SOUND_LAKITU_THROW_SPINY) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_SPINY_BALL, ACTOR_SOUND_JUMP, SOUND_NONE, SOUND_NONE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -359,7 +359,7 @@ EvtScript N(EVS_Attack_SpinyToss) = { EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_SPINY_BALL, LVar0, LVar1, LVar2, 20, TRUE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SPINY_TOSS, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SPINY_TOSS, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -440,7 +440,7 @@ EvtScript N(EVS_Move_SummonSpiny) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Lakitu_Anim01) EVT_END_THREAD EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SPINY_BALL, SOUND_20D2) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SPINY_BALL, SOUND_LAKITU_THROW_SPINY) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_SPINY_BALL, ACTOR_SOUND_JUMP, SOUND_NONE, SOUND_NONE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_SPINY_BALL, ANIM_Lakitu_Anim0C) EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_SPINY_BALL, EVT_FLOAT(1.6)) diff --git a/src/battle/common/actor/lava_bubble.inc.c b/src/battle/common/actor/lava_bubble.inc.c index f27de7318a..e80fe05db1 100644 --- a/src/battle/common/actor/lava_bubble.inc.c +++ b/src/battle/common/actor/lava_bubble.inc.c @@ -379,7 +379,7 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_END_THREAD EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_SIN_OUT) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Anim01) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -425,7 +425,7 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_FIRE, 0, 0, DMG_TACKLE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_FIRE, 0, 0, DMG_TACKLE, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -512,7 +512,7 @@ EvtScript N(EVS_Attack_ShootPartner) = { EVT_WAIT(10) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LavaBubble_Anim05) EVT_WAIT(30) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -554,7 +554,7 @@ EvtScript N(EVS_Attack_ShootPartner) = { EVT_ADD(LVar5, 2) EVT_EXEC_WAIT(N(EVS_ShootFire)) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_FIRE | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SHOOT_PARTNER, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_FIRE | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SHOOT_PARTNER, BS_FLAGS1_TRIGGER_EVENTS) EVT_WAIT(20) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -584,7 +584,7 @@ EvtScript N(EVS_Attack_ShootPlayer) = { EVT_CALL(N(PlayLavaBubbleFlightSound)) EVT_END_THREAD EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_SIN_OUT) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -644,7 +644,7 @@ EvtScript N(EVS_Attack_ShootPlayer) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_QUADRATIC_OUT) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_FIRE, 0, 0, DMG_SHOOT_PLAYER, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_FIRE, 0, 0, DMG_SHOOT_PLAYER, BS_FLAGS1_TRIGGER_EVENTS) 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/m_bush.inc.c b/src/battle/common/actor/m_bush.inc.c index c901b3cb97..c2ad733a2b 100644 --- a/src/battle/common/actor/m_bush.inc.c +++ b/src/battle/common/actor/m_bush.inc.c @@ -235,8 +235,8 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_20C9, 0) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP, SOUND_MBUSH_LEAP, 0) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -277,7 +277,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 2, 25), DMG_BITE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 2, 25), DMG_BITE, BS_FLAGS1_TRIGGER_EVENTS) 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/magikoopa.inc.c b/src/battle/common/actor/magikoopa.inc.c index 3971472968..c3c3b6f9e6 100644 --- a/src/battle/common/actor/magikoopa.inc.c +++ b/src/battle/common/actor/magikoopa.inc.c @@ -302,7 +302,7 @@ EvtScript N(EVS_Idle) = { EvtScript N(EVS_KnockDownCheck) = { EVT_CALL(GetBattleFlags, LVar0) EVT_IF_NOT_FLAG(LVar0, BS_FLAGS1_PARTNER_ACTING) - EVT_IF_FLAG(LVar0, BS_FLAGS1_40 | BS_FLAGS1_200) + EVT_IF_FLAG(LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_ShouldKnockDown, TRUE) EVT_END_IF EVT_ELSE @@ -313,7 +313,7 @@ EvtScript N(EVS_KnockDownCheck) = { EVT_CASE_OR_EQ(MOVE_HEADBONK3) EVT_CASE_OR_EQ(MOVE_MULTIBONK) EVT_CALL(GetBattleFlags, LVar0) - EVT_IF_FLAG(LVar0, BS_FLAGS1_40 | BS_FLAGS1_200) + EVT_IF_FLAG(LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_ShouldKnockDown, TRUE) EVT_END_IF EVT_END_CASE_GROUP @@ -870,7 +870,7 @@ EvtScript N(EVS_Move_HealOne) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, LVarB, SOUND_206D) + EVT_CALL(PlaySoundAtActor, LVarB, SOUND_RECOVER_HEART) EVT_CALL(PlaySoundAtActor, LVarB, SOUND_HEART_BOUNCE) EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, LVarB, SOUND_STAR_BOUNCE_A) @@ -963,7 +963,7 @@ EvtScript N(EVS_Move_HealAll) = { EVT_IF_EQ(LFlag0, FALSE) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, LVar0, SOUND_206D) + EVT_CALL(PlaySoundAtActor, LVar0, SOUND_RECOVER_HEART) EVT_CALL(PlaySoundAtActor, LVar0, SOUND_HEART_BOUNCE) EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, LVar0, SOUND_STAR_BOUNCE_A) @@ -1057,7 +1057,7 @@ EvtScript N(EVS_Attack_MagicBlast) = { EVT_PLAY_EFFECT(EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0) EVT_END_IF EVT_WAIT(30) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar9, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar9, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar9) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1185,10 +1185,10 @@ EvtScript N(EVS_Attack_MagicBlast) = { EVT_WAIT(18) EVT_IF_EQ(LFlag0, TRUE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_MAGIC_BLAST, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_MAGIC_BLAST, BS_FLAGS1_TRIGGER_EVENTS) EVT_ELSE EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_MAGIC_BLAST, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_MAGIC_BLAST, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_IF EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -1621,7 +1621,7 @@ EvtScript N(EVS_Move_TryBoostAttack) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, LVar8, SOUND_02DD) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_MAGIKOOPA_POWER_UP) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) @@ -1734,7 +1734,7 @@ EvtScript N(EVS_Move_TryBoostDefense) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, LVar8, SOUND_02DD) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_MAGIKOOPA_POWER_UP) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) @@ -1965,7 +1965,7 @@ EvtScript N(EVS_Move_TryTransparent) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, LVar8, SOUND_02DB) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_MAGIKOOPA_VANISH) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) diff --git a/src/battle/common/actor/medi_guy.inc.c b/src/battle/common/actor/medi_guy.inc.c index dc72180865..135cec70a9 100644 --- a/src/battle/common/actor/medi_guy.inc.c +++ b/src/battle/common/actor/medi_guy.inc.c @@ -273,12 +273,12 @@ EvtScript N(EVS_Attack_Swoop) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_COS_IN) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02F8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GATHER_SMALL) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_MediGuy_Anim05) @@ -286,7 +286,7 @@ EvtScript N(EVS_Attack_Swoop) = { 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_NONE, SOUND_NONE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02F9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_TOSS) EVT_THREAD EVT_WAIT(5) EVT_SET(LVar0, 0) @@ -321,7 +321,7 @@ EvtScript N(EVS_Attack_Swoop) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02F8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GATHER_SMALL) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_MediGuy_Anim05) @@ -332,7 +332,7 @@ EvtScript N(EVS_Attack_Swoop) = { EVT_SET(LVarB, LVar1) EVT_SET(LVarC, LVar2) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02F9) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_TOSS) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 1) @@ -341,7 +341,7 @@ EvtScript N(EVS_Attack_Swoop) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_MediGuy_Anim05) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_QUADRATIC_OUT) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SWOOP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SWOOP, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -371,7 +371,7 @@ EvtScript N(EVS_Move_HealOne) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(GetOwnerID, LVar0) EVT_CALL(GetActorPos, LVar0, LVar1, LVar2, LVar3) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02F8) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GATHER_SMALL) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_NONE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_MediGuy_Anim05) @@ -388,7 +388,7 @@ EvtScript N(EVS_Move_HealOne) = { EVT_DIV(LVar4, 100) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, LVarA, SOUND_206D) + EVT_CALL(PlaySoundAtActor, LVarA, SOUND_RECOVER_HEART) EVT_CALL(PlaySoundAtActor, LVarA, SOUND_HEART_BOUNCE) EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, LVarA, SOUND_STAR_BOUNCE_A) diff --git a/src/battle/common/actor/monty_mole.inc.c b/src/battle/common/actor/monty_mole.inc.c index 0f46843b9e..43315f816a 100644 --- a/src/battle/common/actor/monty_mole.inc.c +++ b/src/battle/common/actor/monty_mole.inc.c @@ -389,7 +389,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_END_IF EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_ROCK, SOUND_MOLE_THROW) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_ROCK, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 2, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -421,7 +421,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_ROCK, ANIM_MontyMole_Anim0F) EVT_CALL(FlyPartTo, ACTOR_SELF, PRT_ROCK, LVar0, LVar1, LVar2, 0, 20, EASING_LINEAR) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_TOSS, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_TOSS, BS_FLAGS1_TRIGGER_EVENTS) 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/paragloomba.inc.c b/src/battle/common/actor/paragloomba.inc.c index 0584df4d4b..96d606c84c 100644 --- a/src/battle/common/actor/paragloomba.inc.c +++ b/src/battle/common/actor/paragloomba.inc.c @@ -394,7 +394,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_LINEAR) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 2, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -470,7 +470,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_END_SWITCH EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SKY_DIVE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SKY_DIVE, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -784,7 +784,7 @@ EvtScript N(EVS_Downed_TakeTurn) = { EVT_WAIT(5) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Goomba_Dark_Midair) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -896,7 +896,7 @@ EvtScript N(EVS_Downed_TakeTurn) = { EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.3), EVT_FLOAT(0.5), EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_END_SWITCH - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_HEADBONK, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_HEADBONK, BS_FLAGS1_TRIGGER_EVENTS) 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/paragoomba.inc.c b/src/battle/common/actor/paragoomba.inc.c index 550dc11748..b0d71076a1 100644 --- a/src/battle/common/actor/paragoomba.inc.c +++ b/src/battle/common/actor/paragoomba.inc.c @@ -391,7 +391,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_LINEAR) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -467,7 +467,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_END_SWITCH EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_AIR_KICK, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_AIR_KICK, BS_FLAGS1_TRIGGER_EVENTS) 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/paratroopa.inc.c b/src/battle/common/actor/paratroopa.inc.c index 83bace1b2a..c8aec77e35 100644 --- a/src/battle/common/actor/paratroopa.inc.c +++ b/src/battle/common/actor/paratroopa.inc.c @@ -454,7 +454,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -16, EASING_LINEAR) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_01) EVT_WAIT(5) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -544,7 +544,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_ParaTroopa_ShellDive) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_AIR_TACKLE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_AIR_TACKLE, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -1077,14 +1077,14 @@ EvtScript N(EVS_Downed_TakeTurn) = { EVT_WAIT(2) EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_CHILD_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_DOWNED, ANIM_KoopaTroopa_ShellSpin) EVT_WAIT(10) 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(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_TOSS) 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_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1144,7 +1144,7 @@ EvtScript N(EVS_Downed_TakeTurn) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_SHELL_TOSS, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_SHELL_TOSS, BS_FLAGS1_TRIGGER_EVENTS) 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/piranha_plant.inc.c b/src/battle/common/actor/piranha_plant.inc.c index 314e2117a5..313daf0b18 100644 --- a/src/battle/common/actor/piranha_plant.inc.c +++ b/src/battle/common/actor/piranha_plant.inc.c @@ -316,7 +316,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SmallPiranha_Anim03) EVT_WAIT(8) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SmallPiranha_Anim05) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -328,7 +328,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_END_IF EVT_THREAD EVT_WAIT(6) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DE) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PIRANHA_BITE) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SmallPiranha_Anim07) EVT_WAIT(10) @@ -351,13 +351,13 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(2) EVT_THREAD EVT_WAIT(6) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DE) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PIRANHA_BITE) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SmallPiranha_Anim07) EVT_WAIT(10) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_BITE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_BITE, BS_FLAGS1_TRIGGER_EVENTS) 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/pokey.inc.c b/src/battle/common/actor/pokey.inc.c index 2094524d61..38feb4a1be 100644 --- a/src/battle/common/actor/pokey.inc.c +++ b/src/battle/common/actor/pokey.inc.c @@ -555,7 +555,7 @@ EvtScript N(EVS_Attack_GroundSmash) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(3) EVT_END_IF - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 0, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -612,7 +612,7 @@ EvtScript N(EVS_Attack_GroundSmash) = { EVT_END_SWITCH EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 0), LVar1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 0), LVar1, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -792,7 +792,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(3) EVT_EXEC_WAIT(N(EVS_DecrementSize)) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, DMG_THROW_PART, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, DMG_THROW_PART, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -824,7 +824,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_PROJECTILE, EVT_FLOAT(0.1)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_PROJECTILE, ANIM_Pokey_Projectile) EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_PROJECTILE, LVar0, LVar1, LVar2, 0, TRUE) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 0), DMG_THROW_PART, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 0), DMG_THROW_PART, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Anim_Run, LVar1) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar1) EVT_SWITCH(LVar0) @@ -1062,7 +1062,7 @@ EvtScript N(EVS_Attack_SinglePartLeap) = { EVT_WAIT(4) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Pokey_Run1) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, DMG_LEAP, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, DMG_LEAP, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1134,7 +1134,7 @@ EvtScript N(EVS_Attack_SinglePartLeap) = { EVT_END_CHILD_THREAD EVT_CALL(JumpToGoal, ACTOR_SELF, 18, FALSE, TRUE, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 0), DMG_LEAP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 0), DMG_LEAP, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Pokey_Idle1) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/common/actor/pokey_mummy.inc.c b/src/battle/common/actor/pokey_mummy.inc.c index dfae42bdc4..283107f5c7 100644 --- a/src/battle/common/actor/pokey_mummy.inc.c +++ b/src/battle/common/actor/pokey_mummy.inc.c @@ -558,7 +558,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(3) EVT_EXEC_WAIT(N(EVS_DecrementSize)) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 2, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 2, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -590,7 +590,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_PROJECTILE, EVT_FLOAT(0.1)) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_PROJECTILE, ANIM_Pokey_Mummy_Projectile) EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_PROJECTILE, LVar0, LVar1, LVar2, 0, TRUE) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 40), DMG_THROW_PART, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 40), DMG_THROW_PART, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Anim_Run, LVar1) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, LVar1) EVT_SWITCH(LVar0) @@ -643,7 +643,7 @@ EvtScript N(EVS_Attack_SinglePartLeap) = { EVT_WAIT(4) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Pokey_Mummy_Run1) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 2, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -715,7 +715,7 @@ EvtScript N(EVS_Attack_SinglePartLeap) = { EVT_END_CHILD_THREAD EVT_CALL(JumpToGoal, ACTOR_SELF, 18, FALSE, TRUE, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 100), DMG_LEAP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 100), DMG_LEAP, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Pokey_Mummy_Idle1) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/common/actor/putrid_piranha.inc.c b/src/battle/common/actor/putrid_piranha.inc.c index d14ea27155..bea4fc03ec 100644 --- a/src/battle/common/actor/putrid_piranha.inc.c +++ b/src/battle/common/actor/putrid_piranha.inc.c @@ -305,9 +305,9 @@ EvtScript N(EVS_Attack_Bite) = { EVT_END_IF EVT_THREAD EVT_WAIT(8) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DE) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_PIRANHA_BITE) EVT_END_THREAD - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -357,7 +357,7 @@ EvtScript N(EVS_Attack_Bite) = { EVT_WAIT(1) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_BITE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_BITE, BS_FLAGS1_TRIGGER_EVENTS) EVT_SET(LVarF, LVar0) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -436,7 +436,7 @@ EvtScript N(EVS_Attack_BadBreath) = { EVT_WAIT(1) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_LargePiranha_Putrid_Anim09) EVT_WAIT(5) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -462,7 +462,7 @@ EvtScript N(EVS_Attack_BadBreath) = { EVT_END_SWITCH EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 100), DMG_BREATH, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, DMG_STATUS_KEY(STATUS_FLAG_POISON, 3, 100), DMG_BREATH, BS_FLAGS1_TRIGGER_EVENTS) EVT_SET(LVarF, LVar0) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/common/actor/pyro_guy.inc.c b/src/battle/common/actor/pyro_guy.inc.c index 30d6f88d86..05413efd8d 100644 --- a/src/battle/common/actor/pyro_guy.inc.c +++ b/src/battle/common/actor/pyro_guy.inc.c @@ -265,7 +265,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -310,7 +310,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_FIRE, 0, 0, DMG_TACKLE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_FIRE, 0, 0, DMG_TACKLE, BS_FLAGS1_TRIGGER_EVENTS) 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/red_magikoopa.inc.c b/src/battle/common/actor/red_magikoopa.inc.c index 22b27fe3c4..46cbbdfa49 100644 --- a/src/battle/common/actor/red_magikoopa.inc.c +++ b/src/battle/common/actor/red_magikoopa.inc.c @@ -329,7 +329,7 @@ EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_KnockDownCheck) = { EVT_CALL(GetBattleFlags, LVar0) EVT_IF_NOT_FLAG(LVar0, BS_FLAGS1_PARTNER_ACTING) - EVT_IF_FLAG(LVar0, BS_FLAGS1_40 | BS_FLAGS1_200) + EVT_IF_FLAG(LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_ShouldKnockDown, TRUE) EVT_END_IF EVT_ELSE @@ -340,7 +340,7 @@ EvtScript N(EVS_KnockDownCheck) = { EVT_CASE_OR_EQ(MOVE_HEADBONK3) EVT_CASE_OR_EQ(MOVE_MULTIBONK) EVT_CALL(GetBattleFlags, LVar0) - EVT_IF_FLAG(LVar0, BS_FLAGS1_40 | BS_FLAGS1_200) + EVT_IF_FLAG(LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_ShouldKnockDown, TRUE) EVT_END_IF EVT_END_CASE_GROUP @@ -564,7 +564,7 @@ EvtScript N(EVS_Attack_MagicBlast) = { EVT_PLAY_EFFECT(EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_FlyingMagikoopa_Red_Anim02) EVT_WAIT(30) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -618,7 +618,7 @@ EvtScript N(EVS_Attack_MagicBlast) = { EVT_CALL(N(ShrinkActor), LVar0, LVar1, LVar5, LVar3, LVar4, LVar5, 20) EVT_WAIT(18) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_MAGIC_BLAST, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_MAGIC_BLAST, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -639,7 +639,7 @@ EvtScript N(EVS_Attack_WandStrike) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MAGIKOOPA_VANISH) EVT_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_Magikoopa_Red_Anim02) EVT_SET(LVar0, 200) @@ -670,8 +670,8 @@ EvtScript N(EVS_Attack_WandStrike) = { EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_GROUND, 255) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_Magikoopa_Red_Anim03) EVT_WAIT(11) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DC) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MAGIKOOPA_WAND_STRIKE) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -705,7 +705,7 @@ EvtScript N(EVS_Attack_WandStrike) = { EVT_END_SWITCH EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_WAND_STRIKE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_WAND_STRIKE, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -893,7 +893,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, LVar8, SOUND_02DD) + EVT_CALL(PlaySoundAtActor, LVar8, SOUND_MAGIKOOPA_POWER_UP) EVT_END_THREAD EVT_THREAD EVT_CALL(FreezeBattleState, TRUE) diff --git a/src/battle/common/actor/ruff_puff.inc.c b/src/battle/common/actor/ruff_puff.inc.c index 5094df754b..5ffc250c86 100644 --- a/src/battle/common/actor/ruff_puff.inc.c +++ b/src/battle/common/actor/ruff_puff.inc.c @@ -252,7 +252,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(5) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_RuffPuff_Grin) EVT_WAIT(5) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -318,7 +318,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.2)) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_TACKLE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_TACKLE, BS_FLAGS1_TRIGGER_EVENTS) 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/shy_guy_base.inc.c b/src/battle/common/actor/shy_guy_base.inc.c index 960c4a236e..5f9e2349f7 100644 --- a/src/battle/common/actor/shy_guy_base.inc.c +++ b/src/battle/common/actor/shy_guy_base.inc.c @@ -248,7 +248,7 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -307,7 +307,7 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SHYGUY_Anim05) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_TACKLE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_TACKLE, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 15) @@ -353,7 +353,7 @@ EvtScript N(EVS_Attack_Vault) = { EVT_SUB(LVar0, 40) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -411,7 +411,7 @@ EvtScript N(EVS_Attack_Vault) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(JumpToGoal, ACTOR_SELF, 18, FALSE, TRUE, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_VAULT, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_VAULT, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -459,10 +459,10 @@ EvtScript N(EVS_Attack_Vault) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_COLLAPSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SHYGUY_Anim10) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20C3) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DISAPPOINTED) EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(RandInt, 100, LVar0) EVT_IF_LT(LVar0, 50) diff --git a/src/battle/common/actor/sky_guy.inc.c b/src/battle/common/actor/sky_guy.inc.c index 64186221a2..49880dca47 100644 --- a/src/battle/common/actor/sky_guy.inc.c +++ b/src/battle/common/actor/sky_guy.inc.c @@ -390,7 +390,7 @@ EvtScript N(EVS_PopBalloons) = { EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.5)) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_COLLAPSE) EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_CALL(SetPartFlags, ACTOR_SELF, PRT_FLYING, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_SHADOW | ACTOR_PART_FLAG_NO_TARGET) EVT_CALL(SetPartFlags, ACTOR_SELF, PRT_GROUND, ACTOR_PART_FLAG_NO_SHADOW | ACTOR_PART_FLAG_PRIMARY_TARGET) @@ -545,7 +545,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_STONE, ACTOR_PART_FLAG_INVISIBLE, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SLINGSHOT_FIRE) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_STONE, ACTOR_SOUND_JUMP, SOUND_NONE, SOUND_NONE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 3, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_EQ(HIT_RESULT_MISS) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -591,7 +591,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_STONE, EVT_FLOAT(0.1)) EVT_CALL(FlyPartTo, ACTOR_SELF, PRT_STONE, LVar0, LVar1, LVar2, 0, 15, EASING_LINEAR) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SLINGSHOT, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SLINGSHOT, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVarF) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -777,7 +777,7 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -836,7 +836,7 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_ShyGuy_Red_Anim05) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_TACKLE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_TACKLE, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 15) @@ -882,7 +882,7 @@ EvtScript N(EVS_Attack_Vault) = { EVT_SUB(LVar0, 40) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -940,7 +940,7 @@ EvtScript N(EVS_Attack_Vault) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(JumpToGoal, ACTOR_SELF, 18, FALSE, TRUE, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_VAULT, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_VAULT, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -988,10 +988,10 @@ EvtScript N(EVS_Attack_Vault) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_COLLAPSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_ShyGuy_Red_Anim10) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20C3) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DISAPPOINTED) EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_GROUND, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(RandInt, 100, LVar0) EVT_IF_LT(LVar0, 50) diff --git a/src/battle/common/actor/spear_guy.inc.c b/src/battle/common/actor/spear_guy.inc.c index a113b07b16..70ebf2a680 100644 --- a/src/battle/common/actor/spear_guy.inc.c +++ b/src/battle/common/actor/spear_guy.inc.c @@ -557,12 +557,12 @@ EvtScript N(EVS_Attack_SpearStab) = { EVT_WAIT(5) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_SPEAR_GUY, ANIM_SpearGuy_Anim1A) EVT_WAIT(15) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0309) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPEAR_STAB) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_SPEAR_GUY, ANIM_SpearGuy_Anim1B) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -588,12 +588,12 @@ EvtScript N(EVS_Attack_SpearStab) = { EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0309) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPEAR_STAB) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_SPEAR_GUY, ANIM_SpearGuy_Anim1B) EVT_WAIT(5) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_STAB, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_STAB, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -620,9 +620,9 @@ EvtScript N(EVS_Move_SummonBackup) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02FA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPEAR_GUY_DANCE_1) EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02FB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPEAR_GUY_DANCE_2) EVT_END_THREAD EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -634,9 +634,9 @@ EvtScript N(EVS_Move_SummonBackup) = { EVT_WAIT(25) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02FA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPEAR_GUY_DANCE_1) EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02FB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPEAR_GUY_DANCE_2) EVT_END_THREAD EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -655,7 +655,7 @@ EvtScript N(EVS_Move_SummonBackup) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 30, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_RECOVER_HEART) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_SPEAR_GUY, ANIM_SpearGuy_Anim0E) EVT_WAIT(20) EVT_CALL(GetOriginalActorType, ACTOR_SELF, LVar0) @@ -708,19 +708,19 @@ EvtScript N(EVS_Move_SummonBackup) = { EVT_CALL(SetActorPos, LVarB, LVar0, 0, 0) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02FA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPEAR_GUY_DANCE_1) EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02FA) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPEAR_GUY_DANCE_1) EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02FB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPEAR_GUY_DANCE_2) EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02FB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPEAR_GUY_DANCE_2) EVT_WAIT(15) EVT_END_THREAD EVT_CALL(SetActorSpeed, LVarB, EVT_FLOAT(4.0)) EVT_CALL(RunToGoal, LVarB, 0, FALSE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_RECOVER_HEART) EVT_CALL(GetActorPos, LVarB, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 30, 0) @@ -783,7 +783,7 @@ EvtScript N(EVS_BecomeShyGuy) = { EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_RECOVER_HEART) EVT_THREAD EVT_LOOP(10) EVT_CALL(GetPartOffset, ACTOR_SELF, PRT_GRASS_SKIRT, LVar0, LVar1, LVar2) @@ -791,7 +791,7 @@ EvtScript N(EVS_BecomeShyGuy) = { EVT_WAIT(3) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_GRASS_SKIRT, SOUND_02FC) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_GRASS_SKIRT, SOUND_SPEAR_GUY_RIP_SKIRT) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_GRASS_SKIRT, ACTOR_SOUND_JUMP, SOUND_NONE, SOUND_NONE) EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_GRASS_SKIRT, LVar0, 0, LVar2, 30, TRUE) EVT_WAIT(5) @@ -838,7 +838,7 @@ EvtScript N(EVS_Attack_ThrowSpear) = { EVT_CALL(SetPartScale, ACTOR_SELF, PRT_SPEAR, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(SetPartScale, ACTOR_SELF, PRT_GRASS_SKIRT, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_END_IF - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -871,7 +871,7 @@ EvtScript N(EVS_Attack_ThrowSpear) = { EVT_GOTO(0) EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SPEAR, SOUND_030A) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SPEAR, SOUND_SPEAR_THROW) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_SPEAR, ACTOR_SOUND_JUMP, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -924,7 +924,7 @@ EvtScript N(EVS_Attack_ThrowSpear) = { EVT_GOTO(0) EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SPEAR, SOUND_030A) + EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SPEAR, SOUND_SPEAR_THROW) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_SPEAR, ACTOR_SOUND_JUMP, SOUND_NONE, SOUND_NONE) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -933,7 +933,7 @@ EvtScript N(EVS_Attack_ThrowSpear) = { EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_SPEAR, LVar0, LVar1, LVar2, 20, TRUE) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_THROW, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_THROW, BS_FLAGS1_TRIGGER_EVENTS) EVT_WAIT(3) EVT_CALL(SetPartFlagBits, ACTOR_SELF, PRT_SPEAR, ACTOR_PART_FLAG_INVISIBLE, TRUE) EVT_WAIT(20) @@ -1275,7 +1275,7 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1334,7 +1334,7 @@ EvtScript N(EVS_Attack_Tackle) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_SHY_GUY, ANIM_ShyGuy_Red_Anim05) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_TACKLE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_TACKLE, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 15) @@ -1380,7 +1380,7 @@ EvtScript N(EVS_Attack_Vault) = { EVT_SUB(LVar0, 40) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -1438,7 +1438,7 @@ EvtScript N(EVS_Attack_Vault) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(JumpToGoal, ACTOR_SELF, 18, FALSE, TRUE, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_VAULT, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_VAULT, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -1486,10 +1486,10 @@ EvtScript N(EVS_Attack_Vault) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E4) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_COLLAPSE) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_SHY_GUY, ANIM_ShyGuy_Red_Anim10) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20C3) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DISAPPOINTED) EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_SHY_GUY, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(RandInt, 100, LVar0) EVT_IF_LT(LVar0, 50) diff --git a/src/battle/common/actor/spike_top.inc.c b/src/battle/common/actor/spike_top.inc.c index b745f4118a..13f4d756bc 100644 --- a/src/battle/common/actor/spike_top.inc.c +++ b/src/battle/common/actor/spike_top.inc.c @@ -611,7 +611,7 @@ EvtScript N(EVS_Ceiling_TakeTurn) = { EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_END_IF - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 4, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 4, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -671,7 +671,7 @@ EvtScript N(EVS_Ceiling_TakeTurn) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_CEILING_DROP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_CEILING_DROP, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -753,12 +753,12 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(5) EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_SPIN) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikeTop_Anim0A) EVT_WAIT(20) 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_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SHELL_TOSS) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -807,7 +807,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(14.0)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_SHELL_TOSS, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_SHELL_TOSS, BS_FLAGS1_TRIGGER_EVENTS) 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/spiked_gloomba.inc.c b/src/battle/common/actor/spiked_gloomba.inc.c index 6e32c8cd33..caf39336da 100644 --- a/src/battle/common/actor/spiked_gloomba.inc.c +++ b/src/battle/common/actor/spiked_gloomba.inc.c @@ -324,7 +324,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(5) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikedGoomba_Dark_Midair) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -436,7 +436,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.3), EVT_FLOAT(0.5), EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_END_SWITCH - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SPIKEBONK, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SPIKEBONK, BS_FLAGS1_TRIGGER_EVENTS) 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/spiked_goomba.inc.c b/src/battle/common/actor/spiked_goomba.inc.c index 90a29ff368..feca67d0d9 100644 --- a/src/battle/common/actor/spiked_goomba.inc.c +++ b/src/battle/common/actor/spiked_goomba.inc.c @@ -326,7 +326,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(5) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpikedGoomba_Midair) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -438,7 +438,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.3), EVT_FLOAT(0.5), EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_END_SWITCH - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SPIKEBONK, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SPIKEBONK, BS_FLAGS1_TRIGGER_EVENTS) 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/spiny.inc.c b/src/battle/common/actor/spiny.inc.c index 587df7cdc5..1c90e3306e 100644 --- a/src/battle/common/actor/spiny.inc.c +++ b/src/battle/common/actor/spiny.inc.c @@ -437,7 +437,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_BALL, SOUND_SPINY_SPIN_UP) EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_BALL, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 4, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 4, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVarA) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -478,7 +478,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_ROLL, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, SUPPRESS_EVENT_ALL, 0, DMG_ROLL, BS_FLAGS1_TRIGGER_EVENTS) 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/spy_guy.inc.c b/src/battle/common/actor/spy_guy.inc.c index 978776b195..d4413c8177 100644 --- a/src/battle/common/actor/spy_guy.inc.c +++ b/src/battle/common/actor/spy_guy.inc.c @@ -372,7 +372,7 @@ EvtScript N(EVS_Attack_Slingshot) = { EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SLINGSHOT_FIRE) EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_STONE, ACTOR_SOUND_JUMP, SOUND_NONE, SOUND_NONE) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -413,7 +413,7 @@ EvtScript N(EVS_Attack_Slingshot) = { EVT_CALL(SetPartJumpGravity, ACTOR_SELF, PRT_STONE, EVT_FLOAT(0.002)) EVT_CALL(JumpPartTo, ACTOR_SELF, PRT_STONE, LVar0, LVar1, LVar2, 0, TRUE) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SHOOT, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_SHOOT, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -502,9 +502,9 @@ EvtScript N(EVS_Attack_Mallet) = { EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) EVT_THREAD EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0327) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MALLET_SWING) EVT_END_THREAD - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -532,7 +532,7 @@ EvtScript N(EVS_Attack_Mallet) = { EVT_WAIT(5) EVT_WAIT(2) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_MALLET, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_MALLET, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -586,7 +586,7 @@ EvtScript N(EVS_Attack_Mallet) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20DC) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_COMMAND_LOSS) EVT_CALL(N(StartRumbleWithParams), 200, 10) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_SpyGuy_Anim09) diff --git a/src/battle/common/actor/stone_chomp.inc.c b/src/battle/common/actor/stone_chomp.inc.c index 412eec5745..da3ef98758 100644 --- a/src/battle/common/actor/stone_chomp.inc.c +++ b/src/battle/common/actor/stone_chomp.inc.c @@ -659,7 +659,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_StoneChomp_SlowBite) EVT_WAIT(15) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_HURT) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -722,7 +722,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_SELF, PRT_TARGET, LVar0, LVar1, LVar2) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_CHOMP_BITE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_CHOMP_BITE, BS_FLAGS1_TRIGGER_EVENTS) 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/swooper.inc.c b/src/battle/common/actor/swooper.inc.c index 9fb37e9f9e..b493da4ff0 100644 --- a/src/battle/common/actor/swooper.inc.c +++ b/src/battle/common/actor/swooper.inc.c @@ -452,7 +452,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_LINEAR) EVT_END_IF - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 2, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -508,7 +508,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Swooper_Anim06) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SWOOP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SWOOP, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0) @@ -541,7 +541,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar1, 24) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 2, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -590,7 +590,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Swooper_Anim06) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -40, EASING_LINEAR) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SWOOP, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 0, 0, DMG_SWOOP, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 50, 10, 0) diff --git a/src/battle/common/actor/swoopula.inc.c b/src/battle/common/actor/swoopula.inc.c index 81f11be729..a47a18346d 100644 --- a/src/battle/common/actor/swoopula.inc.c +++ b/src/battle/common/actor/swoopula.inc.c @@ -458,7 +458,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -4, EASING_LINEAR) EVT_END_IF - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 2, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -515,7 +515,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Swooper_Gray_Anim06) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -10, EASING_LINEAR) EVT_IF_EQ(LFlag0, TRUE) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 0, BS_FLAGS1_TRIGGER_EVENTS) EVT_RETURN EVT_END_IF EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) @@ -525,7 +525,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Swooper_Gray_Anim02) EVT_WAIT(21) EVT_LOOP(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LEECH) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.9), EVT_FLOAT(1.2), EVT_FLOAT(1.0)) @@ -560,7 +560,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { EVT_WAIT(10) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, DMG_LEECH, BS_FLAGS1_40) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, DMG_LEECH, BS_FLAGS1_NICE_HIT) EVT_WAIT(30) EVT_END_LOOP EVT_ELSE @@ -591,7 +591,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Leeching) EVT_LOOP(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LEECH) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_SET(LFlag0, FALSE) EVT_LOOP(1) @@ -735,7 +735,7 @@ EvtScript N(EVS_Flying_TakeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LEECH) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_SET(LFlag0, FALSE) EVT_LOOP(1) @@ -835,10 +835,10 @@ EvtScript N(EVS_Flying_TakeTurn) = { EVT_BREAK_LOOP EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_UNBLOCKABLE | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 2, BS_FLAGS1_40) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_UNBLOCKABLE | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 2, BS_FLAGS1_NICE_HIT) EVT_CALL(GetLastDamage, ACTOR_PLAYER, LVar3) EVT_IF_NE(LVar3, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_RECOVER_HEART) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) @@ -914,7 +914,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar1, 24) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 2, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -964,7 +964,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Swooper_Gray_Anim06) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, -40, EASING_LINEAR) EVT_IF_EQ(LFlag0, TRUE) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 0, BS_FLAGS1_TRIGGER_EVENTS) EVT_RETURN EVT_END_IF EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) @@ -974,7 +974,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Swooper_Gray_Anim02) EVT_WAIT(21) EVT_LOOP(2) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LEECH) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.9), EVT_FLOAT(1.2), EVT_FLOAT(1.0)) @@ -995,7 +995,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LEECH) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(0.9), EVT_FLOAT(1.2), EVT_FLOAT(1.0)) @@ -1010,7 +1010,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_WAIT(10) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 2, BS_FLAGS1_40) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 2, BS_FLAGS1_NICE_HIT) EVT_WAIT(30) EVT_END_LOOP EVT_ELSE @@ -1040,7 +1040,7 @@ EvtScript N(EVS_TakeTurn) = { EVT_END_IF EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Leeching) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03E0) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LEECH) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_SET(LFlag0, FALSE) EVT_LOOP(1) @@ -1140,10 +1140,10 @@ EvtScript N(EVS_TakeTurn) = { EVT_BREAK_LOOP EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_UNBLOCKABLE | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, DMG_LEECH, BS_FLAGS1_40) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_UNBLOCKABLE | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, DMG_LEECH, BS_FLAGS1_NICE_HIT) EVT_CALL(GetLastDamage, ACTOR_PLAYER, LVar3) EVT_IF_NE(LVar3, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_RECOVER_HEART) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) diff --git a/src/battle/common/actor/whacka.inc.c b/src/battle/common/actor/whacka.inc.c index f1ff71ef7a..0c045810c9 100644 --- a/src/battle/common/actor/whacka.inc.c +++ b/src/battle/common/actor/whacka.inc.c @@ -137,7 +137,7 @@ EvtScript N(EVS_HandleEvent) = { EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2073) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HIT_WHACKA) EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_Whacka_Idle) EVT_EXEC_WAIT(EVS_Enemy_Hit) @@ -293,7 +293,7 @@ EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_MakeWhackaBump) = { EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_SpawnedBump, TRUE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2073) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HIT_WHACKA) EVT_THREAD EVT_WAIT(15) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Whacka_Idle) diff --git a/src/battle/common/actor/white_clubba.inc.c b/src/battle/common/actor/white_clubba.inc.c index 5f3a82a146..5674a2ad8a 100644 --- a/src/battle/common/actor/white_clubba.inc.c +++ b/src/battle/common/actor/white_clubba.inc.c @@ -242,11 +242,11 @@ EvtScript N(EVS_TakeTurn) = { EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleClubba_Frost_Anim01) EVT_WAIT(10) EVT_END_IF - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20C5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CLUBBA_SWING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleClubba_Frost_Anim08) EVT_WAIT(20) EVT_IF_EQ(LVar0, HIT_RESULT_LUCKY) @@ -285,12 +285,12 @@ EvtScript N(EVS_TakeTurn) = { EVT_LABEL(40) // heavy club attack EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleClubba_Frost_Anim09) EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20C5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CLUBBA_SWING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleClubba_Frost_Anim0A) EVT_WAIT(2) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_HEAVY_STRIKE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_HEAVY_STRIKE, BS_FLAGS1_TRIGGER_EVENTS) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.5)) EVT_END_THREAD @@ -298,12 +298,12 @@ EvtScript N(EVS_TakeTurn) = { EVT_LABEL(50) // swift club attack EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleClubba_Frost_Anim09) EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20C5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CLUBBA_SWING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleClubba_Frost_Anim0A) EVT_WAIT(2) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_QUICK_STRIKE, BS_FLAGS1_10) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_QUICK_STRIKE, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.5)) EVT_END_THREAD @@ -313,12 +313,12 @@ EvtScript N(EVS_TakeTurn) = { EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleClubba_Frost_Anim09) EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20C5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CLUBBA_SWING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleClubba_Frost_Anim0A) EVT_WAIT(2) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_QUICK_STRIKE, BS_FLAGS1_40) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_QUICK_STRIKE, BS_FLAGS1_NICE_HIT) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.5)) EVT_END_THREAD @@ -328,12 +328,12 @@ EvtScript N(EVS_TakeTurn) = { EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleClubba_Frost_Anim09) EVT_WAIT(15) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20C5) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_CLUBBA_SWING) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleClubba_Frost_Anim0A) EVT_WAIT(2) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_QUICK_STRIKE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_QUICK_STRIKE, BS_FLAGS1_TRIGGER_EVENTS) EVT_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 10, EVT_FLOAT(1.5)) EVT_END_THREAD diff --git a/src/battle/common/actor/white_magikoopa.inc.c b/src/battle/common/actor/white_magikoopa.inc.c index 2a43d5dafa..6b78345343 100644 --- a/src/battle/common/actor/white_magikoopa.inc.c +++ b/src/battle/common/actor/white_magikoopa.inc.c @@ -361,7 +361,7 @@ EvtScript N(EVS_HandleEvent_Ground) = { EvtScript N(EVS_KnockDownCheck) = { EVT_CALL(GetBattleFlags, LVar0) EVT_IF_NOT_FLAG(LVar0, BS_FLAGS1_PARTNER_ACTING) - EVT_IF_FLAG(LVar0, BS_FLAGS1_40 | BS_FLAGS1_200) + EVT_IF_FLAG(LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_ShouldKnockDown, TRUE) EVT_END_IF EVT_ELSE @@ -372,7 +372,7 @@ EvtScript N(EVS_KnockDownCheck) = { EVT_CASE_OR_EQ(MOVE_HEADBONK3) EVT_CASE_OR_EQ(MOVE_MULTIBONK) EVT_CALL(GetBattleFlags, LVar0) - EVT_IF_FLAG(LVar0, BS_FLAGS1_40 | BS_FLAGS1_200) + EVT_IF_FLAG(LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_ShouldKnockDown, TRUE) EVT_END_IF EVT_END_CASE_GROUP @@ -596,7 +596,7 @@ EvtScript N(EVS_Attack_MagicBlast) = { EVT_PLAY_EFFECT(EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_FlyingMagikoopa_White_Anim02) EVT_WAIT(30) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -650,7 +650,7 @@ EvtScript N(EVS_Attack_MagicBlast) = { EVT_CALL(N(ShrinkActor), LVar0, LVar1, LVar5, LVar3, LVar4, LVar5, 20) EVT_WAIT(18) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_MAGIC_BLAST, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_MAGIC_BLAST, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -671,7 +671,7 @@ EvtScript N(EVS_Attack_WandStrike) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MAGIKOOPA_VANISH) EVT_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_Magikoopa_White_Anim02) EVT_SET(LVar0, 200) @@ -702,8 +702,8 @@ EvtScript N(EVS_Attack_WandStrike) = { EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_GROUND, 255) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_Magikoopa_White_Anim03) EVT_WAIT(11) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DC) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MAGIKOOPA_WAND_STRIKE) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -737,7 +737,7 @@ EvtScript N(EVS_Attack_WandStrike) = { EVT_END_SWITCH EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_WAND_STRIKE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_WAND_STRIKE, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -1037,7 +1037,7 @@ EvtScript N(EVS_Move_HealOne) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, LV_LowestActor, SOUND_206D) + EVT_CALL(PlaySoundAtActor, LV_LowestActor, SOUND_RECOVER_HEART) EVT_CALL(PlaySoundAtActor, LV_LowestActor, SOUND_HEART_BOUNCE) EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, LV_LowestActor, SOUND_STAR_BOUNCE_A) @@ -1136,7 +1136,7 @@ EvtScript N(EVS_Move_HealAll) = { EVT_IF_EQ(LFlag0, FALSE) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtActor, LVar0, SOUND_206D) + EVT_CALL(PlaySoundAtActor, LVar0, SOUND_RECOVER_HEART) EVT_CALL(PlaySoundAtActor, LVar0, SOUND_HEART_BOUNCE) EVT_WAIT(30) EVT_CALL(PlaySoundAtActor, LVar0, SOUND_STAR_BOUNCE_A) diff --git a/src/battle/common/actor/yellow_magikoopa.inc.c b/src/battle/common/actor/yellow_magikoopa.inc.c index 479b4cde3f..fc533add6f 100644 --- a/src/battle/common/actor/yellow_magikoopa.inc.c +++ b/src/battle/common/actor/yellow_magikoopa.inc.c @@ -325,7 +325,7 @@ EvtScript N(EVS_HandleEvent) = { EvtScript N(EVS_KnockDownCheck) = { EVT_CALL(GetBattleFlags, LVar0) EVT_IF_NOT_FLAG(LVar0, BS_FLAGS1_PARTNER_ACTING) - EVT_IF_FLAG(LVar0, BS_FLAGS1_40 | BS_FLAGS1_200) + EVT_IF_FLAG(LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_ShouldKnockDown, TRUE) EVT_END_IF EVT_ELSE @@ -336,7 +336,7 @@ EvtScript N(EVS_KnockDownCheck) = { EVT_CASE_OR_EQ(MOVE_HEADBONK3) EVT_CASE_OR_EQ(MOVE_MULTIBONK) EVT_CALL(GetBattleFlags, LVar0) - EVT_IF_FLAG(LVar0, BS_FLAGS1_40 | BS_FLAGS1_200) + EVT_IF_FLAG(LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_ShouldKnockDown, TRUE) EVT_END_IF EVT_END_CASE_GROUP @@ -563,7 +563,7 @@ EvtScript N(EVS_Attack_MagicBlast) = { EVT_PLAY_EFFECT(EFFECT_GATHER_MAGIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 30, 0) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_FlyingMagikoopa_Yellow_Anim02) EVT_WAIT(30) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -617,7 +617,7 @@ EvtScript N(EVS_Attack_MagicBlast) = { EVT_CALL(N(ShrinkActor), LVar0, LVar1, LVar5, LVar3, LVar4, LVar5, 20) EVT_WAIT(18) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_MAGIC_BLAST, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_MAGIC | DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_MAGIC_BLAST, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) @@ -638,7 +638,7 @@ EvtScript N(EVS_Attack_WandStrike) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_MINUS_1, BTL_CAM_MODEX_1, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DB) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MAGIKOOPA_VANISH) EVT_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_Magikoopa_Yellow_Anim02) EVT_SET(LVar0, 200) @@ -669,8 +669,8 @@ EvtScript N(EVS_Attack_WandStrike) = { EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_GROUND, 255) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_GROUND, ANIM_Magikoopa_Yellow_Anim03) EVT_WAIT(11) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_02DC) - EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_MAGIKOOPA_WAND_STRIKE) + EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) @@ -704,7 +704,7 @@ EvtScript N(EVS_Attack_WandStrike) = { EVT_END_SWITCH EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_WAIT(2) - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_WAND_STRIKE, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_WAND_STRIKE, BS_FLAGS1_TRIGGER_EVENTS) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) diff --git a/src/battle/common/move/HammerSupport.inc.c b/src/battle/common/move/HammerSupport.inc.c index 37ab14aa61..75bb7c744a 100644 --- a/src/battle/common/move/HammerSupport.inc.c +++ b/src/battle/common/move/HammerSupport.inc.c @@ -307,7 +307,7 @@ EvtScript N(EVS_UseSuperHammer) = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) EVT_EXEC_WAIT(N(EVS_HammerSupport_D)) - EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 0, 0, 0, BS_FLAGS1_10) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 0, 0, 0, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) EVT_CALL(SetBattleCamOffsetZ, 8) EVT_CALL(InitTargetIterator) @@ -376,7 +376,7 @@ EvtScript N(EVS_UseUltraHammer) = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) EVT_EXEC_WAIT(N(EVS_HammerSupport_E)) - EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 0, 0, 0, BS_FLAGS1_10) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 0, 0, 0, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_CALL(UseBattleCamPreset, BTL_CAM_PLAYER_AIM_HAMMER) EVT_CALL(SetBattleCamOffsetZ, 8) EVT_CALL(InitTargetIterator) diff --git a/src/battle/common/move/JumpSupport.inc.c b/src/battle/common/move/JumpSupport.inc.c index dd45272cd2..6a8d9d257c 100644 --- a/src/battle/common/move/JumpSupport.inc.c +++ b/src/battle/common/move/JumpSupport.inc.c @@ -48,7 +48,7 @@ EvtScript N(EVS_CheckForAPress) = { EVT_END }; -EvtScript N(EVS_JumpSupport_A) = { +EvtScript N(EVS_JumpSupport_Approach) = { EVT_CALL(SetGoalToFirstTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 40) @@ -305,10 +305,11 @@ EvtScript N(EVS_JumpSupport_Miss) = { EVT_END }; -EvtScript N(EVS_JumpSupport_K) = { +// load the action command +EvtScript N(EVS_JumpSupport_InitCommand) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) - EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Approach)) EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) EVT_CALL(action_command_jump_start, LVarA, 3) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) @@ -322,7 +323,7 @@ EvtScript N(EVS_JumpSupport_K) = { EvtScript N(EVS_JumpSupport_L) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) - EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Approach)) EVT_CALL(InitTargetIterator) EVT_EXEC_WAIT(N(EVS_JumpSupport_C)) EVT_SET(LVarB, LVarA) @@ -348,7 +349,7 @@ EvtScript N(EVS_JumpSupport_L) = { EvtScript N(EVS_JumpSupport_M) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) - EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Approach)) EVT_EXEC_WAIT(N(EVS_JumpSupport_D)) EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(D_802A10F0))) EVT_SET(LVarB, LVarA) diff --git a/src/battle/common/move/StarBeamSupport.inc.c b/src/battle/common/move/StarBeamSupport.inc.c index 810eb5101f..4e591c4441 100644 --- a/src/battle/common/move/StarBeamSupport.inc.c +++ b/src/battle/common/move/StarBeamSupport.inc.c @@ -85,7 +85,7 @@ API_CALLABLE(N(ProcessPeachStarBeam)) { if (target == NULL) { return ApiStatus_DONE2; } - get_actor_part(target, player->targetPartIndex); + get_actor_part(target, player->targetPartID); targetPosX = target->curPos.x + target->headOffset.x; if (target->flags & ACTOR_FLAG_UPSIDE_DOWN) { targetPosY = target->curPos.y + target->headOffset.y - target->size.y; @@ -349,7 +349,7 @@ API_CALLABLE(N(ProcessPeachStarBeam)) { if (script->functionTemp[FT_DELAY] == 0) { N(StarBeamStage) = 1; if (!script->functionTemp[FT_IS_PEACH_BEAM] && player->targetListLength == 1) { - if (get_actor_part(get_actor(player->targetActorID), player->targetPartIndex)->eventFlags & ACTOR_EVENT_FLAG_STAR_ROD_ENCHANTED) { + if (get_actor_part(get_actor(player->targetActorID), player->targetPartID)->eventFlags & ACTOR_EVENT_FLAG_STAR_ROD_ENCHANTED) { script->functionTemp[FT_STATE] = PEACH_STAR_BEAM_IMMUNE; } else { script->functionTemp[FT_DELAY] = 15; diff --git a/src/battle/dmg_item.c b/src/battle/dmg_item.c index 8f04bf0973..a0b931e8e6 100644 --- a/src/battle/dmg_item.c +++ b/src/battle/dmg_item.c @@ -53,7 +53,7 @@ HitResult calc_item_damage_enemy(void) { Actor* partner = battleStatus->partnerActor; s32 currentTargetPartID = battleStatus->curTargetPart; s32 partImmuneToElement; - s32 fearInflicted = FALSE; + s32 wasSpecialHit = FALSE; s32 actorClass; s32 isFireDamage = FALSE; s32 isWaterDamage = FALSE; @@ -125,8 +125,8 @@ HitResult calc_item_damage_enemy(void) { sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); show_immune_bonk(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 1); show_next_damage_popup(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 0); - if (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) { - return HIT_RESULT_1; + if (gBattleStatus.flags1 & (BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT)) { + return HIT_RESULT_NICE; } return HIT_RESULT_HIT; } @@ -204,7 +204,7 @@ HitResult calc_item_damage_enemy(void) { hitResult = HIT_RESULT_HIT; } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { if (dispatchEvent == EVENT_HIT_COMBO) { dispatchEvent = EVENT_HIT; } @@ -218,7 +218,7 @@ HitResult calc_item_damage_enemy(void) { dispatchEvent = EVENT_HIT_COMBO; } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { if (battleStatus->curAttackElement & DAMAGE_TYPE_REMOVE_BUFFS) { dispatchEvent = EVENT_IMMUNE; if (targetPart->eventFlags & ACTOR_EVENT_FLAG_ENCHANTED) { @@ -237,7 +237,7 @@ HitResult calc_item_damage_enemy(void) { } if (battleStatus->curAttackElement & DAMAGE_TYPE_REMOVE_BUFFS) { - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { if ((target->attackBoost > 0 || target->defenseBoost > 0) || ((target->staticStatus == 0 && target->transparentStatus != 0) || target->staticStatus != 0)) { @@ -261,7 +261,7 @@ HitResult calc_item_damage_enemy(void) { } } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { if (battleStatus->curAttackElement & DAMAGE_TYPE_PEACH_BEAM) { dispatchEvent = EVENT_IMMUNE; if (targetPart->eventFlags & ACTOR_EVENT_FLAG_ENCHANTED) { @@ -275,7 +275,7 @@ HitResult calc_item_damage_enemy(void) { } } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { if (battleStatus->curAttackElement & DAMAGE_TYPE_SPIN_SMASH) { if (dispatchEvent == EVENT_HIT) { dispatchEvent = EVENT_SPIN_SMASH_HIT; @@ -286,7 +286,7 @@ HitResult calc_item_damage_enemy(void) { } } - if ((gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) + if ((gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) && (battleStatus->curAttackElement & (DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POW)) && (targetPart->eventFlags & ACTOR_EVENT_FLAG_GROUNDABLE) ) { @@ -298,7 +298,7 @@ HitResult calc_item_damage_enemy(void) { } } - if ((gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) + if ((gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) && (battleStatus->curAttackElement & DAMAGE_TYPE_POW) && (targetPart->eventFlags & ACTOR_EVENT_FLAG_RIDING_BROOMSTICK) ) { @@ -310,7 +310,7 @@ HitResult calc_item_damage_enemy(void) { } } - if ((gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) + if ((gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) && (battleStatus->curAttackElement & (DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POW | DAMAGE_TYPE_QUAKE)) && (targetPart->eventFlags & ACTOR_EVENT_FLAG_FLIPABLE) ) { @@ -322,7 +322,7 @@ HitResult calc_item_damage_enemy(void) { } } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { if (battleStatus->curAttackElement & DAMAGE_TYPE_FIRE) { if (dispatchEvent == EVENT_HIT) { dispatchEvent = EVENT_BURN_HIT; @@ -334,7 +334,7 @@ HitResult calc_item_damage_enemy(void) { } } - if ((gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) + if ((gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) && battleStatus->lastAttackDamage >= 0 && dispatchEvent != EVENT_DEATH && dispatchEvent != EVENT_SPIN_SMASH_DEATH @@ -375,7 +375,7 @@ HitResult calc_item_damage_enemy(void) { temp = target->actorBlueprint->spookChance; temp = (battleStatus->statusChance * temp) / 100; - if ((gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) && (battleStatus->curAttackElement & DAMAGE_TYPE_FEAR)) { + if ((gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) && (battleStatus->curAttackElement & DAMAGE_TYPE_FEAR)) { if (rand_int(99) < temp && (target->debuff != STATUS_KEY_FEAR && target->debuff != STATUS_KEY_DIZZY @@ -387,11 +387,11 @@ HitResult calc_item_damage_enemy(void) { { dispatchEvent = EVENT_SCARE_AWAY; hitResult = HIT_RESULT_HIT; - fearInflicted = TRUE; - gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10 | BS_FLAGS1_SHOW_PLAYER_DECORATIONS | BS_FLAGS1_ACTORS_VISIBLE; + wasSpecialHit = TRUE; + gBattleStatus.flags1 |= BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_SHOW_PLAYER_DECORATIONS | BS_FLAGS1_ACTORS_VISIBLE; sfx_play_sound_at_position(SOUND_DAMAGE_STARS, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); wasStatusInflicted = TRUE; - gBattleStatus.flags1 |= BS_FLAGS1_40; + gBattleStatus.flags1 |= BS_FLAGS1_NICE_HIT; } else { dispatchEvent = EVENT_IMMUNE; hitResult = HIT_RESULT_NO_DAMAGE; @@ -400,16 +400,15 @@ HitResult calc_item_damage_enemy(void) { battleStatus->wasStatusInflicted = wasStatusInflicted; - if ((fearInflicted - && (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200))) - || ((gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) && !(gBattleStatus.flags1 & BS_FLAGS1_80)) + if ((wasSpecialHit && (gBattleStatus.flags1 & (BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT))) + || ((gBattleStatus.flags1 & (BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT)) && !(gBattleStatus.flags1 & BS_FLAGS1_NO_RATING)) ) { if (battleStatus->lastAttackDamage > 0) { sfx_play_sound_at_position(SOUND_DAMAGE_STARS, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); } - if (battleStatus->lastAttackDamage > 0 || (battleStatus->curAttackElement & DAMAGE_TYPE_STATUS_ALWAYS_HITS) && fearInflicted) { - if (gBattleStatus.flags1 & BS_FLAGS1_40) { + if (battleStatus->lastAttackDamage > 0 || (battleStatus->curAttackElement & DAMAGE_TYPE_STATUS_ALWAYS_HITS) && wasSpecialHit) { + if (gBattleStatus.flags1 & BS_FLAGS1_NICE_HIT) { show_action_rating(ACTION_RATING_NICE, target, state->goalPos.x, state->goalPos.y, state->goalPos.z); } else { show_action_rating(ACTION_RATING_SUPER, target, state->goalPos.x, state->goalPos.y, state->goalPos.z); @@ -417,21 +416,21 @@ HitResult calc_item_damage_enemy(void) { } } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { func_80266970(target); } dispatch_event_actor(target, dispatchEvent); if (actorClass == ACTOR_PARTNER) { - if ((battleStatus->lastAttackDamage > 0) && (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE)) { + if ((battleStatus->lastAttackDamage > 0) && (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS)) { inflict_status(target, STATUS_KEY_DAZE, battleStatus->lastAttackDamage); } } if (!(target->flags & ACTOR_FLAG_NO_DMG_POPUP)) { if (battleStatus->lastAttackDamage == 0) { - if (!fearInflicted && !wasStatusInflicted) { + if (!wasSpecialHit && !wasStatusInflicted) { show_immune_bonk(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 3); } } else if (!partImmuneToElement) { @@ -520,12 +519,12 @@ HitResult calc_item_damage_enemy(void) { show_actor_health_bar(target); - if (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) { + if (gBattleStatus.flags1 & (BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT)) { if (hitResult == HIT_RESULT_HIT) { - hitResult = HIT_RESULT_1; + hitResult = HIT_RESULT_NICE; } if (hitResult == HIT_RESULT_NO_DAMAGE) { - hitResult = HIT_RESULT_3; + hitResult = HIT_RESULT_NICE_NO_DAMAGE; } } @@ -546,41 +545,41 @@ ApiStatus ItemDamageEnemy(Evt* script, s32 isInitialCall) { battleStatus->curAttackDamage = evt_get_variable(script, *args++); flags = *args++; - if ((flags & (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) == (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) { - gBattleStatus.flags1 |= BS_FLAGS1_10; - gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; - } else if (flags & BS_FLAGS1_10) { - gBattleStatus.flags1 |= BS_FLAGS1_10; - gBattleStatus.flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; - } else if (flags & BS_FLAGS1_SP_EVT_ACTIVE) { - gBattleStatus.flags1 &= ~BS_FLAGS1_10; - gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; + if ((flags & BS_FLAGS1_INCLUDE_POWER_UPS) && (flags & BS_FLAGS1_TRIGGER_EVENTS)) { + gBattleStatus.flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 |= BS_FLAGS1_TRIGGER_EVENTS; + } else if (flags & BS_FLAGS1_INCLUDE_POWER_UPS) { + gBattleStatus.flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; + } else if (flags & BS_FLAGS1_TRIGGER_EVENTS) { + gBattleStatus.flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 |= BS_FLAGS1_TRIGGER_EVENTS; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_10; - gBattleStatus.flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; + gBattleStatus.flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; } - if (flags & BS_FLAGS1_40) { - gBattleStatus.flags1 |= BS_FLAGS1_40; + if (flags & BS_FLAGS1_NICE_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_NICE_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_40; + gBattleStatus.flags1 &= ~BS_FLAGS1_NICE_HIT; } - if (flags & BS_FLAGS1_200) { - gBattleStatus.flags1 |= BS_FLAGS1_200; + if (flags & BS_FLAGS1_SUPER_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_SUPER_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_200; + gBattleStatus.flags1 &= ~BS_FLAGS1_SUPER_HIT; } - if (flags & BS_FLAGS1_80) { - gBattleStatus.flags1 |= BS_FLAGS1_80; + if (flags & BS_FLAGS1_NO_RATING) { + gBattleStatus.flags1 |= BS_FLAGS1_NO_RATING; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_80; + gBattleStatus.flags1 &= ~BS_FLAGS1_NO_RATING; } actor = get_actor(script->owner1.actorID); battleStatus->curTargetID = actor->targetActorID; - battleStatus->curTargetPart = actor->targetPartIndex; + battleStatus->curTargetPart = actor->targetPartID; battleStatus->statusChance = battleStatus->curAttackStatus; if (battleStatus->statusChance == STATUS_KEY_NEVER) { @@ -617,40 +616,40 @@ ApiStatus ItemSpookEnemy(Evt* script, s32 isInitialCall) { battleStatus->curAttackDamage = evt_get_variable(script, *args++); flags = *args++; - if ((flags & (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) == (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) { - gBattleStatus.flags1 |= BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE; - } else if (flags & BS_FLAGS1_10) { - gBattleStatus.flags1 |= BS_FLAGS1_10; - gBattleStatus.flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; - } else if (flags & BS_FLAGS1_SP_EVT_ACTIVE) { - gBattleStatus.flags1 &= ~BS_FLAGS1_10; - gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; + if ((flags & BS_FLAGS1_INCLUDE_POWER_UPS) && (flags & BS_FLAGS1_TRIGGER_EVENTS)) { + gBattleStatus.flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS; + } else if (flags & BS_FLAGS1_INCLUDE_POWER_UPS) { + gBattleStatus.flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; + } else if (flags & BS_FLAGS1_TRIGGER_EVENTS) { + gBattleStatus.flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 |= BS_FLAGS1_TRIGGER_EVENTS; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_10; - gBattleStatus.flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; + gBattleStatus.flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; } - if (flags & BS_FLAGS1_40) { - gBattleStatus.flags1 |= BS_FLAGS1_40; + if (flags & BS_FLAGS1_NICE_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_NICE_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_40; + gBattleStatus.flags1 &= ~BS_FLAGS1_NICE_HIT; } - if (flags & BS_FLAGS1_200) { - gBattleStatus.flags1 |= BS_FLAGS1_200; + if (flags & BS_FLAGS1_SUPER_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_SUPER_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_200; + gBattleStatus.flags1 &= ~BS_FLAGS1_SUPER_HIT; } - if (flags & BS_FLAGS1_80) { - gBattleStatus.flags1 |= BS_FLAGS1_80; + if (flags & BS_FLAGS1_NO_RATING) { + gBattleStatus.flags1 |= BS_FLAGS1_NO_RATING; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_80; + gBattleStatus.flags1 &= ~BS_FLAGS1_NO_RATING; } actor = get_actor(script->owner1.actorID); battleStatus->curTargetID = actor->targetActorID; - battleStatus->curTargetPart = actor->targetPartIndex; + battleStatus->curTargetPart = actor->targetPartID; battleStatus->statusChance = battleStatus->curAttackStatus; if (battleStatus->statusChance == STATUS_KEY_NEVER) { @@ -686,40 +685,40 @@ ApiStatus ItemAfflictEnemy(Evt* script, s32 isInitialCall) { battleStatus->curAttackDamage = evt_get_variable(script, *args++); flags = *args++; - if ((flags & (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) == (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) { - gBattleStatus.flags1 |= BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE; - } else if (flags & BS_FLAGS1_10) { - gBattleStatus.flags1 |= BS_FLAGS1_10; - gBattleStatus.flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; - } else if (flags & BS_FLAGS1_SP_EVT_ACTIVE) { - gBattleStatus.flags1 &= ~BS_FLAGS1_10; - gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; + if ((flags & BS_FLAGS1_INCLUDE_POWER_UPS) && (flags & BS_FLAGS1_TRIGGER_EVENTS)) { + gBattleStatus.flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS; + } else if (flags & BS_FLAGS1_INCLUDE_POWER_UPS) { + gBattleStatus.flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; + } else if (flags & BS_FLAGS1_TRIGGER_EVENTS) { + gBattleStatus.flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 |= BS_FLAGS1_TRIGGER_EVENTS; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_10; - gBattleStatus.flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; + gBattleStatus.flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; } - if (flags & BS_FLAGS1_40) { - gBattleStatus.flags1 |= BS_FLAGS1_40; + if (flags & BS_FLAGS1_NICE_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_NICE_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_40; + gBattleStatus.flags1 &= ~BS_FLAGS1_NICE_HIT; } - if (flags & BS_FLAGS1_200) { - gBattleStatus.flags1 |= BS_FLAGS1_200; + if (flags & BS_FLAGS1_SUPER_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_SUPER_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_200; + gBattleStatus.flags1 &= ~BS_FLAGS1_SUPER_HIT; } - if (flags & BS_FLAGS1_80) { - gBattleStatus.flags1 |= BS_FLAGS1_80; + if (flags & BS_FLAGS1_NO_RATING) { + gBattleStatus.flags1 |= BS_FLAGS1_NO_RATING; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_80; + gBattleStatus.flags1 &= ~BS_FLAGS1_NO_RATING; } actor = get_actor(script->owner1.actorID); battleStatus->curTargetID = actor->targetActorID; - battleStatus->curTargetPart = actor->targetPartIndex; + battleStatus->curTargetPart = actor->targetPartID; battleStatus->statusChance = battleStatus->curAttackStatus; if (battleStatus->statusChance == STATUS_KEY_NEVER) { @@ -755,41 +754,41 @@ ApiStatus ItemCheckHit(Evt* script, s32 isInitialCall) { battleStatus->curAttackDamage = evt_get_variable(script, *args++); flags = *args++; - if ((flags & (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) == (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) { - gBattleStatus.flags1 |= BS_FLAGS1_10; - gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; - } else if (flags & BS_FLAGS1_10) { - gBattleStatus.flags1 |= BS_FLAGS1_10; - gBattleStatus.flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; - } else if (flags & BS_FLAGS1_SP_EVT_ACTIVE) { - gBattleStatus.flags1 &= ~BS_FLAGS1_10; - gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; + if ((flags & BS_FLAGS1_INCLUDE_POWER_UPS) && (flags & BS_FLAGS1_TRIGGER_EVENTS)) { + gBattleStatus.flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 |= BS_FLAGS1_TRIGGER_EVENTS; + } else if (flags & BS_FLAGS1_INCLUDE_POWER_UPS) { + gBattleStatus.flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; + } else if (flags & BS_FLAGS1_TRIGGER_EVENTS) { + gBattleStatus.flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 |= BS_FLAGS1_TRIGGER_EVENTS; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_10; - gBattleStatus.flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; + gBattleStatus.flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; } - if (flags & BS_FLAGS1_40) { - gBattleStatus.flags1 |= BS_FLAGS1_40; + if (flags & BS_FLAGS1_NICE_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_NICE_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_40; + gBattleStatus.flags1 &= ~BS_FLAGS1_NICE_HIT; } - if (flags & BS_FLAGS1_200) { - gBattleStatus.flags1 |= BS_FLAGS1_200; + if (flags & BS_FLAGS1_SUPER_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_SUPER_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_200; + gBattleStatus.flags1 &= ~BS_FLAGS1_SUPER_HIT; } - if (flags & BS_FLAGS1_80) { - gBattleStatus.flags1 |= BS_FLAGS1_80; + if (flags & BS_FLAGS1_NO_RATING) { + gBattleStatus.flags1 |= BS_FLAGS1_NO_RATING; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_80; + gBattleStatus.flags1 &= ~BS_FLAGS1_NO_RATING; } actor = get_actor(script->owner1.actorID); battleStatus->curTargetID = actor->targetActorID; - battleStatus->curTargetPart = actor->targetPartIndex; + battleStatus->curTargetPart = actor->targetPartID; battleStatus->statusChance = battleStatus->curAttackStatus; if (battleStatus->statusChance == STATUS_KEY_NEVER) { diff --git a/src/battle/dmg_partner.c b/src/battle/dmg_partner.c index e77f295fd2..033a6ca2df 100644 --- a/src/battle/dmg_partner.c +++ b/src/battle/dmg_partner.c @@ -170,7 +170,7 @@ HitResult calc_partner_damage_enemy(void) { s32 isWaterDamage = FALSE; s32 isShockDamage = FALSE; s32 isIceDamage = FALSE; - s32 tempBinary = FALSE; + s32 wasSpecialHit = FALSE; s32 wasStatusInflicted = FALSE; Actor* target; ActorPart* targetPart; @@ -198,7 +198,7 @@ HitResult calc_partner_damage_enemy(void) { target->lastDamageTaken = 0; - if (gBattleStatus.flags1 & BS_FLAGS1_FORCE_HIT_IMMUNE) { + if (gBattleStatus.flags1 & BS_FLAGS1_FORCE_IMMUNE_HIT) { hitResult = HIT_RESULT_NO_DAMAGE; dispatchEvent = EVENT_ZERO_DAMAGE; sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); @@ -215,8 +215,8 @@ HitResult calc_partner_damage_enemy(void) { show_immune_bonk(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 1); show_next_damage_popup(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 0); - if (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) { - return HIT_RESULT_1; + if (gBattleStatus.flags1 & (BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT)) { + return HIT_RESULT_NICE; } else { return HIT_RESULT_HIT; } @@ -250,8 +250,8 @@ HitResult calc_partner_damage_enemy(void) { sfx_play_sound_at_position(SOUND_HIT_FIRE, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); - if (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) { - return HIT_RESULT_1; + if (gBattleStatus.flags1 & (BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT)) { + return HIT_RESULT_NICE; } else { return HIT_RESULT_HIT; } @@ -280,15 +280,15 @@ HitResult calc_partner_damage_enemy(void) { } // check explode on ignition - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS && battleStatus->curAttackElement & DAMAGE_TYPE_FIRE && targetPart->eventFlags & (ACTOR_EVENT_FLAG_FIRE_EXPLODE | ACTOR_EVENT_FLAG_EXPLODE_ON_IGNITION) ) { sfx_play_sound_at_position(SOUND_HIT_FIRE, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_event_actor(target, EVENT_EXPLODE_TRIGGER); - if (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) { - return HIT_RESULT_1; + if (gBattleStatus.flags1 & (BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT)) { + return HIT_RESULT_NICE; } else { return HIT_RESULT_HIT; } @@ -319,15 +319,15 @@ HitResult calc_partner_damage_enemy(void) { } // check explode on ignition (duplicate of previous check) - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS && battleStatus->curAttackElement & DAMAGE_TYPE_FIRE && targetPart->eventFlags & (ACTOR_EVENT_FLAG_FIRE_EXPLODE | ACTOR_EVENT_FLAG_EXPLODE_ON_IGNITION) ) { sfx_play_sound_at_position(SOUND_HIT_FIRE, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_event_actor(target, EVENT_EXPLODE_TRIGGER); - if (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) { - return HIT_RESULT_1; + if (gBattleStatus.flags1 & (BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT)) { + return HIT_RESULT_NICE; } else { return HIT_RESULT_HIT; } @@ -374,7 +374,7 @@ HitResult calc_partner_damage_enemy(void) { && !(battleStatus->curAttackElement & (DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_SHOCK)) && !(battleStatus->curAttackEventSuppression & SUPPRESS_EVENT_SHOCK_CONTACT) ) { - gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; + gBattleStatus.flags1 |= BS_FLAGS1_TRIGGER_EVENTS; } if (targetPart->eventFlags & (ACTOR_EVENT_FLAG_STAR_ROD_ENCHANTED | ACTOR_EVENT_FLAG_ENCHANTED)) { @@ -389,7 +389,7 @@ HitResult calc_partner_damage_enemy(void) { damageDealt = battleStatus->curAttackDamage + partner->attackBoost; - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { if (battleStatus->curAttackElement & DAMAGE_TYPE_BLAST && targetPart->eventFlags & ACTOR_EVENT_FLAG_EXPLODE_ON_IGNITION ) { @@ -486,14 +486,15 @@ HitResult calc_partner_damage_enemy(void) { || battleStatus->curAttackElement & DAMAGE_TYPE_NO_CONTACT || battleStatus->curAttackEventSuppression & SUPPRESS_EVENT_SHOCK_CONTACT ) { - dispatchEvent = (!(gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE)) ? EVENT_ZERO_DAMAGE : EVENT_IMMUNE; + dispatchEvent = (!(gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS)) ? EVENT_ZERO_DAMAGE : EVENT_IMMUNE; sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_event_actor(target, dispatchEvent); show_immune_bonk(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 3); - if (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) { - return HIT_RESULT_1; + if (gBattleStatus.flags1 & (BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT)) { + return HIT_RESULT_NICE; + } else { + return HIT_RESULT_HIT; } - return HIT_RESULT_HIT; } sfx_play_sound_at_position(SOUND_HIT_SHOCK, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); @@ -503,7 +504,7 @@ HitResult calc_partner_damage_enemy(void) { } } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { if (dispatchEvent == EVENT_HIT_COMBO) { dispatchEvent = EVENT_HIT; } @@ -521,11 +522,11 @@ HitResult calc_partner_damage_enemy(void) { dispatchEvent = EVENT_HIT_COMBO; } - if (!(gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE)) { + if (!(gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS)) { clear_part_pal_adjustment(targetPart); } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { if (battleStatus->curAttackElement & DAMAGE_TYPE_SPIN_SMASH) { if (dispatchEvent == EVENT_HIT) { dispatchEvent = EVENT_SPIN_SMASH_HIT; @@ -535,10 +536,10 @@ HitResult calc_partner_damage_enemy(void) { dispatchEvent = EVENT_SPIN_SMASH_DEATH; } - tempBinary = TRUE; + wasSpecialHit = TRUE; } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { if (!(battleStatus->curAttackElement & DAMAGE_TYPE_NO_CONTACT) && targetPart->eventFlags & ACTOR_EVENT_FLAG_POWER_BOUNCE) { if (dispatchEvent == EVENT_HIT_COMBO) { dispatchEvent = EVENT_POWER_BOUNCE_HIT; @@ -561,7 +562,7 @@ HitResult calc_partner_damage_enemy(void) { } } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { if (battleStatus->curAttackElement & DAMAGE_TYPE_JUMP && targetPart->eventFlags & ACTOR_EVENT_FLAG_GROUNDABLE) { if (dispatchEvent == EVENT_HIT) { dispatchEvent = EVENT_FALL_TRIGGER; @@ -571,10 +572,10 @@ HitResult calc_partner_damage_enemy(void) { dispatchEvent = EVENT_FALL_TRIGGER; } - tempBinary = TRUE; + wasSpecialHit = TRUE; } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { if (battleStatus->curAttackElement & DAMAGE_TYPE_JUMP && targetPart->eventFlags & ACTOR_EVENT_FLAG_FLIPABLE) { if (dispatchEvent == EVENT_HIT) { dispatchEvent = EVENT_FLIP_TRIGGER; @@ -585,7 +586,7 @@ HitResult calc_partner_damage_enemy(void) { } if (!(target->flags & ACTOR_FLAG_FLIPPED)) { - tempBinary = TRUE; + wasSpecialHit = TRUE; } } } @@ -593,7 +594,7 @@ HitResult calc_partner_damage_enemy(void) { } } - if (!(gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) + if (!(gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) && battleStatus->curAttackElement & DAMAGE_TYPE_JUMP && targetPart->eventFlags & ACTOR_EVENT_FLAG_FLIPABLE ) { @@ -606,11 +607,11 @@ HitResult calc_partner_damage_enemy(void) { } if (!(target->flags & ACTOR_FLAG_FLIPPED)) { - tempBinary = TRUE; + wasSpecialHit = TRUE; } } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS && battleStatus->curAttackElement & DAMAGE_TYPE_BLAST && targetPart->eventFlags & ACTOR_EVENT_FLAG_EXPLODE_ON_IGNITION ) { @@ -626,11 +627,11 @@ HitResult calc_partner_damage_enemy(void) { dispatchEvent = EVENT_EXPLODE_TRIGGER; } - tempBinary = TRUE; + wasSpecialHit = TRUE; isFireDamage = TRUE; } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { if (battleStatus->curAttackElement & (DAMAGE_TYPE_BLAST | DAMAGE_TYPE_FIRE)) { if (dispatchEvent == EVENT_HIT) { dispatchEvent = EVENT_BURN_HIT; @@ -644,7 +645,7 @@ HitResult calc_partner_damage_enemy(void) { } do { // TODO remove this do while - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS && battleStatus->lastAttackDamage >= 0 && dispatchEvent != EVENT_DEATH && dispatchEvent != EVENT_SPIN_SMASH_DEATH @@ -654,7 +655,7 @@ HitResult calc_partner_damage_enemy(void) { #define INFLICT_STATUS(STATUS_TYPE) \ if ((battleStatus->curAttackStatus & STATUS_FLAG_##STATUS_TYPE) && \ try_inflict_status(target, STATUS_KEY_##STATUS_TYPE, STATUS_TURN_MOD_##STATUS_TYPE)) { \ - tempBinary = TRUE; \ + wasSpecialHit = TRUE; \ wasStatusInflicted = TRUE; \ } \ @@ -691,10 +692,10 @@ HitResult calc_partner_damage_enemy(void) { dispatchEvent = EVENT_SCARE_AWAY; wasStatusInflicted = TRUE; hitResult = HIT_RESULT_HIT; - tempBinary = TRUE; - gBattleStatus.flags1 |= BS_FLAGS1_40; - gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; - gBattleStatus.flags1 |= BS_FLAGS1_10; + wasSpecialHit = TRUE; + gBattleStatus.flags1 |= BS_FLAGS1_NICE_HIT; + gBattleStatus.flags1 |= BS_FLAGS1_TRIGGER_EVENTS; + gBattleStatus.flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS; gBattleStatus.flags1 |= BS_FLAGS1_SHOW_PLAYER_DECORATIONS; gBattleStatus.flags1 |= BS_FLAGS1_ACTORS_VISIBLE; sfx_play_sound_at_position(SOUND_DAMAGE_STARS, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); @@ -724,7 +725,7 @@ HitResult calc_partner_damage_enemy(void) { statusChanceOrDefense = target->actorBlueprint->spookChance; statusChanceOrDefense = (battleStatus->statusChance * statusChanceOrDefense) / 100; - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { if (battleStatus->curAttackElement & DAMAGE_TYPE_FEAR) { if (rand_int(99) < statusChanceOrDefense) { if (!(target->debuff == STATUS_KEY_FEAR || @@ -736,10 +737,10 @@ HitResult calc_partner_damage_enemy(void) { dispatchEvent = EVENT_SCARE_AWAY; wasStatusInflicted = TRUE; hitResult = HIT_RESULT_HIT; - tempBinary = TRUE; - gBattleStatus.flags1 |= BS_FLAGS1_40; - gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; - gBattleStatus.flags1 |= BS_FLAGS1_10; + wasSpecialHit = TRUE; + gBattleStatus.flags1 |= BS_FLAGS1_NICE_HIT; + gBattleStatus.flags1 |= BS_FLAGS1_TRIGGER_EVENTS; + gBattleStatus.flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS; gBattleStatus.flags1 |= BS_FLAGS1_SHOW_PLAYER_DECORATIONS; gBattleStatus.flags1 |= BS_FLAGS1_ACTORS_VISIBLE; sfx_play_sound_at_position(SOUND_DAMAGE_STARS, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); @@ -759,7 +760,7 @@ HitResult calc_partner_damage_enemy(void) { if (!(target->flags & ACTOR_FLAG_NO_DMG_POPUP)) { if (battleStatus->lastAttackDamage == 0) { - if (!tempBinary && !wasStatusInflicted) { + if (!wasSpecialHit && !wasStatusInflicted) { show_immune_bonk(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 3); } } else if (!partImmuneToElement) { @@ -775,17 +776,15 @@ HitResult calc_partner_damage_enemy(void) { } } - if (tempBinary - && gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200) - || gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200) - && !(gBattleStatus.flags1 & BS_FLAGS1_80) + if ((wasSpecialHit && gBattleStatus.flags1 & (BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT)) + || (gBattleStatus.flags1 & (BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT) && !(gBattleStatus.flags1 & BS_FLAGS1_NO_RATING)) ) { if (battleStatus->lastAttackDamage > 0) { sfx_play_sound_at_position(SOUND_DAMAGE_STARS, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); } - if (battleStatus->lastAttackDamage > 0 || (battleStatus->curAttackElement & DAMAGE_TYPE_STATUS_ALWAYS_HITS && tempBinary)) { - if (gBattleStatus.flags1 & BS_FLAGS1_40) { + if (battleStatus->lastAttackDamage > 0 || (battleStatus->curAttackElement & DAMAGE_TYPE_STATUS_ALWAYS_HITS && wasSpecialHit)) { + if (gBattleStatus.flags1 & BS_FLAGS1_NICE_HIT) { show_action_rating(ACTION_RATING_NICE, target, state->goalPos.x, state->goalPos.y, state->goalPos.z); } else { show_action_rating(ACTION_RATING_SUPER, target, state->goalPos.x, state->goalPos.y, state->goalPos.z); @@ -793,7 +792,7 @@ HitResult calc_partner_damage_enemy(void) { } } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { func_80266970(target); } @@ -818,7 +817,7 @@ HitResult calc_partner_damage_enemy(void) { } if (battleStatus->lastAttackDamage < 1 - && !(tempBinary || wasStatusInflicted) + && !(wasSpecialHit || wasStatusInflicted) || targetPart->flags & ACTOR_PART_FLAG_DAMAGE_IMMUNE ) { sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); @@ -888,12 +887,12 @@ HitResult calc_partner_damage_enemy(void) { show_actor_health_bar(target); - if (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) { + if (gBattleStatus.flags1 & (BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT)) { if (hitResult == HIT_RESULT_HIT) { - hitResult = HIT_RESULT_1; + hitResult = HIT_RESULT_NICE; } if (hitResult == HIT_RESULT_NO_DAMAGE) { - hitResult = HIT_RESULT_3; + hitResult = HIT_RESULT_NICE_NO_DAMAGE; } } @@ -937,7 +936,7 @@ s32 dispatch_damage_event_partner(s32 damageAmount, s32 event, s32 stopMotion) { battleStatus->lastAttackDamage += hpChange; partner->lastDamageTaken = battleStatus->lastAttackDamage; battleStatus->curDamageSource = DMG_SRC_DEFAULT; - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { if (event == EVENT_HIT_COMBO) { event = EVENT_HIT; } @@ -947,7 +946,7 @@ s32 dispatch_damage_event_partner(s32 damageAmount, s32 event, s32 stopMotion) { } if (battleStatus->lastAttackDamage > 0) { - gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; + gBattleStatus.flags1 |= BS_FLAGS1_TRIGGER_EVENTS; inflict_status(partner, STATUS_KEY_DAZE, battleStatus->lastAttackDamage); } @@ -967,7 +966,7 @@ s32 dispatch_damage_event_partner(s32 damageAmount, s32 event, s32 stopMotion) { partner->flags |= ACTOR_FLAG_HEALTH_BAR_HIDDEN; - flagCheck = (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) != 0; + flagCheck = (gBattleStatus.flags1 & (BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT)) != 0; dispatch_event_partner(event); return flagCheck; } @@ -1003,7 +1002,7 @@ ApiStatus MakeOwnerTargetIndex(Evt* script, s32 isInitialCall) { selectableTarget = &actor->targetData[targetList[arg2]]; actor->targetActorID = selectableTarget->actorID; - actor->targetPartIndex = selectableTarget->partID; + actor->targetPartID = selectableTarget->partID; } evt_set_variable(script, otherArg, arg2); @@ -1024,7 +1023,7 @@ ApiStatus func_8027FC90(Evt* script, s32 isInitialCall) { outVar = *args++; actor = get_actor(actorID); - battleStatus->flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; + battleStatus->flags1 |= BS_FLAGS1_TRIGGER_EVENTS; hitResult = calc_partner_damage_enemy(); show_next_damage_popup(actor->state.goalPos.x, actor->state.goalPos.y, actor->state.goalPos.z, battleStatus->lastAttackDamage, @@ -1066,47 +1065,47 @@ ApiStatus PartnerDamageEnemy(Evt* script, s32 isInitialCall) { gBattleStatus.powerBounceCounter = 0; flags = *args++; - if ((flags & (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) == (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) { - battleStatus->flags1 |= BS_FLAGS1_10; - battleStatus->flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; - } else if (flags & BS_FLAGS1_10) { - battleStatus->flags1 |= BS_FLAGS1_10; - battleStatus->flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; - } else if (flags & BS_FLAGS1_SP_EVT_ACTIVE) { - battleStatus->flags1 &= ~BS_FLAGS1_10; - battleStatus->flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; + if ((flags & BS_FLAGS1_INCLUDE_POWER_UPS) && (flags & BS_FLAGS1_TRIGGER_EVENTS)) { + battleStatus->flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS; + battleStatus->flags1 |= BS_FLAGS1_TRIGGER_EVENTS; + } else if (flags & BS_FLAGS1_INCLUDE_POWER_UPS) { + battleStatus->flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS; + battleStatus->flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; + } else if (flags & BS_FLAGS1_TRIGGER_EVENTS) { + battleStatus->flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + battleStatus->flags1 |= BS_FLAGS1_TRIGGER_EVENTS; } else { - battleStatus->flags1 &= ~BS_FLAGS1_10; - battleStatus->flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; + battleStatus->flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + battleStatus->flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; } - if (flags & BS_FLAGS1_40) { - gBattleStatus.flags1 |= BS_FLAGS1_40; + if (flags & BS_FLAGS1_NICE_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_NICE_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_40; + gBattleStatus.flags1 &= ~BS_FLAGS1_NICE_HIT; } - if (flags & BS_FLAGS1_200) { - gBattleStatus.flags1 |= BS_FLAGS1_200; + if (flags & BS_FLAGS1_SUPER_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_SUPER_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_200; + gBattleStatus.flags1 &= ~BS_FLAGS1_SUPER_HIT; } - if (flags & BS_FLAGS1_80) { - gBattleStatus.flags1 |= BS_FLAGS1_80; + if (flags & BS_FLAGS1_NO_RATING) { + gBattleStatus.flags1 |= BS_FLAGS1_NO_RATING; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_80; + gBattleStatus.flags1 &= ~BS_FLAGS1_NO_RATING; } - if (flags & BS_FLAGS1_FORCE_HIT_IMMUNE) { - gBattleStatus.flags1 |= BS_FLAGS1_FORCE_HIT_IMMUNE; + if (flags & BS_FLAGS1_FORCE_IMMUNE_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_FORCE_IMMUNE_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_FORCE_HIT_IMMUNE; + gBattleStatus.flags1 &= ~BS_FLAGS1_FORCE_IMMUNE_HIT; } statusChance = battleStatus->curAttackStatus; battleStatus->curTargetID = enemy->targetActorID; - battleStatus->curTargetPart = enemy->targetPartIndex; + battleStatus->curTargetPart = enemy->targetPartID; battleStatus->statusChance = statusChance; if (statusChance == STATUS_KEY_NEVER) { @@ -1146,44 +1145,44 @@ ApiStatus PartnerAfflictEnemy(Evt* script, s32 isInitialCall) { battleStatus->powerBounceCounter = 0; flags = *args++; - if ((flags & (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) == (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) { - battleStatus->flags1 |= BS_FLAGS1_10; - battleStatus->flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; - } else if (flags & BS_FLAGS1_10) { - battleStatus->flags1 |= BS_FLAGS1_10; - battleStatus->flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; - } else if (flags & BS_FLAGS1_SP_EVT_ACTIVE) { - battleStatus->flags1 &= ~BS_FLAGS1_10; - battleStatus->flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; + if ((flags & BS_FLAGS1_INCLUDE_POWER_UPS) && (flags & BS_FLAGS1_TRIGGER_EVENTS)) { + battleStatus->flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS; + battleStatus->flags1 |= BS_FLAGS1_TRIGGER_EVENTS; + } else if (flags & BS_FLAGS1_INCLUDE_POWER_UPS) { + battleStatus->flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS; + battleStatus->flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; + } else if (flags & BS_FLAGS1_TRIGGER_EVENTS) { + battleStatus->flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + battleStatus->flags1 |= BS_FLAGS1_TRIGGER_EVENTS; } else { - battleStatus->flags1 &= ~BS_FLAGS1_10; - battleStatus->flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; + battleStatus->flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + battleStatus->flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; } - if (flags & BS_FLAGS1_40) { - gBattleStatus.flags1 |= BS_FLAGS1_40; + if (flags & BS_FLAGS1_NICE_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_NICE_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_40; + gBattleStatus.flags1 &= ~BS_FLAGS1_NICE_HIT; } - if (flags & BS_FLAGS1_200) { - gBattleStatus.flags1 |= BS_FLAGS1_200; + if (flags & BS_FLAGS1_SUPER_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_SUPER_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_200; + gBattleStatus.flags1 &= ~BS_FLAGS1_SUPER_HIT; } - if (flags & BS_FLAGS1_80) { - gBattleStatus.flags1 |= BS_FLAGS1_80; + if (flags & BS_FLAGS1_NO_RATING) { + gBattleStatus.flags1 |= BS_FLAGS1_NO_RATING; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_80; + gBattleStatus.flags1 &= ~BS_FLAGS1_NO_RATING; } - if (flags & BS_FLAGS1_FORCE_HIT_IMMUNE) { - gBattleStatus.flags1 |= BS_FLAGS1_FORCE_HIT_IMMUNE; + if (flags & BS_FLAGS1_FORCE_IMMUNE_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_FORCE_IMMUNE_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_FORCE_HIT_IMMUNE; + gBattleStatus.flags1 &= ~BS_FLAGS1_FORCE_IMMUNE_HIT; } statusChance = battleStatus->curAttackStatus; battleStatus->curTargetID = actor->targetActorID; - battleStatus->curTargetPart = actor->targetPartIndex; + battleStatus->curTargetPart = actor->targetPartID; battleStatus->statusChance = statusChance; if (statusChance == STATUS_KEY_NEVER) { @@ -1222,44 +1221,44 @@ ApiStatus PartnerPowerBounceEnemy(Evt* script, s32 isInitialCall) { battleStatus->powerBounceCounter = evt_get_variable(script, *args++); flags = *args++; - if ((flags & (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) == (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) { - battleStatus->flags1 |= BS_FLAGS1_10; - battleStatus->flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; - } else if (flags & BS_FLAGS1_10) { - battleStatus->flags1 |= BS_FLAGS1_10; - battleStatus->flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; - } else if (flags & BS_FLAGS1_SP_EVT_ACTIVE) { - battleStatus->flags1 &= ~BS_FLAGS1_10; - battleStatus->flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; + if ((flags & BS_FLAGS1_INCLUDE_POWER_UPS) && (flags & BS_FLAGS1_TRIGGER_EVENTS)) { + battleStatus->flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS; + battleStatus->flags1 |= BS_FLAGS1_TRIGGER_EVENTS; + } else if (flags & BS_FLAGS1_INCLUDE_POWER_UPS) { + battleStatus->flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS; + battleStatus->flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; + } else if (flags & BS_FLAGS1_TRIGGER_EVENTS) { + battleStatus->flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + battleStatus->flags1 |= BS_FLAGS1_TRIGGER_EVENTS; } else { - battleStatus->flags1 &= ~BS_FLAGS1_10; - battleStatus->flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; + battleStatus->flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + battleStatus->flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; } - if (flags & BS_FLAGS1_40) { - gBattleStatus.flags1 |= BS_FLAGS1_40; + if (flags & BS_FLAGS1_NICE_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_NICE_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_40; + gBattleStatus.flags1 &= ~BS_FLAGS1_NICE_HIT; } - if (flags & BS_FLAGS1_200) { - gBattleStatus.flags1 |= BS_FLAGS1_200; + if (flags & BS_FLAGS1_SUPER_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_SUPER_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_200; + gBattleStatus.flags1 &= ~BS_FLAGS1_SUPER_HIT; } - if (flags & BS_FLAGS1_80) { - gBattleStatus.flags1 |= BS_FLAGS1_80; + if (flags & BS_FLAGS1_NO_RATING) { + gBattleStatus.flags1 |= BS_FLAGS1_NO_RATING; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_80; + gBattleStatus.flags1 &= ~BS_FLAGS1_NO_RATING; } - if (flags & BS_FLAGS1_FORCE_HIT_IMMUNE) { - gBattleStatus.flags1 |= BS_FLAGS1_FORCE_HIT_IMMUNE; + if (flags & BS_FLAGS1_FORCE_IMMUNE_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_FORCE_IMMUNE_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_FORCE_HIT_IMMUNE; + gBattleStatus.flags1 &= ~BS_FLAGS1_FORCE_IMMUNE_HIT; } statusChance = battleStatus->curAttackStatus; battleStatus->curTargetID = actor->targetActorID; - battleStatus->curTargetPart = actor->targetPartIndex; + battleStatus->curTargetPart = actor->targetPartID; battleStatus->statusChance = statusChance; if (statusChance == STATUS_KEY_NEVER) { @@ -1300,47 +1299,47 @@ ApiStatus PartnerTestEnemy(Evt* script, s32 isInitialCall) { gBattleStatus.powerBounceCounter = 0; flags = *args++; - if ((flags & (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) == (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) { - battleStatus->flags1 |= BS_FLAGS1_10; - battleStatus->flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; - } else if (flags & BS_FLAGS1_10) { - battleStatus->flags1 |= BS_FLAGS1_10; - battleStatus->flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; - } else if (flags & BS_FLAGS1_SP_EVT_ACTIVE) { - battleStatus->flags1 &= ~BS_FLAGS1_10; - battleStatus->flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; + if ((flags & BS_FLAGS1_INCLUDE_POWER_UPS) && (flags & BS_FLAGS1_TRIGGER_EVENTS)) { + battleStatus->flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS; + battleStatus->flags1 |= BS_FLAGS1_TRIGGER_EVENTS; + } else if (flags & BS_FLAGS1_INCLUDE_POWER_UPS) { + battleStatus->flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS; + battleStatus->flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; + } else if (flags & BS_FLAGS1_TRIGGER_EVENTS) { + battleStatus->flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + battleStatus->flags1 |= BS_FLAGS1_TRIGGER_EVENTS; } else { - battleStatus->flags1 &= ~BS_FLAGS1_10; - battleStatus->flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; + battleStatus->flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + battleStatus->flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; } - if (flags & BS_FLAGS1_40) { - gBattleStatus.flags1 |= BS_FLAGS1_40; + if (flags & BS_FLAGS1_NICE_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_NICE_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_40; + gBattleStatus.flags1 &= ~BS_FLAGS1_NICE_HIT; } - if (flags & BS_FLAGS1_200) { - gBattleStatus.flags1 |= BS_FLAGS1_200; + if (flags & BS_FLAGS1_SUPER_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_SUPER_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_200; + gBattleStatus.flags1 &= ~BS_FLAGS1_SUPER_HIT; } - if (flags & BS_FLAGS1_80) { - gBattleStatus.flags1 |= BS_FLAGS1_80; + if (flags & BS_FLAGS1_NO_RATING) { + gBattleStatus.flags1 |= BS_FLAGS1_NO_RATING; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_80; + gBattleStatus.flags1 &= ~BS_FLAGS1_NO_RATING; } - if (flags & BS_FLAGS1_FORCE_HIT_IMMUNE) { - gBattleStatus.flags1 |= BS_FLAGS1_FORCE_HIT_IMMUNE; + if (flags & BS_FLAGS1_FORCE_IMMUNE_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_FORCE_IMMUNE_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_FORCE_HIT_IMMUNE; + gBattleStatus.flags1 &= ~BS_FLAGS1_FORCE_IMMUNE_HIT; } statusChance = battleStatus->curAttackStatus; battleStatus->curTargetID = enemy->targetActorID; - battleStatus->curTargetPart = enemy->targetPartIndex; + battleStatus->curTargetPart = enemy->targetPartID; battleStatus->statusChance = statusChance; if (statusChance == STATUS_KEY_NEVER) { @@ -1367,7 +1366,7 @@ ApiStatus func_8028070C(Evt* script, s32 isInitialCall) { s32 event = evt_get_variable(script, *args++); battleStatus->curTargetID = actor->targetActorID; - battleStatus->curTargetPart = actor->targetPartIndex; + battleStatus->curTargetPart = actor->targetPartID; if (dispatch_damage_event_partner_0(damageAmount, event, (s32) battleStatus) >= 0) { return does_script_exist_by_ref(script) ? ApiStatus_DONE2 : ApiStatus_BLOCK; diff --git a/src/battle/dmg_player.c b/src/battle/dmg_player.c index e4c1135689..c8a0e9e395 100644 --- a/src/battle/dmg_player.c +++ b/src/battle/dmg_player.c @@ -2,8 +2,10 @@ #include "effects.h" #include "battle/battle.h" #include "script_api/battle.h" +#include "sprite/player.h" -s32 dispatch_damage_event_player(s32 damageAmount, s32 event, s32 arg2); +b32 dispatch_damage_event_player(s32 damageAmount, s32 event, b32 noHitSound); +b32 dispatch_hazard_event_player(s32 damageAmount, s32 event); ApiStatus PlaySleepHitFX(Evt* script, s32 isInitialCall) { fx_debuff(0, script->varTable[0], script->varTable[1], script->varTable[2]); @@ -126,8 +128,6 @@ EvtScript EVS_PlayShrinkHitFX = { EVT_END }; -void dispatch_damage_event_player_1(s32 damageAmount, s32 event); - void dispatch_event_player(s32 eventType) { Actor* player = gBattleStatus.playerActor; Evt* oldOnHitScript; @@ -225,7 +225,7 @@ HitResult calc_player_test_enemy(void) { && !player_team_is_ability_active(player, ABILITY_SPIKE_SHIELD))) { sfx_play_sound_at_position(SOUND_HIT_SPIKE, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); - dispatch_damage_event_player_1(1, EVENT_SPIKE_CONTACT); + dispatch_hazard_event_player(1, EVENT_SPIKE_CONTACT); dispatch_event_actor(target, EVENT_SPIKE_TAUNT); return HIT_RESULT_BACKFIRE; } @@ -251,8 +251,8 @@ HitResult calc_player_damage_enemy(void) { s32 targetDefense; s32 dispatchEvent; s32 partImmuneToElement; - s32 sp20; - s32 sp24; + s32 canBeShocked; + s32 missedAllOrNothing; s32 isFireDamage; s32 isShockDamage; s32 isWaterDamage; @@ -261,7 +261,7 @@ HitResult calc_player_damage_enemy(void) { s32 wasStatusInflicted; s32 attackFxType; - sp20 = FALSE; + canBeShocked = FALSE; isFireDamage = FALSE; isWaterDamage = FALSE; isShockDamage = FALSE; @@ -269,7 +269,7 @@ HitResult calc_player_damage_enemy(void) { wasSpecialHit = FALSE; partImmuneToElement = FALSE; wasStatusInflicted = FALSE; - sp24 = FALSE; + missedAllOrNothing = FALSE; battleStatus->wasStatusInflicted = FALSE; battleStatus->lastAttackDamage = 0; @@ -289,7 +289,7 @@ HitResult calc_player_damage_enemy(void) { target->lastDamageTaken = 0; - if (gBattleStatus.flags1 & BS_FLAGS1_FORCE_HIT_IMMUNE) { + if (gBattleStatus.flags1 & BS_FLAGS1_FORCE_IMMUNE_HIT) { hitResult = HIT_RESULT_NO_DAMAGE; dispatchEvent = EVENT_ZERO_DAMAGE; } else { @@ -310,10 +310,11 @@ HitResult calc_player_damage_enemy(void) { sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); show_immune_bonk(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 1); show_next_damage_popup(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 0); - if (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) { - return HIT_RESULT_1; + if (gBattleStatus.flags1 & (BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT)) { + return HIT_RESULT_NICE; + } else { + return HIT_RESULT_HIT; } - return HIT_RESULT_HIT; } if (targetPart->elementalImmunities & battleStatus->curAttackElement) { @@ -326,7 +327,7 @@ HitResult calc_player_damage_enemy(void) { && !player_team_is_ability_active(player, ABILITY_SPIKE_SHIELD)) { sfx_play_sound_at_position(SOUND_HIT_SPIKE, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); - dispatch_damage_event_player_1(1, EVENT_SPIKE_CONTACT); + dispatch_hazard_event_player(1, EVENT_SPIKE_CONTACT); dispatch_event_actor(target, EVENT_SPIKE_TAUNT); return HIT_RESULT_BACKFIRE; } @@ -335,7 +336,7 @@ HitResult calc_player_damage_enemy(void) { if (!(battleStatus->curAttackElement & (DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_SMASH))) { if (targetPart->eventFlags & ACTOR_EVENT_FLAG_EXPLODE_ON_CONTACT) { sfx_play_sound_at_position(SOUND_HIT_PLAYER_FIRE, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); - dispatch_damage_event_player_1(1, EVENT_BURN_CONTACT); + dispatch_hazard_event_player(1, EVENT_BURN_CONTACT); dispatch_event_actor(target, EVENT_EXPLODE_TRIGGER); return HIT_RESULT_BACKFIRE; } @@ -346,23 +347,24 @@ HitResult calc_player_damage_enemy(void) { && !(player_team_is_ability_active(player, ABILITY_ICE_POWER)) ) { sfx_play_sound_at_position(SOUND_HIT_PLAYER_FIRE, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); - dispatch_damage_event_player_1(1, EVENT_BURN_CONTACT); + dispatch_hazard_event_player(1, EVENT_BURN_CONTACT); dispatch_event_actor(target, EVENT_BURN_TAUNT); return HIT_RESULT_BACKFIRE; } } // check explode on ignition - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS && battleStatus->curAttackElement & DAMAGE_TYPE_FIRE && targetPart->eventFlags & (ACTOR_EVENT_FLAG_FIRE_EXPLODE | ACTOR_EVENT_FLAG_EXPLODE_ON_IGNITION) ) { sfx_play_sound_at_position(SOUND_HIT_PLAYER_FIRE, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_event_actor(target, EVENT_EXPLODE_TRIGGER); - if (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) { - return HIT_RESULT_1; + if (gBattleStatus.flags1 & (BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT)) { + return HIT_RESULT_NICE; + } else { + return HIT_RESULT_HIT; } - return HIT_RESULT_HIT; } // unknown alternate spiky #1 @@ -372,7 +374,7 @@ HitResult calc_player_damage_enemy(void) { && !player_team_is_ability_active(player, ABILITY_SPIKE_SHIELD) ) { sfx_play_sound_at_position(SOUND_HIT_SPIKE, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); - dispatch_damage_event_player_1(1, EVENT_SPIKE_CONTACT); + dispatch_hazard_event_player(1, EVENT_SPIKE_CONTACT); dispatch_event_actor(target, EVENT_SPIKE_TAUNT); return HIT_RESULT_BACKFIRE; } @@ -404,7 +406,7 @@ HitResult calc_player_damage_enemy(void) { switch (attackFxType) { case 1: - sfx_play_sound_at_position(SOUND_0372, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_LIFE_SHROOM_CHIME, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); break; case 2: sfx_play_sound_at_position(SOUND_PLANTS_BELL, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); @@ -413,10 +415,10 @@ HitResult calc_player_damage_enemy(void) { sfx_play_sound_at_position(SOUND_SLIDE_WHISTLE_OUT, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); break; case 4: - sfx_play_sound_at_position(SOUND_2072, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_YOSHI, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); break; case 5: - sfx_play_sound_at_position(SOUND_2073, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_HIT_WHACKA, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); break; case 6: sfx_play_sound_at_position(SOUND_FLOWERS_LAUGH, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); @@ -430,8 +432,8 @@ HitResult calc_player_damage_enemy(void) { && !(battleStatus->curAttackElement & (DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_SHOCK)) && !(battleStatus->curAttackEventSuppression & SUPPRESS_EVENT_SHOCK_CONTACT) ) { - gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; - sp20 = TRUE; + gBattleStatus.flags1 |= BS_FLAGS1_TRIGGER_EVENTS; + canBeShocked = TRUE; } if (targetPart->eventFlags & (ACTOR_EVENT_FLAG_STAR_ROD_ENCHANTED | ACTOR_EVENT_FLAG_ENCHANTED)) { @@ -452,7 +454,7 @@ HitResult calc_player_damage_enemy(void) { currentAttackDamage += count_power_plus(battleStatus->curAttackElement); if (battleStatus->merleeAttackBoost > 0 - && (gBattleStatus.flags1 & BS_FLAGS1_10 || battleStatus->curAttackElement & DAMAGE_TYPE_JUMP) + && (gBattleStatus.flags1 & BS_FLAGS1_INCLUDE_POWER_UPS || battleStatus->curAttackElement & DAMAGE_TYPE_JUMP) ) { currentAttackDamage += battleStatus->merleeAttackBoost; } @@ -520,7 +522,7 @@ HitResult calc_player_damage_enemy(void) { } if (gBattleStatus.flags2 & BS_FLAGS2_HAS_RUSH - && (gBattleStatus.flags1 & BS_FLAGS1_10 || battleStatus->curAttackElement & DAMAGE_TYPE_JUMP) + && (gBattleStatus.flags1 & BS_FLAGS1_INCLUDE_POWER_UPS || battleStatus->curAttackElement & DAMAGE_TYPE_JUMP) ) { if (battleStatus->rushFlags & RUSH_FLAG_POWER) { currentAttackDamage += 2; @@ -537,14 +539,14 @@ HitResult calc_player_damage_enemy(void) { ) { currentAttackDamage++; - if (!(gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200))) { - sp24 = TRUE; + if (!(gBattleStatus.flags1 & (BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT))) { + missedAllOrNothing = TRUE; currentAttackDamage = 0; targetDefense = 0; - gBattleStatus.flags1 &= ~BS_FLAGS1_40; - gBattleStatus.flags1 &= ~BS_FLAGS1_200; - gBattleStatus.flags1 &= ~BS_FLAGS1_10; - gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; + gBattleStatus.flags1 &= ~BS_FLAGS1_NICE_HIT; + gBattleStatus.flags1 &= ~BS_FLAGS1_SUPER_HIT; + gBattleStatus.flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 |= BS_FLAGS1_TRIGGER_EVENTS; } } @@ -558,7 +560,7 @@ HitResult calc_player_damage_enemy(void) { } } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS && battleStatus->curAttackElement & DAMAGE_TYPE_BLAST && targetPart->eventFlags & ACTOR_EVENT_FLAG_EXPLODE_ON_IGNITION ) { @@ -646,10 +648,10 @@ HitResult calc_player_damage_enemy(void) { ) { sfx_play_sound_at_position(SOUND_HIT_PLAYER_SHOCK, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); apply_shock_effect(player); - dispatch_damage_event_player_1(1, EVENT_SHOCK_HIT); + dispatch_hazard_event_player(1, EVENT_SHOCK_HIT); return HIT_RESULT_BACKFIRE; } else { - if (!(gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE)) { + if (!(gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS)) { dispatchEvent = EVENT_ZERO_DAMAGE; } else { dispatchEvent = EVENT_IMMUNE; @@ -657,14 +659,15 @@ HitResult calc_player_damage_enemy(void) { sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); dispatch_event_actor(target, dispatchEvent); show_immune_bonk(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 3); - if (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) { - return HIT_RESULT_1; + if (gBattleStatus.flags1 & (BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT)) { + return HIT_RESULT_NICE; + } else { + return HIT_RESULT_HIT; } - return HIT_RESULT_HIT; } } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { if (battleStatus->curAttackElement & DAMAGE_TYPE_FEAR && rand_int(99) < (target->actorBlueprint->escapeChance * battleStatus->statusChance) / 100 && (target->debuff != STATUS_KEY_FEAR @@ -676,15 +679,16 @@ HitResult calc_player_damage_enemy(void) { && !(target->flags & ACTOR_FLAG_FLIPPED) ) { dispatch_event_actor(target, EVENT_SCARE_AWAY); - if (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) { - return HIT_RESULT_1; + if (gBattleStatus.flags1 & (BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT)) { + return HIT_RESULT_NICE; + } else { + return HIT_RESULT_HIT; } - return HIT_RESULT_HIT; } } } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { if (dispatchEvent == EVENT_HIT_COMBO) { dispatchEvent = EVENT_HIT; } @@ -702,12 +706,12 @@ HitResult calc_player_damage_enemy(void) { dispatchEvent = EVENT_HIT_COMBO; } - if (!(gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE)) { + if (!(gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS)) { clear_part_pal_adjustment(targetPart); } // check for special case damage events - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { // if damage is from Spin Smash, convert generic events to Spin Smash specific events if (battleStatus->curAttackElement & DAMAGE_TYPE_SPIN_SMASH) { PlayerData* playerData = &gPlayerData; @@ -715,7 +719,7 @@ HitResult calc_player_damage_enemy(void) { if (target->actorBlueprint->spinSmashReq != 255 && playerData->hammerLevel + 1 >= target->actorBlueprint->spinSmashReq && battleStatus->lastAttackDamage > 0 - && gBattleStatus.flags1 & BS_FLAGS1_40 + && gBattleStatus.flags1 & BS_FLAGS1_NICE_HIT ) { if (dispatchEvent == EVENT_HIT_COMBO) { dispatchEvent = EVENT_SPIN_SMASH_HIT; @@ -740,7 +744,7 @@ HitResult calc_player_damage_enemy(void) { } // if damage is from Power Bounce, convert generic events to Power Bounce specific events - if ((gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS && !(battleStatus->curAttackElement & DAMAGE_TYPE_NO_CONTACT) && targetPart->eventFlags & ACTOR_EVENT_FLAG_POWER_BOUNCE ) { @@ -766,7 +770,7 @@ HitResult calc_player_damage_enemy(void) { } // try generating fall trigger events - if ((gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS && (battleStatus->curAttackElement & (DAMAGE_TYPE_POW | DAMAGE_TYPE_JUMP)) && targetPart->eventFlags & ACTOR_EVENT_FLAG_GROUNDABLE ) { @@ -782,7 +786,7 @@ HitResult calc_player_damage_enemy(void) { } // try generating flip trigger events - if ((gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS && (battleStatus->curAttackElement & (DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_POW | DAMAGE_TYPE_JUMP)) && targetPart->eventFlags & ACTOR_EVENT_FLAG_FLIPABLE ) { @@ -801,7 +805,7 @@ HitResult calc_player_damage_enemy(void) { } // try generating flip trigger events - if (!(gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) + if (!(gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) && battleStatus->curAttackElement & (DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_POW | DAMAGE_TYPE_JUMP) && targetPart->eventFlags & ACTOR_EVENT_FLAG_FLIPABLE ) { @@ -819,7 +823,7 @@ HitResult calc_player_damage_enemy(void) { } // try generating shell crack events - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS && battleStatus->curAttackElement & DAMAGE_TYPE_SHELL_CRACK && targetPart->eventFlags & ACTOR_EVENT_FLAG_FLIPABLE ) { @@ -834,7 +838,7 @@ HitResult calc_player_damage_enemy(void) { } // try generating burn events - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS && (battleStatus->curAttackElement & (DAMAGE_TYPE_BLAST | DAMAGE_TYPE_FIRE)) ) { if (dispatchEvent == EVENT_HIT) { @@ -850,7 +854,7 @@ HitResult calc_player_damage_enemy(void) { // try inflicting status effects do { // TODO remove this do while - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS && battleStatus->lastAttackDamage >= 0 && dispatchEvent != EVENT_DEATH && dispatchEvent != EVENT_SPIN_SMASH_DEATH @@ -909,8 +913,8 @@ HitResult calc_player_damage_enemy(void) { } } - if ((wasSpecialHit && gBattleStatus.flags1 & BS_FLAGS1_40) || gBattleStatus.flags1 & BS_FLAGS1_40) { - if (!(gBattleStatus.flags1 & BS_FLAGS1_80)) { + if ((wasSpecialHit && gBattleStatus.flags1 & BS_FLAGS1_NICE_HIT) || gBattleStatus.flags1 & BS_FLAGS1_NICE_HIT) { + if (!(gBattleStatus.flags1 & BS_FLAGS1_NO_RATING)) { if (player->actorTypeData1[5]) { sfx_play_sound_at_position(player->actorTypeData1[5], SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); } @@ -929,11 +933,11 @@ HitResult calc_player_damage_enemy(void) { } } - if (sp24) { + if (missedAllOrNothing) { show_action_rating(ACTION_RATING_MISS, target, state->goalPos.x, state->goalPos.y, state->goalPos.z); } - if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) { + if (gBattleStatus.flags1 & BS_FLAGS1_TRIGGER_EVENTS) { func_80266970(target); } @@ -951,7 +955,7 @@ HitResult calc_player_damage_enemy(void) { } } - if (battleStatus->lastAttackDamage < 1 && !wasSpecialHit && !sp20 || targetPart->flags & ACTOR_PART_FLAG_DAMAGE_IMMUNE) { + if (battleStatus->lastAttackDamage < 1 && !wasSpecialHit && !canBeShocked || targetPart->flags & ACTOR_PART_FLAG_DAMAGE_IMMUNE) { sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); } @@ -1019,12 +1023,12 @@ HitResult calc_player_damage_enemy(void) { show_actor_health_bar(target); - if (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) { + if (gBattleStatus.flags1 & (BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT)) { if (hitResult == HIT_RESULT_HIT) { - hitResult = HIT_RESULT_1; + hitResult = HIT_RESULT_NICE; } if (hitResult == HIT_RESULT_NO_DAMAGE) { - hitResult = HIT_RESULT_3; + hitResult = HIT_RESULT_NICE_NO_DAMAGE; } } @@ -1036,14 +1040,14 @@ HitResult calc_player_damage_enemy(void) { ) { sfx_play_sound_at_position(SOUND_HIT_PLAYER_SHOCK, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); apply_shock_effect(player); - dispatch_damage_event_player_1(1, EVENT_SHOCK_HIT); + dispatch_hazard_event_player(1, EVENT_SHOCK_HIT); return HIT_RESULT_BACKFIRE; } return hitResult; } -s32 dispatch_damage_event_player(s32 damageAmount, s32 event, s32 arg2) { +b32 dispatch_damage_event_player(s32 damageAmount, s32 event, b32 noHitSound) { BattleStatus* battleStatus = &gBattleStatus; PlayerData* playerData = &gPlayerData; Actor* player = battleStatus->playerActor; @@ -1097,7 +1101,7 @@ s32 dispatch_damage_event_player(s32 damageAmount, s32 event, s32 arg2) { } } - if (!arg2) { + if (!noHitSound) { set_goal_pos_to_part(state, ACTOR_PLAYER, 0); sfx_play_sound_at_position(SOUND_HIT_NORMAL, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); } @@ -1109,12 +1113,13 @@ s32 dispatch_damage_event_player(s32 damageAmount, s32 event, s32 arg2) { set_actor_flash_mode(player, 1); } - flags = (gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) != 0; + flags = (gBattleStatus.flags1 & (BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT)) != 0; dispatch_event_player(dispatchEvent); return flags; } -s32 dispatch_damage_event_player_0(s32 damageAmount, s32 event) { +// damage received from "damage over time" effects (only used for poison) +b32 dispatch_damage_tick_event_player(s32 damageAmount, s32 event) { BattleStatus* battleStatus = &gBattleStatus; battleStatus->curAttackElement = ELEMENT_END; @@ -1122,8 +1127,9 @@ s32 dispatch_damage_event_player_0(s32 damageAmount, s32 event) { return dispatch_damage_event_player(damageAmount, event, FALSE); } -void dispatch_damage_event_player_1(s32 damageAmount, s32 event) { - dispatch_damage_event_player(damageAmount, event, TRUE); +// damage received from contact hazards +b32 dispatch_hazard_event_player(s32 damageAmount, s32 event) { + return dispatch_damage_event_player(damageAmount, event, TRUE); } ApiStatus GetMenuSelection(Evt* script, s32 isInitialCall) { @@ -1191,7 +1197,7 @@ ApiStatus func_80273444(Evt* script, s32 isInitialCall) { playerState->unk_28 = 180 / playerState->moveTime; playerState->unk_2C = playerState->goalPos.y; if (script->functionTemp[1] != 2) { - sfx_play_sound_at_position(SOUND_PLAYER_JUMP, SOUND_SPACE_DEFAULT, player->curPos.x, player->curPos.y, player->curPos.z); + sfx_play_sound_at_position(SOUND_LONG_PLAYER_JUMP, SOUND_SPACE_DEFAULT, player->curPos.x, player->curPos.y, player->curPos.z); } script->functionTemp[0] = TRUE; } @@ -1541,44 +1547,44 @@ ApiStatus PlayerDamageEnemy(Evt* script, s32 isInitialCall) { battleStatus->powerBounceCounter = 0; flags = *args++; - if ((flags & (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) == (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) { - gBattleStatus.flags1 |= BS_FLAGS1_10; - gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; - } else if (flags & BS_FLAGS1_10) { - gBattleStatus.flags1 |= BS_FLAGS1_10; - gBattleStatus.flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; - } else if (flags & BS_FLAGS1_SP_EVT_ACTIVE) { - gBattleStatus.flags1 &= ~BS_FLAGS1_10; - gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; + if ((flags & BS_FLAGS1_INCLUDE_POWER_UPS) && (flags & BS_FLAGS1_TRIGGER_EVENTS)) { + gBattleStatus.flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 |= BS_FLAGS1_TRIGGER_EVENTS; + } else if (flags & BS_FLAGS1_INCLUDE_POWER_UPS) { + gBattleStatus.flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; + } else if (flags & BS_FLAGS1_TRIGGER_EVENTS) { + gBattleStatus.flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 |= BS_FLAGS1_TRIGGER_EVENTS; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_10; - gBattleStatus.flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; + gBattleStatus.flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; } - if (flags & BS_FLAGS1_40) { - gBattleStatus.flags1 |= BS_FLAGS1_40; + if (flags & BS_FLAGS1_NICE_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_NICE_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_40; + gBattleStatus.flags1 &= ~BS_FLAGS1_NICE_HIT; } - if (flags & BS_FLAGS1_200) { - gBattleStatus.flags1 |= BS_FLAGS1_200; + if (flags & BS_FLAGS1_SUPER_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_SUPER_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_200; + gBattleStatus.flags1 &= ~BS_FLAGS1_SUPER_HIT; } - if (flags & BS_FLAGS1_80) { - gBattleStatus.flags1 |= BS_FLAGS1_80; + if (flags & BS_FLAGS1_NO_RATING) { + gBattleStatus.flags1 |= BS_FLAGS1_NO_RATING; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_80; + gBattleStatus.flags1 &= ~BS_FLAGS1_NO_RATING; } - if (flags & BS_FLAGS1_FORCE_HIT_IMMUNE) { - gBattleStatus.flags1 |= BS_FLAGS1_FORCE_HIT_IMMUNE; + if (flags & BS_FLAGS1_FORCE_IMMUNE_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_FORCE_IMMUNE_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_FORCE_HIT_IMMUNE; + gBattleStatus.flags1 &= ~BS_FLAGS1_FORCE_IMMUNE_HIT; } target = get_actor(script->owner1.actorID); battleStatus->curTargetID = target->targetActorID; - battleStatus->curTargetPart = target->targetPartIndex; + battleStatus->curTargetPart = target->targetPartID; battleStatus->statusChance = battleStatus->curAttackStatus; if (battleStatus->statusChance == STATUS_KEY_NEVER) { battleStatus->statusChance = 0; @@ -1613,43 +1619,43 @@ ApiStatus PlayerPowerBounceEnemy(Evt* script, s32 isInitialCall) { battleStatus->powerBounceCounter = evt_get_variable(script, *args++); flags = *args++; - if ((flags & (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) == (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) { - gBattleStatus.flags1 |= BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE; - } else if (flags & BS_FLAGS1_10) { - gBattleStatus.flags1 |= BS_FLAGS1_10; - gBattleStatus.flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; - } else if (flags & BS_FLAGS1_SP_EVT_ACTIVE) { - gBattleStatus.flags1 &= ~BS_FLAGS1_10; - gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; + if ((flags & BS_FLAGS1_INCLUDE_POWER_UPS) && (flags & BS_FLAGS1_TRIGGER_EVENTS)) { + gBattleStatus.flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS; + } else if (flags & BS_FLAGS1_INCLUDE_POWER_UPS) { + gBattleStatus.flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; + } else if (flags & BS_FLAGS1_TRIGGER_EVENTS) { + gBattleStatus.flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 |= BS_FLAGS1_TRIGGER_EVENTS; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_10; - gBattleStatus.flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; + gBattleStatus.flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; } - if (flags & BS_FLAGS1_40) { - gBattleStatus.flags1 |= BS_FLAGS1_40; + if (flags & BS_FLAGS1_NICE_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_NICE_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_40; + gBattleStatus.flags1 &= ~BS_FLAGS1_NICE_HIT; } - if (flags & BS_FLAGS1_200) { - gBattleStatus.flags1 |= BS_FLAGS1_200; + if (flags & BS_FLAGS1_SUPER_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_SUPER_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_200; + gBattleStatus.flags1 &= ~BS_FLAGS1_SUPER_HIT; } - if (flags & BS_FLAGS1_80) { - gBattleStatus.flags1 |= BS_FLAGS1_80; + if (flags & BS_FLAGS1_NO_RATING) { + gBattleStatus.flags1 |= BS_FLAGS1_NO_RATING; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_80; + gBattleStatus.flags1 &= ~BS_FLAGS1_NO_RATING; } - if (flags & BS_FLAGS1_FORCE_HIT_IMMUNE) { - gBattleStatus.flags1 |= BS_FLAGS1_FORCE_HIT_IMMUNE; + if (flags & BS_FLAGS1_FORCE_IMMUNE_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_FORCE_IMMUNE_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_FORCE_HIT_IMMUNE; + gBattleStatus.flags1 &= ~BS_FLAGS1_FORCE_IMMUNE_HIT; } target = get_actor(script->owner1.actorID); battleStatus->curTargetID = target->targetActorID; - battleStatus->curTargetPart = target->targetPartIndex; + battleStatus->curTargetPart = target->targetPartID; battleStatus->statusChance = battleStatus->curAttackStatus; if (battleStatus->statusChance == STATUS_KEY_NEVER) { battleStatus->statusChance = 0; @@ -1684,43 +1690,43 @@ ApiStatus PlayerTestEnemy(Evt* script, s32 isInitialCall) { battleStatus->powerBounceCounter = 0; flags = *args++; - if ((flags & (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) == (BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE)) { - gBattleStatus.flags1 |= BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE; - } else if (flags & BS_FLAGS1_10) { - gBattleStatus.flags1 |= BS_FLAGS1_10; - gBattleStatus.flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; - } else if (flags & BS_FLAGS1_SP_EVT_ACTIVE) { - gBattleStatus.flags1 &= ~BS_FLAGS1_10; - gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE; + if ((flags & BS_FLAGS1_INCLUDE_POWER_UPS) && (flags & BS_FLAGS1_TRIGGER_EVENTS)) { + gBattleStatus.flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS; + } else if (flags & BS_FLAGS1_INCLUDE_POWER_UPS) { + gBattleStatus.flags1 |= BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; + } else if (flags & BS_FLAGS1_TRIGGER_EVENTS) { + gBattleStatus.flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 |= BS_FLAGS1_TRIGGER_EVENTS; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_10; - gBattleStatus.flags1 &= ~BS_FLAGS1_SP_EVT_ACTIVE; + gBattleStatus.flags1 &= ~BS_FLAGS1_INCLUDE_POWER_UPS; + gBattleStatus.flags1 &= ~BS_FLAGS1_TRIGGER_EVENTS; } - if (flags & BS_FLAGS1_40) { - gBattleStatus.flags1 |= BS_FLAGS1_40; + if (flags & BS_FLAGS1_NICE_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_NICE_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_40; + gBattleStatus.flags1 &= ~BS_FLAGS1_NICE_HIT; } - if (flags & BS_FLAGS1_200) { - gBattleStatus.flags1 |= BS_FLAGS1_200; + if (flags & BS_FLAGS1_SUPER_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_SUPER_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_200; + gBattleStatus.flags1 &= ~BS_FLAGS1_SUPER_HIT; } - if (flags & BS_FLAGS1_80) { - gBattleStatus.flags1 |= BS_FLAGS1_80; + if (flags & BS_FLAGS1_NO_RATING) { + gBattleStatus.flags1 |= BS_FLAGS1_NO_RATING; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_80; + gBattleStatus.flags1 &= ~BS_FLAGS1_NO_RATING; } - if (flags & BS_FLAGS1_FORCE_HIT_IMMUNE) { - gBattleStatus.flags1 |= BS_FLAGS1_FORCE_HIT_IMMUNE; + if (flags & BS_FLAGS1_FORCE_IMMUNE_HIT) { + gBattleStatus.flags1 |= BS_FLAGS1_FORCE_IMMUNE_HIT; } else { - gBattleStatus.flags1 &= ~BS_FLAGS1_FORCE_HIT_IMMUNE; + gBattleStatus.flags1 &= ~BS_FLAGS1_FORCE_IMMUNE_HIT; } target = get_actor(script->owner1.actorID); battleStatus->curTargetID = target->targetActorID; - battleStatus->curTargetPart = target->targetPartIndex; + battleStatus->curTargetPart = target->targetPartID; battleStatus->statusChance = battleStatus->curAttackStatus; if (battleStatus->statusChance == STATUS_KEY_NEVER) { battleStatus->statusChance = 0; @@ -1739,7 +1745,7 @@ ApiStatus DispatchDamagePlayerEvent(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 damageAmount = evt_get_variable(script, *args++); - if (dispatch_damage_event_player_0(damageAmount, *args++) < 0) { + if (dispatch_damage_tick_event_player(damageAmount, *args++) < 0) { return ApiStatus_BLOCK; } @@ -1861,7 +1867,7 @@ ApiStatus func_80274A18(Evt* script, s32 isInitialCall) { playerState->vel = vel2 + ((sin_rad(DEG_TO_RAD(playerState->unk_24)) * 0.8 * acc2) + acc2); } set_actor_anim(0, 0, playerState->animJumpRise); - sfx_play_sound_at_position(SOUND_PLAYER_JUMP, SOUND_SPACE_DEFAULT, player->curPos.x, player->curPos.y, player->curPos.z); + sfx_play_sound_at_position(SOUND_LONG_PLAYER_JUMP, SOUND_SPACE_DEFAULT, player->curPos.x, player->curPos.y, player->curPos.z); script->functionTemp[0] = 1; } @@ -2002,7 +2008,7 @@ ApiStatus func_802752AC(Evt* script, s32 isInitialCall) { playerState->vel = 0.0f; playerState->speed += temp / playerState->moveTime; set_actor_anim(ACTOR_PLAYER, 0, playerState->animJumpRise); - sfx_play_sound_at_position(SOUND_PLAYER_JUMP, SOUND_SPACE_DEFAULT, player->curPos.x, player->curPos.y, player->curPos.z); + sfx_play_sound_at_position(SOUND_LONG_PLAYER_JUMP, SOUND_SPACE_DEFAULT, player->curPos.x, player->curPos.y, player->curPos.z); playerState->unk_24 = 90.0f; playerState->bounceDivisor = 45.0f; playerState->unk_28 = 360 / playerState->moveTime; @@ -2106,7 +2112,7 @@ ApiStatus func_802752AC(Evt* script, s32 isInitialCall) { playerState->unk_24 = clamp_angle(playerState->unk_24); playerState->moveTime--; if (playerState->moveTime == 0) { - sfx_play_sound_at_position(SOUND_PLAYER_JUMP, SOUND_SPACE_DEFAULT, player->curPos.x, player->curPos.y, player->curPos.z); + sfx_play_sound_at_position(SOUND_LONG_PLAYER_JUMP, SOUND_SPACE_DEFAULT, player->curPos.x, player->curPos.y, player->curPos.z); set_actor_anim(ACTOR_PLAYER, 0, playerState->animJumpFall); player->rotPivotOffset.y = 14; player->rot.z -= 66.0f; @@ -2153,7 +2159,7 @@ ApiStatus func_802752AC(Evt* script, s32 isInitialCall) { playerState->moveTime--; if (playerState->moveTime == 0) { player->curPos.y = playerState->goalPos.y; - set_actor_anim(ACTOR_PLAYER, 0, 0x1000C); + set_actor_anim(ACTOR_PLAYER, 0, ANIM_Mario1_SpinFall); return ApiStatus_DONE1; } break; @@ -2246,7 +2252,7 @@ ApiStatus func_80275F00(Evt* script, s32 isInitialCall) { playerState->velStep.z = (playerState->goalPos.z - playerState->curPos.z) / playerState->moveTime; playerState->speed += temp / playerState->moveTime; set_actor_anim(ACTOR_PLAYER, 0, playerState->animJumpFall); - sfx_play_sound_at_position(SOUND_PLAYER_JUMP, SOUND_SPACE_DEFAULT, player->curPos.x, player->curPos.y, player->curPos.z); + sfx_play_sound_at_position(SOUND_LONG_PLAYER_JUMP, SOUND_SPACE_DEFAULT, player->curPos.x, player->curPos.y, player->curPos.z); sfx_play_sound_at_position(SOUND_TORNADO_JUMP, SOUND_SPACE_DEFAULT, player->curPos.x, player->curPos.y, player->curPos.z); playerState->unk_18.x = 0.0f; playerState->unk_18.y = 0.0f; @@ -2290,7 +2296,7 @@ ApiStatus func_80275F00(Evt* script, s32 isInitialCall) { playerState->velStep.z = (playerState->goalPos.z - playerState->curPos.z) / playerState->moveTime; playerState->speed += temp / playerState->moveTime; set_actor_anim(ACTOR_PLAYER, 0, playerState->animJumpRise); - sfx_play_sound_at_position(SOUND_PLAYER_JUMP, SOUND_SPACE_DEFAULT, player->curPos.x, player->curPos.y, player->curPos.z); + sfx_play_sound_at_position(SOUND_LONG_PLAYER_JUMP, SOUND_SPACE_DEFAULT, player->curPos.x, player->curPos.y, player->curPos.z); sfx_play_sound_at_position(SOUND_TORNADO_JUMP, SOUND_SPACE_DEFAULT, player->curPos.x, player->curPos.y, player->curPos.z); playerState->unk_18.x = 0.0f; playerState->unk_18.y = 0.0f; @@ -2310,7 +2316,7 @@ ApiStatus func_80275F00(Evt* script, s32 isInitialCall) { break; case 20: playerState->moveTime = 1; - set_actor_anim(ACTOR_PLAYER, 1, 0x1000C); + set_actor_anim(ACTOR_PLAYER, 1, ANIM_Mario1_SpinFall); player->rot.y = 0.0f; playerState->unk_24 = 90.0f; playerState->bounceDivisor = fabsf(playerState->unk_18.x - playerState->unk_18.y) / 16.5; @@ -2345,7 +2351,7 @@ ApiStatus func_80275F00(Evt* script, s32 isInitialCall) { playerState->velStep.z = (playerState->goalPos.z - playerState->curPos.z) / playerState->moveTime; playerState->speed += temp / playerState->moveTime; set_actor_anim(ACTOR_PLAYER, 0, playerState->animJumpRise); - sfx_play_sound_at_position(SOUND_PLAYER_JUMP, SOUND_SPACE_DEFAULT, player->curPos.x, player->curPos.y, player->curPos.z); + sfx_play_sound_at_position(SOUND_LONG_PLAYER_JUMP, SOUND_SPACE_DEFAULT, player->curPos.x, player->curPos.y, player->curPos.z); playerState->unk_24 = 90.0f; playerState->bounceDivisor = 45.0f; playerState->unk_28 = 360 / playerState->moveTime; diff --git a/src/battle/level_up.c b/src/battle/level_up.c index d81230837f..982b04ead0 100644 --- a/src/battle/level_up.c +++ b/src/battle/level_up.c @@ -641,7 +641,7 @@ void btl_state_update_celebration(void) { y = player->curPos.y + 25.0f; z = player->curPos.z; fx_recover(1, x, y, z, playerData->curFP); - playerData->specialBarsFilled = playerData->maxStarPower * 256; + playerData->starPower = playerData->maxStarPower * SP_PER_BAR; } if (CelebrateSubstateTime != 0) { diff --git a/src/battle/move/hammer/attack.c b/src/battle/move/hammer/attack.c index a3f4018cd7..c50f4ea805 100644 --- a/src/battle/move/hammer/attack.c +++ b/src/battle/move/hammer/attack.c @@ -8,9 +8,9 @@ #include "battle/common/move/HammerSupport.inc.c" -extern EvtScript N(EVS_UseMove0_Impl); +extern EvtScript N(EVS_UseMove_Impl); -EvtScript N(EVS_UseMove0) = { +EvtScript N(EVS_UseMove) = { EVT_CALL(ShowActionHud, TRUE) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) @@ -18,23 +18,23 @@ EvtScript N(EVS_UseMove0) = { EVT_SET(LVarD, 45) EVT_SET(LVarE, 1) EVT_SET(LVarF, 2) - EVT_EXEC_WAIT(N(EVS_UseMove0_Impl)) + EVT_EXEC_WAIT(N(EVS_UseMove_Impl)) EVT_CASE_EQ(1) EVT_SET(LVarD, 45) EVT_SET(LVarE, 2) EVT_SET(LVarF, 4) - EVT_EXEC_WAIT(N(EVS_UseMove0_Impl)) + EVT_EXEC_WAIT(N(EVS_UseMove_Impl)) EVT_CASE_EQ(2) EVT_SET(LVarD, 45) EVT_SET(LVarE, 3) EVT_SET(LVarF, 6) - EVT_EXEC_WAIT(N(EVS_UseMove0_Impl)) + EVT_EXEC_WAIT(N(EVS_UseMove_Impl)) EVT_END_SWITCH EVT_RETURN EVT_END }; -EvtScript N(EVS_UseMove0_Impl) = { +EvtScript N(EVS_UseMove_Impl) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) @@ -104,7 +104,7 @@ EvtScript N(EVS_UseMove0_Impl) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_SILENT) EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, SUPPRESS_EVENTS_HAMMER, 0, LVarF, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) @@ -115,11 +115,11 @@ EvtScript N(EVS_UseMove0_Impl) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_SILENT) EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, SUPPRESS_EVENTS_HAMMER, 0, LVarE, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -131,7 +131,7 @@ EvtScript N(EVS_UseMove0_Impl) = { EVT_END }; -EvtScript N(EVS_UseMove1) = { +EvtScript N(EVS_FirstStrike) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) @@ -200,15 +200,15 @@ EvtScript N(EVS_UseMove1) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_SILENT) EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVar9, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, SUPPRESS_EVENTS_HAMMER, 0, LVar9, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) EVT_RETURN EVT_END }; -extern EvtScript N(EVS_UseMove2_Impl); +extern EvtScript N(EVS_UseBerserker_Impl); -EvtScript N(EVS_UseMove2) = { +EvtScript N(EVS_UseBerserker) = { EVT_CALL(ShowActionHud, TRUE) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) @@ -216,23 +216,23 @@ EvtScript N(EVS_UseMove2) = { EVT_SET(LVarD, 75) EVT_SET(LVarE, 1) EVT_SET(LVarF, 2) - EVT_EXEC_WAIT(N(EVS_UseMove2_Impl)) + EVT_EXEC_WAIT(N(EVS_UseBerserker_Impl)) EVT_CASE_EQ(1) EVT_SET(LVarD, 66) EVT_SET(LVarE, 2) EVT_SET(LVarF, 4) - EVT_EXEC_WAIT(N(EVS_UseMove2_Impl)) + EVT_EXEC_WAIT(N(EVS_UseBerserker_Impl)) EVT_CASE_EQ(2) EVT_SET(LVarD, 57) EVT_SET(LVarE, 3) EVT_SET(LVarF, 6) - EVT_EXEC_WAIT(N(EVS_UseMove2_Impl)) + EVT_EXEC_WAIT(N(EVS_UseBerserker_Impl)) EVT_END_SWITCH EVT_RETURN EVT_END }; -EvtScript N(EVS_UseMove2_Impl) = { +EvtScript N(EVS_UseBerserker_Impl) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) @@ -326,7 +326,7 @@ EvtScript N(EVS_UseMove2_Impl) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_SILENT) EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, SUPPRESS_EVENTS_HAMMER, 0, LVarF, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) @@ -337,11 +337,11 @@ EvtScript N(EVS_UseMove2_Impl) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_SILENT) EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, SUPPRESS_EVENTS_HAMMER, 0, LVarE, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/move/hammer/auto_smash.c b/src/battle/move/hammer/auto_smash.c index 19f5628227..77438e99e8 100644 --- a/src/battle/move/hammer/auto_smash.c +++ b/src/battle/move/hammer/auto_smash.c @@ -42,7 +42,7 @@ EvtScript N(EVS_UseMove_Impl) = { EVT_CASE_EQ(2) EVT_EXEC_WAIT(N(EVS_UseUltraHammer)) EVT_END_SWITCH - EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVar9, BS_FLAGS1_10) + EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVar9, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_CALL(GetActionSuccessCopy, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(0) @@ -103,7 +103,7 @@ EvtScript N(EVS_UseMove_Impl) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_SILENT) EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, SUPPRESS_EVENTS_HAMMER, 0, LVarF, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) @@ -114,11 +114,11 @@ EvtScript N(EVS_UseMove_Impl) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_SILENT) EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, SUPPRESS_EVENTS_HAMMER, 0, LVarE, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/move/hammer/d_down_pound.c b/src/battle/move/hammer/d_down_pound.c index 3f22b72524..3fd827de4f 100644 --- a/src/battle/move/hammer/d_down_pound.c +++ b/src/battle/move/hammer/d_down_pound.c @@ -128,13 +128,13 @@ EvtScript N(UseMove_Impl) = { EVT_CALL(GetPlayerActionSuccess, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_IGNORE_DEFENSE, 25, 0, LVarF, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_IGNORE_DEFENSE, SUPPRESS_EVENTS_HAMMER, 0, LVarF, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_IGNORE_DEFENSE, 25, 0, LVarE, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_IGNORE_DEFENSE, SUPPRESS_EVENTS_HAMMER, 0, LVarE, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/move/hammer/hammer_charge_0.c b/src/battle/move/hammer/hammer_charge_0.c index cdcd9701f4..07b1730fea 100644 --- a/src/battle/move/hammer/hammer_charge_0.c +++ b/src/battle/move/hammer/hammer_charge_0.c @@ -137,7 +137,7 @@ EvtScript N(EVS_802A3348) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_SILENT) EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, SUPPRESS_EVENTS_HAMMER, 0, LVarF, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_SET(LFlag0, TRUE) EVT_CASE_DEFAULT EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) @@ -149,12 +149,12 @@ EvtScript N(EVS_802A3348) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_SILENT) EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 32) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, SUPPRESS_EVENTS_HAMMER, 0, LVarE, BS_FLAGS1_TRIGGER_EVENTS) EVT_SET(LFlag0, FALSE) EVT_END_SWITCH EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -209,7 +209,7 @@ EvtScript N(EVS_802A3948) = { EVT_CALL(func_802A10C8_74F1F8, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_CHARGE_UP) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_PLAYER_JUMP) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_LONG_PLAYER_JUMP) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -260,7 +260,7 @@ EvtScript N(EVS_802A3C90) = { EVT_CALL(func_802A10C8_74F1F8, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_CHARGE_UP) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_PLAYER_JUMP) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_LONG_PLAYER_JUMP) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -311,7 +311,7 @@ EvtScript N(EVS_802A3FD8) = { EVT_CALL(func_802A10C8_74F1F8, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_CHARGE_UP) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_PLAYER_JUMP) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_LONG_PLAYER_JUMP) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) diff --git a/src/battle/move/hammer/hammer_charge_1.c b/src/battle/move/hammer/hammer_charge_1.c index 4d4b889bbd..3437c74b49 100644 --- a/src/battle/move/hammer/hammer_charge_1.c +++ b/src/battle/move/hammer/hammer_charge_1.c @@ -146,7 +146,7 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_SILENT) EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, SUPPRESS_EVENTS_HAMMER, 0, LVarF, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_SET(LFlag0, TRUE) EVT_CASE_DEFAULT EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) @@ -158,12 +158,12 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_SILENT) EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 32) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, SUPPRESS_EVENTS_HAMMER, 0, LVarE, BS_FLAGS1_TRIGGER_EVENTS) EVT_SET(LFlag0, FALSE) EVT_END_SWITCH EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -218,7 +218,7 @@ EvtScript N(EVS_802A39C8) = { EVT_CALL(func_802A10C8_759678, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_CHARGE_UP) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_PLAYER_JUMP) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_LONG_PLAYER_JUMP) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -270,7 +270,7 @@ EvtScript N(EVS_802A3D1C) = { EVT_CALL(func_802A10C8_759678, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_CHARGE_UP) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_PLAYER_JUMP) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_LONG_PLAYER_JUMP) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -322,7 +322,7 @@ EvtScript N(EVS_802A4070) = { EVT_CALL(func_802A10C8_759678, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_CHARGE_UP) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_PLAYER_JUMP) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_LONG_PLAYER_JUMP) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) diff --git a/src/battle/move/hammer/hammer_charge_2.c b/src/battle/move/hammer/hammer_charge_2.c index a072f007d7..b045b4e85a 100644 --- a/src/battle/move/hammer/hammer_charge_2.c +++ b/src/battle/move/hammer/hammer_charge_2.c @@ -146,7 +146,7 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_SILENT) EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, SUPPRESS_EVENTS_HAMMER, 0, LVarF, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_SET(LFlag0, TRUE) EVT_CASE_DEFAULT EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) @@ -158,12 +158,12 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_SILENT) EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 32) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, SUPPRESS_EVENTS_HAMMER, 0, LVarE, BS_FLAGS1_TRIGGER_EVENTS) EVT_SET(LFlag0, FALSE) EVT_END_SWITCH EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -218,7 +218,7 @@ EvtScript N(EVS_802A39C8) = { EVT_CALL(func_802A10C8_75E698, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_CHARGE_UP) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_PLAYER_JUMP) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_LONG_PLAYER_JUMP) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -268,7 +268,7 @@ EvtScript N(EVS_802A3CF4) = { EVT_CALL(func_802A10C8_75E698, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_CHARGE_UP) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_PLAYER_JUMP) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_LONG_PLAYER_JUMP) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -318,7 +318,7 @@ EvtScript N(EVS_802A4020) = { EVT_CALL(func_802A10C8_75E698, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_CHARGE_UP) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_PLAYER_JUMP) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_LONG_PLAYER_JUMP) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) diff --git a/src/battle/move/hammer/hammer_throw.c b/src/battle/move/hammer/hammer_throw.c index 5785f41289..1baed53772 100644 --- a/src/battle/move/hammer/hammer_throw.c +++ b/src/battle/move/hammer/hammer_throw.c @@ -400,7 +400,7 @@ EvtScript N(EVS_UseMove_Impl) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_SILENT) EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_THROW | DAMAGE_TYPE_NO_CONTACT, 25, 0, LVarF, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_THROW | DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENTS_HAMMER, 0, LVarF, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) @@ -411,11 +411,11 @@ EvtScript N(EVS_UseMove_Impl) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_SILENT) EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_THROW | DAMAGE_TYPE_NO_CONTACT, 25, 0, LVarE, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_THROW | DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENTS_HAMMER, 0, LVarE, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/move/hammer/mega_quake.c b/src/battle/move/hammer/mega_quake.c index 07a999b080..462a6213b5 100644 --- a/src/battle/move/hammer/mega_quake.c +++ b/src/battle/move/hammer/mega_quake.c @@ -191,9 +191,9 @@ EvtScript N(EVS_802A3238) = { EVT_CALL(GetPlayerActionSuccess, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_QUAKE_HAMMER | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 25, 0, LVarF, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_QUAKE_HAMMER | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENTS_HAMMER, 0, LVarF, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_QUAKE_HAMMER | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 25, 0, LVarE, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_QUAKE_HAMMER | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENTS_HAMMER, 0, LVarE, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_LABEL(11) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar1) diff --git a/src/battle/move/hammer/mega_smash.c b/src/battle/move/hammer/mega_smash.c index fc397f2935..b181fbc53b 100644 --- a/src/battle/move/hammer/mega_smash.c +++ b/src/battle/move/hammer/mega_smash.c @@ -82,7 +82,7 @@ EvtScript N(UseMove_Impl) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_SILENT) EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, SUPPRESS_EVENTS_HAMMER, 0, LVarF, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) @@ -93,11 +93,11 @@ EvtScript N(UseMove_Impl) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_SILENT) EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, SUPPRESS_EVENTS_HAMMER, 0, LVarE, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/move/hammer/power_quake.c b/src/battle/move/hammer/power_quake.c index cd49ca56a9..cc5493a002 100644 --- a/src/battle/move/hammer/power_quake.c +++ b/src/battle/move/hammer/power_quake.c @@ -140,9 +140,9 @@ EvtScript N(EVS_802A3168) = { EVT_CALL(GetPlayerActionSuccess, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_QUAKE_HAMMER | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 25, 0, LVarF, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_QUAKE_HAMMER | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENTS_HAMMER, 0, LVarF, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_QUAKE_HAMMER | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 25, 0, LVarE, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_QUAKE_HAMMER | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENTS_HAMMER, 0, LVarE, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_LABEL(11) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar1) diff --git a/src/battle/move/hammer/power_smash.c b/src/battle/move/hammer/power_smash.c index f05e287c52..fef73ac18d 100644 --- a/src/battle/move/hammer/power_smash.c +++ b/src/battle/move/hammer/power_smash.c @@ -77,7 +77,7 @@ EvtScript N(UseMove_Impl) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_SILENT) EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, SUPPRESS_EVENTS_HAMMER, 0, LVarF, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) @@ -88,11 +88,11 @@ EvtScript N(UseMove_Impl) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_SILENT) EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, SUPPRESS_EVENTS_HAMMER, 0, LVarE, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/move/hammer/quake_hammer.c b/src/battle/move/hammer/quake_hammer.c index 5b74501b42..eab773d8ca 100644 --- a/src/battle/move/hammer/quake_hammer.c +++ b/src/battle/move/hammer/quake_hammer.c @@ -125,9 +125,9 @@ EvtScript N(EVS_802A3168) = { EVT_CALL(GetPlayerActionSuccess, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_QUAKE_HAMMER | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 25, 0, LVarF, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_QUAKE_HAMMER | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENTS_HAMMER, 0, LVarF, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_QUAKE_HAMMER | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 25, 0, LVarE, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_QUAKE_HAMMER | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENTS_HAMMER, 0, LVarE, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_LABEL(11) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar1) diff --git a/src/battle/move/hammer/shell_crack.c b/src/battle/move/hammer/shell_crack.c index 064fa5049a..7f5546abaf 100644 --- a/src/battle/move/hammer/shell_crack.c +++ b/src/battle/move/hammer/shell_crack.c @@ -98,7 +98,7 @@ EvtScript N(UseMove_Impl) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_SILENT) EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SHELL_CRACK, 25, 0, LVarF, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SHELL_CRACK, SUPPRESS_EVENTS_HAMMER, 0, LVarF, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) @@ -109,11 +109,11 @@ EvtScript N(UseMove_Impl) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_SILENT) EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SHELL_CRACK, 25, 0, LVarE, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SHELL_CRACK, SUPPRESS_EVENTS_HAMMER, 0, LVarE, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/move/hammer/shrink_smash.c b/src/battle/move/hammer/shrink_smash.c index efc80ab99f..5d2d8cc6b7 100644 --- a/src/battle/move/hammer/shrink_smash.c +++ b/src/battle/move/hammer/shrink_smash.c @@ -101,7 +101,7 @@ EvtScript N(EVS_UseMove_Impl) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_SILENT) EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 100), LVarF, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, SUPPRESS_EVENTS_HAMMER, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 100), LVarF, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) @@ -112,11 +112,11 @@ EvtScript N(EVS_UseMove_Impl) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_SILENT) EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 75), LVarE, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, SUPPRESS_EVENTS_HAMMER, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 75), LVarE, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_END_SWITCH EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/move/hammer/spin_smash.c b/src/battle/move/hammer/spin_smash.c index dec52c2795..6f7fbfd849 100644 --- a/src/battle/move/hammer/spin_smash.c +++ b/src/battle/move/hammer/spin_smash.c @@ -149,10 +149,10 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(func_802A1000_737890) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SPIN_SMASH | DAMAGE_TYPE_MULTIPLE_POPUPS, 25, 0, LVarF, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SPIN_SMASH | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENTS_HAMMER, 0, LVarF, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(func_802A1074_737904) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SPIN_SMASH | DAMAGE_TYPE_MULTIPLE_POPUPS, 25, 0, LVarE, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SPIN_SMASH | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENTS_HAMMER, 0, LVarE, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -162,8 +162,8 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_B)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_THREAD @@ -271,10 +271,10 @@ EvtScript N(EVS_UseMove2_Impl) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(func_802A1000_737890) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SPIN_SMASH | DAMAGE_TYPE_MULTIPLE_POPUPS, 25, 0, LVarF, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SPIN_SMASH | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENTS_HAMMER, 0, LVarF, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(func_802A1074_737904) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SPIN_SMASH | DAMAGE_TYPE_MULTIPLE_POPUPS, 25, 0, LVarE, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SPIN_SMASH | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENTS_HAMMER, 0, LVarE, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -284,8 +284,8 @@ EvtScript N(EVS_UseMove2_Impl) = { EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_B)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_THREAD @@ -391,10 +391,10 @@ EvtScript N(EVS_UseMove3_Impl) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(func_802A1000_737890) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SPIN_SMASH | DAMAGE_TYPE_MULTIPLE_POPUPS, 25, 0, LVarF, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SPIN_SMASH | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENTS_HAMMER, 0, LVarF, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(func_802A1074_737904) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SPIN_SMASH | DAMAGE_TYPE_MULTIPLE_POPUPS, 25, 0, LVarE, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_SPIN_SMASH | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENTS_HAMMER, 0, LVarE, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -404,8 +404,8 @@ EvtScript N(EVS_UseMove3_Impl) = { EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_B)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_THREAD diff --git a/src/battle/move/hammer/super_smash.c b/src/battle/move/hammer/super_smash.c index 5817b8c046..f3f0b20e19 100644 --- a/src/battle/move/hammer/super_smash.c +++ b/src/battle/move/hammer/super_smash.c @@ -78,7 +78,7 @@ EvtScript N(UseMove_Impl) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_SILENT) EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarF, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, SUPPRESS_EVENTS_HAMMER, 0, LVarF, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) @@ -89,11 +89,11 @@ EvtScript N(UseMove_Impl) = { EVT_CASE_EQ(2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_SILENT) EVT_END_SWITCH - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, LVarE, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_SMASH, SUPPRESS_EVENTS_HAMMER, 0, LVarE, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_A)) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_HIT) diff --git a/src/battle/move/item/coconut.c b/src/battle/move/item/coconut.c index 1d52eb7d8c..102ad64f96 100644 --- a/src/battle/move/item/coconut.c +++ b/src/battle/move/item/coconut.c @@ -84,7 +84,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 18) EVT_CALL(GetItemPower, ITEM_COCONUT, LVar3, LVar4) EVT_CALL(ApplyShrinkFromOwner, LVar3) - EVT_CALL(ItemDamageEnemy, LVar9, DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, LVar3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar9, DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, LVar3, BS_FLAGS1_TRIGGER_EVENTS) EVT_ADD(LVar0, 60) EVT_ADD(LVar1, 0) EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 16) diff --git a/src/battle/move/item/dizzy_dial.c b/src/battle/move/item/dizzy_dial.c index 97b49d00ed..def5aa3fc6 100644 --- a/src/battle/move/item/dizzy_dial.c +++ b/src/battle/move/item/dizzy_dial.c @@ -87,7 +87,7 @@ EvtScript N(EVS_UseItem) = { EVT_END_IF EVT_CALL(GetItemPower, ITEM_DIZZY_DIAL, LVar0, LVar1) EVT_CALL(MakeStatusField, LVar0, STATUS_FLAG_DIZZY, 100, LVar0) - EVT_CALL(ItemAfflictEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_STATUS_ALWAYS_HITS, LVar0, 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemAfflictEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_STATUS_ALWAYS_HITS, LVar0, 0, BS_FLAGS1_TRIGGER_EVENTS) EVT_LABEL(1) EVT_WAIT(5) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) diff --git a/src/battle/move/item/dusty_hammer.c b/src/battle/move/item/dusty_hammer.c index 99d94a7d8e..bb1ea730b7 100644 --- a/src/battle/move/item/dusty_hammer.c +++ b/src/battle/move/item/dusty_hammer.c @@ -83,7 +83,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 18) EVT_CALL(GetItemPower, ITEM_DUSTY_HAMMER, LVar3, LVar4) EVT_CALL(ApplyShrinkFromOwner, LVar3) - EVT_CALL(ItemDamageEnemy, LVar9, DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, LVar3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar9, DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, LVar3, BS_FLAGS1_TRIGGER_EVENTS) EVT_ADD(LVar0, 40) EVT_ADD(LVar1, 10) EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 10) diff --git a/src/battle/move/item/egg_missile.c b/src/battle/move/item/egg_missile.c index 13bcbc24e5..8078d0b08a 100644 --- a/src/battle/move/item/egg_missile.c +++ b/src/battle/move/item/egg_missile.c @@ -186,7 +186,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.45)) EVT_END_THREAD EVT_CALL(GetItemPower, ITEM_EGG_MISSILE, LVar0, LVar1) - EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_FIRE | DAMAGE_TYPE_BLAST | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_FIRE | DAMAGE_TYPE_BLAST | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_EXEC_WAIT(N(PlayerGoHome)) EVT_RETURN EVT_END diff --git a/src/battle/move/item/electro_pop.c b/src/battle/move/item/electro_pop.c index 3c57fdb374..baa987d356 100644 --- a/src/battle/move/item/electro_pop.c +++ b/src/battle/move/item/electro_pop.c @@ -102,7 +102,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0) - EVT_CALL(PlaySound, SOUND_0379) + EVT_CALL(PlaySound, SOUND_VOLT_SHROOM_APPLY) EVT_CALL(GetItemPower, ITEM_VOLT_SHROOM, LVar0, LVar1) EVT_CALL(N(func_802A123C_7307DC)) EVT_WAIT(40) diff --git a/src/battle/move/item/fire_flower.c b/src/battle/move/item/fire_flower.c index 23fc2c4e2f..922210dcb5 100644 --- a/src/battle/move/item/fire_flower.c +++ b/src/battle/move/item/fire_flower.c @@ -28,7 +28,7 @@ EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_FIRE_FLOWER) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(N(FadeBackgroundDarken)) - EVT_CALL(PlaySound, SOUND_0377) + EVT_CALL(PlaySound, SOUND_PLANT_FIRE_FLOWER) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_PlantFireFlower) EVT_THREAD EVT_WAIT(50) @@ -74,7 +74,7 @@ EvtScript N(EVS_UseItem) = { EVT_END_IF EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetItemPower, ITEM_FIRE_FLOWER, LVar0, LVar1) - EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_FIRE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_FIRE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_LABEL(1) EVT_WAIT(5) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) diff --git a/src/battle/move/item/fright_jar.c b/src/battle/move/item/fright_jar.c index 624567edb9..a51508b9ea 100644 --- a/src/battle/move/item/fright_jar.c +++ b/src/battle/move/item/fright_jar.c @@ -23,7 +23,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(MoveBattleCamOver, 50) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Crouch) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0367) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_FRIGHT_JAR) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -40) EVT_ADD(LVar1, 5) @@ -54,7 +54,7 @@ EvtScript N(EVS_UseItem) = { EVT_GOTO(1) EVT_END_IF EVT_CALL(SetDamageSource, DMG_SRC_FRIGHT_JAR) - EVT_CALL(ItemSpookEnemy, LVar0, DAMAGE_TYPE_FEAR | DAMAGE_TYPE_STATUS_ALWAYS_HITS | DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_NO_CONTACT, 0, 100, 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemSpookEnemy, LVar0, DAMAGE_TYPE_FEAR | DAMAGE_TYPE_STATUS_ALWAYS_HITS | DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_NO_CONTACT, 0, 100, 0, BS_FLAGS1_TRIGGER_EVENTS) EVT_LABEL(1) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, ITER_NO_MORE) diff --git a/src/battle/move/item/hustle_drink.c b/src/battle/move/item/hustle_drink.c index 1dee1d80f2..e78cb05d43 100644 --- a/src/battle/move/item/hustle_drink.c +++ b/src/battle/move/item/hustle_drink.c @@ -56,7 +56,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_13) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0369) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HUSTLE_WHISTLE) EVT_THREAD EVT_LOOP(2) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -106,7 +106,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_END_THREAD EVT_LOOP(10) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0369) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HUSTLE_WHISTLE) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 0, LVar0, LVar1, LVar2, 0, 0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, LVar0, LVar1, LVar2, 0, 0) EVT_WAIT(4) diff --git a/src/battle/move/item/insecticide_herb.c b/src/battle/move/item/insecticide_herb.c index baa4c3c128..3698c187eb 100644 --- a/src/battle/move/item/insecticide_herb.c +++ b/src/battle/move/item/insecticide_herb.c @@ -144,7 +144,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(N(func_802A123C_72A98C)) EVT_CALL(DeleteVirtualEntity, LVarA) EVT_IF_EQ(LVar9, 0) - EVT_CALL(ItemDamageEnemy, LVar0, 0, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar0, 0, 0, 0, BS_FLAGS1_TRIGGER_EVENTS) EVT_ELSE EVT_CALL(InitTargetIterator) EVT_CALL(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/move/item/mystery.c b/src/battle/move/item/mystery.c index a0f09fccd2..98c5636342 100644 --- a/src/battle/move/item/mystery.c +++ b/src/battle/move/item/mystery.c @@ -241,7 +241,7 @@ EvtScript N(EVS_UseItem) = { EVT_WAIT(220) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_DING) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0368) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_MYSTERY_REEL) EVT_CALL(N(func_802A13E4_72C994)) EVT_WAIT(2) EVT_IF_NE(LVar0, 133) @@ -276,7 +276,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(N(func_802A188C_72CE3C), LVar0, LVar1, LVar2) - EVT_CALL(SetBattleFlagBits, BS_FLAGS1_SP_EVT_ACTIVE, TRUE) + EVT_CALL(SetBattleFlagBits, BS_FLAGS1_TRIGGER_EVENTS, TRUE) EVT_CALL(DispatchDamagePlayerEvent, 1, EVENT_HIT) EVT_RETURN EVT_END diff --git a/src/battle/move/item/pebble.c b/src/battle/move/item/pebble.c index 2da3ad3495..90dc1919e6 100644 --- a/src/battle/move/item/pebble.c +++ b/src/battle/move/item/pebble.c @@ -83,7 +83,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 18) EVT_CALL(GetItemPower, ITEM_PEBBLE, LVar3, LVar4) EVT_CALL(ApplyShrinkFromOwner, LVar3) - EVT_CALL(ItemDamageEnemy, LVar9, DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, LVar3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar9, DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT, 0, LVar3, BS_FLAGS1_TRIGGER_EVENTS) EVT_ADD(LVar0, 60) EVT_ADD(LVar1, 0) EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 16) diff --git a/src/battle/move/item/pow_block.c b/src/battle/move/item/pow_block.c index 0c39a92c36..c54f54e7b7 100644 --- a/src/battle/move/item/pow_block.c +++ b/src/battle/move/item/pow_block.c @@ -113,7 +113,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(GetItemPower, ITEM_POW_BLOCK, LVar3, LVar4) EVT_CALL(ApplyShrinkFromOwner, LVar3) EVT_CALL(SetDamageSource, DMG_SRC_POW_BLOCK) - EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_POW | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, LVar3, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_POW | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, LVar3, BS_FLAGS1_TRIGGER_EVENTS) EVT_LABEL(1) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, ITER_NO_MORE) diff --git a/src/battle/move/item/repel_gel.c b/src/battle/move/item/repel_gel.c index d0807f017c..8de93e6757 100644 --- a/src/battle/move/item/repel_gel.c +++ b/src/battle/move/item/repel_gel.c @@ -24,14 +24,14 @@ API_CALLABLE(N(func_802A123C_72DDAC)) { EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_REPEL_GEL) EVT_EXEC_WAIT(N(UseItemWithEffect)) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0375) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_REPEL_GEL_APPLY) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_ApplyCream) EVT_WAIT(45) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 3, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0376) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_REPEL_GEL_VANISH) EVT_CALL(GetItemPower, ITEM_REPEL_GEL, LVar0, LVar1) EVT_CALL(N(func_802A123C_72DDAC)) EVT_WAIT(20) diff --git a/src/battle/move/item/shooting_star.c b/src/battle/move/item/shooting_star.c index eb0171d109..dd85f5d0ab 100644 --- a/src/battle/move/item/shooting_star.c +++ b/src/battle/move/item/shooting_star.c @@ -128,7 +128,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(N(SpawnDamageStarsFX), LVar0, LVar1, LVar2) EVT_CALL(GetItemPower, ITEM_SHOOTING_STAR, LVar0, LVar1) - EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_LABEL(1) EVT_WAIT(10) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) diff --git a/src/battle/move/item/sleepy_sheep.c b/src/battle/move/item/sleepy_sheep.c index db0f900b7e..6256dc60ef 100644 --- a/src/battle/move/item/sleepy_sheep.c +++ b/src/battle/move/item/sleepy_sheep.c @@ -295,7 +295,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(SetBattleCamZoom, 169) EVT_CALL(MoveBattleCamOver, 50) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0364) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_SHEEP_STAMPEDE) EVT_LOOP(7) EVT_CALL(StartRumble, BTL_RUMBLE_HIT_MIN) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.5)) @@ -423,7 +423,7 @@ EvtScript N(EVS_UseItem) = { EVT_END_IF EVT_CALL(GetItemPower, ITEM_SLEEPY_SHEEP, LVar0, LVar1) EVT_CALL(MakeStatusField, LVar0, STATUS_FLAG_SLEEP, 100, LVar0) - EVT_CALL(ItemAfflictEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_STATUS_ALWAYS_HITS, LVar0, 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemAfflictEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_STATUS_ALWAYS_HITS, LVar0, 0, BS_FLAGS1_TRIGGER_EVENTS) EVT_LABEL(1) EVT_WAIT(5) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) diff --git a/src/battle/move/item/snowman_doll.c b/src/battle/move/item/snowman_doll.c index b26c5f70a2..267edd364a 100644 --- a/src/battle/move/item/snowman_doll.c +++ b/src/battle/move/item/snowman_doll.c @@ -29,7 +29,7 @@ EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_SNOWMAN_DOLL) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(N(FadeBackgroundDarken)) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0363) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_WINTERY_JINGLE) EVT_THREAD EVT_LOOP(45) EVT_CALL(RandInt, 300, LVar0) @@ -80,7 +80,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(N(func_802A123C_71C06C), LVar0, LVar1, LVar2) EVT_CALL(GetItemPower, ITEM_SNOWMAN_DOLL, LVar0, LVar1) - EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_ICE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_ICE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_WAIT(5) EVT_LABEL(1) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) diff --git a/src/battle/move/item/stone_cap.c b/src/battle/move/item/stone_cap.c index 0cb6ab4515..a14b1ca358 100644 --- a/src/battle/move/item/stone_cap.c +++ b/src/battle/move/item/stone_cap.c @@ -54,12 +54,12 @@ API_CALLABLE(N(func_802A123C_7217DC)) { EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_STONE_CAP) EVT_EXEC_WAIT(N(UseItemWithEffect)) - EVT_CALL(PlaySound, SOUND_0361) + EVT_CALL(PlaySound, SOUND_PUT_ON_CAP) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_AdjustCap) EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Crouch) EVT_CALL(GetItemPower, ITEM_STONE_CAP, LVar0, LVar1) - EVT_CALL(PlaySound, SOUND_0362) + EVT_CALL(PlaySound, SOUND_BECOME_STONE) EVT_CALL(N(func_802A123C_7217DC)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_WAIT(20) diff --git a/src/battle/move/item/stop_watch.c b/src/battle/move/item/stop_watch.c index a499ff825c..94b2550ee8 100644 --- a/src/battle/move/item/stop_watch.c +++ b/src/battle/move/item/stop_watch.c @@ -35,7 +35,7 @@ EvtScript N(EVS_UseItem) = { EVT_END_IF EVT_CALL(GetItemPower, ITEM_STOP_WATCH, LVar0, LVar1) EVT_CALL(MakeStatusField, LVar0, STATUS_FLAG_STOP, 100, LVar0) - EVT_CALL(ItemAfflictEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_STATUS_ALWAYS_HITS, LVar0, 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemAfflictEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_STATUS_ALWAYS_HITS, LVar0, 0, BS_FLAGS1_TRIGGER_EVENTS) EVT_LABEL(1) EVT_WAIT(5) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) diff --git a/src/battle/move/item/strange_cake.c b/src/battle/move/item/strange_cake.c index 2f2ee9df6b..a5170f514d 100644 --- a/src/battle/move/item/strange_cake.c +++ b/src/battle/move/item/strange_cake.c @@ -306,7 +306,7 @@ EvtScript N(EVS_UseItem) = { EVT_WAIT(220) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_DING) EVT_END_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0368) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_MYSTERY_REEL) EVT_CALL(N(func_802A13E4_7316E4)) EVT_WAIT(2) EVT_SWITCH(LVar0) diff --git a/src/battle/move/item/thunder_bolt.c b/src/battle/move/item/thunder_bolt.c index 0a989d302a..8deb10da12 100644 --- a/src/battle/move/item/thunder_bolt.c +++ b/src/battle/move/item/thunder_bolt.c @@ -50,7 +50,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(MoveBattleCamOver, 20) EVT_END_THREAD EVT_CALL(N(FadeBackgroundDarken)) - EVT_CALL(PlaySound, SOUND_0365) + EVT_CALL(PlaySound, SOUND_THUNDER_BOLT) EVT_WAIT(10) EVT_CALL(InitTargetIterator) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -63,7 +63,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(StartRumble, BTL_RUMBLE_PLAYER_EXTREME) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_CALL(GetItemPower, ITEM_THUNDER_RAGE, LVar0, LVar1) - EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_LABEL(1) EVT_WAIT(5) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) diff --git a/src/battle/move/item/thunder_rage.c b/src/battle/move/item/thunder_rage.c index 87f0c97d69..4ae64fcc14 100644 --- a/src/battle/move/item/thunder_rage.c +++ b/src/battle/move/item/thunder_rage.c @@ -50,7 +50,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(MoveBattleCamOver, 20) EVT_END_CHILD_THREAD EVT_CALL(N(FadeBackgroundDarken)) - EVT_CALL(PlaySound, SOUND_0365) + EVT_CALL(PlaySound, SOUND_THUNDER_BOLT) EVT_WAIT(10) EVT_CALL(InitTargetIterator) EVT_LABEL(0) @@ -65,7 +65,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetItemPower, ITEM_THUNDER_RAGE, LVar0, LVar1) - EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_LABEL(1) EVT_WAIT(5) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) diff --git a/src/battle/move/item/volt_shroom.c b/src/battle/move/item/volt_shroom.c index ccc7b54e40..e9fe811c26 100644 --- a/src/battle/move/item/volt_shroom.c +++ b/src/battle/move/item/volt_shroom.c @@ -30,7 +30,7 @@ EvtScript N(EVS_UseItem) = { EVT_SETF(LVar3, EVT_FLOAT(1.0)) EVT_CALL(MultiplyByActorScale, LVar3) EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, LVar3, 30, 0) - EVT_CALL(PlaySound, SOUND_0379) + EVT_CALL(PlaySound, SOUND_VOLT_SHROOM_APPLY) EVT_CALL(GetItemPower, ITEM_VOLT_SHROOM, LVar0, LVar1) EVT_CALL(N(func_802A123C_71AA2C)) EVT_WAIT(20) diff --git a/src/battle/move/jump/attack.c b/src/battle/move/jump/attack.c index 1ca4417e25..1cf645b261 100644 --- a/src/battle/move/jump/attack.c +++ b/src/battle/move/jump/attack.c @@ -25,12 +25,12 @@ API_CALLABLE(N(GetJumpDamage)) { return ApiStatus_DONE2; } -extern EvtScript N(EVS_UseMove0_ImplA); -extern EvtScript N(EVS_UseMove0_ImplB); -extern EvtScript N(EVS_UseMove0_ImplC); +extern EvtScript N(EVS_UseMove_Normal); +extern EvtScript N(EVS_UseMove_Super); +extern EvtScript N(EVS_UseMove_Ultra); extern EvtScript N(EVS_UseMove_Tutorial); -EvtScript N(EVS_UseMove0) = { +EvtScript N(EVS_UseMove) = { EVT_CALL(ShowActionHud, TRUE) EVT_CALL(GetBattleFlags2, LVar0) EVT_IF_FLAG(LVar0, BS_FLAGS2_DOING_JUMP_TUTORIAL) @@ -40,24 +40,24 @@ EvtScript N(EVS_UseMove0) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) - EVT_EXEC_WAIT(N(EVS_UseMove0_ImplA)) + EVT_EXEC_WAIT(N(EVS_UseMove_Normal)) EVT_CASE_EQ(1) - EVT_EXEC_WAIT(N(EVS_UseMove0_ImplB)) + EVT_EXEC_WAIT(N(EVS_UseMove_Super)) EVT_CASE_EQ(2) - EVT_EXEC_WAIT(N(EVS_UseMove0_ImplC)) + EVT_EXEC_WAIT(N(EVS_UseMove_Ultra)) EVT_END_SWITCH EVT_RETURN EVT_END }; -EvtScript N(EVS_UseMove0_ImplA) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) +EvtScript N(EVS_UseMove_Normal) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(GetActionCommandMode, LVar0) - EVT_IF_EQ(LVar0, 2) - EVT_CALL(SetActionCommandMode, 3) + EVT_IF_EQ(LVar0, ACTION_COMMAND_MODE_TUTORIAL) + EVT_CALL(SetActionCommandMode, ACTION_COMMAND_MODE_TUTORIAL_WAIT_INPUT) EVT_LOOP(0) EVT_CALL(GetActionCommandMode, LVar0) - EVT_IF_LT(LVar0, 2) + EVT_IF_LT(LVar0, ACTION_COMMAND_MODE_TUTORIAL) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) @@ -69,26 +69,28 @@ EvtScript N(EVS_UseMove0_ImplA) = { EVT_RETURN EVT_END_IF EVT_CALL(GetActionCommandMode, LVar0) - EVT_IF_GT(LVar0, 0) + EVT_IF_GT(LVar0, ACTION_COMMAND_MODE_NOT_LEARNED) EVT_WAIT(1) EVT_END_IF EVT_CALL(GetPlayerActionSuccess, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + // missed action command, end the script here EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) + // successful action command, continue with script EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CHILD_THREAD @@ -108,15 +110,15 @@ EvtScript N(EVS_UseMove0_ImplA) = { EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 224) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_CALL(SetActionResult, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END }; -EvtScript N(EVS_UseMove0_ImplB) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) +EvtScript N(EVS_UseMove_Super) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -127,10 +129,10 @@ EvtScript N(EVS_UseMove0_ImplB) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -138,8 +140,8 @@ EvtScript N(EVS_UseMove0_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(GetActionResult, LVarF) @@ -163,15 +165,15 @@ EvtScript N(EVS_UseMove0_ImplB) = { EVT_CALL(EnablePlayerBlur, ACTOR_BLUR_RESET) EVT_WAIT(1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 224) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_CALL(SetActionResult, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END }; -EvtScript N(EVS_UseMove0_ImplC) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) +EvtScript N(EVS_UseMove_Ultra) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -182,10 +184,10 @@ EvtScript N(EVS_UseMove0_ImplC) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -193,8 +195,8 @@ EvtScript N(EVS_UseMove0_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(GetActionResult, LVarF) @@ -216,33 +218,33 @@ EvtScript N(EVS_UseMove0_ImplC) = { EVT_CALL(EnablePlayerBlur, ACTOR_BLUR_RESET) EVT_WAIT(1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 224) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_CALL(SetActionResult, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END }; -extern EvtScript N(EVS_UseMove1_ImplA); -extern EvtScript N(EVS_UseMove1_ImplB); -extern EvtScript N(EVS_UseMove1_ImplC); +extern EvtScript N(EVS_FirstStrike_Normal); +extern EvtScript N(EVS_FirstStrike_Super); +extern EvtScript N(EVS_FirstStrike_Ultra); -EvtScript N(EVS_UseMove1) = { +EvtScript N(EVS_FirstStrike) = { EVT_CALL(ShowActionHud, TRUE) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) - EVT_EXEC_WAIT(N(EVS_UseMove1_ImplA)) + EVT_EXEC_WAIT(N(EVS_FirstStrike_Normal)) EVT_CASE_EQ(1) - EVT_EXEC_WAIT(N(EVS_UseMove1_ImplB)) + EVT_EXEC_WAIT(N(EVS_FirstStrike_Super)) EVT_CASE_EQ(2) - EVT_EXEC_WAIT(N(EVS_UseMove1_ImplC)) + EVT_EXEC_WAIT(N(EVS_FirstStrike_Ultra)) EVT_END_SWITCH EVT_RETURN EVT_END }; -EvtScript N(EVS_UseMove1_ImplA) = { +EvtScript N(EVS_FirstStrike_Normal) = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 40) @@ -265,13 +267,13 @@ EvtScript N(EVS_UseMove1_ImplA) = { EVT_CALL(func_80274A18, LVarA, 0) EVT_CALL(N(GetJumpDamage)) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVarF, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVarF, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END }; -EvtScript N(EVS_UseMove1_ImplB) = { +EvtScript N(EVS_FirstStrike_Super) = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 40) @@ -288,13 +290,13 @@ EvtScript N(EVS_UseMove1_ImplB) = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(UseBattleCamPresetImmediately, BTL_CAM_PRESET_34) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 4, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 4, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END }; -EvtScript N(EVS_UseMove1_ImplC) = { +EvtScript N(EVS_FirstStrike_Ultra) = { EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) EVT_SUB(LVar3, 40) @@ -309,33 +311,33 @@ EvtScript N(EVS_UseMove1_ImplC) = { EVT_SET(LVarA, 4) EVT_CALL(func_80275F00, LVarA, 1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END }; -extern EvtScript N(EVS_UseMove2_ImplA); -extern EvtScript N(EVS_UseMove2_ImplB); -extern EvtScript N(EVS_UseMove2_ImplC); +extern EvtScript N(EVS_UseBerserker_Normal); +extern EvtScript N(EVS_UseBerserker_Super); +extern EvtScript N(EVS_UseBerserker_Ultra); -EvtScript N(EVS_UseMove2) = { +EvtScript N(EVS_UseBerserker) = { EVT_CALL(ShowActionHud, TRUE) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) - EVT_EXEC_WAIT(N(EVS_UseMove2_ImplA)) + EVT_EXEC_WAIT(N(EVS_UseBerserker_Normal)) EVT_CASE_EQ(1) - EVT_EXEC_WAIT(N(EVS_UseMove2_ImplB)) + EVT_EXEC_WAIT(N(EVS_UseBerserker_Super)) EVT_CASE_EQ(2) - EVT_EXEC_WAIT(N(EVS_UseMove2_ImplC)) + EVT_EXEC_WAIT(N(EVS_UseBerserker_Ultra)) EVT_END_SWITCH EVT_RETURN EVT_END }; -EvtScript N(EVS_UseMove2_ImplA) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) +EvtScript N(EVS_UseBerserker_Normal) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -346,10 +348,10 @@ EvtScript N(EVS_UseMove2_ImplA) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -357,8 +359,8 @@ EvtScript N(EVS_UseMove2_ImplA) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CHILD_THREAD @@ -378,15 +380,15 @@ EvtScript N(EVS_UseMove2_ImplA) = { EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 224) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_CALL(SetActionResult, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END }; -EvtScript N(EVS_UseMove2_ImplB) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) +EvtScript N(EVS_UseBerserker_Super) = { + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -397,10 +399,10 @@ EvtScript N(EVS_UseMove2_ImplB) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -408,8 +410,8 @@ EvtScript N(EVS_UseMove2_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(GetActionResult, LVarF) @@ -433,17 +435,17 @@ EvtScript N(EVS_UseMove2_ImplB) = { EVT_CALL(EnablePlayerBlur, ACTOR_BLUR_RESET) EVT_WAIT(1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 224) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_CALL(SetActionResult, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN EVT_END }; -EvtScript N(EVS_UseMove2_ImplC) = { +EvtScript N(EVS_UseBerserker_Ultra) = { EVT_CALL(InitTargetIterator) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -454,10 +456,10 @@ EvtScript N(EVS_UseMove2_ImplC) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -465,8 +467,8 @@ EvtScript N(EVS_UseMove2_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(GetActionResult, LVarF) @@ -488,7 +490,7 @@ EvtScript N(EVS_UseMove2_ImplC) = { EVT_CALL(EnablePlayerBlur, ACTOR_BLUR_RESET) EVT_WAIT(1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 224) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_CALL(SetActionResult, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -498,7 +500,7 @@ EvtScript N(EVS_UseMove2_ImplC) = { EvtScript N(EVS_UseMove_Tutorial) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) - EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Approach)) EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) EVT_CALL(action_command_jump_start, LVarA, 3) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) @@ -530,10 +532,10 @@ EvtScript N(EVS_UseMove_Tutorial) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -541,8 +543,8 @@ EvtScript N(EVS_UseMove_Tutorial) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CHILD_THREAD @@ -562,7 +564,7 @@ EvtScript N(EVS_UseMove_Tutorial) = { EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 224) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_CALL(SetActionResult, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN diff --git a/src/battle/move/jump/auto_jump.c b/src/battle/move/jump/auto_jump.c index 4d8c79740e..0698d5051b 100644 --- a/src/battle/move/jump/auto_jump.c +++ b/src/battle/move/jump/auto_jump.c @@ -29,7 +29,7 @@ EvtScript N(EVS_UseMove) = { }; EvtScript N(EVS_UseMove_ImplA) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(GetActionCommandMode, LVar0) EVT_IF_EQ(LVar0, 2) EVT_CALL(SetActionCommandMode, 3) @@ -51,10 +51,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -62,8 +62,8 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CHILD_THREAD @@ -83,7 +83,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 224) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_CALL(SetActionResult, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -91,7 +91,7 @@ EvtScript N(EVS_UseMove_ImplA) = { }; EvtScript N(EVS_UseMove_ImplB) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -102,10 +102,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -113,8 +113,8 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(GetActionResult, LVarF) @@ -138,7 +138,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(EnablePlayerBlur, ACTOR_BLUR_DISABLE) EVT_WAIT(1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, 224) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 2, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_CALL(SetActionResult, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -146,7 +146,7 @@ EvtScript N(EVS_UseMove_ImplB) = { }; EvtScript N(EVS_UseMove_ImplC) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -157,10 +157,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -168,8 +168,8 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(GetActionResult, LVarF) @@ -191,7 +191,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(EnablePlayerBlur, ACTOR_BLUR_DISABLE) EVT_WAIT(1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 224) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_CALL(SetActionResult, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN diff --git a/src/battle/move/jump/auto_multibounce.c b/src/battle/move/jump/auto_multibounce.c index 97e858632b..0521c45d19 100644 --- a/src/battle/move/jump/auto_multibounce.c +++ b/src/battle/move/jump/auto_multibounce.c @@ -28,7 +28,7 @@ EvtScript N(EVS_UseMove) = { }; EvtScript N(EVS_UseMove_ImplA) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -45,14 +45,14 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_ELSE EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_END_IF EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_SWITCH(LVar0) @@ -65,8 +65,8 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -112,18 +112,18 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_ELSE EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 240) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_END_IF EVT_CASE_DEFAULT EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_ELSE EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 240) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_END_IF EVT_END_SWITCH EVT_SWITCH(LVarF) @@ -170,7 +170,7 @@ EvtScript N(EVS_UseMove_ImplA) = { }; EvtScript N(EVS_UseMove_ImplB) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -187,14 +187,14 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_ELSE EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_END_IF EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_SWITCH(LVar0) @@ -207,8 +207,8 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -259,18 +259,18 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_ELSE EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 240) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_END_IF EVT_CASE_DEFAULT EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_ELSE EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 240) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_END_IF EVT_END_SWITCH EVT_SWITCH(LVarF) @@ -317,7 +317,7 @@ EvtScript N(EVS_UseMove_ImplB) = { }; EvtScript N(EVS_UseMove_ImplC) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -334,14 +334,14 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_ELSE EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_END_IF EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_SWITCH(LVar0) @@ -354,8 +354,8 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -399,18 +399,18 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_ELSE EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 240) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_END_IF EVT_CASE_DEFAULT EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_ELSE EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 240) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_END_IF EVT_END_SWITCH EVT_SWITCH(LVarF) diff --git a/src/battle/move/jump/d_down_jump.c b/src/battle/move/jump/d_down_jump.c index 0c575b399d..526d51960d 100644 --- a/src/battle/move/jump/d_down_jump.c +++ b/src/battle/move/jump/d_down_jump.c @@ -44,7 +44,7 @@ EvtScript N(EVS_UseMove) = { }; EvtScript N(EVS_UseMove_ImplA) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -60,10 +60,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_ACTOR_JUMPED_1) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 1, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 1, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -71,8 +71,8 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CHILD_THREAD @@ -95,7 +95,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_D_DOWN_HIT_1) EVT_WAIT(1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 1, 224) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_CALL(SetActionResult, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -103,7 +103,7 @@ EvtScript N(EVS_UseMove_ImplA) = { }; EvtScript N(EVS_UseMove_ImplB) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -117,10 +117,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 2, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 2, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -128,8 +128,8 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(GetActionResult, LVarF) @@ -156,7 +156,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_D_DOWN_HIT_2) EVT_WAIT(1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 2, 224) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 2, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_CALL(SetActionResult, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -164,7 +164,7 @@ EvtScript N(EVS_UseMove_ImplB) = { }; EvtScript N(EVS_UseMove_ImplC) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -178,10 +178,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 3, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 3, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -189,8 +189,8 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(GetActionResult, LVarF) @@ -215,7 +215,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_D_DOWN_HIT_3) EVT_WAIT(1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 3, 224) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 3, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_CALL(SetActionResult, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN diff --git a/src/battle/move/jump/demo_power_bounce.c b/src/battle/move/jump/demo_power_bounce.c index 5094362ae9..867fd5c0d3 100644 --- a/src/battle/move/jump/demo_power_bounce.c +++ b/src/battle/move/jump/demo_power_bounce.c @@ -64,7 +64,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) - EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Approach)) EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) EVT_CALL(action_command_jump_start, LVarA, 1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) @@ -81,10 +81,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -92,8 +92,8 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CHILD_THREAD @@ -182,8 +182,8 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -200,7 +200,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) - EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Approach)) EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) EVT_CALL(action_command_jump_start, LVarA, 1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) @@ -217,10 +217,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -228,8 +228,8 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(GetActionResult, LVarE) @@ -318,8 +318,8 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -336,7 +336,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) - EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Approach)) EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) EVT_CALL(action_command_jump_start, LVarA, 1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) @@ -353,10 +353,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -364,8 +364,8 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(GetActionResult, LVarE) @@ -450,8 +450,8 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN diff --git a/src/battle/move/jump/dizzy_stomp.c b/src/battle/move/jump/dizzy_stomp.c index 668a196d0e..6b304fbd7f 100644 --- a/src/battle/move/jump/dizzy_stomp.c +++ b/src/battle/move/jump/dizzy_stomp.c @@ -27,7 +27,7 @@ EvtScript N(EVS_UseMove) = { }; EvtScript N(EVS_UseMove_ImplA) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -38,10 +38,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 75), 1, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 75), 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 75), 1, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 75), 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -49,8 +49,8 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CHILD_THREAD @@ -70,7 +70,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 100), 1, 224) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 100), 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_CALL(SetActionResult, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -78,7 +78,7 @@ EvtScript N(EVS_UseMove_ImplA) = { }; EvtScript N(EVS_UseMove_ImplB) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -89,10 +89,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 75), 2, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 75), 2, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 75), 2, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 75), 2, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -100,8 +100,8 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(GetActionResult, LVarF) @@ -125,7 +125,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(EnablePlayerBlur, ACTOR_BLUR_DISABLE) EVT_WAIT(1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 100), 2, 224) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 100), 2, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_CALL(SetActionResult, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -133,7 +133,7 @@ EvtScript N(EVS_UseMove_ImplB) = { }; EvtScript N(EVS_UseMove_ImplC) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -144,10 +144,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 75), 3, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 75), 3, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 75), 3, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 75), 3, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -155,8 +155,8 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(GetActionResult, LVarF) @@ -178,7 +178,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(EnablePlayerBlur, ACTOR_BLUR_DISABLE) EVT_WAIT(1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 100), 3, 224) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_DIZZY, 3, 100), 3, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_CALL(SetActionResult, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN diff --git a/src/battle/move/jump/earthquake_jump.c b/src/battle/move/jump/earthquake_jump.c index f81b815603..33184c494e 100644 --- a/src/battle/move/jump/earthquake_jump.c +++ b/src/battle/move/jump/earthquake_jump.c @@ -100,10 +100,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVarB) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, 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_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, 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_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_LABEL(2) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) @@ -118,8 +118,8 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CHILD_THREAD @@ -204,14 +204,14 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, 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_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_NICE_HIT) EVT_ELSE EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, 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_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_END_IF EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, 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_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) @@ -243,8 +243,8 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -320,10 +320,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVarB) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, 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_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, 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_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_LABEL(2) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) @@ -338,8 +338,8 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CHILD_THREAD @@ -430,14 +430,14 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, 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_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_NICE_HIT) EVT_ELSE EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, 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_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_END_IF EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, 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_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) @@ -469,8 +469,8 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -546,10 +546,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVarB) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, 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_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, 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_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_LABEL(2) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) @@ -564,8 +564,8 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CHILD_THREAD @@ -652,14 +652,14 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, 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_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_NICE_HIT) EVT_ELSE EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, 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_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_END_IF EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, 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_CALL(PlayerDamageEnemy, LVarC, DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_EQ(0) @@ -691,8 +691,8 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN diff --git a/src/battle/move/jump/jump_charge_0.c b/src/battle/move/jump/jump_charge_0.c index 8d9d441de0..360073b763 100644 --- a/src/battle/move/jump/jump_charge_0.c +++ b/src/battle/move/jump/jump_charge_0.c @@ -74,7 +74,7 @@ EvtScript N(EVS_UseMove0) = { EVT_CALL(N(func_802A1108_74D678), LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_CHARGE_UP) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_PLAYER_JUMP) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_LONG_PLAYER_JUMP) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) diff --git a/src/battle/move/jump/jump_charge_1.c b/src/battle/move/jump/jump_charge_1.c index 5cd7eb588d..c1436c4b38 100644 --- a/src/battle/move/jump/jump_charge_1.c +++ b/src/battle/move/jump/jump_charge_1.c @@ -83,7 +83,7 @@ EvtScript N(EVS_UseMove0) = { EVT_CALL(N(func_802A1108_74D678), LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_CHARGE_UP) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_PLAYER_JUMP) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_LONG_PLAYER_JUMP) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) diff --git a/src/battle/move/jump/jump_charge_2.c b/src/battle/move/jump/jump_charge_2.c index ce10a429d6..d45d4f76fe 100644 --- a/src/battle/move/jump/jump_charge_2.c +++ b/src/battle/move/jump/jump_charge_2.c @@ -83,7 +83,7 @@ EvtScript N(EVS_UseMove0) = { EVT_CALL(N(func_802A1108_74D678), LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_CHARGE_UP) EVT_WAIT(4) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_PLAYER_JUMP) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_LONG_PLAYER_JUMP) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) diff --git a/src/battle/move/jump/mega_jump.c b/src/battle/move/jump/mega_jump.c index 3827c5baa0..26e9074e9c 100644 --- a/src/battle/move/jump/mega_jump.c +++ b/src/battle/move/jump/mega_jump.c @@ -46,7 +46,7 @@ EvtScript N(EVS_PlayQuakeFX) = { }; EvtScript N(EVS_UseMove_Basic) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -58,10 +58,10 @@ EvtScript N(EVS_UseMove_Basic) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 5, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 5, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_GT(HIT_RESULT_HIT) @@ -74,7 +74,7 @@ EvtScript N(EVS_UseMove_Basic) = { }; EvtScript N(EVS_UseMove_Super) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -86,10 +86,10 @@ EvtScript N(EVS_UseMove_Super) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 8, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 8, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_GT(HIT_RESULT_HIT) @@ -102,7 +102,7 @@ EvtScript N(EVS_UseMove_Super) = { }; EvtScript N(EVS_UseMove_Ultra) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -114,10 +114,10 @@ EvtScript N(EVS_UseMove_Ultra) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 10, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 10, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 7, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 7, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_GT(HIT_RESULT_HIT) diff --git a/src/battle/move/jump/multibounce.c b/src/battle/move/jump/multibounce.c index 27cb8e9306..c6dbb0e5ce 100644 --- a/src/battle/move/jump/multibounce.c +++ b/src/battle/move/jump/multibounce.c @@ -35,7 +35,7 @@ EvtScript N(EVS_UseMove_Basic) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) - EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Approach)) EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) EVT_CALL(action_command_jump_start, LVarA, 1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) @@ -55,17 +55,17 @@ EvtScript N(EVS_UseMove_Basic) = { EVT_WAIT(1) EVT_CALL(GetPlayerActionSuccess, LVar0) EVT_SWITCH(LVar0) - EVT_CASE_GT(FALSE) - EVT_IF_EQ(LFlag0, FALSE) + EVT_CASE_GT(0) + EVT_IF_FALSE(LFlag0) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_ELSE EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_END_IF EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_SWITCH(LVar0) @@ -78,8 +78,8 @@ EvtScript N(EVS_UseMove_Basic) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -125,18 +125,18 @@ EvtScript N(EVS_UseMove_Basic) = { EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_ELSE EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 240) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_END_IF EVT_CASE_DEFAULT EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_ELSE EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, 240) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_END_IF EVT_END_SWITCH EVT_SWITCH(LVarF) @@ -186,7 +186,7 @@ EvtScript N(EVS_UseMove_Super) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) - EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Approach)) EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) EVT_CALL(action_command_jump_start, LVarA, 1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) @@ -209,14 +209,14 @@ EvtScript N(EVS_UseMove_Super) = { EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_ELSE EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_END_IF EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_SWITCH(LVar0) @@ -229,8 +229,8 @@ EvtScript N(EVS_UseMove_Super) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -281,18 +281,18 @@ EvtScript N(EVS_UseMove_Super) = { EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_ELSE EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 240) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_END_IF EVT_CASE_DEFAULT EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_ELSE EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, 240) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_END_IF EVT_END_SWITCH EVT_SWITCH(LVarF) @@ -342,7 +342,7 @@ EvtScript N(EVS_UseMove_Ultra) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) - EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Approach)) EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) EVT_CALL(action_command_jump_start, LVarA, 1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) @@ -365,14 +365,14 @@ EvtScript N(EVS_UseMove_Ultra) = { EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_ELSE EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_END_IF EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) EVT_SWITCH(LVar0) @@ -385,8 +385,8 @@ EvtScript N(EVS_UseMove_Ultra) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -430,18 +430,18 @@ EvtScript N(EVS_UseMove_Ultra) = { EVT_CASE_GT(FALSE) EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_ELSE EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 240) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_END_IF EVT_CASE_DEFAULT EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_ELSE EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, 240) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_MULTI_BOUNCE | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_END_IF EVT_END_SWITCH EVT_SWITCH(LVarF) diff --git a/src/battle/move/jump/power_bounce.c b/src/battle/move/jump/power_bounce.c index fdb01afe8d..78b22928ea 100644 --- a/src/battle/move/jump/power_bounce.c +++ b/src/battle/move/jump/power_bounce.c @@ -83,7 +83,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) - EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Approach)) EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) EVT_CALL(action_command_jump_start, LVarA, 1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) @@ -100,10 +100,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -111,8 +111,8 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CHILD_THREAD @@ -127,96 +127,96 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SET(LVarF, 0) EVT_SET(LFlag0, FALSE) EVT_LABEL(10) - EVT_CHILD_THREAD - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) - EVT_WAIT(5) + EVT_CHILD_THREAD + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_27) + EVT_WAIT(5) + EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) + EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) + EVT_END_CHILD_THREAD + EVT_CALL(CloseActionCommandInfo) + EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) + EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) + EVT_CALL(action_command_jump_init) + EVT_SET(LVarA, 24) + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(action_command_jump_start, LVarA, 1) + EVT_CASE_EQ(1) + EVT_CALL(action_command_jump_start, LVarA, 2) + EVT_CASE_EQ(2) + EVT_CALL(action_command_jump_start, LVarA, 3) + EVT_CASE_EQ(3) + EVT_CALL(action_command_jump_start, LVarA, 4) + EVT_CASE_DEFAULT + EVT_CALL(action_command_jump_start, LVarA, 5) + EVT_END_SWITCH + EVT_SUB(LVarD, 1) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_35) - EVT_END_CHILD_THREAD - EVT_CALL(CloseActionCommandInfo) - EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) - EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) - EVT_CALL(action_command_jump_init) - EVT_SET(LVarA, 24) - EVT_SWITCH(LVarF) - EVT_CASE_EQ(0) - EVT_CALL(action_command_jump_start, LVarA, 1) - EVT_CASE_EQ(1) - EVT_CALL(action_command_jump_start, LVarA, 2) - EVT_CASE_EQ(2) - EVT_CALL(action_command_jump_start, LVarA, 3) - EVT_CASE_EQ(3) - EVT_CALL(action_command_jump_start, LVarA, 4) - EVT_CASE_DEFAULT - EVT_CALL(action_command_jump_start, LVarA, 5) - EVT_END_SWITCH - EVT_SUB(LVarD, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) - EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_IF_EQ(LVarF, 0) - EVT_CALL(func_80274A18, 24, 3) - EVT_ELSE - EVT_CALL(func_80274A18, 24, 4) - EVT_END_IF - EVT_CALL(GetCommandAutoSuccess, LVar1) - EVT_IF_EQ(LVar1, 1) - EVT_IF_GE(LVarF, 3) + EVT_IF_EQ(LVarF, 0) + EVT_CALL(func_80274A18, 24, 3) + EVT_ELSE + EVT_CALL(func_80274A18, 24, 4) + EVT_END_IF + EVT_CALL(GetCommandAutoSuccess, LVar1) + EVT_IF_EQ(LVar1, 1) + EVT_IF_GE(LVarF, 3) + EVT_SET(LFlag0, TRUE) + EVT_END_IF + EVT_END_IF + EVT_CALL(N(GetHitChance)) + EVT_IF_GE(LVarF, LVar0) EVT_SET(LFlag0, TRUE) EVT_END_IF - EVT_END_IF - EVT_CALL(N(GetHitChance)) - EVT_IF_GE(LVarF, LVar0) - EVT_SET(LFlag0, TRUE) - EVT_END_IF - EVT_WAIT(1) - EVT_CALL(GetPlayerActionSuccess, LVar0) - EVT_SWITCH(LVar0) - EVT_CASE_GT(FALSE) - EVT_IF_EQ(LFlag0, FALSE) + EVT_WAIT(1) + EVT_CALL(GetPlayerActionSuccess, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GT(0) + EVT_IF_EQ(LFlag0, FALSE) + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) + EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, BS_FLAGS1_NICE_HIT) + EVT_ELSE + EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) + EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) + EVT_END_IF + EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, BS_FLAGS1_40) - EVT_ELSE - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_40 | BS_FLAGS1_80) - EVT_END_IF - EVT_CASE_DEFAULT - EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, BS_FLAGS1_SP_EVT_ACTIVE) - EVT_END_SWITCH - EVT_SWITCH(LVarF) - EVT_CASE_EQ(0) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) - EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_2) - EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_3) - EVT_CASE_EQ(3) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) - EVT_CASE_DEFAULT - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) - EVT_END_SWITCH - EVT_CALL(SetActionResult, LVarE) - EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(HIT_RESULT_HIT) - EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) - EVT_IF_EQ(LFlag0, TRUE) - EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_CALL(PlayerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, LVarD, BS_FLAGS1_TRIGGER_EVENTS) + EVT_END_SWITCH + EVT_SWITCH(LVarF) + EVT_CASE_EQ(0) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_1) + EVT_CASE_EQ(1) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_2) + EVT_CASE_EQ(2) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_3) + EVT_CASE_EQ(3) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) + EVT_CASE_DEFAULT + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_JUMP_COMBO_4) + EVT_END_SWITCH + EVT_CALL(SetActionResult, LVarE) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(HIT_RESULT_HIT) + EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) + EVT_IF_EQ(LFlag0, TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN - EVT_END_IF - EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) - EVT_RETURN - EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) - EVT_IF_EQ(LFlag0, TRUE) - EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) - EVT_RETURN - EVT_END_IF - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_ADD(LVarF, 1) - EVT_CALL(N(IncrementHitCounter)) - EVT_GOTO(10) + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) + EVT_IF_EQ(LFlag0, TRUE) + EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) + EVT_RETURN + EVT_END_IF + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_ADD(LVarF, 1) + EVT_CALL(N(IncrementHitCounter)) + EVT_GOTO(10) EVT_RETURN EVT_END }; @@ -225,7 +225,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) - EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Approach)) EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) EVT_CALL(action_command_jump_start, LVarA, 1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) @@ -242,10 +242,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -253,8 +253,8 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(GetActionResult, LVarE) @@ -348,8 +348,8 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -367,7 +367,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) EVT_CALL(action_command_jump_init) EVT_CALL(SetActionDifficultyTable, EVT_PTR(N(DifficultyTable))) - EVT_EXEC_WAIT(N(EVS_JumpSupport_A)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_Approach)) EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) EVT_CALL(action_command_jump_start, LVarA, 1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) @@ -384,10 +384,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVarC, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -395,8 +395,8 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(GetActionResult, LVarE) @@ -486,8 +486,8 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN diff --git a/src/battle/move/jump/power_jump.c b/src/battle/move/jump/power_jump.c index 6fc5c5ec06..290a1abee0 100644 --- a/src/battle/move/jump/power_jump.c +++ b/src/battle/move/jump/power_jump.c @@ -40,7 +40,7 @@ EvtScript N(EVS_802A26B4) = { }; EvtScript N(EVS_UseMove_ImplA) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -52,10 +52,10 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 4, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 4, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 3, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_GT(HIT_RESULT_HIT) @@ -68,7 +68,7 @@ EvtScript N(EVS_UseMove_ImplA) = { }; EvtScript N(EVS_UseMove_ImplB) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -80,10 +80,10 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 4, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 4, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_GT(HIT_RESULT_HIT) @@ -96,7 +96,7 @@ EvtScript N(EVS_UseMove_ImplB) = { }; EvtScript N(EVS_UseMove_ImplC) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -108,10 +108,10 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 8, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 8, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 5, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 5, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_GT(HIT_RESULT_HIT) diff --git a/src/battle/move/jump/shrink_stomp.c b/src/battle/move/jump/shrink_stomp.c index 5a1eb621b2..8ed081e13c 100644 --- a/src/battle/move/jump/shrink_stomp.c +++ b/src/battle/move/jump/shrink_stomp.c @@ -27,7 +27,7 @@ EvtScript N(EVS_UseMove) = { }; EvtScript N(EVS_UseMove_Basic) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -38,10 +38,10 @@ EvtScript N(EVS_UseMove_Basic) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 75), 1, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 75), 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 75), 1, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 75), 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -49,8 +49,8 @@ EvtScript N(EVS_UseMove_Basic) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CHILD_THREAD @@ -70,7 +70,7 @@ EvtScript N(EVS_UseMove_Basic) = { EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_ACTOR_JUMPED_1) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 100), 1, 224) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 100), 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_CALL(SetActionResult, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -78,7 +78,7 @@ EvtScript N(EVS_UseMove_Basic) = { }; EvtScript N(EVS_UseMove_Super) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -89,10 +89,10 @@ EvtScript N(EVS_UseMove_Super) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_ACTOR_JUMPED_2) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 75), 2, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 75), 2, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_ACTOR_JUMPED_2) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 75), 2, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 75), 2, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -100,8 +100,8 @@ EvtScript N(EVS_UseMove_Super) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(GetActionResult, LVarF) @@ -125,7 +125,7 @@ EvtScript N(EVS_UseMove_Super) = { EVT_CALL(EnablePlayerBlur, ACTOR_BLUR_DISABLE) EVT_WAIT(1) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_ACTOR_JUMPED_2) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 100), 2, 224) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 100), 2, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_CALL(SetActionResult, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -133,7 +133,7 @@ EvtScript N(EVS_UseMove_Super) = { }; EvtScript N(EVS_UseMove_Ultra) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -144,10 +144,10 @@ EvtScript N(EVS_UseMove_Ultra) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_ACTOR_JUMPED_3) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 75), 3, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 75), 3, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_ACTOR_JUMPED_3) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 75), 3, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 75), 3, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -155,8 +155,8 @@ EvtScript N(EVS_UseMove_Ultra) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(GetActionResult, LVarF) @@ -178,7 +178,7 @@ EvtScript N(EVS_UseMove_Ultra) = { EVT_CALL(EnablePlayerBlur, ACTOR_BLUR_DISABLE) EVT_WAIT(1) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_ACTOR_JUMPED_3) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 100), 3, 224) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SHRINK, 3, 100), 3, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_CALL(SetActionResult, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN diff --git a/src/battle/move/jump/sleep_stomp.c b/src/battle/move/jump/sleep_stomp.c index a313b527ab..48812a8943 100644 --- a/src/battle/move/jump/sleep_stomp.c +++ b/src/battle/move/jump/sleep_stomp.c @@ -27,7 +27,7 @@ EvtScript N(EVS_UseMove) = { }; EvtScript N(EVS_UseMove_Basic) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -38,10 +38,10 @@ EvtScript N(EVS_UseMove_Basic) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 75), 1, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 75), 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 75), 1, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 75), 1, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -49,8 +49,8 @@ EvtScript N(EVS_UseMove_Basic) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CHILD_THREAD @@ -70,7 +70,7 @@ EvtScript N(EVS_UseMove_Basic) = { EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 100), 1, 224) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 100), 1, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_CALL(SetActionResult, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -78,7 +78,7 @@ EvtScript N(EVS_UseMove_Basic) = { }; EvtScript N(EVS_UseMove_Super) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -89,10 +89,10 @@ EvtScript N(EVS_UseMove_Super) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 75), 2, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 75), 2, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 75), 2, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 75), 2, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -100,8 +100,8 @@ EvtScript N(EVS_UseMove_Super) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(GetActionResult, LVarF) @@ -125,7 +125,7 @@ EvtScript N(EVS_UseMove_Super) = { EVT_CALL(EnablePlayerBlur, ACTOR_BLUR_DISABLE) EVT_WAIT(1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 100), 2, 224) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 100), 2, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_CALL(SetActionResult, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN @@ -133,7 +133,7 @@ EvtScript N(EVS_UseMove_Super) = { }; EvtScript N(EVS_UseMove_Ultra) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -144,10 +144,10 @@ EvtScript N(EVS_UseMove_Ultra) = { EVT_SWITCH(LVar0) EVT_CASE_GT(FALSE) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 75), 3, 80) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 75), 3, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 75), 3, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 75), 3, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -155,8 +155,8 @@ EvtScript N(EVS_UseMove_Ultra) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_G)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(GetActionResult, LVarF) @@ -178,7 +178,7 @@ EvtScript N(EVS_UseMove_Ultra) = { EVT_CALL(EnablePlayerBlur, ACTOR_BLUR_DISABLE) EVT_WAIT(1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 100), 3, 224) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 100), 3, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT | BS_FLAGS1_NO_RATING) EVT_CALL(SetActionResult, LVarF) EVT_EXEC_WAIT(N(EVS_JumpSupport_E)) EVT_RETURN diff --git a/src/battle/move/jump/super_jump.c b/src/battle/move/jump/super_jump.c index 8d005ef7a6..f78e18f135 100644 --- a/src/battle/move/jump/super_jump.c +++ b/src/battle/move/jump/super_jump.c @@ -42,7 +42,7 @@ EvtScript N(EVS_802A26B4) = { }; EvtScript N(EVS_UseMove_ImplA) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -52,12 +52,12 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_WAIT(1) EVT_CALL(GetPlayerActionSuccess, LVar0) EVT_SWITCH(LVar0) - EVT_CASE_GT(FALSE) + EVT_CASE_GT(0) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 5, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 5, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_1, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 4, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 4, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_GT(HIT_RESULT_HIT) @@ -70,7 +70,7 @@ EvtScript N(EVS_UseMove_ImplA) = { }; EvtScript N(EVS_UseMove_ImplB) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -80,12 +80,12 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_WAIT(1) EVT_CALL(GetPlayerActionSuccess, LVar0) EVT_SWITCH(LVar0) - EVT_CASE_GT(FALSE) + EVT_CASE_GT(0) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 7, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 7, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_2, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 5, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 5, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_GT(HIT_RESULT_HIT) @@ -98,7 +98,7 @@ EvtScript N(EVS_UseMove_ImplB) = { }; EvtScript N(EVS_UseMove_ImplC) = { - EVT_EXEC_WAIT(N(EVS_JumpSupport_K)) + EVT_EXEC_WAIT(N(EVS_JumpSupport_InitCommand)) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_EXEC_WAIT(N(EVS_JumpSupport_Miss)) @@ -107,12 +107,12 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_WAIT(1) EVT_CALL(GetPlayerActionSuccess, LVar0) EVT_SWITCH(LVar0) - EVT_CASE_GT(FALSE) + EVT_CASE_GT(0) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 9, 112) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 9, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_ACTOR_JUMPED_3, SOUND_NONE) - EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, 48) + EVT_CALL(PlayerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 6, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_GT(HIT_RESULT_HIT) diff --git a/src/battle/move/star_power/chill_out.c b/src/battle/move/star_power/chill_out.c index 9121359f24..e2c92f291b 100644 --- a/src/battle/move/star_power/chill_out.c +++ b/src/battle/move/star_power/chill_out.c @@ -38,7 +38,7 @@ API_CALLABLE(N(SpawnChillOutFX)) { API_CALLABLE(N(CanChillOutHit)) { Actor* actor = get_actor(script->owner1.actorID); Actor* target = get_actor(actor->targetActorID); - ActorPart* part = get_actor_part(target, actor->targetPartIndex); + ActorPart* part = get_actor_part(target, actor->targetPartID); script->varTable[0] = FALSE; @@ -69,7 +69,7 @@ API_CALLABLE(N(CanChillOutHit)) { API_CALLABLE(N(InflictChillOutHit)) { Actor* enemy = get_actor(script->owner1.enemyID); Actor* target = get_actor(enemy->targetActorID); - ActorPart* targetPart = get_actor_part(target, enemy->targetPartIndex); + ActorPart* targetPart = get_actor_part(target, enemy->targetPartID); f32 x, y, z; if (target->flags & ACTOR_FLAG_TARGET_ONLY) { @@ -178,7 +178,7 @@ EvtScript N(EVS_UsePower) = { EVT_IF_EQ(LVar0, TRUE) EVT_CALL(N(InflictChillOutHit)) EVT_ELSE - EVT_CALL(PlayerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 0, BS_FLAGS1_FORCE_HIT_IMMUNE | BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(PlayerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 0, BS_FLAGS1_FORCE_IMMUNE_HIT | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_IF EVT_LABEL(1) EVT_WAIT(5) diff --git a/src/battle/move/star_power/focus.c b/src/battle/move/star_power/focus.c index b4037cde0f..c851fa1433 100644 --- a/src/battle/move/star_power/focus.c +++ b/src/battle/move/star_power/focus.c @@ -19,17 +19,17 @@ API_CALLABLE(N(RestoreStarPowerFromPlayer)) { script->varTable[0] = RESTORE_NOT_FULL; - if (playerData->specialBarsFilled >= playerData->maxStarPower * 256) { + if (playerData->starPower >= playerData->maxStarPower * SP_PER_BAR) { script->varTable[0] = RESTORE_ALREADY_FULL; return ApiStatus_DONE2; } - deepFocusSP = is_ability_active(ABILITY_DEEP_FOCUS) * 64; - superFocusSP = is_ability_active(ABILITY_SUPER_FOCUS) * 128; + deepFocusSP = is_ability_active(ABILITY_DEEP_FOCUS) * SP_PER_SEG * 2; + superFocusSP = is_ability_active(ABILITY_SUPER_FOCUS) * SP_PER_SEG * 4; - add_SP(deepFocusSP + superFocusSP + 128); + add_star_power(deepFocusSP + superFocusSP + SP_PER_SEG * 4); - if (playerData->specialBarsFilled == playerData->maxStarPower * 256) { + if (playerData->starPower == playerData->maxStarPower * SP_PER_BAR) { script->varTable[0] = RESTORE_NOW_FULL; } @@ -41,14 +41,14 @@ API_CALLABLE(N(RestoreStarPowerFromPartner)) { script->varTable[0] = RESTORE_NOT_FULL; - if (playerData->specialBarsFilled >= playerData->maxStarPower * 256) { + if (playerData->starPower >= playerData->maxStarPower * SP_PER_BAR) { script->varTable[0] = RESTORE_ALREADY_FULL; return ApiStatus_DONE2; } - add_SP(128); + add_star_power(SP_PER_SEG * 4); - if (playerData->specialBarsFilled == playerData->maxStarPower * 256) { + if (playerData->starPower == playerData->maxStarPower * SP_PER_BAR) { script->varTable[0] = RESTORE_NOW_FULL; } diff --git a/src/battle/move/star_power/lullaby.c b/src/battle/move/star_power/lullaby.c index 2dc569911b..0b7f6cc837 100644 --- a/src/battle/move/star_power/lullaby.c +++ b/src/battle/move/star_power/lullaby.c @@ -52,7 +52,7 @@ EvtScript N(EVS_UsePower) = { EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_GOTO(1) EVT_END_IF - EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 100), 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, DMG_STATUS_KEY(STATUS_FLAG_SLEEP, 3, 100), 0, BS_FLAGS1_TRIGGER_EVENTS) EVT_LABEL(1) EVT_WAIT(5) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) diff --git a/src/battle/move/star_power/peach_beam.c b/src/battle/move/star_power/peach_beam.c index ae4bb923d8..36d678cfa5 100644 --- a/src/battle/move/star_power/peach_beam.c +++ b/src/battle/move/star_power/peach_beam.c @@ -27,7 +27,7 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_PEACH_BEAM | DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_PEACH_BEAM | DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, 0, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, ITER_NO_MORE) EVT_GOTO(0) diff --git a/src/battle/move/star_power/peach_focus.c b/src/battle/move/star_power/peach_focus.c index 8e2b03b28e..4bbeb18224 100644 --- a/src/battle/move/star_power/peach_focus.c +++ b/src/battle/move/star_power/peach_focus.c @@ -8,8 +8,8 @@ #include "battle/common/move/StarPowerSupport.inc.c" enum N(ActorVars) { - AVAR_Unk_0 = 0, - AVAR_Unk_1 = 1, + AVAR_Twink_PowerLevel = 0, + AVAR_Twink_DefensePtr = 1, }; API_CALLABLE(N(IncreaseTwinkDefense)) { @@ -54,7 +54,7 @@ EvtScript N(EVS_UsePower) = { EVT_ADD(LVar1, 20) EVT_CALL(N(SpawnStarSparkleFX), LVar0, LVar1, LVar2) EVT_CALL(N(FadeBackgroundDarken)) - EVT_CALL(GetActorVar, ACTOR_PARTNER, AVAR_Unk_0, LVar0) + EVT_CALL(GetActorVar, ACTOR_PARTNER, AVAR_Twink_PowerLevel, LVar0) EVT_IF_EQ(LVar0, 0) EVT_CALL(ActorSpeak, MSG_CH8_0096, ACTOR_PLAYER, 0, ANIM_Peach3_Pray, ANIM_Peach3_Pray) EVT_END_IF @@ -66,11 +66,11 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(N(SpawnWishSparkleFX), LVar0, LVar1, LVar2) EVT_WAIT(30) EVT_CALL(PlaySound, SOUND_STAR_POWER_RECOVERY) - EVT_CALL(GetActorVar, ACTOR_PARTNER, AVAR_Unk_0, LVar0) + EVT_CALL(GetActorVar, ACTOR_PARTNER, AVAR_Twink_PowerLevel, LVar0) EVT_ADD(LVar0, 1) - EVT_CALL(SetActorVar, ACTOR_PARTNER, AVAR_Unk_0, LVar0) + EVT_CALL(SetActorVar, ACTOR_PARTNER, AVAR_Twink_PowerLevel, LVar0) EVT_CALL(ModifyActorDecoration, ACTOR_PARTNER, 1, 0, LVar0, 0, 0, 0) - EVT_CALL(GetActorVar, ACTOR_PARTNER, AVAR_Unk_1, LVar0) + EVT_CALL(GetActorVar, ACTOR_PARTNER, AVAR_Twink_DefensePtr, LVar0) EVT_CALL(N(IncreaseTwinkDefense)) EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) diff --git a/src/battle/move/star_power/peach_focus_alt.c b/src/battle/move/star_power/peach_focus_alt.c index dd2f2107bc..e84304fb50 100644 --- a/src/battle/move/star_power/peach_focus_alt.c +++ b/src/battle/move/star_power/peach_focus_alt.c @@ -11,16 +11,16 @@ API_CALLABLE(N(RestoreStarPower)) { PlayerData* playerData2 = &gPlayerData; if (is_ability_active(ABILITY_DEEP_FOCUS)) { - playerData->specialBarsFilled += 128; + playerData->starPower += SP_PER_SEG * 4; } if (is_ability_active(ABILITY_SUPER_FOCUS)) { - playerData->specialBarsFilled += 256; + playerData->starPower += SP_PER_BAR; } - playerData->specialBarsFilled += 128; + playerData->starPower += SP_PER_SEG * 4; - if (playerData2->specialBarsFilled >= playerData2->maxStarPower * 256) { - playerData2->specialBarsFilled = playerData2->maxStarPower * 256; + if (playerData2->starPower >= playerData2->maxStarPower * SP_PER_BAR) { + playerData2->starPower = playerData2->maxStarPower * SP_PER_BAR; } return ApiStatus_DONE2; diff --git a/src/battle/move/star_power/smooch.c b/src/battle/move/star_power/smooch.c index 7384161634..c73acebd97 100644 --- a/src/battle/move/star_power/smooch.c +++ b/src/battle/move/star_power/smooch.c @@ -154,7 +154,7 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(N(FadeBackgroundLighten)) EVT_END_THREAD EVT_CALL(PlayerYieldTurn) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_PLAYER_JUMP) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_LONG_PLAYER_JUMP) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) diff --git a/src/battle/move/star_power/star_beam.c b/src/battle/move/star_power/star_beam.c index c9a60b9d4a..e4e86d3519 100644 --- a/src/battle/move/star_power/star_beam.c +++ b/src/battle/move/star_power/star_beam.c @@ -27,7 +27,7 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_REMOVE_BUFFS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_REMOVE_BUFFS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, 0, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_IF_NE(LVar0, ITER_NO_MORE) EVT_GOTO(0) diff --git a/src/battle/move/star_power/star_storm.c b/src/battle/move/star_power/star_storm.c index ca078c3356..eb0e98ae46 100644 --- a/src/battle/move/star_power/star_storm.c +++ b/src/battle/move/star_power/star_storm.c @@ -80,7 +80,7 @@ EvtScript N(EVS_UsePower) = { EVT_END_IF EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(N(SpawnDamageStarsFX), LVar0, LVar1, LVar2) - EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 7, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_COSMIC | DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 7, BS_FLAGS1_TRIGGER_EVENTS) EVT_LABEL(1) EVT_WAIT(10) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) diff --git a/src/battle/move/star_power/time_out.c b/src/battle/move/star_power/time_out.c index 2edad910c1..91e18c1232 100644 --- a/src/battle/move/star_power/time_out.c +++ b/src/battle/move/star_power/time_out.c @@ -25,7 +25,7 @@ EvtScript N(EVS_UsePower) = { EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_GOTO(1) EVT_END_IF - EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, DMG_STATUS_KEY(STATUS_FLAG_STOP, 5, 100), 0, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(ItemDamageEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, DMG_STATUS_KEY(STATUS_FLAG_STOP, 5, 100), 0, BS_FLAGS1_TRIGGER_EVENTS) EVT_WAIT(5) EVT_LABEL(1) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) diff --git a/src/battle/move/star_power/up_and_away.c b/src/battle/move/star_power/up_and_away.c index 244c6962e9..0880a74b53 100644 --- a/src/battle/move/star_power/up_and_away.c +++ b/src/battle/move/star_power/up_and_away.c @@ -163,7 +163,7 @@ EvtScript N(EVS_UsePower) = { EVT_END_THREAD EVT_CASE_DEFAULT EVT_IF_EQ(LFlag0, FALSE) - EVT_CALL(PlayerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 0, BS_FLAGS1_FORCE_HIT_IMMUNE | BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(PlayerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_ALL, 0, 0, BS_FLAGS1_FORCE_IMMUNE_HIT | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_IF EVT_END_SWITCH EVT_WAIT(5) diff --git a/src/battle/partner/bombette.c b/src/battle/partner/bombette.c index ec829deb7f..7f77f58558 100644 --- a/src/battle/partner/bombette.c +++ b/src/battle/partner/bombette.c @@ -933,9 +933,9 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_CALL(SetActorDispOffset, ACTOR_PARTNER, 0, 0, 0) EVT_WAIT(2) EVT_CALL(CloseActionCommandInfo) - EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_ALT_SPIKY, 0, 1, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_ALT_SPIKY, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_2020) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOMBETTE_BODY_SLAM) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(AddGoalPos, ACTOR_PARTNER, -10, 0, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBombette_BodySlam) @@ -981,7 +981,7 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_SET(LVarE, 3) EVT_SET(LVarF, 5) EVT_END_SWITCH - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_2020) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOMBETTE_BODY_SLAM) EVT_CALL(GetPartnerActionSuccess, LVar0) EVT_IF_GT(LVar0, 0) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) @@ -999,17 +999,17 @@ EvtScript N(EVS_Attack_BodySlam) = { EVT_END_IF EVT_SWITCH(LVar0) EVT_CASE_GT(0) - EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_TOP, 0, LVarF, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_TOP, 0, LVarF, BS_FLAGS1_NICE_HIT | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_CASE_DEFAULT - EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_TOP, 0, LVarE, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_TOP, 0, LVarE, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_EXEC_WAIT(N(EVS_ReturnHome)) EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_EXEC_WAIT(N(returnHome2)) EVT_END_CASE_GROUP EVT_END_SWITCH @@ -1099,7 +1099,7 @@ EvtScript N(EVS_Attack_Bomb) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar2) EVT_CASE_EQ(MOVE_BOMB) - EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_END_SWITCH EVT_CALL(StopSound, SOUND_LRAW_BOMBETTE_FUSE) EVT_SWITCH(LVar2) @@ -1236,7 +1236,7 @@ EvtScript N(EVS_Attack_Bomb) = { EVT_CASE_EQ(MOVE_BOMB) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOMBETTE_BLAST_LV1) - EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, 6) EVT_BREAK_SWITCH EVT_END_IF @@ -1244,16 +1244,16 @@ EvtScript N(EVS_Attack_Bomb) = { EVT_CALL(N(GetBombDamage), LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(0) - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_BLAST | DAMAGE_TYPE_NO_CONTACT, 0, 0, LVarF, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_BLAST | DAMAGE_TYPE_NO_CONTACT, 0, 0, LVarF, BS_FLAGS1_NICE_HIT | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SET(LF_MashEnded, 1) EVT_CASE_DEFAULT - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_BLAST | DAMAGE_TYPE_NO_CONTACT, 0, 0, LVarF, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_BLAST | DAMAGE_TYPE_NO_CONTACT, 0, 0, LVarF, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_END_SWITCH EVT_CASE_EQ(MOVE_POWER_BOMB) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOMBETTE_BLAST_LV1) EVT_LABEL(5) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) - EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, 6) EVT_GOTO(6) EVT_END_IF @@ -1261,10 +1261,10 @@ EvtScript N(EVS_Attack_Bomb) = { EVT_CALL(N(GetPowerBombDamage), LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(0) - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_BLAST | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, LVarF, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_BLAST | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, LVarF, BS_FLAGS1_NICE_HIT | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SET(LF_MashEnded, 1) EVT_CASE_DEFAULT - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_BLAST | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, LVarF, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_BLAST | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, LVarF, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_END_SWITCH EVT_LABEL(6) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) @@ -1275,7 +1275,7 @@ EvtScript N(EVS_Attack_Bomb) = { EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOMBETTE_BLAST_LV3) EVT_LABEL(10) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) - EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, 6) EVT_GOTO(11) EVT_END_IF @@ -1283,10 +1283,10 @@ EvtScript N(EVS_Attack_Bomb) = { EVT_CALL(N(GetMegaBombDamage), LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(0) - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_BLAST | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, LVarF, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_BLAST | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, LVarF, BS_FLAGS1_NICE_HIT | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SET(LF_MashEnded, 1) EVT_CASE_DEFAULT - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_BLAST | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, LVarF, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_BLAST | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, LVarF, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_END_SWITCH EVT_LABEL(11) EVT_WAIT(5) @@ -1354,7 +1354,7 @@ EvtScript N(EVS_Attack_FirstStrike) = { EVT_CALL(MoveBattleCamOver, 1) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBombette_AboutToExplode) EVT_WAIT(5) - EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_WAIT(10) EVT_CALL(StopSound, SOUND_LRAW_BOMBETTE_FUSE) EVT_LOOP(7) @@ -1383,7 +1383,7 @@ EvtScript N(EVS_Attack_FirstStrike) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 8, EVT_FLOAT(0.15)) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOMBETTE_BLAST_LV1) - EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_GOTO(10) EVT_END_IF @@ -1397,7 +1397,7 @@ EvtScript N(EVS_Attack_FirstStrike) = { EVT_CASE_EQ(MOVE_BODY_SLAM3) EVT_SET(LVarF, 7) EVT_END_SWITCH - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_BLAST | DAMAGE_TYPE_NO_CONTACT, 0, 0, LVarF, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_BLAST | DAMAGE_TYPE_NO_CONTACT, 0, 0, LVarF, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_LABEL(10) EVT_SET(LVar0, 0) EVT_SWITCH(LVar0) diff --git a/src/battle/partner/bow.c b/src/battle/partner/bow.c index 1fb309379b..5d17315419 100644 --- a/src/battle/partner/bow.c +++ b/src/battle/partner/bow.c @@ -535,7 +535,7 @@ EvtScript N(smack) = { EVT_CALL(GetPartnerActionSuccess, LVarB) EVT_CALL(func_80269600, LVarD) EVT_LABEL(0) - EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_SlapOnce) EVT_CALL(CloseActionCommandInfo) @@ -585,17 +585,17 @@ EvtScript N(smack) = { EVT_CALL(AddBattleCamZoom, 25) EVT_CALL(MoveBattleCamOver, 5) EVT_END_IF - EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_HURT, SOUND_2019, 0) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_HURT, SOUND_BOW_SMACK, 0) EVT_IF_EQ(LVarE, 1) EVT_IF_GT(LVarB, 99) - EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT, 0, LVarC, BS_FLAGS1_40 | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT, 0, LVarC, BS_FLAGS1_NICE_HIT | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_ELSE - EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT, 0, LVarC, BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT, 0, LVarC, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_END_IF EVT_GOTO(1) EVT_ELSE EVT_IF_GT(LVarB, 99) - EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT, 0, LVarC, BS_FLAGS1_40) + EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT, 0, LVarC, BS_FLAGS1_NICE_HIT) EVT_ELSE EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT, 0, LVarC, 0) EVT_END_IF @@ -627,13 +627,13 @@ EvtScript N(smack) = { EVT_END_IF EVT_WAIT(2) EVT_CALL(SetActorScale, ACTOR_PARTNER, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) - EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_HURT, SOUND_2019, 0) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_HURT, SOUND_BOW_SMACK, 0) EVT_CALL(GetPartnerActionSuccess, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(99) - EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT, 0, LVarC, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT, 0, LVarC, BS_FLAGS1_NICE_HIT | BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_DEFAULT - EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT, 0, LVarC, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT, 0, LVarC, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_WAIT(8) EVT_SWITCH(LVar0) @@ -642,8 +642,8 @@ EvtScript N(smack) = { EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Idle) EVT_EXEC_WAIT(N(EVS_ReturnHome)) EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_Idle) EVT_EXEC_WAIT(N(returnHome2)) EVT_END_CASE_GROUP @@ -929,16 +929,16 @@ EvtScript N(spook) = { EVT_CALL(GetActionQuality, LVarF) EVT_LOOP(0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 2, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, 6) EVT_GOTO(10) EVT_END_IF EVT_CALL(SetDamageSource, DMG_SRC_SPOOK) EVT_SWITCH(LVarF) EVT_CASE_GT(99) - EVT_CALL(PartnerAfflictEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, STATUS_FLAG_400000, LVarF, 0, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerAfflictEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, STATUS_FLAG_400000, LVarF, 0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_CASE_DEFAULT - EVT_CALL(PartnerAfflictEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, STATUS_FLAG_400000, LVarF, 0, BS_FLAGS1_80 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerAfflictEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, STATUS_FLAG_400000, LVarF, 0, BS_FLAGS1_NO_RATING | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_END_SWITCH EVT_LABEL(10) EVT_WAIT(5) @@ -1047,7 +1047,7 @@ EvtScript N(fanSmack) = { EVT_CALL(GetPartnerActionSuccess, LVarB) EVT_CALL(func_80269600, LVarD) EVT_LABEL(0) - EVT_CALL(PartnerTestEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_ALT_SPIKY, 0, 1, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_ALT_SPIKY, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleBow_FanSmackOnce) EVT_CALL(CloseActionCommandInfo) @@ -1104,17 +1104,17 @@ EvtScript N(fanSmack) = { EVT_END_IF EVT_CALL(GetGoalPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_CONFETTI, 5, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 20, 0) - EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_HURT, SOUND_201A, 0) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_HURT, SOUND_BOW_FAN_SMACK, 0) EVT_IF_EQ(LVarE, 1) EVT_IF_GT(LVarB, 99) - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_ALT_SPIKY, 0, LVarC, BS_FLAGS1_40 | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_ALT_SPIKY, 0, LVarC, BS_FLAGS1_NICE_HIT | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_ELSE - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_ALT_SPIKY, 0, LVarC, BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_ALT_SPIKY, 0, LVarC, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_END_IF EVT_GOTO(1) EVT_ELSE EVT_IF_GT(LVarB, 99) - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_ALT_SPIKY, 0, LVarC, BS_FLAGS1_40) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_ALT_SPIKY, 0, LVarC, BS_FLAGS1_NICE_HIT) EVT_ELSE EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_ALT_SPIKY, 0, LVarC, 0) EVT_END_IF @@ -1167,13 +1167,13 @@ EvtScript N(fanSmack) = { EVT_END_IF EVT_WAIT(2) EVT_CALL(SetActorScale, ACTOR_PARTNER, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) - EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_HURT, SOUND_201A, 0) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_HURT, SOUND_BOW_FAN_SMACK, 0) EVT_CALL(GetPartnerActionSuccess, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(99) - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_ALT_SPIKY, 0, LVarC, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_ALT_SPIKY, 0, LVarC, BS_FLAGS1_NICE_HIT | BS_FLAGS1_TRIGGER_EVENTS) EVT_CASE_DEFAULT - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_ALT_SPIKY, 0, LVarC, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_ALT_SPIKY, 0, LVarC, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_THREAD EVT_IF_EQ(LVarE, 1) diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c index 06d6eeb2b0..2367d85d8c 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -9,26 +9,26 @@ extern s32 bActorTattles[]; -static EffectInstance* N(tattleEffect); +static EffectInstance* N(TattleWindowEffect); static b32 N(isCharged); +extern s32 N(MultibonkChance); -extern s32 N(powerBounceChance); extern EvtScript N(EVS_Init); -extern EvtScript N(EVS_Celebrate); +extern EvtScript N(EVS_Idle); +extern EvtScript N(EVS_HandleEvent); +extern EvtScript N(EVS_HandlePhase); +extern EvtScript N(EVS_TakeTurn); extern EvtScript N(EVS_ExecuteAction); -extern EvtScript N(EVS_FirstStrike); -extern EvtScript N(EVS_RunAway); -extern EvtScript N(EVS_RunAwayFail); extern EvtScript N(EVS_Attack_Headbonk1); extern EvtScript N(EVS_Attack_Headbonk2); extern EvtScript N(EVS_Attack_Headbonk3); -extern EvtScript N(EVS_Move_Multibonk); extern EvtScript N(EVS_Move_Tattle); extern EvtScript N(EVS_Move_Charge); -extern EvtScript N(EVS_HandleEvent); -extern EvtScript N(EVS_Idle); -extern EvtScript N(EVS_HandlePhase); -extern EvtScript N(EVS_TakeTurn); +extern EvtScript N(EVS_Move_Multibonk); +extern EvtScript N(EVS_FirstStrike); +extern EvtScript N(EVS_RunAway); +extern EvtScript N(EVS_RunAwayFail); +extern EvtScript N(EVS_Celebrate); enum N(ActorPartIDs) { PRT_MAIN = 1, @@ -61,13 +61,15 @@ API_CALLABLE(N(GetReturnMoveTime)) { return ApiStatus_DONE2; } -API_CALLABLE(N(AdjustPowerBounceChance)) { +API_CALLABLE(N(AdjustMultibonkChance)) { Actor* targetActor = get_actor(get_actor(script->owner1.actorID)->targetActorID); script->varTable[0] = 99; - N(powerBounceChance) *= targetActor->actorBlueprint->powerBounceChance; - N(powerBounceChance) /= 100; - if (N(powerBounceChance) < rand_int(100)) { + + // @bug this value is not reset between Multibonk uses + N(MultibonkChance) *= targetActor->actorBlueprint->powerBounceChance; + N(MultibonkChance) /= 100; + if (N(MultibonkChance) < rand_int(100)) { script->varTable[0] = 0; } @@ -338,13 +340,13 @@ API_CALLABLE(N(GetTattleCamPos)) { } API_CALLABLE(N(OpenTattleWindow)) { - N(tattleEffect) = fx_tattle_window(0, 206, 144, 0, 1.0f, 0); + N(TattleWindowEffect) = fx_tattle_window(0, 206, 144, 0, 1.0f, 0); return ApiStatus_DONE2; } API_CALLABLE(N(CloseTattleWindow)) { - EffectInstance* effect = N(tattleEffect); + EffectInstance* effect = N(TattleWindowEffect); effect->data.tattleWindow->pos.y = 144.0f; effect->flags |= FX_INSTANCE_FLAG_DISMISS; @@ -940,9 +942,9 @@ EvtScript N(EVS_Attack_Headbonk1) = { EVT_CALL(SetActorDispOffset, ACTOR_PARTNER, 0, 9, 0) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, 0, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_200D) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_GOOMBARIO_JUMP) EVT_CALL(N(JumpOnTarget), LVarA, 0) - EVT_CALL(PartnerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, 0, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) EVT_CALL(N(OnMissHeadbonk)) @@ -967,11 +969,11 @@ EvtScript N(EVS_Attack_Headbonk1) = { EVT_CASE_GT(0) EVT_CALL(N(GetChargeAmount)) EVT_ADD(LVar0, 1) - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_40 | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_CASE_DEFAULT EVT_CALL(N(StopChargeAndGet)) EVT_ADD(LVar0, 1) - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_SWITCH(LVar0) @@ -980,8 +982,8 @@ EvtScript N(EVS_Attack_Headbonk1) = { EVT_EXEC_WAIT(N(EVS_ReturnHome)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_THREAD @@ -1020,7 +1022,7 @@ EvtScript N(EVS_Attack_Headbonk1) = { EVT_WAIT(1) 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(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_CALL(SetActionResult, LVarF) EVT_EXEC_WAIT(N(returnHome2)) @@ -1045,9 +1047,9 @@ EvtScript N(EVS_Attack_Headbonk2) = { EVT_CALL(SetActorDispOffset, ACTOR_PARTNER, 0, 9, 0) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, 0, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_200D) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_GOOMBARIO_JUMP) EVT_CALL(N(JumpOnTarget), LVarA, 0) - EVT_CALL(PartnerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, 0, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) EVT_CALL(N(OnMissHeadbonk)) @@ -1072,11 +1074,11 @@ EvtScript N(EVS_Attack_Headbonk2) = { EVT_CASE_GT(0) EVT_CALL(N(GetChargeAmount)) EVT_ADD(LVar0, 2) - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_40 | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_CASE_DEFAULT EVT_CALL(N(StopChargeAndGet)) EVT_ADD(LVar0, 2) - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_SWITCH(LVar0) @@ -1085,8 +1087,8 @@ EvtScript N(EVS_Attack_Headbonk2) = { EVT_EXEC_WAIT(N(EVS_ReturnHome)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_THREAD @@ -1127,7 +1129,7 @@ EvtScript N(EVS_Attack_Headbonk2) = { EVT_WAIT(1) 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(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_CALL(SetActionResult, LVarF) EVT_EXEC_WAIT(N(returnHome2)) @@ -1152,9 +1154,9 @@ EvtScript N(EVS_Attack_Headbonk3) = { EVT_CALL(SetActorDispOffset, ACTOR_PARTNER, 0, 9, 0) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, 0, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_200D) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_GOOMBARIO_JUMP) EVT_CALL(N(JumpOnTarget), LVarA, 0) - EVT_CALL(PartnerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, 0, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) EVT_CALL(N(OnMissHeadbonk)) @@ -1179,11 +1181,11 @@ EvtScript N(EVS_Attack_Headbonk3) = { EVT_CASE_GT(0) EVT_CALL(N(GetChargeAmount)) EVT_ADD(LVar0, 3) - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_40 | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_CASE_DEFAULT EVT_CALL(N(StopChargeAndGet)) EVT_ADD(LVar0, 3) - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_SWITCH(LVar0) @@ -1192,8 +1194,8 @@ EvtScript N(EVS_Attack_Headbonk3) = { EVT_EXEC_WAIT(N(EVS_ReturnHome)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_THREAD @@ -1243,7 +1245,7 @@ EvtScript N(EVS_Attack_Headbonk3) = { EVT_WAIT(1) 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(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_CALL(SetActionResult, LVarF) EVT_EXEC_WAIT(N(returnHome2)) @@ -1253,7 +1255,7 @@ EvtScript N(EVS_Attack_Headbonk3) = { s32 N(actionCommandTable)[] = { 7, 6, 5, 4, 3, 2, 1, 0 }; -s32 N(powerBounceChance) = 200; +s32 N(MultibonkChance) = 200; EvtScript N(EVS_Move_Multibonk) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_JUMP) @@ -1272,9 +1274,9 @@ EvtScript N(EVS_Move_Multibonk) = { EVT_CALL(SetActorDispOffset, ACTOR_PARTNER, 0, 9, 0) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, 0, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_200D) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_GOOMBARIO_JUMP) EVT_CALL(N(JumpOnTarget), LVarA, 0) - EVT_CALL(PartnerTestEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, 0, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) EVT_CALL(N(OnMissHeadbonk)) @@ -1299,11 +1301,11 @@ EvtScript N(EVS_Move_Multibonk) = { EVT_CASE_GT(0) EVT_CALL(N(GetChargeAmount)) EVT_ADD(LVar0, 3) - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVar0, BS_FLAGS1_40 | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVar0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_CASE_DEFAULT EVT_CALL(N(StopChargeAndGet)) 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_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVar0, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_SWITCH(LVar0) @@ -1312,8 +1314,8 @@ EvtScript N(EVS_Move_Multibonk) = { EVT_EXEC_WAIT(N(EVS_ReturnHome)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_THREAD @@ -1375,7 +1377,7 @@ EvtScript N(EVS_Move_Multibonk) = { EVT_CALL(N(JumpOnTarget), LVarA, 3) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_RESET) EVT_SUB(LVarD, 1) - EVT_CALL(N(AdjustPowerBounceChance)) + EVT_CALL(N(AdjustMultibonkChance)) EVT_IF_GE(LVarF, LVar0) EVT_SET(LFlag0, TRUE) EVT_END_IF @@ -1393,16 +1395,16 @@ EvtScript N(EVS_Move_Multibonk) = { EVT_IF_EQ(LFlag0, FALSE) EVT_CALL(N(GetChargeAmount)) EVT_ADD(LVar0, 3) - EVT_CALL(PartnerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVar0, LVarD, BS_FLAGS1_40) + EVT_CALL(PartnerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVar0, LVarD, BS_FLAGS1_NICE_HIT) EVT_ELSE EVT_CALL(N(StopChargeAndGet)) EVT_ADD(LVar0, 3) - EVT_CALL(PartnerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVar0, LVarD, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(PartnerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVar0, LVarD, BS_FLAGS1_TRIGGER_EVENTS) EVT_END_IF EVT_CASE_DEFAULT EVT_CALL(N(StopChargeAndGet)) EVT_ADD(LVar0, 3) - EVT_CALL(PartnerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVar0, LVarD, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(PartnerPowerBounceEnemy, LVar0, DAMAGE_TYPE_JUMP | DAMAGE_TYPE_POWER_BOUNCE, 0, 0, LVar0, LVarD, BS_FLAGS1_TRIGGER_EVENTS) EVT_SET(LFlag0, FALSE) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) @@ -1413,8 +1415,8 @@ EvtScript N(EVS_Move_Multibonk) = { EVT_EXEC_WAIT(N(EVS_ReturnHome)) EVT_RETURN EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_IF_EQ(LFlag0, TRUE) EVT_EXEC_WAIT(N(returnHome2)) EVT_RETURN @@ -1490,7 +1492,7 @@ EvtScript N(EVS_Move_Charge) = { EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_ADD(LVar2, -5) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_2003) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_GOOMBARIO_GATHERING) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 9, LVar0, LVar1, LVar2, EVT_FLOAT(2.0), 20, 0) EVT_END_THREAD EVT_WAIT(30) diff --git a/src/battle/partner/kooper.c b/src/battle/partner/kooper.c index dbad40ed14..73f84365c8 100644 --- a/src/battle/partner/kooper.c +++ b/src/battle/partner/kooper.c @@ -570,7 +570,7 @@ EvtScript N(shellToss) = { EVT_CALL(action_command_hammer_start, 0, 50 * DT - 3, 3) EVT_CALL(SetActionQuality, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_200C) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_KOOPER_SHELL_SPINUP) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_59) EVT_SET(LVar9, 0) EVT_SET(LVar1, 0) @@ -632,7 +632,7 @@ EvtScript N(shellToss) = { EVT_IF_EQ(LVar0, 0) EVT_GOTO(0) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_200A) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_PARAKARRY_AIR_RAID_1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 15) EVT_EXEC_WAIT(N(getShellTossMoveTime)) @@ -641,7 +641,7 @@ EvtScript N(shellToss) = { EVT_CALL(SetActorSpeed, ACTOR_PARTNER, LVarA) 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_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENTS_KOOPER_TEST, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_THREAD EVT_CALL(N(SlowDown)) @@ -683,9 +683,9 @@ EvtScript N(shellToss) = { EVT_CALL(GetPartnerActionSuccess, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(0) - 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_ALT_SPIKY, 0, LVarF, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENTS_KOOPER_DAMAGE, 0, LVarF, BS_FLAGS1_NICE_HIT | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) 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_ALT_SPIKY, 0, LVarE, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENTS_KOOPER_DAMAGE, 0, LVarE, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_SWITCH(LVar0) @@ -693,8 +693,8 @@ EvtScript N(shellToss) = { EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_EXEC_WAIT(N(EVS_ReturnHome)) EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_EXEC_WAIT(N(returnHomeOnMiss)) EVT_END_CASE_GROUP EVT_END_SWITCH @@ -740,7 +740,7 @@ EvtScript N(powerShell) = { EVT_CALL(action_command_hammer_start, 0, 47, 3) EVT_CALL(SetActionQuality, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_200C) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_KOOPER_SHELL_SPINUP) EVT_SET(LVar9, 0) EVT_SET(LVar1, 0) EVT_LOOP(50) @@ -803,7 +803,7 @@ EvtScript N(powerShell) = { EVT_GOTO(0) EVT_END_IF EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Unk_0, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_200B) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_PARAKARRY_AIR_RAID_2) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 15) EVT_SET(LVarB, 260) @@ -828,7 +828,7 @@ EvtScript N(powerShell) = { EVT_IF_GT(LVar0, LVar3) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 2, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENTS_KOOPER_TEST, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, 6) EVT_GOTO(12) EVT_END_IF @@ -845,9 +845,9 @@ EvtScript N(powerShell) = { EVT_CALL(GetPartnerActionSuccess, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(0) - 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_ALT_SPIKY, 0, LVarF, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENTS_KOOPER_DAMAGE, 0, LVarF, BS_FLAGS1_NICE_HIT | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) 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_ALT_SPIKY, 0, LVarE, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENTS_KOOPER_DAMAGE, 0, LVarE, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_LABEL(12) @@ -906,7 +906,7 @@ EvtScript N(dizzyShell) = { EVT_CALL(action_command_dizzy_shell_start, 0, LVarA, 3, LVar0) EVT_CALL(SetActionQuality, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_200C) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_KOOPER_SHELL_SPINUP) EVT_SET(LVar9, 0) EVT_SET(LVarA, EVT_FLOAT(8.0)) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_DIZZY_SHELL) @@ -945,7 +945,7 @@ EvtScript N(dizzyShell) = { EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar4, LVar5, LVar6, 32, 4, 0, 10, 0) EVT_END_SWITCH EVT_END_LOOP - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0290) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_DIZZY_SHELL_LAUNCH) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 15) EVT_SET(LVarB, 300) @@ -983,7 +983,7 @@ EvtScript N(dizzyShell) = { EVT_IF_GT(LVar0, LVar3) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 2, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENTS_KOOPER_TEST, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_GOTO(12) EVT_END_IF @@ -1004,18 +1004,18 @@ EvtScript N(dizzyShell) = { EVT_IF_EQ(LVar9, 1) EVT_IF_EQ(LVarF, 100) 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_ALT_SPIKY, DMG_STATUS_ALWAYS(STATUS_FLAG_DIZZY, 3), 254, 0, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + SUPPRESS_EVENTS_KOOPER_DAMAGE, DMG_STATUS_ALWAYS(STATUS_FLAG_DIZZY, 3), 254, 0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_ELSE - 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_ALT_SPIKY, DMG_STATUS_ALWAYS(STATUS_FLAG_DIZZY, 3), LVarF, 0, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerAfflictEnemy, LVar0, DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, SUPPRESS_EVENTS_KOOPER_DAMAGE, DMG_STATUS_ALWAYS(STATUS_FLAG_DIZZY, 3), LVarF, 0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_END_IF EVT_ELSE - 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_ALT_SPIKY, DMG_STATUS_ALWAYS(STATUS_FLAG_DIZZY, 3), LVarF, 0, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerAfflictEnemy, LVar0, DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, SUPPRESS_EVENTS_KOOPER_DAMAGE, DMG_STATUS_ALWAYS(STATUS_FLAG_DIZZY, 3), LVarF, 0, BS_FLAGS1_NICE_HIT | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_END_IF EVT_CASE_DEFAULT EVT_IF_EQ(LVar9, 1) - 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_ALT_SPIKY, DMG_STATUS_ALWAYS(STATUS_FLAG_DIZZY, 3), 255, 0, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerAfflictEnemy, LVar0, DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, SUPPRESS_EVENTS_KOOPER_DAMAGE, DMG_STATUS_ALWAYS(STATUS_FLAG_DIZZY, 3), 255, 0, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_ELSE - 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_ALT_SPIKY, DMG_STATUS_ALWAYS(STATUS_FLAG_DIZZY, 3), 255, 0, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerAfflictEnemy, LVar0, DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, SUPPRESS_EVENTS_KOOPER_DAMAGE, DMG_STATUS_ALWAYS(STATUS_FLAG_DIZZY, 3), 255, 0, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_END_IF EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) @@ -1078,8 +1078,8 @@ EvtScript N(fireShell) = { EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Unk_1, 0) EVT_SET(LVarA, EVT_FLOAT(8.0)) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleKooper_ShellSpinSlowest) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_200C) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_028E) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_KOOPER_SHELL_SPINUP) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_ROARING_FIRE) EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_ZERO, 0, ACTOR_DECORATION_RED_FLAMES) EVT_WAIT(1) EVT_CALL(ModifyActorDecoration, ACTOR_PARTNER, -1, 0, 10, 10, 255, 0) @@ -1163,7 +1163,7 @@ EvtScript N(fireShell) = { EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 1, LVar3, LVar4, LVar5, 32, 4, 0, 10, 0) EVT_END_SWITCH EVT_END_LOOP - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_028F) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_FIRE_SHELL_LAUNCH) EVT_CALL(N(GetFireShellSpeedAndDamage)) EVT_SWITCH(LVarE) EVT_CASE_OR_EQ(0) @@ -1229,7 +1229,7 @@ EvtScript N(fireShell) = { EVT_IF_GT(LVar0, LVar3) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 2, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENTS_KOOPER_TEST, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, 6) EVT_GOTO(12) EVT_END_IF @@ -1247,9 +1247,9 @@ EvtScript N(fireShell) = { EVT_CALL(GetPartnerActionSuccess, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(99) - 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_ALT_SPIKY, 0, LVarF, BS_FLAGS1_40 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_FIRE | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENTS_KOOPER_DAMAGE, 0, LVarF, BS_FLAGS1_NICE_HIT | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) 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_ALT_SPIKY, 0, LVarF, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_FIRE | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENTS_KOOPER_DAMAGE, 0, LVarF, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_LABEL(12) @@ -1298,7 +1298,7 @@ EvtScript N(shellTossOnFirstStrike) = { EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(16.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_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENTS_KOOPER_TEST, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_THREAD EVT_CALL(N(SlowDown)) @@ -1346,7 +1346,7 @@ EvtScript N(shellTossOnFirstStrike) = { EVT_CASE_EQ(MOVE_SHELL_TOSS3) EVT_SET(LVarF, 3) EVT_END_SWITCH - 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_ALT_SPIKY, 0, LVarF, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENTS_KOOPER_DAMAGE, 0, LVarF, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar2) EVT_CASE_EQ(MOVE_SHELL_TOSS1) diff --git a/src/battle/partner/lakilester.c b/src/battle/partner/lakilester.c index fbdfd2eda6..f968b889b6 100644 --- a/src/battle/partner/lakilester.c +++ b/src/battle/partner/lakilester.c @@ -18,12 +18,12 @@ extern EvtScript N(EVS_TakeTurn); extern EvtScript N(EVS_Init); extern EvtScript N(EVS_ExecuteAction); extern EvtScript N(EVS_Celebrate); -extern EvtScript N(runAway); -extern EvtScript N(runAwayFail); -extern EvtScript N(spinyFlip); -extern EvtScript N(spinySurge); -extern EvtScript N(cloudNine); -extern EvtScript N(hurricane); +extern EvtScript N(EVS_RunAway); +extern EvtScript N(EVS_RunAwayFail); +extern EvtScript N(EVS_Move_SpinyFlip); +extern EvtScript N(EVS_Move_SpinySurge); +extern EvtScript N(EVS_Move_CloudNine); +extern EvtScript N(EVS_Move_Hurricane); extern HudScript HES_AimBlinkA; extern HudScript HES_AimReticle; @@ -33,23 +33,23 @@ extern HudScript HES_StickTapRight; static s32 sSavedHurricaneIntensity; static s32 sBreathSizeIncrease; static s32 sMaxPower; -static s32 hudAimReticle; -static s32 hudAimTarget; -static s32 sTargetMarkRotation; +static s32 HID_AimReticle; +static s32 HID_AimTarget; +static s32 TargetMarkRotation; static s32 D_8023D294; -static s32 sAimingTimer; +static s32 AimingTime; static s32 D_8023D29C; static f32 D_8023D2A0; static f32 D_8023D2A4; static f32 D_8023D2A8; static f32 D_8023D2AC; static f32 D_8023D2B0; -static f32 sAimMoveAngle; +static f32 AimMoveAngle; static s32 hudAim[1]; -static s32 hudStick; -static s32 hudStickPosX; -static s32 hudStickPosY; -static s32 sSpinyFlipStarted; +static s32 HID_AnalogStick; +static s32 HudStickPosX; +static s32 HudStickPosY; +static b32 SpinyFlipTargetingDone; static s32 D_8023D2CC; static s32 sTargetStates[24]; static s32 sNumEnemiesBeingBlown; @@ -85,20 +85,6 @@ typedef struct HurricaneState { /* 0x74 */ char unk_74[0x10]; } HurricaneState; -API_CALLABLE(N(SpinyFlipUpdatePopup)) { - if (isInitialCall) { - sSpinyFlipStarted = 0; - } - - if (sSpinyFlipStarted == 0) { - btl_set_popup_duration(99); - return ApiStatus_BLOCK; - } - - return ApiStatus_DONE2; -} - - s32 N(DefaultAnims)[] = { STATUS_KEY_NORMAL, ANIM_BattleLakilester_Walk, STATUS_KEY_DAZE, ANIM_BattleLakilester_Injured, @@ -280,9 +266,9 @@ EvtScript N(EVS_TakeTurn) = { EVT_CASE_EQ(PHASE_CELEBRATE) EVT_EXEC_WAIT(N(EVS_Celebrate)) EVT_CASE_EQ(PHASE_RUN_AWAY_START) - EVT_EXEC_WAIT(N(runAway)) + EVT_EXEC_WAIT(N(EVS_RunAway)) EVT_CASE_EQ(PHASE_RUN_AWAY_FAIL) - EVT_EXEC_WAIT(N(runAwayFail)) + EVT_EXEC_WAIT(N(EVS_RunAwayFail)) EVT_END_SWITCH EVT_RETURN EVT_END @@ -291,22 +277,22 @@ EvtScript N(EVS_TakeTurn) = { EvtScript N(EVS_Celebrate) = { EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_BattleLakilester_Celebrate) - EVT_SET_CONST(LVar2, ANIM_BattleLakilester_Walk) - EVT_SET_CONST(LVar3, ANIM_BattleLakilester_Walk) + EVT_SET_CONST(LVar2, ANIM_BattleLakilester_Walk) + EVT_SET_CONST(LVar3, ANIM_BattleLakilester_Walk) EVT_EXEC_WAIT(EVS_Partner_Celebrate) EVT_RETURN EVT_END }; -EvtScript N(runAway) = { +EvtScript N(EVS_RunAway) = { EVT_SET_CONST(LVar0, PRT_MAIN) - EVT_SET_CONST(LVar1, ANIM_BattleLakilester_Run) + EVT_SET_CONST(LVar1, ANIM_BattleLakilester_Run) EVT_EXEC_WAIT(EVS_Partner_RunAway) EVT_RETURN EVT_END }; -EvtScript N(runAwayFail) = { +EvtScript N(EVS_RunAwayFail) = { EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(6.0)) @@ -337,20 +323,20 @@ EvtScript N(EVS_ExecuteAction) = { EVT_SWITCH(LVar2) EVT_CASE_EQ(MOVE_SPINY_FLIP1) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) - EVT_EXEC_WAIT(N(spinyFlip)) + EVT_EXEC_WAIT(N(EVS_Move_SpinyFlip)) EVT_CASE_EQ(MOVE_SPINY_FLIP2) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) - EVT_EXEC_WAIT(N(spinyFlip)) + EVT_EXEC_WAIT(N(EVS_Move_SpinyFlip)) EVT_CASE_EQ(MOVE_SPINY_FLIP3) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) - EVT_EXEC_WAIT(N(spinyFlip)) + EVT_EXEC_WAIT(N(EVS_Move_SpinyFlip)) EVT_CASE_EQ(MOVE_SPINY_SURGE) - EVT_EXEC_WAIT(N(spinySurge)) + EVT_EXEC_WAIT(N(EVS_Move_SpinySurge)) EVT_CASE_EQ(MOVE_CLOUD_NINE) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) - EVT_EXEC_WAIT(N(cloudNine)) + EVT_EXEC_WAIT(N(EVS_Move_CloudNine)) EVT_CASE_EQ(MOVE_HURRICANE) - EVT_EXEC_WAIT(N(hurricane)) + EVT_EXEC_WAIT(N(EVS_Move_Hurricane)) EVT_END_SWITCH EVT_RETURN EVT_END @@ -378,7 +364,22 @@ EvtScript N(EVS_ReturnHome) = { EVT_END }; -HudScript* N(aimHudScripts)[] = { &HES_AimBlinkA }; +HudScript* N(AimDotHudScripts)[] = { + &HES_AimBlinkA +}; + +API_CALLABLE(N(SpinyFlipUpdatePopup)) { + if (isInitialCall) { + SpinyFlipTargetingDone = FALSE; + } + + if (!SpinyFlipTargetingDone) { + btl_set_popup_duration(99); + return ApiStatus_BLOCK; + } else { + return ApiStatus_DONE2; + } +} API_CALLABLE(N(SpinyFlipActionCommand)) { BattleStatus* battleStatus = &gBattleStatus; @@ -389,8 +390,8 @@ API_CALLABLE(N(SpinyFlipActionCommand)) { ActorState* playerState; ActorState* partnerState; f32 speed; - f32 dpadAngle; - s32 dpadAmplitude; + f32 stickAngle; + s32 stickMagnitude; s32 id; s32 i; @@ -409,27 +410,33 @@ API_CALLABLE(N(SpinyFlipActionCommand)) { s32 temp_v1_2; s32* var_s0; + enum SpinyFlipState { + SPINY_FLIP_INIT = 0, + SPINY_FLIP_DELAY = 1, // give player time to start aiming + SPINY_FLIP_AIMING = 2, // player is aiming + }; + partnerState = &partner->state; playerState = &battleStatus->playerActor->state; if (isInitialCall) { - script->functionTemp[0] = 0; + script->functionTemp[0] = SPINY_FLIP_INIT; } switch (script->functionTemp[0]) { - case 0: - hudAimReticle = hud_element_create(&HES_AimReticle); - hud_element_set_render_depth(hudAimReticle, 10); - hudAimTarget = hud_element_create(&HES_AimTarget); - hud_element_set_render_depth(hudAimTarget, 10); - hud_element_create_transform_A(hudAimTarget); - hudStickPosX = -48; - hudStickPosY = 70; - hudStick = id = hud_element_create(&HES_StickNeutral); - hud_element_set_render_pos(id, hudStickPosX, hudStickPosY); + case SPINY_FLIP_INIT: + HID_AimReticle = hud_element_create(&HES_AimReticle); + hud_element_set_render_depth(HID_AimReticle, 10); + HID_AimTarget = hud_element_create(&HES_AimTarget); + hud_element_set_render_depth(HID_AimTarget, 10); + hud_element_create_transform_A(HID_AimTarget); + HudStickPosX = -48; + HudStickPosY = 70; + HID_AnalogStick = id = hud_element_create(&HES_StickNeutral); + hud_element_set_render_pos(id, HudStickPosX, HudStickPosY); hud_element_set_render_depth(id, 0); - for (i = 0; i < ARRAY_COUNT(N(aimHudScripts)); i++) { - hudAim[i] = idAim = hud_element_create(N(aimHudScripts)[i]); + for (i = 0; i < ARRAY_COUNT(N(AimDotHudScripts)); i++) { + hudAim[i] = idAim = hud_element_create(N(AimDotHudScripts)[i]); hud_element_set_render_depth(idAim, 10); } partnerState->curPos.x = partner->curPos.x + 33.0f; @@ -438,9 +445,9 @@ API_CALLABLE(N(SpinyFlipActionCommand)) { partnerState->unk_18.x = partner->curPos.x + 33.0f; partnerState->unk_18.y = partner->curPos.y + 34.0f; partnerState->unk_18.z = partner->curPos.z + 15.0f; - set_goal_pos_to_part(partnerState, partner->targetActorID, partner->targetPartIndex); + set_goal_pos_to_part(partnerState, partner->targetActorID, partner->targetPartID); target = get_actor(partner->targetActorID); - part = get_actor_part(target, partner->targetPartIndex); + part = get_actor_part(target, partner->targetPartID); partnerState->goalPos.x += part->projectileTargetOffset.x; partnerState->goalPos.y += part->projectileTargetOffset.y; partnerState->goalPos.z = partnerState->goalPos.z; // required to match @@ -451,47 +458,47 @@ API_CALLABLE(N(SpinyFlipActionCommand)) { partnerState->speed = 0.0f; partnerState->velStep.x = 0.0f; partnerState->velStep.y = 0.0f; - sTargetMarkRotation = 0; + TargetMarkRotation = 0; D_8023D294 = 0; - sAimingTimer = 30; + AimingTime = 30; D_8023D2A0 = 0.0f; D_8023D2A4 = 0.0f; D_8023D2A8 = 0.0f; D_8023D2AC = 0.0f; D_8023D29C = 0; D_8023D2B0 = 3.0f; - sAimMoveAngle = -1.0f; + AimMoveAngle = -1.0f; partnerState->unk_24 = ((part->size.y + part->size.x) / 2) / 24.0; - hud_element_set_scale(hudAimTarget, partnerState->unk_24 * target->scalingFactor); - sSpinyFlipStarted = 1; - script->functionTemp[0] = 1; + hud_element_set_scale(HID_AimTarget, partnerState->unk_24 * target->scalingFactor); + SpinyFlipTargetingDone = TRUE; + script->functionTemp[0] = SPINY_FLIP_DELAY; break; - case 1: + case SPINY_FLIP_DELAY: if (battleStatus->stickX != 0 || battleStatus->stickY != 0) { - sAimingTimer = 0; + AimingTime = 0; } - if (sAimingTimer != 0) { - sAimingTimer--; + if (AimingTime != 0) { + AimingTime--; } else { - sAimingTimer = (s32)(80 * DT); - hud_element_set_script(hudStick, &HES_StickTapRight); + AimingTime = (s32)(80 * DT); + hud_element_set_script(HID_AnalogStick, &HES_StickTapRight); sfx_play_sound_at_position(SOUND_AIM_SPINY_FLIP, SOUND_SPACE_DEFAULT, 0.0f, 0.0f, 0.0f); - script->functionTemp[0] = 2; + script->functionTemp[0] = SPINY_FLIP_AIMING; } break; - case 2: - dpadAmplitude = battleStatus->dpadY; - if (dpadAmplitude > 80) { - dpadAmplitude = 80; + case SPINY_FLIP_AIMING: + stickMagnitude = battleStatus->stickMagnitude; + if (stickMagnitude > 80) { + stickMagnitude = 80; } - dpadAngle = battleStatus->dpadX; - if (dpadAmplitude < 35) { - f32 temp = dpadAmplitude; - dpadAmplitude = temp * sin_rad(DEG_TO_RAD(dpadAmplitude * 2)); + stickAngle = battleStatus->stickAngle; + if (stickMagnitude < 35) { + f32 temp = stickMagnitude; + stickMagnitude = temp * sin_rad(DEG_TO_RAD(stickMagnitude * 2)); } temp_f8 = D_8023D2A0; temp_f2 = temp_f8 + D_8023D2A4 + D_8023D2A8; - D_8023D2A0 = dpadAmplitude; + D_8023D2A0 = stickMagnitude; D_8023D2A8 = D_8023D2A4; temp_f10 = D_8023D2A0 - (temp_f2 / 3.0f); D_8023D2A4 = temp_f8; @@ -502,23 +509,23 @@ API_CALLABLE(N(SpinyFlipActionCommand)) { } else { partner->state.speed += (D_8023D2AC / 8.5) / 2.0; } - sAimMoveAngle = dpadAngle; + AimMoveAngle = stickAngle; } else { D_8023D2AC = temp_f10; } - if (!(dpadAmplitude < 31)) { - sAimMoveAngle = dpadAngle; + if (!(stickMagnitude < 31)) { + AimMoveAngle = stickAngle; } if (partnerState->speed > 6.7) { - partnerState->speed = 6.7f; + partnerState->speed = 6.7; } - partnerState->speed = partnerState->speed - (f32) ((2.0 * (40 - dpadAmplitude)) / 40.0); + partnerState->speed -= (f32) ((2.0 * (40 - stickMagnitude)) / 40.0); if (partnerState->speed <= 0.0f) { partnerState->speed = 0.0f; D_8023D2AC = 0.0f; } - if (sAimMoveAngle >= 0.0f) { - theta = DEG_TO_RAD(sAimMoveAngle); + if (AimMoveAngle >= 0.0f) { + theta = DEG_TO_RAD(AimMoveAngle); sinTheta = sin_rad(theta); cosTheta = cos_rad(theta); speed = partnerState->speed; @@ -538,16 +545,16 @@ API_CALLABLE(N(SpinyFlipActionCommand)) { partnerState->curPos.y = 0.0f; } if (battleStatus->curButtonsPressed & BUTTON_A) { - sAimingTimer = 0; + AimingTime = 0; } - if (sAimingTimer == 60) { + if (AimingTime == 60) { set_actor_anim(ACTOR_PARTNER, 0, ANIM_BattleLakilester_HoldSpiny); } - if (sAimingTimer == 30) { + if (AimingTime == 30) { set_actor_anim(ACTOR_PARTNER, 0, ANIM_BattleLakilester_StrainHoldSpiny); } - if (sAimingTimer != 0) { - sAimingTimer--; + if (AimingTime != 0) { + AimingTime--; break; } script->varTable[14] = 0; @@ -559,10 +566,10 @@ API_CALLABLE(N(SpinyFlipActionCommand)) { if (partnerState->dist <= 12.0) { script->varTable[15] = 1; } - hud_element_free(hudAimTarget); - hud_element_free(hudAimReticle); - hud_element_free(hudStick); - for (i = 0; i < ARRAY_COUNT(N(aimHudScripts)); i++) { + hud_element_free(HID_AimTarget); + hud_element_free(HID_AimReticle); + hud_element_free(HID_AnalogStick); + for (i = 0; i < ARRAY_COUNT(N(AimDotHudScripts)); i++) { id = hudAim[i]; hud_element_free(id); } @@ -574,34 +581,36 @@ API_CALLABLE(N(SpinyFlipActionCommand)) { get_screen_coords(gCurrentCameraID, partnerState->goalPos.x, partnerState->goalPos.y, partnerState->goalPos.z, &screenX, &screenY, &screenZ); - id = hudAimTarget; + id = HID_AimTarget; hud_element_set_render_pos(id, screenX, screenY); - hud_element_set_transform_rotation(id, 0.0f, 0.0f, sTargetMarkRotation); - sTargetMarkRotation -= 10; - sTargetMarkRotation = clamp_angle(sTargetMarkRotation); + hud_element_set_transform_rotation(id, 0.0f, 0.0f, TargetMarkRotation); + TargetMarkRotation -= 10; + TargetMarkRotation = clamp_angle(TargetMarkRotation); get_screen_coords(gCurrentCameraID, partnerState->curPos.x, partnerState->curPos.y, partnerState->curPos.z, &screenX, &screenY, &screenZ); - hud_element_set_render_pos(hudAimReticle, screenX, screenY); + hud_element_set_render_pos(HID_AimReticle, screenX, screenY); + // show analog stick hud element switch (script->functionTemp[0]) { - case 1: - case 2: - hudStickPosX += 20; - if (hudStickPosX > 50) { - hudStickPosX = 50; + case SPINY_FLIP_DELAY: + case SPINY_FLIP_AIMING: + HudStickPosX += 20; + if (HudStickPosX > 50) { + HudStickPosX = 50; } - hud_element_set_render_pos(hudStick, hudStickPosX, hudStickPosY); + hud_element_set_render_pos(HID_AnalogStick, HudStickPosX, HudStickPosY); break; } + // show aim dot hud element in center of switch (script->functionTemp[0]) { - case 1: - case 2: + case SPINY_FLIP_DELAY: + case SPINY_FLIP_AIMING: playerState->curPos.x = partnerState->curPos.x; playerState->curPos.y = partnerState->curPos.y; playerState->curPos.z = partnerState->curPos.z; - for (i = 0; i < ARRAY_COUNT(N(aimHudScripts)); i++) { + for (i = 0; i < ARRAY_COUNT(N(AimDotHudScripts)); i++) { get_screen_coords(gCurrentCameraID, playerState->curPos.x, playerState->curPos.y, playerState->curPos.z, &screenX, &screenY, &screenZ); id = hudAim[i]; hud_element_set_render_pos(id, screenX, screenY); @@ -633,14 +642,14 @@ API_CALLABLE(N(GetSpinySurgeDamage)) { s32 damage = 0; switch (partnerLevel) { - case 0: + case PARTNER_RANK_NORMAL: if (actionCommandResult <= 99) { damage = 1; } else { damage = 2; } break; - case 1: + case PARTNER_RANK_SUPER: if (actionCommandResult <= 70) { damage = 1; } else if (actionCommandResult <= 99) { @@ -649,7 +658,7 @@ API_CALLABLE(N(GetSpinySurgeDamage)) { damage = 3; } break; - case 2: + case PARTNER_RANK_ULTRA: if (actionCommandResult <= 40) { damage = 1; } else if (actionCommandResult <= 70) { @@ -685,7 +694,7 @@ API_CALLABLE(N(RemoveCloudNineFX)) { return ApiStatus_DONE2; } -API_CALLABLE(N(CloudNineFX)) { +API_CALLABLE(N(SpawnCloudNineFX)) { BattleStatus* battleStatus = &gBattleStatus; Actor* actor = battleStatus->playerActor; @@ -824,7 +833,7 @@ API_CALLABLE(N(CanTargetBeBlown)) { return ApiStatus_DONE2; } -EvtScript N(spinyFlip) = { +EvtScript N(EVS_Move_SpinyFlip) = { EVT_THREAD EVT_CALL(N(SpinyFlipUpdatePopup)) EVT_END_THREAD @@ -883,11 +892,11 @@ EvtScript N(spinyFlip) = { EVT_CALL(SetActorVar, ACTOR_PARTNER, AVAR_Unk_0, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_ThrowSpiny) EVT_WAIT(3) - EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 2, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_SET(LVarF, -1) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_201B) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_LAKILESTER_THROW_SPINY_A) EVT_SWITCH(LVarF) EVT_CASE_EQ(-1) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_BattleLakilester_SpinySpin) @@ -929,7 +938,7 @@ EvtScript N(spinyFlip) = { EVT_END_SWITCH EVT_SWITCH(LVarF) EVT_CASE_GT(0) - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_SPINY_SURGE | DAMAGE_TYPE_NO_CONTACT, 0, 0, LVarE, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_40) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_SPINY_SURGE | DAMAGE_TYPE_NO_CONTACT, 0, 0, LVarE, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT EVT_SET(LVar0, HIT_RESULT_NO_DAMAGE) EVT_END_SWITCH @@ -941,8 +950,8 @@ EvtScript N(spinyFlip) = { EVT_END_SWITCH EVT_WAIT(15) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_EXEC_WAIT(N(returnHome2)) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -954,7 +963,7 @@ EvtScript N(spinyFlip) = { EVT_END }; -EvtScript N(spinySurge) = { +EvtScript N(EVS_Move_SpinySurge) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_SPINY_SURGE) EVT_CALL(action_command_spiny_surge_init) EVT_CALL(GetActorLevel, ACTOR_PARTNER, LVar0) @@ -1024,10 +1033,10 @@ EvtScript N(spinySurge) = { EVT_BREAK_SWITCH EVT_END_IF EVT_IF_EQ(LFlag2, FALSE) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_201B) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_LAKILESTER_THROW_SPINY_A) EVT_SET(LFlag2, TRUE) EVT_ELSE - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_201C) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_LAKILESTER_THROW_SPINY_B) EVT_SET(LFlag2, FALSE) EVT_END_IF EVT_CALL(N(ThrowSpinyFX)) @@ -1066,7 +1075,7 @@ EvtScript N(spinySurge) = { EVT_CALL(InitTargetIterator) EVT_LABEL(0) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) - EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 2, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_GOTO(12) EVT_END_IF @@ -1074,9 +1083,9 @@ EvtScript N(spinySurge) = { EVT_CALL(N(GetSpinySurgeDamage)) EVT_SWITCH(LVar0) EVT_CASE_GT(0) - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_SPINY_SURGE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, LVarF, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_40) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_SPINY_SURGE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, LVarF, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_SPINY_SURGE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, LVarF, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_SPINY_SURGE | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, LVarF, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_GT(0) @@ -1093,8 +1102,8 @@ EvtScript N(spinySurge) = { EVT_WAIT(30) EVT_LABEL(13) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_EXEC_WAIT(N(returnHome2)) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -1163,8 +1172,8 @@ EvtScript N(cloudNine_normal) = { EVT_CALL(GetPartnerActionSuccess, LVarA) EVT_IF_GT(LVarA, 0) EVT_CALL(N(RemoveCloudNineFX)) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_201D) - EVT_CALL(N(CloudNineFX)) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_LAKILESTER_MAKE_CLOUD_NINE) + EVT_CALL(N(SpawnCloudNineFX)) EVT_CALL(N(ApplyCloudNine)) EVT_CALL(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_SHOW_STATUS_ICONS, TRUE) EVT_END_IF @@ -1277,8 +1286,8 @@ EvtScript N(cloudNine_immobile) = { EVT_CALL(MoveBattleCamOver, 5) EVT_CALL(GetPartnerActionSuccess, LVarA) EVT_IF_GT(LVarA, 0) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_201D) - EVT_CALL(N(CloudNineFX)) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_LAKILESTER_MAKE_CLOUD_NINE) + EVT_CALL(N(SpawnCloudNineFX)) EVT_CALL(N(ApplyCloudNine)) EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) @@ -1333,7 +1342,7 @@ EvtScript N(cloudNine_immobile) = { EVT_END }; -EvtScript N(cloudNine) = { +EvtScript N(EVS_Move_CloudNine) = { EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAGS_IMMOBILIZED) EVT_EXEC_WAIT(N(cloudNine_immobile)) @@ -1484,7 +1493,7 @@ API_CALLABLE(N(ProcessHurricane)) { sHuffPuffBreathEffect->data.huffPuffBreath->pos.z = NPC_DISPOSE_POS_Z; if (script->functionTemp[2] != 0) { - sfx_play_sound_at_position(SOUND_201E, SOUND_SPACE_DEFAULT, partner->curPos.x, partner->curPos.y, partner->curPos.z); + sfx_play_sound_at_position(SOUND_LAKILESTER_HURRICANE_INHALE, SOUND_SPACE_DEFAULT, partner->curPos.x, partner->curPos.y, partner->curPos.z); } script->functionTemp[2] = 0; @@ -1507,7 +1516,7 @@ API_CALLABLE(N(ProcessHurricane)) { sHuffPuffBreathEffect->data.huffPuffBreath->speedX = 2.0f; if (script->functionTemp[2] == 0) { - sfx_play_sound_at_position(SOUND_201F, SOUND_SPACE_DEFAULT, partner->curPos.x, partner->curPos.y, partner->curPos.z); + sfx_play_sound_at_position(SOUND_LAKILESTER_HURRICANE_EXHALE, SOUND_SPACE_DEFAULT, partner->curPos.x, partner->curPos.y, partner->curPos.z); } script->functionTemp[2] = 1; @@ -1703,7 +1712,7 @@ API_CALLABLE(N(IsHurricaneActive)) { return ApiStatus_DONE2; } -EvtScript N(hurricane) = { +EvtScript N(EVS_Move_Hurricane) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_HURRICANE) EVT_CALL(action_command_hurricane_init) EVT_CALL(SetupMashMeter, 1, 100, 0, 0, 0, 0) @@ -1731,7 +1740,7 @@ EvtScript N(hurricane) = { EVT_CALL(SetBattleCamZoom, 430) EVT_CALL(MoveBattleCamOver, 150 * DT) EVT_CALL(func_8024ECF8, BTL_CAM_MODEY_0, BTL_CAM_MODEX_0, TRUE) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0288) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_LAKILESTER_HURRICANE_WIND) EVT_THREAD EVT_CALL(N(ProcessHurricane)) EVT_END_THREAD @@ -1768,7 +1777,7 @@ EvtScript N(hurricane) = { EVT_END_THREAD EVT_ELSE EVT_IF_EQ(LVar0, 0) - EVT_CALL(PartnerDamageEnemy, LVar2, DAMAGE_TYPE_NO_CONTACT, 0, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_FORCE_HIT_IMMUNE) + EVT_CALL(PartnerDamageEnemy, LVar2, DAMAGE_TYPE_NO_CONTACT, 0, 0, 0, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_FORCE_IMMUNE_HIT) EVT_END_IF EVT_END_IF EVT_LABEL(11) diff --git a/src/battle/partner/parakarry.c b/src/battle/partner/parakarry.c index 2e7c00771d..9f7741e67a 100644 --- a/src/battle/partner/parakarry.c +++ b/src/battle/partner/parakarry.c @@ -139,9 +139,9 @@ API_CALLABLE(N(ShellShotActionCommand)) { hud_element_set_render_pos(hudID, hudStickPosX, hudStickPosY); hud_element_set_render_depth(hudID, 0); - set_goal_pos_to_part(state, parakarry->targetActorID, parakarry->targetPartIndex); + set_goal_pos_to_part(state, parakarry->targetActorID, parakarry->targetPartID); targetActor = get_actor(parakarry->targetActorID); - targetActorPart = get_actor_part(targetActor, parakarry->targetPartIndex); + targetActorPart = get_actor_part(targetActor, parakarry->targetPartID); state->goalPos.x += targetActorPart->projectileTargetOffset.x * targetActor->scalingFactor; state->goalPos.y += targetActorPart->projectileTargetOffset.y * targetActor->scalingFactor; @@ -376,7 +376,7 @@ API_CALLABLE(N(AirLiftChance)) { BattleStatus* battleStatus = &gBattleStatus; Actor* partnerActor = battleStatus->partnerActor; Actor* targetActor = get_actor(partnerActor->targetActorID); - ActorPart* targetActorPart = get_actor_part(targetActor, partnerActor->targetPartIndex); + ActorPart* targetActorPart = get_actor_part(targetActor, partnerActor->targetPartID); s32 airLiftChance = targetActor->actorBlueprint->airLiftChance; s32 hpPercentLost = 100 - targetActor->curHP * 100 / targetActor->maxHP; @@ -444,7 +444,7 @@ API_CALLABLE(N(CarryAway)) { parakarry->state.moveTime = clamp_angle(parakarry->state.moveTime); if (gGameStatusPtr->frameCounter % 10 == 0) { - sfx_play_sound_at_position(SOUND_2009, SOUND_SPACE_DEFAULT, parakarry->state.curPos.x, parakarry->state.curPos.y, parakarry->state.curPos.z); + sfx_play_sound_at_position(SOUND_PARAKARRY_FLAP, SOUND_SPACE_DEFAULT, parakarry->state.curPos.x, parakarry->state.curPos.y, parakarry->state.curPos.z); } if (parakarry->state.curPos.x > 240.0f) { @@ -507,9 +507,9 @@ API_CALLABLE(N(FlyAround)) { } if (script->functionTemp[3] != 0) { - sfx_play_sound_at_position(SOUND_200A, SOUND_SPACE_DEFAULT, state->curPos.x, state->curPos.y, state->curPos.z); + sfx_play_sound_at_position(SOUND_PARAKARRY_AIR_RAID_1, SOUND_SPACE_DEFAULT, state->curPos.x, state->curPos.y, state->curPos.z); } else { - sfx_play_sound_at_position(SOUND_200B, SOUND_SPACE_DEFAULT, state->curPos.x, state->curPos.y, state->curPos.z); + sfx_play_sound_at_position(SOUND_PARAKARRY_AIR_RAID_2, SOUND_SPACE_DEFAULT, state->curPos.x, state->curPos.y, state->curPos.z); } script->functionTemp[3] = 1 - script->functionTemp[3]; } @@ -529,9 +529,9 @@ API_CALLABLE(N(FlyAround)) { } while (0); if (script->functionTemp[3] != 0) { - sfx_play_sound_at_position(SOUND_200A, SOUND_SPACE_DEFAULT, state->curPos.x, state->curPos.y, state->curPos.z); + sfx_play_sound_at_position(SOUND_PARAKARRY_AIR_RAID_1, SOUND_SPACE_DEFAULT, state->curPos.x, state->curPos.y, state->curPos.z); } else { - sfx_play_sound_at_position(SOUND_200B, SOUND_SPACE_DEFAULT, state->curPos.x, state->curPos.y, state->curPos.z); + sfx_play_sound_at_position(SOUND_PARAKARRY_AIR_RAID_2, SOUND_SPACE_DEFAULT, state->curPos.x, state->curPos.y, state->curPos.z); } script->functionTemp[3] = 1 - script->functionTemp[3]; } @@ -551,9 +551,9 @@ API_CALLABLE(N(FlyAround)) { } while (0); // TODO macro? if (script->functionTemp[3] != 0) { - sfx_play_sound_at_position(SOUND_200A, SOUND_SPACE_DEFAULT, state->curPos.x, state->curPos.y, state->curPos.z); + sfx_play_sound_at_position(SOUND_PARAKARRY_AIR_RAID_1, SOUND_SPACE_DEFAULT, state->curPos.x, state->curPos.y, state->curPos.z); } else { - sfx_play_sound_at_position(SOUND_200B, SOUND_SPACE_DEFAULT, state->curPos.x, state->curPos.y, state->curPos.z); + sfx_play_sound_at_position(SOUND_PARAKARRY_AIR_RAID_2, SOUND_SPACE_DEFAULT, state->curPos.x, state->curPos.y, state->curPos.z); } script->functionTemp[3] = 1 - script->functionTemp[3]; } @@ -573,9 +573,9 @@ API_CALLABLE(N(FlyAround)) { } while (0); // TODO macro? if (script->functionTemp[3] != 0) { - sfx_play_sound_at_position(SOUND_200A, SOUND_SPACE_DEFAULT, state->curPos.x, state->curPos.y, state->curPos.z); + sfx_play_sound_at_position(SOUND_PARAKARRY_AIR_RAID_1, SOUND_SPACE_DEFAULT, state->curPos.x, state->curPos.y, state->curPos.z); } else { - sfx_play_sound_at_position(SOUND_200B, SOUND_SPACE_DEFAULT, state->curPos.x, state->curPos.y, state->curPos.z); + sfx_play_sound_at_position(SOUND_PARAKARRY_AIR_RAID_2, SOUND_SPACE_DEFAULT, state->curPos.x, state->curPos.y, state->curPos.z); } script->functionTemp[3] = 1 - script->functionTemp[3]; } @@ -947,7 +947,7 @@ EvtScript N(skyDive) = { EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Still) EVT_WAIT(3) EVT_CALL(action_command_jump_start, 32, 3) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_2004) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_PARAKARRY_PREDIVE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_52) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_FlyFast) EVT_CALL(AddGoalPos, ACTOR_PARTNER, 0, 10, 0) @@ -960,13 +960,13 @@ EvtScript N(skyDive) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_52) EVT_CALL(AddGoalPos, ACTOR_PARTNER, -26, 25, 0) EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, -20, EASING_QUARTIC_OUT) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_2005) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_PARAKARRY_DIVE) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_ENABLE) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(AddGoalPos, ACTOR_PARTNER, -10, 0, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_Dive) EVT_CALL(FlyToGoal, ACTOR_PARTNER, 5, 0, EASING_LINEAR) - EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_CHILD_THREAD EVT_WAIT(5) @@ -990,9 +990,9 @@ EvtScript N(skyDive) = { EVT_CALL(GetPartnerActionSuccess, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(0) - EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT, 0, LVarF, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_40) + EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT, 0, LVarF, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT - EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT, 0, LVarE, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT, 0, LVarE, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_SWITCH(LVar0) @@ -1001,8 +1001,8 @@ EvtScript N(skyDive) = { EVT_SET_CONST(LVarA, ANIM_BattleParakarry_Think) EVT_EXEC_WAIT(N(EVS_ReturnHome)) EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_SET_CONST(LVarA, ANIM_BattleParakarry_Dive) EVT_EXEC_WAIT(N(returnHome2)) EVT_END_CASE_GROUP @@ -1021,9 +1021,9 @@ EvtScript N(shellShot) = { EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_ShellFly) EVT_CALL(N(ShellShotActionCommand)) EVT_CALL(StopSound, SOUND_AIM_SHELL_SHOT) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_2006) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_PARAKARRY_SHELL_SHOT) EVT_CALL(GetActionQuality, LVar0) - EVT_CALL(PartnerTestEnemy, LVarA, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVarA, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVarA, HIT_RESULT_MISS) EVT_SET(LVar0, -2) EVT_END_IF @@ -1067,7 +1067,7 @@ EvtScript N(shellShot) = { EVT_CALL(N(GetShellShotDamage)) EVT_SWITCH(LVar0) EVT_CASE_GT(0) - 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_ALT_SPIKY, 0, LVarF, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_40) + EVT_CALL(PartnerDamageEnemy, LVar0, 0, SUPPRESS_EVENTS_KOOPER_DAMAGE, 0, LVarF, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_HIT_RATTLE) EVT_CASE_DEFAULT EVT_SET(LVar0, HIT_RESULT_NO_DAMAGE) @@ -1084,8 +1084,8 @@ EvtScript N(shellShot) = { EVT_END_IF EVT_EXEC_WAIT(N(EVS_ReturnHome)) EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_SET_CONST(LVarA, ANIM_BattleParakarry_ShellFly) EVT_EXEC_WAIT(N(returnHome2)) EVT_END_CASE_GROUP @@ -1124,7 +1124,7 @@ EvtScript N(airLift) = { EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleParakarry_LiftLight) EVT_CALL(SetAnimationRate, ACTOR_PARTNER, 0, EVT_FLOAT(2.0)) EVT_WAIT(2) - EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT, 0, 1, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_CALL(CloseActionCommandInfo) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_51) @@ -1145,7 +1145,7 @@ EvtScript N(airLift) = { EVT_RETURN EVT_END_IF EVT_WAIT(3) - EVT_CALL(PartnerTestEnemy, LVar0, DAMAGE_TYPE_AIR_LIFT, SUPPRESS_EVENT_SPIKY_FRONT, 0, 0, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(PartnerTestEnemy, LVar0, DAMAGE_TYPE_AIR_LIFT, SUPPRESS_EVENT_SPIKY_FRONT, 0, 0, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(N(AirLiftChance)) EVT_IF_NE(LVar0, -1) EVT_CALL(action_command_air_lift_start, 0, 87 * DT, 3, 0) @@ -1259,17 +1259,17 @@ EvtScript N(airRaid) = { EVT_CALL(InitTargetIterator) EVT_LABEL(10) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, 6) EVT_GOTO(11) EVT_END_IF EVT_CALL(GetPartnerActionSuccess, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(99) - 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_ALT_SPIKY, 0, LVarF, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_40) + 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_ALT_SPIKY, 0, LVarF, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_HIT_RATTLE) 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_ALT_SPIKY, 0, LVarF, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE) + 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_ALT_SPIKY, 0, LVarF, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_NONE) EVT_WAIT(5) diff --git a/src/battle/partner/sushie.c b/src/battle/partner/sushie.c index 1c10419486..ebc6880645 100644 --- a/src/battle/partner/sushie.c +++ b/src/battle/partner/sushie.c @@ -34,8 +34,8 @@ API_CALLABLE(N(SetSquirtAngle)) { ActorPart* targetPart; Actor* partner = gBattleStatus.partnerActor; - set_goal_pos_to_part(&partner->state, partner->targetActorID, partner->targetPartIndex); - targetPart = get_actor_part(get_actor(partner->targetActorID), partner->targetPartIndex); + set_goal_pos_to_part(&partner->state, partner->targetActorID, partner->targetPartID); + targetPart = get_actor_part(get_actor(partner->targetActorID), partner->targetPartID); partner->state.goalPos.x += targetPart->projectileTargetOffset.x; partner->state.goalPos.y += targetPart->projectileTargetOffset.y; @@ -889,7 +889,7 @@ EvtScript N(bellyFlop) = { EVT_SET(LVarE, 3) EVT_SET(LVarF, 5) EVT_END_SWITCH - EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_CALL(SetActorScale, ACTOR_PARTNER, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_CALL(LandJump, ACTOR_PARTNER) @@ -913,9 +913,9 @@ EvtScript N(bellyFlop) = { EVT_CALL(GetPartnerActionSuccess, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(0) - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, SUPPRESS_EVENT_SPIKY_FRONT, 0, LVarF, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_40) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, SUPPRESS_EVENT_SPIKY_FRONT, 0, LVarF, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, SUPPRESS_EVENT_SPIKY_FRONT, 0, LVarE, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_JUMP, SUPPRESS_EVENT_SPIKY_FRONT, 0, LVarE, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -923,8 +923,8 @@ EvtScript N(bellyFlop) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_51) EVT_EXEC_WAIT(N(EVS_ReturnHome)) EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 8) EVT_EXEC_WAIT(N(returnHome2)) @@ -985,7 +985,7 @@ EvtScript N(squirt) = { EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_SUSHIE_SQUIRT) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 10) - EVT_CALL(PartnerTestEnemy, LVar0, DAMAGE_TYPE_WATER | DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, DAMAGE_TYPE_WATER | DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleSushie_Squirt) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -1013,10 +1013,10 @@ EvtScript N(squirt) = { EVT_CALL(N(GetSquirtDamage)) EVT_SWITCH(LVar0) EVT_CASE_GT(0) - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_WATER | DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_EXPLODE_CONTACT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_FLAG_200, 0, LVarF, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_40) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_WATER | DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_EXPLODE_CONTACT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_FLAG_200, 0, LVarF, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_HIT_RATTLE) EVT_CASE_DEFAULT - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_WATER | DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_EXPLODE_CONTACT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_FLAG_200, 0, LVarF, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_WATER | DAMAGE_TYPE_NO_CONTACT, SUPPRESS_EVENT_EXPLODE_CONTACT | SUPPRESS_EVENT_BURN_CONTACT | SUPPRESS_EVENT_FLAG_200, 0, LVarF, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_HIT_RATTLE) EVT_END_SWITCH EVT_SWITCH(LVar0) @@ -1024,8 +1024,8 @@ EvtScript N(squirt) = { EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_EXEC_WAIT(N(restoreFromSquirt)) EVT_END_CASE_GROUP - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_EXEC_WAIT(N(restoreFromSquirt2)) EVT_END_CASE_GROUP EVT_END_SWITCH @@ -1203,15 +1203,15 @@ EvtScript N(tidalWave) = { EVT_CALL(InitTargetIterator) EVT_LOOP(0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) - EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 2, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 2, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_GOTO(10) EVT_END_IF EVT_SWITCH(LVarE) EVT_CASE_GE(6) - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_WATER | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, LVarF, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_40) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_WATER | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, LVarF, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_WATER | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, LVarF, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_WATER | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS, 0, 0, LVarF, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_WAIT(5) EVT_LABEL(10) diff --git a/src/battle/partner/twink.c b/src/battle/partner/twink.c index 8f919a9444..1e977d3588 100644 --- a/src/battle/partner/twink.c +++ b/src/battle/partner/twink.c @@ -12,29 +12,26 @@ extern EvtScript N(EVS_HandleEvent); extern EvtScript N(EVS_HandlePhase); extern EvtScript N(EVS_ExecuteAction); extern EvtScript N(EVS_Celebrate); -extern EvtScript N(runAway); -extern EvtScript N(runAwayFail); +extern EvtScript N(EVS_RunAway); +extern EvtScript N(EVS_RunAwayFail); enum N(ActorPartIDs) { - PRT_MAIN = 1, + PRT_MAIN = 1, }; enum N(ActorVars) { - AVAR_Unk_0 = 0, - AVAR_Unk_1 = 1, + AVAR_Twink_PowerLevel = 0, + AVAR_Twink_DefensePtr = 1, + AVAR_Kammy_Speaking = 1, }; -enum N(ActorParams) { - DMG_UNK = 0, -}; - -API_CALLABLE(func_80238000_714CF0) { +API_CALLABLE(N(IsPeachBattle)) { BattleStatus* battleStatus = &gBattleStatus; if (battleStatus->flags2 & BS_FLAGS2_PEACH_BATTLE) { - script->varTable[0] = 1; + script->varTable[0] = TRUE; } else { - script->varTable[0] = 0; + script->varTable[0] = FALSE; } return ApiStatus_DONE2; @@ -119,32 +116,32 @@ EvtScript N(EVS_Init) = { EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(EVS_Idle))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(EVS_HandleEvent))) EVT_CALL(BindHandlePhase, ACTOR_SELF, EVT_PTR(N(EVS_HandlePhase))) - EVT_CALL(func_80238000_714CF0) - EVT_IF_NE(LVar0, 1) + EVT_CALL(N(IsPeachBattle)) + EVT_IF_NE(LVar0, TRUE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_ATTACK, TRUE) EVT_END_IF - EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Unk_0, 0) - EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Unk_1, EVT_PTR(N(DefenseTable))) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Twink_PowerLevel, 0) + EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Twink_DefensePtr, EVT_PTR(N(DefenseTable))) EVT_CALL(AddActorDecoration, ACTOR_SELF, PRT_MAIN, 0, ACTOR_DECORATION_SPARKLES) EVT_CALL(ModifyActorDecoration, ACTOR_SELF, PRT_MAIN, 0, 0, 0, 0, 0) EVT_RETURN EVT_END }; -s32 D_802382F8_714FE8 = 0; +s32 N(BobPhase) = 0; -API_CALLABLE(func_80238028_714D18) { +API_CALLABLE(N(AddFlightBobbing)) { Actor* actor = get_actor(script->owner1.actorID); - D_802382F8_714FE8 += 18; - D_802382F8_714FE8 = clamp_angle(D_802382F8_714FE8); - actor->verticalRenderOffset = 2.0f * sin_rad(DEG_TO_RAD(D_802382F8_714FE8)); + N(BobPhase) += 18; + N(BobPhase) = clamp_angle(N(BobPhase)); + actor->verticalRenderOffset = 2.0f * sin_rad(DEG_TO_RAD(N(BobPhase))); return ApiStatus_DONE2; } EvtScript N(EVS_Idle) = { EVT_LOOP(0) - EVT_CALL(func_80238028_714D18) + EVT_CALL(N(AddFlightBobbing)) EVT_WAIT(1) EVT_END_LOOP EVT_RETURN @@ -188,9 +185,9 @@ EvtScript N(EVS_TakeTurn) = { EVT_CASE_EQ(PHASE_CELEBRATE) EVT_EXEC_WAIT(N(EVS_Celebrate)) EVT_CASE_EQ(PHASE_RUN_AWAY_START) - EVT_EXEC_WAIT(N(runAway)) + EVT_EXEC_WAIT(N(EVS_RunAway)) EVT_CASE_EQ(PHASE_RUN_AWAY_FAIL) - EVT_EXEC_WAIT(N(runAwayFail)) + EVT_EXEC_WAIT(N(EVS_RunAwayFail)) EVT_END_SWITCH EVT_RETURN EVT_END @@ -205,7 +202,7 @@ EvtScript N(EVS_Celebrate) = { EVT_END }; -EvtScript N(runAway) = { +EvtScript N(EVS_RunAway) = { EVT_SET_CONST(LVar0, PRT_MAIN) EVT_SET_CONST(LVar1, ANIM_Twink_Angry) EVT_EXEC_WAIT(EVS_Partner_RunAway) @@ -213,7 +210,7 @@ EvtScript N(runAway) = { EVT_END }; -EvtScript N(runAwayFail) = { +EvtScript N(EVS_RunAwayFail) = { EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(6.0)) @@ -234,7 +231,7 @@ EvtScript N(EVS_HandlePhase) = { EvtScript N(EVS_ExecuteAction) = { EVT_CALL(EnableIdleScript, ACTOR_PARTNER, IDLE_SCRIPT_DISABLE) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) - EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_FLY, SOUND_207F, SOUND_TWINK_FLY_B) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_FLY, SOUND_TWINK_FLY_A, SOUND_TWINK_FLY_B) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_52) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(InitTargetIterator) @@ -255,20 +252,20 @@ EvtScript N(EVS_ExecuteAction) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_52) EVT_CALL(AddGoalPos, ACTOR_PARTNER, -40, 15, 0) EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, -20, EASING_QUARTIC_OUT) - EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Unk_0, LVarF) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Twink_PowerLevel, LVarF) EVT_IF_GT(LVarF, 1) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_ENABLE) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_207E) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_TWINK_ATTACK) EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(AddGoalPos, ACTOR_PARTNER, -10, 0, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_Twink_Angry) EVT_CALL(FlyToGoal, ACTOR_PARTNER, 5, 0, EASING_LINEAR) - EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Unk_0, LVarF) + EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Twink_PowerLevel, LVarF) EVT_IF_GT(LVarF, 0) - EVT_CALL(PartnerDamageEnemy, LVar0, 0, 0, 0, LVarF, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, 0, 0, 0, LVarF, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_ELSE - EVT_CALL(PartnerDamageEnemy, LVar0, 0, 0, 0, LVarF, BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10) + EVT_CALL(PartnerDamageEnemy, LVar0, 0, 0, 0, LVarF, BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_INCLUDE_POWER_UPS) EVT_END_IF EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_03) EVT_CALL(MoveBattleCamOver, 10) @@ -279,12 +276,12 @@ EvtScript N(EVS_ExecuteAction) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_LOOP(0) EVT_WAIT(1) - EVT_CALL(GetActorVar, ACTOR_ENEMY0, AVAR_Unk_1, LVar0) + EVT_CALL(GetActorVar, ACTOR_ENEMY0, AVAR_Kammy_Speaking, LVar0) EVT_IF_EQ(LVar0, 0) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_FLY, SOUND_207F, SOUND_TWINK_FLY_B) + EVT_CALL(SetActorSounds, ACTOR_PARTNER, ACTOR_SOUND_FLY, SOUND_TWINK_FLY_A, SOUND_TWINK_FLY_B) EVT_CALL(SetGoalToHome, ACTOR_PARTNER) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_Twink_Angry) EVT_CALL(SetActorSpeed, ACTOR_PARTNER, EVT_FLOAT(8.0)) diff --git a/src/battle/partner/watt.c b/src/battle/partner/watt.c index cdfbca925f..4d6fdcf68d 100644 --- a/src/battle/partner/watt.c +++ b/src/battle/partner/watt.c @@ -11,19 +11,19 @@ #define NAMESPACE battle_partner_watt -extern EvtScript N(EVS_HandleEvent); +extern EvtScript N(EVS_Init); extern EvtScript N(EVS_Idle); +extern EvtScript N(EVS_HandleEvent); extern EvtScript N(EVS_HandlePhase); extern EvtScript N(EVS_TakeTurn); -extern EvtScript N(EVS_Init); extern EvtScript N(EVS_ExecuteAction); extern EvtScript N(EVS_Celebrate); -extern EvtScript N(runAway); -extern EvtScript N(runAwayFail); -extern EvtScript N(electroDash); -extern EvtScript N(powerShock); -extern EvtScript N(turboCharge); -extern EvtScript N(megaShock); +extern EvtScript N(EVS_RunAway); +extern EvtScript N(EVS_RunAwayFail); +extern EvtScript N(EVS_Attack_ElectroDash); +extern EvtScript N(EVS_Attack_PowerShock); +extern EvtScript N(EVS_Attack_MegaShock); +extern EvtScript N(EVS_Move_TurboCharge); extern EffectInstance* N(radialShimmer); extern s32 D_8023B948_707438[]; @@ -41,8 +41,8 @@ static EffectInstance* sWattEffectData_effect1; static EffectInstance* sWattEffectData_effect2; enum N(ActorPartIDs) { - PRT_MAIN = 1, - PRT_2 = 2, + PRT_MAIN = 1, + PRT_2 = 2, }; API_CALLABLE(N(WattFXUpdate)) { @@ -72,7 +72,7 @@ API_CALLABLE(N(WattFXUpdate)) { x = partner->curPos.x + partner->headOffset.x; y = partner->curPos.y + partner->headOffset.y + partner->verticalRenderOffset + 12.0f; z = partner->curPos.z + partner->headOffset.z; - if ((gBattleStatus.flags2 & (BS_FLAGS2_10 | BS_FLAGS2_PARTNER_TURN_USED)) == BS_FLAGS2_PARTNER_TURN_USED) { + if (!(gBattleStatus.flags2 & BS_FLAGS2_OVERRIDE_INACTIVE_PARTNER) && (gBattleStatus.flags2 & BS_FLAGS2_PARTNER_TURN_USED)) { y = NPC_DISPOSE_POS_Y; } @@ -219,7 +219,7 @@ API_CALLABLE(N(TargetParalyzeChance)) { BattleStatus* battleStatus = &gBattleStatus; Actor* partnerActor = battleStatus->partnerActor; Actor* targetActor = get_actor(partnerActor->targetActorID); - ActorPart* targetActorPart = get_actor_part(targetActor, partnerActor->targetPartIndex); + ActorPart* targetActorPart = get_actor_part(targetActor, partnerActor->targetPartID); s32 statusChance = lookup_status_chance(targetActor->statusTable, STATUS_KEY_PARALYZE); if (targetActor->transparentStatus == STATUS_KEY_TRANSPARENT) { @@ -630,9 +630,9 @@ EvtScript N(EVS_TakeTurn) = { EVT_CASE_EQ(PHASE_CELEBRATE) EVT_EXEC_WAIT(N(EVS_Celebrate)) EVT_CASE_EQ(PHASE_RUN_AWAY_START) - EVT_EXEC_WAIT(N(runAway)) + EVT_EXEC_WAIT(N(EVS_RunAway)) EVT_CASE_EQ(PHASE_RUN_AWAY_FAIL) - EVT_EXEC_WAIT(N(runAwayFail)) + EVT_EXEC_WAIT(N(EVS_RunAwayFail)) EVT_END_SWITCH EVT_RETURN EVT_END @@ -650,7 +650,7 @@ EvtScript N(EVS_Celebrate) = { EVT_END }; -EvtScript N(runAway) = { +EvtScript N(EVS_RunAway) = { EVT_CALL(N(WattFXEnable)) EVT_CALL(N(WattFXSetEffect), 1) EVT_SET_CONST(LVar0, PRT_MAIN) @@ -660,7 +660,7 @@ EvtScript N(runAway) = { EVT_END }; -EvtScript N(runAwayFail) = { +EvtScript N(EVS_RunAwayFail) = { EVT_CALL(N(WattFXEnable)) EVT_CALL(N(WattFXSetEffect), 1) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) @@ -694,17 +694,17 @@ EvtScript N(EVS_ExecuteAction) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar2) EVT_CASE_EQ(MOVE_ELECTRO_DASH1) - EVT_EXEC_WAIT(N(electroDash)) + EVT_EXEC_WAIT(N(EVS_Attack_ElectroDash)) EVT_CASE_EQ(MOVE_ELECTRO_DASH2) - EVT_EXEC_WAIT(N(electroDash)) + EVT_EXEC_WAIT(N(EVS_Attack_ElectroDash)) EVT_CASE_EQ(MOVE_ELECTRO_DASH3) - EVT_EXEC_WAIT(N(electroDash)) + EVT_EXEC_WAIT(N(EVS_Attack_ElectroDash)) EVT_CASE_EQ(MOVE_POWER_SHOCK) - EVT_EXEC_WAIT(N(powerShock)) + EVT_EXEC_WAIT(N(EVS_Attack_PowerShock)) EVT_CASE_EQ(MOVE_TURBO_CHARGE) - EVT_EXEC_WAIT(N(turboCharge)) + EVT_EXEC_WAIT(N(EVS_Move_TurboCharge)) EVT_CASE_EQ(MOVE_MEGA_SHOCK) - EVT_EXEC_WAIT(N(megaShock)) + EVT_EXEC_WAIT(N(EVS_Attack_MegaShock)) EVT_END_SWITCH EVT_RETURN EVT_END @@ -742,7 +742,7 @@ EvtScript N(dashToTarget) = { EvtScript N(charge) = { EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Strain) EVT_CALL(N(WattFXDisable)) - EVT_CALL(PlayLoopingSoundAtActor, ACTOR_PARTNER, 0, SOUND_0289) + EVT_CALL(PlayLoopingSoundAtActor, ACTOR_PARTNER, 0, SOUND_WATT_CHARGE) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 12) EVT_CALL(N(ElectroDashFX), LVar0, LVar1, LVar2) @@ -762,7 +762,7 @@ EvtScript N(charge) = { EVT_END }; -EvtScript N(electroDash_wait) = { +EvtScript N(EVS_ElectroDashDelay) = { EVT_LOOP(30) EVT_WAIT(1) EVT_END_LOOP @@ -770,7 +770,7 @@ EvtScript N(electroDash_wait) = { EVT_END }; -EvtScript N(electroDash) = { +EvtScript N(EVS_Attack_ElectroDash) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_BODY_SLAM) EVT_CALL(action_command_body_slam_init) EVT_CALL(SetupMashMeter, 1, 100, 0, 0, 0, 0) @@ -805,7 +805,7 @@ EvtScript N(electroDash) = { EVT_KILL_THREAD(LVarA) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT, 0, 1, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SET(LFlag0, FALSE) EVT_EXEC_GET_TID(N(charge), LVarA) EVT_LOOP(55) @@ -821,7 +821,7 @@ EvtScript N(electroDash) = { EVT_GOTO(10) EVT_END_IF EVT_IF_EQ(LFlag0, FALSE) - EVT_EXEC_GET_TID(N(electroDash_wait), LVarA) + EVT_EXEC_GET_TID(N(EVS_ElectroDashDelay), LVarA) EVT_LOOP(30) EVT_CALL(CheckButtonDown, BUTTON_A, LVar0) EVT_IF_EQ(LVar0, 0) @@ -858,7 +858,7 @@ EvtScript N(electroDash) = { EVT_KILL_THREAD(LVarA) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT, 0, 1, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_SET(LFlag0, FALSE) EVT_EXEC_GET_TID(N(charge), LVarA) EVT_LOOP(55) @@ -882,7 +882,7 @@ EvtScript N(electroDash) = { EVT_GOTO(10) EVT_END_IF EVT_IF_EQ(LFlag0, FALSE) - EVT_EXEC_GET_TID(N(electroDash_wait), LVarA) + EVT_EXEC_GET_TID(N(EVS_ElectroDashDelay), LVarA) EVT_LOOP(30) EVT_CALL(CheckButtonDown, BUTTON_A, LVar0) EVT_IF_EQ(LVar0, 0) @@ -912,7 +912,7 @@ EvtScript N(electroDash) = { EVT_WAIT(2) EVT_CALL(N(SetBackgroundAlpha), 0) EVT_END_THREAD - EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT, 0, 1, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_THREAD EVT_WAIT(5) @@ -945,14 +945,14 @@ EvtScript N(electroDash) = { EVT_CALL(GetPartnerActionSuccess, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(0) - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_SHOCK_CONTACT | SUPPRESS_EVENT_ALT_SPIKY, 0, LVarF, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_40) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_SHOCK_CONTACT | SUPPRESS_EVENT_ALT_SPIKY, 0, LVarF, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT - EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_SHOCK_CONTACT | SUPPRESS_EVENT_ALT_SPIKY, 0, LVarE, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(PartnerDamageEnemy, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_IGNORE_DEFENSE, SUPPRESS_EVENT_SPIKY_TOP | SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_SHOCK_CONTACT | SUPPRESS_EVENT_ALT_SPIKY, 0, LVarE, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_CALL(PartnerYieldTurn) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_EXEC_WAIT(N(returnHome2)) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -964,7 +964,7 @@ EvtScript N(electroDash) = { EVT_END }; -EvtScript N(powerShock) = { +EvtScript N(EVS_Attack_PowerShock) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_POWER_SHOCK) EVT_CALL(action_command_power_shock_init) EVT_CALL(SetupMashMeter, 1, 100, 0, 0, 0, 0) @@ -984,7 +984,7 @@ EvtScript N(powerShock) = { EVT_CALL(AddGoalPos, ACTOR_PARTNER, -15, -10, 0) EVT_CALL(FlyToGoal, ACTOR_PARTNER, 30, 0, EASING_COS_IN_OUT) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) - EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT, 0, 1, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_CALL(AddBattleCamZoom, -100) EVT_CALL(MoveBattleCamOver, 80) EVT_CALL(N(WattFXDisable)) @@ -1007,7 +1007,7 @@ EvtScript N(powerShock) = { EVT_END_THREAD EVT_WAIT(75 * DT) EVT_CALL(SetActorPaletteEffect, ACTOR_SELF, PRT_MAIN, ACTOR_PAL_ADJUST_WATT_IDLE) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_028A) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_WATT_POWER_SHOCK) EVT_THREAD EVT_SETF(LVar0, EVT_FLOAT(1.0)) EVT_LOOP(3) @@ -1050,7 +1050,7 @@ EvtScript N(powerShock) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleWatt_Idle) EVT_END_THREAD - EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT, 0, 1, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_WAIT(15) EVT_EXEC_WAIT(N(EVS_ReturnHome)) @@ -1060,9 +1060,9 @@ EvtScript N(powerShock) = { EVT_CALL(GetPartnerActionSuccess, LVar0) EVT_SWITCH(LVar0) EVT_CASE_GT(0) - EVT_CALL(PartnerAfflictEnemy, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, DMG_STATUS_ALWAYS(STATUS_FLAG_PARALYZE, 3), 254, 0, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_40) + EVT_CALL(PartnerAfflictEnemy, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, DMG_STATUS_ALWAYS(STATUS_FLAG_PARALYZE, 3), 254, 0, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_CASE_DEFAULT - EVT_CALL(PartnerAfflictEnemy, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, DMG_STATUS_ALWAYS(STATUS_FLAG_PARALYZE, 3), 255, 0, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(PartnerAfflictEnemy, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, DMG_STATUS_ALWAYS(STATUS_FLAG_PARALYZE, 3), 255, 0, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS) EVT_END_SWITCH EVT_CALL(PartnerYieldTurn) EVT_IF_NE(LFlagF, TRUE) @@ -1074,8 +1074,8 @@ EvtScript N(powerShock) = { EVT_END_IF EVT_WAIT(30) EVT_SWITCH(LVar0) - EVT_CASE_OR_EQ(HIT_RESULT_1) - EVT_CASE_OR_EQ(HIT_RESULT_3) + EVT_CASE_OR_EQ(HIT_RESULT_NICE) + EVT_CASE_OR_EQ(HIT_RESULT_NICE_NO_DAMAGE) EVT_EXEC_WAIT(N(returnHome2)) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(HIT_RESULT_HIT) @@ -1087,7 +1087,7 @@ EvtScript N(powerShock) = { EVT_END }; -EvtScript N(8023AE8C) = { +EvtScript N(EVS_TurboCharge_HealthyPlayer) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_WATER_BLOCK) EVT_CALL(action_command_water_block_init, 1) EVT_CALL(SetActionHudPrepareTime, 0) @@ -1128,7 +1128,7 @@ EvtScript N(8023AE8C) = { EVT_CALL(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_DISABLE) EVT_END_THREAD EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_028B) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_WATT_TURBO_CHARGE) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 42) EVT_CALL(N(TurboChargeFX), LVar0, LVar1, LVar2) @@ -1136,7 +1136,7 @@ EvtScript N(8023AE8C) = { EVT_CALL(AddBattleCamZoom, 100) EVT_CALL(MoveBattleCamOver, 5) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_PLAYER_JUMP) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_LONG_PLAYER_JUMP) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -1172,7 +1172,7 @@ EvtScript N(8023AE8C) = { EVT_END }; -EvtScript N(8023B450) = { +EvtScript N(EVS_TurboCharge_ImmobilePlayer) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_WATER_BLOCK) EVT_CALL(action_command_water_block_init, 1) EVT_CALL(SetActionHudPrepareTime, 0) @@ -1211,7 +1211,7 @@ EvtScript N(8023B450) = { EVT_CALL(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_DISABLE) EVT_END_THREAD EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_028B) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_WATT_TURBO_CHARGE) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 42) EVT_CALL(N(TurboChargeFX), LVar0, LVar1, LVar2) @@ -1243,12 +1243,12 @@ EvtScript N(8023B450) = { EVT_END }; -EvtScript N(turboCharge) = { +EvtScript N(EVS_Move_TurboCharge) = { EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAGS_IMMOBILIZED) - EVT_EXEC_WAIT(N(8023B450)) + EVT_EXEC_WAIT(N(EVS_TurboCharge_ImmobilePlayer)) EVT_ELSE - EVT_EXEC_WAIT(N(8023AE8C)) + EVT_EXEC_WAIT(N(EVS_TurboCharge_HealthyPlayer)) EVT_END_IF EVT_RETURN EVT_END @@ -1256,7 +1256,7 @@ EvtScript N(turboCharge) = { s32 D_8023B948_707438[] = { 3, 3, 4, 7, 10, 13, 16, 16, 16, 16 }; -EvtScript N(megaShock) = { +EvtScript N(EVS_Attack_MegaShock) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_MEGA_SHOCK) EVT_CALL(action_command_mega_shock_init) EVT_CALL(SetupMashMeter, 1, 100, 0, 0, 0, 0) @@ -1313,10 +1313,10 @@ EvtScript N(megaShock) = { EVT_THREAD EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 12) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_028C) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_WATT_MEGA_DISCHARGE) EVT_PLAY_EFFECT(EFFECT_FLASHING_BOX_SHOCKWAVE, 2, LVar0, LVar1, LVar2, 0, 0, 0) EVT_WAIT(10) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_2024) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_WATT_MEGA_CHARGE_WAVE) EVT_PLAY_EFFECT(EFFECT_FLASHING_BOX_SHOCKWAVE, 2, LVar0, LVar1, LVar2, 0, 0, 0) EVT_END_THREAD EVT_THREAD @@ -1348,14 +1348,14 @@ EvtScript N(megaShock) = { EVT_LOOP(0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetPartnerActionSuccess, LVarF) - EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_10) + EVT_CALL(PartnerTestEnemy, LVar0, 0, SUPPRESS_EVENT_SPIKY_FRONT | SUPPRESS_EVENT_BURN_CONTACT, 0, 1, BS_FLAGS1_INCLUDE_POWER_UPS) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_GOTO(11) EVT_END_IF EVT_IF_EQ(LVarF, 100) - EVT_CALL(PartnerAfflictEnemy, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, DMG_STATUS_ALWAYS(STATUS_FLAG_PARALYZE, 3), 254, 0, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_40) + EVT_CALL(PartnerAfflictEnemy, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, DMG_STATUS_ALWAYS(STATUS_FLAG_PARALYZE, 3), 254, 0, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_ELSE - EVT_CALL(PartnerAfflictEnemy, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, DMG_STATUS_ALWAYS(STATUS_FLAG_PARALYZE, 3), LVarF, 0, BS_FLAGS1_10 | BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_40) + EVT_CALL(PartnerAfflictEnemy, LVar0, DAMAGE_TYPE_SHOCK | DAMAGE_TYPE_NO_CONTACT | DAMAGE_TYPE_MULTIPLE_POPUPS | DAMAGE_TYPE_STATUS_ALWAYS_HITS, 0, DMG_STATUS_ALWAYS(STATUS_FLAG_PARALYZE, 3), LVarF, 0, BS_FLAGS1_INCLUDE_POWER_UPS | BS_FLAGS1_TRIGGER_EVENTS | BS_FLAGS1_NICE_HIT) EVT_END_IF EVT_LABEL(11) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) diff --git a/src/battle/player_events.c b/src/battle/player_events.c index 8f35c3d871..9ff6eb22bd 100644 --- a/src/battle/player_events.c +++ b/src/battle/player_events.c @@ -71,14 +71,21 @@ API_CALLABLE(ActivateDefend) { return ApiStatus_DONE2; } -API_CALLABLE(DoesMarioStatusPreventHappyAnimation) { +// (out) LVar0: skip playing lucky animation +API_CALLABLE(TryPlayerLucky) { Actor* player = gBattleStatus.playerActor; show_action_rating(ACTION_RATING_LUCKY, player, player->curPos.x, player->curPos.y + 20.0f, player->curPos.z); - sfx_play_sound(SOUND_03FC); + sfx_play_sound(SOUND_LUCKY); + script->varTable[0] = FALSE; - if (player->debuff == STATUS_KEY_FEAR || player->debuff == STATUS_KEY_DIZZY || player->debuff == STATUS_KEY_PARALYZE || - player->debuff == STATUS_KEY_SLEEP ||player->debuff == STATUS_KEY_FROZEN || player->debuff == STATUS_KEY_STOP) { + if (player->debuff == STATUS_KEY_FEAR + || player->debuff == STATUS_KEY_DIZZY + || player->debuff == STATUS_KEY_PARALYZE + || player->debuff == STATUS_KEY_SLEEP + || player->debuff == STATUS_KEY_FROZEN + || player->debuff == STATUS_KEY_STOP + ) { script->varTable[0] = TRUE; } return ApiStatus_DONE2; @@ -162,7 +169,7 @@ API_CALLABLE(func_80260E38) { } API_CALLABLE(func_80260E5C) { - gBattleStatus.flags1 &= ~BS_FLAGS1_8000; + gBattleStatus.flags1 &= ~BS_FLAGS1_FREE_ACTION_COMMAND; gBattleStatus.flags1 &= ~BS_FLAGS1_2000; gBattleStatus.flags1 &= ~BS_FLAGS1_4000; return ApiStatus_DONE2; @@ -408,7 +415,7 @@ API_CALLABLE(BattleMerleeUpdateFX) { BattleMerleeWaveEffect = fx_energy_orb_wave(3, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.00001f, 0); D_8029FBA4 = 0; D_8029FB90 = 12; - sfx_play_sound(SOUND_2074); + sfx_play_sound(SOUND_MAGIC_ASCENDING); } merlee->pos.y = D_8029FB94 + (sin_rad(DEG_TO_RAD(script->functionTemp[1])) * 3.0f); @@ -961,8 +968,8 @@ EvtScript EVS_Player_HandleEvent = { EVT_END_IF EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_LUCKY) - EVT_CALL(DoesMarioStatusPreventHappyAnimation) - EVT_IF_EQ(LVar0, FALSE) + EVT_CALL(TryPlayerLucky) + EVT_IF_FALSE(LVar0) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_AdjustCap) EVT_WAIT(30) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) @@ -1289,7 +1296,7 @@ EvtScript EVS_PlayerDies = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_24) EVT_WAIT(15) EVT_CALL(EnablePlayerBlur, ACTOR_BLUR_ENABLE) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0371) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_PLAYER_SPINNING) EVT_SET(LVar0, 0) EVT_LOOP(30) EVT_ADD(LVar0, 60) @@ -1304,7 +1311,7 @@ EvtScript EVS_PlayerDies = { EVT_END_LOOP EVT_CALL(EnablePlayerBlur, ACTOR_BLUR_DISABLE) EVT_WAIT(30) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_03FB) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_PLAYER_COLLAPSE) EVT_SET(LVar0, 0) EVT_SET(LVar1, 1) EVT_LOOP(0) @@ -1476,7 +1483,7 @@ EvtScript EVS_UseLifeShroom = { EVT_WAIT(15) EVT_CALL(GiveRefundCleanup) EVT_END_IF - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0372) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_LIFE_SHROOM_CHIME) EVT_ADD(LVar4, 15) EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 3, LVar3, LVar4, LVar5, EVT_FLOAT(1.0)) EVT_SET(LVar0, LVarF) @@ -1491,7 +1498,7 @@ EvtScript EVS_UseLifeShroom = { EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_START_RECOVERY) EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 1, LVar3, LVar4, LVar5, 70, 70, 10, 20) EVT_WAIT(20) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0373) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_REVIVAL_MAGIC) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_STARS_SHIMMER, 2, LVar0, LVar1, LVar2, 50, 20, 32, 30) EVT_WAIT(40) @@ -1520,7 +1527,7 @@ EvtScript EVS_UseLifeShroom = { EVT_CHILD_THREAD EVT_CALL(LifeShroomRevealWorld) EVT_END_CHILD_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0374) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_PLAYER_REVIVE) EVT_CALL(SetActorRotation, ACTOR_PLAYER, 0, 0, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(ConsumeLifeShroom) @@ -1554,7 +1561,7 @@ EvtScript EVS_UseLifeShroom = { EVT_PLAY_EFFECT(EFFECT_MISC_PARTICLES, 2, LVar0, LVar1, LVar2, 20, 20, EVT_FLOAT(1.0), 10, 50) EVT_END_LOOP EVT_END_CHILD_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_PLAYER_JUMP) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_LONG_PLAYER_JUMP) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -1613,7 +1620,7 @@ EvtScript EVS_MerleeAttackBonus = { EVT_CALL(BattleFadeOutMerlee) EVT_CALL(DeleteNpc, NPC_BTL_MERLEE) EVT_END_CHILD_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2075) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_MAGIC_DESCENDING) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayBattleMerleeGatherFX, LVar0, LVar1, LVar2) EVT_CALL(PlayBattleMerleeOrbFX, LVar0, LVar1, LVar2) @@ -1662,7 +1669,7 @@ EvtScript EVS_MerleeDefenseBonus = { EVT_CALL(BattleFadeOutMerlee) EVT_CALL(DeleteNpc, NPC_BTL_MERLEE) EVT_END_CHILD_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2075) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_MAGIC_DESCENDING) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayBattleMerleeGatherFX, LVar0, LVar1, LVar2) EVT_CALL(PlayBattleMerleeOrbFX, LVar0, LVar1, LVar2) @@ -1716,7 +1723,7 @@ EvtScript EVS_MerleeExpBonus = { EVT_CALL(BattleFadeOutMerlee) EVT_CALL(DeleteNpc, NPC_BTL_MERLEE) EVT_END_CHILD_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2075) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_MAGIC_DESCENDING) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayBattleMerleeGatherFX, LVar0, LVar1, LVar2) EVT_CALL(PlayBattleMerleeOrbFX, LVar0, LVar1, LVar2) diff --git a/src/battle/popup_messages.c b/src/battle/popup_messages.c index eebf9b1590..af247fc6e3 100644 --- a/src/battle/popup_messages.c +++ b/src/battle/popup_messages.c @@ -178,10 +178,10 @@ BSS s16 HID_BattleMessage1; BSS s16 HID_BattleMessage2; BSS s16 HID_BattleMessage3; BSS s16 HID_BattleMessage4; -BSS b16 D_8029F64A; -BSS b16 D_8029F64C; -BSS s16 D_8029F64E; -BSS s16 D_8029F650; +BSS b16 ActionCommandTipVisible; +BSS b16 BattleMessage_BoxPosLocked; +BSS s16 BattleMessage_CurBoxPosY; +BSS s16 BattleMessage_CurBoxOffsetY; extern HudScript HES_AimReticle; extern HudScript HES_AimTarget; @@ -319,7 +319,7 @@ void show_immune_bonk(f32 x, f32 y, f32 z, s32 numStars, s32 arg4, s32 arg5) { var_f20 = 0.7f; } - if (battleStatus->flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) { + if (battleStatus->flags1 & (BS_FLAGS1_NICE_HIT | BS_FLAGS1_SUPER_HIT)) { baseScale *= 2.0; } @@ -342,7 +342,7 @@ void show_immune_bonk(f32 x, f32 y, f32 z, s32 numStars, s32 arg4, s32 arg5) { battleStatus->unk_90 = 0; popup->updateFunc = btl_bonk_update; popup->renderWorldFunc = btl_bonk_render; - popup->unk_00 = 0; + popup->unk_00 = FALSE; popup->renderUIFunc = NULL; popup->messageIndex = 1; popup->active |= 0x10; @@ -540,7 +540,7 @@ void btl_show_battle_message(s32 messageIndex, s32 duration) { if (popup != NULL) { popup->updateFunc = btl_update_message_popup; popup->renderUIFunc = btl_show_message_popup; - popup->unk_00 = 0; + popup->unk_00 = FALSE; popup->renderWorldFunc = NULL; popup->messageIndex = messageIndex; popup->duration = duration; @@ -549,10 +549,10 @@ void btl_show_battle_message(s32 messageIndex, s32 duration) { popup->message = NULL; BattlePopupMessageVar = 0; bPopupMessage = popup; - D_8029F64A = FALSE; - D_8029F64C = FALSE; - D_8029F64E = 0; - D_8029F650 = 0; + ActionCommandTipVisible = FALSE; + BattleMessage_BoxPosLocked = FALSE; + BattleMessage_CurBoxPosY = 0; + BattleMessage_CurBoxOffsetY = 0; } } @@ -563,7 +563,7 @@ void btl_show_variable_battle_message(s32 messageIndex, s32 duration, s32 varVal if (popup != NULL) { popup->updateFunc = btl_update_message_popup; popup->renderUIFunc = btl_show_message_popup; - popup->unk_00 = 0; + popup->unk_00 = FALSE; popup->renderWorldFunc = NULL; popup->messageIndex = messageIndex; popup->duration = duration; @@ -572,10 +572,10 @@ void btl_show_variable_battle_message(s32 messageIndex, s32 duration, s32 varVal popup->message = NULL; BattlePopupMessageVar = varValue; bPopupMessage = popup; - D_8029F64A = FALSE; - D_8029F64C = FALSE; - D_8029F64E = 0; - D_8029F650 = 0; + ActionCommandTipVisible = FALSE; + BattleMessage_BoxPosLocked = FALSE; + BattleMessage_CurBoxPosY = 0; + BattleMessage_CurBoxOffsetY = 0; } } @@ -586,17 +586,17 @@ s32 btl_is_popup_displayed(void) { void btl_set_popup_duration(s32 duration) { PopupMessage* popup = bPopupMessage; - if (D_8029F64A && popup != NULL) { + if (ActionCommandTipVisible && popup != NULL) { popup->duration = duration; } } -void func_8024FAE8(void) { - D_8029F64C = TRUE; +void btl_message_lock_box_pos(void) { + BattleMessage_BoxPosLocked = TRUE; } -void func_8024FAFC(void) { - D_8029F64C = FALSE; +void btl_message_unlock_box_pos(void) { + BattleMessage_BoxPosLocked = FALSE; } void close_action_command_instruction_popup(void) { @@ -673,12 +673,12 @@ void btl_update_message_popup(void* data) { default: break; case BTL_MSG_STATE_INIT: - popup->showMsgState = BTL_MSG_STATE_1; + popup->showMsgState = BTL_MSG_STATE_POPUP_PRE_DELAY; break; - case BTL_MSG_STATE_1: - popup->showMsgState = BTL_MSG_STATE_2; + case BTL_MSG_STATE_POPUP_PRE_DELAY: + popup->showMsgState = BTL_MSG_STATE_POPUP_DELAY; break; - case BTL_MSG_STATE_2: + case BTL_MSG_STATE_POPUP_DELAY: if (battleStatus->curButtonsPressed & (BUTTON_A | BUTTON_B)) { popup->duration = 0; } @@ -686,13 +686,13 @@ void btl_update_message_popup(void* data) { if (popup->duration != 0) { popup->duration--; } else { - popup->showMsgState = BTL_MSG_STATE_3; + popup->showMsgState = BTL_MSG_STATE_POPUP_POST_DELAY; } break; - case BTL_MSG_STATE_3: - popup->showMsgState = BTL_MSG_STATE_4; + case BTL_MSG_STATE_POPUP_POST_DELAY: + popup->showMsgState = BTL_MSG_STATE_POPUP_DISPOSE; break; - case BTL_MSG_STATE_4: + case BTL_MSG_STATE_POPUP_DISPOSE: shouldDisposeWindow = TRUE; break; } @@ -720,9 +720,9 @@ void btl_update_message_popup(void* data) { case BTL_MSG_ACTION_TIP_REDUCE_DAMAGE: case BTL_MSG_ACTION_TIP_NOT_USED_3: actionCommandMode = battleStatus->actionCommandMode; - D_8029F64A = TRUE; + ActionCommandTipVisible = TRUE; if (actionCommandMode == ACTION_COMMAND_MODE_NOT_LEARNED) { - D_8029F64A = FALSE; + ActionCommandTipVisible = FALSE; shouldDisposeWindow = TRUE; break; } @@ -864,14 +864,14 @@ void btl_update_message_popup(void* data) { hud_element_set_render_pos(HID_BattleMessage1, -100, -100); break; } - popup->showMsgState = BTL_MSG_STATE_1; + popup->showMsgState = BTL_MSG_STATE_ACTION_TIP_DELAY; break; - case BTL_MSG_STATE_1: // show the message + case BTL_MSG_STATE_ACTION_TIP_DELAY: if (gBattleStatus.flags1 & BS_FLAGS1_10000) { gBattleStatus.flags1 &= ~BS_FLAGS1_4000; set_window_update(WINDOW_ID_BATTLE_POPUP, WINDOW_UPDATE_SHOW_TRANSPARENT); popup->duration = 0; - popup->showMsgState = BTL_MSG_STATE_2; + popup->showMsgState = BTL_MSG_STATE_ACTION_TIP_DISPOSE; break; } @@ -950,28 +950,28 @@ void btl_update_message_popup(void* data) { if (popup->duration != -1) { popup->duration = 30; } - popup->showMsgState = BTL_MSG_STATE_2; + popup->showMsgState = BTL_MSG_STATE_ACTION_TIP_DISPOSE; break; } break; - case BTL_MSG_STATE_2: // show message + case BTL_MSG_STATE_ACTION_TIP_DISPOSE: if ((actionCommandMode != ACTION_COMMAND_MODE_TUTORIAL) || (gBattleStatus.flags1 & BS_FLAGS1_10000) ) { s16* duration; - if (D_8029F64E < 192) { - if (!D_8029F64C) { - D_8029F64E += 10; - if (D_8029F64E > 192) { - D_8029F64E = 192; + if (BattleMessage_CurBoxPosY < 192) { + if (!BattleMessage_BoxPosLocked) { + BattleMessage_CurBoxPosY += 10; + if (BattleMessage_CurBoxPosY > 192) { + BattleMessage_CurBoxPosY = 192; } } else { break; } } - gWindows[WINDOW_ID_BATTLE_POPUP].pos.y = D_8029F64E + D_8029F650; + gWindows[WINDOW_ID_BATTLE_POPUP].pos.y = BattleMessage_CurBoxPosY + BattleMessage_CurBoxOffsetY; if (popup->duration == -1) { break; @@ -1019,7 +1019,7 @@ void btl_update_message_popup(void* data) { hud_element_free(HID_BattleMessage4); break; } - D_8029F64A = FALSE; + ActionCommandTipVisible = FALSE; shouldDisposeWindow = TRUE; } break; @@ -1035,12 +1035,12 @@ void btl_update_message_popup(void* data) { default: break; case BTL_MSG_STATE_INIT: - popup->showMsgState = BTL_MSG_STATE_1; + popup->showMsgState = BTL_MSG_STATE_ERROR_PRE_DELAY; break; - case BTL_MSG_STATE_1: - popup->showMsgState = BTL_MSG_STATE_2; + case BTL_MSG_STATE_ERROR_PRE_DELAY: + popup->showMsgState = BTL_MSG_STATE_ERROR_DELAY; break; - case BTL_MSG_STATE_2: + case BTL_MSG_STATE_ERROR_DELAY: if (battleStatus->curButtonsPressed & (BUTTON_A | BUTTON_B)) { popup->duration = 0; } @@ -1048,13 +1048,13 @@ void btl_update_message_popup(void* data) { if (popup->duration != 0) { popup->duration--; } else { - popup->showMsgState = BTL_MSG_STATE_3; + popup->showMsgState = BTL_MSG_STATE_ERROR_POST_DELAY; } break; - case BTL_MSG_STATE_3: - popup->showMsgState = BTL_MSG_STATE_4; + case BTL_MSG_STATE_ERROR_POST_DELAY: + popup->showMsgState = BTL_MSG_STATE_ERROR_DISPOSE; break; - case BTL_MSG_STATE_4: + case BTL_MSG_STATE_ERROR_DISPOSE: shouldDisposeWindow = TRUE; break; } @@ -1105,9 +1105,9 @@ void btl_update_message_popup(void* data) { hud_element_set_render_pos(HID_BattleMessage1, -100, -100); break; } - popup->showMsgState = BTL_MSG_STATE_1; + popup->showMsgState = BTL_MSG_STATE_DISABLED_DELAY; break; - case BTL_MSG_STATE_1: + case BTL_MSG_STATE_DISABLED_DELAY: if (popup->duration != 0) { popup->duration--; break; @@ -1199,14 +1199,14 @@ void btl_message_popup_draw_content(void* data, s32 x, s32 y) { messageID = BattleMessages[popup->messageIndex]; msgLinesIdx = get_msg_lines(messageID) - 1; y += BattleMessage_TextOffsetsY[msgLinesIdx]; - set_message_value(BattlePopupMessageVar, 0); + set_message_int_var(BattlePopupMessageVar, 0); draw_msg(messageID, x, y, 255, MSG_PAL_0F, 0); break; case BTL_MSG_CANT_MOVE: messageID = BattleMessages[popup->messageIndex]; msgLinesIdx = get_msg_lines(messageID) - 1; y += BattleMessage_TextOffsetsY[msgLinesIdx]; - set_message_msg(bActorMessages[BattlePopupMessageVar], 0); + set_message_text_var(bActorMessages[BattlePopupMessageVar], 0); draw_msg(messageID, x, y, 255, MSG_PAL_0F, 0); break; case BTL_MSG_HAMMER_DISABLED_1: @@ -1243,7 +1243,7 @@ void btl_message_popup_draw_content(void* data, s32 x, s32 y) { case BTL_MSG_ACTION_TIP_REDUCE_DAMAGE: case BTL_MSG_ACTION_TIP_NOT_USED_3: opacity = 255; - if (popup->showMsgState < BTL_MSG_STATE_2) { + if (popup->showMsgState < BTL_MSG_STATE_ACTION_TIP_DISPOSE) { opacity = 160; } if (popup->messageIndex == BTL_MSG_ACTION_TIP_UNUSED_3) { @@ -1486,7 +1486,7 @@ void btl_show_message_popup(void* data) { popup->needsInit = FALSE; messageID = BattleMessages[popup->messageIndex]; - set_message_value(BattlePopupMessageVar, 0); + set_message_int_var(BattlePopupMessageVar, 0); msgWidth = get_msg_width(messageID, 0) + 31; posX = 160 - (msgWidth / 2); width = msgWidth; @@ -1502,7 +1502,7 @@ void btl_show_message_popup(void* data) { popup->needsInit = FALSE; messageID = BattleMessages[popup->messageIndex]; - set_message_msg(bActorMessages[BattlePopupMessageVar], 0); + set_message_text_var(bActorMessages[BattlePopupMessageVar], 0); msgWidth = get_msg_width(messageID, 0) + 31; posX = 160 - (msgWidth / 2); width = msgWidth; @@ -1546,12 +1546,12 @@ void btl_show_message_popup(void* data) { height = BattleMessage_BoxSizesY[numLines]; if (popup->messageIndex == BTL_MSG_ACTION_TIP_UNUSED_3) { posY = 120; - D_8029F64C = TRUE; + BattleMessage_BoxPosLocked = TRUE; } - D_8029F64E = posY; - D_8029F650 = BattleMessage_BoxOffsetsY[numLines]; + BattleMessage_CurBoxPosY = posY; + BattleMessage_CurBoxOffsetY = BattleMessage_BoxOffsetsY[numLines]; - posY = D_8029F64E + D_8029F650; + posY = BattleMessage_CurBoxPosY + BattleMessage_CurBoxOffsetY; set_window_properties(WINDOW_ID_BATTLE_POPUP, posX, posY, width, height, WINDOW_PRIORITY_0, btl_message_popup_draw_content, popup, -1); if (popup->messageIndex == BTL_MSG_ACTION_TIP_UNUSED_3) { set_window_update(WINDOW_ID_BATTLE_POPUP, WINDOW_UPDATE_SHOW); @@ -1606,13 +1606,13 @@ ApiStatus SetMessageBoxDuration(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_80251434(Evt* script, s32 isInitialCall) { - func_8024FAE8(); +ApiStatus LockMessageBoxPosition(Evt* script, s32 isInitialCall) { + btl_message_lock_box_pos(); return ApiStatus_DONE2; } -ApiStatus func_80251454(Evt* script, s32 isInitialCall) { - func_8024FAFC(); +ApiStatus UnlockMessageBoxPosition(Evt* script, s32 isInitialCall) { + btl_message_unlock_box_pos(); return ApiStatus_DONE2; } diff --git a/src/battle/standard_events.c b/src/battle/standard_events.c index b1efb10691..75dd138d71 100644 --- a/src/battle/standard_events.c +++ b/src/battle/standard_events.c @@ -1184,7 +1184,7 @@ EvtScript EVS_ForceNextTarget = { }; EvtScript EVS_Enemy_FanSmack_Impl = { - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2022) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_FAN_SMACK_HIT) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(GetActorSize, ACTOR_SELF, LVar3, LVar4) EVT_DIVF(LVar3, EVT_FLOAT(40.0)) @@ -1213,7 +1213,7 @@ EvtScript EVS_Enemy_FanSmack_Impl = { EVT_CASE_OR_EQ(DMG_SRC_LAST_FAN_SMACK_RIGHT) EVT_WAIT(40) EVT_CALL(DismissEffect, LVarF) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2023) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_FAN_SMACK_END) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_RETURN @@ -1842,7 +1842,7 @@ EvtScript EVS_Enemy_SpinSmash_HitNext = { EVT_GOTO(1) EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) + EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE | DAMAGE_TYPE_MULTIPLE_POPUPS, SUPPRESS_EVENT_ALL, 0, 1, BS_FLAGS1_TRIGGER_EVENTS) EVT_GOTO(1) // done EVT_LABEL(10) diff --git a/src/battle/use_moves.c b/src/battle/use_moves.c index 99b3225f52..1aa82dc86b 100644 --- a/src/battle/use_moves.c +++ b/src/battle/use_moves.c @@ -2,9 +2,9 @@ #include "ld_addrs.h" #include "battle.h" -extern EvtScript battle_move_hammer_attack_EVS_UseMove0; -extern EvtScript battle_move_hammer_attack_EVS_UseMove1; -extern EvtScript battle_move_hammer_attack_EVS_UseMove2; +extern EvtScript battle_move_hammer_attack_EVS_UseMove; +extern EvtScript battle_move_hammer_attack_EVS_FirstStrike; +extern EvtScript battle_move_hammer_attack_EVS_UseBerserker; extern EvtScript battle_move_hammer_charge_0_EVS_UseMove0; extern EvtScript battle_move_hammer_charge_0_EVS_UseMove1; extern EvtScript battle_move_hammer_charge_1_EVS_UseMove0; @@ -24,9 +24,9 @@ extern EvtScript battle_move_shrink_smash_EVS_UseMove; extern EvtScript battle_move_spin_smash_EVS_UseMove; extern EvtScript battle_move_shell_crack_EVS_UseMove; -extern EvtScript battle_move_jump_attack_EVS_UseMove0; -extern EvtScript battle_move_jump_attack_EVS_UseMove1; -extern EvtScript battle_move_jump_attack_EVS_UseMove2; +extern EvtScript battle_move_jump_attack_EVS_UseMove; +extern EvtScript battle_move_jump_attack_EVS_FirstStrike; +extern EvtScript battle_move_jump_attack_EVS_UseBerserker; extern EvtScript battle_move_jump_charge_0_EVS_UseMove0; extern EvtScript battle_move_jump_charge_0_EVS_UseMove1; extern EvtScript battle_move_jump_charge_1_EVS_UseMove0; @@ -50,11 +50,11 @@ BattleMoveEntry gMoveScriptTable[] = { [MOVE_NONE] {}, [MOVE_UNUSED_01] {}, [MOVE_UNUSED_02] {}, - [MOVE_HAMMER1] BTL_MOVE(hammer_attack, EVS_UseMove0), - [MOVE_HAMMER2] BTL_MOVE(hammer_attack, EVS_UseMove0), - [MOVE_HAMMER3] BTL_MOVE(hammer_attack, EVS_UseMove0), - [MOVE_FIRST_STRIKE_HAMMER] BTL_MOVE(hammer_attack, EVS_UseMove1), - [MOVE_BERSERKER_HAMMER] BTL_MOVE(hammer_attack, EVS_UseMove2), + [MOVE_HAMMER1] BTL_MOVE(hammer_attack, EVS_UseMove), + [MOVE_HAMMER2] BTL_MOVE(hammer_attack, EVS_UseMove), + [MOVE_HAMMER3] BTL_MOVE(hammer_attack, EVS_UseMove), + [MOVE_FIRST_STRIKE_HAMMER] BTL_MOVE(hammer_attack, EVS_FirstStrike), + [MOVE_BERSERKER_HAMMER] BTL_MOVE(hammer_attack, EVS_UseBerserker), [MOVE_SPIN_SMASH] BTL_MOVE(spin_smash, EVS_UseMove), [MOVE_QUAKE_HAMMER] BTL_MOVE(quake_hammer, EVS_UseMove0), [MOVE_D_DOWN_POUND] BTL_MOVE(d_down_pound, EVS_UseMove), @@ -73,11 +73,11 @@ BattleMoveEntry gMoveScriptTable[] = { [MOVE_MEGA_SMASH] BTL_MOVE(mega_smash, EVS_UseMove), [MOVE_SHRINK_SMASH] BTL_MOVE(shrink_smash, EVS_UseMove), [MOVE_SHELL_CRACK] BTL_MOVE(shell_crack, EVS_UseMove), - [MOVE_JUMP1] BTL_MOVE(jump_attack, EVS_UseMove0), - [MOVE_JUMP2] BTL_MOVE(jump_attack, EVS_UseMove0), - [MOVE_JUMP3] BTL_MOVE(jump_attack, EVS_UseMove0), - [MOVE_FIRST_STRIKE_JUMP] BTL_MOVE(jump_attack, EVS_UseMove1), - [MOVE_BERSERKER_JUMP] BTL_MOVE(jump_attack, EVS_UseMove2), + [MOVE_JUMP1] BTL_MOVE(jump_attack, EVS_UseMove), + [MOVE_JUMP2] BTL_MOVE(jump_attack, EVS_UseMove), + [MOVE_JUMP3] BTL_MOVE(jump_attack, EVS_UseMove), + [MOVE_FIRST_STRIKE_JUMP] BTL_MOVE(jump_attack, EVS_FirstStrike), + [MOVE_BERSERKER_JUMP] BTL_MOVE(jump_attack, EVS_UseBerserker), [MOVE_MULTIBOUNCE] BTL_MOVE(multibounce, EVS_UseMove), [MOVE_POWER_BOUNCE] BTL_MOVE(power_bounce, EVS_UseMove), [MOVE_SLEEP_STOMP] BTL_MOVE(sleep_stomp, EVS_UseMove), diff --git a/src/battle/use_star_powers.c b/src/battle/use_star_powers.c index 6657bc1584..0f2efb8fda 100644 --- a/src/battle/use_star_powers.c +++ b/src/battle/use_star_powers.c @@ -115,7 +115,7 @@ API_CALLABLE(LoadStarPowerScript) { PlayerData* playerData = &gPlayerData; s16 starPowerIdx; - playerData->specialBarsFilled -= gMoveTable[battleStatus->selectedMoveID].costFP * 256; + playerData->starPower -= gMoveTable[battleStatus->selectedMoveID].costFP * SP_PER_BAR; starPowerIdx = battleStatus->moveArgument; dma_copy((&StarPowersTable[starPowerIdx])->romStart, (&StarPowersTable[starPowerIdx])->romEnd, diff --git a/src/cam_main.c b/src/cam_main.c index acf935a2cf..df9ac8dfcd 100644 --- a/src/cam_main.c +++ b/src/cam_main.c @@ -208,14 +208,14 @@ void render_frame(s32 isSecondPass) { render_workers_world(); render_effects_world(); execute_render_tasks(); - render_hud_elements_world(); + render_transformed_hud_elements(); } else { guOrthoF(camera->perspectiveMatrix, 0.0f, SCREEN_WIDTH, -SCREEN_HEIGHT, 0.0f, -1000.0f, 1000.0f, 1.0f); guMtxF2L(camera->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCamID]); gSPMatrix(gMainGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCamID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - render_hud_elements_world(); + render_transformed_hud_elements(); render_item_entities(); } } else { diff --git a/src/cam_mode_zone_interp.c b/src/cam_mode_zone_interp.c index a905050a83..90538af89f 100644 --- a/src/cam_mode_zone_interp.c +++ b/src/cam_mode_zone_interp.c @@ -655,14 +655,14 @@ void update_camera_zone_interp(Camera* camera) { camera->yinterpAlpha = 1.0f; } - if (camera->moveFlags & CAMERA_MOVE_FLAG_4) { + if (camera->moveFlags & CAMERA_MOVE_ACCEL_INTERP_Y) { camera->yinterpAlpha += 0.3; if (camera->yinterpAlpha >= 1.0) { camera->yinterpAlpha = 1.0f; } } - if (!(camera->moveFlags & CAMERA_MOVE_FLAG_2)) { + if (!(camera->moveFlags & CAMERA_MOVE_NO_INTERP_Y)) { camera->yinterpCur += (camera->yinterpGoal - camera->yinterpCur) * camera->yinterpAlpha; } @@ -904,7 +904,7 @@ void update_camera_zone_interp(Camera* camera) { cosAngle = cos_deg(gCurrentCamConfiguration.boomPitch + D_800A08DC); sinAngle = sin_deg(gCurrentCamConfiguration.boomPitch + D_800A08DC); - if (!(camera->moveFlags & CAMERA_MOVE_FLAG_2)) { + if (!(camera->moveFlags & CAMERA_MOVE_NO_INTERP_Y)) { camera->lookAt_eye.y = gCurrentCamConfiguration.targetPos.y + (gCurrentCamConfiguration.boomLength * sinAngle); } @@ -920,7 +920,7 @@ void update_camera_zone_interp(Camera* camera) { } temp_f8_2 = gCurrentCamConfiguration.targetPos.y - camera->lookAt_eye.y; - if (!(camera->moveFlags & CAMERA_MOVE_FLAG_2)) { + if (!(camera->moveFlags & CAMERA_MOVE_NO_INTERP_Y)) { camera->lookAt_obj.y = camera->lookAt_eye.y + ((dist * sinAngle) + (temp_f8_2 * cosAngle)); } temp_f4_4 = (dist * cosAngle) - (temp_f8_2 * sinAngle); diff --git a/src/effects/tubba_heart_attack.c b/src/effects/tubba_heart_attack.c index e80cbac137..407d7b4685 100644 --- a/src/effects/tubba_heart_attack.c +++ b/src/effects/tubba_heart_attack.c @@ -1,24 +1,36 @@ #include "common.h" #include "effects_internal.h" +enum MiniHeartState { + HEART_STATE_INIT = 0, + HEART_STATE_APPEAR = 1, + HEART_STATE_SWARM = 2, + HEART_STATE_MISS = 20, + HEART_STATE_WAIT = 3, + HEART_STATE_SQUEEZE = 4, + HEART_STATE_DISPERSE = 5, + HEART_STATE_VANISH = 6, + HEART_STATE_DONE = 7, +}; + extern Gfx D_09000400_3D2980[]; extern Gfx D_09000518_3D2A98[]; -u8 D_E00CCDD0[] = { 94, 92, 100, 105, 107, 105, 100 }; +u8 AnimScalePct[] = { 94, 92, 100, 105, 107, 105, 100 }; -u8 D_E00CCDD8[] = { 20, 40, 58, 73, 85, 92, 97, 100 }; +u8 AppearScalePct[] = { 20, 40, 58, 73, 85, 92, 97, 100 }; -u8 D_E00CCDE0[] = { +u8 SwarmInterpPct[] = { 0, 2, 5, 9, 14, 20, 27, 35, 44, 54, 64, 74, 84, 94, 100 }; -u8 D_E00CCDF0[] = { +u8 MissInterpPct[] = { 0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 109, 117, 124, 130, 135, 139, 142, 144, 145 }; -u8 D_E00CCE04[] = { +u8 SqueezeInterpPct[] = { 100, 100, 100, 100, 100, 100, 100, 100, 101, 102, 102, 103, 103, 104, 104, 104, 107, 107, 110, 110, 118, 118, 126, 126, 134, 142, 145, 145, 145, 142, @@ -28,10 +40,12 @@ u8 D_E00CCE04[] = { 134, 126, 126, 118, 118, 110, 110, 105, 105, 105 }; -s8 D_E00CCE4C[] = { - -5, -5, -5, -4, -4, -4, -3, -3, -2, -2, - -1, -1, 0, 0, 1, 2, 2, 3, 3, 4, - 4, 4, 5, 5, 5 +s8 HeartOffsetY[TUBBA_MINI_HEART_COUNT] = { + -5, -5, -5, -4, -4, + -4, -3, -3, -2, -2, + -1, -1, 0, 0, 1, + 2, 2, 3, 3, 4, + 4, 4, 5, 5, 5, }; void tubba_heart_attack_init(EffectInstance* effect); @@ -40,12 +54,12 @@ void tubba_heart_attack_render(EffectInstance* effect); void tubba_heart_attack_appendGfx(void* effect); EffectInstance* tubba_heart_attack_main( - s32 arg0, + s32 type, f32 arg1, f32 arg2, f32 arg3, f32 arg4, - s32 arg5 + s32 duration ) { EffectBlueprint bp; EffectInstance* effect; @@ -65,38 +79,38 @@ EffectInstance* tubba_heart_attack_main( data = effect->data.tubbaHeartAttack = general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.tubbaHeartAttack != NULL); - data->unk_00 = arg0; - data->unk_14 = 0; - if (arg5 <= 0) { - data->unk_10 = 1000; + data->type = type; + data->lifetime = 0; + if (duration <= 0) { + data->timeLeft = 1000; } else { - data->unk_10 = arg5; + data->timeLeft = duration; } - data->unk_24 = 255; - data->unk_04 = arg1; - data->unk_08 = arg2; - data->unk_0C = arg3; - data->unk_28 = arg4; - data->unk_18 = 70; - data->unk_1C = 180; - data->unk_20 = 120; + data->primA = 255; + data->centerX = arg1; + data->centerY = arg2; + data->centerZ = arg3; + data->overallScale = arg4; + data->primR = 70; + data->primG = 180; + data->primB = 120; - for (i = 0; i < 25; i++) { - f32 sin = sin_deg(i * 1080 / 25); - f32 cos = cos_deg(i * 1080 / 25); + for (i = 0; i < TUBBA_MINI_HEART_COUNT; i++) { + f32 sin = sin_deg(i * 1080 / TUBBA_MINI_HEART_COUNT); + f32 cos = cos_deg(i * 1080 / TUBBA_MINI_HEART_COUNT); - data->unk_478[i] = rand_int(359) - 180; - data->unk_284[i] = sin * 15.0f; - data->unk_2E8[i] = D_E00CCE4C[i] + 10; - data->unk_34C[i] = cos * 15.0f; - data->unk_158[i] = sin * 120.0f; - data->unk_1BC[i] = D_E00CCE4C[i] * 8 + 40; - data->unk_220[i] = cos * 120.0f; - data->unk_66C[i] = i * 2 + 1; - data->unk_5A4[i] = 0; - data->unk_6D0[i] = 0; - data->unk_734[i] = 0; - data->unk_4DC[i] = 0; + data->rotZ[i] = rand_int(359) - 180; + data->finalX[i] = sin * 15.0f; + data->finalY[i] = HeartOffsetY[i] + 10; + data->finalZ[i] = cos * 15.0f; + data->initialX[i] = sin * 120.0f; + data->initialY[i] = HeartOffsetY[i] * 8 + 40; + data->initialZ[i] = cos * 120.0f; + data->appearDelay[i] = i * 2 + 1; + data->shrinkVelY[i] = 0; + data->state[i] = HEART_STATE_INIT; + data->stateTime[i] = 0; + data->rotXY[i] = 0; } return effect; @@ -110,171 +124,164 @@ EFFECT_DEF_FLOATING_CLOUD_PUFF(floating_cloud_puff_main); void tubba_heart_attack_update(EffectInstance* effect) { TubbaHeartAttackFXData* data = effect->data.tubbaHeartAttack; EffectInstance* puffEffect; - s32 unk_00 = data->unk_00; - s32 unk_14; + s32 type = data->type; + s32 time; f32 factor; f32 angle; f32 sin; f32 cos; - Matrix4f sp18; - Matrix4f sp58; + Matrix4f mtx; + Matrix4f tempMtx; s32 i; s32 j; if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; - data->unk_10 = 64; + data->timeLeft = 64; } - if (data->unk_10 < 1000) { - data->unk_10--; + if (data->timeLeft < 1000) { + data->timeLeft--; } - data->unk_14++; + data->lifetime++; - if (data->unk_10 < 0) { + if (data->timeLeft < 0) { remove_effect(effect); return; } - unk_14 = data->unk_14; + time = data->lifetime; - for (i = 0; i < 25; i++) { - f32 unk_158 = data->unk_158[i]; - f32 unk_1BC = data->unk_1BC[i]; - f32 unk_220 = data->unk_220[i]; + for (i = 0; i < TUBBA_MINI_HEART_COUNT; i++) { + f32 x = data->initialX[i]; + f32 y = data->initialY[i]; + f32 z = data->initialZ[i]; - data->unk_414[i] = D_E00CCDD0[unk_14 % ARRAY_COUNT(D_E00CCDD0)] * 0.01f; - data->unk_3B0[i] = 2.0f - data->unk_414[i]; + data->scaleY[i] = AnimScalePct[time % ARRAY_COUNT(AnimScalePct)] * 0.01f; + data->scaleX[i] = 2.0f - data->scaleY[i]; - switch (data->unk_6D0[i]) { - case 0: - data->unk_2C[i] = unk_158; - data->unk_90[i] = unk_1BC; - data->unk_F4[i] = unk_220; - data->unk_4DC[i] += 0.0f; + switch (data->state[i]) { + case HEART_STATE_INIT: + data->posX[i] = x; + data->posY[i] = y; + data->posZ[i] = z; + data->rotXY[i] += 0.0f; - if (data->unk_66C[i] != 0) { - data->unk_66C[i]--; - } else { - data->unk_6D0[i] = 1; - data->unk_3B0[i] = data->unk_414[i] = D_E00CCDD8[data->unk_734[i]] * 0.01; - data->unk_734[i]++; + if (data->appearDelay[i] != 0) { + data->appearDelay[i]--; + break; } + data->state[i] = HEART_STATE_APPEAR; + data->scaleX[i] = data->scaleY[i] = AppearScalePct[data->stateTime[i]] * 0.01; + data->stateTime[i]++; break; - case 1: - data->unk_3B0[i] = data->unk_414[i] = D_E00CCDD8[data->unk_734[i]] * 0.01; - data->unk_4DC[i] += 0.0f; + case HEART_STATE_APPEAR: + data->scaleX[i] = data->scaleY[i] = AppearScalePct[data->stateTime[i]] * 0.01; + data->rotXY[i] += 0.0f; - data->unk_734[i]++; - if (data->unk_734[i] >= ARRAY_COUNT(D_E00CCDD8)) { - if (unk_00 == 0) { - data->unk_6D0[i] = 2; + data->stateTime[i]++; + if (data->stateTime[i] >= ARRAY_COUNT(AppearScalePct)) { + if (type == FX_HEART_SWARM_HIT) { + data->state[i] = HEART_STATE_SWARM; } else { - data->unk_6D0[i] = 20; + data->state[i] = HEART_STATE_MISS; } - data->unk_734[i] = 0; + data->stateTime[i] = 0; } - break; - case 20: - data->unk_4DC[i] += 0.0f; + case HEART_STATE_MISS: + data->rotXY[i] += 0.0f; - factor = D_E00CCDF0[data->unk_734[i]] * 0.01; + factor = MissInterpPct[data->stateTime[i]] * 0.01; - data->unk_3B0[i] = data->unk_414[i] = 1.0f; - data->unk_2C[i] = unk_158 + (data->unk_284[i] - unk_158) * factor; - data->unk_90[i] = unk_1BC + (data->unk_2E8[i] - unk_1BC) * factor; - data->unk_F4[i] = unk_220 + (data->unk_34C[i] - unk_220) * factor; + data->scaleX[i] = data->scaleY[i] = 1.0f; + data->posX[i] = x + (data->finalX[i] - x) * factor; + data->posY[i] = y + (data->finalY[i] - y) * factor; + data->posZ[i] = z + (data->finalZ[i] - z) * factor; - data->unk_734[i]++; - if (data->unk_734[i] >= ARRAY_COUNT(D_E00CCDF0)) { - data->unk_6D0[i] = 5; - data->unk_734[i] = 0; - data->unk_540[i] = data->unk_284[i] * 0.5; - data->unk_5A4[i] = data->unk_2E8[i] * 0.5; - data->unk_608[i] = data->unk_34C[i] * 0.5; + data->stateTime[i]++; + if (data->stateTime[i] >= ARRAY_COUNT(MissInterpPct)) { + data->state[i] = HEART_STATE_DISPERSE; + data->stateTime[i] = 0; + data->shrinkVelX[i] = data->finalX[i] * 0.5; + data->shrinkVelY[i] = data->finalY[i] * 0.5; + data->shrinkVelZ[i] = data->finalZ[i] * 0.5; } - break; - case 2: - data->unk_4DC[i] += 0.0f; + case HEART_STATE_SWARM: + data->rotXY[i] += 0.0f; - factor = D_E00CCDE0[data->unk_734[i]] * 0.01; + factor = SwarmInterpPct[data->stateTime[i]] * 0.01; - data->unk_414[i] = 1.0f; - data->unk_3B0[i] = 1.0f; - data->unk_2C[i] = unk_158 + (data->unk_284[i] - unk_158) * factor; - data->unk_90[i] = unk_1BC + (data->unk_2E8[i] - unk_1BC) * factor; - data->unk_F4[i] = unk_220 + (data->unk_34C[i] - unk_220) * factor; + data->scaleY[i] = 1.0f; + data->scaleX[i] = 1.0f; + data->posX[i] = x + (data->finalX[i] - x) * factor; + data->posY[i] = y + (data->finalY[i] - y) * factor; + data->posZ[i] = z + (data->finalZ[i] - z) * factor; - data->unk_734[i]++; - if (data->unk_734[i] >= ARRAY_COUNT(D_E00CCDE0)) { - data->unk_6D0[i] = 3; - data->unk_734[i] = 0; + data->stateTime[i]++; + if (data->stateTime[i] >= ARRAY_COUNT(SwarmInterpPct)) { + data->state[i] = HEART_STATE_WAIT; + data->stateTime[i] = 0; } - break; - case 3: + case HEART_STATE_WAIT: if (i == 24) { - for (j = 0; j < ARRAY_COUNT(data->unk_6D0); j++) { - data->unk_6D0[j] = 4; + for (j = 0; j < ARRAY_COUNT(data->state); j++) { + data->state[j] = HEART_STATE_SQUEEZE; } } - break; - case 4: - factor = D_E00CCE04[data->unk_734[i]] * 0.01; - angle = i * 1080 / 25 + (1.0f - factor) * 1080.0f * 0.5 * cos_deg(i * 180 / 25); + case HEART_STATE_SQUEEZE: + factor = SqueezeInterpPct[data->stateTime[i]] * 0.01; + angle = i * 1080 / TUBBA_MINI_HEART_COUNT + (1.0f - factor) * 1080.0f * 0.5 * cos_deg(i * 180 / TUBBA_MINI_HEART_COUNT); sin = sin_deg(angle); cos = cos_deg(angle); - data->unk_2C[i] = ((15.0f / factor) / factor) * sin; - data->unk_90[i] = D_E00CCE4C[i] + 10; - data->unk_F4[i] = ((15.0f / factor) / factor) * cos; + data->posX[i] = ((15.0f / factor) / factor) * sin; + data->posY[i] = HeartOffsetY[i] + 10; + data->posZ[i] = ((15.0f / factor) / factor) * cos; - data->unk_734[i]++; - if (data->unk_734[i] >= ARRAY_COUNT(D_E00CCE04)) { - data->unk_6D0[i] = 5; - data->unk_734[i] = 0; - data->unk_540[i] = data->unk_284[i] * 0.5; - data->unk_5A4[i] = data->unk_2E8[i] * 0.5; - data->unk_608[i] = data->unk_34C[i] * 0.5; + data->stateTime[i]++; + if (data->stateTime[i] >= ARRAY_COUNT(SqueezeInterpPct)) { + data->state[i] = HEART_STATE_DISPERSE; + data->stateTime[i] = 0; + data->shrinkVelX[i] = data->finalX[i] * 0.5; + data->shrinkVelY[i] = data->finalY[i] * 0.5; + data->shrinkVelZ[i] = data->finalZ[i] * 0.5; + } + break; + case HEART_STATE_DISPERSE: + data->posX[i] += data->shrinkVelX[i]; + data->posY[i] += data->shrinkVelY[i]; + data->posZ[i] += data->shrinkVelZ[i]; + data->shrinkVelX[i] *= 0.99; + data->shrinkVelY[i] *= 0.99; + data->shrinkVelZ[i] *= 0.99; + data->shrinkVelY[i] += -0.1; + + data->stateTime[i]++; + if (data->stateTime[i] >= 17) { + data->stateTime[i] = 0; + data->state[i] = HEART_STATE_VANISH; } + data->rotZ[i] *= 0.9; break; - case 5: - data->unk_2C[i] += data->unk_540[i]; - data->unk_90[i] += data->unk_5A4[i]; - data->unk_F4[i] += data->unk_608[i]; - data->unk_540[i] *= 0.99; - data->unk_5A4[i] *= 0.99; - data->unk_608[i] *= 0.99; - data->unk_5A4[i] += -0.1; - - data->unk_734[i]++; - if (data->unk_734[i] >= 17) { - data->unk_734[i] = 0; - data->unk_6D0[i] = 6; - } - - data->unk_478[i] *= 0.9; - - break; - case 6: + case HEART_STATE_VANISH: load_effect(EFFECT_FLOATING_CLOUD_PUFF); - guRotateF(sp18, data->unk_4DC[i], 0.0f, 1.0f, 0.0f); - guTranslateF(sp58, data->unk_2C[i], data->unk_90[i], data->unk_F4[i]); - guMtxCatF(sp58, sp18, sp18); + guRotateF(mtx, data->rotXY[i], 0.0f, 1.0f, 0.0f); + guTranslateF(tempMtx, data->posX[i], data->posY[i], data->posZ[i]); + guMtxCatF(tempMtx, mtx, mtx); - puffEffect = floating_cloud_puff_main(0, data->unk_04 + sp18[3][0], data->unk_08 + sp18[3][1], data->unk_0C + sp18[3][2], 1.0f, 16); + puffEffect = floating_cloud_puff_main(0, data->centerX + mtx[3][0], data->centerY + mtx[3][1], data->centerZ + mtx[3][2], 1.0f, 16); puffEffect->data.floatingCloudPuff->unk_28 = 100; puffEffect->data.floatingCloudPuff->unk_2C = 0; puffEffect->data.floatingCloudPuff->unk_30 = 0; - data->unk_6D0[i] = 7; - + data->state[i] = HEART_STATE_DONE; break; } } @@ -299,7 +306,7 @@ void func_E00CC9C8(void) { void tubba_heart_attack_appendGfx(void* effect) { TubbaHeartAttackFXData* data = ((EffectInstance*)effect)->data.tubbaHeartAttack; Camera* camera = &gCameras[gCurrentCameraID]; - s32 unk_24 = data->unk_24; + s32 alpha = data->primA; Matrix4f sp18; Matrix4f sp58; s32 i; @@ -307,26 +314,26 @@ void tubba_heart_attack_appendGfx(void* effect) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - guTranslateF(sp18, data->unk_04, data->unk_08, data->unk_0C); - guScaleF(sp58, data->unk_28, data->unk_28, data->unk_28); + guTranslateF(sp18, data->centerX, data->centerY, data->centerZ); + guScaleF(sp58, data->overallScale, data->overallScale, data->overallScale); guMtxCatF(sp58, sp18, sp18); guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gDPSetPrimColor(gMainGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, unk_24); + gDPSetPrimColor(gMainGfxPos++, 0, 0, data->primR, data->primG, data->primB, alpha); gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, 0); gSPDisplayList(gMainGfxPos++, D_09000400_3D2980); - for (i = 0; i < 25; i++) { - if (data->unk_6D0[i] != 0 && data->unk_6D0[i] != 7) { - guRotateF(sp18, data->unk_4DC[i], 0.0f, 1.0f, 0.0f); - guTranslateF(sp58, data->unk_2C[i], data->unk_90[i], data->unk_F4[i]); + for (i = 0; i < TUBBA_MINI_HEART_COUNT; i++) { + if (data->state[i] != HEART_STATE_INIT && data->state[i] != HEART_STATE_DONE) { + guRotateF(sp18, data->rotXY[i], 0.0f, 1.0f, 0.0f); + guTranslateF(sp58, data->posX[i], data->posY[i], data->posZ[i]); guMtxCatF(sp58, sp18, sp18); - guRotateF(sp58, -data->unk_4DC[i], 0.0f, 1.0f, 0.0f); + guRotateF(sp58, -data->rotXY[i], 0.0f, 1.0f, 0.0f); guMtxCatF(sp58, sp18, sp18); - guRotateF(sp58, data->unk_478[i], 0.0f, 0.0f, 1.0f); + guRotateF(sp58, data->rotZ[i], 0.0f, 0.0f, 1.0f); guMtxCatF(sp58, sp18, sp18); - guScaleF(sp58, data->unk_3B0[i], data->unk_414[i], 1.0f); + guScaleF(sp58, data->scaleX[i], data->scaleY[i], 1.0f); guMtxCatF(sp58, sp18, sp18); guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); diff --git a/src/encounter.c b/src/encounter.c index 719cb8557a..871d0adbbe 100644 --- a/src/encounter.c +++ b/src/encounter.c @@ -42,7 +42,7 @@ EvtScript EVS_MerleeDropCoins = { EVT_CALL(FadeOutMerlee) EVT_CALL(DeleteNpc, NPC_BTL_MERLEE) EVT_END_THREAD - EVT_CALL(PlaySound, SOUND_2075) + EVT_CALL(PlaySound, SOUND_MAGIC_DESCENDING) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(PlayMerleeGatherFX, LVar0, LVar1, LVar2) EVT_CALL(PlayMerleeOrbFX, LVar0, LVar1, LVar2) @@ -172,7 +172,7 @@ SHIFT_BSS s32 gEncounterState; SHIFT_BSS s32 gEncounterSubState; SHIFT_BSS EncounterStatus gCurrentEncounter; SHIFT_BSS s8 D_8009A63C; -SHIFT_BSS s8 D_8009A654; +SHIFT_BSS s8 HasPreBattleSongPushed; SHIFT_BSS s16 gFirstStrikeMessagePos; SHIFT_BSS s8 D_8009A670; SHIFT_BSS s32 D_8009A678; @@ -185,7 +185,7 @@ SHIFT_BSS EffectInstance* WorldMerleeOrbEffect; SHIFT_BSS EffectInstance* WorldMerleeWaveEffect; void set_battle_formation(Battle*); -void func_800E97E4(void); +void setup_status_bar_for_world(void); void partner_handle_after_battle(void); s32 get_coin_drop_amount(Enemy* enemy); @@ -316,7 +316,7 @@ ApiStatus MerleeUpdateFX(Evt* script, s32 isInitialCall) { WorldMerleeWaveEffect = fx_energy_orb_wave(3, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.00001f, 0); D_800A0BB8 = 0; D_800A0BA0 = 12; - sfx_play_sound(SOUND_2074); + sfx_play_sound(SOUND_MAGIC_ASCENDING); } merlee->pos.y = D_800A0BA4 + sin_rad(DEG_TO_RAD(script->functionTemp[1])) * 3.0f; @@ -655,14 +655,15 @@ void update_encounters_neutral(void) { } } - if (currentEncounter->battleTriggerCooldown != 0 || - gGameStatusPtr->debugEnemyContact == DEBUG_CONTACT_CANT_TOUCH || - (playerStatus->flags & PS_FLAG_ARMS_RAISED) || - (gOverrideFlags & GLOBAL_OVERRIDES_40) || - gPartnerStatus.actingPartner == PARTNER_BOW || - (enemy->flags & ENEMY_FLAG_PASSIVE) || - (gOverrideFlags & (GLOBAL_OVERRIDES_DISABLE_BATTLES | GLOBAL_OVERRIDES_200 | GLOBAL_OVERRIDES_400 | GLOBAL_OVERRIDES_800)) || - is_picking_up_item()) { + if (currentEncounter->battleTriggerCooldown != 0 + || gGameStatusPtr->debugEnemyContact == DEBUG_CONTACT_CANT_TOUCH + || (playerStatus->flags & PS_FLAG_ARMS_RAISED) + || (gOverrideFlags & GLOBAL_OVERRIDES_40) + || gPartnerStatus.actingPartner == PARTNER_BOW + || (enemy->flags & ENEMY_FLAG_PASSIVE) + || (gOverrideFlags & (GLOBAL_OVERRIDES_DISABLE_BATTLES | GLOBAL_OVERRIDES_200 | GLOBAL_OVERRIDES_400 | GLOBAL_OVERRIDES_800)) + || is_picking_up_item() + ) { continue; } do { @@ -732,11 +733,11 @@ void update_encounters_neutral(void) { testY = npcY; testZ = npcZ; - if (npc_test_move_taller_with_slipping(COLLISION_CHANNEL_10000, &testX, &testY, &testZ, distance, atan2(npcX, npcZ, playerX, playerZ), colHeight, colRadius * 2.0f)) { + if (npc_test_move_taller_with_slipping(COLLIDER_FLAG_IGNORE_PLAYER, &testX, &testY, &testZ, distance, atan2(npcX, npcZ, playerX, playerZ), colHeight, colRadius * 2.0f)) { testX = playerX; testY = playerY; testZ = playerZ; - if (npc_test_move_taller_with_slipping(COLLISION_CHANNEL_10000, &testX, &testY, &testZ, distance, atan2(playerX, playerZ, npcX, npcZ), colHeight, colRadius * 2.0f)) { + if (npc_test_move_taller_with_slipping(COLLIDER_FLAG_IGNORE_PLAYER, &testX, &testY, &testZ, distance, atan2(playerX, playerZ, npcX, npcZ), colHeight, colRadius * 2.0f)) { break; } } @@ -795,11 +796,11 @@ void update_encounters_neutral(void) { testX = npcX; testY = npcY; testZ = npcZ; - if (npc_test_move_taller_with_slipping(COLLISION_CHANNEL_10000, &testX, &testY, &testZ, distance, atan2(npcX, npcZ, playerX, playerZ), colHeight, colRadius * 2.0f)) { + if (npc_test_move_taller_with_slipping(COLLIDER_FLAG_IGNORE_PLAYER, &testX, &testY, &testZ, distance, atan2(npcX, npcZ, playerX, playerZ), colHeight, colRadius * 2.0f)) { testX = playerX; testY = playerY; testZ = playerZ; - if (npc_test_move_taller_with_slipping(COLLISION_CHANNEL_10000, &testX, &testY, &testZ, distance, atan2(playerX, playerZ, npcX, npcZ), colHeight, colRadius * 2.0f)) { + if (npc_test_move_taller_with_slipping(COLLIDER_FLAG_IGNORE_PLAYER, &testX, &testY, &testZ, distance, atan2(playerX, playerZ, npcX, npcZ), colHeight, colRadius * 2.0f)) { break; } } @@ -880,11 +881,11 @@ void update_encounters_neutral(void) { testX = npcX; testY = npcY; testZ = npcZ; - if (npc_test_move_taller_with_slipping(COLLISION_CHANNEL_10000, &testX, &testY, &testZ, distance, atan2(npcX, npcZ, playerX, playerZ), colHeight, colRadius * 2.0f)) { + if (npc_test_move_taller_with_slipping(COLLIDER_FLAG_IGNORE_PLAYER, &testX, &testY, &testZ, distance, atan2(npcX, npcZ, playerX, playerZ), colHeight, colRadius * 2.0f)) { testX = playerX; testY = playerY; testZ = playerZ; - if (npc_test_move_taller_with_slipping(COLLISION_CHANNEL_10000, &testX, &testY, &testZ, distance, atan2(playerX, playerZ, npcX, npcZ), colHeight, colRadius * 2.0f)) { + if (npc_test_move_taller_with_slipping(COLLIDER_FLAG_IGNORE_PLAYER, &testX, &testY, &testZ, distance, atan2(playerX, playerZ, npcX, npcZ), colHeight, colRadius * 2.0f)) { continue; } } @@ -1262,7 +1263,7 @@ void update_encounters_pre_battle(void) { currentEncounter->unk_94 = 1; currentEncounter->fadeOutAccel = 1; currentEncounter->unk_08 = -1; - D_8009A654 = FALSE; + HasPreBattleSongPushed = FALSE; D_80077C40 = 0; suspend_all_group(EVT_GROUP_10); @@ -1354,7 +1355,7 @@ void update_encounters_pre_battle(void) { bgm_set_battle_song(currentEncounter->songID, FIRST_STRIKE_NONE); } bgm_push_battle_song(); - D_8009A654 = TRUE; + HasPreBattleSongPushed = TRUE; currentEncounter->battleStartCountdown = 10; gEncounterSubState = ENCOUNTER_SUBSTATE_PRE_BATTLE_LOAD_BATTLE; case ENCOUNTER_SUBSTATE_PRE_BATTLE_LOAD_BATTLE: @@ -1378,15 +1379,15 @@ void update_encounters_pre_battle(void) { } partner_handle_before_battle(); - currentEncounter->dizzyAttackStatus = 0; - currentEncounter->dizzyAttackDuration = 0; + currentEncounter->dizzyAttack.status = 0; + currentEncounter->dizzyAttack.duration = 0; enemy = currentEncounter->curEnemy; currentEncounter->instigatorValue = enemy->instigatorValue; if (is_ability_active(ABILITY_DIZZY_ATTACK) && currentEncounter->hitType == ENCOUNTER_TRIGGER_SPIN) { - currentEncounter->dizzyAttackStatus = 4; - currentEncounter->dizzyAttackDuration = 3; + currentEncounter->dizzyAttack.status = 4; + currentEncounter->dizzyAttack.duration = 3; } sfx_stop_sound(SOUND_SPIN); @@ -1585,16 +1586,16 @@ void update_encounters_post_battle(void) { currentEncounter->unk_08 = 0; gPlayerStatus.blinkTimer = 0; currentEncounter->scriptedBattle = FALSE; - func_800E97E4(); - currentEncounter->dizzyAttackStatus = 0; - currentEncounter->unk_A4 = 0; - currentEncounter->unk_A8 = 0; - currentEncounter->unk_AC = 0; - currentEncounter->dizzyAttackDuration = 0; - currentEncounter->unk_A6 = 0; - currentEncounter->unk_AA = 0; - currentEncounter->unk_AE = 0; - if (D_8009A654 == TRUE) { + setup_status_bar_for_world(); + currentEncounter->dizzyAttack.status = 0; + currentEncounter->unusedAttack1.status = 0; + currentEncounter->unusedAttack2.status = 0; + currentEncounter->unusedAttack3.status = 0; + currentEncounter->dizzyAttack.duration = 0; + currentEncounter->unusedAttack1.duration = 0; + currentEncounter->unusedAttack2.duration = 0; + currentEncounter->unusedAttack3.duration = 0; + if (HasPreBattleSongPushed == TRUE) { bgm_pop_battle_song(); } currentEncounter->fadeOutAccel = 1; diff --git a/src/encounter_api.c b/src/encounter_api.c index ac07ea12f5..62f18c1e68 100644 --- a/src/encounter_api.c +++ b/src/encounter_api.c @@ -851,14 +851,14 @@ ApiStatus OnPlayerFled(Evt* script, s32 isInitialCall) { enemy->aiFlags |= ENEMY_AI_FLAG_SUSPEND; if (!skipReaction) { - EffectInstance* unk; + EffectInstance* emoteEffect; if (!(enemy->aiFlags & ENEMY_AI_FLAG_10)) { - npc->curAnim = *enemy->animList; + npc->curAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; } if (!(enemy->aiFlags & ENEMY_AI_FLAG_8)) { - fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 0.0f, -20.0f, 40, &unk); + fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 0.0f, -20.0f, 40, &emoteEffect); } if ((npc->flags & (NPC_FLAG_GRAVITY | NPC_FLAG_JUMPING | NPC_FLAG_FLYING)) == (NPC_FLAG_JUMPING | NPC_FLAG_FLYING)) { diff --git a/src/entity.c b/src/entity.c index c1400e5cc4..f824246423 100644 --- a/src/entity.c +++ b/src/entity.c @@ -1666,7 +1666,7 @@ s32 entity_raycast_down(f32* x, f32* y, f32* z, f32* hitYaw, f32* hitPitch, f32* hitID = entityID | COLLISION_WITH_ENTITY_BIT; } - colliderID = test_ray_colliders(0x10000, *x, *y, *z, 0.0f, -1.0f, 0.0f, &hitX, &hitY, &hitZ, &hitDepth, &hitNx, + colliderID = test_ray_colliders(COLLIDER_FLAG_IGNORE_PLAYER, *x, *y, *z, 0.0f, -1.0f, 0.0f, &hitX, &hitY, &hitZ, &hitDepth, &hitNx, &hitNy, &hitNz); if (colliderID >= 0) { hitID = colliderID; diff --git a/src/entity/HiddenPanel.c b/src/entity/HiddenPanel.c index 8c5d352e25..846f3ec4cd 100644 --- a/src/entity/HiddenPanel.c +++ b/src/entity/HiddenPanel.c @@ -118,7 +118,7 @@ void entity_HiddenPanel_flip_over(Entity* entity) { switch (data->state) { case 0: - sfx_play_sound(SOUND_20AB); + sfx_play_sound(SOUND_FLIP_PANEL); data->state = 1; data->unk_02 = TRUE; data->riseInterpPhase = 90.0f; @@ -199,7 +199,7 @@ void entity_HiddenPanel_flip_over(Entity* entity) { rotAngle = 0.0f; data->timer = 10; exec_ShakeCamX(CAM_DEFAULT, CAM_SHAKE_DECAYING_VERTICAL, 1, 0.2f); - sfx_play_sound(SOUND_20AC); + sfx_play_sound(SOUND_CLOSE_PANEL); } break; case 4: diff --git a/src/entity/WoodenCrate.c b/src/entity/WoodenCrate.c index 5496ec7405..eec2d87e8d 100644 --- a/src/entity/WoodenCrate.c +++ b/src/entity/WoodenCrate.c @@ -233,7 +233,7 @@ s32 entity_WoodenCrate_idle(Entity* entity) { entity_set_render_script(entity, &Entity_WoodenCrate_RenderShatteredScript); entity_start_script(entity); exec_entity_commandlist(entity); - sfx_play_sound(SOUND_20AE); + sfx_play_sound(SOUND_BREAK_CRATE); } } diff --git a/src/entity/jan_iwa/Plants2.c b/src/entity/jan_iwa/Plants2.c index 034acad679..d23350f61c 100644 --- a/src/entity/jan_iwa/Plants2.c +++ b/src/entity/jan_iwa/Plants2.c @@ -191,7 +191,7 @@ void func_802BC3E4_E2ED14(Entity* entity) { data->unk_10 -= 360.0f; } if (data->unk_10 == 96.0f) { - sfx_play_sound(SOUND_0392); + sfx_play_sound(SOUND_MUNCHLESIA_CHEW); } } diff --git a/src/entity/sbk_omo/StarBoxLauncher.c b/src/entity/sbk_omo/StarBoxLauncher.c index 11cbf786a6..8fc6c47a94 100644 --- a/src/entity/sbk_omo/StarBoxLauncher.c +++ b/src/entity/sbk_omo/StarBoxLauncher.c @@ -74,7 +74,7 @@ void entity_StarBoxLauncher_check_launch(Entity* entity) { hitDepth = 10.0f; add_vec2D_polar(&x, &z, 10.0f, func_800E5348()); - if (npc_raycast_down_sides(COLLISION_CHANNEL_10000, &x, &y, &z, &hitDepth) != 0) { + if (npc_raycast_down_sides(COLLIDER_FLAG_IGNORE_PLAYER, &x, &y, &z, &hitDepth) != 0) { if (NpcHitQueryColliderID & COLLISION_WITH_ENTITY_BIT) { result = get_entity_type(NpcHitQueryColliderID) == ENTITY_TYPE_STAR_BOX_LAUCHER; } diff --git a/src/evt/evt.c b/src/evt/evt.c index 0dddbd1ac0..47ee98bf6f 100644 --- a/src/evt/evt.c +++ b/src/evt/evt.c @@ -1129,7 +1129,7 @@ s32 evt_trigger_on_activate_lock(Trigger* trigger) { if (!does_script_exist(trigger->runningScriptID)) { trigger->runningScript = NULL; - trigger->flags.flags &= ~TRIGGER_ACTIVATED; + trigger->flags &= ~TRIGGER_ACTIVATED; } } diff --git a/src/evt/fx_api.c b/src/evt/fx_api.c index dcada95879..ddb2c685cc 100644 --- a/src/evt/fx_api.c +++ b/src/evt/fx_api.c @@ -27,7 +27,7 @@ ApiStatus ShowRecoveryShimmer(Evt* script, s32 isInitialCall) { f32 z = evt_get_float_variable(script, *args++); show_recovery_shimmer(x, y, z, evt_get_variable(script, *args++)); - sfx_play_sound_at_position(SOUND_0378, SOUND_SPACE_DEFAULT, x, y, z); + sfx_play_sound_at_position(SOUND_RECOVERY_SHMMER, SOUND_SPACE_DEFAULT, x, y, z); return ApiStatus_DONE2; } diff --git a/src/evt/msg_api.c b/src/evt/msg_api.c index e89884c6ab..18481df6d7 100644 --- a/src/evt/msg_api.c +++ b/src/evt/msg_api.c @@ -325,9 +325,9 @@ ApiStatus func_802D0C94(Evt* script, s32 initialCall) { Bytecode* args = script->ptrReadPos; if (evt_get_variable(script, *args++) == 0) { - gOverrideFlags |= GLOBAL_OVERRIDES_10; + gOverrideFlags |= GLOBAL_OVERRIDES_MESSAGES_OVER_FRONTUI; } else { - gOverrideFlags &= ~GLOBAL_OVERRIDES_10; + gOverrideFlags &= ~GLOBAL_OVERRIDES_MESSAGES_OVER_FRONTUI; } return ApiStatus_DONE2; } @@ -337,7 +337,7 @@ ApiStatus SetMessageText(Evt* script, s32 isInitialCall) { s32 msg = evt_get_variable(script, *args++); s32 index = evt_get_variable(script, *args++); - set_message_msg(msg, index); + set_message_text_var(msg, index); return ApiStatus_DONE2; } @@ -346,6 +346,6 @@ ApiStatus SetMessageValue(Evt* script, s32 initialCall) { s32 value = evt_get_variable(script, *ptrReadPos++); s32 index = evt_get_variable(script, *ptrReadPos); - set_message_value(value, index); + set_message_int_var(value, index); return ApiStatus_DONE2; } diff --git a/src/evt/player_api.c b/src/evt/player_api.c index 0bc1457978..e9c6b4e8b0 100644 --- a/src/evt/player_api.c +++ b/src/evt/player_api.c @@ -46,7 +46,7 @@ ApiStatus DisablePlayerInput(Evt* script, s32 isInitialCall) { disable_player_input(); partner_disable_input(); close_status_bar(); - func_800E984C(); + disable_status_bar_input(); if (playerStatus->actionState == ACTION_STATE_SPIN) { playerStatus->animFlags |= PA_FLAG_INTERRUPT_SPIN; } @@ -56,7 +56,7 @@ ApiStatus DisablePlayerInput(Evt* script, s32 isInitialCall) { partner_enable_input(); func_800E01DC(); gOverrideFlags &= ~GLOBAL_OVERRIDES_40; - func_800E983C(); + enable_status_bar_input(); } return ApiStatus_DONE2; } @@ -270,7 +270,7 @@ s32 player_jump(Evt* script, s32 isInitialCall, s32 mode) { anim = ANIM_MarioW3_8bit_Jump; } suggest_player_anim_allow_backward(anim); - sfx_play_sound_at_player(SOUND_JUMP_2081, SOUND_SPACE_DEFAULT); + sfx_play_sound_at_player(SOUND_QUICK_PLAYER_JUMP, SOUND_SPACE_DEFAULT); } script->functionTemp[0] = 1; } @@ -492,7 +492,7 @@ ApiStatus FullyRestoreHPandFP(Evt* script, s32 isInitialCall) { ApiStatus FullyRestoreSP(Evt* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; - playerData->specialBarsFilled = playerData->maxStarPower * 256; + playerData->starPower = playerData->maxStarPower * SP_PER_BAR; return ApiStatus_DONE2; } diff --git a/src/filemenu/filemenu_common.c b/src/filemenu/filemenu_common.c index 5553371ca5..6e9f89b4ba 100644 --- a/src/filemenu/filemenu_common.c +++ b/src/filemenu/filemenu_common.c @@ -1041,7 +1041,7 @@ void filemenu_init(s32 arg0) { func_PAL_8002B574(); if (menu->page == 0) { - fio_has_valid_globals(); + fio_load_globals(); if (gSaveGlobals.lastFileSelected >= 4) { gSaveGlobals.lastFileSelected = 0; } @@ -1092,7 +1092,7 @@ void filemenu_init(s32 arg0) { } if (menu->page == 0) { - fio_has_valid_globals(); + fio_load_globals(); if (gSaveGlobals.lastFileSelected >= 4) { gSaveGlobals.lastFileSelected = 0; } diff --git a/src/filemenu/filemenu_yesno.c b/src/filemenu/filemenu_yesno.c index 08eacfb8f0..16e9deac88 100644 --- a/src/filemenu/filemenu_yesno.c +++ b/src/filemenu/filemenu_yesno.c @@ -360,7 +360,7 @@ void filemenu_yesno_handle_input(MenuPanel* menu) { { gSaveGlobals.useMonoSound = 1 - gGameStatusPtr->soundOutputMode; gSaveGlobals.lastFileSelected = slot3; - fio_flush_globals(); + fio_save_globals(); } fio_load_game(slot3); set_game_mode(GAME_MODE_END_FILE_SELECT); diff --git a/src/fio.c b/src/fio.c index d47927fbf2..8fdde87ec8 100644 --- a/src/fio.c +++ b/src/fio.c @@ -71,7 +71,7 @@ b32 fio_validate_globals_checksums(void) { return fio_calc_globals_checksum() == header->crc1; } -b32 fio_has_valid_globals(void) { +b32 fio_load_globals(void) { fio_read_flash(GLOBALS_PAGE_1, &gSaveGlobals, sizeof(gSaveGlobals)); if (fio_validate_globals_checksums()) { return TRUE; @@ -83,10 +83,10 @@ b32 fio_has_valid_globals(void) { } bzero(&gSaveGlobals, sizeof(gSaveGlobals)); - return FALSE; + return FALSE; } -b32 fio_flush_globals(void) { +b32 fio_save_globals(void) { s32 checksum; strcpy(gSaveGlobals.magicString, MagicSaveString); diff --git a/src/fio.h b/src/fio.h index 43bbbbb5b1..78319d9411 100644 --- a/src/fio.h +++ b/src/fio.h @@ -3,8 +3,8 @@ #include "common.h" -b32 fio_has_valid_globals(void); -b32 fio_flush_globals(void); +b32 fio_load_globals(void); +b32 fio_save_globals(void); b32 fio_load_game(s32 saveSlot); void fio_save_game(s32 saveSlot); void fio_erase_game(s32 saveSlot); diff --git a/src/hud_element.c b/src/hud_element.c index b33fcc0953..57abbe7a54 100644 --- a/src/hud_element.c +++ b/src/hud_element.c @@ -103,7 +103,7 @@ Vtx D_8014F0C8[] = { } }; -Lights1 D_8014F108 = gdSPDefLights1(255, 255, 255, 0, 0, 0, 0, 0, 0); +Lights1 HudElementLights = gdSPDefLights1(255, 255, 255, 0, 0, 0, 0, 0, 0); SHIFT_BSS s32 gHudElementsNumber; SHIFT_BSS s32 D_80159180; @@ -1617,12 +1617,14 @@ void render_hud_element(HudElement* hudElement) { gDPPipeSync(gMainGfxPos++); } -void render_hud_elements_world(void) { +void render_transformed_hud_elements(void) { s32 i, count, j; s32 sortedElements[ARRAY_COUNT(*gHudElements)]; s32 el1, el2; HudElement* hudElement; s16 tempOffsetZ; + s32 flags; + s32 z1, z2; // TODO fix this terrible match do { @@ -1631,20 +1633,33 @@ void render_hud_elements_world(void) { if (gCurrentCamID == CAM_3) { for (i = 0; i < ARRAY_COUNT(*gHudElements); i++) { hudElement = (*gHudElements)[i]; - if (hudElement != NULL) { - s32 flags = hudElement->flags; - if (flags && !(flags & HUD_ELEMENT_FLAG_DISABLED)) { - if (!(flags & (HUD_ELEMENT_FLAG_200000 | HUD_ELEMENT_FLAG_10000000))) { - if (flags & HUD_ELEMENT_FLAG_TRANSFORM) { - if (!(flags & HUD_ELEMENT_FLAG_40000000)) { - if (!(flags & HUD_ELEMENT_FLAG_FRONTUI) && hudElement->drawSizePreset >= 0 && !(flags & HUD_ELEMENT_FLAG_80)) { - sortedElements[count++] = i; - } - } - } - } - } + if (hudElement == NULL) { + continue; } + + flags = hudElement->flags; + if (flags == 0 || flags & HUD_ELEMENT_FLAG_DISABLED) { + continue; + } + + if (flags & (HUD_ELEMENT_FLAG_200000 | HUD_ELEMENT_FLAG_10000000)) { + continue; + } + + if (!(flags & HUD_ELEMENT_FLAG_TRANSFORM)) { + continue; + } + + if (flags & HUD_ELEMENT_FLAG_40000000) { + continue; + } + + if (flags & HUD_ELEMENT_FLAG_FRONTUI || hudElement->drawSizePreset < 0 || flags & HUD_ELEMENT_FLAG_80) { + continue; + } + + // add element to list + sortedElements[count++] = i; } if (count != 0) { @@ -1665,7 +1680,7 @@ void render_hud_elements_world(void) { gDPPipeSync(gMainGfxPos++); gSPClearGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); gSPSetGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); - gSPSetLights1(gMainGfxPos++, D_8014F108); + gSPSetLights1(gMainGfxPos++, HudElementLights); gSPTexture(gMainGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); gSPSetOtherMode(gMainGfxPos++, G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 18, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE); @@ -1675,24 +1690,39 @@ void render_hud_elements_world(void) { } } } + count = 0; if (gCurrentCamID == CAM_BATTLE) { for (i = 0; i < ARRAY_COUNT(*gHudElements); i++) { hudElement = (*gHudElements)[i]; - if (hudElement != NULL) { - s32 flags = hudElement->flags; - if (flags && !(flags & HUD_ELEMENT_FLAG_DISABLED)) { - if (!(flags & (HUD_ELEMENT_FLAG_200000 | HUD_ELEMENT_FLAG_10000000))) { - if (flags & HUD_ELEMENT_FLAG_TRANSFORM) { - if (flags & HUD_ELEMENT_FLAG_40000000) { - if (!(flags & HUD_ELEMENT_FLAG_FRONTUI) && hudElement->drawSizePreset >= 0 && !(flags & HUD_ELEMENT_FLAG_80)) { - sortedElements[count++] = i; - } - } - } - } - } + if (hudElement == NULL) { + continue; } + + flags = hudElement->flags; + if (flags == 0 || flags & HUD_ELEMENT_FLAG_DISABLED) { + continue; + } + + if (flags & (HUD_ELEMENT_FLAG_200000 | HUD_ELEMENT_FLAG_10000000)) { + continue; + } + + if (!(flags & HUD_ELEMENT_FLAG_TRANSFORM)) { + continue; + } + + // different from CAM_3 pass + if (!(flags & HUD_ELEMENT_FLAG_40000000)) { + continue; + } + + if (flags & HUD_ELEMENT_FLAG_FRONTUI || hudElement->drawSizePreset < 0 || flags & HUD_ELEMENT_FLAG_80) { + continue; + } + + // add element to list + sortedElements[count++] = i; } if (count != 0) { @@ -1713,7 +1743,7 @@ void render_hud_elements_world(void) { gDPPipeSync(gMainGfxPos++); gSPClearGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); gSPSetGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); - gSPSetLights1(gMainGfxPos++, D_8014F108); + gSPSetLights1(gMainGfxPos++, HudElementLights); gSPTexture(gMainGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); gDPSetAlphaCompare(gMainGfxPos++, G_AC_NONE); gSPSetOtherMode(gMainGfxPos++, G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 18, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE); @@ -1771,7 +1801,7 @@ void func_80143C48(s32 elemID, s32 arg1, s32 camID) { gSPClearGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); gSPSetGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); - gSPSetLights1(gMainGfxPos++, D_8014F108); + gSPSetLights1(gMainGfxPos++, HudElementLights); gSPTexture(gMainGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP); @@ -1788,34 +1818,44 @@ void func_80143C48(s32 elemID, s32 arg1, s32 camID) { elemID &= ~HUD_ELEMENT_BATTLE_ID_MASK; elem = (*gHudElements)[elemID]; - if (elem != NULL) { - if (elem->flags && !(elem->flags & HUD_ELEMENT_FLAG_DISABLED)) { - if (!(elem->flags & (HUD_ELEMENT_FLAG_200000 | HUD_ELEMENT_FLAG_10000000))) { - if (elem->flags & HUD_ELEMENT_FLAG_TRANSFORM) { - if (!(elem->flags & HUD_ELEMENT_FLAG_FRONTUI) && (elem->drawSizePreset >= 0) && (elem->flags & HUD_ELEMENT_FLAG_80)) { - render_hud_element(elem); - } - } - } - } + if (elem == NULL) { + return; } + + if (elem->flags == 0 || elem->flags & HUD_ELEMENT_FLAG_DISABLED) { + return; + } + + if (elem->flags & (HUD_ELEMENT_FLAG_200000 | HUD_ELEMENT_FLAG_10000000)) { + return; + } + + if (!(elem->flags & HUD_ELEMENT_FLAG_TRANSFORM)) { + return; + } + + if (elem->flags & HUD_ELEMENT_FLAG_FRONTUI || elem->drawSizePreset < 0 || !(elem->flags & HUD_ELEMENT_FLAG_80)) { + return; + } + + render_hud_element(elem); } } -void func_80144218(s32 arg0) { - func_80143C48(arg0, 1, CAM_3); +void func_80144218(s32 id) { + func_80143C48(id, 1, CAM_3); } -void func_80144238(s32 arg0) { - func_80143C48(arg0, 0, CAM_3); +void func_80144238(s32 id) { + func_80143C48(id, 0, CAM_3); } -void func_80144258(s32 arg0) { - func_80143C48(arg0, 1, CAM_BATTLE); +void func_80144258(s32 id) { + func_80143C48(id, 1, CAM_BATTLE); } -void func_80144278(s32 arg0) { - func_80143C48(arg0, 0, CAM_BATTLE); +void func_80144278(s32 id) { + func_80143C48(id, 0, CAM_BATTLE); } void draw_hud_element_internal(s32 id, s32 clipMode) { diff --git a/src/hud_element.h b/src/hud_element.h index 7b3c11f27e..ea9d0fe92e 100644 --- a/src/hud_element.h +++ b/src/hud_element.h @@ -476,7 +476,7 @@ void render_hud_elements_frontUI(void); void render_hud_element(HudElement* hudElement); -void render_hud_elements_world(void); +void render_transformed_hud_elements(void); void func_80143C48(s32 arg0, s32 arg1, s32 camID); void func_80144218(s32 arg0); diff --git a/src/inspect_icon.c b/src/inspect_icon.c index f1334e4370..96db5a64ce 100644 --- a/src/inspect_icon.c +++ b/src/inspect_icon.c @@ -113,8 +113,8 @@ s32 should_continue_inspect(void) { curInteraction = NO_COLLIDER; break; } - } else if ( - ((playerStatus->flags & (PS_FLAG_HAS_CONVERSATION_NPC | PS_FLAG_INPUT_DISABLED)) == PS_FLAG_HAS_CONVERSATION_NPC) + } else if (!(playerStatus->flags & PS_FLAG_INPUT_DISABLED) + && (playerStatus->flags & PS_FLAG_HAS_CONVERSATION_NPC) && (npc != NULL) && (npc->flags & NPC_FLAG_10000000) ) { diff --git a/src/80850_len_3060.c b/src/inventory.c similarity index 62% rename from src/80850_len_3060.c rename to src/inventory.c index a4c17c1a52..d40d93f74e 100644 --- a/src/80850_len_3060.c +++ b/src/inventory.c @@ -1,13 +1,21 @@ #include "common.h" #include "hud_element.h" -BSS s16 D_8010CD10; -BSS s16 D_8010CD12; +#define FULLY_EXTENDED_Y 18 +#define FULLY_RETRACTED_Y -100 + +enum BlinkModes { + BLINK_OFF = 0, + BLINK_ON = 1, +}; + +BSS b16 D_8010CD10; +BSS b16 D_8010CD12; BSS char D_8010CD14[0xA]; BSS s32 D_8010CD20; BSS char D_8010CD24[0xC]; -SHIFT_BSS UiStatus gUIStatus; +SHIFT_BSS StatusBar gStatusBar; extern HudScript* TimesHudScript; extern HudScript* SPIncrementHudScripts[]; @@ -43,8 +51,8 @@ void clear_player_data(void) { PlayerData* playerData = &gPlayerData; s32 i; - D_8010CD10 = 0; - D_8010CD12 = 0; + D_8010CD10 = FALSE; + D_8010CD12 = FALSE; playerData->hammerLevel = -1; playerData->curHP = 10; @@ -61,13 +69,13 @@ void clear_player_data(void) { playerData->fortressKeyCount = 0; playerData->starPieces = 0; playerData->starPoints = 0; - playerData->unk_11 = 0; - playerData->unk_288 = 0; - playerData->merleeSpellType = MERLEE_SPELL_0; + playerData->unused_011 = 0; + playerData->unused_288 = 0; + playerData->merleeSpellType = MERLEE_SPELL_NONE; playerData->merleeCastsLeft = 0; playerData->merleeTurnCount = -1; playerData->maxStarPower = 0; - playerData->specialBarsFilled = 0; + playerData->starPower = 0; playerData->starBeamLevel = 0; playerData->curPartner = 0; @@ -108,7 +116,7 @@ void clear_player_data(void) { playerData->powerBounces = 0; playerData->battlesCount = 0; playerData->battlesWon = 0; - playerData->unk_2A6 = 0; + playerData->fleeAttempts = 0; playerData->battlesFled = 0; playerData->trainingsDone = 0; playerData->walkingStepsTaken = 0; @@ -280,7 +288,7 @@ s32 get_stored_count(void) { s32 i = 0; s32 sum = 0; - for (i; i < ARRAY_COUNT(gPlayerData.storedItems); i++) { + for (; i < ARRAY_COUNT(gPlayerData.storedItems); i++) { if (playerData->storedItems[i] != ITEM_NONE) { sum++; } @@ -314,157 +322,157 @@ void enforce_hpfp_limits(void) { } void initialize_status_bar(void) { - UiStatus* uiStatus = &gUIStatus; + StatusBar* statusBar = &gStatusBar; PlayerData* playerData = &gPlayerData; s32 iconIndex; - uiStatus->drawPosX = 12; - D_8010CD10 = 0; - D_8010CD12 = 0; - uiStatus->drawPosY = -100; - uiStatus->hidden = FALSE; - uiStatus->showTimer = 210; - uiStatus->unk_3B[0] = 0; - uiStatus->ignoreChanges = FALSE; - uiStatus->unk_45[0] = 0; - uiStatus->unk_45[1] = 0; - uiStatus->hpBlinking = 0; - uiStatus->hpBlinkCounter = 0; - uiStatus->hpBlinkTimer = 0; - uiStatus->fpBlinking = 0; - uiStatus->fpBlinkCounter = 0; - uiStatus->fpBlinkTimer = 0; - uiStatus->spBlinking = 0; - uiStatus->spBlinkCounter = 0; - uiStatus->coinsBlinking = 0; - uiStatus->coinsBlinkCounter = 0; - uiStatus->coinsBlinkTimer = 0; - uiStatus->disabled = 0; - uiStatus->starpointsBlinking = 0; - uiStatus->displayHP = playerData->curHP; - uiStatus->displayFP = playerData->curFP; - uiStatus->displayCoins = playerData->coins; - uiStatus->displayStarpoints = playerData->starPoints; - uiStatus->displaySP = playerData->specialBarsFilled; - uiStatus->starpointsBlinkCounter = 0; - uiStatus->unk_6C[2] = -1; - uiStatus->unk_3B[1] = 0; - uiStatus->unk_57 = 0; - uiStatus->unk_58 = 0; - uiStatus->unk_59 = 0; - uiStatus->spBarsToBlink = 0; - uiStatus->unk_6C[0] = 0; - uiStatus->unk_6C[1] = 0; - uiStatus->iconIndex12 = -1; + statusBar->drawPosX = 12; + D_8010CD10 = FALSE; + D_8010CD12 = FALSE; + statusBar->drawPosY = FULLY_RETRACTED_Y; + statusBar->hidden = FALSE; + statusBar->showTimer = 210; + statusBar->unk_3B = FALSE; + statusBar->ignoreChanges = FALSE; + statusBar->openInputDisabled = FALSE; + statusBar->alwaysShown = FALSE; + statusBar->hpBlinking = BLINK_OFF; + statusBar->hpBlinkCounter = 0; + statusBar->hpBlinkTimer = 0; + statusBar->fpBlinking = BLINK_OFF; + statusBar->fpBlinkCounter = 0; + statusBar->fpBlinkTimer = 0; + statusBar->spBlinking = BLINK_OFF; + statusBar->spBlinkCounter = 0; + statusBar->coinsBlinking = BLINK_OFF; + statusBar->coinsBlinkCounter = 0; + statusBar->coinsBlinkTimer = 0; + statusBar->disabled = 0; + statusBar->starpointsBlinking = BLINK_OFF; + statusBar->displayHP = playerData->curHP; + statusBar->displayFP = playerData->curFP; + statusBar->displayCoins = playerData->coins; + statusBar->displayStarpoints = playerData->starPoints; + statusBar->displayStarPower = playerData->starPower; + statusBar->starpointsBlinkCounter = 0; + statusBar->unk_6E = -1; + statusBar->unk_3C = FALSE; + statusBar->unk_57 = 0; + statusBar->unk_58 = 0; + statusBar->unk_59 = 0; + statusBar->spBarsToBlink = 0; + statusBar->coinCounterHideTime = 0; + statusBar->unk_6D = 0; + statusBar->iconIndex12 = -1; close_status_bar(); #if VERSION_PAL switch (gCurrentLanguage) { case LANGUAGE_EN: - iconIndex = uiStatus->hpIconIndices[0] = hud_element_create(&HES_StatusHP); + iconIndex = statusBar->hpIconHIDs[0] = hud_element_create(&HES_StatusHP); break; case LANGUAGE_DE: - iconIndex = uiStatus->hpIconIndices[0] = hud_element_create(&HES_StatusHP_de); + iconIndex = statusBar->hpIconHIDs[0] = hud_element_create(&HES_StatusHP_de); break; case LANGUAGE_FR: - iconIndex = uiStatus->hpIconIndices[0] = hud_element_create(&HES_StatusHP_fr); + iconIndex = statusBar->hpIconHIDs[0] = hud_element_create(&HES_StatusHP_fr); break; case LANGUAGE_ES: - iconIndex = uiStatus->hpIconIndices[0] = hud_element_create(&HES_StatusHP_es); + iconIndex = statusBar->hpIconHIDs[0] = hud_element_create(&HES_StatusHP_es); break; } hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80); hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); #else - uiStatus->hpIconIndices[0] = iconIndex = hud_element_create(&HES_StatusHP); + statusBar->hpIconHIDs[0] = iconIndex = hud_element_create(&HES_StatusHP); hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80); hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); #endif - uiStatus->hpIconIndices[1] = iconIndex = hud_element_create(&HES_StatusHeart); + statusBar->hpIconHIDs[1] = iconIndex = hud_element_create(&HES_StatusHeart); hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80); hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); #if VERSION_PAL switch (gCurrentLanguage) { case LANGUAGE_EN: - iconIndex = uiStatus->fpIconIndices[0] = hud_element_create(&HES_StatusFP); + iconIndex = statusBar->fpIconHIDs[0] = hud_element_create(&HES_StatusFP); break; case LANGUAGE_DE: - iconIndex = uiStatus->fpIconIndices[0] = hud_element_create(&HES_StatusFP_de); + iconIndex = statusBar->fpIconHIDs[0] = hud_element_create(&HES_StatusFP_de); break; case LANGUAGE_FR: - iconIndex = uiStatus->fpIconIndices[0] = hud_element_create(&HES_StatusFP_fr); + iconIndex = statusBar->fpIconHIDs[0] = hud_element_create(&HES_StatusFP_fr); break; case LANGUAGE_ES: - iconIndex = uiStatus->fpIconIndices[0] = hud_element_create(&HES_StatusFP_es); + iconIndex = statusBar->fpIconHIDs[0] = hud_element_create(&HES_StatusFP_es); break; } hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80); hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); #else - uiStatus->fpIconIndices[0] = iconIndex = hud_element_create(&HES_StatusFP); + statusBar->fpIconHIDs[0] = iconIndex = hud_element_create(&HES_StatusFP); hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80); hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); #endif - uiStatus->fpIconIndices[1] = iconIndex = hud_element_create(&HES_StatusFlower); + statusBar->fpIconHIDs[1] = iconIndex = hud_element_create(&HES_StatusFlower); hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80); hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); - uiStatus->coinIconIndex = iconIndex = hud_element_create(&HES_StatusCoin); + statusBar->coinIconHID = iconIndex = hud_element_create(&HES_StatusCoin); hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80); hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); - uiStatus->coinSparkleIconIndex = iconIndex = hud_element_create(&HES_Item_CoinSparkleRandom); + statusBar->coinSparkleHID = iconIndex = hud_element_create(&HES_Item_CoinSparkleRandom); hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80); hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); - uiStatus->starpointsIconIndex = iconIndex = hud_element_create(&HES_StatusStarPoint); + statusBar->spIconHID = iconIndex = hud_element_create(&HES_StatusStarPoint); hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80); hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); - uiStatus->starpointsShineIconIndex = iconIndex = hud_element_create(&HES_StatusSPShine); + statusBar->spShineHID = iconIndex = hud_element_create(&HES_StatusSPShine); hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80); hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); - uiStatus->iconIndex8 = iconIndex = hud_element_create(&HES_StatusTimes); + statusBar->hpTimesHID = iconIndex = hud_element_create(&HES_StatusTimes); hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); - uiStatus->iconIndex9 = iconIndex = hud_element_create(&HES_StatusTimes); + statusBar->fpTimesHID = iconIndex = hud_element_create(&HES_StatusTimes); hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); - uiStatus->iconIndexA = iconIndex = hud_element_create(&HES_StatusTimes); + statusBar->spTimesHID = iconIndex = hud_element_create(&HES_StatusTimes); hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); - uiStatus->iconIndexB = iconIndex = hud_element_create(&HES_StatusTimes); + statusBar->coinTimesHID = iconIndex = hud_element_create(&HES_StatusTimes); hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); - uiStatus->starIconIndex = iconIndex = hud_element_create(&HES_StatusStar1); + statusBar->starIconHID = iconIndex = hud_element_create(&HES_StatusStar1); hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80); hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); func_800F0D5C(); } -void status_bar_draw_number(s32 iconID, s32 x, s32 y, s32 value, s32 numDigits) { +void status_bar_draw_number(s32 iconID, s32 startX, s32 startY, s32 value, s32 numDigits) { s8 digits[4]; - s32 i; - s32 x2, y2; - s32 keepDrawing; + s32 drawX, drawY; + b32 keepDrawing; s32 digit; - + s32 i; + hud_element_set_script(iconID, TimesHudScript); - x2 = x + 8; - y2 = y + 8; - hud_element_set_render_pos(iconID, x2, y2 - 1); + drawX = startX + 8; + drawY = startY + 8; + hud_element_set_render_pos(iconID, drawX, drawY - 1); hud_element_clear_flags(iconID, HUD_ELEMENT_FLAG_DISABLED); hud_element_draw_next(iconID); @@ -475,33 +483,33 @@ void status_bar_draw_number(s32 iconID, s32 x, s32 y, s32 value, s32 numDigits) value /= 10; } - x2 += 13; + drawX += 13; keepDrawing = FALSE; - for (i = 0; i < numDigits; i++, x2 += 8) { + for (i = 0; i < numDigits; i++, drawX += 8) { digit = digits[i]; // Once we have encountered our first non-zero digit, we need to keep drawing the remaining digits if (digit != 0 || keepDrawing || (i == numDigits - 1)) { keepDrawing = TRUE; hud_element_set_script(iconID, DigitHudScripts[digit]); - hud_element_set_render_pos(iconID, x2, y2); + hud_element_set_render_pos(iconID, drawX, drawY); hud_element_clear_flags(iconID, HUD_ELEMENT_FLAG_DISABLED); hud_element_draw_next(iconID); } } } -void status_bar_draw_stat(s32 id, s32 x, s32 y, s32 currentValue, s32 maxValue) { +void status_bar_draw_stat(s32 id, s32 startX, s32 startY, s32 currentValue, s32 maxValue) { s8 digits[4]; - s32 cond; + b32 keepDrawing; s32 digit; s32 numDigits = 2; - s32 localX; - s32 localY; + s32 drawX; + s32 drawY; s32 i = 0; - s32 baseX = x + 8; - s32 baseY = y + 8; + s32 baseX = startX + 8; + s32 baseY = startY + 8; hud_element_set_script(id, SlashHudScript); hud_element_set_render_pos(id, baseX + 14, baseY + 1); @@ -514,15 +522,15 @@ void status_bar_draw_stat(s32 id, s32 x, s32 y, s32 currentValue, s32 maxValue) currentValue /= 10; } - localX = baseX; - localY = baseY; - cond = FALSE; - for (i = 0; i < numDigits; i++, localX += 8) { + drawX = baseX; + drawY = baseY; + keepDrawing = FALSE; + for (i = 0; i < numDigits; i++, drawX += 8) { digit = digits[i]; - if (digit != 0 || cond || i == numDigits - 1) { - cond = TRUE; + if (digit != 0 || keepDrawing || i == numDigits - 1) { + keepDrawing = TRUE; hud_element_set_script(id, DigitHudScripts[digit]); - hud_element_set_render_pos(id, localX, localY); + hud_element_set_render_pos(id, drawX, drawY); hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); hud_element_draw_next(id); } @@ -533,15 +541,15 @@ void status_bar_draw_stat(s32 id, s32 x, s32 y, s32 currentValue, s32 maxValue) maxValue /= 10; } - localX = baseX + 26; - localY = baseY; - cond = FALSE; - for (i = 0; i < numDigits; i++, localX += 8) { + drawX = baseX + 26; + drawY = baseY; + keepDrawing = FALSE; + for (i = 0; i < numDigits; i++, drawX += 8) { digit = digits[i]; - if (digit != 0 || cond || i == numDigits - 1) { - cond = TRUE; + if (digit != 0 || keepDrawing || i == numDigits - 1) { + keepDrawing = TRUE; hud_element_set_script(id, DigitHudScripts[digit]); - hud_element_set_render_pos(id, localX, localY); + hud_element_set_render_pos(id, drawX, drawY); hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); hud_element_draw_next(id); } @@ -549,7 +557,7 @@ void status_bar_draw_stat(s32 id, s32 x, s32 y, s32 currentValue, s32 maxValue) } void update_status_bar(void) { - UiStatus* uiStatus = &gUIStatus; + StatusBar* statusBar = &gStatusBar; PlayerData* playerData = &gPlayerData; PlayerStatus* playerStatus = &gPlayerStatus; s32 sp50; @@ -573,126 +581,132 @@ void update_status_bar(void) { return; } - if (!gGameStatusPtr->isBattle && playerData->coins != uiStatus->displayCoins) { + if (!gGameStatusPtr->isBattle && playerData->coins != statusBar->displayCoins) { status_bar_start_blinking_coins(); } - i = playerData->coins - uiStatus->displayCoins; - + // update coin counter (+1 coin per frame for each 5-coin delta) + i = playerData->coins - statusBar->displayCoins; if (i < 0) { i = (i - 4) / 5; } else { i = (i + 4) / 5; } - uiStatus->displayCoins += i; + statusBar->displayCoins += i; - if (uiStatus->displayHP != playerData->curHP && !uiStatus->ignoreChanges) { - if (uiStatus->hidden) { - uiStatus->showTimer = 70; - uiStatus->hidden = FALSE; - uiStatus->unk_3B[0] = 0; + // show the status bar if HP has changed + if (statusBar->displayHP != playerData->curHP && !statusBar->ignoreChanges) { + if (statusBar->hidden) { + statusBar->showTimer = 70; + statusBar->hidden = FALSE; + statusBar->unk_3B = FALSE; } else { - uiStatus->showTimer = 70; + statusBar->showTimer = 70; } } - if (uiStatus->displayFP != playerData->curFP && !uiStatus->ignoreChanges) { - if (uiStatus->hidden) { - uiStatus->showTimer = 70; - uiStatus->hidden = FALSE; - uiStatus->unk_3B[0] = 0; + // show the status bar if FP has changed + if (statusBar->displayFP != playerData->curFP && !statusBar->ignoreChanges) { + if (statusBar->hidden) { + statusBar->showTimer = 70; + statusBar->hidden = FALSE; + statusBar->unk_3B = FALSE; } else { - uiStatus->showTimer = 70; + statusBar->showTimer = 70; } } - if (uiStatus->displaySP != playerData->specialBarsFilled && !uiStatus->ignoreChanges) { - if (uiStatus->hidden) { - uiStatus->showTimer = 70; - uiStatus->hidden = FALSE; - uiStatus->unk_3B[0] = 0; + // show the status bar if star power has changed + if (statusBar->displayStarPower != playerData->starPower && !statusBar->ignoreChanges) { + if (statusBar->hidden) { + statusBar->showTimer = 70; + statusBar->hidden = FALSE; + statusBar->unk_3B = FALSE; } else { - uiStatus->showTimer = 70; + statusBar->showTimer = 70; } } - if (uiStatus->displayHP != playerData->curHP) { - if (!gGameStatusPtr->isBattle && playerData->curHP < uiStatus->displayHP) { + // sync displayed HP toward true HP + if (statusBar->displayHP != playerData->curHP) { + if (!gGameStatusPtr->isBattle && playerData->curHP < statusBar->displayHP) { status_bar_start_blinking_hp(); } - if (uiStatus->displayHP < playerData->curHP) { - if (uiStatus->drawPosY >= 18) { + if (statusBar->displayHP < playerData->curHP) { + if (statusBar->drawPosY >= FULLY_EXTENDED_Y) { if (gGameStatusPtr->frameCounter % 4 == 0) { - uiStatus->displayHP++; + statusBar->displayHP++; sfx_play_sound(SOUND_HEART_PICKUP); } } else if (gGameStatusPtr->frameCounter % 4 == 0) { - uiStatus->displayHP++; + statusBar->displayHP++; } } else if (gGameStatusPtr->frameCounter % 4 == 0) { - uiStatus->displayHP--; + statusBar->displayHP--; } } - if (uiStatus->displayFP != playerData->curFP) { - if (!gGameStatusPtr->isBattle && playerData->curFP < uiStatus->displayFP) { + // sync displayed FP toward true FP + if (statusBar->displayFP != playerData->curFP) { + if (!gGameStatusPtr->isBattle && playerData->curFP < statusBar->displayFP) { status_bar_start_blinking_fp(); } - if (uiStatus->displayFP < playerData->curFP) { - if (uiStatus->drawPosY >= 18) { + if (statusBar->displayFP < playerData->curFP) { + if (statusBar->drawPosY >= FULLY_EXTENDED_Y) { if (gGameStatusPtr->frameCounter % 4 == 0) { - uiStatus->displayFP++; + statusBar->displayFP++; sfx_play_sound(SOUND_FLOWER_PICKUP); } } else if (gGameStatusPtr->frameCounter % 4 == 0) { - uiStatus->displayFP++; + statusBar->displayFP++; } } else if (gGameStatusPtr->frameCounter % 4 == 0) { - uiStatus->displayFP--; + statusBar->displayFP--; } } - if (uiStatus->displaySP != playerData->specialBarsFilled) { - if (uiStatus->displaySP < playerData->specialBarsFilled) { - uiStatus->displaySP += 10; - if (uiStatus->displaySP > playerData->specialBarsFilled) { - uiStatus->displaySP = playerData->specialBarsFilled; + // sync displayed star power toward true star power + if (statusBar->displayStarPower != playerData->starPower) { + if (statusBar->displayStarPower < playerData->starPower) { + statusBar->displayStarPower += 10; + if (statusBar->displayStarPower > playerData->starPower) { + statusBar->displayStarPower = playerData->starPower; } } else { - uiStatus->displaySP -= 10; - if (uiStatus->displaySP < playerData->specialBarsFilled) { - uiStatus->displaySP = playerData->specialBarsFilled; + statusBar->displayStarPower -= 10; + if (statusBar->displayStarPower < playerData->starPower) { + statusBar->displayStarPower = playerData->starPower; } } } - if (uiStatus->disabled) { + if (statusBar->disabled) { return; } - if (uiStatus->unk_45[1] && uiStatus->hidden && playerStatus->inputDisabledCount == 0) { - uiStatus->showTimer = 42; - uiStatus->hidden = FALSE; - uiStatus->unk_3B[0] = 0; + if (statusBar->alwaysShown && statusBar->hidden && playerStatus->inputDisabledCount == 0) { + statusBar->showTimer = 42; + statusBar->hidden = FALSE; + statusBar->unk_3B = FALSE; } - switch (uiStatus->hidden) { + switch (statusBar->hidden) { case FALSE: - uiStatus->drawPosY += 10; - if (uiStatus->drawPosY >= 18) { - uiStatus->drawPosY = 18; - if (uiStatus->unk_3B[1] && uiStatus->unk_3B[0] && playerStatus->actionState != ACTION_STATE_IDLE) { - uiStatus->showTimer = 0; + statusBar->drawPosY += 10; + if (statusBar->drawPosY >= FULLY_EXTENDED_Y) { + statusBar->drawPosY = FULLY_EXTENDED_Y; + if (statusBar->unk_3C && statusBar->unk_3B && playerStatus->actionState != ACTION_STATE_IDLE) { + statusBar->showTimer = 0; } - if (uiStatus->showTimer != 0) { - uiStatus->showTimer--; + if (statusBar->showTimer != 0) { + statusBar->showTimer--; } else { - if (!uiStatus->ignoreChanges) { - if (!uiStatus->unk_3B[0] || playerStatus->actionState != ACTION_STATE_IDLE) { + if (!statusBar->ignoreChanges) { + if (!statusBar->unk_3B || playerStatus->actionState != ACTION_STATE_IDLE) { if (!gGameStatusPtr->isBattle) { - uiStatus->hidden = TRUE; - uiStatus->showTimer = 0; - uiStatus->unk_3B[1] = 0; + statusBar->hidden = TRUE; + statusBar->showTimer = 0; + statusBar->unk_3C = FALSE; } } } @@ -700,23 +714,23 @@ void update_status_bar(void) { } break; case TRUE: - uiStatus->drawPosY -= 5; - if (uiStatus->drawPosY < -100) { - uiStatus->drawPosY = -100; - if (!uiStatus->ignoreChanges) { + statusBar->drawPosY -= 5; + if (statusBar->drawPosY < FULLY_RETRACTED_Y) { + statusBar->drawPosY = FULLY_RETRACTED_Y; + if (!statusBar->ignoreChanges) { if (playerStatus->actionState != ACTION_STATE_IDLE) { - uiStatus->showTimer = 0; + statusBar->showTimer = 0; } else if (playerStatus->flags & (PS_FLAG_NO_STATIC_COLLISION | PS_FLAG_INPUT_DISABLED)) { - uiStatus->showTimer = 0; + statusBar->showTimer = 0; } else { - uiStatus->showTimer++; + statusBar->showTimer++; } - if (uiStatus->showTimer >= 240 && !gGameStatusPtr->isBattle) { - uiStatus->showTimer = 210; - uiStatus->hidden = FALSE; - uiStatus->unk_3B[0] = 1; - uiStatus->unk_3B[1] = 1; + if (statusBar->showTimer >= 240 && !gGameStatusPtr->isBattle) { + statusBar->showTimer = 210; + statusBar->hidden = FALSE; + statusBar->unk_3B = TRUE; + statusBar->unk_3C = TRUE; } } } @@ -724,83 +738,83 @@ void update_status_bar(void) { } gDPSetScissor(gMainGfxPos++, G_SC_NON_INTERLACE, 12, 20, SCREEN_WIDTH - 12, SCREEN_HEIGHT - 20); - x = uiStatus->drawPosX; - y = uiStatus->drawPosY; + x = statusBar->drawPosX; + y = statusBar->drawPosY; draw_box(0, WINDOW_STYLE_5, x, y, 0, 174, 35, 255, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL); draw_box(0, WINDOW_STYLE_6, x + 174, y, 0, 122, 25, 255, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL); - if (uiStatus->hpBlinkTimer > 0) { - uiStatus->hpBlinkTimer--; - if (uiStatus->hpBlinkTimer == 0) { + if (statusBar->hpBlinkTimer > 0) { + statusBar->hpBlinkTimer--; + if (statusBar->hpBlinkTimer == 0) { status_bar_stop_blinking_hp(); } } showStat = TRUE; - if (uiStatus->hpBlinking) { - if (uiStatus->hpBlinkCounter > 8) { + if (statusBar->hpBlinking != BLINK_OFF) { + if (statusBar->hpBlinkCounter > 8) { showStat = FALSE; - if (uiStatus->hpBlinkCounter > 12) { - uiStatus->hpBlinkCounter = 0; + if (statusBar->hpBlinkCounter > 12) { + statusBar->hpBlinkCounter = 0; showStat = TRUE; } } - uiStatus->hpBlinkCounter++; + statusBar->hpBlinkCounter++; } if (showStat) { - id = uiStatus->hpIconIndices[0]; - x = uiStatus->drawPosX + 22; - y = uiStatus->drawPosY + 13; + id = statusBar->hpIconHIDs[0]; + x = statusBar->drawPosX + 22; + y = statusBar->drawPosY + 13; hud_element_set_render_pos(id, x, y); hud_element_draw_next(id); - id = uiStatus->hpIconIndices[1]; - x = uiStatus->drawPosX + 37; - y = uiStatus->drawPosY + 13; + id = statusBar->hpIconHIDs[1]; + x = statusBar->drawPosX + 37; + y = statusBar->drawPosY + 13; hud_element_set_render_pos(id, x, y); hud_element_draw_next(id); - x = uiStatus->drawPosX + 48; - y = uiStatus->drawPosY + 8; - status_bar_draw_stat(uiStatus->iconIndex8, x, y, uiStatus->displayHP, playerData->curMaxHP); + x = statusBar->drawPosX + 48; + y = statusBar->drawPosY + 8; + status_bar_draw_stat(statusBar->hpTimesHID, x, y, statusBar->displayHP, playerData->curMaxHP); } - if (uiStatus->fpBlinkTimer > 0) { - uiStatus->fpBlinkTimer--; - if (uiStatus->fpBlinkTimer == 0) { + if (statusBar->fpBlinkTimer > 0) { + statusBar->fpBlinkTimer--; + if (statusBar->fpBlinkTimer == 0) { status_bar_stop_blinking_fp(); } } showStat = TRUE; - if (uiStatus->fpBlinking) { - if (uiStatus->fpBlinkCounter > 8) { + if (statusBar->fpBlinking != BLINK_OFF) { + if (statusBar->fpBlinkCounter > 8) { showStat = FALSE; - if (uiStatus->fpBlinkCounter > 12) { - uiStatus->fpBlinkCounter = 0; + if (statusBar->fpBlinkCounter > 12) { + statusBar->fpBlinkCounter = 0; showStat = TRUE; } } - uiStatus->fpBlinkCounter++; + statusBar->fpBlinkCounter++; } if (showStat) { - id = uiStatus->fpIconIndices[0]; - x = uiStatus->drawPosX + 110; - y = uiStatus->drawPosY + 13; + id = statusBar->fpIconHIDs[0]; + x = statusBar->drawPosX + 110; + y = statusBar->drawPosY + 13; hud_element_set_render_pos(id, x, y); hud_element_draw_next(id); - id = uiStatus->fpIconIndices[1]; - x = uiStatus->drawPosX + 125; - y = uiStatus->drawPosY + 13; + id = statusBar->fpIconHIDs[1]; + x = statusBar->drawPosX + 125; + y = statusBar->drawPosY + 13; hud_element_set_render_pos(id, x, y); hud_element_draw_next(id); - x = uiStatus->drawPosX + 136; - y = uiStatus->drawPosY + 8; - status_bar_draw_stat(uiStatus->iconIndex9, x, y, uiStatus->displayFP, playerData->curMaxFP); + x = statusBar->drawPosX + 136; + y = statusBar->drawPosY + 8; + status_bar_draw_stat(statusBar->fpTimesHID, x, y, statusBar->displayFP, playerData->curMaxFP); } if (playerData->level >= 27) { @@ -808,115 +822,115 @@ void update_status_bar(void) { } showStat = TRUE; - if (uiStatus->starpointsBlinking) { - if (uiStatus->starpointsBlinkCounter > 8) { - if (uiStatus->starpointsBlinkCounter <= 12) { + if (statusBar->starpointsBlinking != BLINK_OFF) { + if (statusBar->starpointsBlinkCounter > 8) { + if (statusBar->starpointsBlinkCounter <= 12) { showStat = FALSE; } else { - uiStatus->starpointsBlinkCounter = 0; + statusBar->starpointsBlinkCounter = 0; } } - uiStatus->starpointsBlinkCounter++; + statusBar->starpointsBlinkCounter++; } if (showStat) { - id = uiStatus->starpointsIconIndex; - x = uiStatus->drawPosX + 195; - y = uiStatus->drawPosY + 14; + id = statusBar->spIconHID; + x = statusBar->drawPosX + 195; + y = statusBar->drawPosY + 14; hud_element_set_render_pos(id, x, y); hud_element_draw_next(id); - id = uiStatus->starpointsShineIconIndex; - x = uiStatus->drawPosX + 195; - y = uiStatus->drawPosY + 9; + id = statusBar->spShineHID; + x = statusBar->drawPosX + 195; + y = statusBar->drawPosY + 9; hud_element_set_render_pos(id, x, y); hud_element_draw_next(id); - x = uiStatus->drawPosX + 200; - y = uiStatus->drawPosY + 8; - status_bar_draw_number(uiStatus->iconIndexA, x, y, playerData->starPoints, 2); + x = statusBar->drawPosX + 200; + y = statusBar->drawPosY + 8; + status_bar_draw_number(statusBar->spTimesHID, x, y, playerData->starPoints, 2); } - if (uiStatus->coinsBlinkTimer > 0) { - uiStatus->coinsBlinkTimer--; - if (uiStatus->coinsBlinkTimer == 0) { + if (statusBar->coinsBlinkTimer > 0) { + statusBar->coinsBlinkTimer--; + if (statusBar->coinsBlinkTimer == 0) { status_bar_stop_blinking_coins(); } } showStat = TRUE; - if (uiStatus->coinsBlinking) { - if (uiStatus->coinsBlinkCounter > 8) { + if (statusBar->coinsBlinking != BLINK_OFF) { + if (statusBar->coinsBlinkCounter > 8) { showStat = FALSE; - if (uiStatus->coinsBlinkCounter > 12) { - uiStatus->coinsBlinkCounter = 0; + if (statusBar->coinsBlinkCounter > 12) { + statusBar->coinsBlinkCounter = 0; showStat = TRUE; } } - uiStatus->coinsBlinkCounter++; + statusBar->coinsBlinkCounter++; } if (showStat) { - id = uiStatus->coinIconIndex; - x = uiStatus->drawPosX + 244; - y = uiStatus->drawPosY + 14; + id = statusBar->coinIconHID; + x = statusBar->drawPosX + 244; + y = statusBar->drawPosY + 14; hud_element_set_render_pos(id, x, y); hud_element_draw_next(id); - id = uiStatus->coinSparkleIconIndex; - x = uiStatus->drawPosX + 244; - y = uiStatus->drawPosY + 14; + id = statusBar->coinSparkleHID; + x = statusBar->drawPosX + 244; + y = statusBar->drawPosY + 14; hud_element_set_render_pos(id, x, y); hud_element_draw_next(id); - x = uiStatus->drawPosX + 247; - y = uiStatus->drawPosY + 8; - status_bar_draw_number(uiStatus->iconIndexB, x, y, uiStatus->displayCoins, 3); + x = statusBar->drawPosX + 247; + y = statusBar->drawPosY + 8; + status_bar_draw_number(statusBar->coinTimesHID, x, y, statusBar->displayCoins, 3); } - id = uiStatus->starIconIndex; + id = statusBar->starIconHID; showStat = TRUE; - if (uiStatus->spBlinking) { - if (uiStatus->spBlinkCounter > 5) { - if (uiStatus->spBlinkCounter <= 8) { + if (statusBar->spBlinking != BLINK_OFF) { + if (statusBar->spBlinkCounter > 5) { + if (statusBar->spBlinkCounter <= 8) { showStat = FALSE; } else { - uiStatus->spBlinkCounter = 0; + statusBar->spBlinkCounter = 0; showStat = TRUE; } } - uiStatus->spBlinkCounter++; + statusBar->spBlinkCounter++; } - x = uiStatus->drawPosX + 20; - y = uiStatus->drawPosY + 28; + x = statusBar->drawPosX + 20; + y = statusBar->drawPosY + 28; - spBars = uiStatus->displaySP / 256; - limit = uiStatus->displaySP % 256; + spBars = statusBar->displayStarPower / SP_PER_BAR; + limit = statusBar->displayStarPower % SP_PER_BAR; limit /= 32; limit += spBars * 8; - if (uiStatus->unk_57 == 1) { - spBars = playerData->specialBarsFilled / 256; - limit = playerData->specialBarsFilled % 256; + if (statusBar->unk_57 == 1) { + spBars = playerData->starPower / SP_PER_BAR; + limit = playerData->starPower % SP_PER_BAR; limit = limit / 32; limit += spBars * 8; func_800F0CB0(0, x + limit * 25 / 10, y, 1.0f); - uiStatus->unk_57 = 2; + statusBar->unk_57 = 2; } sp54 = FALSE; - if (uiStatus->unk_57 != 0) { - if (uiStatus->unk_58 != 0) { - uiStatus->unk_58--; + if (statusBar->unk_57 != 0) { + if (statusBar->unk_58 != 0) { + statusBar->unk_58--; } else { - uiStatus->unk_57 = 0; + statusBar->unk_57 = 0; } - if ((uiStatus->unk_58 / 5) & 1) { + if ((statusBar->unk_58 / 5) & 1) { sp54 = TRUE; } - maxStarPower = uiStatus->unk_59; // required to match - s7 = uiStatus->unk_59 % 8; - s7 += uiStatus->unk_59 / 8 * 8; + maxStarPower = statusBar->unk_59; // required to match + s7 = statusBar->unk_59 % 8; + s7 += statusBar->unk_59 / 8 * 8; } else { s7 = limit; } @@ -925,9 +939,9 @@ void update_status_bar(void) { sp50 = 0; s1 = 0; - if (uiStatus->spBlinking) { + if (statusBar->spBlinking != BLINK_OFF) { if (!showStat) { - s32 limit = uiStatus->spBarsToBlink * 8; + s32 limit = statusBar->spBarsToBlink * 8; do {} while (0); if (sp50 < limit) { while (TRUE) { @@ -1122,116 +1136,116 @@ void update_status_bar(void) { } void coin_counter_draw_content(UNK_TYPE arg0, s32 posX, s32 posY) { - UiStatus* uiStatus = &gUIStatus; + StatusBar* statusBar = &gStatusBar; s32 iconIndex; - if ((gPlayerData.coins != uiStatus->displayCoins) && ((gGameStatusPtr->frameCounter % 3) == 0)) { + if ((gPlayerData.coins != statusBar->displayCoins) && ((gGameStatusPtr->frameCounter % 3) == 0)) { sfx_play_sound(SOUND_COIN_PICKUP); } - iconIndex = uiStatus->iconIndex10; + iconIndex = statusBar->coinCountTimesHID; hud_element_set_render_pos(iconIndex, posX + 27, posY + 11); hud_element_draw_clipped(iconIndex); - iconIndex = uiStatus->iconIndex11; + iconIndex = statusBar->coinCountIconHID; hud_element_set_render_pos(iconIndex, posX + 15, posY + 11); hud_element_draw_clipped(iconIndex); - draw_number(uiStatus->displayCoins, posX + 58, posY + 4, DRAW_NUMBER_CHARSET_THIN, MSG_PAL_STANDARD, 255, DRAW_NUMBER_STYLE_MONOSPACE | DRAW_NUMBER_STYLE_ALIGN_RIGHT); + draw_number(statusBar->displayCoins, posX + 58, posY + 4, DRAW_NUMBER_CHARSET_THIN, MSG_PAL_STANDARD, 255, DRAW_NUMBER_STYLE_MONOSPACE | DRAW_NUMBER_STYLE_ALIGN_RIGHT); } void update_coin_counter(void) { - UiStatus* uiStatus = &gUIStatus; + StatusBar* statusBar = &gStatusBar; PlayerData* playerData = &gPlayerData; do {} while (0); // Needed to match - if (uiStatus->unk_6C[1] != 0) { - uiStatus->unk_6C[1] -= 1; - if (((uiStatus->unk_6C[1] << 24) == 0) && (uiStatus->iconIndex12 >= 0)) { - hud_element_free(uiStatus->iconIndex12); - hud_element_free(uiStatus->iconIndex13); - uiStatus->iconIndex12 = -1; + if (statusBar->unk_6D != 0) { + statusBar->unk_6D--; + if ((statusBar->unk_6D == 0) && (statusBar->iconIndex12 >= 0)) { + hud_element_free(statusBar->iconIndex12); + hud_element_free(statusBar->iconIndex13); + statusBar->iconIndex12 = -1; } - D_8010CD12 = 0; + D_8010CD12 = FALSE; } - if (uiStatus->unk_6C[0] != 0) { - if ((uiStatus->displayCoins == playerData->coins) && (uiStatus->unk_6C[0] > 30)) { - uiStatus->unk_6C[0] = 30; - } + if (statusBar->coinCounterHideTime == 0) { + return; + } - if ((uiStatus->displayCoins == playerData->coins) || (uiStatus->unk_6C[0] <= 30)) { - uiStatus->unk_6C[0] -= 1; - if (uiStatus->unk_6C[0] == 0) { - set_window_update(WINDOW_ID_CURRENCY_COUNTER, (s32)basic_hidden_window_update); - uiStatus->unk_6C[1] = 15; - D_8010CD10 = 0; - D_8010CD12 = 1; - uiStatus->iconIndex12 = uiStatus->iconIndex10; - uiStatus->iconIndex13 = uiStatus->iconIndex11; - uiStatus->displayCoins = playerData->coins; - if (uiStatus->unk_6C[2] > -1) { - uiStatus->ignoreChanges = uiStatus->unk_6C[2]; - uiStatus->unk_6C[2] = -1; - } + if ((statusBar->displayCoins == playerData->coins) && (statusBar->coinCounterHideTime > 30)) { + statusBar->coinCounterHideTime = 30; + } + + if ((statusBar->displayCoins == playerData->coins) || (statusBar->coinCounterHideTime <= 30)) { + statusBar->coinCounterHideTime--; + if (statusBar->coinCounterHideTime == 0) { + set_window_update(WINDOW_ID_CURRENCY_COUNTER, (s32)basic_hidden_window_update); + statusBar->unk_6D = 15; + D_8010CD10 = FALSE; + D_8010CD12 = TRUE; + statusBar->iconIndex12 = statusBar->coinCountTimesHID; + statusBar->iconIndex13 = statusBar->coinCountIconHID; + statusBar->displayCoins = playerData->coins; + if (statusBar->unk_6E > -1) { + statusBar->ignoreChanges = statusBar->unk_6E; + statusBar->unk_6E = -1; } } } } void show_coin_counter(void) { - UiStatus* uiStatus = &gUIStatus; + StatusBar* statusBar = &gStatusBar; s32 index; - if ((D_8010CD10 != 0) || (D_8010CD12 != 0)) { + if (D_8010CD10 || D_8010CD12) { set_window_update(WINDOW_ID_CURRENCY_COUNTER, WINDOW_UPDATE_HIDE); - if (uiStatus->iconIndex12 > -1) { - hud_element_free(uiStatus->iconIndex10); - hud_element_free(uiStatus->iconIndex11); - uiStatus->iconIndex12 = -1; + if (statusBar->iconIndex12 > -1) { + hud_element_free(statusBar->coinCountTimesHID); + hud_element_free(statusBar->coinCountIconHID); + statusBar->iconIndex12 = -1; } - uiStatus->unk_6C[0] = 0; - uiStatus->unk_6C[1] = 0; - D_8010CD10 = 0; - D_8010CD12 = 0; + statusBar->coinCounterHideTime = 0; + statusBar->unk_6D = 0; + D_8010CD10 = FALSE; + D_8010CD12 = FALSE; } - if (uiStatus->unk_6C[0] == 0) { + if (statusBar->coinCounterHideTime == 0) { set_window_properties(WINDOW_ID_CURRENCY_COUNTER, 32, 164, 64, 20, WINDOW_PRIORITY_21, coin_counter_draw_content, 0, -1); set_window_update(WINDOW_ID_CURRENCY_COUNTER, (s32)basic_window_update); - index = hud_element_create(&HES_MenuTimes); - uiStatus->iconIndex10 = index; + statusBar->coinCountTimesHID = index = hud_element_create(&HES_MenuTimes); hud_element_set_flags(index, HUD_ELEMENT_FLAG_80); hud_element_set_tint(index, 255, 255, 255); - index = hud_element_create(&HES_StatusCoin); - uiStatus->iconIndex11 = index; + statusBar->coinCountIconHID = index = hud_element_create(&HES_StatusCoin); hud_element_set_flags(index, HUD_ELEMENT_FLAG_80); hud_element_set_tint(index, 255, 255, 255); - uiStatus->unk_6C[0] = 0; + statusBar->coinCounterHideTime = 0; - if (uiStatus->unk_6C[2] < 0) { - uiStatus->unk_6C[2] = uiStatus->ignoreChanges; + if (statusBar->unk_6E < 0) { + statusBar->unk_6E = statusBar->ignoreChanges; } - uiStatus->ignoreChanges = TRUE; - D_8010CD10 = 1; + statusBar->ignoreChanges = TRUE; + D_8010CD10 = TRUE; } } void hide_coin_counter(void) { - UiStatus* uiStatus = &gUIStatus; + StatusBar* statusBar = &gStatusBar; - if ((D_8010CD10 != 0) && (uiStatus->unk_6C[0] == 0)) { - uiStatus->unk_6C[0] = 60; + if (D_8010CD10 && (statusBar->coinCounterHideTime == 0)) { + statusBar->coinCounterHideTime = 60; } } void hide_coin_counter_immediately(void) { - UiStatus* uiStatus = &gUIStatus; + StatusBar* statusBar = &gStatusBar; - if ((D_8010CD10 != 0) && (uiStatus->unk_6C[0] == 0)) { - uiStatus->unk_6C[0] = 1; + if (D_8010CD10 && (statusBar->coinCounterHideTime == 0)) { + statusBar->coinCounterHideTime = 1; } } @@ -1250,306 +1264,307 @@ void draw_status_ui(void) { update_coin_counter(); } -void open_status_bar_long(void) { - UiStatus* uiStatus = &gUIStatus; +void open_status_bar_slowly(void) { + StatusBar* statusBar = &gStatusBar; - if (uiStatus->hidden) { - uiStatus->showTimer = 210; - uiStatus->hidden = FALSE; - uiStatus->unk_3B[0] = 1; + if (statusBar->hidden) { + statusBar->showTimer = 210; + statusBar->hidden = FALSE; + statusBar->unk_3B = TRUE; } } -void open_status_bar_short(void) { - UiStatus* uiStatus = &gUIStatus; +void open_status_bar_quickly(void) { + StatusBar* statusBar = &gStatusBar; - if (uiStatus->hidden) { - uiStatus->showTimer = 105; - uiStatus->hidden = FALSE; - uiStatus->unk_3B[0] = 1; + if (statusBar->hidden) { + statusBar->showTimer = 105; + statusBar->hidden = FALSE; + statusBar->unk_3B = TRUE; } } void close_status_bar(void) { - UiStatus* uiStatus = &gUIStatus; + StatusBar* statusBar = &gStatusBar; - if (uiStatus->hidden != TRUE) { - uiStatus->hidden = TRUE; - uiStatus->showTimer = 0; - uiStatus->unk_3B[0] = 1; + if (statusBar->hidden != TRUE) { + statusBar->hidden = TRUE; + statusBar->showTimer = 0; + statusBar->unk_3B = TRUE; } } -void func_800E97E4(void) { - UiStatus* uiStatus = &gUIStatus; +void setup_status_bar_for_world(void) { + StatusBar* statusBar = &gStatusBar; - uiStatus->drawPosY = -100; - uiStatus->ignoreChanges = FALSE; - uiStatus->showTimer = 0; - uiStatus->hidden = TRUE; - uiStatus->unk_3B[0] = 0; - uiStatus->unk_3B[1] = 0; + statusBar->drawPosY = FULLY_RETRACTED_Y; + statusBar->ignoreChanges = FALSE; + statusBar->showTimer = 0; + statusBar->hidden = TRUE; + statusBar->unk_3B = FALSE; + statusBar->unk_3C = FALSE; } -void func_800E9810(void) { - UiStatus* uiStatus = &gUIStatus; +void setup_status_bar_for_battle(void) { + StatusBar* statusBar = &gStatusBar; - uiStatus->showTimer = 210; - uiStatus->drawPosY = 0; - uiStatus->ignoreChanges = FALSE; - uiStatus->hidden = 0; - uiStatus->unk_3B[0] = 1; - uiStatus->unk_3B[1] = 0; + statusBar->drawPosY = 0; + statusBar->ignoreChanges = FALSE; + statusBar->showTimer = 210; + statusBar->hidden = FALSE; + statusBar->unk_3B = TRUE; + statusBar->unk_3C = FALSE; } -void func_800E983C(void) { - gUIStatus.unk_45[0] = 0; +void enable_status_bar_input(void) { + gStatusBar.openInputDisabled = FALSE; } -void func_800E984C(void) { - gUIStatus.unk_45[0] = 1; +void disable_status_bar_input(void) { + gStatusBar.openInputDisabled = TRUE; } -s32 func_800E9860(void) { - UiStatus* uiStatus = &gUIStatus; +// determine whether the player can open or close the status bar via button press +b32 can_control_status_bar(void) { + StatusBar* statusBar = &gStatusBar; - s32 ret = 1 - uiStatus->unk_45[0]; + s32 ret = 1 - statusBar->openInputDisabled; - if (uiStatus->unk_45[1] != 0) { - ret = 0; + if (statusBar->alwaysShown) { + ret = FALSE; } - if (uiStatus->ignoreChanges) { - ret = 0; + if (statusBar->ignoreChanges) { + ret = FALSE; } return ret; } void status_bar_ignore_changes(void) { - gUIStatus.ignoreChanges = TRUE; + gStatusBar.ignoreChanges = TRUE; } -void func_800E98A8(void) { - UiStatus* uiStatus = &gUIStatus; +void status_bar_show_and_ignore_changes(void) { + StatusBar* statusBar = &gStatusBar; - uiStatus->ignoreChanges = TRUE; - uiStatus->drawPosY = 18; + statusBar->ignoreChanges = TRUE; + statusBar->drawPosY = FULLY_EXTENDED_Y; } void status_bar_respond_to_changes(void) { - gUIStatus.ignoreChanges = FALSE; + gStatusBar.ignoreChanges = FALSE; } -s32 func_800E98D4(void) { - UiStatus* uiStatus = &gUIStatus; +s32 status_bar_is_ignoring_changes(void) { + StatusBar* statusBar = &gStatusBar; - return uiStatus->unk_45[1] + uiStatus->ignoreChanges; + return statusBar->alwaysShown + statusBar->ignoreChanges; } -void func_800E98EC(void) { - gUIStatus.unk_45[1] = 1; +void status_bar_always_show_on(void) { + gStatusBar.alwaysShown = TRUE; } -void func_800E9900(void) { - gUIStatus.unk_45[1] = 0; +void status_bar_always_show_off(void) { + gStatusBar.alwaysShown = FALSE; } s32 is_status_bar_visible(void) { - return !gUIStatus.hidden; + return !gStatusBar.hidden; } void status_bar_start_blinking_hp(void) { - UiStatus* uiStatus = &gUIStatus; + StatusBar* statusBar = &gStatusBar; if (!gGameStatusPtr->isBattle) { - uiStatus->hpBlinkTimer = 120; + statusBar->hpBlinkTimer = 120; } - if (uiStatus->hpBlinking != 1) { - uiStatus->hpBlinking = 1; - uiStatus->hpBlinkCounter = 0; + if (statusBar->hpBlinking != BLINK_ON) { + statusBar->hpBlinking = BLINK_ON; + statusBar->hpBlinkCounter = 0; } } void status_bar_stop_blinking_hp(void) { - UiStatus* uiStatus = &gUIStatus; + StatusBar* statusBar = &gStatusBar; - if (uiStatus->hpBlinking != 0) { - uiStatus->hpBlinking = 0; - uiStatus->hpBlinkCounter = 0; - uiStatus->hpBlinkTimer = 0; + if (statusBar->hpBlinking != BLINK_OFF) { + statusBar->hpBlinking = BLINK_OFF; + statusBar->hpBlinkCounter = 0; + statusBar->hpBlinkTimer = 0; } } void status_bar_start_blinking_fp(void) { - UiStatus* uiStatus = &gUIStatus; + StatusBar* statusBar = &gStatusBar; if (!gGameStatusPtr->isBattle) { - uiStatus->fpBlinkTimer = 120; + statusBar->fpBlinkTimer = 120; } - if (uiStatus->fpBlinking != 1) { - uiStatus->fpBlinking = 1; - uiStatus->fpBlinkCounter = 0; + if (statusBar->fpBlinking != BLINK_ON) { + statusBar->fpBlinking = BLINK_ON; + statusBar->fpBlinkCounter = 0; } } void status_bar_stop_blinking_fp(void) { - UiStatus* uiStatus = &gUIStatus; + StatusBar* statusBar = &gStatusBar; - if (uiStatus->fpBlinking != 0) { - uiStatus->fpBlinking = 0; - uiStatus->fpBlinkCounter = 0; + if (statusBar->fpBlinking != BLINK_OFF) { + statusBar->fpBlinking = BLINK_OFF; + statusBar->fpBlinkCounter = 0; } } void status_bar_start_blinking_coins(void) { - UiStatus* uiStatus = &gUIStatus; + StatusBar* statusBar = &gStatusBar; if (!gGameStatusPtr->isBattle) { - uiStatus->coinsBlinkTimer = 120; + statusBar->coinsBlinkTimer = 120; } - if (uiStatus->coinsBlinking != 1) { - uiStatus->coinsBlinking = 1; - uiStatus->coinsBlinkCounter = 0; + if (statusBar->coinsBlinking != BLINK_ON) { + statusBar->coinsBlinking = BLINK_ON; + statusBar->coinsBlinkCounter = 0; } } void status_bar_stop_blinking_coins(void) { - UiStatus* uiStatus = &gUIStatus; + StatusBar* statusBar = &gStatusBar; - if (uiStatus->coinsBlinking != 0) { - uiStatus->coinsBlinking = 0; - uiStatus->coinsBlinkCounter = 0; - uiStatus->coinsBlinkTimer = 0; + if (statusBar->coinsBlinking != BLINK_OFF) { + statusBar->coinsBlinking = BLINK_OFF; + statusBar->coinsBlinkCounter = 0; + statusBar->coinsBlinkTimer = 0; } } void status_bar_start_blinking_sp(void) { PlayerData* playerData = &gPlayerData; - UiStatus* uiStatus = &gUIStatus; + StatusBar* statusBar = &gStatusBar; - uiStatus->spBarsToBlink = playerData->maxStarPower; - if (uiStatus->spBlinking != 1) { - uiStatus->spBlinking = 1; - uiStatus->spBlinkCounter = 0; + statusBar->spBarsToBlink = playerData->maxStarPower; + if (statusBar->spBlinking != BLINK_ON) { + statusBar->spBlinking = BLINK_ON; + statusBar->spBlinkCounter = 0; } } void status_bar_stop_blinking_sp(void) { - UiStatus* uiStatus = &gUIStatus; + StatusBar* statusBar = &gStatusBar; - if (uiStatus->spBlinking != 0) { - uiStatus->spBlinking = 0; - uiStatus->spBlinkCounter = 0; + if (statusBar->spBlinking != BLINK_OFF) { + statusBar->spBlinking = BLINK_OFF; + statusBar->spBlinkCounter = 0; } } void status_bar_start_blinking_sp_bars(s32 numBarsToBlink) { - UiStatus* uiStatus = &gUIStatus; + StatusBar* statusBar = &gStatusBar; - uiStatus->spBarsToBlink = numBarsToBlink; - if (uiStatus->spBlinking != 1) { - uiStatus->spBlinking = 1; - uiStatus->spBlinkCounter = 0; + statusBar->spBarsToBlink = numBarsToBlink; + if (statusBar->spBlinking != BLINK_ON) { + statusBar->spBlinking = BLINK_ON; + statusBar->spBlinkCounter = 0; } } void status_bar_start_blinking_starpoints(void) { - UiStatus* uiStatus = &gUIStatus; + StatusBar* statusBar = &gStatusBar; - if (uiStatus->starpointsBlinking != 1) { - uiStatus->starpointsBlinking = 1; - uiStatus->starpointsBlinkCounter = 0; + if (statusBar->starpointsBlinking != BLINK_ON) { + statusBar->starpointsBlinking = BLINK_ON; + statusBar->starpointsBlinkCounter = 0; } } void status_bar_stop_blinking_starpoints(void) { - UiStatus* uiStatus = &gUIStatus; + StatusBar* statusBar = &gStatusBar; - if (uiStatus->starpointsBlinking != 0) { - uiStatus->starpointsBlinking = 0; - uiStatus->starpointsBlinkCounter = 0; + if (statusBar->starpointsBlinking != BLINK_OFF) { + statusBar->starpointsBlinking = BLINK_OFF; + statusBar->starpointsBlinkCounter = 0; } } void decrement_status_bar_disabled(void) { - UiStatus* uiStatus = &gUIStatus; + StatusBar* statusBar = &gStatusBar; - if (uiStatus->disabled > 0) { - uiStatus->disabled--; + if (statusBar->disabled > 0) { + statusBar->disabled--; } } void increment_status_bar_disabled(void) { - UiStatus* uiStatus = &gUIStatus; + StatusBar* statusBar = &gStatusBar; - uiStatus->disabled++; + statusBar->disabled++; } void sync_status_bar(void) { PlayerData* playerData = &gPlayerData; - UiStatus* uiStatus = &gUIStatus; + StatusBar* statusBar = &gStatusBar; - uiStatus->displayHP = playerData->curHP; - uiStatus->displayFP = playerData->curFP; - uiStatus->displaySP = playerData->specialBarsFilled; - uiStatus->displayCoins = playerData->coins; - uiStatus->displayStarpoints = playerData->starPoints; + statusBar->displayHP = playerData->curHP; + statusBar->displayFP = playerData->curFP; + statusBar->displayStarPower = playerData->starPower; + statusBar->displayCoins = playerData->coins; + statusBar->displayStarpoints = playerData->starPoints; } void reset_status_bar(void) { PlayerData* playerData = &gPlayerData; - UiStatus* uiStatus = &gUIStatus; + StatusBar* statusBar = &gStatusBar; s32 i; - uiStatus->drawPosX = 12; - uiStatus->drawPosY = -100; - uiStatus->hidden = 0; - uiStatus->showTimer = 210; - uiStatus->unk_3B[0] = 0; - uiStatus->ignoreChanges = FALSE; - uiStatus->unk_45[0] = 0; - uiStatus->unk_45[1] = 0; - uiStatus->hpBlinking = 0; - uiStatus->hpBlinkCounter = 0; - uiStatus->hpBlinkTimer = 0; - uiStatus->fpBlinking = 0; - uiStatus->fpBlinkCounter = 0; - uiStatus->fpBlinkTimer = 0; - uiStatus->coinsBlinking = 0; - uiStatus->coinsBlinkCounter = 0; - uiStatus->coinsBlinkTimer = 0; - uiStatus->spBlinking = 0; - uiStatus->spBlinkCounter = 0; - uiStatus->disabled = 0; - uiStatus->starpointsBlinking = 0; - uiStatus->starpointsBlinkCounter = 0; - uiStatus->unk_6C[2] = -1; - uiStatus->displayHP = playerData->curHP; - uiStatus->displayFP = playerData->curFP; - uiStatus->displayCoins = playerData->coins; - uiStatus->displayStarpoints = playerData->starPoints; - uiStatus->displaySP = playerData->specialBarsFilled; - uiStatus->unk_3B[1] = 0; + statusBar->drawPosX = 12; + statusBar->drawPosY = FULLY_RETRACTED_Y; + statusBar->hidden = 0; + statusBar->showTimer = 210; + statusBar->unk_3B = FALSE; + statusBar->ignoreChanges = FALSE; + statusBar->openInputDisabled = FALSE; + statusBar->alwaysShown = FALSE; + statusBar->hpBlinking = BLINK_OFF; + statusBar->hpBlinkCounter = 0; + statusBar->hpBlinkTimer = 0; + statusBar->fpBlinking = BLINK_OFF; + statusBar->fpBlinkCounter = 0; + statusBar->fpBlinkTimer = 0; + statusBar->coinsBlinking = BLINK_OFF; + statusBar->coinsBlinkCounter = 0; + statusBar->coinsBlinkTimer = 0; + statusBar->spBlinking = BLINK_OFF; + statusBar->spBlinkCounter = 0; + statusBar->disabled = 0; + statusBar->starpointsBlinking = BLINK_OFF; + statusBar->starpointsBlinkCounter = 0; + statusBar->unk_6E = -1; + statusBar->displayHP = playerData->curHP; + statusBar->displayFP = playerData->curFP; + statusBar->displayCoins = playerData->coins; + statusBar->displayStarpoints = playerData->starPoints; + statusBar->displayStarPower = playerData->starPower; + statusBar->unk_3C = FALSE; - for (i = 0; i < ARRAY_COUNT(uiStatus->hpIconIndices); i++) { - copy_world_hud_element_ref_to_battle(uiStatus->hpIconIndices[i], uiStatus->hpIconIndices[i]); + for (i = 0; i < ARRAY_COUNT(statusBar->hpIconHIDs); i++) { + copy_world_hud_element_ref_to_battle(statusBar->hpIconHIDs[i], statusBar->hpIconHIDs[i]); } - for (i = 0; i < ARRAY_COUNT(uiStatus->fpIconIndices); i++) { - copy_world_hud_element_ref_to_battle(uiStatus->fpIconIndices[i], uiStatus->fpIconIndices[i]); + for (i = 0; i < ARRAY_COUNT(statusBar->fpIconHIDs); i++) { + copy_world_hud_element_ref_to_battle(statusBar->fpIconHIDs[i], statusBar->fpIconHIDs[i]); } - copy_world_hud_element_ref_to_battle(uiStatus->coinIconIndex, uiStatus->coinIconIndex); - copy_world_hud_element_ref_to_battle(uiStatus->coinSparkleIconIndex, uiStatus->coinSparkleIconIndex); - copy_world_hud_element_ref_to_battle(uiStatus->starpointsIconIndex, uiStatus->starpointsIconIndex); - copy_world_hud_element_ref_to_battle(uiStatus->starpointsShineIconIndex, uiStatus->starpointsShineIconIndex); - copy_world_hud_element_ref_to_battle(uiStatus->iconIndex8, uiStatus->iconIndex8); - copy_world_hud_element_ref_to_battle(uiStatus->iconIndex9, uiStatus->iconIndex9); - copy_world_hud_element_ref_to_battle(uiStatus->iconIndexA, uiStatus->iconIndexA); - copy_world_hud_element_ref_to_battle(uiStatus->iconIndexB, uiStatus->iconIndexB); - copy_world_hud_element_ref_to_battle(uiStatus->starIconIndex, uiStatus->starIconIndex); + copy_world_hud_element_ref_to_battle(statusBar->coinIconHID, statusBar->coinIconHID); + copy_world_hud_element_ref_to_battle(statusBar->coinSparkleHID, statusBar->coinSparkleHID); + copy_world_hud_element_ref_to_battle(statusBar->spIconHID, statusBar->spIconHID); + copy_world_hud_element_ref_to_battle(statusBar->spShineHID, statusBar->spShineHID); + copy_world_hud_element_ref_to_battle(statusBar->hpTimesHID, statusBar->hpTimesHID); + copy_world_hud_element_ref_to_battle(statusBar->fpTimesHID, statusBar->fpTimesHID); + copy_world_hud_element_ref_to_battle(statusBar->spTimesHID, statusBar->spTimesHID); + copy_world_hud_element_ref_to_battle(statusBar->coinTimesHID, statusBar->coinTimesHID); + copy_world_hud_element_ref_to_battle(statusBar->starIconHID, statusBar->starIconHID); } s32 is_ability_active(s32 ability) { @@ -1952,40 +1967,40 @@ s32 add_star_pieces(s32 amt) { return playerData->starPieces; } -void increment_max_SP(void) { +void increment_max_star_power(void) { gPlayerData.maxStarPower++; - gPlayerData.specialBarsFilled = gPlayerData.maxStarPower * 256; + gPlayerData.starPower = gPlayerData.maxStarPower * SP_PER_BAR; } -void set_max_SP(s8 newMaxSP) { - gPlayerData.maxStarPower = newMaxSP; - gPlayerData.specialBarsFilled = newMaxSP * 256; +void set_max_star_power(s8 newMax) { + gPlayerData.maxStarPower = newMax; + gPlayerData.starPower = newMax * SP_PER_BAR; } -void add_SP(s32 amt) { +void add_star_power(s32 amt) { // TODO cleanup PlayerData* playerData = &gPlayerData; - UiStatus* uiStatus = &gUIStatus; + StatusBar* statusBar = &gStatusBar; s32 phi_v1; s32 maxPower; - uiStatus->unk_57 = 1; - uiStatus->unk_58 = 60; + statusBar->unk_57 = 1; + statusBar->unk_58 = 60; - phi_v1 = playerData->specialBarsFilled; - if (playerData->specialBarsFilled < 0) { - phi_v1 = playerData->specialBarsFilled + 31; + phi_v1 = playerData->starPower; + if (playerData->starPower < 0) { + phi_v1 = playerData->starPower + 31; } - uiStatus->unk_59 = phi_v1 >> 5; + statusBar->unk_59 = phi_v1 >> 5; // same as / SP_PER_SEG - playerData->specialBarsFilled += amt; + playerData->starPower += amt; - maxPower = playerData->maxStarPower << 8; - if (playerData->specialBarsFilled > maxPower) { - playerData->specialBarsFilled = maxPower; + maxPower = playerData->maxStarPower * SP_PER_BAR; + if (playerData->starPower > maxPower) { + playerData->starPower = maxPower; } - gUIStatus.displaySP = gPlayerData.specialBarsFilled; + gStatusBar.displayStarPower = gPlayerData.starPower; } s32 recover_fp(s32 amt) { diff --git a/src/item_entity.c b/src/item_entity.c index 6efe3ea027..45d72a4d79 100644 --- a/src/item_entity.c +++ b/src/item_entity.c @@ -8,6 +8,7 @@ #include "message_ids.h" #include "nu/nusys.h" #include "ld_addrs.h" +#include "sprite.h" #include "sprite/player.h" #if VERSION_IQUE @@ -21,7 +22,7 @@ extern SparkleScript SparkleScript_Coin; extern Gfx D_8014B870[]; extern Gfx D_8014BBD8[]; -extern Lights1 D_8014C6C8; +extern Lights1 ItemEntityLights; extern HudCacheEntry* gHudElementCacheTableRaster; extern HudCacheEntry* gHudElementCacheTablePalette; @@ -30,23 +31,23 @@ extern u8* gHudElementCacheBuffer; extern s32* gHudElementCacheSize; SHIFT_BSS s32 ItemEntitiesCreated; -SHIFT_BSS s32 D_80155D80; +SHIFT_BSS s32 UnusedItemPhysicsScriptID; SHIFT_BSS s32 ItemEntityAlternatingSpawn; SHIFT_BSS s32 ItemEntityRenderGroup; -SHIFT_BSS s16 D_80155D8C; -SHIFT_BSS s16 D_80155D8E; -SHIFT_BSS s16 D_80155D90; +SHIFT_BSS s16 CoinSparkleCenterX; +SHIFT_BSS s16 CoinSparkleCenterY; +SHIFT_BSS s16 CoinSparkleCenterZ; SHIFT_BSS ItemEntity* WorldItemEntities[MAX_ITEM_ENTITIES]; SHIFT_BSS ItemEntity* BattleItemEntities[MAX_ITEM_ENTITIES]; SHIFT_BSS ItemEntity** gCurrentItemEntities; SHIFT_BSS s16 isPickingUpItem; -SHIFT_BSS s16 D_801565A6; -SHIFT_BSS s16 D_801565A8; // some hack relating to kooper item pickups -SHIFT_BSS PopupMenu D_801565B0; +SHIFT_BSS s16 ItemSpawnWithinPlayerPickupDelay; +SHIFT_BSS s16 D_801565A8; +SHIFT_BSS PopupMenu ItemPickupMenu; SHIFT_BSS s32 ItemPickupIconID; SHIFT_BSS s32 ItemPickupStateDelay; -SHIFT_BSS s32 D_801568E8; -SHIFT_BSS s32 D_801568EC; +SHIFT_BSS s32 ThrowAwayMenuIdx; +SHIFT_BSS s32 ThrowAwayItemID; SHIFT_BSS EffectInstance* ItemPickupGotOutline; SHIFT_BSS MessagePrintState* GotItemTutorialPrinter; SHIFT_BSS b32 GotItemTutorialClosed; @@ -112,7 +113,7 @@ Gfx D_8014C6A0[] = { gsSPEndDisplayList(), }; -Lights1 D_8014C6C8 = gdSPDefLights1(255, 255, 255, 0, 0, 0, 0, 0, 0); +Lights1 ItemEntityLights = gdSPDefLights1(255, 255, 255, 0, 0, 0, 0, 0, 0); s16 PickupHeaderWindowHeight[] = { 32, 40 }; s16 PickupMessageWindowYOffsets[] = { 8, 4 }; @@ -172,9 +173,9 @@ void draw_coin_sparkles(ItemEntity* item) { Matrix4f spD8; ImgFXTexture ifxImg; - x = D_80155D8C; - y = D_80155D8E; - z = D_80155D90; + x = CoinSparkleCenterX; + y = CoinSparkleCenterY; + z = CoinSparkleCenterZ; angle = clamp_angle(180.0f - gCameras[gCurrentCamID].curYaw); guTranslateF(sp18, x, y, z); @@ -188,7 +189,7 @@ void draw_coin_sparkles(ItemEntity* item) { gDPSetCycleType(gMainGfxPos++, G_CYC_1CYCLE); gSPClearGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); gSPSetGeometryMode(gMainGfxPos++, G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); - gSPSetLights1(gMainGfxPos++, D_8014C6C8); + gSPSetLights1(gMainGfxPos++, ItemEntityLights); gSPTexture(gMainGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); gDPSetTextureLOD(gMainGfxPos++, G_TL_TILE); gDPSetTexturePersp(gMainGfxPos++, G_TP_PERSP); @@ -250,9 +251,9 @@ void clear_item_entity_data(void) { } ItemEntitiesCreated = 0; - D_80155D8C = 0; - D_80155D8E = 0; - D_80155D90 = 0; + CoinSparkleCenterX = 0; + CoinSparkleCenterY = 0; + CoinSparkleCenterZ = 0; ItemEntityAlternatingSpawn = 0; if (!gGameStatusPtr->isBattle) { @@ -308,7 +309,7 @@ void item_entity_load(ItemEntity* item) { palette = *pos++; // 32x32 or 24x24 (divided by 2 because these are ci4 iamges) - size = (item->flags & ITEM_ENTITY_FLAG_40000) ? (32 * 32 / 2) : (24 * 24 / 2); + size = (item->flags & ITEM_ENTITY_FLAG_FULLSIZE) ? (32 * 32 / 2) : (24 * 24 / 2); entry = gHudElementCacheTableRaster; i = 0; @@ -439,7 +440,9 @@ s32 make_item_entity(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pic itemID &= 0xFFFF; - item->flags = ITEM_ENTITY_FLAG_80 | ITEM_ENTITY_FLAG_10 | ITEM_ENTITY_FLAG_CAM2 | ITEM_ENTITY_FLAG_CAM1 | ITEM_ENTITY_FLAG_CAM0; + item->flags = (ITEM_ENTITY_FLAG_CAM0 | ITEM_ENTITY_FLAG_CAM1 | ITEM_ENTITY_FLAG_CAM2); + item->flags |= ITEM_ENTITY_FLAG_10; + item->flags |= ITEM_ENTITY_FLAG_JUST_SPAWNED; item->pickupMsgFlags = 0; item->boundVar = pickupFlagIndex; item->itemID = itemID; @@ -452,18 +455,17 @@ s32 make_item_entity(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pic item->lastPos.x = -9999; item->lastPos.y = -9999; item->lastPos.z = -9999; - D_801565A6 = 30; + ItemSpawnWithinPlayerPickupDelay = 30; item->flags |= ITEM_ENTITY_RESIZABLE; if (gItemTable[itemID].typeFlags & ITEM_TYPE_FLAG_ENTITY_FULLSIZE) { - item->flags |= ITEM_ENTITY_FLAG_40000; + item->flags |= ITEM_ENTITY_FLAG_FULLSIZE; item->flags &= ~ITEM_ENTITY_RESIZABLE; } if (ItemEntityAlternatingSpawn != 0) { - item->flags |= ITEM_ENTITY_FLAG_20000; + item->flags |= ITEM_ENTITY_FLAG_ODD_SPAWN_PARITY; } - ItemEntityAlternatingSpawn = 1 - ItemEntityAlternatingSpawn; switch (item->spawnType) { @@ -475,7 +477,7 @@ s32 make_item_entity(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pic item->flags |= ITEM_ENTITY_FLAG_800000; break; case ITEM_SPAWN_MODE_INVISIBLE: - item->flags |= ITEM_ENTITY_FLAG_100000; + item->flags |= ITEM_ENTITY_FLAG_INVISIBLE; break; case ITEM_SPAWN_MODE_BATTLE_REWARD: item->flags |= ITEM_ENTITY_FLAG_800000; @@ -495,12 +497,12 @@ s32 make_item_entity(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pic break; case ITEM_SPAWN_MODE_TOSS_SPAWN_ONCE: item->flags |= ITEM_ENTITY_FLAG_800000; - item->flags |= ITEM_ENTITY_FLAG_800; + item->flags |= ITEM_ENTITY_FLAG_SAVE_ON_INIT; item->spawnType = ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS; break; case ITEM_SPAWN_MODE_TOSS_SPAWN_ONCE_NEVER_VANISH: item->flags |= ITEM_ENTITY_FLAG_800000; - item->flags |= ITEM_ENTITY_FLAG_800; + item->flags |= ITEM_ENTITY_FLAG_SAVE_ON_INIT; item->flags |= ITEM_ENTITY_FLAG_NEVER_VANISH; item->spawnType = ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS; break; @@ -538,7 +540,7 @@ s32 make_item_entity(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pic break; case ITEM_SPAWN_MODE_FALL_SPAWN_ONCE: item->flags |= ITEM_ENTITY_FLAG_800000; - item->flags |= ITEM_ENTITY_FLAG_800; + item->flags |= ITEM_ENTITY_FLAG_SAVE_ON_INIT; item->spawnType = ITEM_SPAWN_MODE_FALL_SPAWN_ALWAYS; break; case ITEM_SPAWN_MODE_FIXED_SPAWN_ALWAYS: @@ -641,7 +643,7 @@ s32 make_item_entity(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pic y = item->pos.y + 12.0f; z = item->pos.z; hitDepth = 1000.0f; - npc_raycast_down_sides(COLLISION_CHANNEL_20000, &x, &y, &z, &hitDepth); + npc_raycast_down_sides(COLLIDER_FLAG_IGNORE_NPC, &x, &y, &z, &hitDepth); shadow->pos.x = x; shadow->pos.y = y; shadow->pos.z = z; @@ -664,7 +666,7 @@ s32 make_item_entity(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pic } if (item->itemID == ITEM_STAR_PIECE) { - item->flags &= ~ITEM_ENTITY_FLAG_80; + item->flags &= ~ITEM_ENTITY_FLAG_JUST_SPAWNED; } return id; @@ -703,7 +705,9 @@ s32 make_item_entity_at_player(s32 itemID, s32 category, s32 pickupMsgFlags) { itemID &= 0xFFFF; item->renderGroup = -1; - item->flags = (ITEM_ENTITY_FLAG_CAM0 | ITEM_ENTITY_FLAG_CAM1 | ITEM_ENTITY_FLAG_CAM2 | ITEM_ENTITY_FLAG_10 | ITEM_ENTITY_FLAG_2000000); + item->flags = (ITEM_ENTITY_FLAG_CAM0 | ITEM_ENTITY_FLAG_CAM1 | ITEM_ENTITY_FLAG_CAM2); + item->flags |= ITEM_ENTITY_FLAG_10; + item->flags |= ITEM_ENTITY_FLAG_2000000; if (category != ITEM_TYPE_CONSUMABLE) { item->flags |= ITEM_ENTITY_FLAG_4000000; } @@ -728,10 +732,11 @@ s32 make_item_entity_at_player(s32 itemID, s32 category, s32 pickupMsgFlags) { item->flags |= ITEM_ENTITY_RESIZABLE; if (gItemTable[itemID].typeFlags & ITEM_TYPE_FLAG_ENTITY_FULLSIZE) { - item->flags = (item->flags | ITEM_ENTITY_FLAG_40000) & ~ITEM_ENTITY_RESIZABLE; + item->flags = (item->flags | ITEM_ENTITY_FLAG_FULLSIZE) & ~ITEM_ENTITY_RESIZABLE; } + if (ItemEntityAlternatingSpawn != 0) { - item->flags |= ITEM_ENTITY_FLAG_20000; + item->flags |= ITEM_ENTITY_FLAG_ODD_SPAWN_PARITY; } ItemEntityAlternatingSpawn = 1 - ItemEntityAlternatingSpawn; @@ -743,7 +748,7 @@ s32 make_item_entity_at_player(s32 itemID, s32 category, s32 pickupMsgFlags) { posY = item->pos.y + 12.0f; posZ = item->pos.z; depth = 1000.0f; - npc_raycast_down_sides(COLLISION_CHANNEL_20000, &posX, &posY, &posZ, &depth); + npc_raycast_down_sides(COLLIDER_FLAG_IGNORE_NPC, &posX, &posY, &posZ, &depth); shadow->pos.x = posX; shadow->pos.y = posY; shadow->pos.z = posZ; @@ -822,9 +827,9 @@ void update_item_entities(void) { if (item->itemID == ITEM_COIN) { if (rand_int(100) > 90) { sparkle_script_init(item, &SparkleScript_Coin); - D_80155D8C = rand_int(16) - 8; - D_80155D8E = rand_int(16) - 8; - D_80155D90 = 5; + CoinSparkleCenterX = rand_int(16) - 8; + CoinSparkleCenterY = rand_int(16) - 8; + CoinSparkleCenterZ = 5; } sparkle_script_update(item); } @@ -872,7 +877,7 @@ void update_item_entities(void) { y = item->pos.y + 12.0f; z = item->pos.z; hitDepth = 1000.0f; - npc_raycast_down_sides(COLLISION_CHANNEL_20000, &x, &y, &z, &hitDepth); + npc_raycast_down_sides(COLLIDER_FLAG_IGNORE_NPC, &x, &y, &z, &hitDepth); shadow->pos.x = x; shadow->pos.y = y; @@ -915,7 +920,7 @@ void appendGfx_item_entity(void* data) { } } - if (!(item->flags & ITEM_ENTITY_FLAG_40000)) { + if (!(item->flags & ITEM_ENTITY_FLAG_FULLSIZE)) { yOffset = -2; } else { yOffset = -3; @@ -963,7 +968,7 @@ void appendGfx_item_entity(void* data) { } } - if (!(item->flags & ITEM_ENTITY_FLAG_40000)) { + if (!(item->flags & ITEM_ENTITY_FLAG_FULLSIZE)) { gDPLoadTLUT_pal16(gMainGfxPos++, 0, gHudElementCacheTablePalette[item->lookupPaletteIndex].data); if (gSpriteShadingProfile->flags != 0) { gDPSetTextureImage(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 12, gHudElementCacheTableRaster[item->lookupRasterIndex].data); @@ -1054,7 +1059,7 @@ void draw_item_entities(void) { && item->flags != 0 && !(item->flags & ITEM_ENTITY_FLAG_HIDDEN) && (item->flags & (1 << gCurrentCamID)) - && !(item->flags & ITEM_ENTITY_FLAG_100000) + && !(item->flags & ITEM_ENTITY_FLAG_INVISIBLE) && (item->renderGroup == -1 || ItemEntityRenderGroup == item->renderGroup)) { if (!(item->flags & ITEM_ENTITY_FLAG_TRANSPARENT)) { @@ -1076,7 +1081,7 @@ void draw_item_entities(void) { } void draw_ui_item_entities(void) { - if (!(gOverrideFlags & (GLOBAL_OVERRIDES_4000 | GLOBAL_OVERRIDES_8000))) { + if (!(gOverrideFlags & (GLOBAL_OVERRIDES_PREV_400 | GLOBAL_OVERRIDES_PREV_800))) { s32 i; for (i = 0; i < MAX_ITEM_ENTITIES; i++) { @@ -1123,8 +1128,8 @@ void render_item_entities(void) { if (item != NULL) { if ((item->flags != 0)) { if (!(item->flags & ITEM_ENTITY_FLAG_HIDDEN)) { - if ((item->flags & ITEM_ENTITY_FLAG_100000)) { - if (!(item->flags & ITEM_ENTITY_FLAG_40000)) { + if ((item->flags & ITEM_ENTITY_FLAG_INVISIBLE)) { + if (!(item->flags & ITEM_ENTITY_FLAG_FULLSIZE)) { offsetY = -4; } else { offsetY = 0; @@ -1177,7 +1182,7 @@ void render_item_entities(void) { } } - if (!(item->flags & ITEM_ENTITY_FLAG_40000)) { + if (!(item->flags & ITEM_ENTITY_FLAG_FULLSIZE)) { gDPLoadTLUT_pal16(gMainGfxPos++, 0, gHudElementCacheTablePalette[item->lookupPaletteIndex].data); if (gSpriteShadingProfile->flags != 0) { gDPSetTextureImage(gMainGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 12, gHudElementCacheTableRaster[item->lookupRasterIndex].data); @@ -1300,10 +1305,10 @@ void func_80133A94(s32 idx, s32 itemID) { item->itemID = itemID; item->flags |= ITEM_ENTITY_RESIZABLE; - item->flags &= ~ITEM_ENTITY_FLAG_40000; + item->flags &= ~ITEM_ENTITY_FLAG_FULLSIZE; if (gItemTable[itemID].typeFlags & ITEM_TYPE_FLAG_ENTITY_FULLSIZE) { - item->flags |= ITEM_ENTITY_FLAG_40000; + item->flags |= ITEM_ENTITY_FLAG_FULLSIZE; item->flags &= ~ITEM_ENTITY_RESIZABLE; } @@ -1316,22 +1321,22 @@ b32 test_item_player_collision(ItemEntity* item) { EncounterStatus* encounterStatus = &gCurrentEncounter; Camera* camera = &gCameras[gCurrentCameraID]; s32 actionState = playerStatus->actionState; - f32 distThreshold; + f32 itemPickupRadius; f32 itemX, itemY, itemZ; - f32 tmpX, tmpZ; + f32 hammerX, hammerZ; f32 playerX, playerY, playerZ; - f32 colliderHeightHalf; - f32 colliderDiameterQuart; + f32 playerHalfHeight; + f32 playerHalfRadius; f32 spriteFacingAngle; - f32 playerY2; - f32 xDiff, zDiff; + f32 hammerY; + f32 dx, dz; f32 dist; f32 angle; - b32 cond; + b32 hitDetected; // below weird temps required to match - f32 fourteen; - f32 yTopThreshold; - f32 yBottomThreshold; + f32 hammerRadius; + f32 hammerHitboxHeight; + f32 itemHitboxHeight; f32 tmpFourteen; f32 tmpYTopThreshold; @@ -1357,16 +1362,16 @@ b32 test_item_player_collision(ItemEntity* item) { return FALSE; } - fourteen = tmpFourteen; + hammerRadius = tmpFourteen; tmpYTopThreshold = 18.0f; - yBottomThreshold = 27.0f; + itemHitboxHeight = 27.0f; - cond = item->flags; // required to match + hitDetected = item->flags; // required to match if (item->flags & ITEM_ENTITY_FLAG_HIDDEN) { return FALSE; } - yTopThreshold = tmpYTopThreshold; + hammerHitboxHeight = tmpYTopThreshold; if (get_time_freeze_mode() != TIME_FREEZE_NORMAL) { return FALSE; } @@ -1388,13 +1393,13 @@ b32 test_item_player_collision(ItemEntity* item) { return FALSE; } - cond = FALSE; - colliderHeightHalf = playerStatus->colliderHeight / 2; + hitDetected = FALSE; playerX = playerStatus->pos.x; playerY = playerStatus->pos.y; playerZ = playerStatus->pos.z; + playerHalfHeight = playerStatus->colliderHeight / 2; + playerHalfRadius = playerStatus->colliderDiameter / 4; - colliderDiameterQuart = playerStatus->colliderDiameter / 4; spriteFacingAngle = playerStatus->spriteFacingAngle; if (spriteFacingAngle < 180.0f) { spriteFacingAngle = clamp_angle(camera->curYaw - 90.0f); @@ -1402,70 +1407,74 @@ b32 test_item_player_collision(ItemEntity* item) { spriteFacingAngle = clamp_angle(camera->curYaw + 90.0f); } - tmpX = playerX; - playerY2 = playerY; - tmpZ = playerZ; + hammerX = playerX; + hammerY = playerY; + hammerZ = playerZ; if (get_clamped_angle_diff(camera->curYaw, spriteFacingAngle) < 0.0f) { angle = clamp_angle(camera->curYaw - 90.0f); - if (playerStatus->trueAnimation & 0x01000000) { + if (playerStatus->trueAnimation & SPRITE_ID_BACK_FACING) { angle = clamp_angle(angle + 30.0f); } } else { angle = clamp_angle(camera->curYaw + 90.0f); - if (playerStatus->trueAnimation & 0x01000000) { + if (playerStatus->trueAnimation & SPRITE_ID_BACK_FACING) { angle = clamp_angle(angle - 30.0f); } } - add_vec2D_polar(&tmpX, &tmpZ, 24.0f, angle); + add_vec2D_polar(&hammerX, &hammerZ, 24.0f, angle); itemX = item->pos.x; itemY = item->pos.y; itemZ = item->pos.z; + // check for player collision do { do { - distThreshold = 13.5f; + itemPickupRadius = 13.5f; } while (0); // required to match - xDiff = itemX - playerX; - zDiff = itemZ - playerZ; + dx = itemX - playerX; + dz = itemZ - playerZ; + dist = sqrtf(SQ(dx) + SQ(dz)); - dist = sqrtf(SQ(xDiff) + SQ(zDiff)); - if (!(colliderDiameterQuart + distThreshold <= dist) && - !(itemY + yBottomThreshold < playerY) && - !(playerY + colliderHeightHalf < itemY)) + if (!(playerHalfRadius + itemPickupRadius <= dist) // XZ distance is close enough + && !(itemY + itemHitboxHeight < playerY) // item is not below player + && !(playerY + playerHalfHeight < itemY)) // player is not below item { - cond = TRUE; + hitDetected = TRUE; } } while (0); // required to match + // check for hammer collision if (playerStatus->actionState == ACTION_STATE_HAMMER && (playerStatus->flags & PS_FLAG_HAMMER_CHECK)) { - xDiff = itemX - tmpX; - zDiff = itemZ - tmpZ; - dist = sqrtf(SQ(xDiff) + SQ(zDiff)); - if (!(fourteen + distThreshold <= dist) - && !(itemY + yBottomThreshold < playerY2) - && !(playerY2 + yTopThreshold < itemY)) + dx = itemX - hammerX; + dz = itemZ - hammerZ; + dist = sqrtf(SQ(dx) + SQ(dz)); + + if (!(hammerRadius + itemPickupRadius <= dist) // XZ distance is close enough + && !(itemY + itemHitboxHeight < hammerY) // item is not below hammer + && !(hammerY + hammerHitboxHeight < itemY)) // hammer is not below item { - cond = TRUE; + hitDetected = TRUE; } } - if (cond) { - if (item->flags & ITEM_ENTITY_FLAG_80) { - if (D_801565A6 != 0) { - D_801565A6--; + // if an item spawns inside the player, wait a bit before allowing pickup + if (hitDetected) { + if (item->flags & ITEM_ENTITY_FLAG_JUST_SPAWNED) { + if (ItemSpawnWithinPlayerPickupDelay != 0) { + ItemSpawnWithinPlayerPickupDelay--; return FALSE; - } else { - item->flags &= ~ITEM_ENTITY_FLAG_80; } + item->flags &= ~ITEM_ENTITY_FLAG_JUST_SPAWNED; } return TRUE; } - if (item->flags & ITEM_ENTITY_FLAG_80) { - item->flags &= ~ITEM_ENTITY_FLAG_80; + // no hit detected, skip 'spawned within player' checks in the future + if (item->flags & ITEM_ENTITY_FLAG_JUST_SPAWNED) { + item->flags &= ~ITEM_ENTITY_FLAG_JUST_SPAWNED; } return FALSE; } @@ -1736,7 +1745,7 @@ void update_item_entity_collectable(ItemEntity* item) { physData->useSimplePhysics = TRUE; } - if (item->flags & ITEM_ENTITY_FLAG_800) { + if (item->flags & ITEM_ENTITY_FLAG_SAVE_ON_INIT) { set_global_flag(item->boundVar); } item->state = ITEM_PHYSICS_STATE_ALIVE; @@ -1801,9 +1810,9 @@ void update_item_entity_collectable(ItemEntity* item) { outDepth = temp + physData->verticalVel; if (!physData->useSimplePhysics) { - hit = npc_raycast_up(COLLISION_CHANNEL_20000, &outX, &outY, &outZ, &outDepth); + hit = npc_raycast_up(COLLIDER_FLAG_IGNORE_NPC, &outX, &outY, &outZ, &outDepth); } else { - hit = npc_raycast_up(COLLISION_CHANNEL_20000, &outX, &outY, &outZ, &outDepth); + hit = npc_raycast_up(COLLIDER_FLAG_IGNORE_NPC, &outX, &outY, &outZ, &outDepth); } if (hit && outDepth < temp) { @@ -1823,9 +1832,9 @@ void update_item_entity_collectable(ItemEntity* item) { outZ = item->pos.z; if (!physData->useSimplePhysics) { - hit = npc_test_move_complex_with_slipping(COLLISION_CHANNEL_20000, &outX, &outY, &outZ, 0.0f, physData->moveAngle, physData->constVel, physData->collisionRadius); + hit = npc_test_move_complex_with_slipping(COLLIDER_FLAG_IGNORE_NPC, &outX, &outY, &outZ, 0.0f, physData->moveAngle, physData->constVel, physData->collisionRadius); } else { - hit = npc_test_move_simple_with_slipping(COLLISION_CHANNEL_20000, &outX, &outY, &outZ, 0.0f, physData->moveAngle, physData->constVel, physData->collisionRadius); + hit = npc_test_move_simple_with_slipping(COLLIDER_FLAG_IGNORE_NPC, &outX, &outY, &outZ, 0.0f, physData->moveAngle, physData->constVel, physData->collisionRadius); } if (hit) { @@ -1854,9 +1863,9 @@ void update_item_entity_collectable(ItemEntity* item) { outZ = item->pos.z; outDepth = -physData->verticalVel + 12.0f; if (!physData->useSimplePhysics) { - hit = npc_raycast_down_sides(COLLISION_CHANNEL_20000, &outX, &outY, &outZ, &outDepth); + hit = npc_raycast_down_sides(COLLIDER_FLAG_IGNORE_NPC, &outX, &outY, &outZ, &outDepth); } else { - hit = npc_raycast_down_around(COLLISION_CHANNEL_20000, &outX, &outY, &outZ, &outDepth, 180.0f, 20.0f); + hit = npc_raycast_down_around(COLLIDER_FLAG_IGNORE_NPC, &outX, &outY, &outZ, &outDepth, 180.0f, 20.0f); } } else { outX = item->pos.x; @@ -2008,7 +2017,7 @@ void update_item_entity_collectable(ItemEntity* item) { // items in this unused state are managed by a script // when the script is done executing, destroy these items if (item->state == ITEM_PHYSICS_STATE_04) { - if (!does_script_exist(D_80155D80)) { + if (!does_script_exist(UnusedItemPhysicsScriptID)) { D_801565A8 = FALSE; remove_item_entity_by_reference(item); resume_all_group(EVT_GROUP_02); @@ -2027,7 +2036,7 @@ void update_item_entity_collectable(ItemEntity* item) { void draw_ui_item_entity_collectable(ItemEntity* item) { if (item->state == ITEM_PHYSICS_STATE_ALIVE) { ItemEntityPhysicsData* physicsData = item->physicsData; - s32 flag = (item->flags & ITEM_ENTITY_FLAG_20000) > 0; + s32 flag = (item->flags & ITEM_ENTITY_FLAG_ODD_SPAWN_PARITY) > 0; if (item->spawnType != ITEM_SPAWN_MODE_ITEM_BLOCK_SPAWN_ALWAYS) { if (item->spawnType != ITEM_SPAWN_MODE_TOSS_FADE1) { @@ -2073,7 +2082,7 @@ void draw_ui_item_entity_no_pickup(ItemEntity* item) { void update_item_entity_pickup(ItemEntity* item) { PlayerData* playerData = &gPlayerData; PlayerStatus* playerStatus = &gPlayerStatus; - PopupMenu* menu = &D_801565B0; + PopupMenu* menu = &ItemPickupMenu; ItemData* itemData; s32 numEntries; s32 msgID; @@ -2389,8 +2398,8 @@ block_47: // TODO required to match break; case ITEM_PICKUP_STATE_AWAIT_THROW_AWAY: if (ItemPickupStateDelay == 0) { - D_801568E8 = menu->result; - if (D_801568E8 == 0) { + ThrowAwayMenuIdx = menu->result; + if (ThrowAwayMenuIdx == 0) { break; } hide_popup_menu(); @@ -2398,23 +2407,23 @@ block_47: // TODO required to match ItemPickupStateDelay++; if (ItemPickupStateDelay >= 15) { destroy_popup_menu(); - if (D_801568E8 == 255) { - D_801568E8 = 1; + if (ThrowAwayMenuIdx == 255) { + ThrowAwayMenuIdx = 1; } - D_801568EC = menu->userIndex[D_801568E8 - 1]; - hud_element_set_script(ItemPickupIconID, menu->ptrIcon[D_801568E8 - 1]); + ThrowAwayItemID = menu->userIndex[ThrowAwayMenuIdx - 1]; + hud_element_set_script(ItemPickupIconID, menu->ptrIcon[ThrowAwayMenuIdx - 1]); get_item_entity( make_item_entity_delayed( - D_801568EC, + ThrowAwayItemID, playerStatus->pos.x, playerStatus->pos.y + playerStatus->colliderHeight, playerStatus->pos.z, 3, 0, 0 ) )->renderGroup = -1; - if (D_801568E8 >= 2) { - playerData->invItems[D_801568E8 - 2] = ITEM_NONE; + if (ThrowAwayMenuIdx >= 2) { + playerData->invItems[ThrowAwayMenuIdx - 2] = ITEM_NONE; sort_items(); add_item(item->itemID); } @@ -2484,7 +2493,7 @@ void func_801363A0(ItemEntity* item) { itemMsg = MSG_Menus_005C; } - set_message_msg(itemData->nameMsg, 0); + set_message_text_var(itemData->nameMsg, 0); if (!(gItemTable[item->itemID].typeFlags & ITEM_TYPE_FLAG_KEY) && item->itemID != ITEM_STAR_PIECE && @@ -2513,7 +2522,7 @@ void func_801363A0(ItemEntity* item) { itemMsg = MSG_Menus_005C; } - set_message_msg(itemData->nameMsg, 0); + set_message_text_var(itemData->nameMsg, 0); width = get_msg_width(itemMsg, 0) + 30; posX = 160 - width / 2; posY = 76; @@ -2548,7 +2557,7 @@ void func_801363A0(ItemEntity* item) { } break; case ITEM_PICKUP_STATE_AWAIT_THROW_AWAY: - set_message_msg(itemData->nameMsg, 0); + set_message_text_var(itemData->nameMsg, 0); width = get_msg_width(MSG_Menus_005F, 0) + 54; posX = 160 - width / 2; set_window_properties(WINDOW_ID_12, 160 - width / 2, 76, width, 40, WINDOW_PRIORITY_0, draw_content_pickup_item_header, item, -1); @@ -2572,7 +2581,7 @@ void draw_content_pickup_item_header(ItemEntity* item, s32 posX, s32 posY) { } else { itemMsg = MSG_Menus_005A; } - set_message_msg(itemData->nameMsg, 0); + set_message_text_var(itemData->nameMsg, 0); if (item->pickupMsgFlags & ITEM_PICKUP_FLAG_1_COIN) { itemMsg = MSG_Menus_005D; @@ -2600,7 +2609,7 @@ void draw_content_pickup_item_header(ItemEntity* item, s32 posX, s32 posY) { itemMsg = MSG_Menus_005C; } - set_message_msg(itemData->nameMsg, 0); + set_message_text_var(itemData->nameMsg, 0); } offsetY = PickupMessageWindowYOffsets[get_msg_lines(itemMsg) - 1]; @@ -2622,7 +2631,7 @@ void draw_content_pickup_item_header(ItemEntity* item, s32 posX, s32 posY) { break; case ITEM_PICKUP_STATE_SHOW_THREW_AWAY: case ITEM_PICKUP_STATE_HIDE_THREW_AWAY: - set_message_msg(gItemTable[D_801568EC].nameMsg, 0); + set_message_text_var(gItemTable[ThrowAwayItemID].nameMsg, 0); draw_msg(MSG_Menus_005F, posX + 40, posY + 4, 255, MSG_PAL_2F, 0); hud_element_set_render_pos(ItemPickupIconID, posX + 20, posY + 20); hud_element_draw_next(ItemPickupIconID); diff --git a/src/main_loop.c b/src/main_loop.c index e7bd6ad536..3ad3c51faf 100644 --- a/src/main_loop.c +++ b/src/main_loop.c @@ -9,7 +9,7 @@ SHIFT_BSS s32 gOverrideFlags; SHIFT_BSS s32 timeFreezeMode; SHIFT_BSS u16** nuGfxCfb; -SHIFT_BSS s16 D_8009A690; +SHIFT_BSS s16 SoftResetDelay; SHIFT_BSS DisplayContext D_80164000[2]; s8 gGameStepDelayAmount = 1; @@ -27,8 +27,8 @@ GameStatus gGameStatus = { }; GameStatus* gGameStatusPtr = &gGameStatus; -s16 D_800741A0 = 0; -s16 D_800741A2 = 0; +s16 SoftResetOverlayAlpha = 0; +s16 SoftResetState = 0; s32 D_800741A4 = 0; Mtx MasterIdentityMtx = RDP_MATRIX( @@ -94,59 +94,59 @@ void step_game_loop(void) { update_windows(); update_curtains(); - if (gOverrideFlags & GLOBAL_OVERRIDES_ENABLE_TRANSITION_STENCIL) { - switch (D_800741A2) { + if (gOverrideFlags & GLOBAL_OVERRIDES_SOFT_RESET) { + switch (SoftResetState) { case 0: gOverrideFlags |= GLOBAL_OVERRIDES_200; disable_player_input(); - if (D_800741A0 == 255) { - D_800741A2 = 1; - D_8009A690 = 3; + if (SoftResetOverlayAlpha == 255) { + SoftResetState = 1; + SoftResetDelay = 3; } else { - D_800741A0 += 10; - if (D_800741A0 > 255) { - D_800741A0 = 255; + SoftResetOverlayAlpha += 10; + if (SoftResetOverlayAlpha > 255) { + SoftResetOverlayAlpha = 255; } } break; case 1: gOverrideFlags |= GLOBAL_OVERRIDES_DISABLE_DRAW_FRAME; - D_8009A690--; - if (D_8009A690 == 0) { + SoftResetDelay--; + if (SoftResetDelay == 0) { sfx_stop_env_sounds(); set_game_mode(GAME_MODE_STARTUP); - gOverrideFlags &= ~GLOBAL_OVERRIDES_ENABLE_TRANSITION_STENCIL; + gOverrideFlags &= ~GLOBAL_OVERRIDES_SOFT_RESET; } break; } } else { - D_800741A0 = 0; - D_800741A2 = 0; + SoftResetOverlayAlpha = 0; + SoftResetState = 0; } if (gOverrideFlags & GLOBAL_OVERRIDES_DISABLE_BATTLES) { - gOverrideFlags |= GLOBAL_OVERRIDES_1000; + gOverrideFlags |= GLOBAL_OVERRIDES_PREV_DISABLE_BATTLES; } else { - gOverrideFlags &= ~GLOBAL_OVERRIDES_1000; + gOverrideFlags &= ~GLOBAL_OVERRIDES_PREV_DISABLE_BATTLES; } if (gOverrideFlags & GLOBAL_OVERRIDES_200) { - gOverrideFlags |= GLOBAL_OVERRIDES_2000; + gOverrideFlags |= GLOBAL_OVERRIDES_PREV_200; } else { - gOverrideFlags &= ~GLOBAL_OVERRIDES_2000; + gOverrideFlags &= ~GLOBAL_OVERRIDES_PREV_200; } if (gOverrideFlags & GLOBAL_OVERRIDES_400) { - gOverrideFlags |= GLOBAL_OVERRIDES_4000; + gOverrideFlags |= GLOBAL_OVERRIDES_PREV_400; } else { - gOverrideFlags &= ~GLOBAL_OVERRIDES_4000; + gOverrideFlags &= ~GLOBAL_OVERRIDES_PREV_400; } if (gOverrideFlags & GLOBAL_OVERRIDES_800) { - gOverrideFlags |= GLOBAL_OVERRIDES_8000; + gOverrideFlags |= GLOBAL_OVERRIDES_PREV_800; } else { - gOverrideFlags &= ~GLOBAL_OVERRIDES_8000; + gOverrideFlags &= ~GLOBAL_OVERRIDES_PREV_800; } // Unused rand_int used to advance the global random seed each visual frame @@ -196,7 +196,7 @@ void gfx_draw_frame(void) { render_effects_UI(); state_render_backUI(); - if (!(gOverrideFlags & GLOBAL_OVERRIDES_WINDOWS_IN_FRONT_OF_CURTAINS)) { + if (!(gOverrideFlags & GLOBAL_OVERRIDES_WINDOWS_OVER_CURTAINS)) { render_window_root(); } @@ -204,7 +204,9 @@ void gfx_draw_frame(void) { render_frame(TRUE); } - if (!(gOverrideFlags & (GLOBAL_OVERRIDES_MESSAGES_IN_FRONT_OF_CURTAINS | GLOBAL_OVERRIDES_10))) { + if (!(gOverrideFlags & GLOBAL_OVERRIDES_MESSAGES_OVER_CURTAINS) + && !(gOverrideFlags & GLOBAL_OVERRIDES_MESSAGES_OVER_FRONTUI) + ) { render_messages(); } @@ -212,26 +214,29 @@ void gfx_draw_frame(void) { render_hud_elements_frontUI(); render_screen_overlay_frontUI(); - if ((gOverrideFlags & (GLOBAL_OVERRIDES_MESSAGES_IN_FRONT_OF_CURTAINS | GLOBAL_OVERRIDES_10)) == GLOBAL_OVERRIDES_10) { + if (!(gOverrideFlags & GLOBAL_OVERRIDES_MESSAGES_OVER_CURTAINS) + && (gOverrideFlags & GLOBAL_OVERRIDES_MESSAGES_OVER_FRONTUI) + ) { render_messages(); } render_curtains(); - if (gOverrideFlags & GLOBAL_OVERRIDES_MESSAGES_IN_FRONT_OF_CURTAINS) { + if (gOverrideFlags & GLOBAL_OVERRIDES_MESSAGES_OVER_CURTAINS) { render_messages(); } - if (gOverrideFlags & GLOBAL_OVERRIDES_WINDOWS_IN_FRONT_OF_CURTAINS) { + + if (gOverrideFlags & GLOBAL_OVERRIDES_WINDOWS_OVER_CURTAINS) { render_window_root(); } state_render_frontUI(); - if (gOverrideFlags & GLOBAL_OVERRIDES_ENABLE_TRANSITION_STENCIL) { - switch (D_800741A2) { + if (gOverrideFlags & GLOBAL_OVERRIDES_SOFT_RESET) { + switch (SoftResetState) { case 0: case 1: - _render_transition_stencil(7, D_800741A0, NULL); + _render_transition_stencil(OVERLAY_SCREEN_MARIO, SoftResetOverlayAlpha, NULL); break; } } diff --git a/src/msg.c b/src/msg.c index d7acc0693b..3b399f72d3 100644 --- a/src/msg.c +++ b/src/msg.c @@ -1540,7 +1540,7 @@ void set_message_images(MessageImageData* images) { *gMsgVarImages = images; } -void set_message_msg(s32 msgID, s32 index) { +void set_message_text_var(s32 msgID, s32 index) { u8* mallocSpace = NULL; s32 i; u8* msgVars; @@ -1570,7 +1570,7 @@ void set_message_msg(s32 msgID, s32 index) { } } -void set_message_value(s32 value, s32 index) { +void set_message_int_var(s32 value, s32 index) { s8 strBuffer[ARRAY_COUNT(gMessageMsgVars[index])]; s8* bufferIt; s32 i; diff --git a/src/npc.c b/src/npc.c index eb93d0b12f..69f4ef6597 100644 --- a/src/npc.c +++ b/src/npc.c @@ -165,7 +165,7 @@ s32 create_npc_impl(NpcBlueprint* blueprint, AnimID* animList, s32 isPeachNpc) { npc->renderYaw = 0.0f; npc->imgfxType = IMGFX_CLEAR; npc->imgfxFlags = 0; - npc->collisionChannel = COLLISION_CHANNEL_20000; + npc->collisionChannel = COLLIDER_FLAG_IGNORE_NPC; npc->isFacingAway = FALSE; npc->yawCamOffset = 0; npc->turnAroundYawAdjustment = 0; @@ -775,7 +775,7 @@ f32 npc_get_render_yaw(Npc* npc) { f32 yaw; s32 direction; - if (!(gOverrideFlags & (GLOBAL_OVERRIDES_8000 | GLOBAL_OVERRIDES_4000))) { + if (!(gOverrideFlags & (GLOBAL_OVERRIDES_PREV_800 | GLOBAL_OVERRIDES_PREV_400))) { cameraYaw = camera->curYaw; camRelativeYaw = get_clamped_angle_diff(cameraYaw, npc->yaw); @@ -2117,7 +2117,7 @@ s32 npc_get_collider_below(Npc* npc) { x = npc->pos.x; z = npc->pos.z; - if (npc_raycast_down_sides(COLLISION_CHANNEL_8000 | COLLISION_CHANNEL_10000 | COLLISION_CHANNEL_20000, &x, &y, &z, &yaw)) { + if (npc_raycast_down_sides(COLLIDER_FLAG_IGNORE_SHELL | COLLIDER_FLAG_IGNORE_PLAYER | COLLIDER_FLAG_IGNORE_NPC, &x, &y, &z, &yaw)) { if (yaw <= 16.0f) { return NpcHitQueryColliderID; } @@ -2209,7 +2209,7 @@ void npc_set_imgfx_params(Npc* npc, s32 imgfxType, s32 arg2, s32 arg3, s32 arg4, void spawn_surface_effects(Npc* npc, SurfaceInteractMode mode) { PartnerStatus* temp = &gPartnerStatus; - if ((npc->flags & (NPC_FLAG_TOUCHES_GROUND | NPC_FLAG_INVISIBLE)) == NPC_FLAG_TOUCHES_GROUND) { + if (!(npc->flags & NPC_FLAG_INVISIBLE) && (npc->flags & NPC_FLAG_TOUCHES_GROUND)) { if (npc->moveSpeed != 0.0f) { s32 surfaceType = get_collider_flags((u16)npc->curFloor) & COLLIDER_FLAGS_SURFACE_TYPE_MASK; switch (surfaceType) { diff --git a/src/pause/pause_stats.c b/src/pause/pause_stats.c index 10c1dbd21e..736caa55df 100644 --- a/src/pause/pause_stats.c +++ b/src/pause/pause_stats.c @@ -308,9 +308,9 @@ void pause_stats_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, // get number of full power increments playerData = &gPlayerData; - powFullBars = playerData->specialBarsFilled / 256; - powIncrements = playerData->specialBarsFilled % 256; // get remainder in unfilled bar - powIncrements /= 32; // subdivide unfilled bar into 8 segments (8 = 256/32) + powFullBars = playerData->starPower / SP_PER_BAR; + powIncrements = playerData->starPower % SP_PER_BAR; // get remainder in unfilled bar + powIncrements /= SP_PER_SEG; // subdivide unfilled bar into 8 segments (8 = 256/32) powIncrements += powFullBars * 8; // add 8 increments per full bar // draw filled bars diff --git a/src/state_file_select.c b/src/state_file_select.c index b327be2f5b..2e4b77e872 100644 --- a/src/state_file_select.c +++ b/src/state_file_select.c @@ -87,7 +87,7 @@ void state_init_file_select(void) { gCameras[CAM_DEFAULT].auxPitch = 0; gCameras[CAM_DEFAULT].lookAt_dist = 100; gCameras[CAM_DEFAULT].auxBoomPitch = 0; - gOverrideFlags |= GLOBAL_OVERRIDES_WINDOWS_IN_FRONT_OF_CURTAINS; + gOverrideFlags |= GLOBAL_OVERRIDES_WINDOWS_OVER_CURTAINS; } void state_step_language_select(void) { @@ -236,7 +236,7 @@ void state_init_exit_file_select(void) { set_map_transition_effect(TRANSITION_SLOW_FADE_TO_WHITE); } else { set_map_transition_effect(TRANSITION_ENTER_WORLD); - gOverrideFlags &= ~GLOBAL_OVERRIDES_WINDOWS_IN_FRONT_OF_CURTAINS; + gOverrideFlags &= ~GLOBAL_OVERRIDES_WINDOWS_OVER_CURTAINS; bgm_set_song(0, -1, 0, 1000, 8); } gOverrideFlags &= ~GLOBAL_OVERRIDES_40; @@ -410,7 +410,7 @@ void state_step_exit_file_select(void) { set_time_freeze_mode(TIME_FREEZE_NORMAL); if (temp_s0 == 0) { set_game_mode(GAME_MODE_TITLE_SCREEN); - gOverrideFlags &= ~GLOBAL_OVERRIDES_WINDOWS_IN_FRONT_OF_CURTAINS; + gOverrideFlags &= ~GLOBAL_OVERRIDES_WINDOWS_OVER_CURTAINS; } else { D_800A0930 = 10; D_800A0931 = 4; diff --git a/src/state_pause.c b/src/state_pause.c index 1e75447abb..073fc58db5 100644 --- a/src/state_pause.c +++ b/src/state_pause.c @@ -209,7 +209,7 @@ void state_step_unpause(void) { status_bar_respond_to_changes(); set_time_freeze_mode(TIME_FREEZE_PARTIAL); StepPauseState = 3; - gPlayerStatus.alpha2 = gPlayerStatus.alpha1 - 1; + gPlayerStatus.prevAlpha = gPlayerStatus.curAlpha - 1; D_802D9D71 = D_802D9D70 + 1; update_encounters(); diff --git a/src/state_startup.c b/src/state_startup.c index 5202f5c510..faeef48878 100644 --- a/src/state_startup.c +++ b/src/state_startup.c @@ -70,7 +70,7 @@ void state_step_startup(void) { gGameStatusPtr->unk_48[i] = 15; } - fio_has_valid_globals(); + fio_load_globals(); if (gSaveGlobals.useMonoSound == 0) { gGameStatusPtr->soundOutputMode = SOUND_OUT_STEREO; diff --git a/src/status_icons.c b/src/status_icons.c index 28dbe2c26a..a24b13e4a9 100644 --- a/src/status_icons.c +++ b/src/status_icons.c @@ -224,25 +224,25 @@ void update_merlee_message(void* data) { switch (popup->showMsgState) { case BTL_MSG_STATE_INIT: - popup->showMsgState = BTL_MSG_STATE_1; + popup->showMsgState = BTL_MSG_STATE_POPUP_PRE_DELAY; break; - case BTL_MSG_STATE_1: - popup->showMsgState = BTL_MSG_STATE_2; + case BTL_MSG_STATE_POPUP_PRE_DELAY: + popup->showMsgState = BTL_MSG_STATE_POPUP_DELAY; break; - case BTL_MSG_STATE_2: + case BTL_MSG_STATE_POPUP_DELAY: if (gGameStatusPtr->pressedButtons[0] & (BUTTON_A | BUTTON_B)) { popup->duration = 0; } if (popup->duration != 0) { popup->duration--; } else { - popup->showMsgState = BTL_MSG_STATE_3; + popup->showMsgState = BTL_MSG_STATE_POPUP_POST_DELAY; } break; - case BTL_MSG_STATE_3: - popup->showMsgState = BTL_MSG_STATE_4; + case BTL_MSG_STATE_POPUP_POST_DELAY: + popup->showMsgState = BTL_MSG_STATE_POPUP_DISPOSE; break; - case BTL_MSG_STATE_4: + case BTL_MSG_STATE_POPUP_DISPOSE: closeMessage = TRUE; break; } diff --git a/src/trigger.c b/src/trigger.c index f144480b3e..19707dc42b 100644 --- a/src/trigger.c +++ b/src/trigger.c @@ -6,7 +6,7 @@ SHIFT_BSS TriggerList bTriggerList; SHIFT_BSS TriggerList* gCurrentTriggerListPtr; void default_trigger_on_activate(Trigger* self) { - self->flags.flags |= TRIGGER_ACTIVATED; + self->flags |= TRIGGER_ACTIVATED; } void clear_trigger_data(void) { @@ -70,7 +70,7 @@ Trigger* create_trigger(TriggerBlueprint* bp) { ASSERT(trigger != NULL); - trigger->flags.flags = bp->flags | TRIGGER_ACTIVE; + trigger->flags = bp->flags | TRIGGER_ACTIVE; trigger->varIndex = bp->varIndex; trigger->location.colliderID = bp->colliderID; trigger->itemList = bp->itemList; @@ -99,16 +99,16 @@ void update_triggers(void) { continue; } - if (!(listTrigger->flags.flags & TRIGGER_ACTIVE)) { + if (!(listTrigger->flags & TRIGGER_ACTIVE)) { continue; } - if (listTrigger->flags.flags & TRIGGER_FORCE_ACTIVATE) { - listTrigger->flags.flags |= TRIGGER_ACTIVATED; + if (listTrigger->flags & TRIGGER_FORCE_ACTIVATE) { + listTrigger->flags |= TRIGGER_ACTIVATED; continue; } - if (listTrigger->flags.flags & TRIGGER_WALL_PUSH) { + if (listTrigger->flags & TRIGGER_WALL_PUSH) { if (listTrigger->location.colliderID == collisionStatus->curWall) { func_800E06C0(1); } @@ -119,19 +119,19 @@ void update_triggers(void) { } } - if (listTrigger->flags.flags & TRIGGER_FLOOR_TOUCH) { + if (listTrigger->flags & TRIGGER_FLOOR_TOUCH) { if (listTrigger->location.colliderID != collisionStatus->curFloor) { continue; } } - if (listTrigger->flags.flags & TRIGGER_FLOOR_ABOVE) { + if (listTrigger->flags & TRIGGER_FLOOR_ABOVE) { if (listTrigger->location.colliderID != collisionStatus->floorBelow) { continue; } } - if (listTrigger->flags.flags & TRIGGER_WALL_PRESS_A) { + if (listTrigger->flags & TRIGGER_WALL_PRESS_A) { if (listTrigger->location.colliderID == collisionStatus->curWall) { collisionStatus->touchingWallTrigger = 1; } @@ -140,56 +140,56 @@ void update_triggers(void) { } } - if (listTrigger->flags.flags & TRIGGER_WALL_TOUCH) { + if (listTrigger->flags & TRIGGER_WALL_TOUCH) { if (listTrigger->location.colliderID != collisionStatus->curWall) { continue; } } - if (listTrigger->flags.flags & TRIGGER_FLOOR_JUMP) { + if (listTrigger->flags & TRIGGER_FLOOR_JUMP) { if (listTrigger->location.colliderID != collisionStatus->lastTouchedFloor) { continue; } } - if (listTrigger->flags.flags & TRIGGER_FLOOR_PRESS_A) { + if (listTrigger->flags & TRIGGER_FLOOR_PRESS_A) { if ((listTrigger->location.colliderID != collisionStatus->curFloor) || !(gGameStatusPtr->pressedButtons[0] & BUTTON_A) || (gPlayerStatus.flags & PS_FLAG_INPUT_DISABLED)) { continue; } } - if (listTrigger->flags.flags & TRIGGER_WALL_HAMMER) { + if (listTrigger->flags & TRIGGER_WALL_HAMMER) { if (listTrigger->location.colliderID != collisionStatus->lastWallHammered) { continue; } } - if (listTrigger->flags.flags & TRIGGER_CEILING_TOUCH) { + if (listTrigger->flags & TRIGGER_CEILING_TOUCH) { if (listTrigger->location.colliderID != collisionStatus->curCeiling) { continue; } } - if (listTrigger->flags.flags & TRIGGER_FLAG_2000) { + if (listTrigger->flags & TRIGGER_FLAG_2000) { if (listTrigger->location.colliderID != collisionStatus->unk_0C) { continue; } } - if (listTrigger->flags.flags & TRIGGER_FLAG_4000) { + if (listTrigger->flags & TRIGGER_FLAG_4000) { if (listTrigger->location.colliderID != collisionStatus->unk_0E) { continue; } } - if (listTrigger->flags.flags & TRIGGER_FLAG_8000) { + if (listTrigger->flags & TRIGGER_FLAG_8000) { if (listTrigger->location.colliderID != collisionStatus->unk_10) { continue; } } - if (listTrigger->flags.flags & TRIGGER_POINT_BOMB) { + if (listTrigger->flags & TRIGGER_POINT_BOMB) { Vec4f* triggerPos; f32 dist; @@ -207,15 +207,15 @@ void update_triggers(void) { } } - if (listTrigger->flags.flags & TRIGGER_GAME_FLAG_SET && get_global_flag(listTrigger->varIndex) == 0) { + if (listTrigger->flags & TRIGGER_GAME_FLAG_SET && get_global_flag(listTrigger->varIndex) == 0) { continue; } - if (listTrigger->flags.flags & TRIGGER_AREA_FLAG_SET && get_area_flag(listTrigger->varIndex) == 0) { + if (listTrigger->flags & TRIGGER_AREA_FLAG_SET && get_area_flag(listTrigger->varIndex) == 0) { continue; } - listTrigger->flags.flags |= TRIGGER_ACTIVATED; + listTrigger->flags |= TRIGGER_ACTIVATED; } for (i = 0; i < ARRAY_COUNT(*gCurrentTriggerListPtr); i++) { @@ -225,10 +225,10 @@ void update_triggers(void) { continue; } - if (listTrigger->flags.flags & TRIGGER_ACTIVE) { - if (listTrigger->flags.flags & TRIGGER_ACTIVATED) { + if (listTrigger->flags & TRIGGER_ACTIVE) { + if (listTrigger->flags & TRIGGER_ACTIVATED) { if (listTrigger->onActivateFunc(listTrigger) == 0) { - listTrigger->flags.flags &= ~TRIGGER_ACTIVATED; + listTrigger->flags &= ~TRIGGER_ACTIVATED; } } } @@ -260,8 +260,8 @@ s32 is_another_trigger_bound(Trigger* trigger, EvtScript* script) { continue; } - if (listTrigger->flags.flags & TRIGGER_ACTIVE) { - if (listTrigger->flags.flags & TRIGGER_ACTIVATED) { + if (listTrigger->flags & TRIGGER_ACTIVE) { + if (listTrigger->flags & TRIGGER_ACTIVATED) { if (listTrigger->onTriggerEvt == script) { return TRUE; } @@ -290,7 +290,7 @@ s32 should_collider_allow_interact(s32 colliderID) { if (trigger != NULL && trigger->hasPlayerInteractPrompt != 0 && trigger->location.colliderID == colliderID - && trigger->flags.flags & TRIGGER_WALL_PRESS_A + && trigger->flags & TRIGGER_WALL_PRESS_A ) { return TRUE; } diff --git a/src/world/action/hammer.c b/src/world/action/hammer.c index 1e46219b41..5aa4aafa30 100644 --- a/src/world/action/hammer.c +++ b/src/world/action/hammer.c @@ -91,7 +91,7 @@ void action_hammer_play_hit_fx(s32 hitID) { switch (is_ability_active(ABILITY_ATTACK_FX)) { case 1: - soundID = SOUND_0372; + soundID = SOUND_LIFE_SHROOM_CHIME; break; case 2: soundID = SOUND_PLANTS_BELL; @@ -100,10 +100,10 @@ void action_hammer_play_hit_fx(s32 hitID) { soundID = SOUND_SLIDE_WHISTLE_OUT; break; case 4: - soundID = SOUND_2072; + soundID = SOUND_YOSHI; break; case 5: - soundID = SOUND_2073; + soundID = SOUND_HIT_WHACKA; break; case 6: soundID = SOUND_FLOWERS_LAUGH; @@ -145,7 +145,7 @@ s32 func_802B62A4_E25174(void) { x = playerX + (outSinTheta * i); y = playerY; z = playerZ - (outCosTheta * i); - ret = player_test_lateral_overlap(3, playerStatus, &x, &y, &z, 4.0f, yaw); + ret = player_test_lateral_overlap(PLAYER_COLLISION_3, playerStatus, &x, &y, &z, 4.0f, yaw); if (ret >= 0) { HammerHit->hitPos.x = x; HammerHit->hitPos.y = y; @@ -172,7 +172,7 @@ s32 func_802B62A4_E25174(void) { y = playerY; z = playerZ - (outCosTheta * i); - ret = player_test_lateral_overlap(3, playerStatus, &x, &y, &z, 4.0f, yaw); + ret = player_test_lateral_overlap(PLAYER_COLLISION_3, playerStatus, &x, &y, &z, 4.0f, yaw); if (ret >= 0) { HammerHit->hitPos.x = x; HammerHit->hitPos.y = y; @@ -323,7 +323,7 @@ void func_802B6820_E256F0(void) { x = playerX + (outSinTheta * i); y = playerY; z = playerZ - (outCosTheta * i); - result = player_test_lateral_overlap(3, playerStatus, &x, &y, &z, 4.0f, yaw); + result = player_test_lateral_overlap(PLAYER_COLLISION_3, playerStatus, &x, &y, &z, 4.0f, yaw); if (HammerHit->unk_14 == 0) { collisionStatus->lastWallHammered = result; if (result >= 0) { @@ -354,7 +354,7 @@ void func_802B6820_E256F0(void) { x = playerX + (outSinTheta * i); y = playerY; z = playerZ - (outCosTheta * i); - result = player_test_lateral_overlap(3, playerStatus, &x, &y, &z, 4.0f, yaw); + result = player_test_lateral_overlap(PLAYER_COLLISION_3, playerStatus, &x, &y, &z, 4.0f, yaw); if (HammerHit->unk_14 == 0) { collisionStatus->lastWallHammered = result; if (result >= 0) { diff --git a/src/world/action/hit_fire.c b/src/world/action/hit_fire.c index bb0596d3c8..fc5d78d061 100644 --- a/src/world/action/hit_fire.c +++ b/src/world/action/hit_fire.c @@ -30,7 +30,7 @@ void action_update_hit_fire(void) { ReturnAngle = atan2(playerStatus->pos.x, playerStatus->pos.z, playerStatus->lastGoodPos.x, playerStatus->lastGoodPos.z); playerStatus->curSpeed = get_xz_dist_to_player(playerStatus->lastGoodPos.x, playerStatus->lastGoodPos.z) / 18.0f; subtract_hp(1); - open_status_bar_long(); + open_status_bar_slowly(); gOverrideFlags |= GLOBAL_OVERRIDES_40; } diff --git a/src/world/action/hit_lava.c b/src/world/action/hit_lava.c index 5455c14165..8d91921e09 100644 --- a/src/world/action/hit_lava.c +++ b/src/world/action/hit_lava.c @@ -44,10 +44,10 @@ void action_update_hit_lava(void) { playerStatus->curSpeed = 0.0f; LaunchVelocity = 0.0f; - gCameras[CAM_DEFAULT].moveFlags |= (CAMERA_MOVE_IGNORE_PLAYER_Y | CAMERA_MOVE_FLAG_2); + gCameras[CAM_DEFAULT].moveFlags |= (CAMERA_MOVE_IGNORE_PLAYER_Y | CAMERA_MOVE_NO_INTERP_Y); LaunchInterpPhase = 90.0f; subtract_hp(1); - open_status_bar_long(); + open_status_bar_slowly(); gOverrideFlags |= GLOBAL_OVERRIDES_40; sfx_play_sound_at_player(SOUND_TOUCH_LAVA, SOUND_SPACE_DEFAULT); } @@ -173,8 +173,8 @@ void action_update_hit_lava(void) { exec_ShakeCamX(0, 2, 1, 0.8f); start_rumble(256, 50); phys_adjust_cam_on_landing(); - gCameras[CAM_DEFAULT].moveFlags &= ~CAMERA_MOVE_FLAG_2; - sfx_play_sound_at_player(SOUND_03FB, SOUND_SPACE_DEFAULT); + gCameras[CAM_DEFAULT].moveFlags &= ~CAMERA_MOVE_NO_INTERP_Y; + sfx_play_sound_at_player(SOUND_PLAYER_COLLAPSE, SOUND_SPACE_DEFAULT); suggest_player_anim_always_forward(ANIM_MarioW2_Thrown); playerStatus->flags &= ~PS_FLAG_HIT_FIRE; playerStatus->flags &= ~PS_FLAG_FLYING; diff --git a/src/world/action/jump.c b/src/world/action/jump.c index d00038d5d7..95e95ba365 100644 --- a/src/world/action/jump.c +++ b/src/world/action/jump.c @@ -57,7 +57,7 @@ void action_update_jump(void) { sfx_play_sound_at_player(SOUND_JUMP_8BIT_MARIO, SOUND_SPACE_DEFAULT); } else { - sfx_play_sound_at_player(SOUND_JUMP_2081, SOUND_SPACE_DEFAULT); + sfx_play_sound_at_player(SOUND_QUICK_PLAYER_JUMP, SOUND_SPACE_DEFAULT); } } } diff --git a/src/world/action/land.c b/src/world/action/land.c index c1622bb37a..b990491bc0 100644 --- a/src/world/action/land.c +++ b/src/world/action/land.c @@ -54,7 +54,7 @@ void action_update_land(void) { collisionStatus->lastTouchedFloor = -1; playerStatus->animFlags &= ~PA_FLAG_INTERRUPT_SPIN; - camera->moveFlags &= ~CAMERA_MOVE_FLAG_4; + camera->moveFlags &= ~CAMERA_MOVE_ACCEL_INTERP_Y; } playerStatus->actionSubstate++; // SUBSTATE_DONE playerStatus->curSpeed *= 0.6f; 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 006e193cf3..c6991c57da 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 @@ -316,7 +316,7 @@ NpcData N(NpcData_Boo_01)[] = { EvtScript N(EVS_TubbaWalking) = { EVT_LOOP(LVar0) - EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_HEAVY_NPC_STEP_C, SOUND_SPACE_DEFAULT) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(0.5)) EVT_WAIT(5) EVT_END_LOOP @@ -350,7 +350,7 @@ EvtScript N(EVS_Scene_TubbaRaid) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SpeakToPlayer, NPC_Boo_03, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 0, MSG_CH3_00A0) - EVT_CALL(PlaySoundAt, SOUND_20F6, SOUND_SPACE_DEFAULT, 450, 200, 160) + EVT_CALL(PlaySoundAt, SOUND_HEAVY_NPC_STEP_C, SOUND_SPACE_DEFAULT, 450, 200, 160) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(0.8)) EVT_CALL(PlaySoundAtNpc, NPC_Boo_01, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(PlaySoundAtNpc, NPC_Boo_02, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) diff --git a/src/world/area_arn/arn_07/arn_07_5_npc.c b/src/world/area_arn/arn_07/arn_07_5_npc.c index 160978fc0b..6860d2f05b 100644 --- a/src/world/area_arn/arn_07/arn_07_5_npc.c +++ b/src/world/area_arn/arn_07/arn_07_5_npc.c @@ -9,7 +9,7 @@ #include "world/common/npc/StarSpirit.inc.c" API_CALLABLE(N(UpgradeStarPowerCh3)) { - set_max_SP(3); + set_max_star_power(3); gPlayerData.curHP = gPlayerData.curMaxHP; gPlayerData.curFP = gPlayerData.curMaxFP; sync_status_bar(); @@ -18,7 +18,7 @@ API_CALLABLE(N(UpgradeStarPowerCh3)) { EvtScript N(EVS_TubbaWalking) = { EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_HEAVY_NPC_STEP_C, SOUND_SPACE_DEFAULT) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(0.8)) EVT_END_LOOP EVT_RETURN diff --git a/src/world/area_dgb/dgb_00/dgb_00_3_npc.c b/src/world/area_dgb/dgb_00/dgb_00_3_npc.c index 705a19f419..cfffcb1548 100644 --- a/src/world/area_dgb/dgb_00/dgb_00_3_npc.c +++ b/src/world/area_dgb/dgb_00/dgb_00_3_npc.c @@ -552,7 +552,7 @@ EvtScript N(EVS_Scene_ThrownOutBySentinel) = { EVT_CALL(SetNpcPos, NPC_Sentinel, 175, 85, -33) EVT_CALL(SetNpcAnimation, NPC_Sentinel, ANIM_Sentinel_Anim09) EVT_WAIT(20) - EVT_CALL(PlaySoundAtNpc, NPC_Sentinel, SOUND_02F7, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Sentinel, SOUND_SENTINEL_PICKUP, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcAnimation, NPC_Sentinel, ANIM_Sentinel_Anim02) EVT_CALL(SetNpcPos, NPC_Sentinel, 175, 70, -33) EVT_THREAD diff --git a/src/world/area_dgb/dgb_01/dgb_01_3_bridges.c b/src/world/area_dgb/dgb_01/dgb_01_3_bridges.c index 13f9d76c47..b07b7190d5 100644 --- a/src/world/area_dgb/dgb_01/dgb_01_3_bridges.c +++ b/src/world/area_dgb/dgb_01/dgb_01_3_bridges.c @@ -22,9 +22,9 @@ EvtScript N(EVS_Scene_TubbaSmashBridges) = { EVT_CALL(InterruptUsePartner) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Shocked) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_HEAVY_NPC_STEP_C, SOUND_SPACE_DEFAULT) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_HEAVY_NPC_STEP_C, SOUND_SPACE_DEFAULT) EVT_WAIT(5) EVT_END_THREAD EVT_THREAD @@ -33,7 +33,7 @@ EvtScript N(EVS_Scene_TubbaSmashBridges) = { EVT_WAIT(30) EVT_THREAD EVT_LOOP(12) - EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_HEAVY_NPC_STEP_C, SOUND_SPACE_DEFAULT) EVT_WAIT(5) EVT_END_LOOP EVT_END_THREAD @@ -134,10 +134,10 @@ EvtScript N(EVS_Scene_TubbaSmashBridges) = { EVT_CALL(NpcMoveTo, NPC_Tubba, 176, 0, 0) EVT_END_THREAD EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_HEAVY_NPC_STEP_C, SOUND_SPACE_DEFAULT) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.3)) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_HEAVY_NPC_STEP_C, SOUND_SPACE_DEFAULT) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 2, EVT_FLOAT(0.15)) EVT_WAIT(8) EVT_END_THREAD @@ -161,10 +161,10 @@ EvtScript N(EVS_Scene_TubbaSmashBridges) = { EVT_END_THREAD EVT_THREAD EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_HEAVY_NPC_STEP_C, SOUND_SPACE_DEFAULT) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.3)) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_HEAVY_NPC_STEP_C, SOUND_SPACE_DEFAULT) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 2, EVT_FLOAT(0.15)) EVT_WAIT(8) EVT_END_LOOP diff --git a/src/world/area_dgb/dgb_01/dgb_01_5_npc.c b/src/world/area_dgb/dgb_01/dgb_01_5_npc.c index 7b6807011f..d44bb3b346 100644 --- a/src/world/area_dgb/dgb_01/dgb_01_5_npc.c +++ b/src/world/area_dgb/dgb_01/dgb_01_5_npc.c @@ -152,10 +152,10 @@ EvtScript N(EVS_NpcIdle_Tubba_Floor1) = { EVT_END_THREAD EVT_THREAD EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20F6, SOUND_PARAM_QUIET) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_HEAVY_NPC_STEP_C, SOUND_PARAM_QUIET) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(2.0)) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20F6, SOUND_PARAM_QUIET) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_HEAVY_NPC_STEP_C, SOUND_PARAM_QUIET) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 2, EVT_FLOAT(1.0)) EVT_WAIT(8) EVT_END_LOOP diff --git a/src/world/area_dgb/dgb_08/dgb_08_3_npc.c b/src/world/area_dgb/dgb_08/dgb_08_3_npc.c index 26d02dc1a3..13d8125ff6 100644 --- a/src/world/area_dgb/dgb_08/dgb_08_3_npc.c +++ b/src/world/area_dgb/dgb_08/dgb_08_3_npc.c @@ -114,10 +114,10 @@ EvtScript N(EVS_NpcAI_Tubba) = { EVT_EXEC(N(EVS_SetPatrolAfterWaiting)) EVT_THREAD EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20F6, SOUND_PARAM_QUIET) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_HEAVY_NPC_STEP_C, SOUND_PARAM_QUIET) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(2.0)) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20F6, SOUND_PARAM_QUIET) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_HEAVY_NPC_STEP_C, SOUND_PARAM_QUIET) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 2, EVT_FLOAT(1.0)) EVT_WAIT(8) EVT_END_LOOP diff --git a/src/world/area_dgb/dgb_15/dgb_15_3_npc.c b/src/world/area_dgb/dgb_15/dgb_15_3_npc.c index 399a272e8d..27d6184893 100644 --- a/src/world/area_dgb/dgb_15/dgb_15_3_npc.c +++ b/src/world/area_dgb/dgb_15/dgb_15_3_npc.c @@ -77,7 +77,7 @@ EvtScript N(EVS_PlayFootstepFX) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_SELF, LVar3, LVar4, LVar5) EVT_IF_NE(LVar3, LVar6) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20F6, SOUND_PARAM_MUTE | SOUND_SPACE_FULL) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_HEAVY_NPC_STEP_C, SOUND_PARAM_MUTE | SOUND_SPACE_FULL) EVT_CALL(GetDist2D, LVarA, LVar0, LVar2, LVar3, LVar5) EVT_SWITCH(LVarA) EVT_CASE_LT(200) diff --git a/src/world/area_dgb/dgb_18/dgb_18_3_npc.c b/src/world/area_dgb/dgb_18/dgb_18_3_npc.c index e13e339db3..1bdd481fbc 100644 --- a/src/world/area_dgb/dgb_18/dgb_18_3_npc.c +++ b/src/world/area_dgb/dgb_18/dgb_18_3_npc.c @@ -62,7 +62,7 @@ EvtScript N(EVS_Scene_TubbaFallsAsleep) = { EVT_CALL(FadeOutMusic, 0, 500) EVT_LOOP(3) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_JoltAwake) - EVT_CALL(PlaySoundAt, SOUND_20F6, SOUND_SPACE_DEFAULT, 382, 0, 218) + EVT_CALL(PlaySoundAt, SOUND_HEAVY_NPC_STEP_C, SOUND_SPACE_DEFAULT, 382, 0, 218) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_WAIT(20) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) @@ -97,7 +97,7 @@ EvtScript N(EVS_Scene_TubbaFallsAsleep) = { EVT_END_LOOP EVT_THREAD EVT_LOOP(3) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20F6, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_HEAVY_NPC_STEP_C, SOUND_SPACE_DEFAULT) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.3)) EVT_WAIT(5) EVT_END_LOOP @@ -131,14 +131,14 @@ EvtScript N(EVS_Scene_TubbaFallsAsleep) = { EVT_IF_EQ(LVar0, 1) EVT_BREAK_LOOP EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20F6, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_HEAVY_NPC_STEP_C, SOUND_SPACE_DEFAULT) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.3)) EVT_WAIT(9) EVT_CALL(GetSelfVar, 0, LVar0) EVT_IF_EQ(LVar0, 1) EVT_BREAK_LOOP EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20F6, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_HEAVY_NPC_STEP_C, SOUND_SPACE_DEFAULT) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 2, EVT_FLOAT(0.15)) EVT_WAIT(12) EVT_END_LOOP diff --git a/src/world/area_dro/dro_01/npc_shop_owner.c b/src/world/area_dro/dro_01/npc_shop_owner.c index 8bde304fe9..7a82e821af 100644 --- a/src/world/area_dro/dro_01/npc_shop_owner.c +++ b/src/world/area_dro/dro_01/npc_shop_owner.c @@ -107,7 +107,7 @@ EvtScript N(EVS_NpcInteract_ShopOwner) = { EVT_RETURN EVT_END_IF EVT_END_IF - EVT_EXEC_WAIT(ItemShopInteract) + EVT_EXEC_WAIT(EVS_ShopOwnerDialog) EVT_EXEC_WAIT(N(EVS_LetterPrompt_ShopOwner)) EVT_IF_NE(LVarC, DELIVERY_NOT_POSSIBLE) EVT_RETURN diff --git a/src/world/area_dro/dro_02/npc_merlee.c b/src/world/area_dro/dro_02/npc_merlee.c index c0b857ef4c..a7a957145b 100644 --- a/src/world/area_dro/dro_02/npc_merlee.c +++ b/src/world/area_dro/dro_02/npc_merlee.c @@ -93,10 +93,10 @@ API_CALLABLE(N(TryEnchantPlayer)) { playerData->merleeTurnCount = rand_int(2) + 1; switch (rand_int(3)) { case 0: - playerData->merleeSpellType = MERLEE_SPELL_1; + playerData->merleeSpellType = MERLEE_SPELL_ATK_BOOST; break; case 1: - playerData->merleeSpellType = MERLEE_SPELL_2; + playerData->merleeSpellType = MERLEE_SPELL_DEF_BOOST; break; case 2: playerData->merleeSpellType = MERLEE_SPELL_EXP_BOOST; diff --git a/src/world/area_flo/flo_00/flo_00_3_npc.c b/src/world/area_flo/flo_00/flo_00_3_npc.c index bd2ff19f02..7cd5db41eb 100644 --- a/src/world/area_flo/flo_00/flo_00_3_npc.c +++ b/src/world/area_flo/flo_00/flo_00_3_npc.c @@ -12,7 +12,7 @@ NpcSettings N(NpcSettings_Dummy) = { #include "world/common/npc/StarSpirit.inc.c" API_CALLABLE(N(UpgradeStarPowerCh6)) { - set_max_SP(6); + set_max_star_power(6); gPlayerData.curHP = gPlayerData.curMaxHP; gPlayerData.curFP = gPlayerData.curMaxFP; sync_status_bar(); diff --git a/src/world/area_flo/flo_12/flo_12_3_npc.c b/src/world/area_flo/flo_12/flo_12_3_npc.c index 5f5cb0c4f7..00c5e1b2ae 100644 --- a/src/world/area_flo/flo_12/flo_12_3_npc.c +++ b/src/world/area_flo/flo_12/flo_12_3_npc.c @@ -81,7 +81,7 @@ EvtScript N(EVS_NpcInteract_Rosie) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Rosie_TakeOut) EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Rosie_IdleHold) - EVT_CALL(MakeItemEntity, ITEM_WATER_STONE, -33, 14, 19, ITEM_SPAWN_MODE_DECORATION, 0x00000564) + EVT_CALL(MakeItemEntity, ITEM_WATER_STONE, -33, 14, 19, ITEM_SPAWN_MODE_DECORATION, EVT_INDEX_OF_GAME_FLAG(GF_FLO12_HeldItemPickup)) EVT_WAIT(10) EVT_SWITCH(GF_FLO10_LilyRequestedWaterStone) EVT_CASE_EQ(0) diff --git a/src/world/area_flo/flo_21/flo_21_4_npc.c b/src/world/area_flo/flo_21/flo_21_4_npc.c index 1f8822b2b2..48732fee31 100644 --- a/src/world/area_flo/flo_21/flo_21_4_npc.c +++ b/src/world/area_flo/flo_21/flo_21_4_npc.c @@ -31,7 +31,7 @@ Vec3f N(Path_JumpOut)[] = { EvtScript N(EVS_PlayRumbleSounds) = { EVT_LABEL(0) - EVT_CALL(PlaySound, SOUND_20B6) + EVT_CALL(PlaySound, SOUND_HUFF_N_PUFF_JIGGLE) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15, EVT_FLOAT(1.0)) EVT_WAIT(15) EVT_GOTO(0) @@ -40,7 +40,7 @@ EvtScript N(EVS_PlayRumbleSounds) = { }; EvtScript N(EVS_HuffNPuff_JumpOut) = { - EVT_CALL(PlaySoundAtNpc, NPC_HuffNPuff_01, SOUND_03C0, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_HuffNPuff_01, SOUND_HUFF_N_PUFF_EMERGE, SOUND_SPACE_DEFAULT) EVT_PLAY_EFFECT(EFFECT_SHOCKWAVE, 3, 650, 104, 0) EVT_WAIT(15) EVT_CALL(SetNpcJumpscale, NPC_HuffNPuff_02, EVT_FLOAT(0.0)) @@ -316,7 +316,7 @@ EvtScript N(EVS_HuffNPuff_Defeat_AnimateScale) = { EVT_CHILD_THREAD EVT_USE_BUF(EVT_PTR(N(BeginAnimScaleX))) EVT_LOOP(ARRAY_COUNT(N(BeginAnimScaleX))) - EVT_CALL(PlaySoundAtNpc, NPC_HuffNPuff_01, SOUND_20B6, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_HuffNPuff_01, SOUND_HUFF_N_PUFF_JIGGLE, SOUND_SPACE_DEFAULT) EVT_BUF_READ3(LVar6, LVar7, LVar8) EVT_CALL(MakeLerp, LVar6, LVar7, LVar8, EASING_SIN_OUT) EVT_LOOP(0) @@ -333,7 +333,7 @@ EvtScript N(EVS_HuffNPuff_Defeat_AnimateScale) = { EVT_LOOP(0) EVT_USE_BUF(EVT_PTR(N(LoopAnimScaleX))) EVT_LOOP(ARRAY_COUNT(N(LoopAnimScaleX))) - EVT_CALL(PlaySoundAtNpc, NPC_HuffNPuff_01, SOUND_20B6, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_HuffNPuff_01, SOUND_HUFF_N_PUFF_JIGGLE, SOUND_SPACE_DEFAULT) EVT_BUF_READ2(LVar6, LVar7) EVT_CALL(MakeLerp, LVar6, LVar7, 4, EASING_SIN_OUT) EVT_LOOP(0) diff --git a/src/world/area_flo/flo_24/flo_24_2_main.c b/src/world/area_flo/flo_24/flo_24_2_main.c index 1d20c9bfbc..bac4f1e901 100644 --- a/src/world/area_flo/flo_24/flo_24_2_main.c +++ b/src/world/area_flo/flo_24/flo_24_2_main.c @@ -31,9 +31,9 @@ EvtScript N(EVS_Main) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o177, SURFACE_TYPE_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o178, SURFACE_TYPE_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o179, SURFACE_TYPE_DOCK_WALL) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o177, COLLIDER_FLAG_80000) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o178, COLLIDER_FLAG_80000) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o179, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o177, COLLIDER_FLAG_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o178, COLLIDER_FLAG_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o179, COLLIDER_FLAG_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o176, SURFACE_TYPE_WATER) EVT_FLOWER_SPAWN_REGION( -480, -350, -65, -260, 0) EVT_FLOWER_SPAWN_REGION( 100, -350, 480, -260, 0) diff --git a/src/world/area_gv/gv_01/gv_01_1_main.c b/src/world/area_gv/gv_01/gv_01_1_main.c index ec0ef91cac..63f8e08fca 100644 --- a/src/world/area_gv/gv_01/gv_01_1_main.c +++ b/src/world/area_gv/gv_01/gv_01_1_main.c @@ -157,7 +157,7 @@ EvtScript N(EVS_E8CA04) = { EvtScript N(EVS_Main) = { EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(ModifyGlobalOverrideFlags, 0, GLOBAL_OVERRIDES_20000) + EVT_CALL(ModifyGlobalOverrideFlags, 0, GLOBAL_OVERRIDES_DONT_RESUME_SONG_AFTER_BATTLE) EVT_SETUP_CAMERA_NO_LEAD() EVT_THREAD EVT_CALL(GetCurrentPartnerID, LVar0) diff --git a/src/world/area_hos/hos_03/hos_03_6_npc.c b/src/world/area_hos/hos_03/hos_03_6_npc.c index d70b7421dd..56b4cb26bb 100644 --- a/src/world/area_hos/hos_03/hos_03_6_npc.c +++ b/src/world/area_hos/hos_03/hos_03_6_npc.c @@ -133,7 +133,7 @@ EvtScript N(EVS_NpcInit_ToadHouseKeeper) = { }; EvtScript N(EVS_NpcInteract_ShopOwner) = { - EVT_EXEC_WAIT(ItemShopInteract) + EVT_EXEC_WAIT(EVS_ShopOwnerDialog) EVT_RETURN EVT_END }; diff --git a/src/world/area_hos/hos_05/hos_05_4_npc.c b/src/world/area_hos/hos_05/hos_05_4_npc.c index 45dc1e0c04..4fafdfa9f3 100644 --- a/src/world/area_hos/hos_05/hos_05_4_npc.c +++ b/src/world/area_hos/hos_05/hos_05_4_npc.c @@ -6,7 +6,7 @@ API_CALLABLE(N(UnlockStarBeam)) { gPlayerData.starBeamLevel = 1; gPlayerData.curHP = gPlayerData.curMaxHP; gPlayerData.curFP = gPlayerData.curMaxFP; - gPlayerData.specialBarsFilled = gPlayerData.maxStarPower * 256; + gPlayerData.starPower = gPlayerData.maxStarPower * SP_PER_BAR; sync_status_bar(); return ApiStatus_DONE2; } diff --git a/src/world/area_isk/isk_02/isk_02_2_lock.c b/src/world/area_isk/isk_02/isk_02_2_lock.c index c7ca72ea4c..e274ecd556 100644 --- a/src/world/area_isk/isk_02/isk_02_2_lock.c +++ b/src/world/area_isk/isk_02/isk_02_2_lock.c @@ -47,7 +47,7 @@ EvtScript N(EVS_SetupLock) = { EVT_BIND_PADLOCK(EVT_PTR(N(EVS_UnlockDoor)), TRIGGER_WALL_PRESS_A, EVT_ENTITY_INDEX(0), EVT_PTR(N(KeyList)), 0, 1) EVT_ELSE EVT_CALL(EnableGroup, MODEL_g304, FALSE) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittne, COLLIDER_FLAGS_SURFACE_TYPE_MASK | COLLIDER_FLAG_SAFE_FLOOR | COLLIDER_FLAG_IGNORE_SHELL | COLLIDER_FLAG_IGNORE_PLAYER | COLLIDER_FLAG_80000 | 0x7FF47E00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittne, COLLIDER_FLAGS_SURFACE_TYPE_MASK | COLLIDER_FLAG_SAFE_FLOOR | COLLIDER_FLAG_IGNORE_SHELL | COLLIDER_FLAG_IGNORE_PLAYER | COLLIDER_FLAG_DOCK_WALL | 0x7FF47E00) EVT_END_IF EVT_RETURN EVT_END diff --git a/src/world/area_isk/isk_11/isk_11_4_scene.c b/src/world/area_isk/isk_11/isk_11_4_scene.c index a7a1412199..7a70e91011 100644 --- a/src/world/area_isk/isk_11/isk_11_4_scene.c +++ b/src/world/area_isk/isk_11/isk_11_4_scene.c @@ -111,7 +111,7 @@ EvtScript N(EVS_ManageSecretPassage) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_WAIT(10 * DT) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2092, SOUND_LENS_FLARE, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2092, SOUND_LARGE_LENS_FLARE, SOUND_SPACE_DEFAULT) EVT_CALL(N(SpawnLensFlare), -16, -438, 510, 240) EVT_CALL(N(SpawnLensFlare), 16, -438, 510, 240) EVT_WAIT(5 * DT) diff --git a/src/world/area_isk/isk_11/isk_11_6_lock.c b/src/world/area_isk/isk_11/isk_11_6_lock.c index f729eb4502..9bbde336c8 100644 --- a/src/world/area_isk/isk_11/isk_11_6_lock.c +++ b/src/world/area_isk/isk_11/isk_11_6_lock.c @@ -47,7 +47,7 @@ EvtScript N(EVS_SetupLock) = { EVT_BIND_PADLOCK(EVT_PTR(N(EVS_UnlockPrompt_RuinsKey)), TRIGGER_WALL_PRESS_A, EVT_ENTITY_INDEX(0), EVT_PTR(N(ItemList_RuinsKey)), 0, 1) EVT_ELSE EVT_CALL(EnableGroup, MODEL_g374, FALSE) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittne, COLLIDER_FLAGS_SURFACE_TYPE_MASK | COLLIDER_FLAG_SAFE_FLOOR | COLLIDER_FLAG_IGNORE_SHELL | COLLIDER_FLAG_IGNORE_PLAYER | COLLIDER_FLAG_80000 | 0x7FF47E00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittne, COLLIDER_FLAGS_SURFACE_TYPE_MASK | COLLIDER_FLAG_SAFE_FLOOR | COLLIDER_FLAG_IGNORE_SHELL | COLLIDER_FLAG_IGNORE_PLAYER | COLLIDER_FLAG_DOCK_WALL | 0x7FF47E00) EVT_END_IF EVT_RETURN EVT_END diff --git a/src/world/area_isk/isk_16/isk_16_3_boss.c b/src/world/area_isk/isk_16/isk_16_3_boss.c index 4951a4a7b1..6912801a20 100644 --- a/src/world/area_isk/isk_16/isk_16_3_boss.c +++ b/src/world/area_isk/isk_16/isk_16_3_boss.c @@ -109,7 +109,7 @@ EvtScript N(EVS_Scene_TutankoopaAppears) = { EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_01, ANIM_Tutankoopa_Idle) EVT_THREAD EVT_WAIT(59) - EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_03EF, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_BOWSER_CHARGE_LIGHTNING, SOUND_SPACE_DEFAULT) EVT_END_THREAD EVT_CALL(SetNpcImgFXParams, NPC_Tutankoopa_01, IMGFX_SET_ALPHA, 255, 0, 0, 0) EVT_CALL(SetNpcImgFXFlags, NPC_Tutankoopa_01, IMGFX_FLAG_800) @@ -158,7 +158,7 @@ EvtScript N(EVS_Scene_TutankoopaDefeated) = { EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_01, ANIM_Tutankoopa_Hurt) EVT_CALL(SetNpcJumpscale, NPC_Tutankoopa_01, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_20E3, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_ACTOR_WITHER, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_Tutankoopa_01, 442, -910, 393, 30 * DT) EVT_CALL(PlaySoundAtNpc, NPC_Tutankoopa_01, SOUND_ACTOR_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_Tutankoopa_01, 416, -910, 420, 20 * DT) diff --git a/src/world/area_iwa/iwa_04/iwa_04_4_npc.c b/src/world/area_iwa/iwa_04/iwa_04_4_npc.c index fc6dab0546..8cb5229b04 100644 --- a/src/world/area_iwa/iwa_04/iwa_04_4_npc.c +++ b/src/world/area_iwa/iwa_04/iwa_04_4_npc.c @@ -17,7 +17,7 @@ API_CALLABLE(N(func_8024107C_91C95C)) { EvtScript N(EVS_FlapWingSounds) = { EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20EF, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BUZZAR_FLAP, SOUND_SPACE_DEFAULT) EVT_WAIT(16) EVT_END_LOOP EVT_RETURN diff --git a/src/world/area_iwa/iwa_10/iwa_10_4_train.c b/src/world/area_iwa/iwa_10/iwa_10_4_train.c index efa8a17694..4e80aa9f28 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_4_train.c +++ b/src/world/area_iwa/iwa_10/iwa_10_4_train.c @@ -191,7 +191,7 @@ EvtScript N(EVS_AnimateTrain) = { EVT_CALL(ScaleModel, MODEL_08, LVar1, LVar0, LVar1) EVT_END_IF EVT_IF_EQ(MF_TrainArriveDoorOpen, TRUE) - EVT_CALL(PlaySoundAt, SOUND_20A5, SOUND_SPACE_DEFAULT, -435, 84, 37) + EVT_CALL(PlaySoundAt, SOUND_TRAIN_DOOR_OPEN, SOUND_SPACE_DEFAULT, -435, 84, 37) EVT_SET(LVar8, 10) EVT_SET(LFlag1, TRUE) EVT_SET(MF_TrainArriveDoorOpen, FALSE) @@ -202,7 +202,7 @@ EvtScript N(EVS_AnimateTrain) = { EVT_SET(MF_TrainArrivePlayerDisembark, FALSE) EVT_END_IF EVT_IF_EQ(MF_TrainDepartDoorOpen, TRUE) - EVT_CALL(PlaySoundAt, SOUND_20A5, SOUND_SPACE_DEFAULT, -413, 84, 38) + EVT_CALL(PlaySoundAt, SOUND_TRAIN_DOOR_OPEN, SOUND_SPACE_DEFAULT, -413, 84, 38) EVT_SET(LVar8, 10) EVT_SET(LFlag2, TRUE) EVT_SET(MF_TrainDepartDoorOpen, FALSE) @@ -221,7 +221,7 @@ EvtScript N(EVS_AnimateTrain) = { EVT_IF_LE(LVar9, 0) EVT_SET(LVar9, 0) EVT_SET(LFlag1, FALSE) - EVT_CALL(PlaySoundAt, SOUND_20A6, SOUND_SPACE_DEFAULT, -435, 84, 37) + EVT_CALL(PlaySoundAt, SOUND_TRAIN_DOOR_CLOSE, SOUND_SPACE_DEFAULT, -435, 84, 37) EVT_END_IF EVT_END_IF EVT_IF_EQ(LFlag2, TRUE) @@ -233,7 +233,7 @@ EvtScript N(EVS_AnimateTrain) = { EVT_IF_LE(LVarA, 0) EVT_SET(LVarA, 0) EVT_SET(LFlag2, FALSE) - EVT_CALL(PlaySoundAt, SOUND_20A6, SOUND_SPACE_DEFAULT, -413, 84, 38) + EVT_CALL(PlaySoundAt, SOUND_TRAIN_DOOR_CLOSE, SOUND_SPACE_DEFAULT, -413, 84, 38) EVT_END_IF EVT_END_IF EVT_CALL(RotateModel, MODEL_omote, LVar9, 0, -1, 0) diff --git a/src/world/area_jan/jan_00/jan_00_2_npc.c b/src/world/area_jan/jan_00/jan_00_2_npc.c index 4caf276b70..b99d6c19a9 100644 --- a/src/world/area_jan/jan_00/jan_00_2_npc.c +++ b/src/world/area_jan/jan_00/jan_00_2_npc.c @@ -301,7 +301,7 @@ EvtScript N(D_80242FA8_B234E8) = { EVT_CALL(NpcMoveTo, NPC_Kolorado_02, LVar0, LVar2, 10) EVT_CALL(SetNpcAnimation, NPC_Kolorado_02, ANIM_Kolorado_Thrown) EVT_CALL(SetNpcJumpscale, NPC_Kolorado_02, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_Kolorado_02, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Kolorado_02, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_Kolorado_02, 224, 0, 20, 20) EVT_CALL(SetNpcAnimation, NPC_Kolorado_02, ANIM_Kolorado_Walk) EVT_CALL(NpcMoveTo, NPC_Kolorado_02, 290, 20, 20) @@ -346,7 +346,7 @@ EvtScript N(D_80242FA8_B234E8) = { EVT_CALL(InterpNpcYaw, NPC_Kolorado_02, 90, 4) EVT_WAIT(15) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Kolorado_02, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Kolorado_02, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(GetNpcPos, NPC_Kolorado_02, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_Kolorado_02, LVar0, LVar1, LVar2, 15) EVT_WAIT(25) @@ -461,7 +461,7 @@ EvtScript N(EVS_NpcInteract_Kolorado_01) = { EVT_CALL(func_80240B4C_B2108C, 2, LVar0, LVar1, LVar2) EVT_CALL(SetNpcAnimation, NPC_Kolorado_02, ANIM_Kolorado_Thrown) EVT_CALL(SetNpcJumpscale, NPC_Kolorado_02, EVT_FLOAT(0.5)) - EVT_CALL(PlaySoundAtNpc, NPC_Kolorado_02, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Kolorado_02, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_Kolorado_02, LVar0, LVar1, LVar2, 20) EVT_CALL(SetNpcAnimation, NPC_Kolorado_02, ANIM_Kolorado_Idle) EVT_CALL(InterpNpcYaw, NPC_Kolorado_02, 90, 0) diff --git a/src/world/area_jan/jan_03/jan_03_4_npc.c b/src/world/area_jan/jan_03/jan_03_4_npc.c index ee2ca9d5e6..5d585d100e 100644 --- a/src/world/area_jan/jan_03/jan_03_4_npc.c +++ b/src/world/area_jan/jan_03/jan_03_4_npc.c @@ -213,7 +213,7 @@ EvtScript N(EVS_NpcInit_Toad) = { }; EvtScript N(EVS_NpcInteract_Yoshi_01) = { - EVT_EXEC_WAIT(ItemShopInteract) + EVT_EXEC_WAIT(EVS_ShopOwnerDialog) EVT_RETURN EVT_END }; diff --git a/src/world/area_jan/jan_04/jan_04_2_main.c b/src/world/area_jan/jan_04/jan_04_2_main.c index 0eec368f63..5f4670afab 100644 --- a/src/world/area_jan/jan_04/jan_04_2_main.c +++ b/src/world/area_jan/jan_04/jan_04_2_main.c @@ -59,9 +59,9 @@ EvtScript N(EVS_Main) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o52, SURFACE_TYPE_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o53, SURFACE_TYPE_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o54, SURFACE_TYPE_DOCK_WALL) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o52, COLLIDER_FLAG_80000) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o53, COLLIDER_FLAG_80000) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o54, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o52, COLLIDER_FLAG_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o53, COLLIDER_FLAG_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o54, COLLIDER_FLAG_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1, SURFACE_TYPE_WATER) EVT_CALL(MakeTransformGroup, MODEL_g12) EVT_CALL(EnableTexPanning, MODEL_o61, TRUE) diff --git a/src/world/area_jan/jan_05/jan_05_2_main.c b/src/world/area_jan/jan_05/jan_05_2_main.c index 5281f21594..3d273406b7 100644 --- a/src/world/area_jan/jan_05/jan_05_2_main.c +++ b/src/world/area_jan/jan_05/jan_05_2_main.c @@ -27,8 +27,8 @@ EvtScript N(EVS_Main) = { EVT_EXEC(N(EVS_SetupBushes)) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o75, SURFACE_TYPE_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o77, SURFACE_TYPE_DOCK_WALL) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o75, COLLIDER_FLAG_80000) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o77, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o75, COLLIDER_FLAG_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o77, COLLIDER_FLAG_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1, SURFACE_TYPE_WATER) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_deiliw, SURFACE_TYPE_WATER) EVT_EXEC(N(EVS_SetupTrees)) diff --git a/src/world/area_jan/jan_06/jan_06_1_main.c b/src/world/area_jan/jan_06/jan_06_1_main.c index 9c490e1a2e..29a40af061 100644 --- a/src/world/area_jan/jan_06/jan_06_1_main.c +++ b/src/world/area_jan/jan_06/jan_06_1_main.c @@ -65,9 +65,9 @@ EvtScript N(EVS_Main) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o69, SURFACE_TYPE_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o71, SURFACE_TYPE_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o74, SURFACE_TYPE_DOCK_WALL) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o69, COLLIDER_FLAG_80000) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o71, COLLIDER_FLAG_80000) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o74, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o69, COLLIDER_FLAG_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o71, COLLIDER_FLAG_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o74, COLLIDER_FLAG_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1, SURFACE_TYPE_WATER) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o257, SURFACE_TYPE_WATER) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o258, SURFACE_TYPE_WATER) diff --git a/src/world/area_jan/jan_07/jan_07_3_npc.c b/src/world/area_jan/jan_07/jan_07_3_npc.c index 909f3eb4f6..0c18f59f1d 100644 --- a/src/world/area_jan/jan_07/jan_07_3_npc.c +++ b/src/world/area_jan/jan_07/jan_07_3_npc.c @@ -198,7 +198,7 @@ EvtScript N(EVS_NpcIdle_PutridPiranha) = { EVT_CALL(SetNpcRotation, NPC_PutridPiranha_01, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_20B1, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_PIRANHA_SPIN_1, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim01) EVT_WAIT(5) EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim04) @@ -208,7 +208,7 @@ EvtScript N(EVS_NpcIdle_PutridPiranha) = { EVT_CALL(SetNpcRotation, NPC_PutridPiranha_02, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_02, SOUND_20B1, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_02, SOUND_PIRANHA_SPIN_1, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim01) EVT_WAIT(5) EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim04) @@ -220,7 +220,7 @@ EvtScript N(EVS_NpcIdle_PutridPiranha) = { EVT_CALL(SetNpcRotation, NPC_PutridPiranha_02, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_20B2, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_PIRANHA_SPIN_2, SOUND_SPACE_DEFAULT) EVT_SET(LVar0, 0) EVT_LOOP(12) EVT_ADD(LVar0, 30) @@ -228,7 +228,7 @@ EvtScript N(EVS_NpcIdle_PutridPiranha) = { EVT_CALL(SetNpcRotation, NPC_PutridPiranha_02, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_20B2, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_PIRANHA_SPIN_2, SOUND_SPACE_DEFAULT) EVT_SET(LVar0, 0) EVT_LOOP(12) EVT_ADD(LVar0, 30) @@ -236,17 +236,17 @@ EvtScript N(EVS_NpcIdle_PutridPiranha) = { EVT_CALL(SetNpcRotation, NPC_PutridPiranha_02, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_20B2, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_PIRANHA_SPIN_2, SOUND_SPACE_DEFAULT) EVT_LOOP(3) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_20B3, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_PIRANHA_TENSE, SOUND_SPACE_DEFAULT) EVT_END_LOOP EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim05) EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim05) EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim06) EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim06) - EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_03B2, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_PIRANHA_CHOMP, SOUND_SPACE_DEFAULT) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(StartBossBattle, SONG_SPECIAL_BATTLE) EVT_RETURN diff --git a/src/world/area_jan/jan_08/jan_08_2_main.c b/src/world/area_jan/jan_08/jan_08_2_main.c index 35a2a9a345..28b0d64a52 100644 --- a/src/world/area_jan/jan_08/jan_08_2_main.c +++ b/src/world/area_jan/jan_08/jan_08_2_main.c @@ -24,8 +24,8 @@ EvtScript N(EVS_Main) = { EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o79, SURFACE_TYPE_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o81, SURFACE_TYPE_DOCK_WALL) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o79, COLLIDER_FLAG_80000) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o81, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o79, COLLIDER_FLAG_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o81, COLLIDER_FLAG_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1, SURFACE_TYPE_WATER) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_odeilie, SURFACE_TYPE_WATER) EVT_EXEC(N(EVS_SetupBushes)) diff --git a/src/world/area_jan/jan_09/jan_09_1_main.c b/src/world/area_jan/jan_09/jan_09_1_main.c index a054433c59..6fd9019847 100644 --- a/src/world/area_jan/jan_09/jan_09_1_main.c +++ b/src/world/area_jan/jan_09/jan_09_1_main.c @@ -48,8 +48,8 @@ EvtScript N(EVS_Main) = { EVT_EXEC(N(EVS_SetupBushes)) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o97, SURFACE_TYPE_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o99, SURFACE_TYPE_DOCK_WALL) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o97, COLLIDER_FLAG_80000) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o99, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o97, COLLIDER_FLAG_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o99, COLLIDER_FLAG_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1, SURFACE_TYPE_WATER) EVT_EXEC(N(EVS_SetupTrees)) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitw, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/area_jan/jan_10/jan_10_2_main.c b/src/world/area_jan/jan_10/jan_10_2_main.c index 7f800231d0..b14ee9b043 100644 --- a/src/world/area_jan/jan_10/jan_10_2_main.c +++ b/src/world/area_jan/jan_10/jan_10_2_main.c @@ -20,7 +20,7 @@ EvtScript N(EVS_Main) = { EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupLogs)) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o20, SURFACE_TYPE_DOCK_WALL) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o20, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o20, COLLIDER_FLAG_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1, SURFACE_TYPE_WATER) EVT_EXEC(N(EVS_SetupTrees)) EVT_EXEC(N(EVS_SetupBushes)) diff --git a/src/world/area_jan/jan_15/jan_15_2_npc.c b/src/world/area_jan/jan_15/jan_15_2_npc.c index ad4445cc9a..6093516a2f 100644 --- a/src/world/area_jan/jan_15/jan_15_2_npc.c +++ b/src/world/area_jan/jan_15/jan_15_2_npc.c @@ -78,7 +78,7 @@ EvtScript N(EVS_NpcIdle_PutridPiranha) = { EVT_CALL(SetNpcRotation, NPC_PutridPiranha_03, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_03, SOUND_03B1, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_03, SOUND_PIRANHA_SPIN, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_03, ANIM_LargePiranha_Putrid_Anim01) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim04) @@ -88,7 +88,7 @@ EvtScript N(EVS_NpcIdle_PutridPiranha) = { EVT_CALL(SetNpcRotation, NPC_PutridPiranha_01, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_20B1, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_PIRANHA_SPIN_1, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim01) EVT_WAIT(5) EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim04) @@ -98,7 +98,7 @@ EvtScript N(EVS_NpcIdle_PutridPiranha) = { EVT_CALL(SetNpcRotation, NPC_PutridPiranha_02, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_02, SOUND_20B1, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_02, SOUND_PIRANHA_SPIN_1, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim01) EVT_WAIT(5) EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim04) @@ -112,7 +112,7 @@ EvtScript N(EVS_NpcIdle_PutridPiranha) = { EVT_CALL(SetNpcRotation, NPC_PutridPiranha_03, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_20B2, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_PIRANHA_SPIN_2, SOUND_SPACE_DEFAULT) EVT_SET(LVar0, 0) EVT_LOOP(12) EVT_ADD(LVar0, 30) @@ -121,7 +121,7 @@ EvtScript N(EVS_NpcIdle_PutridPiranha) = { EVT_CALL(SetNpcRotation, NPC_PutridPiranha_03, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_20B2, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_PIRANHA_SPIN_2, SOUND_SPACE_DEFAULT) EVT_SET(LVar0, 0) EVT_LOOP(12) EVT_ADD(LVar0, 30) @@ -130,10 +130,10 @@ EvtScript N(EVS_NpcIdle_PutridPiranha) = { EVT_CALL(SetNpcRotation, NPC_PutridPiranha_03, 0, LVar0, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_20B2, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_PIRANHA_SPIN_2, SOUND_SPACE_DEFAULT) EVT_LOOP(3) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_20B3, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_PIRANHA_TENSE, SOUND_SPACE_DEFAULT) EVT_END_LOOP EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim05) EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim05) @@ -142,7 +142,7 @@ EvtScript N(EVS_NpcIdle_PutridPiranha) = { EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim06) EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim06) EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_03, ANIM_LargePiranha_Putrid_Anim06) - EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_03B2, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_PIRANHA_CHOMP, SOUND_SPACE_DEFAULT) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(StartBossBattle, SONG_SPECIAL_BATTLE) EVT_RETURN diff --git a/src/world/area_jan/jan_22/jan_22_3_npc.c b/src/world/area_jan/jan_22/jan_22_3_npc.c index 3519a9ec73..49a7d86624 100644 --- a/src/world/area_jan/jan_22/jan_22_3_npc.c +++ b/src/world/area_jan/jan_22/jan_22_3_npc.c @@ -25,7 +25,7 @@ enum { API_CALLABLE(N(UpgradeStarPowerCh5)) { PlayerData* playerData = &gPlayerData; - set_max_SP(5); + set_max_star_power(5); playerData->curHP = playerData->curMaxHP; playerData->curFP = playerData->curMaxFP; sync_status_bar(); @@ -865,7 +865,7 @@ EvtScript N(EVS_NpcIdle_Kolorado_After) = { EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0 / DT)) EVT_CALL(NpcMoveTo, NPC_SELF, 190, 60, 0) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.5)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 200, 0, 0, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) EVT_CALL(SetSelfVar, 0, 21) diff --git a/src/world/area_jan/jan_23/jan_23_3_npc.c b/src/world/area_jan/jan_23/jan_23_3_npc.c index 5ae910392c..4ee69fe403 100644 --- a/src/world/area_jan/jan_23/jan_23_3_npc.c +++ b/src/world/area_jan/jan_23/jan_23_3_npc.c @@ -257,11 +257,11 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(12.0)) EVT_LOOP(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0386, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BIG_DRUM_A, SOUND_SPACE_DEFAULT) EVT_CALL(SetCamDistance, CAM_DEFAULT, 310) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0387, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BIG_DRUM_B, SOUND_SPACE_DEFAULT) EVT_CALL(SetCamDistance, CAM_DEFAULT, 460) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) diff --git a/src/world/area_kkj/common/Searchlights.inc.c b/src/world/area_kkj/common/Searchlights.inc.c index 5b09e8ecaa..940815d078 100644 --- a/src/world/area_kkj/common/Searchlights.inc.c +++ b/src/world/area_kkj/common/Searchlights.inc.c @@ -43,7 +43,7 @@ API_CALLABLE(N(UnkPhysicsFunc)) { // required to match, has to be r r = dist2D(npc->pos.x, npc->pos.z, playerStatus->pos.x, playerStatus->pos.z); - channel = COLLISION_IGNORE_ENTITIES | COLLISION_CHANNEL_20000 | COLLISION_CHANNEL_10000 | COLLISION_CHANNEL_8000; + channel = COLLISION_IGNORE_ENTITIES | COLLIDER_FLAG_IGNORE_NPC | COLLIDER_FLAG_IGNORE_PLAYER | COLLIDER_FLAG_IGNORE_SHELL; if (npc_test_move_taller_with_slipping(channel, &x, &y, &z, r, atan2(npc->pos.x, npc->pos.z, playerStatus->pos.x, playerStatus->pos.z), npc->collisionDiameter, npc->collisionHeight)) diff --git a/src/world/area_kkj/kkj_13/kkj_13_4_npcs_intro.c b/src/world/area_kkj/kkj_13/kkj_13_4_npcs_intro.c index f9e108726e..2f7899aea2 100644 --- a/src/world/area_kkj/kkj_13/kkj_13_4_npcs_intro.c +++ b/src/world/area_kkj/kkj_13/kkj_13_4_npcs_intro.c @@ -18,7 +18,7 @@ EvtScript N(EVS_NpcIdle_BowserAwaitBattle) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(ModifyGlobalOverrideFlags, 1, GLOBAL_OVERRIDES_20000) + EVT_CALL(ModifyGlobalOverrideFlags, 1, GLOBAL_OVERRIDES_DONT_RESUME_SONG_AFTER_BATTLE) EVT_CALL(StartBossBattle, SONG_BOWSER_THEME) EVT_RETURN EVT_END diff --git a/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c b/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c index ccdc051ac0..2e5082a272 100644 --- a/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c +++ b/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c @@ -433,7 +433,7 @@ EvtScript N(EVS_Scene_BowserAttacks) = { EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Brandish) EVT_WAIT(10 * DT) EVT_CALL(FadeOutMusic, 0, 500) - EVT_CALL(PlaySoundAtNpc, NPC_Bowser_Body, SOUND_2121, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Bowser_Body, SOUND_BOWSER_STAR_ROD_USE, SOUND_SPACE_DEFAULT) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, 780, 95, 27, 1, 30) EVT_WAIT(40 * DT) EVT_THREAD @@ -444,7 +444,7 @@ EvtScript N(EVS_Scene_BowserAttacks) = { EVT_ADD(LVar2, 5) EVT_PLAY_EFFECT(EFFECT_LIGHTNING, 4, LVar0, LVar1, LVar2, 0, 0) EVT_THREAD - EVT_CALL(PlaySoundAtPlayer, SOUND_0390, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_TOSS_PLAYER, SOUND_SPACE_DEFAULT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Hurt) EVT_CALL(LoadPath, 30 * DT, EVT_PTR(N(PlayerThrownPath)), ARRAY_COUNT(N(PlayerThrownPath)), EASING_LINEAR) EVT_SET(LVar4, 0) diff --git a/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c b/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c index 7b9048389f..125fec80fc 100644 --- a/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c +++ b/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c @@ -16,11 +16,11 @@ API_CALLABLE(N(SetLightSourcePos)) { EvtScript N(EVS_PlaySounds_KoopaBrosShowOff) = { EVT_LOOP(0) - EVT_CALL(PlaySoundAt, SOUND_LENS_FLARE, SOUND_SPACE_DEFAULT, 100, 0, -40) + EVT_CALL(PlaySoundAt, SOUND_LARGE_LENS_FLARE, SOUND_SPACE_DEFAULT, 100, 0, -40) EVT_WAIT(30) - EVT_CALL(PlaySoundAt, SOUND_0356, SOUND_SPACE_DEFAULT, 100, 0, -40) + EVT_CALL(PlaySoundAt, SOUND_KOOPA_BROS_TOWER_SPIN_3, SOUND_SPACE_DEFAULT, 100, 0, -40) EVT_WAIT(60) - EVT_CALL(PlaySoundAt, SOUND_037C, SOUND_SPACE_DEFAULT, 100, 0, -40) + EVT_CALL(PlaySoundAt, SOUND_KOOPA_LAUNCH_SHELL, SOUND_SPACE_DEFAULT, 100, 0, -40) EVT_WAIT(30) EVT_END_LOOP EVT_RETURN @@ -184,7 +184,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_02, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_02, NPC_FLAG_FLYING, FALSE) EVT_CALL(NpcMoveTo, NPC_KoopaBros_02, 100, -40, 18) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_03E9, SOUND_PARAM_MUTE) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_KOOPA_BROS_LAND, SOUND_PARAM_MUTE) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 100, 0, -40, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_02, FALSE) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_IdleCrouch) @@ -198,7 +198,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_01, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_01, NPC_FLAG_FLYING, FALSE) EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, 128, -15, 18) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_03E9, SOUND_PARAM_MUTE) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_KOOPA_BROS_LAND, SOUND_PARAM_MUTE) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 128, 0, -15, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_01, FALSE) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_IdleCrouch) @@ -212,7 +212,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_03, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_03, NPC_FLAG_FLYING, FALSE) EVT_CALL(NpcMoveTo, NPC_KoopaBros_03, 140, -90, 18) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_03, SOUND_03E9, SOUND_PARAM_MUTE) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_03, SOUND_KOOPA_BROS_LAND, SOUND_PARAM_MUTE) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 140, 0, -90, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_03, FALSE) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_IdleCrouch) @@ -226,7 +226,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_04, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_04, NPC_FLAG_FLYING, FALSE) EVT_CALL(NpcMoveTo, NPC_KoopaBros_04, 168, -45, 18) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_04, SOUND_03E9, SOUND_PARAM_MUTE) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_04, SOUND_KOOPA_BROS_LAND, SOUND_PARAM_MUTE) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 168, 0, -45, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_04, FALSE) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_IdleCrouch) @@ -240,7 +240,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_WAIT(15) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_20F3, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_SMALL_LENS_FLARE, SOUND_SPACE_DEFAULT) EVT_CALL(GetNpcPos, NPC_KoopaBros_02, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_ADD(LVar1, 30) @@ -249,7 +249,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_20F3, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_SMALL_LENS_FLARE, SOUND_SPACE_DEFAULT) EVT_CALL(GetNpcPos, NPC_KoopaBros_01, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_ADD(LVar1, 30) @@ -258,7 +258,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_03, SOUND_20F3, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_03, SOUND_SMALL_LENS_FLARE, SOUND_SPACE_DEFAULT) EVT_CALL(GetNpcPos, NPC_KoopaBros_03, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_ADD(LVar1, 30) @@ -267,7 +267,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_04, SOUND_20F3, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_04, SOUND_SMALL_LENS_FLARE, SOUND_SPACE_DEFAULT) EVT_CALL(GetNpcPos, NPC_KoopaBros_04, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_ADD(LVar1, 30) diff --git a/src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c b/src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c index 9af612dd72..c38c863e43 100644 --- a/src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c +++ b/src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c @@ -253,19 +253,19 @@ EvtScript N(EVS_GourmetGuy_LovesCake) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(20.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_0381, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_GOURMET_GUY_SHOCK_1, SOUND_SPACE_DEFAULT) EVT_WAIT(33 * DT) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(65.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(7.5), EVT_FLOAT(-1.3)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_0382, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_GOURMET_GUY_SHOCK_2, SOUND_SPACE_DEFAULT) EVT_WAIT(33 * DT) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(3.5), 0) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_0383, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_GOURMET_GUY_SHOCK_3, SOUND_SPACE_DEFAULT) EVT_WAIT(18 * DT) EVT_CALL(SetMusicTrack, 0, SONG_GOURMET_GUY_FREAKOUT, 0, 8) EVT_WAIT(30 * DT) @@ -292,7 +292,7 @@ EvtScript N(EVS_GourmetGuy_LovesCake) = { }; EvtScript N(EVS_GourmetGuy_RunAround) = { - EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_0384, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_GOURMET_GUY_RUN, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Leap) EVT_CALL(SetNpcJumpscale, NPC_GourmetGuy, EVT_FLOAT(0.001953125)) EVT_CALL(GetNpcPos, NPC_GourmetGuy, LVar0, LVar1, LVar2) @@ -300,7 +300,7 @@ EvtScript N(EVS_GourmetGuy_RunAround) = { EVT_CALL(SetNpcAnimation, NPC_GourmetGuy, ANIM_GourmetGuy_Panic) EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcSpeed, NPC_GourmetGuy, EVT_FLOAT(20.0 / DT)) - EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_0384, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_GOURMET_GUY_RUN, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcRotation, NPC_GourmetGuy, 0, 0, -45) EVT_CALL(SetNpcYaw, NPC_GourmetGuy, 90) EVT_CALL(MakeLerp, 0, 100, 30, EASING_LINEAR) @@ -321,14 +321,14 @@ EvtScript N(EVS_GourmetGuy_RunAround) = { EVT_END_LOOP EVT_WAIT(20 * DT) EVT_CALL(SetNpcRotation, NPC_GourmetGuy, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_0384, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_GOURMET_GUY_RUN, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy, NPC_FLAG_UPSIDE_DOWN, TRUE) EVT_CALL(SetNpcYaw, NPC_GourmetGuy, 270) EVT_CALL(SetNpcPos, NPC_GourmetGuy, 250, 160, 50) EVT_CALL(NpcMoveTo, NPC_GourmetGuy, -100, 50, 0) EVT_CALL(SetNpcFlagBits, NPC_GourmetGuy, NPC_FLAG_UPSIDE_DOWN, FALSE) EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_0384, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_GourmetGuy, SOUND_GOURMET_GUY_RUN, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcYaw, NPC_GourmetGuy, 90) EVT_CALL(SetNpcPos, NPC_GourmetGuy, -100, 0, 70) EVT_CALL(NpcMoveTo, NPC_GourmetGuy, 140, 70, 0) diff --git a/src/world/area_kkj/kkj_23/kkj_23_5_scene.c b/src/world/area_kkj/kkj_23/kkj_23_5_scene.c index a3aedd363e..389cc98342 100644 --- a/src/world/area_kkj/kkj_23/kkj_23_5_scene.c +++ b/src/world/area_kkj/kkj_23/kkj_23_5_scene.c @@ -164,7 +164,7 @@ EvtScript N(EVS_RemoveDisguise) = { EVT_ADD(LVar1, 4) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAtPlayer, SOUND_2049, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_DARK_TOAD_DISPEL, SOUND_SPACE_DEFAULT) EVT_CALL(N(ForceDisguiseLoss)) EVT_LOOP(10) EVT_CALL(InterpPlayerYaw, LVar0, 0) @@ -289,7 +289,7 @@ EvtScript N(EVS_Scene_KammyUnmasksPeach) = { EVT_CALL(InterpNpcYaw, NPC_Koopatrol_01, 90, 5) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim05) EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim05, ANIM_WorldKammy_Anim05, 5, MSG_Peach_0154) - EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_207A, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_KAMMY_SUMMON_MAGIC, SOUND_SPACE_DEFAULT) EVT_CALL(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -20) EVT_ADD(LVar1, 40) diff --git a/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c b/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c index a7d26932f7..e1d5d32a1d 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c +++ b/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c @@ -29,7 +29,7 @@ EvtScript N(EVS_NpcIdle_Bowser) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_END_THREAD - EVT_CALL(ModifyGlobalOverrideFlags, 1, GLOBAL_OVERRIDES_20000) + EVT_CALL(ModifyGlobalOverrideFlags, 1, GLOBAL_OVERRIDES_DONT_RESUME_SONG_AFTER_BATTLE) EVT_CALL(StopSound, SOUND_LRAW_KPA_ARENA_TURN_ON) EVT_CALL(StartBossBattle, SONG_BOWSER_BATTLE) EVT_RETURN @@ -69,7 +69,7 @@ EvtScript N(EVS_NpcIdle_Kammy_Broom) = { EVT_WAIT(1) EVT_CALL(GetNpcPos, NPC_Peach_01, LVar0, LVar1, LVar2) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(ModifyGlobalOverrideFlags, 1, GLOBAL_OVERRIDES_20000) + EVT_CALL(ModifyGlobalOverrideFlags, 1, GLOBAL_OVERRIDES_DONT_RESUME_SONG_AFTER_BATTLE) EVT_CALL(StopSound, SOUND_LRAW_KPA_ARENA_ACTIVE) EVT_CALL(StartBossBattle, SONG_BOWSER_BATTLE) EVT_CALL(EnablePartnerAI) diff --git a/src/world/area_kkj/kkj_25/kkj_25_5_arena.c b/src/world/area_kkj/kkj_25/kkj_25_5_arena.c index 7577cb8fee..0503919b01 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_5_arena.c +++ b/src/world/area_kkj/kkj_25/kkj_25_5_arena.c @@ -364,7 +364,7 @@ EvtScript N(EVS_Scene_ActivateMachine) = { EVT_CALL(SetNpcAnimation, NPC_Kammy_01, ANIM_BattleKammy_Anim08) EVT_CALL(GetNpcPos, NPC_Kammy_01, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -30) - EVT_CALL(PlaySoundAt, SOUND_207A, SOUND_SPACE_DEFAULT, LVar0, 22, 0) + EVT_CALL(PlaySoundAt, SOUND_KAMMY_SUMMON_MAGIC, SOUND_SPACE_DEFAULT, LVar0, 22, 0) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, 22, 0, 1, 80) EVT_THREAD EVT_WAIT(80) diff --git a/src/world/area_kkj/kkj_25/kkj_25_6_peach_free.c b/src/world/area_kkj/kkj_25/kkj_25_6_peach_free.c index 22da52f562..3598cd0ab9 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_6_peach_free.c +++ b/src/world/area_kkj/kkj_25/kkj_25_6_peach_free.c @@ -141,7 +141,7 @@ EvtScript N(EVS_Scene_PeachBreaksFree) = { EVT_SET(LVar4, 3) EVT_CALL(N(SpawnStarsOrbitingKammy1)) EVT_SET(MV_OrbitingEffectAIdx, LVar0) - EVT_CALL(PlaySound, SOUND_20E5) + EVT_CALL(PlaySound, SOUND_KNOCKOUT_CHIRPING) EVT_WAIT(5) EVT_CALL(SetNpcAnimation, NPC_Kammy_02, ANIM_BattleKammy_Anim03) EVT_END_THREAD diff --git a/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c b/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c index 7a521fd689..e1ec77ffd5 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c +++ b/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c @@ -22,7 +22,7 @@ API_CALLABLE(N(UpgradeStarBeam)) { gPlayerData.starBeamLevel = 2; gPlayerData.curHP = gPlayerData.curMaxHP; gPlayerData.curFP = gPlayerData.curMaxFP; - gPlayerData.specialBarsFilled = gPlayerData.maxStarPower * 256; + gPlayerData.starPower = gPlayerData.maxStarPower * SP_PER_BAR; sync_status_bar(); return ApiStatus_DONE2; diff --git a/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c b/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c index 563e7ee72f..be5a3a65fb 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c +++ b/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c @@ -391,7 +391,7 @@ EvtScript N(EVS_Scene_BowserDefeated) = { EVT_CALL(SetCamDistance, CAM_DEFAULT, 750) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_WAIT(40) - EVT_CALL(PlaySoundAt, SOUND_203C, SOUND_SPACE_DEFAULT, 220, -43, 350) + EVT_CALL(PlaySoundAt, SOUND_KPA_ARENA_EXPLODING, SOUND_SPACE_DEFAULT, 220, -43, 350) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, 220, -43, 350, EVT_FLOAT(8.0), 40) EVT_SET(MV_DestructState, DESTRUCT_STATE_2) EVT_WAIT(50) @@ -418,7 +418,7 @@ EvtScript N(EVS_Scene_BowserDefeated) = { EVT_CALL(InterpNpcYaw, NPC_Bowser_03, 90, 0) EVT_WAIT(20) EVT_CALL(SpeakToPlayer, NPC_Bowser_03, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 512, MSG_CH8_00AD) - EVT_CALL(PlaySoundAt, SOUND_203C, SOUND_SPACE_DEFAULT, 370, -10, 180) + EVT_CALL(PlaySoundAt, SOUND_KPA_ARENA_EXPLODING, SOUND_SPACE_DEFAULT, 370, -10, 180) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, 370, -10, 180, EVT_FLOAT(6.0), 40) EVT_SET(MV_DestructState, DESTRUCT_STATE_3) EVT_WAIT(20) @@ -451,7 +451,7 @@ EvtScript N(EVS_Scene_BowserDefeated) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SpeakToNpc, NPC_Bowser_03, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 512, NPC_Kammy_05, MSG_CH8_00AE) EVT_WAIT(5) - EVT_CALL(PlaySoundAt, SOUND_203C, SOUND_SPACE_DEFAULT, 350, 50, -100) + EVT_CALL(PlaySoundAt, SOUND_KPA_ARENA_EXPLODING, SOUND_SPACE_DEFAULT, 350, 50, -100) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, 350, 50, -100, EVT_FLOAT(4.0), 20) EVT_SET(MV_DestructState, DESTRUCT_STATE_5) EVT_WAIT(25) @@ -463,7 +463,7 @@ EvtScript N(EVS_Scene_BowserDefeated) = { EVT_CALL(SetNpcAnimation, NPC_Bowser_03, ANIM_WorldBowser_Idle) EVT_END_THREAD EVT_THREAD - EVT_CALL(PlaySoundAt, SOUND_203C, SOUND_SPACE_DEFAULT, 570, 0, 100) + EVT_CALL(PlaySoundAt, SOUND_KPA_ARENA_EXPLODING, SOUND_SPACE_DEFAULT, 570, 0, 100) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, 570, 0, 100, EVT_FLOAT(4.0), 20) EVT_SET(MV_DestructState, DESTRUCT_STATE_6) EVT_END_THREAD diff --git a/src/world/area_kmr/kmr_02/kmr_02_5_entity.c b/src/world/area_kmr/kmr_02/kmr_02_5_entity.c index 6446c146c3..56fd40ecae 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_5_entity.c +++ b/src/world/area_kmr/kmr_02/kmr_02_5_entity.c @@ -66,11 +66,11 @@ EvtScript N(EVS_OnSmash_GateBlock) = { }; EvtScript N(EVS_SummonGateBlock) = { - EVT_CALL(PlaySoundAt, SOUND_207A, SOUND_SPACE_DEFAULT, 373, 88, 255) + EVT_CALL(PlaySoundAt, SOUND_KAMMY_SUMMON_MAGIC, SOUND_SPACE_DEFAULT, 373, 88, 255) EVT_CALL(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, 373, 88, 255, 1, 100) EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAt, SOUND_207B, SOUND_SPACE_DEFAULT, 326, 150, 261) + EVT_CALL(PlaySoundAt, SOUND_KAMMY_SUMMON_BLOCK, SOUND_SPACE_DEFAULT, 326, 150, 261) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, 326, 150, 261, 1, 60) EVT_WAIT(20 * DT) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, 326, 150, 261, 1, 60) @@ -94,14 +94,14 @@ EvtScript N(EVS_SummonGateBlock) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_207C, SOUND_SPACE_DEFAULT, LVar2, LVar0, LVar4) + EVT_CALL(PlaySoundAt, SOUND_KAMMY_RAISE_OBJECT, SOUND_SPACE_DEFAULT, LVar2, LVar0, LVar4) EVT_WAIT(20 * DT) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) EVT_THREAD EVT_WAIT(15) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar2, 0, LVar4, 0) EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_207D, SOUND_SPACE_DEFAULT, LVar2, LVar0, LVar4) + EVT_CALL(PlaySoundAt, SOUND_KAMMY_LOWER_OBJECT, SOUND_SPACE_DEFAULT, LVar2, LVar0, LVar4) EVT_CALL(MakeLerp, 300, 0, 20 * DT, EASING_CUBIC_IN) EVT_LABEL(20) EVT_CALL(UpdateLerp) diff --git a/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c b/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c index 7651fc17fe..0ec60129a4 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c +++ b/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c @@ -149,7 +149,7 @@ EvtScript N(EVS_Scene_KammyStrikes) = { EVT_END_IF EVT_KILL_THREAD(MV_Unk_04) EVT_KILL_THREAD(MV_Unk_05) - EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_032B, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_SKID, SOUND_SPACE_DEFAULT) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim10) EVT_WAIT(1) diff --git a/src/world/area_kmr/kmr_09/kmr_09_3_npc.c b/src/world/area_kmr/kmr_09/kmr_09_3_npc.c index aa58ea6784..98eebdd9fc 100644 --- a/src/world/area_kmr/kmr_09/kmr_09_3_npc.c +++ b/src/world/area_kmr/kmr_09/kmr_09_3_npc.c @@ -103,7 +103,7 @@ EvtScript N(EVS_NpcIdle_Goomba_Ambush) = { EVT_END_LOOP EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 0) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.6)) EVT_CALL(NpcJump0, NPC_SELF, -35, 0, 25, 23) diff --git a/src/world/area_kmr/kmr_11/kmr_11_3_scenes.c b/src/world/area_kmr/kmr_11/kmr_11_3_scenes.c index 42114e7803..1911d93ee5 100644 --- a/src/world/area_kmr/kmr_11/kmr_11_3_scenes.c +++ b/src/world/area_kmr/kmr_11/kmr_11_3_scenes.c @@ -35,7 +35,7 @@ EvtScript N(EVS_GoombaKingBlastoff) = { EVT_END_THREAD EVT_CALL(SetNpcJumpscale, NPC_GoombaKing, EVT_FLOAT(0.3)) EVT_CALL(NpcJump0, NPC_GoombaKing, -1600, 1000, -1600, 150) - EVT_CALL(PlaySoundAt, SOUND_LENS_FLARE, SOUND_SPACE_DEFAULT, -1600, 1000, -1600) + EVT_CALL(PlaySoundAt, SOUND_LARGE_LENS_FLARE, SOUND_SPACE_DEFAULT, -1600, 1000, -1600) EVT_CALL(N(MakeLensFlare), -1600, 1000, -1600, 40) EVT_CALL(SetNpcPos, NPC_GoombaKing, NPC_DISPOSE_LOCATION) EVT_CALL(RemoveNpc, NPC_GoombaKing) @@ -356,8 +356,8 @@ EvtScript N(EVS_Scene_MeetGoombaKing_Impl) = { EVT_GOTO(1) EVT_END_IF EVT_CALL(PlaySoundAtCollider, COLLIDER_tt, SOUND_METAL_DOOR_CLOSE, SOUND_SPACE_DEFAULT) - EVT_CALL(PlaySoundAt, SOUND_20EC, SOUND_SPACE_DEFAULT, -330, 0, -130) - EVT_CALL(PlaySoundAt, SOUND_20B4, SOUND_SPACE_DEFAULT, -330, 0, -130) + EVT_CALL(PlaySoundAt, SOUND_HEAVY_NPC_STEP_A, SOUND_SPACE_DEFAULT, -330, 0, -130) + EVT_CALL(PlaySoundAt, SOUND_HEAVY_NPC_STEP_B, SOUND_SPACE_DEFAULT, -330, 0, -130) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -725, 117, -137, 100) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -617, 108, -137, 100) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.5)) @@ -371,32 +371,32 @@ EvtScript N(EVS_Scene_MeetGoombaKing_Impl) = { EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH0_00C5) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_WAIT(40 * DT) - EVT_CALL(PlaySoundAt, SOUND_20EC, SOUND_SPACE_DEFAULT, -330, 0, -130) - EVT_CALL(PlaySoundAt, SOUND_20B4, SOUND_SPACE_DEFAULT, -330, 0, -130) + EVT_CALL(PlaySoundAt, SOUND_HEAVY_NPC_STEP_A, SOUND_SPACE_DEFAULT, -330, 0, -130) + EVT_CALL(PlaySoundAt, SOUND_HEAVY_NPC_STEP_B, SOUND_SPACE_DEFAULT, -330, 0, -130) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -725, 117, -137, 100) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -617, 108, -137, 100) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.2)) EVT_SET(LVar3, 2) EVT_EXEC(N(EVS_BouncePlayerAndPartner)) EVT_WAIT(60 * DT) - EVT_CALL(PlaySoundAt, SOUND_20EC, SOUND_SPACE_DEFAULT, -330, 0, -130) - EVT_CALL(PlaySoundAt, SOUND_20B4, SOUND_SPACE_DEFAULT, -330, 0, -130) + EVT_CALL(PlaySoundAt, SOUND_HEAVY_NPC_STEP_A, SOUND_SPACE_DEFAULT, -330, 0, -130) + EVT_CALL(PlaySoundAt, SOUND_HEAVY_NPC_STEP_B, SOUND_SPACE_DEFAULT, -330, 0, -130) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -725, 117, -137, 100) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -617, 108, -137, 100) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.6)) EVT_SET(LVar3, 4) EVT_EXEC(N(EVS_BouncePlayerAndPartner)) EVT_WAIT(60 * DT) - EVT_CALL(PlaySoundAt, SOUND_20EC, SOUND_SPACE_DEFAULT, -330, 0, -130) - EVT_CALL(PlaySoundAt, SOUND_20B4, SOUND_SPACE_DEFAULT, -330, 0, -130) + EVT_CALL(PlaySoundAt, SOUND_HEAVY_NPC_STEP_A, SOUND_SPACE_DEFAULT, -330, 0, -130) + EVT_CALL(PlaySoundAt, SOUND_HEAVY_NPC_STEP_B, SOUND_SPACE_DEFAULT, -330, 0, -130) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -725, 117, -137, 100) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -617, 108, -137, 100) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_SET(LVar3, 6) EVT_EXEC(N(EVS_BouncePlayerAndPartner)) EVT_WAIT(60 * DT) - EVT_CALL(PlaySoundAt, SOUND_20EC, SOUND_SPACE_DEFAULT, -330, 0, -130) - EVT_CALL(PlaySoundAt, SOUND_20B4, SOUND_SPACE_DEFAULT, -330, 0, -130) + EVT_CALL(PlaySoundAt, SOUND_HEAVY_NPC_STEP_A, SOUND_SPACE_DEFAULT, -330, 0, -130) + EVT_CALL(PlaySoundAt, SOUND_HEAVY_NPC_STEP_B, SOUND_SPACE_DEFAULT, -330, 0, -130) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -725, 117, -137, 100) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -617, 108, -137, 100) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.5)) @@ -423,8 +423,8 @@ EvtScript N(EVS_Scene_MeetGoombaKing_Impl) = { EVT_CALL(SetNpcPos, NPC_GoombaKing, -405, 0, -91) EVT_CALL(PlaySoundAtNpc, NPC_GoombaKing, SOUND_LARGE_ACTOR_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_GoombaKing, -419, 119, -91, 30 * DT) - EVT_CALL(PlaySoundAt, SOUND_20EC, SOUND_SPACE_DEFAULT, -330, 0, -130) - EVT_CALL(PlaySoundAt, SOUND_20B4, SOUND_SPACE_DEFAULT, -330, 0, -130) + EVT_CALL(PlaySoundAt, SOUND_HEAVY_NPC_STEP_A, SOUND_SPACE_DEFAULT, -330, 0, -130) + EVT_CALL(PlaySoundAt, SOUND_HEAVY_NPC_STEP_B, SOUND_SPACE_DEFAULT, -330, 0, -130) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -725, 117, -137, 100) EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, -617, 108, -137, 100) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(1.0)) diff --git a/src/world/area_kmr/kmr_12/kmr_12_3_npc.c b/src/world/area_kmr/kmr_12/kmr_12_3_npc.c index df7da35e66..feb7e33801 100644 --- a/src/world/area_kmr/kmr_12/kmr_12_3_npc.c +++ b/src/world/area_kmr/kmr_12/kmr_12_3_npc.c @@ -66,7 +66,7 @@ EvtScript N(EVS_NpcIdle_Goomba) = { EVT_CALL(SetNpcImgFXParams, NPC_SELF, IMGFX_SET_ANIM, IMGFX_ANIM_UNFURL, 1, 1, 0) EVT_WAIT(12) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.6)) EVT_CALL(NpcJump0, NPC_SELF, -35, 0, 30, 23) diff --git a/src/world/area_kmr/kmr_20/kmr_20_10_npc.c b/src/world/area_kmr/kmr_20/kmr_20_10_npc.c index 9c0850977e..b09cd5aa0f 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_10_npc.c +++ b/src/world/area_kmr/kmr_20/kmr_20_10_npc.c @@ -631,31 +631,31 @@ EvtScript N(EVS_NpcIdle_ShyGuy) = { EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 1) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim03) EVT_LOOP(0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 482, 0, -286, 15) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 726, 0, -153, 15) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 603, 0, 0, 15) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 557, 0, 130, 15) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 357, 0, 87, 15) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 344, 30, -8, 15) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 276, 138, 22, 15) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 360, 61, -117, 15) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 427, 55, -182, 15) EVT_WAIT(5) EVT_END_LOOP @@ -668,12 +668,12 @@ EvtScript N(EVS_NpcAI_ShyGuy) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim0C) EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim03) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203F, SOUND_SPACE_DEFAULT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SHY_GUY_RUN_AWAY, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 495, 0, -108, 15) EVT_WAIT(3) EVT_CALL(NpcMoveTo, NPC_SELF, 550, -170, 15) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 594, 30, -220, 15) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_ENTER_PIPE, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcImgFXFlags, NPC_SELF, IMGFX_FLAG_800) @@ -692,7 +692,7 @@ EvtScript N(EVS_NpcAI_ShyGuy) = { }; EvtScript N(EVS_NpcHit_ShyGuy) = { - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203E, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SHY_GUY_OUCH, SOUND_SPACE_DEFAULT) EVT_SET(GF_KMR20_ChasedOffShyGuy, TRUE) EVT_CALL(SetNpcVar, NPC_Luigi_1, 0, 1) EVT_WAIT(2) diff --git a/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c b/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c index 266097429f..2bceac9c81 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c +++ b/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c @@ -427,7 +427,7 @@ EvtScript N(EVS_Scene_SettingOff) = { EVT_WAIT(10 * DT) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_Jump) - EVT_CALL(PlaySoundAtNpc, NPC_Scene_Luigi, SOUND_JUMP_2081, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Scene_Luigi, SOUND_QUICK_PLAYER_JUMP, SOUND_SPACE_DEFAULT) EVT_WAIT(7 * DT) EVT_WAIT(7 * DT) EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_Idle) diff --git a/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c b/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c index 97a5643f0b..592dbd1303 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c +++ b/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c @@ -234,7 +234,7 @@ EvtScript N(EVS_Scene_EpilogueGetLetter) = { EVT_CALL(NpcJump0, NPC_Luigi_1, 180, 30, -20, 10) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Jump) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_JUMP_2081, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_QUICK_PLAYER_JUMP, SOUND_SPACE_DEFAULT) EVT_WAIT(5) EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Fall) EVT_WAIT(5) @@ -312,7 +312,7 @@ EvtScript N(EVS_Scene_EpilogueGetLetter) = { EVT_WAIT(10) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Jump) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_JUMP_2081, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_QUICK_PLAYER_JUMP, SOUND_SPACE_DEFAULT) EVT_WAIT(7) EVT_WAIT(7) EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Idle) diff --git a/src/world/area_kmr/kmr_20/kmr_20_4_documents.c b/src/world/area_kmr/kmr_20/kmr_20_4_documents.c index 2c64686afb..a20809220e 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_4_documents.c +++ b/src/world/area_kmr/kmr_20/kmr_20_4_documents.c @@ -470,7 +470,7 @@ EvtScript N(EVS_Shake_Mailbox) = { EvtScript N(EVS_SecretPanel_Flip) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o252, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o252, SOUND_20AB, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o252, SOUND_FLIP_PANEL, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, 0, 2160, 60, EASING_QUADRATIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -480,7 +480,7 @@ EvtScript N(EVS_SecretPanel_Flip) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_o252, SOUND_20AC, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o252, SOUND_CLOSE_PANEL, SOUND_SPACE_DEFAULT) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o252, COLLIDER_FLAGS_UPPER_MASK) EVT_RETURN EVT_END diff --git a/src/world/area_kmr/kmr_20/kmr_20_5_entity.c b/src/world/area_kmr/kmr_20/kmr_20_5_entity.c index efe0d15e4d..ec56a77656 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_5_entity.c +++ b/src/world/area_kmr/kmr_20/kmr_20_5_entity.c @@ -10,7 +10,7 @@ API_CALLABLE(N(SetAmbienceVolumeHalf_Entity)){ EvtScript N(EVS_SecretPanel_FlipBack) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o252, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o252, SOUND_20AB, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o252, SOUND_FLIP_PANEL, SOUND_SPACE_DEFAULT) EVT_CALL(N(SetAmbienceVolumeHalf_Entity)) EVT_CALL(MakeLerp, 0, -2160, 60, EASING_QUADRATIC_OUT) EVT_LOOP(0) @@ -21,7 +21,7 @@ EvtScript N(EVS_SecretPanel_FlipBack) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_o252, SOUND_20AC, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o252, SOUND_CLOSE_PANEL, SOUND_SPACE_DEFAULT) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o252, COLLIDER_FLAGS_UPPER_MASK) EVT_RETURN EVT_END diff --git a/src/world/area_kmr/kmr_23/kmr_23_2_npc.c b/src/world/area_kmr/kmr_23/kmr_23_2_npc.c index 9516be0d45..5782ddfaa2 100644 --- a/src/world/area_kmr/kmr_23/kmr_23_2_npc.c +++ b/src/world/area_kmr/kmr_23/kmr_23_2_npc.c @@ -389,14 +389,14 @@ API_CALLABLE(N(func_80240CA8_9086D8)) { API_CALLABLE(N(ShowMessagesInFrontOfCurtains)) { EndChapter* data = (EndChapter*) evt_get_variable(NULL, MV_EndChapterDataPtr); data->unk1E = TRUE; - gOverrideFlags |= GLOBAL_OVERRIDES_MESSAGES_IN_FRONT_OF_CURTAINS; + gOverrideFlags |= GLOBAL_OVERRIDES_MESSAGES_OVER_CURTAINS; return ApiStatus_DONE2; } API_CALLABLE(N(ShowMessagesBehindCurtains)) { EndChapter* data = (EndChapter*) evt_get_variable(NULL, MV_EndChapterDataPtr); data->unk1E = FALSE; - gOverrideFlags &= ~GLOBAL_OVERRIDES_MESSAGES_IN_FRONT_OF_CURTAINS; + gOverrideFlags &= ~GLOBAL_OVERRIDES_MESSAGES_OVER_CURTAINS; return ApiStatus_DONE2; } diff --git a/src/world/area_kpa/kpa_133/kpa_133_5_water.c b/src/world/area_kpa/kpa_133/kpa_133_5_water.c index 3d17c4a3b7..259394f905 100644 --- a/src/world/area_kpa/kpa_133/kpa_133_5_water.c +++ b/src/world/area_kpa/kpa_133/kpa_133_5_water.c @@ -19,7 +19,7 @@ EvtScript N(EVS_SetWaterLevel) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o418, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o414, SURFACE_TYPE_DOCK_WALL) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o414, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o414, COLLIDER_FLAG_DOCK_WALL) EVT_CASE_EQ(2) EVT_CALL(TranslateGroup, MODEL_suimen, 0, 220, 0) EVT_CALL(EnableModel, MODEL_sui, FALSE) @@ -28,8 +28,8 @@ EvtScript N(EVS_SetWaterLevel) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_kabe_2, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o418, SURFACE_TYPE_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o440, SURFACE_TYPE_DOCK_WALL) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o418, COLLIDER_FLAG_80000) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o440, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o418, COLLIDER_FLAG_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o440, COLLIDER_FLAG_DOCK_WALL) EVT_END_SWITCH EVT_RETURN EVT_END diff --git a/src/world/area_kpa/kpa_134/kpa_134_3_chains.c b/src/world/area_kpa/kpa_134/kpa_134_3_chains.c index edc7d84d9e..da7204d74c 100644 --- a/src/world/area_kpa/kpa_134/kpa_134_3_chains.c +++ b/src/world/area_kpa/kpa_134/kpa_134_3_chains.c @@ -28,7 +28,7 @@ EvtScript N(EVS_SetupChains) = { EVT_CALL(TranslateModel, MODEL_o385, 0, 120, 0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_deiliaw, SURFACE_TYPE_DOCK_WALL) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliaw, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliaw, COLLIDER_FLAG_DOCK_WALL) EVT_CASE_EQ(2) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_hidari, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(EnableModel, MODEL_o385, FALSE) @@ -280,7 +280,7 @@ EvtScript N(EVS_RaiseWaterLevel1) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deiliaw, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliaw, COLLIDER_FLAG_IGNORE_SHELL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_deiliaw, SURFACE_TYPE_DOCK_WALL) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliaw, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliaw, COLLIDER_FLAG_DOCK_WALL) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(DisablePlayerInput, FALSE) EVT_THREAD diff --git a/src/world/area_kpa/kpa_17/kpa_17_4_npc.c b/src/world/area_kpa/kpa_17/kpa_17_4_npc.c index cbd64f6f00..b82a009c9d 100644 --- a/src/world/area_kpa/kpa_17/kpa_17_4_npc.c +++ b/src/world/area_kpa/kpa_17/kpa_17_4_npc.c @@ -30,7 +30,7 @@ EvtScript N(EVS_Scene_FallIntoCell) = { EVT_WAIT(1) EVT_IF_LE(LVar1, 30) EVT_CALL(SetPlayerPos, LVar0, 30, LVar2) - EVT_CALL(PlaySoundAtPlayer, SOUND_03FB, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_PLAYER_COLLAPSE, SOUND_SPACE_DEFAULT) EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP diff --git a/src/world/area_kpa/kpa_53/kpa_53_3_npc.c b/src/world/area_kpa/kpa_53/kpa_53_3_npc.c index 644668e6b7..09fa1daa87 100644 --- a/src/world/area_kpa/kpa_53/kpa_53_3_npc.c +++ b/src/world/area_kpa/kpa_53/kpa_53_3_npc.c @@ -71,7 +71,7 @@ EvtScript N(EVS_NpcAI_Duplighost_Caught) = { EVT_WAIT(5) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Follower, SOUND_20B8, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Follower, SOUND_GHOST_TRANSFORM, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, 0, 1440, 20, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) diff --git a/src/world/area_kpa/kpa_83/kpa_83_3_npc.c b/src/world/area_kpa/kpa_83/kpa_83_3_npc.c index e258dc6d0a..3e597465cd 100644 --- a/src/world/area_kpa/kpa_83/kpa_83_3_npc.c +++ b/src/world/area_kpa/kpa_83/kpa_83_3_npc.c @@ -201,7 +201,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosRed, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosRed, NPC_FLAG_FLYING, FALSE) EVT_CALL(NpcMoveTo, NPC_KoopaBrosRed, 20, 160, 20) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosRed, SOUND_03E9, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosRed, SOUND_KOOPA_BROS_LAND, SOUND_SPACE_DEFAULT) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 20, 0, 160, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBrosRed, FALSE) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_IdleCrouch) @@ -216,7 +216,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosBlk, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosBlk, NPC_FLAG_FLYING, FALSE) EVT_CALL(NpcMoveTo, NPC_KoopaBrosBlk, 48, 185, 20) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosBlk, SOUND_03E9, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosBlk, SOUND_KOOPA_BROS_LAND, SOUND_SPACE_DEFAULT) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 48, 0, 185, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBrosBlk, FALSE) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlk, ANIM_KoopaBros_Black_IdleCrouch) @@ -231,7 +231,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosYlw, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosYlw, NPC_FLAG_FLYING, FALSE) EVT_CALL(NpcMoveTo, NPC_KoopaBrosYlw, 60, 110, 20) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosYlw, SOUND_03E9, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosYlw, SOUND_KOOPA_BROS_LAND, SOUND_SPACE_DEFAULT) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 60, 0, 110, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBrosYlw, FALSE) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYlw, ANIM_KoopaBros_Yellow_IdleCrouch) @@ -246,7 +246,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosGrn, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_KoopaBrosGrn, NPC_FLAG_FLYING, FALSE) EVT_CALL(NpcMoveTo, NPC_KoopaBrosGrn, 88, 155, 20) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosGrn, SOUND_03E9, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosGrn, SOUND_KOOPA_BROS_LAND, SOUND_SPACE_DEFAULT) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 88, 0, 155, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBrosGrn, FALSE) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGrn, ANIM_KoopaBros_Green_IdleCrouch) @@ -259,7 +259,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_ADD(LVar0, 5) EVT_ADD(LVar1, 30) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosRed, SOUND_20F3, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosRed, SOUND_SMALL_LENS_FLARE, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_ThumbsUp) EVT_END_THREAD EVT_THREAD @@ -268,7 +268,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_ADD(LVar0, 5) EVT_ADD(LVar1, 30) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosBlk, SOUND_20F3, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosBlk, SOUND_SMALL_LENS_FLARE, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlk, ANIM_KoopaBros_Black_ThumbsUp) EVT_END_THREAD EVT_THREAD @@ -277,7 +277,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_ADD(LVar0, 5) EVT_ADD(LVar1, 30) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosYlw, SOUND_20F3, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosYlw, SOUND_SMALL_LENS_FLARE, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYlw, ANIM_KoopaBros_Yellow_ThumbsUp) EVT_END_THREAD EVT_THREAD @@ -286,7 +286,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_ADD(LVar0, 5) EVT_ADD(LVar1, 30) EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosGrn, SOUND_20F3, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBrosGrn, SOUND_SMALL_LENS_FLARE, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGrn, ANIM_KoopaBros_Green_ThumbsUp) EVT_END_THREAD EVT_WAIT(45) diff --git a/src/world/area_kpa/kpa_96/kpa_96_3_npc.c b/src/world/area_kpa/kpa_96/kpa_96_3_npc.c index 7dc3263697..40bddea89f 100644 --- a/src/world/area_kpa/kpa_96/kpa_96_3_npc.c +++ b/src/world/area_kpa/kpa_96/kpa_96_3_npc.c @@ -128,7 +128,7 @@ EvtScript N(EVS_NpcInteract_SpikedGoomba) = { EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_SpikedGoomba_Walk, ANIM_SpikedGoomba_Idle, 0, MSG_CH8_0050) EVT_END_IF EVT_ELSE - EVT_EXEC_WAIT(ItemShopInteract) + EVT_EXEC_WAIT(EVS_ShopOwnerDialog) EVT_END_IF EVT_RETURN EVT_END diff --git a/src/world/area_kzn/kzn_02/kzn_02_3_npc.c b/src/world/area_kzn/kzn_02/kzn_02_3_npc.c index dcdfa3834e..0bec27df23 100644 --- a/src/world/area_kzn/kzn_02/kzn_02_3_npc.c +++ b/src/world/area_kzn/kzn_02/kzn_02_3_npc.c @@ -48,7 +48,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Thrown) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, -655, 20, 0, 20) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Yell) EVT_CALL(NpcJump0, NPC_SELF, -645, 20, 0, 5) @@ -99,7 +99,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Fallen) EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 2) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, -760, 50, -40, 10) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) EVT_WAIT(4) @@ -108,7 +108,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Fallen) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 2) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, -760, 40, -40, 10) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) EVT_WAIT(4) diff --git a/src/world/area_kzn/kzn_03/kzn_03_2_npc.c b/src/world/area_kzn/kzn_03/kzn_03_2_npc.c index 278d2c9bfe..ec8911e110 100644 --- a/src/world/area_kzn/kzn_03/kzn_03_2_npc.c +++ b/src/world/area_kzn/kzn_03/kzn_03_2_npc.c @@ -61,7 +61,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(GetNpcPos, NPC_SELF, LVar3, LVar4, LVar5) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.5)) EVT_LABEL(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, LVar3, LVar4, LVar5, 9) EVT_CALL(GetSelfVar, 0, LVar0) EVT_IF_EQ(LVar0, 1) @@ -95,7 +95,7 @@ EvtScript N(EVS_NpcInteract_Kolorado) = { EVT_CALL(GetNpcPos, NPC_SELF, LVar3, LVar4, LVar5) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.5)) EVT_LABEL(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, LVar3, LVar4, LVar5, 9) EVT_CALL(GetSelfVar, 0, LVar0) EVT_IF_EQ(LVar0, 1) diff --git a/src/world/area_kzn/kzn_09/kzn_09_4_npc.c b/src/world/area_kzn/kzn_09/kzn_09_4_npc.c index 2aeb32b3a1..0a9ee04665 100644 --- a/src/world/area_kzn/kzn_09/kzn_09_4_npc.c +++ b/src/world/area_kzn/kzn_09/kzn_09_4_npc.c @@ -80,7 +80,7 @@ EvtScript N(EVS_Scene_KoloradoFallsDown) = { EVT_THREAD EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.5)) EVT_LABEL(1) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, -410, 870, -15, 10 * DT) EVT_CALL(GetSelfVar, 0, LVar0) EVT_IF_NE(LVar0, 1) @@ -108,11 +108,11 @@ EvtScript N(EVS_Scene_KoloradoFallsDown) = { EVT_SET(LVar3, -350) EVT_SET(LVar4, 870) EVT_SET(LVar5, -15) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, LVar3, LVar4, LVar5, 10 * DT) EVT_ADD(LVar3, 90) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Thrown) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, LVar3, LVar4, LVar5, 10 * DT) EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) EVT_CALL(SetSelfVar, 0, 1) diff --git a/src/world/area_kzn/kzn_18/kzn_18_2_npc.c b/src/world/area_kzn/kzn_18/kzn_18_2_npc.c index 8bf4036cfe..300b8a9dea 100644 --- a/src/world/area_kzn/kzn_18/kzn_18_2_npc.c +++ b/src/world/area_kzn/kzn_18/kzn_18_2_npc.c @@ -57,7 +57,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_THREAD EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 10 * DT) EVT_CALL(SetNpcYaw, NPC_SELF, 90) EVT_SET(MV_KoloradoJumpDone, TRUE) diff --git a/src/world/area_kzn/kzn_19/kzn_19_4_npc.c b/src/world/area_kzn/kzn_19/kzn_19_4_npc.c index cafbe9120d..38c3803b5c 100644 --- a/src/world/area_kzn/kzn_19/kzn_19_4_npc.c +++ b/src/world/area_kzn/kzn_19/kzn_19_4_npc.c @@ -303,7 +303,7 @@ EvtScript N(EVS_NpcIdle_LavaPiranha) = { EVT_CALL(PlayerMoveTo, 200, -30, 0) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_03C5, SOUND_SPACE_DEFAULT, 330, 25, -50) + EVT_CALL(PlaySoundAt, SOUND_LAVA_PIRANHA_EMERGE, SOUND_SPACE_DEFAULT, 330, 25, -50) EVT_EXEC(N(EVS_PlayVinesAnim_Emerge)) EVT_WAIT(59) EVT_THREAD @@ -558,7 +558,7 @@ EvtScript N(EVS_NpcDefeat_LavaPiranha) = { EVT_CALL(EnableGroup, MODEL_mae, FALSE) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_ato, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_mae, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySoundAt, SOUND_03C6, SOUND_SPACE_DEFAULT, 330, 25, -50) + EVT_CALL(PlaySoundAt, SOUND_LAVA_PIRANHA_DEFEAT, SOUND_SPACE_DEFAULT, 330, 25, -50) EVT_EXEC(N(EVS_PlayVinesAnim_Defeat)) EVT_WAIT(1) EVT_CALL(SetNpcAux, NPC_SELF, EVT_PTR(N(EVS_NpcAux_LavaPiranha))) diff --git a/src/world/area_kzn/kzn_20/kzn_20_3_npc.c b/src/world/area_kzn/kzn_20/kzn_20_3_npc.c index 5035db12d1..44452e523b 100644 --- a/src/world/area_kzn/kzn_20/kzn_20_3_npc.c +++ b/src/world/area_kzn/kzn_20/kzn_20_3_npc.c @@ -187,9 +187,9 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) EVT_CALL(SetNpcPos, NPC_SELF, -30, 100, 40) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, -25, 125, -20, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 20, 150, 5, 10) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) EVT_CALL(NpcMoveTo, NPC_SELF, 40, 35, 0) @@ -214,7 +214,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) EVT_CALL(NpcMoveTo, NPC_SELF, 20, 0, 0) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, -35, 125, -20, 12) EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(1.0)) @@ -254,11 +254,11 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.0)) EVT_SET(MV_SceneState, SCENE_STATE_KOLORADO_WENT_BACK) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, -30, 100, 40, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, -15, 75, 80, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 35, 50, 120, 10) EVT_CASE_EQ(SCENE_STATE_KOLORADO_WARNED) EVT_CALL(N(func_80240A68_C96998)) @@ -299,9 +299,9 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Walk) EVT_CALL(SetNpcPos, NPC_SELF, -30, 100, 40) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, -25, 125, -20, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 20, 150, 5, 8) EVT_SET(MV_SceneState, SCENE_STATE_SEARCH_FOR_EXIT) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) diff --git a/src/world/area_kzn/kzn_22/kzn_22_4_npc.c b/src/world/area_kzn/kzn_22/kzn_22_4_npc.c index 8e07041ca8..6af8c485a9 100644 --- a/src/world/area_kzn/kzn_22/kzn_22_4_npc.c +++ b/src/world/area_kzn/kzn_22/kzn_22_4_npc.c @@ -50,7 +50,7 @@ EVT_END_IF //@bug unmatched endif // repeatedly jump for the treasure chest EVT_LABEL(1) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 15) EVT_IF_EQ(AF_KZN23_GrabbedKolorado, FALSE) EVT_WAIT(1) diff --git a/src/world/area_mac/mac_00/mac_00_2_main.c b/src/world/area_mac/mac_00/mac_00_2_main.c index 6e9fb933d4..5392702b70 100644 --- a/src/world/area_mac/mac_00/mac_00_2_main.c +++ b/src/world/area_mac/mac_00/mac_00_2_main.c @@ -105,9 +105,9 @@ EvtScript N(EVS_Main) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_op_1, SURFACE_TYPE_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_op2, SURFACE_TYPE_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_op3, SURFACE_TYPE_DOCK_WALL) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_op_1, COLLIDER_FLAG_80000) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_op2, COLLIDER_FLAG_80000) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_op3, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_op_1, COLLIDER_FLAG_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_op2, COLLIDER_FLAG_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_op3, COLLIDER_FLAG_DOCK_WALL) EVT_CALL(N(DummyColliderFunction), COLLIDER_op_1) EVT_CALL(N(DummyColliderFunction), COLLIDER_op2) EVT_CALL(N(DummyColliderFunction), COLLIDER_op3) diff --git a/src/world/area_mac/mac_00/mac_00_5_npc.c b/src/world/area_mac/mac_00/mac_00_5_npc.c index 20d25d2dca..53ec20da21 100644 --- a/src/world/area_mac/mac_00/mac_00_5_npc.c +++ b/src/world/area_mac/mac_00/mac_00_5_npc.c @@ -23,7 +23,7 @@ EvtScript N(EVS_NpcAI_ShyGuy_03) = { EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_ShyGuy_02, ANIM_ShyGuy_Red_Anim03) EVT_CALL(SetNpcJumpscale, NPC_ShyGuy_02, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_02, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_02, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_ShyGuy_02, 400, 20, -300, 20) EVT_CALL(NpcFacePlayer, NPC_ShyGuy_02, 0) EVT_WAIT(10) @@ -37,7 +37,7 @@ EvtScript N(EVS_NpcAI_ShyGuy_03) = { EVT_CALL(PlayerMoveTo, 410, -340, 0) EVT_END_THREAD EVT_SET(LVar0, 22) - EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_203F, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_SHY_GUY_RUN_AWAY, SOUND_SPACE_DEFAULT) EVT_EXEC_GET_TID(N(EVS_ShyGuy_PlayRunningSounds), LVarA) EVT_CALL(SetNpcSpeed, NPC_ShyGuy_02, EVT_FLOAT(8.0)) EVT_CALL(NpcMoveTo, NPC_ShyGuy_02, 170, -140, 0) @@ -89,7 +89,7 @@ EvtScript N(EVS_NpcHit_ShyGuy_03) = { EVT_RETURN EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_HIT_PLAYER_NORMAL, SOUND_SPACE_DEFAULT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203E, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SHY_GUY_OUCH, SOUND_SPACE_DEFAULT) EVT_SET(GF_MAC00_ShyGuyChasedFromShop, TRUE) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(SetEnemyFlagBits, NPC_ShyGuy_02, ENEMY_FLAG_CANT_INTERACT, 1) @@ -143,7 +143,7 @@ EvtScript N(EVS_NpcInit_GardenShyGuy1) = { }; EvtScript N(EVS_NpcInteract_Toad_01) = { - EVT_EXEC_WAIT(ItemShopInteract) + EVT_EXEC_WAIT(EVS_ShopOwnerDialog) EVT_RETURN EVT_END }; diff --git a/src/world/area_mac/mac_00/npc/russ_and_thief.inc.c b/src/world/area_mac/mac_00/npc/russ_and_thief.inc.c index ca6600dd91..e0626e3f1d 100644 --- a/src/world/area_mac/mac_00/npc/russ_and_thief.inc.c +++ b/src/world/area_mac/mac_00/npc/russ_and_thief.inc.c @@ -215,10 +215,10 @@ EvtScript N(EVS_ShyGuy_StealDictionary) = { EVT_EXEC_GET_TID(N(EVS_ShyGuy_PlayRunningSounds), LVarA) EVT_CALL(NpcMoveTo, NPC_ShyGuyThief, -10, -410, 0) EVT_KILL_THREAD(LVarA) - EVT_CALL(PlaySoundAtNpc, NPC_ShyGuyThief, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuyThief, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_ShyGuyThief, -10, 0, -340, 0) EVT_SET(LVar0, 21) - EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_203F, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_SHY_GUY_RUN_AWAY, SOUND_SPACE_DEFAULT) EVT_EXEC_GET_TID(N(EVS_ShyGuy_PlayRunningSounds), LVarA) EVT_CALL(NpcMoveTo, NPC_ShyGuyThief, 45, -186, 0) EVT_CALL(NpcMoveTo, NPC_ShyGuyThief, 139, -67, 0) diff --git a/src/world/area_mac/mac_01/mac_01_9_npc.c b/src/world/area_mac/mac_01/mac_01_9_npc.c index f24bd06fae..b7845a4aba 100644 --- a/src/world/area_mac/mac_01/mac_01_9_npc.c +++ b/src/world/area_mac/mac_01/mac_01_9_npc.c @@ -613,7 +613,7 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 1, LVar3, LVar4, LVar5, 1, 30) EVT_CALL(SetNpcAnimation, NPC_DarkToad_01, ANIM_DarkToad_Red_Hurt) EVT_WAIT(5 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_01, SOUND_2049, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_01, SOUND_DARK_TOAD_DISPEL, SOUND_SPACE_DEFAULT) EVT_CALL(GetNpcPos, NPC_DarkToad_01, LVar3, LVar4, LVar5) EVT_CALL(SetNpcPos, NPC_DarkToad_01, LVar3, NPC_DISPOSE_POS_Y, LVar2) EVT_CALL(SetNpcPos, NPC_KoopaBros_01, LVar3, LVar4, LVar5) @@ -630,7 +630,7 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 1, LVar3, LVar4, LVar5, 1, 30) EVT_CALL(SetNpcAnimation, NPC_DarkToad_02, ANIM_DarkToad_Black_Hurt) EVT_WAIT(5 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_02, SOUND_2049, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_02, SOUND_DARK_TOAD_DISPEL, SOUND_SPACE_DEFAULT) EVT_CALL(GetNpcPos, NPC_DarkToad_02, LVar3, LVar4, LVar5) EVT_CALL(SetNpcPos, NPC_DarkToad_02, LVar3, NPC_DISPOSE_POS_Y, LVar2) EVT_CALL(SetNpcPos, NPC_KoopaBros_02, LVar3, LVar4, LVar5) @@ -647,7 +647,7 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 1, LVar3, LVar4, LVar5, 1, 30) EVT_CALL(SetNpcAnimation, NPC_DarkToad_03, ANIM_DarkToad_Yellow_Hurt) EVT_WAIT(5 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_03, SOUND_2049, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_03, SOUND_DARK_TOAD_DISPEL, SOUND_SPACE_DEFAULT) EVT_CALL(GetNpcPos, NPC_DarkToad_03, LVar3, LVar4, LVar5) EVT_CALL(SetNpcPos, NPC_DarkToad_03, LVar3, NPC_DISPOSE_POS_Y, LVar2) EVT_CALL(SetNpcPos, NPC_KoopaBros_03, LVar3, LVar4, LVar5) @@ -663,7 +663,7 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 1, LVar3, LVar4, LVar5, 1, 30) EVT_CALL(SetNpcAnimation, NPC_DarkToad_04, ANIM_DarkToad_Green_Hurt) EVT_WAIT(5 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_04, SOUND_2049, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_DarkToad_04, SOUND_DARK_TOAD_DISPEL, SOUND_SPACE_DEFAULT) EVT_CALL(GetNpcPos, NPC_DarkToad_04, LVar3, LVar4, LVar5) EVT_CALL(SetNpcPos, NPC_DarkToad_04, LVar3, NPC_DISPOSE_POS_Y, LVar2) EVT_CALL(SetNpcPos, NPC_KoopaBros_04, LVar3, LVar4, LVar5) @@ -1720,7 +1720,7 @@ EvtScript N(D_8025B854_81C0D4) = { EVT_CALL(SpeakToPlayer, NPC_Rowf, ANIM_Rowf_Talk, ANIM_Rowf_Idle, 0, MSG_MAC_Plaza_0007) EVT_EXEC(N(D_8025B760_81BFE0)) EVT_SET(LVar0, 6) - EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_203F, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_SHY_GUY_RUN_AWAY, SOUND_SPACE_DEFAULT) EVT_EXEC_GET_TID(N(D_8024E6F8_80EF78), LVarA) EVT_CALL(NpcMoveTo, NPC_PostOfficeShyGuy, -45, 330, 30) EVT_CALL(NpcMoveTo, NPC_PostOfficeShyGuy, -45, 710, 30) @@ -1853,14 +1853,14 @@ EvtScript N(EVS_NpcIdle_ShyGuy_02) = { EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 1) EVT_WAIT(3) EVT_IF_EQ(MF_InsideToadHouse, TRUE) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_END_IF EVT_CALL(NpcJump0, NPC_SELF, 539, 36, -242, 8) EVT_WAIT(2) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) EVT_WAIT(3) EVT_IF_EQ(MF_InsideToadHouse, TRUE) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_END_IF EVT_CALL(NpcJump0, NPC_SELF, 572, 36, -226, 8) EVT_WAIT(2) @@ -1878,7 +1878,7 @@ EvtScript N(EVS_NpcAI_ShyGuy_02) = { EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim03) EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 1) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 550, 20, -161, 0) EVT_THREAD EVT_WAIT(10) @@ -1898,7 +1898,7 @@ EvtScript N(EVS_NpcAI_ShyGuy_02) = { EVT_END_THREAD EVT_CALL(ShowSweat, NPC_SELF, 1, -45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_SET(LVar0, -1) - EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_203F, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_SHY_GUY_RUN_AWAY, SOUND_SPACE_DEFAULT) EVT_EXEC_GET_TID(N(D_8024E6F8_80EF78), LVarA) EVT_CALL(NpcMoveTo, NPC_SELF, 420, -118, 0) EVT_KILL_THREAD(LVarA) @@ -1929,7 +1929,7 @@ EvtScript N(EVS_NpcHit_ShyGuy_02) = { EVT_RETURN EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_HIT_PLAYER_NORMAL, SOUND_SPACE_DEFAULT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203E, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SHY_GUY_OUCH, SOUND_SPACE_DEFAULT) EVT_SET(GF_MAC01_ChasedShyGuyFromToadHouse, TRUE) EVT_SET(AF_MAC_43, TRUE) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_ShyGuy_02))) diff --git a/src/world/area_mac/mac_01/npc/flower_gate.inc.c b/src/world/area_mac/mac_01/npc/flower_gate.inc.c index 6b797ec3a5..568c83ffce 100644 --- a/src/world/area_mac/mac_01/npc/flower_gate.inc.c +++ b/src/world/area_mac/mac_01/npc/flower_gate.inc.c @@ -14,14 +14,14 @@ EvtScript N(EVS_NpcIdle_GardenShyGuy1) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim03) EVT_LOOP(0) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 180, 27, 280, 15) EVT_CALL(NpcMoveTo, NPC_SELF, 220, 250, 15) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 310, 27, 250, 15) EVT_CALL(NpcMoveTo, NPC_SELF, 350, 280, 15) EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 1) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 360, 27, 380, 15) EVT_CALL(NpcMoveTo, NPC_SELF, 300, 450, 15) EVT_CALL(NpcMoveTo, NPC_SELF, 230, 450, 15) @@ -36,16 +36,16 @@ EvtScript N(EVS_NpcIdle_GardenShyGuy2) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim03) EVT_LOOP(0) EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 1) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 360, 27, 380, 15) EVT_CALL(NpcMoveTo, NPC_SELF, 300, 450, 15) EVT_CALL(NpcMoveTo, NPC_SELF, 230, 450, 15) EVT_CALL(NpcMoveTo, NPC_SELF, 170, 380, 15) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 180, 27, 280, 15) EVT_CALL(NpcMoveTo, NPC_SELF, 220, 250, 15) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 310, 27, 250, 15) EVT_CALL(NpcMoveTo, NPC_SELF, 350, 280, 15) EVT_END_LOOP @@ -65,7 +65,7 @@ EvtScript N(EVS_GardenShyGuy_RunAway) = { EVT_CALL(ShowSweat, NPC_SELF, 1, -45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 1) EVT_SET(LVar0, -1) - EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_203F, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_SHY_GUY_RUN_AWAY, SOUND_SPACE_DEFAULT) EVT_EXEC_GET_TID(N(D_8024E6F8_80EF78), LVar9) EVT_CALL(NpcMoveTo, NPC_SELF, 160, 400, 0) EVT_KILL_THREAD(LVar9) @@ -74,10 +74,10 @@ EvtScript N(EVS_GardenShyGuy_RunAway) = { EVT_EXEC(N(EVS_MinhThankYou)) EVT_END_IF EVT_CALL(ShowSweat, NPC_SELF, 1, -45, EMOTER_NPC, 0, 0, 0, 0, 20) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 110, 20, 420, 0) EVT_CALL(ShowSweat, NPC_SELF, 1, -45, EMOTER_NPC, 0, 0, 0, 0, 20) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 40, 0, 450, 0) EVT_CALL(ShowSweat, NPC_SELF, 1, -45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_CALL(NpcMoveTo, NPC_SELF, -30, 550, 0) @@ -105,7 +105,7 @@ EvtScript N(EVS_GardenShyGuy_PlayHitReactionSounds) = { EVT_RETURN EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_HIT_PLAYER_NORMAL, SOUND_SPACE_DEFAULT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203E, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SHY_GUY_OUCH, SOUND_SPACE_DEFAULT) EVT_SET(LVar0, 0) EVT_RETURN EVT_END diff --git a/src/world/area_mac/mac_01/npc/post_office.inc.c b/src/world/area_mac/mac_01/npc/post_office.inc.c index c2b822a497..e9e9bcf8d6 100644 --- a/src/world/area_mac/mac_01/npc/post_office.inc.c +++ b/src/world/area_mac/mac_01/npc/post_office.inc.c @@ -443,10 +443,10 @@ EvtScript N(EVS_PostOfficeShyGuy_Escape) = { EVT_EXEC(N(EVS_CarryItem_PostOfficeShyGuy)) EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(60) - EVT_CALL(PlaySoundAtNpc, NPC_PostOfficeShyGuy, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PostOfficeShyGuy, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_PostOfficeShyGuy, 247, 20, -440, 20) EVT_SET(LVar0, 6) - EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_203F, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_SHY_GUY_RUN_AWAY, SOUND_SPACE_DEFAULT) EVT_EXEC_GET_TID(N(D_8024E6F8_80EF78), LVarA) EVT_CALL(NpcMoveTo, NPC_PostOfficeShyGuy, 180, -410, 20) EVT_CALL(NpcMoveTo, NPC_PostOfficeShyGuy, 150, -333, 8) diff --git a/src/world/area_mac/mac_02/npc/shyguy_thief.inc.c b/src/world/area_mac/mac_02/npc/shyguy_thief.inc.c index 5890b4e2c8..27f022e83f 100644 --- a/src/world/area_mac/mac_02/npc/shyguy_thief.inc.c +++ b/src/world/area_mac/mac_02/npc/shyguy_thief.inc.c @@ -60,7 +60,7 @@ EvtScript N(D_8024B6E8_82E9A8) = { EVT_CALL(EnableGroup, MODEL_cook_in, FALSE) EVT_END_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy, SOUND_203F, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy, SOUND_SHY_GUY_RUN_AWAY, SOUND_SPACE_DEFAULT) EVT_EXEC_GET_TID(N(D_8024B6A0_82E960), LVarA) EVT_CALL(SetNpcSpeed, NPC_ShyGuy, 8) EVT_CALL(NpcMoveTo, NPC_ShyGuy, -140, -240, 0) diff --git a/src/world/area_mac/mac_03/mac_03_3_train.c b/src/world/area_mac/mac_03/mac_03_3_train.c index 028cdce218..f8b6c28d9e 100644 --- a/src/world/area_mac/mac_03/mac_03_3_train.c +++ b/src/world/area_mac/mac_03/mac_03_3_train.c @@ -196,7 +196,7 @@ EvtScript N(EVS_AnimateTrain) = { EVT_CALL(ScaleModel, MODEL_08, LVar1, LVar0, LVar1) EVT_END_IF EVT_IF_EQ(MF_TrainDepartDoorOpen, TRUE) - EVT_CALL(PlaySoundAt, SOUND_20A5, SOUND_SPACE_DEFAULT, -435, 84, 37) + EVT_CALL(PlaySoundAt, SOUND_TRAIN_DOOR_OPEN, SOUND_SPACE_DEFAULT, -435, 84, 37) EVT_SET(LVar8, 10) EVT_SET(LFlag1, TRUE) EVT_SET(MF_TrainDepartDoorOpen, FALSE) @@ -207,7 +207,7 @@ EvtScript N(EVS_AnimateTrain) = { EVT_SET(MF_TrainDepartPlayerBoard, FALSE) EVT_END_IF EVT_IF_EQ(MF_TrainArriveDoorOpen, TRUE) - EVT_CALL(PlaySoundAt, SOUND_20A5, SOUND_SPACE_DEFAULT, -413, 84, 38) + EVT_CALL(PlaySoundAt, SOUND_TRAIN_DOOR_OPEN, SOUND_SPACE_DEFAULT, -413, 84, 38) EVT_SET(LVar8, 10) EVT_SET(LFlag2, TRUE) EVT_SET(MF_TrainArriveDoorOpen, FALSE) @@ -226,7 +226,7 @@ EvtScript N(EVS_AnimateTrain) = { EVT_IF_LE(LVar9, 0) EVT_SET(LVar9, 0) EVT_SET(LFlag1, FALSE) - EVT_CALL(PlaySoundAt, SOUND_20A6, SOUND_SPACE_DEFAULT, -435, 84, 37) + EVT_CALL(PlaySoundAt, SOUND_TRAIN_DOOR_CLOSE, SOUND_SPACE_DEFAULT, -435, 84, 37) EVT_END_IF EVT_END_IF EVT_IF_EQ(LFlag2, TRUE) @@ -238,7 +238,7 @@ EvtScript N(EVS_AnimateTrain) = { EVT_IF_LE(LVarA, 0) EVT_SET(LVarA, 0) EVT_SET(LFlag2, FALSE) - EVT_CALL(PlaySoundAt, SOUND_20A6, SOUND_SPACE_DEFAULT, -413, 84, 38) + EVT_CALL(PlaySoundAt, SOUND_TRAIN_DOOR_CLOSE, SOUND_SPACE_DEFAULT, -413, 84, 38) EVT_END_IF EVT_END_IF EVT_CALL(RotateModel, MODEL_omote, LVar9, 0, -1, 0) diff --git a/src/world/area_mac/mac_03/mac_03_4_npc.c b/src/world/area_mac/mac_03/mac_03_4_npc.c index 1354ad914d..7f148dd387 100644 --- a/src/world/area_mac/mac_03/mac_03_4_npc.c +++ b/src/world/area_mac/mac_03/mac_03_4_npc.c @@ -484,11 +484,11 @@ EvtScript N(EVS_NpcIdle_ShyGuy) = { EVT_LOOP(0) EVT_CALL(NpcMoveTo, NPC_SELF, -250, -25, 30) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, -250, 0, 30, 15) EVT_CALL(NpcMoveTo, NPC_SELF, -100, 30, 30) EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 1) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, -100, 0, -25, 15) EVT_END_LOOP EVT_RETURN @@ -508,10 +508,10 @@ EvtScript N(EVS_NpcAI_ShyGuy) = { EVT_KILL_THREAD(LVarA) EVT_CALL(ShowSweat, NPC_SELF, 1, 45, EMOTER_NPC, 0, 0, 0, 0, 20) EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, -30, 0, 0, 20) EVT_CALL(ShowSweat, NPC_SELF, 1, 45, EMOTER_NPC, 0, 0, 0, 0, 20) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203F, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SHY_GUY_RUN_AWAY, SOUND_SPACE_DEFAULT) EVT_EXEC_GET_TID(N(D_8024A7F4_83BFF4), LVarA) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(8.0)) EVT_CALL(NpcMoveTo, NPC_SELF, 30, -200, 0) @@ -544,7 +544,7 @@ EvtScript N(EVS_NpcHit_ShyGuy) = { EVT_RETURN EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_HIT_PLAYER_NORMAL, SOUND_SPACE_DEFAULT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203E, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SHY_GUY_OUCH, SOUND_SPACE_DEFAULT) EVT_SET(GF_MAC03_ShyGuyChasedOff, TRUE) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_ShyGuy))) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, 1) diff --git a/src/world/area_mac/mac_03/mac_03_7_oinks.c b/src/world/area_mac/mac_03/mac_03_7_oinks.c index da6c8ad5c9..9f2833f2b1 100644 --- a/src/world/area_mac/mac_03/mac_03_7_oinks.c +++ b/src/world/area_mac/mac_03/mac_03_7_oinks.c @@ -192,7 +192,7 @@ EvtScript N(EVS_TurnCrank) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_THREAD - EVT_CALL(PlaySoundAt, SOUND_20A7, SOUND_SPACE_DEFAULT, 111, 89, -358) + EVT_CALL(PlaySoundAt, SOUND_TURN_MECHANISM, SOUND_SPACE_DEFAULT, 111, 89, -358) EVT_SET(LVar0, 0) EVT_LOOP(5) EVT_ADD(LVar0, 6) @@ -231,7 +231,7 @@ EvtScript N(EVS_TurnCrank) = { EVT_CALL(ScaleModel, MODEL_boo, 1, LVar0, 1) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_20A8, SOUND_SPACE_DEFAULT, 134, 132, -399) + EVT_CALL(PlaySoundAt, SOUND_CAPSULE_OPEN, SOUND_SPACE_DEFAULT, 134, 132, -399) EVT_LOOP(5) EVT_SUBF(LVar0, EVT_FLOAT(0.08)) EVT_CALL(ScaleModel, MODEL_boo, 1, LVar0, 1) diff --git a/src/world/area_mac/mac_04/npc_chet_rippo.inc.c b/src/world/area_mac/mac_04/npc_chet_rippo.inc.c index 5ec83eb6e9..cc8328a0d3 100644 --- a/src/world/area_mac/mac_04/npc_chet_rippo.inc.c +++ b/src/world/area_mac/mac_04/npc_chet_rippo.inc.c @@ -89,7 +89,7 @@ API_CALLABLE(N(SetStatusBarRespondToChanges)) { API_CALLABLE(N(ForceStatusBarToAppear)) { status_bar_respond_to_changes(); - open_status_bar_long(); + open_status_bar_slowly(); return ApiStatus_DONE2; } diff --git a/src/world/area_mac/mac_04/npc_harry_t.inc.c b/src/world/area_mac/mac_04/npc_harry_t.inc.c index eea680deb3..8c08fb1c62 100644 --- a/src/world/area_mac/mac_04/npc_harry_t.inc.c +++ b/src/world/area_mac/mac_04/npc_harry_t.inc.c @@ -41,7 +41,7 @@ EvtScript N(EVS_NpcInteract_HarryT) = { EVT_SET(GB_StoryProgress, STORY_CH4_RETURNED_STOREROOM_KEY) EVT_END_SWITCH EVT_ELSE - EVT_EXEC_WAIT(ItemShopInteract) + EVT_EXEC_WAIT(EVS_ShopOwnerDialog) EVT_END_IF EVT_RETURN EVT_END diff --git a/src/world/area_mac/mac_04/npc_muskular.inc.c b/src/world/area_mac/mac_04/npc_muskular.inc.c index 41b9e3537a..d72e9d5170 100644 --- a/src/world/area_mac/mac_04/npc_muskular.inc.c +++ b/src/world/area_mac/mac_04/npc_muskular.inc.c @@ -3,7 +3,7 @@ API_CALLABLE(N(UpgradeStarPowerCh4)) { PlayerData* playerData = &gPlayerData; - set_max_SP(4); + set_max_star_power(4); playerData->curHP = playerData->curMaxHP; playerData->curFP = playerData->curMaxFP; sync_status_bar(); 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 82f20fb7db..721322e5df 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 @@ -102,7 +102,7 @@ EvtScript N(EVS_SuspiciousGuy_RevealSecretRoom) = { }; EvtScript N(EVS_SuspiciousGuy_RunAway) = { - EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_203E, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_SHY_GUY_OUCH, SOUND_SPACE_DEFAULT) EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_ShyGuy_01, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20 * DT) diff --git a/src/world/area_mac/mac_05/mac_05_4_npc.c b/src/world/area_mac/mac_05/mac_05_4_npc.c index e7f3afefde..a944a5e6ad 100644 --- a/src/world/area_mac/mac_05/mac_05_4_npc.c +++ b/src/world/area_mac/mac_05/mac_05_4_npc.c @@ -599,7 +599,7 @@ EvtScript N(EVS_802496FC) = { EVT_IF_EQ(GB_StoryProgress, STORY_CH5_TRADED_VASE_FOR_SEED) EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Run) EVT_CALL(N(func_80242A90_854C00), 5, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_Kolorado, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Kolorado, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcJumpscale, NPC_Kolorado, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_Kolorado, LVar0, LVar1, LVar2, 20) EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Idle) @@ -1019,7 +1019,7 @@ EvtScript N(EVS_NpcInteract_Toad_01) = { EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Run) EVT_CALL(NpcMoveTo, NPC_Kolorado, LVar3, LVar5, 20) EVT_CALL(N(func_80242A90_854C00), 2, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_Kolorado, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Kolorado, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcJumpscale, NPC_Kolorado, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_Kolorado, LVar0, LVar1, LVar2, 20) EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Idle) diff --git a/src/world/area_mac/machi/machi_3_entity.c b/src/world/area_mac/machi/machi_3_entity.c index c60b164ab8..30e8da0083 100644 --- a/src/world/area_mac/machi/machi_3_entity.c +++ b/src/world/area_mac/machi/machi_3_entity.c @@ -17,7 +17,7 @@ API_CALLABLE(N(func_80240048_7E73E8)) { if (isInitialCall) { script->functionTemp[0] = 0; script->functionTemp[1] = 0; - gOverrideFlags |= GLOBAL_OVERRIDES_10; + gOverrideFlags |= GLOBAL_OVERRIDES_MESSAGES_OVER_FRONTUI; } set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, script->functionTemp[1]); @@ -49,13 +49,13 @@ API_CALLABLE(N(func_80240114_7E74B4)) { if (isInitialCall) { script->functionTemp[0] = 0; script->functionTemp[1] = 255; - gOverrideFlags |= GLOBAL_OVERRIDES_10; + gOverrideFlags |= GLOBAL_OVERRIDES_MESSAGES_OVER_FRONTUI; } set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, script->functionTemp[1]); if (script->functionTemp[1] == 0) { - gOverrideFlags &= ~GLOBAL_OVERRIDES_10; + gOverrideFlags &= ~GLOBAL_OVERRIDES_MESSAGES_OVER_FRONTUI; return ApiStatus_DONE2; } diff --git a/src/world/area_mgm/mgm_01/mgm_01_2_npc.c b/src/world/area_mgm/mgm_01/mgm_01_2_npc.c index aec1b352a2..f3c97e238e 100644 --- a/src/world/area_mgm/mgm_01/mgm_01_2_npc.c +++ b/src/world/area_mgm/mgm_01/mgm_01_2_npc.c @@ -384,7 +384,7 @@ API_CALLABLE(N(UpdateRecords)) { if (player->jumpGameRecord < data->curScore) { player->jumpGameRecord = data->curScore; } - set_message_value(data->curScore, 0); + set_message_int_var(data->curScore, 0); return ApiStatus_DONE2; } @@ -477,7 +477,7 @@ API_CALLABLE(N(DestroyBlockEntities)) { } } - sfx_play_sound_with_params(SOUND_0283, 0x50, 0, 0); + sfx_play_sound_with_params(SOUND_KOOPER_SHELL_KICK, 0x50, 0, 0); return ApiStatus_DONE2; } @@ -660,11 +660,11 @@ API_CALLABLE(N(SetMsgVars_BlocksRemaining)) { Enemy* scorekeeper = get_enemy(SCOREKEEPER_ENEMY_IDX); s32 remaining = (scorekeeper->varTable[TOTAL_BLOCKS_VAR_IDX] - scorekeeper->varTable[BROKEN_BLOCKS_VAR_IDX]) + 1; - set_message_value(remaining, 0); + set_message_int_var(remaining, 0); #if VERSION_PAL evt_set_variable(script, LVarD, remaining); #else - set_message_msg((remaining == 1) ? (s32)&MessageSingular : (s32)&MessagePlural, 1); + set_message_text_var((remaining == 1) ? (s32)&MessageSingular : (s32)&MessagePlural, 1); #endif return ApiStatus_DONE2; @@ -814,7 +814,7 @@ EvtScript N(EVS_ManageMinigame) = { EVT_CASE_EQ(8) EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0037) EVT_CALL(N(DoubleScore)) - EVT_CALL(PlaySoundWithVolume, SOUND_03FC, 0) + EVT_CALL(PlaySoundWithVolume, SOUND_LUCKY, 0) EVT_WAIT(30) EVT_CALL(N(UpdateRecords)) EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MGM_0038) diff --git a/src/world/area_mgm/mgm_02/mgm_02_2_npc.c b/src/world/area_mgm/mgm_02/mgm_02_2_npc.c index c167e4ef5c..7560a6cc2d 100644 --- a/src/world/area_mgm/mgm_02/mgm_02_2_npc.c +++ b/src/world/area_mgm/mgm_02/mgm_02_2_npc.c @@ -865,9 +865,9 @@ API_CALLABLE(N(UpdateRecords)) { playerData->smashGameRecord = data->curScore; } - set_message_value(seconds, 0); - set_message_value(deciseconds, 1); - set_message_value(data->curScore, 2); + set_message_int_var(seconds, 0); + set_message_int_var(deciseconds, 1); + set_message_int_var(data->curScore, 2); outScore = data->curScore; if (data->curScore == 0 && data->found == NUM_PANELS) { @@ -928,7 +928,7 @@ API_CALLABLE(N(CleanupGame)) { get_screen_coords(CAM_DEFAULT, npc->pos.x, npc->pos.y, npc->pos.z, &screenX, &screenY, &screenZ); if (screenX - 1 < SCREEN_WIDTH - 1) { fx_walking_dust(1, npc->pos.x, npc->pos.y, npc->pos.z, 0, 0); - sfx_play_sound(SOUND_0283); + sfx_play_sound(SOUND_KOOPER_SHELL_KICK); } npc->flags |= NPC_FLAG_INVISIBLE; disable_npc_shadow(npc); @@ -1850,13 +1850,13 @@ EvtScript N(EVS_NpcInit_Bobomb) = { EVT_CALL(GetSelfNpcID, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(NPC_Bobomb_01) - EVT_CALL(SetSelfVar, 8, SOUND_032C) + EVT_CALL(SetSelfVar, 8, SOUND_NPC_JUMP) EVT_CASE_EQ(NPC_Bobomb_02) - EVT_CALL(SetSelfVar, 8, SOUND_032D) + EVT_CALL(SetSelfVar, 8, SOUND_LOWER_NPC_JUMP) EVT_CASE_EQ(NPC_Bobomb_03) - EVT_CALL(SetSelfVar, 8, SOUND_032C) + EVT_CALL(SetSelfVar, 8, SOUND_NPC_JUMP) EVT_CASE_DEFAULT - EVT_CALL(SetSelfVar, 8, SOUND_032D) + EVT_CALL(SetSelfVar, 8, SOUND_LOWER_NPC_JUMP) EVT_END_SWITCH EVT_CALL(RandInt, 100, LVar0) EVT_IF_LT(LVar0, 50) diff --git a/src/world/area_mim/mim_02/mim_02_3_npc.c b/src/world/area_mim/mim_02/mim_02_3_npc.c index c214da5fc8..63fc719120 100644 --- a/src/world/area_mim/mim_02/mim_02_3_npc.c +++ b/src/world/area_mim/mim_02/mim_02_3_npc.c @@ -39,7 +39,7 @@ EvtScript N(EVS_NpcInteract_Oaklie) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcJumpscale, NPC_Oaklie, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_Oaklie, -426, 58, -70, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) @@ -60,7 +60,7 @@ EvtScript N(EVS_NpcInteract_Oaklie) = { EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Fall) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_Oaklie, -333, 0, -81, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) EVT_WAIT(5 * DT) @@ -69,7 +69,7 @@ EvtScript N(EVS_NpcInteract_Oaklie) = { EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Fall) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_Oaklie, -300, 0, -170, 15 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) EVT_WAIT(5 * DT) @@ -78,7 +78,7 @@ EvtScript N(EVS_NpcInteract_Oaklie) = { EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Fall) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_Oaklie, -226, 0, -245, 15 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) EVT_WAIT(5 * DT) @@ -87,7 +87,7 @@ EvtScript N(EVS_NpcInteract_Oaklie) = { EVT_WAIT(15 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Fall) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_Oaklie, -160, 0, -296, 15 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) EVT_WAIT(5 * DT) @@ -127,7 +127,7 @@ EvtScript N(EVS_NpcIdle_Oaklie) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0 / DT)) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_SELF, -455, 0, 0, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) diff --git a/src/world/area_mim/mim_11/mim_11_5_npc.c b/src/world/area_mim/mim_11/mim_11_5_npc.c index c22f4ab891..c33571b2e5 100644 --- a/src/world/area_mim/mim_11/mim_11_5_npc.c +++ b/src/world/area_mim/mim_11/mim_11_5_npc.c @@ -1,6 +1,6 @@ #include "mim_11.h" -void increment_max_SP(void); +void increment_max_star_power(void); NpcSettings N(NpcSettings_Bootler) = { .height = 24, @@ -27,7 +27,7 @@ NpcSettings N(NpcSettings_Unused2) = { }; API_CALLABLE(N(IncreaseMaxSP)) { - increment_max_SP(); + increment_max_star_power(); return ApiStatus_DONE2; } diff --git a/src/world/area_nok/nok_01/nok_01_4_npc.c b/src/world/area_nok/nok_01/nok_01_4_npc.c index ff3990848f..64f3e944fb 100644 --- a/src/world/area_nok/nok_01/nok_01_4_npc.c +++ b/src/world/area_nok/nok_01/nok_01_4_npc.c @@ -285,7 +285,7 @@ EvtScript N(EVS_NpcHit_MiscFuzzy2) = { }; EvtScript N(EVS_NpcInteract_Koopa_ShopOwner) = { - EVT_EXEC_WAIT(ItemShopInteract) + EVT_EXEC_WAIT(EVS_ShopOwnerDialog) EVT_RETURN EVT_END }; diff --git a/src/world/area_nok/nok_01/nok_01_6_rooms.c b/src/world/area_nok/nok_01/nok_01_6_rooms.c index 690d403d3d..dba7d7073c 100644 --- a/src/world/area_nok/nok_01/nok_01_6_rooms.c +++ b/src/world/area_nok/nok_01/nok_01_6_rooms.c @@ -1,14 +1,14 @@ #include "nok_01.h" API_CALLABLE(N(OnEnterShop)) { - func_800E98EC(); + status_bar_always_show_on(); status_bar_ignore_changes(); - open_status_bar_long(); + open_status_bar_slowly(); return ApiStatus_DONE2; } API_CALLABLE(N(OnExitShop)) { - func_800E9900(); + status_bar_always_show_off(); status_bar_respond_to_changes(); close_status_bar(); return ApiStatus_DONE2; diff --git a/src/world/area_nok/nok_11/nok_11_4_npc.c b/src/world/area_nok/nok_11/nok_11_4_npc.c index 71c31e2e93..83226cd7ae 100644 --- a/src/world/area_nok/nok_11/nok_11_4_npc.c +++ b/src/world/area_nok/nok_11/nok_11_4_npc.c @@ -50,7 +50,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa_01) = { EVT_SET(LVar0, EVT_PTR(N(SearchBush_Scene))) EVT_EXEC(N(EVS_SearchBush)) EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_SELF, -230, 0, -157, 15 * DT) EVT_CALL(NpcFacePlayer, NPC_SELF, 0) @@ -87,7 +87,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa_01) = { EVT_WAIT(15 * DT) EVT_THREAD EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20AD, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_WATER_SPLASH, SOUND_SPACE_DEFAULT) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_PLAY_EFFECT(EFFECT_WATER_SPLASH, 2, LVar0, LVar1, LVar2, EVT_FLOAT(0.7), 30) diff --git a/src/world/area_nok/nok_12/nok_12_6_npc.c b/src/world/area_nok/nok_12/nok_12_6_npc.c index 406569d620..1edd0d07f6 100644 --- a/src/world/area_nok/nok_12/nok_12_6_npc.c +++ b/src/world/area_nok/nok_12/nok_12_6_npc.c @@ -16,7 +16,7 @@ EvtScript N(EVS_NpcIdle_SpikedGoomba) = { EVT_END_IF EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_SpikedGoomba_Sleep) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_03E1, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_AI_FOUND_PLAYER_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, -90, 0, 10, EASING_LINEAR) EVT_LABEL(1) EVT_CALL(UpdateLerp) diff --git a/src/world/area_obk/obk_03/obk_03_5_stairs.c b/src/world/area_obk/obk_03/obk_03_5_stairs.c index dcbeb1c9fe..ec8c80e972 100644 --- a/src/world/area_obk/obk_03/obk_03_5_stairs.c +++ b/src/world/area_obk/obk_03/obk_03_5_stairs.c @@ -15,7 +15,7 @@ EvtScript N(EVS_DropStep) = { }; EvtScript N(EVS_PlayDropStepFX) = { - EVT_CALL(PlaySoundAt, SOUND_203D, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_OBK_STAIRS_DROP, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_WAIT(LVarA) EVT_SET(LVar3, LVar0) EVT_SET(LVar4, LVar1) diff --git a/src/world/area_obk/obk_03/obk_03_6_npc.c b/src/world/area_obk/obk_03/obk_03_6_npc.c index 2212334cfe..0e25b04496 100644 --- a/src/world/area_obk/obk_03/obk_03_6_npc.c +++ b/src/world/area_obk/obk_03/obk_03_6_npc.c @@ -30,7 +30,7 @@ EvtScript N(EVS_LetterReward_Igor) = { EvtScript N(EVS_NpcInteract_Igor) = { EVT_IF_GE(GB_StoryProgress, STORY_CH3_BOW_JOINED_PARTY) - EVT_EXEC_WAIT(ItemShopInteract) + EVT_EXEC_WAIT(EVS_ShopOwnerDialog) EVT_ELSE EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Boo_Talk, ANIM_Boo_Idle, 0, MSG_CH3_005C) EVT_END_IF diff --git a/src/world/area_obk/obk_04/obk_04_3_npc.c b/src/world/area_obk/obk_04/obk_04_3_npc.c index d0df2a5098..d7099688fa 100644 --- a/src/world/area_obk/obk_04/obk_04_3_npc.c +++ b/src/world/area_obk/obk_04/obk_04_3_npc.c @@ -38,7 +38,7 @@ void N(func_802400D0_BC7F30)(Npc* npc) { npc_set_imgfx_params(npc, IMGFX_CLEAR, 0, 0, 0, 0, npc->imgfxFlags); } else { npc->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2; - npc_set_imgfx_params(npc, IMGFX_SET_ALPHA, gPlayerStatusPtr->alpha1, 255, 0, 0, npc->imgfxFlags); + npc_set_imgfx_params(npc, IMGFX_SET_ALPHA, gPlayerStatusPtr->curAlpha, 255, 0, 0, npc->imgfxFlags); npc->imgfxArg1 = 255; } } diff --git a/src/world/area_obk/obk_05/obk_05_2_main.c b/src/world/area_obk/obk_05/obk_05_2_main.c index c6c0536867..b4c3ba3d57 100644 --- a/src/world/area_obk/obk_05/obk_05_2_main.c +++ b/src/world/area_obk/obk_05/obk_05_2_main.c @@ -66,7 +66,7 @@ EvtScript N(EVS_ManageRetroJar) = { EVT_CALL(SetMusicTrack, 0, SONG_CHAPTER_START, 1, 8) EVT_SET(MF_IsRetroMario, TRUE) EVT_ELSE - EVT_CALL(PlaySoundAtPlayer, SOUND_JUMP_2081, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_QUICK_PLAYER_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(Disable8bitMario, TRUE) EVT_EXEC(N(EVS_SetupMusic)) EVT_SET(MF_IsRetroMario, FALSE) diff --git a/src/world/area_obk/obk_07/obk_07_6_phonograph.c b/src/world/area_obk/obk_07/obk_07_6_phonograph.c index 7ba9150982..24c2ab7d67 100644 --- a/src/world/area_obk/obk_07/obk_07_6_phonograph.c +++ b/src/world/area_obk/obk_07/obk_07_6_phonograph.c @@ -327,7 +327,7 @@ API_CALLABLE(N(CreatePhonographHudData)) { s32 id; s32 i; - gOverrideFlags |= GLOBAL_OVERRIDES_10; + gOverrideFlags |= GLOBAL_OVERRIDES_MESSAGES_OVER_FRONTUI; data->hudWorker = create_worker_frontUI(N(worker_update_phonograph_hud), N(worker_draw_phonograph_hud)); data->state = PHONOGRAPH_HUD_STATE_INIT; data->fillValue = 0; @@ -389,7 +389,7 @@ API_CALLABLE(N(DestroyPhonographHudData)) { PhonographData* data = N(GetPhonographData)(); data->state = PHONOGRAPH_HUD_STATE_DESTROYED; - gOverrideFlags &= ~GLOBAL_OVERRIDES_10; + gOverrideFlags &= ~GLOBAL_OVERRIDES_MESSAGES_OVER_FRONTUI; hud_element_free(data->hudElemAButton); hud_element_free(data->hudElemBlueMeter); hud_element_free(data->hudElemOK); diff --git a/src/world/area_obk/obk_08/obk_08_5_npc.c b/src/world/area_obk/obk_08/obk_08_5_npc.c index b79080a721..9426d7a19b 100644 --- a/src/world/area_obk/obk_08/obk_08_5_npc.c +++ b/src/world/area_obk/obk_08/obk_08_5_npc.c @@ -38,7 +38,7 @@ void N(func_80240920_BD4190)(Npc* npc) { npc_set_imgfx_params(npc, IMGFX_CLEAR, 0, 0, 0, 0, npc->imgfxFlags); } else { npc->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2; - npc_set_imgfx_params(npc, IMGFX_SET_ALPHA, gPlayerStatusPtr->alpha1, 0, 0, 0, npc->imgfxFlags); + npc_set_imgfx_params(npc, IMGFX_SET_ALPHA, gPlayerStatusPtr->curAlpha, 0, 0, 0, npc->imgfxFlags); npc->imgfxArg1 = 255; } } diff --git a/src/world/area_omo/omo_02/omo_02_6_npc.c b/src/world/area_omo/omo_02/omo_02_6_npc.c index adb512956c..df545dead8 100644 --- a/src/world/area_omo/omo_02/omo_02_6_npc.c +++ b/src/world/area_omo/omo_02/omo_02_6_npc.c @@ -45,7 +45,7 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Loner) = { EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(6.0 / DT)) EVT_CALL(NpcMoveTo, NPC_SELF, -575, 0, 0) EVT_KILL_THREAD(LVarA) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, -460, 0, -20, 40 / DT) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) @@ -62,7 +62,7 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Loner) = { EVT_GOTO(10) EVT_END_IF EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, -460, 0, -20, 40 / DT) EVT_END_IF EVT_RETURN diff --git a/src/world/area_omo/omo_04/omo_04_6_scenes.c b/src/world/area_omo/omo_04/omo_04_6_scenes.c index 3080d5b395..f9588c4c6b 100644 --- a/src/world/area_omo/omo_04/omo_04_6_scenes.c +++ b/src/world/area_omo/omo_04/omo_04_6_scenes.c @@ -146,7 +146,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_END_LOOP EVT_SET(MF_KammyFlying, FALSE) EVT_KILL_THREAD(MV_FlightSoundsScriptID) - EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_032B, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_SKID, SOUND_SPACE_DEFAULT) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim10) EVT_WAIT(1) @@ -187,7 +187,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_CALL(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 25) EVT_ADD(LVar1, 38) - EVT_CALL(PlaySoundAt, SOUND_207A, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_KAMMY_SUMMON_MAGIC, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 100) EVT_WAIT(100 * DT) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) diff --git a/src/world/area_omo/omo_05/omo_05_4_npc.c b/src/world/area_omo/omo_05/omo_05_4_npc.c index 0b48768488..0c542e6253 100644 --- a/src/world/area_omo/omo_05/omo_05_4_npc.c +++ b/src/world/area_omo/omo_05/omo_05_4_npc.c @@ -231,21 +231,21 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(25.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0381, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_GOURMET_GUY_SHOCK_1, SOUND_SPACE_DEFAULT) EVT_WAIT(33 * DT) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(320.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(13.0), EVT_FLOAT(-0.8)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(25.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0382, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_GOURMET_GUY_SHOCK_2, SOUND_SPACE_DEFAULT) EVT_WAIT(33 * DT) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(250.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(14.0), EVT_FLOAT(0.0)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(25.0 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0383, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_GOURMET_GUY_SHOCK_3, SOUND_SPACE_DEFAULT) EVT_WAIT(18 * DT) EVT_CALL(SetMusicTrack, 0, SONG_GOURMET_GUY_FREAKOUT, 0, 8) EVT_WAIT(30 * DT) @@ -287,19 +287,19 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { EVT_GOTO(19) EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0384, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_GOURMET_GUY_RUN, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GourmetGuy_Panic) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(20.0 / DT)) EVT_CALL(NpcMoveTo, NPC_SELF, 0, 110, 0) EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0384, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_GOURMET_GUY_RUN, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_UPSIDE_DOWN, TRUE) EVT_CALL(SetNpcPos, NPC_SELF, 0, 145, 110) EVT_CALL(NpcMoveTo, NPC_SELF, -500, 110, 0) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_UPSIDE_DOWN, FALSE) EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0384, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_GOURMET_GUY_RUN, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, -45) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) EVT_CALL(MakeLerp, 0, 100, 30 * DT, EASING_LINEAR) @@ -320,7 +320,7 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { EVT_GOTO(10) EVT_END_IF EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0384, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_GOURMET_GUY_RUN, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 0) EVT_CALL(SetNpcPos, NPC_SELF, -500, 0, 110) EVT_CALL(NpcMoveTo, NPC_SELF, -250, 110, 0) @@ -334,7 +334,7 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0385, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_GOURMET_GUY_LAUNCH, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_GourmetGuy_Leap) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.002)) EVT_CALL(NpcJump0, NPC_SELF, -250, 500, 110, 40 * DT) diff --git a/src/world/area_omo/omo_07/omo_07_6_scenes.c b/src/world/area_omo/omo_07/omo_07_6_scenes.c index 4c570c375c..297b7d5b70 100644 --- a/src/world/area_omo/omo_07/omo_07_6_scenes.c +++ b/src/world/area_omo/omo_07/omo_07_6_scenes.c @@ -89,7 +89,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_CALL(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 25) EVT_ADD(LVar1, 38) - EVT_CALL(PlaySoundAt, SOUND_207A, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_KAMMY_SUMMON_MAGIC, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 75) EVT_WAIT(75 * DT) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) diff --git a/src/world/area_omo/omo_08/omo_08_3_boxes.c b/src/world/area_omo/omo_08/omo_08_3_boxes.c index 92b93fd8b8..8f376cf55f 100644 --- a/src/world/area_omo/omo_08/omo_08_3_boxes.c +++ b/src/world/area_omo/omo_08/omo_08_3_boxes.c @@ -558,7 +558,7 @@ EvtScript N(EVS_BoxResult_ReleaseShyGuys) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(GetModelCenter, MODEL_b1_1) EVT_CALL(SetNpcPos, NPC_ShyGuy_01, LVar0, LVar1, LVar2) EVT_CALL(SetNpcJumpscale, NPC_ShyGuy_01, EVT_FLOAT(1.0)) @@ -578,7 +578,7 @@ EvtScript N(EVS_BoxResult_ReleaseShyGuys) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(GetModelCenter, MODEL_b2_1) EVT_CALL(SetNpcPos, NPC_ShyGuy_02, LVar0, LVar1, LVar2) EVT_CALL(SetNpcJumpscale, NPC_ShyGuy_02, EVT_FLOAT(1.0)) @@ -598,7 +598,7 @@ EvtScript N(EVS_BoxResult_ReleaseShyGuys) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(GetModelCenter, MODEL_b3_1) EVT_CALL(SetNpcPos, NPC_ShyGuy_03, LVar0, LVar1, LVar2) EVT_CALL(SetNpcJumpscale, NPC_ShyGuy_03, EVT_FLOAT(1.0)) @@ -618,7 +618,7 @@ EvtScript N(EVS_BoxResult_ReleaseShyGuys) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(GetModelCenter, MODEL_b4_1) EVT_CALL(SetNpcPos, NPC_ShyGuy_04, LVar0, LVar1, LVar2) EVT_CALL(SetNpcJumpscale, NPC_ShyGuy_04, EVT_FLOAT(1.0)) diff --git a/src/world/area_omo/omo_09/omo_09_3_conveyors.c b/src/world/area_omo/omo_09/omo_09_3_conveyors.c index 73d84a0d57..976d076afe 100644 --- a/src/world/area_omo/omo_09/omo_09_3_conveyors.c +++ b/src/world/area_omo/omo_09/omo_09_3_conveyors.c @@ -58,7 +58,7 @@ API_CALLABLE(N(AddConveyorPush)) { one = 1; if (partnerStatus->actingPartner == PARTNER_BOW) { - if (partnerStatus->partnerActionState != PARTNER_ACTION_NONE && playerStatus->alpha1 == 128) { + if (partnerStatus->partnerActionState != PARTNER_ACTION_NONE && playerStatus->curAlpha == 128) { x = playerStatus->pos.x; y = playerStatus->pos.y; z = playerStatus->pos.z; diff --git a/src/world/area_omo/omo_09/omo_09_8_scenes.c b/src/world/area_omo/omo_09/omo_09_8_scenes.c index 270b6ed493..1694a83f4f 100644 --- a/src/world/area_omo/omo_09/omo_09_8_scenes.c +++ b/src/world/area_omo/omo_09/omo_09_8_scenes.c @@ -89,7 +89,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_CALL(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 25) EVT_ADD(LVar1, 38) - EVT_CALL(PlaySoundAt, SOUND_207A, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_KAMMY_SUMMON_MAGIC, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 75) EVT_WAIT(75 * DT) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) diff --git a/src/world/area_omo/omo_14/omo_14_3_npc.c b/src/world/area_omo/omo_14/omo_14_3_npc.c index 95f4592d62..68e2c06ffb 100644 --- a/src/world/area_omo/omo_14/omo_14_3_npc.c +++ b/src/world/area_omo/omo_14/omo_14_3_npc.c @@ -114,7 +114,7 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Loner) = { EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_IF_EQ(LVar1, 0) - EVT_CALL(PlaySound, SOUND_03ED) + EVT_CALL(PlaySound, SOUND_MASTER_SMACK) EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 10 * DT) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 1, 4, EVT_FLOAT(1.0)) @@ -122,7 +122,7 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Loner) = { EVT_WAIT(3 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_PanicRun) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) - EVT_CALL(PlaySound, SOUND_03EE) + EVT_CALL(PlaySound, SOUND_MASTER_PUNCH) EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 15 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_ELSE diff --git a/src/world/area_pra/common/Reflection.inc.c b/src/world/area_pra/common/Reflection.inc.c index 7f792ad3f1..b0d65a0baf 100644 --- a/src/world/area_pra/common/Reflection.inc.c +++ b/src/world/area_pra/common/Reflection.inc.c @@ -95,16 +95,16 @@ void N(worker_reflect_player_wall)(void) { spr_update_player_sprite(PLAYER_SPRITE_AUX2, anim, 1.0f); if (!(playerStatus->flags & PS_FLAG_SPINNING)) { - if (playerStatus->alpha1 != D_802D9D70) { - if (playerStatus->alpha1 < 254) { + if (playerStatus->curAlpha != D_802D9D70) { + if (playerStatus->curAlpha < 254) { renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; - set_player_imgfx_comp(PLAYER_SPRITE_AUX2, -1, IMGFX_SET_ALPHA, 0, 0, 0, playerStatus->alpha1, 0); + set_player_imgfx_comp(PLAYER_SPRITE_AUX2, -1, IMGFX_SET_ALPHA, 0, 0, 0, playerStatus->curAlpha, 0); } else { renderMode = RENDER_MODE_ALPHATEST; set_player_imgfx_comp(PLAYER_SPRITE_AUX2, -1, IMGFX_CLEAR, 0, 0, 0, 0, 0); } } - D_802D9D70 = playerStatus->alpha1; + D_802D9D70 = playerStatus->curAlpha; } else { renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; D_802D9D70 = 0; @@ -170,16 +170,16 @@ void N(worker_reflect_player_floor)(void) { spr_update_player_sprite(PLAYER_SPRITE_AUX1, playerStatus->trueAnimation, 1.0f); if (!(playerStatus->flags & PS_FLAG_SPINNING)) { - if (playerStatus->alpha1 != D_802D9D71) { - if (playerStatus->alpha1 < 254) { + if (playerStatus->curAlpha != D_802D9D71) { + if (playerStatus->curAlpha < 254) { renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; - set_player_imgfx_comp(PLAYER_SPRITE_AUX1, -1, IMGFX_SET_ALPHA, 0, 0, 0, playerStatus->alpha1, 0); + set_player_imgfx_comp(PLAYER_SPRITE_AUX1, -1, IMGFX_SET_ALPHA, 0, 0, 0, playerStatus->curAlpha, 0); } else { renderMode = RENDER_MODE_ALPHATEST; set_player_imgfx_comp(PLAYER_SPRITE_AUX1, -1, IMGFX_CLEAR, 0, 0, 0, 0, 0); } } - D_802D9D71 = playerStatus->alpha1; + D_802D9D71 = playerStatus->curAlpha; } else { renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; D_802D9D71 = 0; diff --git a/src/world/area_pra/pra_01/pra_01_3_npc.c b/src/world/area_pra/pra_01/pra_01_3_npc.c index ae4c6e396a..bb91749607 100644 --- a/src/world/area_pra/pra_01/pra_01_3_npc.c +++ b/src/world/area_pra/pra_01/pra_01_3_npc.c @@ -9,7 +9,7 @@ MAP_STATIC_PAD(1,key_item); #include "world/common/complete/NormalItemChoice.inc.c" API_CALLABLE(N(UpgradeStarPowerCh7)) { - set_max_SP(7); + set_max_star_power(7); gPlayerData.curHP = gPlayerData.curMaxHP; gPlayerData.curFP = gPlayerData.curMaxFP; sync_status_bar(); diff --git a/src/world/area_pra/pra_32/pra_32_3_npc.c b/src/world/area_pra/pra_32/pra_32_3_npc.c index 1e5f781bc8..81d86cc95c 100644 --- a/src/world/area_pra/pra_32/pra_32_3_npc.c +++ b/src/world/area_pra/pra_32/pra_32_3_npc.c @@ -179,7 +179,7 @@ EvtScript N(EVS_Scene_BossDefeated) = { EVT_WAIT(1) EVT_END_LOOP EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_CrystalKing_01, SOUND_036B, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_CrystalKing_01, SOUND_CRYSTAL_KING_DISAPPEAR, SOUND_SPACE_DEFAULT) EVT_CALL(GetNpcPos, NPC_CrystalKing_01, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 0, LVar0, LVar1, LVar2, 1, 130) EVT_END_THREAD diff --git a/src/world/area_sam/sam_01/sam_01_5_scenes.c b/src/world/area_sam/sam_01/sam_01_5_scenes.c index 9d9b9cf5ec..0a54937325 100644 --- a/src/world/area_sam/sam_01/sam_01_5_scenes.c +++ b/src/world/area_sam/sam_01/sam_01_5_scenes.c @@ -528,7 +528,7 @@ EvtScript N(EVS_Scene_MysterySolved) = { EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_WakeUp) EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_MayorPenguin, ANIM_MayorPenguin_Idle) - EVT_CALL(PlaySoundAtNpc, NPC_MayorPenguin, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_MayorPenguin, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcJumpscale, NPC_MayorPenguin, EVT_FLOAT(1.0)) EVT_CALL(GetNpcPos, NPC_MayorPenguin, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_MayorPenguin, LVar0, 0, LVar2, 10 * DT) diff --git a/src/world/area_sam/sam_02/sam_02_4_npc.c b/src/world/area_sam/sam_02/sam_02_4_npc.c index 90655fd259..a57dd2dd66 100644 --- a/src/world/area_sam/sam_02/sam_02_4_npc.c +++ b/src/world/area_sam/sam_02/sam_02_4_npc.c @@ -22,11 +22,11 @@ EvtScript N(EVS_NpcInteract_Penguin_ShopOwner) = { EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH7_MAYOR_MURDER_MYSTERY) - EVT_EXEC_WAIT(ItemShopInteract) + EVT_EXEC_WAIT(EVS_ShopOwnerDialog) EVT_CASE_LT(STORY_CH7_MAYOR_MURDER_SOLVED) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Penguin_Talk, ANIM_Penguin_Idle, 0, MSG_CH7_006A) EVT_CASE_GE(STORY_CH7_MAYOR_MURDER_SOLVED) - EVT_EXEC_WAIT(ItemShopInteract) + EVT_EXEC_WAIT(EVS_ShopOwnerDialog) EVT_END_SWITCH EVT_RETURN EVT_END diff --git a/src/world/area_sam/sam_04/sam_04_3_snowmen.c b/src/world/area_sam/sam_04/sam_04_3_snowmen.c index 6ffcaababd..86850e54af 100644 --- a/src/world/area_sam/sam_04/sam_04_3_snowmen.c +++ b/src/world/area_sam/sam_04/sam_04_3_snowmen.c @@ -105,7 +105,7 @@ EvtScript N(EVS_SnowmanMove) = { EVT_SETF(LVar3, LVar7) EVT_SET(LVar4, 20) EVT_EXEC_WAIT(N(EVS_SnowmanJump)) - EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_038C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_SAM_SNOWMAN_JUMP, SOUND_SPACE_DEFAULT) EVT_END_LOOP EVT_RETURN EVT_END @@ -263,17 +263,17 @@ EvtScript N(EVS_Scene_SnowmenSpeak) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_038D, SOUND_SPACE_DEFAULT, 0, 0, -300) + EVT_CALL(PlaySoundAt, SOUND_SAM_SNOWMEN_RAISE_WALL, SOUND_SPACE_DEFAULT, 0, 0, -300) EVT_CALL(MakeLerp, 0, 100, 200 * DT, EASING_COS_IN_OUT) EVT_LABEL(0) - EVT_CALL(UpdateLerp) - EVT_CALL(TranslateModel, MODEL_o65, 0, LVar0, 0) - EVT_CALL(TranslateModel, MODEL_o64, 0, LVar0, 0) - EVT_CALL(TranslateModel, MODEL_o66, 0, LVar0, 0) - EVT_WAIT(1) - EVT_IF_EQ(LVar1, 1) - EVT_GOTO(0) - EVT_END_IF + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_o65, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o64, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o66, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF EVT_WAIT(60 * DT) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 100, EVT_FLOAT(0.3)) @@ -284,7 +284,7 @@ EvtScript N(EVS_Scene_SnowmenSpeak) = { EVT_CALL(GetModelCenter, MODEL_o64) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, 0, LVar2, 0) EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_038E, SOUND_SPACE_DEFAULT, 0, 0, -300) + EVT_CALL(PlaySoundAt, SOUND_SAM_SNOWMEN_OPEN_PASSAGE, SOUND_SPACE_DEFAULT, 0, 0, -300) EVT_CALL(MakeLerp, 0, 80, 100 * DT, EASING_COS_IN_OUT) EVT_LABEL(1) EVT_CALL(UpdateLerp) diff --git a/src/world/area_sam/sam_07/sam_07_4_frozen_pit.c b/src/world/area_sam/sam_07/sam_07_4_frozen_pit.c index e46048df30..88aa3dc8dc 100644 --- a/src/world/area_sam/sam_07/sam_07_4_frozen_pit.c +++ b/src/world/area_sam/sam_07/sam_07_4_frozen_pit.c @@ -138,7 +138,7 @@ API_CALLABLE(N(AwaitPlayerNotPoundingFloor)) { #include "world/common/EnableCameraFollowPlayerY.inc.c" EvtScript N(EVS_BreakIce) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_o116, SOUND_0396, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o116, SOUND_ICE_SHATTER, 0) EVT_CALL(N(AnimateIceShattering)) EVT_LOOP(10) EVT_CALL(SetGroupVisibility, MODEL_move1, MODEL_GROUP_VISIBLE) @@ -188,7 +188,7 @@ EvtScript N(EVS_UseGreenSwitch) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(N(GetEntityPosition), MV_SwitchEntityID, LVar7, LVar8, LVar9) EVT_IF_EQ(GF_SAM07_FloorRaised, FALSE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_m1_yuka, SOUND_0399, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_m1_yuka, SOUND_SAM07_RAISE_FLOOR, 0) EVT_SUB(LVar8, -180) EVT_CALL(MakeLerp, -180, 0, 120, EASING_COS_IN_OUT) EVT_LABEL(0) @@ -210,7 +210,7 @@ EvtScript N(EVS_UseGreenSwitch) = { EVT_ELSE EVT_CALL(EnableModel, MODEL_o137, TRUE) EVT_CALL(EnableModel, MODEL_o135, FALSE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_m1_yuka, SOUND_039A, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_m1_yuka, SOUND_SAM07_LOWER_FLOOR, 0) EVT_CALL(MakeLerp, 0, -180, 120, EASING_COS_IN_OUT) EVT_LABEL(1) EVT_CALL(UpdateLerp) diff --git a/src/world/area_sam/sam_08/sam_08_5_scenes.c b/src/world/area_sam/sam_08/sam_08_5_scenes.c index dbdf21a2b3..d436b70aab 100644 --- a/src/world/area_sam/sam_08/sam_08_5_scenes.c +++ b/src/world/area_sam/sam_08/sam_08_5_scenes.c @@ -44,7 +44,7 @@ EvtScript N(EVS_Scene_ImposterAppears) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o47, COLLIDER_FLAG_IGNORE_SHELL) EVT_THREAD EVT_CALL(EnableModel, MODEL_m1_kabe, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_m1_kabe, SOUND_039B, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_m1_kabe, SOUND_SAM08_RAISE_FLOOR, 0) EVT_CALL(MakeLerp, -120, 0, 60 * DT, EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(UpdateLerp) @@ -511,7 +511,7 @@ EvtScript N(EVS_Scene_HitFakeKooper) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(SetNpcAnimation, NPC_Kooper_02A, ANIM_WorldKooper_Hurt) EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Kooper_02A, SOUND_20B8, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Kooper_02A, SOUND_GHOST_TRANSFORM, SOUND_SPACE_DEFAULT) EVT_LOOP(10) EVT_CALL(GetNpcPos, NPC_Kooper_02A, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 3) diff --git a/src/world/area_sam/sam_11/sam_11_6_pond.c b/src/world/area_sam/sam_11/sam_11_6_pond.c index bec9b2145e..dc0553a8c0 100644 --- a/src/world/area_sam/sam_11/sam_11_6_pond.c +++ b/src/world/area_sam/sam_11/sam_11_6_pond.c @@ -137,7 +137,7 @@ EvtScript N(EVS_DamageFrozenPond_Before) = { EVT_SWITCH(GB_SAM11_FrozenPondDamage) EVT_CASE_EQ(1) EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_suimen, SOUND_0389, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_suimen, SOUND_SAM_POND_CRACK_1, 0) EVT_CALL(EnableModel, MODEL_ice01, FALSE) EVT_CALL(EnableModel, MODEL_ice02, TRUE) EVT_CALL(SetNpcFlagBits, NPC_PenguinPatrol, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_GRAVITY, TRUE) @@ -159,12 +159,12 @@ EvtScript N(EVS_DamageFrozenPond_Before) = { EVT_CASE_EQ(2) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(InterruptUsePartner) - EVT_CALL(PlaySoundAtCollider, COLLIDER_suimen, SOUND_038A, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_suimen, SOUND_SAM_POND_CRACK_2, 0) EVT_CALL(EnableModel, MODEL_ice02, FALSE) EVT_CALL(EnableModel, MODEL_ice03, TRUE) EVT_THREAD EVT_WAIT(10) - EVT_CALL(PlaySoundAtNpc, NPC_PenguinPatrol, SOUND_0397, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PenguinPatrol, SOUND_PENGUIN_WHISTLE, SOUND_SPACE_DEFAULT) EVT_END_THREAD EVT_CALL(SetNpcFlagBits, NPC_PenguinPatrol, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Run) @@ -185,7 +185,7 @@ EvtScript N(EVS_DamageFrozenPond_Before) = { EVT_CALL(NpcMoveTo, NPC_PenguinPatrol, LVar0, LVar2, 0) EVT_THREAD EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(PlaySoundAtPlayer, SOUND_0398, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_DRAG_PLAYER, SOUND_SPACE_DEFAULT) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Thrown) EVT_SET(MF_Unk_01, FALSE) @@ -207,7 +207,7 @@ EvtScript N(EVS_DamageFrozenPond_Before) = { EVT_CALL(NpcMoveTo, NPC_PenguinPatrol, -207, 110, 0) EVT_CALL(NpcMoveTo, NPC_PenguinPatrol, -450, 0, 0) EVT_SET(MF_Unk_01, TRUE) - EVT_CALL(StopSound, SOUND_0398) + EVT_CALL(StopSound, SOUND_DRAG_PLAYER) EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Idle) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Surprise) EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_Talk, ANIM_PenguinPatrol_Idle, 0, MSG_CH7_00B8) @@ -220,7 +220,7 @@ EvtScript N(EVS_DamageFrozenPond_Before) = { EVT_ADD(LVar0, -20) EVT_CALL(NpcMoveTo, NPC_PenguinPatrol, LVar0, LVar2, 0) EVT_WAIT(10) - EVT_CALL(PlaySoundAtNpc, NPC_PenguinPatrol, SOUND_0390, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PenguinPatrol, SOUND_TOSS_PLAYER, SOUND_SPACE_DEFAULT) EVT_THREAD EVT_SET(MV_ThrownOut, 1) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) @@ -290,11 +290,11 @@ EvtScript N(EVS_DamageFrozenPond_After) = { EVT_IF_NE(GB_SAM11_FrozenPondDamage, 3) EVT_SWITCH(GB_SAM11_FrozenPondDamage) EVT_CASE_EQ(1) - EVT_CALL(PlaySoundAtCollider, COLLIDER_suimen, SOUND_0389, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_suimen, SOUND_SAM_POND_CRACK_1, 0) EVT_CALL(EnableModel, MODEL_ice01, FALSE) EVT_CALL(EnableModel, MODEL_ice02, TRUE) EVT_CASE_EQ(2) - EVT_CALL(PlaySoundAtCollider, COLLIDER_suimen, SOUND_038A, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_suimen, SOUND_SAM_POND_CRACK_2, 0) EVT_CALL(EnableModel, MODEL_ice02, FALSE) EVT_CALL(EnableModel, MODEL_ice03, TRUE) EVT_END_SWITCH @@ -338,7 +338,7 @@ EvtScript N(EVS_DamageFrozenPond_After) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_END_THREAD EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_038B, SOUND_SPACE_DEFAULT, 0, 60, 220) + EVT_CALL(PlaySoundAt, SOUND_SAM_POND_SHATTER, SOUND_SPACE_DEFAULT, 0, 60, 220) EVT_CALL(N(SpawnIceShards)) EVT_CALL(EnableModel, MODEL_ice03, FALSE) EVT_CALL(SetGroupVisibility, MODEL_ice04, MODEL_GROUP_VISIBLE) @@ -365,8 +365,8 @@ EvtScript N(EVS_DamageFrozenPond_After) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o663, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o356, SURFACE_TYPE_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_deilitp, SURFACE_TYPE_DOCK_WALL) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o356, COLLIDER_FLAG_80000) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitp, COLLIDER_FLAG_IGNORE_SHELL | COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o356, COLLIDER_FLAG_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitp, COLLIDER_FLAG_IGNORE_SHELL | COLLIDER_FLAG_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_suimen, SURFACE_TYPE_WATER) EVT_EXEC(N(EVS_SetupIcebergs)) EVT_SET(GB_SAM11_FrozenPondDamage, 4) @@ -517,8 +517,8 @@ EvtScript N(EVS_SetupPond) = { EVT_ELSE EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o356, SURFACE_TYPE_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_deilitp, SURFACE_TYPE_DOCK_WALL) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o356, COLLIDER_FLAG_80000) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitp, COLLIDER_FLAG_IGNORE_SHELL | COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o356, COLLIDER_FLAG_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitp, COLLIDER_FLAG_IGNORE_SHELL | COLLIDER_FLAG_DOCK_WALL) EVT_END_IF EVT_RETURN EVT_END diff --git a/src/world/area_sbk/sbk_02/sbk_02_4_npc.c b/src/world/area_sbk/sbk_02/sbk_02_4_npc.c index 6a90010ae6..ccfabca6dc 100644 --- a/src/world/area_sbk/sbk_02/sbk_02_4_npc.c +++ b/src/world/area_sbk/sbk_02/sbk_02_4_npc.c @@ -29,7 +29,7 @@ EvtScript N(EVS_NpcIdle_Mamar) = { }; API_CALLABLE(N(UpgradeStarPowerCh2)) { - set_max_SP(2); + set_max_star_power(2); gPlayerData.curHP = gPlayerData.curMaxHP; gPlayerData.curFP = gPlayerData.curMaxFP; sync_status_bar(); diff --git a/src/world/area_tik/tik_01/tik_01_5_npc.c b/src/world/area_tik/tik_01/tik_01_5_npc.c index 818f0f4c2e..8ab26d5e14 100644 --- a/src/world/area_tik/tik_01/tik_01_5_npc.c +++ b/src/world/area_tik/tik_01/tik_01_5_npc.c @@ -18,7 +18,7 @@ EvtScript N(EVS_NpcIdle_Blooper) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -75) EVT_CALL(SetNpcPos, NPC_SELF, LVar0, 150, 0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_03DC, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BLOOPER_MOVE, SOUND_SPACE_DEFAULT) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_LARGE_ACTOR_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcFlyTo, NPC_SELF, LVar0, 0, 0, 10, 0, EASING_QUADRATIC_IN) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Blooper_Anim0C) @@ -43,7 +43,7 @@ EvtScript N(EVS_NpcDefeat_Blooper) = { EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_03DD, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BLOOPER_FALL, SOUND_SPACE_DEFAULT) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_LARGE_ACTOR_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(NpcFlyTo, NPC_SELF, LVar0, 150, 0, 15, 0, EASING_QUADRATIC_IN) diff --git a/src/world/area_tik/tik_02/tik_02_5_npc.c b/src/world/area_tik/tik_02/tik_02_5_npc.c index ed1097b2c6..06541e6a84 100644 --- a/src/world/area_tik/tik_02/tik_02_5_npc.c +++ b/src/world/area_tik/tik_02/tik_02_5_npc.c @@ -29,7 +29,7 @@ EvtScript N(EVS_NpcIdle_Blooper) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, 140, LVar1, LVar2) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_03DC, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BLOOPER_MOVE, SOUND_SPACE_DEFAULT) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_LARGE_ACTOR_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcPos, NPC_SELF, -100, -300, -120) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Blooper_Anim01) @@ -63,7 +63,7 @@ EvtScript N(EVS_NpcDefeat_Blooper) = { EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_03DD, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BLOOPER_FALL, SOUND_SPACE_DEFAULT) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_LARGE_ACTOR_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_SELF, -100, -300, -120, 40) diff --git a/src/world/area_tik/tik_08/tik_08_2_main.c b/src/world/area_tik/tik_08/tik_08_2_main.c index 85924bfe4b..d7c84c6648 100644 --- a/src/world/area_tik/tik_08/tik_08_2_main.c +++ b/src/world/area_tik/tik_08/tik_08_2_main.c @@ -62,8 +62,8 @@ EvtScript N(EVS_Main) = { EVT_END_THREAD EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o77, SURFACE_TYPE_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o75, SURFACE_TYPE_DOCK_WALL) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o77, COLLIDER_FLAG_80000) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o75, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o77, COLLIDER_FLAG_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o75, COLLIDER_FLAG_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_suimen, SURFACE_TYPE_WATER) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_ttd, COLLIDER_FLAGS_UPPER_MASK) EVT_WAIT(1) diff --git a/src/world/area_tik/tik_08/tik_08_5_npc.c b/src/world/area_tik/tik_08/tik_08_5_npc.c index 91fa285ca5..4aa8a9f9f6 100644 --- a/src/world/area_tik/tik_08/tik_08_5_npc.c +++ b/src/world/area_tik/tik_08/tik_08_5_npc.c @@ -26,7 +26,7 @@ EvtScript N(EVS_NpcIdle_Blooper) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(InterpPlayerYaw, 270, 0) EVT_WAIT(20) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_03DC, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BLOOPER_MOVE, SOUND_SPACE_DEFAULT) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_LARGE_ACTOR_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, -250, -60, 15, EASING_QUADRATIC_IN) EVT_LOOP(0) @@ -63,7 +63,7 @@ EvtScript N(EVS_NpcDefeat_Blooper) = { EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_03DD, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BLOOPER_FALL, SOUND_SPACE_DEFAULT) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_LARGE_ACTOR_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcFlyTo, NPC_SELF, -40, -250, 0, 40, 0, EASING_LINEAR) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.0)) diff --git a/src/world/area_tik/tik_18/tik_18_4_npc.c b/src/world/area_tik/tik_18/tik_18_4_npc.c index 9bd13a7aef..581b440672 100644 --- a/src/world/area_tik/tik_18/tik_18_4_npc.c +++ b/src/world/area_tik/tik_18/tik_18_4_npc.c @@ -13,7 +13,7 @@ EvtScript N(EVS_NpcIdle_SpikedGloomba) = { EVT_END_IF EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_SpikedGoomba_Dark_Sleep) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_03E1, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_AI_FOUND_PLAYER_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, -90, 0, 10, EASING_LINEAR) EVT_LABEL(1) EVT_CALL(UpdateLerp) diff --git a/src/world/area_trd/trd_00/trd_00_3_npc.c b/src/world/area_trd/trd_00/trd_00_3_npc.c index 6e2b461e5f..c32fc975cc 100644 --- a/src/world/area_trd/trd_00/trd_00_3_npc.c +++ b/src/world/area_trd/trd_00/trd_00_3_npc.c @@ -5,7 +5,7 @@ extern EvtScript N(EVS_SetupMusic); API_CALLABLE(N(UpgradeStarPowerCh1)) { - set_max_SP(1); + set_max_star_power(1); gPlayerData.curHP = gPlayerData.curMaxHP; gPlayerData.curFP = gPlayerData.curMaxFP; sync_status_bar(); diff --git a/src/world/area_trd/trd_09/trd_09_3_npc.c b/src/world/area_trd/trd_09/trd_09_3_npc.c index 263c74ae24..e95cdbdc99 100644 --- a/src/world/area_trd/trd_09/trd_09_3_npc.c +++ b/src/world/area_trd/trd_09/trd_09_3_npc.c @@ -414,7 +414,7 @@ EvtScript N(EVS_NpcAI_BulletBill) = { EVT_ADD(LVar2, 11) EVT_CALL(SetNpcPos, NPC_SELF, LVar1, LVar2, LVar3) EVT_CALL(InterpNpcYaw, NPC_SELF, LVar4, 0) - EVT_CALL(func_80045838, -1, SOUND_0328, SOUND_PARAM_MORE_QUIET) + EVT_CALL(func_80045838, -1, SOUND_BLASTER_FIRE, SOUND_PARAM_MORE_QUIET) EVT_SET(LVarA, LVar1) EVT_SUB(LVarA, 10) EVT_SET(LVarB, LVar2) diff --git a/src/world/area_trd/trd_10/trd_10_3_fake_bowser.c b/src/world/area_trd/trd_10/trd_10_3_fake_bowser.c index f6f4bd9adf..3e5e99a627 100644 --- a/src/world/area_trd/trd_10/trd_10_3_fake_bowser.c +++ b/src/world/area_trd/trd_10/trd_10_3_fake_bowser.c @@ -51,7 +51,7 @@ EvtScript N(EVS_RevealFakeBowser) = { EVT_GOTO(0) EVT_END_IF EVT_CALL(MakeLerp, 100, -100, 60 * DT, EASING_QUADRATIC_OUT) - EVT_CALL(PlaySoundAt, SOUND_03BE, SOUND_SPACE_DEFAULT, 50, 0, 0) + EVT_CALL(PlaySoundAt, SOUND_FAKE_BOWSER_LONG_WALK, SOUND_SPACE_DEFAULT, 50, 0, 0) EVT_LABEL(10) EVT_CALL(UpdateLerp) EVT_EXEC_WAIT(N(EVS_SetModelsPos)) diff --git a/src/world/area_tst/tst_03/tst_03_1_main.c b/src/world/area_tst/tst_03/tst_03_1_main.c index efd798f003..bcf545ccbd 100644 --- a/src/world/area_tst/tst_03/tst_03_1_main.c +++ b/src/world/area_tst/tst_03/tst_03_1_main.c @@ -46,8 +46,8 @@ EvtScript N(EVS_Main) = { EVT_BIND_TRIGGER(EVT_PTR(N(EVS_GotoMap_tst_04_0)), TRIGGER_WALL_PUSH, COLLIDER_deilite, 1, 0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_puku, SURFACE_TYPE_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_pukut, SURFACE_TYPE_DOCK_WALL) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_puku, COLLIDER_FLAG_80000) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_pukut, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_puku, COLLIDER_FLAG_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_pukut, COLLIDER_FLAG_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o264, SURFACE_TYPE_WATER) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o265, SURFACE_TYPE_SPIKES) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o236, SURFACE_TYPE_LAVA) diff --git a/src/world/common/atomic/ToadHouse.inc.c b/src/world/common/atomic/ToadHouse.inc.c index 77e4b6ea06..183f839e96 100644 --- a/src/world/common/atomic/ToadHouse.inc.c +++ b/src/world/common/atomic/ToadHouse.inc.c @@ -65,7 +65,7 @@ API_CALLABLE(N(ToadHouse_DoesPlayerNeedSleep)) { if (playerData->curMaxFP != playerData->curFP) { return ApiStatus_DONE2; } - if (playerData->specialBarsFilled != playerData->maxStarPower * 256) { + if (playerData->starPower != playerData->maxStarPower * SP_PER_BAR) { return ApiStatus_DONE2; } script->varTable[1] = TRUE; diff --git a/src/world/common/complete/Quizmo.inc.c b/src/world/common/complete/Quizmo.inc.c index afbb61ee7f..1c6615433e 100644 --- a/src/world/common/complete/Quizmo.inc.c +++ b/src/world/common/complete/Quizmo.inc.c @@ -239,15 +239,15 @@ API_CALLABLE(N(Quizmo_HideWorld)) { for (i = 0; i < MAX_NPCS; i++) { Npc* npc = get_npc_by_index(i); - - if (npc != NULL && npc->flags != 0 && npc->npcID != NPC_PARTNER && npc->npcID != CHUCK_QUIZMO_NPC_ID) { - npc->flags |= NPC_FLAG_HIDING; + if (npc != NULL && npc->flags != 0) { + if (npc->npcID != NPC_PARTNER && npc->npcID != CHUCK_QUIZMO_NPC_ID) { + npc->flags |= NPC_FLAG_HIDING; + } } } for (i = 0; i < MAX_ITEM_ENTITIES; i++) { ItemEntity* itemEntity = get_item_entity(i); - if (itemEntity != NULL && itemEntity->flags & ITEM_ENTITY_FLAG_10) { itemEntity->flags |= ITEM_ENTITY_FLAG_HIDING; } diff --git a/src/world/common/enemy/Clubba_Multi.inc.c b/src/world/common/enemy/Clubba_Multi.inc.c index 0f5c0e26d7..76ef003182 100644 --- a/src/world/common/enemy/Clubba_Multi.inc.c +++ b/src/world/common/enemy/Clubba_Multi.inc.c @@ -162,7 +162,7 @@ EvtScript N(EVS_NpcAI_Clubba_Hitbox) = { EVT_CALL(SetSelfVar, 2, 50) EVT_CALL(SetSelfVar, 3, 32) EVT_CALL(SetSelfVar, 4, 3) - EVT_CALL(SetSelfVar, 15, SOUND_20C5) + EVT_CALL(SetSelfVar, 15, SOUND_CLUBBA_SWING) EVT_CALL(N(MeleeHitbox_Main)) EVT_RETURN EVT_END diff --git a/src/world/common/enemy/FrostClubba_Multi.inc.c b/src/world/common/enemy/FrostClubba_Multi.inc.c index 652b332ac0..d6aa85ef93 100644 --- a/src/world/common/enemy/FrostClubba_Multi.inc.c +++ b/src/world/common/enemy/FrostClubba_Multi.inc.c @@ -160,7 +160,7 @@ EvtScript N(EVS_NpcAI_FrostClubba_Hitbox) = { EVT_CALL(SetSelfVar, 2, 48) EVT_CALL(SetSelfVar, 3, 30) EVT_CALL(SetSelfVar, 4, 3) - EVT_CALL(SetSelfVar, 15, SOUND_20C5) + EVT_CALL(SetSelfVar, 15, SOUND_CLUBBA_SWING) EVT_CALL(N(MeleeHitbox_Main)) EVT_RETURN EVT_END diff --git a/src/world/common/enemy/FrostPiranha.inc.c b/src/world/common/enemy/FrostPiranha.inc.c index 99157597b4..9dd397b652 100644 --- a/src/world/common/enemy/FrostPiranha.inc.c +++ b/src/world/common/enemy/FrostPiranha.inc.c @@ -40,7 +40,7 @@ EvtScript N(EVS_NpcAI_FrostPiranha_Hitbox) = { EVT_CALL(SetSelfVar, 0, 14) EVT_CALL(SetSelfVar, 1, 28) EVT_CALL(SetSelfVar, 4, 3) - EVT_CALL(SetSelfVar, 15, SOUND_20DE) + EVT_CALL(SetSelfVar, 15, SOUND_PIRANHA_BITE) EVT_CALL(N(MeleeHitbox_Main)) EVT_RETURN EVT_END diff --git a/src/world/common/enemy/PiranhaPlant.inc.c b/src/world/common/enemy/PiranhaPlant.inc.c index 8a9b7d3158..2c3ee47ca5 100644 --- a/src/world/common/enemy/PiranhaPlant.inc.c +++ b/src/world/common/enemy/PiranhaPlant.inc.c @@ -40,7 +40,7 @@ EvtScript N(EVS_NpcAI_PiranhaPlant_Hitbox) = { EVT_CALL(SetSelfVar, 0, 10) EVT_CALL(SetSelfVar, 1, 18) EVT_CALL(SetSelfVar, 4, 3) - EVT_CALL(SetSelfVar, 15, SOUND_20DE) + EVT_CALL(SetSelfVar, 15, SOUND_PIRANHA_BITE) EVT_CALL(N(MeleeHitbox_Main)) EVT_RETURN EVT_END diff --git a/src/world/common/enemy/PutridPiranha.inc.c b/src/world/common/enemy/PutridPiranha.inc.c index d0880d5a9e..1c7a62550e 100644 --- a/src/world/common/enemy/PutridPiranha.inc.c +++ b/src/world/common/enemy/PutridPiranha.inc.c @@ -40,7 +40,7 @@ EvtScript N(EVS_NpcAI_PutridPiranha_Hitbox) = { EVT_CALL(SetSelfVar, 0, 14) EVT_CALL(SetSelfVar, 1, 28) EVT_CALL(SetSelfVar, 4, 3) - EVT_CALL(SetSelfVar, 15, SOUND_20DE) + EVT_CALL(SetSelfVar, 15, SOUND_PIRANHA_BITE) EVT_CALL(N(MeleeHitbox_Main)) EVT_RETURN EVT_END diff --git a/src/world/common/enemy/Sentinel.inc.c b/src/world/common/enemy/Sentinel.inc.c index fc613d6466..09eada3df2 100644 --- a/src/world/common/enemy/Sentinel.inc.c +++ b/src/world/common/enemy/Sentinel.inc.c @@ -50,7 +50,7 @@ EvtScript N(EVS_NpcAI_Sentinel) = { EVT_ADD(LVar1, 20) EVT_ADD(LVar2, 2) EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) - EVT_CALL(func_80045838, -1, SOUND_02F7, 0) + EVT_CALL(func_80045838, -1, SOUND_SENTINEL_PICKUP, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Sentinel_Anim08) EVT_WAIT(10) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Flail) diff --git a/src/world/common/enemy/ai/BulletBillAI.inc.c b/src/world/common/enemy/ai/BulletBillAI.inc.c index f36f3dbff3..d3afb56cd3 100644 --- a/src/world/common/enemy/ai/BulletBillAI.inc.c +++ b/src/world/common/enemy/ai/BulletBillAI.inc.c @@ -211,7 +211,7 @@ API_CALLABLE(N(BillBlasterAI_Main)) { npc->curAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; bulletEnemy = get_enemy(enemy->AI_VAR_BLASTER_BULLET); bulletEnemy->VAR_PROJECTILE_HITBOX_STATE = PROJECTILE_HITBOX_STATE_PRE; - ai_enemy_play_sound(npc, SOUND_0328, SOUND_PARAM_MORE_QUIET); + ai_enemy_play_sound(npc, SOUND_BLASTER_FIRE, SOUND_PARAM_MORE_QUIET); npc->duration = 5; script->AI_TEMP_STATE = AI_STATE_BLASTER_COOLDOWN; // fallthrough diff --git a/src/world/common/enemy/ai/FlyingAI.inc.c b/src/world/common/enemy/ai/FlyingAI.inc.c index 0ffd12ef08..23f2fbbede 100644 --- a/src/world/common/enemy/ai/FlyingAI.inc.c +++ b/src/world/common/enemy/ai/FlyingAI.inc.c @@ -188,7 +188,7 @@ void N(FlyingAI_LoiterInit)(Evt* script, MobileAISettings* aiSettings, EnemyDete npc->duration = (aiSettings->waitTime / 2) + rand_int((aiSettings->waitTime / 2) + 1); npc->yaw = clamp_angle(npc->yaw + rand_int(180) - 90.0f); - npc->curAnim = *enemy->animList; + npc->curAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; script->functionTemp[0] = 3; } diff --git a/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c b/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c index 4ed747accf..843c66c29f 100644 --- a/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c +++ b/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c @@ -54,7 +54,7 @@ void N(ShyGuyPatrolAI_17)(Evt* script, MobileAISettings* aiSettings, EnemyDetect npc->duration--; if (npc->duration == 0) { - npc->curAnim = *enemy->animList; + npc->curAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; script->functionTemp[0] = 0; } } diff --git a/src/world/common/enemy/ai/ShyGuyWanderAI.inc.c b/src/world/common/enemy/ai/ShyGuyWanderAI.inc.c index 07b4c978db..f1ebcb4b5e 100644 --- a/src/world/common/enemy/ai/ShyGuyWanderAI.inc.c +++ b/src/world/common/enemy/ai/ShyGuyWanderAI.inc.c @@ -52,7 +52,7 @@ void N(ShyGuyWanderAI_17)(Evt* script, MobileAISettings* aiSettings, EnemyDetect npc->duration--; if (npc->duration == 0) { - npc->curAnim = *enemy->animList; + npc->curAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; script->functionTemp[0] = 0; } } diff --git a/src/world/common/entity/SuperBlock.inc.c b/src/world/common/entity/SuperBlock.inc.c index d566540529..0808b2e180 100644 --- a/src/world/common/entity/SuperBlock.inc.c +++ b/src/world/common/entity/SuperBlock.inc.c @@ -196,7 +196,7 @@ API_CALLABLE(N(SuperBlock_SwitchToPartner)) { } API_CALLABLE(N(SuperBlock_LoadCurrentPartnerName)) { - set_message_msg(gPartnerPopupProperties[gPlayerData.curPartner].nameMsg, 0); + set_message_text_var(gPartnerPopupProperties[gPlayerData.curPartner].nameMsg, 0); return ApiStatus_DONE2; } diff --git a/src/world/common/todo/UnkFunc46.inc.c b/src/world/common/todo/UnkFunc46.inc.c index 64fe29f9cb..7542680a75 100644 --- a/src/world/common/todo/UnkFunc46.inc.c +++ b/src/world/common/todo/UnkFunc46.inc.c @@ -7,7 +7,7 @@ API_CALLABLE(N(UnkFunc46)) { f32 var3 = 0.0f; f32 var4 = 2000.0f; - if (npc_raycast_down_sides(COLLISION_CHANNEL_10000, &var1, &var2, &var3, &var4)) { + if (npc_raycast_down_sides(COLLIDER_FLAG_IGNORE_PLAYER, &var1, &var2, &var3, &var4)) { script->varTable[0] = var1; script->varTable[2] = var2 + 55.0f; } diff --git a/src/world/common/todo/UnkFunc62.inc.c b/src/world/common/todo/UnkFunc62.inc.c index 064a51a210..3d8d7fee0e 100644 --- a/src/world/common/todo/UnkFunc62.inc.c +++ b/src/world/common/todo/UnkFunc62.inc.c @@ -104,7 +104,7 @@ API_CALLABLE(N(UnkFunc62)) { state->vel = velocity + ((phi_f0 * phi_f2 * temp_f22_3) + temp_f22_3); } set_actor_anim(ACTOR_SELF, 1, state->animJumpRise); - sfx_play_sound(SOUND_JUMP_2081); + sfx_play_sound(SOUND_QUICK_PLAYER_JUMP); script->functionTemp[0] = 1; } diff --git a/src/world/dead/area_flo/flo_00/flo_00_3_npc.c b/src/world/dead/area_flo/flo_00/flo_00_3_npc.c index 70452560e6..cba1133151 100644 --- a/src/world/dead/area_flo/flo_00/flo_00_3_npc.c +++ b/src/world/dead/area_flo/flo_00/flo_00_3_npc.c @@ -12,7 +12,7 @@ NpcSettings N(NpcSettings_Dummy) = { #include "world/common/npc/StarSpirit.inc.c" API_CALLABLE(N(UpgradeStarPowerCh6)) { - set_max_SP(6); + set_max_star_power(6); gPlayerData.curHP = gPlayerData.curMaxHP; gPlayerData.curFP = gPlayerData.curMaxFP; sync_status_bar(); diff --git a/src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c b/src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c index 24b5aae7b4..9594e9d3f2 100644 --- a/src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c +++ b/src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c @@ -57,7 +57,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_THREAD EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 10) EVT_CALL(SetNpcYaw, NPC_SELF, 90) EVT_SET(MV_KoloradoJumpDone, TRUE) diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c b/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c index 60ccd3df2a..6d88ba9255 100644 --- a/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c +++ b/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c @@ -677,7 +677,7 @@ EvtScript N(EVS_NpcIdle_LavaPiranha) = { EVT_CALL(PlayerMoveTo, 200, -30, 0) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_03C5, SOUND_SPACE_DEFAULT, 330, 25, -50) + EVT_CALL(PlaySoundAt, SOUND_LAVA_PIRANHA_EMERGE, SOUND_SPACE_DEFAULT, 330, 25, -50) EVT_EXEC(N(EVS_PlayVinesAnim_Emerge)) EVT_WAIT(59) EVT_THREAD @@ -932,7 +932,7 @@ EvtScript N(EVS_NpcDefeat_LavaPiranha) = { EVT_CALL(EnableGroup, MODEL_mae, FALSE) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_ato, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_mae, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySoundAt, SOUND_03C6, SOUND_SPACE_DEFAULT, 330, 25, -50) + EVT_CALL(PlaySoundAt, SOUND_LAVA_PIRANHA_DEFEAT, SOUND_SPACE_DEFAULT, 330, 25, -50) EVT_EXEC(N(EVS_PlayVinesAnim_Defeat)) EVT_WAIT(1) EVT_CALL(SetNpcAux, NPC_SELF, EVT_PTR(N(EVS_NpcAux_LavaPiranha))) diff --git a/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c b/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c index 5035db12d1..44452e523b 100644 --- a/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c +++ b/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c @@ -187,9 +187,9 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) EVT_CALL(SetNpcPos, NPC_SELF, -30, 100, 40) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, -25, 125, -20, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 20, 150, 5, 10) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) EVT_CALL(NpcMoveTo, NPC_SELF, 40, 35, 0) @@ -214,7 +214,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) EVT_CALL(NpcMoveTo, NPC_SELF, 20, 0, 0) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, -35, 125, -20, 12) EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(1.0)) @@ -254,11 +254,11 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.0)) EVT_SET(MV_SceneState, SCENE_STATE_KOLORADO_WENT_BACK) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, -30, 100, 40, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, -15, 75, 80, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 35, 50, 120, 10) EVT_CASE_EQ(SCENE_STATE_KOLORADO_WARNED) EVT_CALL(N(func_80240A68_C96998)) @@ -299,9 +299,9 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Walk) EVT_CALL(SetNpcPos, NPC_SELF, -30, 100, 40) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, -25, 125, -20, 10) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, 20, 150, 5, 8) EVT_SET(MV_SceneState, SCENE_STATE_SEARCH_FOR_EXIT) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) diff --git a/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c b/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c index 8e07041ca8..6af8c485a9 100644 --- a/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c +++ b/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c @@ -50,7 +50,7 @@ EVT_END_IF //@bug unmatched endif // repeatedly jump for the treasure chest EVT_LABEL(1) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(2.0)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_032C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_NPC_JUMP, SOUND_SPACE_DEFAULT) EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 15) EVT_IF_EQ(AF_KZN23_GrabbedKolorado, FALSE) EVT_WAIT(1) diff --git a/src/7fd10_len_b40.c b/src/world/menus.c similarity index 59% rename from src/7fd10_len_b40.c rename to src/world/menus.c index 30f3b47cf5..2cdeafa09f 100644 --- a/src/7fd10_len_b40.c +++ b/src/world/menus.c @@ -9,30 +9,45 @@ #include "world/partners.h" #include "world/partner/lakilester.h" -BSS s16 D_8010C9C0; +enum WorldMenuStates { + WORLD_MENU_STATE_NONE = 0, + WORLD_MENU_STATE_DELAY = 1, + WORLD_MENU_STATE_OPEN = 2, + WORLD_MENU_STATE_HOLD = 3, + WORLD_MENU_STATE_CLOSE = 4, + WORLD_MENU_STATE_UNPAUSE = 10, +}; + +enum WorldMenuTypes { + WORLD_MENU_CHANGE_PARTNER = 0, + WORLD_MENU_USE_ITEM = 1, + WORLD_MENU_PAUSE = 2, +}; + +BSS s16 SwappedWorldMenus; BSS char D_8010C9C4[0x4]; -BSS PopupMenu D_8010C9C8; -BSS s16 D_8010CCF8; -BSS s16 D_8010CCFA; -BSS s16 D_8010CCFC; -BSS s16 D_8010CCFE; -BSS s16 D_8010CD00; +BSS PopupMenu WorldPopupMenu; +BSS s16 WorldMenuType; +BSS s16 WorldMenuDelay; +BSS s16 WorldPopupResult; +BSS s16 OpenMenuDisableCount; +BSS s16 WorldMenuState; extern s32 MenuIndexFromPartnerID[]; -void func_800E6860(void) { +void reset_outta_sight_alpha_on_menu_close(void) { PlayerStatus* playerStatus = &gPlayerStatus; if (gPartnerStatus.partnerActionState != PARTNER_ACTION_NONE && gPartnerStatus.actingPartner == PARTNER_BOW) { Npc* partner = get_npc_unsafe(NPC_PARTNER); - set_player_imgfx_comp(PLAYER_SPRITE_MAIN, -1, IMGFX_SET_ALPHA, 0, 0, 0, playerStatus->alpha1, 0); - npc_set_imgfx_params(partner, IMGFX_SET_ALPHA, playerStatus->alpha1, 0, 0, 0, 0); - playerStatus->alpha2 = 0; + set_player_imgfx_comp(PLAYER_SPRITE_MAIN, -1, IMGFX_SET_ALPHA, 0, 0, 0, playerStatus->curAlpha, 0); + npc_set_imgfx_params(partner, IMGFX_SET_ALPHA, playerStatus->curAlpha, 0, 0, 0, 0); + playerStatus->prevAlpha = 0; } } -s32 func_800E6904(void) { +b32 should_cancel_open_world_menu(void) { PartnerStatus* partnerStatus = &gPartnerStatus; PlayerStatus* playerStatus = &gPlayerStatus; s32 actionState = playerStatus->actionState; @@ -47,7 +62,7 @@ s32 func_800E6904(void) { { return TRUE; } - } else if (partner_player_can_pause()) { + } else if (partner_can_open_world_menus()) { if (partnerStatus->actingPartner == PARTNER_WATT) { return TRUE; } else if (partnerStatus->actingPartner == PARTNER_BOW) { @@ -64,7 +79,7 @@ s32 func_800E6904(void) { return FALSE; } -s32 can_pause(s32 currentButtons, s32 pressedButtons) { +b32 can_open_world_menu(s32 currentButtons, s32 pressedButtons) { PartnerStatus* partnerStatus = &gPartnerStatus; s32 actionState = gPlayerStatus.actionState; @@ -72,50 +87,50 @@ s32 can_pause(s32 currentButtons, s32 pressedButtons) { && !(gPlayerStatus.flags & PS_FLAG_PAUSE_DISABLED) && !(currentButtons & (BUTTON_Z | BUTTON_R)) && (pressedButtons & (BUTTON_START | BUTTON_C_LEFT | BUTTON_C_RIGHT)) - && ((gGameStatusPtr->mapShop == NULL) || !(gGameStatusPtr->mapShop->flags & SHOP_FLAG_1)) + && !((gGameStatusPtr->mapShop != NULL) && (gGameStatusPtr->mapShop->flags & SHOP_FLAG_SHOWING_ITEM_INFO)) && !(gOverrideFlags & GLOBAL_OVERRIDES_DISABLE_MENUS) && !is_picking_up_item() ) { - if (!(gPlayerStatus.animFlags & PA_FLAG_8BIT_MARIO)) { - if (partnerStatus->partnerActionState == PARTNER_ACTION_NONE) { - if (!(gPlayerStatus.flags & PS_FLAG_NO_STATIC_COLLISION)) { - if (actionState == ACTION_STATE_IDLE || - actionState == ACTION_STATE_WALK || - actionState == ACTION_STATE_RUN) - { - return TRUE; - } - } - } else if (partner_player_can_pause()) { - if (partnerStatus->actingPartner == PARTNER_WATT) { - return actionState == ACTION_STATE_IDLE || - actionState == ACTION_STATE_WALK || - actionState == ACTION_STATE_RUN; - } else if (partnerStatus->actingPartner == PARTNER_BOW) { - if (actionState == ACTION_STATE_RIDE) { - gPlayerStatus.alpha2 = 0; - return TRUE; - } - } else if (partnerStatus->actingPartner == PARTNER_LAKILESTER) { - if (actionState == ACTION_STATE_RIDE) { - if (world_lakilester_can_dismount()) { - return TRUE; - } - sfx_play_sound(SOUND_MENU_ERROR); - } - } else if (partnerStatus->actingPartner == PARTNER_SUSHIE) { - sfx_play_sound(SOUND_MENU_ERROR); + if (gPlayerStatus.animFlags & PA_FLAG_8BIT_MARIO) { + sfx_play_sound(SOUND_MENU_ERROR); + return FALSE; + } + if (partnerStatus->partnerActionState == PARTNER_ACTION_NONE) { + if (!(gPlayerStatus.flags & PS_FLAG_NO_STATIC_COLLISION)) { + if (actionState == ACTION_STATE_IDLE || + actionState == ACTION_STATE_WALK || + actionState == ACTION_STATE_RUN + ) { + return TRUE; } } - } else { - sfx_play_sound(SOUND_MENU_ERROR); + } else if (partner_can_open_world_menus()) { + if (partnerStatus->actingPartner == PARTNER_WATT) { + return actionState == ACTION_STATE_IDLE || + actionState == ACTION_STATE_WALK || + actionState == ACTION_STATE_RUN; + } else if (partnerStatus->actingPartner == PARTNER_BOW) { + if (actionState == ACTION_STATE_RIDE) { + gPlayerStatus.prevAlpha = 0; + return TRUE; + } + } else if (partnerStatus->actingPartner == PARTNER_LAKILESTER) { + if (actionState == ACTION_STATE_RIDE) { + if (world_lakilester_can_dismount()) { + return TRUE; + } + sfx_play_sound(SOUND_MENU_ERROR); + } + } else if (partnerStatus->actingPartner == PARTNER_SUSHIE) { + sfx_play_sound(SOUND_MENU_ERROR); + } } } return FALSE; } -void func_800E6B68(void) { - D_8010CD00 = 0; +void clear_world_menus(void) { + WorldMenuState = WORLD_MENU_STATE_NONE; } s32 setup_partner_popup(PopupMenu* menu) { @@ -175,7 +190,7 @@ s32 setup_item_popup(PopupMenu* menu) { } void check_input_open_menus(void) { - static s16 D_8010C9C0; + static s16 SwappedWorldMenus; PartnerStatus* partnerStatus; PlayerStatus* playerStatus; @@ -190,7 +205,7 @@ void check_input_open_menus(void) { partnerStatus = &gPartnerStatus; playerStatus = &gPlayerStatus; playerData = &gPlayerData; - popup = &D_8010C9C8; + popup = &WorldPopupMenu; if (gGameStatusPtr->debugScripts != DEBUG_SCRIPTS_NONE || (gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_IS_PEACH) @@ -199,7 +214,7 @@ void check_input_open_menus(void) { return; } - if (partnerStatus->partnerActionState != 0 && + if (partnerStatus->partnerActionState != PARTNER_ACTION_NONE && (partnerStatus->actingPartner == PARTNER_SUSHIE || partnerStatus->actingPartner == PARTNER_LAKILESTER || partnerStatus->actingPartner == PARTNER_BOW)) @@ -212,29 +227,30 @@ void check_input_open_menus(void) { } partnerActionState = &partnerStatus->partnerActionState; + // prevent opening popup menus during the epilogue if (evt_get_variable(NULL, GB_StoryProgress) >= STORY_EPILOGUE) { currentButtons &= ~(BUTTON_C_LEFT | BUTTON_C_RIGHT); pressedButtons &= ~(BUTTON_C_LEFT | BUTTON_C_RIGHT); } - switch (D_8010CD00) { - case 0: - if (can_pause(currentButtons, pressedButtons)) { - D_8010CCF8 = 1; - if (pressedButtons & 1) { - D_8010CCF8 = 0; + switch (WorldMenuState) { + case WORLD_MENU_STATE_NONE: + if (can_open_world_menu(currentButtons, pressedButtons)) { + WorldMenuType = WORLD_MENU_USE_ITEM; + if (pressedButtons & BUTTON_C_RIGHT) { + WorldMenuType = WORLD_MENU_CHANGE_PARTNER; } if (pressedButtons & BUTTON_START) { - D_8010CCF8 = 2; + WorldMenuType = WORLD_MENU_PAUSE; } - D_8010C9C0 = FALSE; + SwappedWorldMenus = FALSE; block_17: - switch (D_8010CCF8) { - case 0: + switch (WorldMenuType) { + case WORLD_MENU_CHANGE_PARTNER: if (playerStatus->flags & PS_FLAG_NO_CHANGE_PARTNER) { sfx_play_sound(SOUND_MENU_ERROR); - if (D_8010C9C0) { - func_800E6860(); + if (SwappedWorldMenus) { + reset_outta_sight_alpha_on_menu_close(); playerStatus->flags &= ~PS_FLAG_PAUSED; gOverrideFlags &= ~GLOBAL_OVERRIDES_40; set_time_freeze_mode(TIME_FREEZE_NORMAL); @@ -250,7 +266,7 @@ block_17: break; } return; - case 1: + case WORLD_MENU_USE_ITEM: numEntries = setup_item_popup(popup); if (numEntries == 0) { return; @@ -263,38 +279,38 @@ block_17: playerStatus->flags |= PS_FLAG_PAUSED; disable_player_input(); partner_disable_input(); - D_8010CCFA = 3; - D_8010CD00 = 1; - D_8010CCFE = playerStatus->inputDisabledCount; + WorldMenuDelay = 3; + WorldMenuState = WORLD_MENU_STATE_DELAY; + OpenMenuDisableCount = playerStatus->inputDisabledCount; } break; - case 1: + case WORLD_MENU_STATE_DELAY: flags = ~PS_FLAG_PAUSED; - if ((func_800E6904() == 0) || is_picking_up_item() || D_8010CCFE < playerStatus->inputDisabledCount != 0) { + if (!should_cancel_open_world_menu() || is_picking_up_item() || OpenMenuDisableCount < playerStatus->inputDisabledCount != 0) { playerStatus->flags &= flags; enable_player_input(); partner_enable_input(); - D_8010CD00 = 0; - if (D_8010C9C0) { - func_800E6860(); + WorldMenuState = WORLD_MENU_STATE_NONE; + if (SwappedWorldMenus) { + reset_outta_sight_alpha_on_menu_close(); playerStatus->flags &= ~PS_FLAG_PAUSED; gOverrideFlags &= ~GLOBAL_OVERRIDES_40; set_time_freeze_mode(TIME_FREEZE_NORMAL); } } else { - D_8010CCFA--; - if (D_8010CCFA == 0) { - D_8010CD00 = 2; + WorldMenuDelay--; + if (WorldMenuDelay == 0) { + WorldMenuState = WORLD_MENU_STATE_OPEN; gOverrideFlags |= GLOBAL_OVERRIDES_40; } } break; - case 2: - if (D_8010CCF8 == 2) { + case WORLD_MENU_STATE_OPEN: + if (WorldMenuType == WORLD_MENU_PAUSE) { set_game_mode(GAME_MODE_PAUSE); sfx_play_sound(SOUND_MENU_OPEN); - D_8010CCFA = 10; - D_8010CD00 = 10; + WorldMenuDelay = 10; + WorldMenuState = WORLD_MENU_STATE_UNPAUSE; return; } create_standard_popup_menu(popup); @@ -302,68 +318,70 @@ block_17: if (*partnerActionState == PARTNER_ACTION_NONE) { set_action_state(ACTION_STATE_IDLE); } - D_8010CD00++; + WorldMenuState++; break; - case 3: - if (popup->result != POPUP_RESULT_MINUS_1) { - D_8010CCFC = popup->result; - if (D_8010CCFC != POPUP_RESULT_CHOOSING) { + case WORLD_MENU_STATE_HOLD: + if (popup->result != POPUP_RESULT_INVALID) { + WorldPopupResult = popup->result; + if (WorldPopupResult != POPUP_RESULT_CHOOSING) { hide_popup_menu(); - D_8010CCFA = 15; - D_8010CD00++; + WorldMenuDelay = 15; + WorldMenuState++; } } break; - case 4: - D_8010CCFA--; - if (D_8010CCFA == 0) { - destroy_popup_menu(); - D_8010CD00 = 0; - enable_player_input(); - partner_enable_input(); - if (D_8010CCFC == POPUP_RESULT_MINUS_2) { - if ((setup_partner_popup(popup) == 0) || (setup_item_popup(popup) == 0)) { - D_8010CCFC = POPUP_RESULT_CANCEL; - } else { - switch (D_8010CCF8) { - case 0: - D_8010CCF8 = 1; - break; - case 1: - D_8010CCF8 = 0; - break; - } - D_8010C9C0 = TRUE; - goto block_17; // TODO required to match + case WORLD_MENU_STATE_CLOSE: + WorldMenuDelay--; + if (WorldMenuDelay != 0) { + break; + } + destroy_popup_menu(); + WorldMenuState = WORLD_MENU_STATE_NONE; + enable_player_input(); + partner_enable_input(); + if (WorldPopupResult == POPUP_RESULT_SWAP_MENU) { + if ((setup_partner_popup(popup) == 0) || (setup_item_popup(popup) == 0)) { + WorldPopupResult = POPUP_RESULT_CANCEL; + } else { + // swap to other menu + switch (WorldMenuType) { + case WORLD_MENU_CHANGE_PARTNER: + WorldMenuType = WORLD_MENU_USE_ITEM; + break; + case WORLD_MENU_USE_ITEM: + WorldMenuType = WORLD_MENU_CHANGE_PARTNER; + break; } + SwappedWorldMenus = TRUE; + goto block_17; // TODO required to match } + } - if (D_8010CCFC != POPUP_RESULT_CANCEL) { - switch (D_8010CCF8) { - case 0: - switch_to_partner(popup->userIndex[D_8010CCFC - 1]); - break; - case 1: - do { - use_consumable(popup->userIndex[D_8010CCFC - 1]); - } while (0); // todo required to match + if (WorldPopupResult != POPUP_RESULT_CANCEL) { + switch (WorldMenuType) { + case WORLD_MENU_CHANGE_PARTNER: + switch_to_partner(popup->userIndex[WorldPopupResult - 1]); + break; + case WORLD_MENU_USE_ITEM: + do { + use_consumable(popup->userIndex[WorldPopupResult - 1]); + } while (0); // todo required to match #ifndef VERSION_JP - gOverrideFlags |= GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS; + gOverrideFlags |= GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS; #endif - break; - } + break; } - func_800E6860(); - playerStatus->flags &= ~PS_FLAG_PAUSED; - gOverrideFlags &= ~GLOBAL_OVERRIDES_40; - set_time_freeze_mode(TIME_FREEZE_NORMAL); } + reset_outta_sight_alpha_on_menu_close(); + playerStatus->flags &= ~PS_FLAG_PAUSED; + gOverrideFlags &= ~GLOBAL_OVERRIDES_40; + set_time_freeze_mode(TIME_FREEZE_NORMAL); break; - case 10: - D_8010CCFA--; - if (D_8010CCFA == 0) { - func_800E6860(); - D_8010CD00 = 0; + case WORLD_MENU_STATE_UNPAUSE: + WorldMenuDelay--; + if (WorldMenuDelay == 0) { + reset_outta_sight_alpha_on_menu_close(); + WorldMenuState = WORLD_MENU_STATE_NONE; playerStatus->flags &= ~PS_FLAG_PAUSED; gOverrideFlags &= ~GLOBAL_OVERRIDES_40; enable_player_input(); @@ -385,9 +403,11 @@ void check_input_status_bar(void) { } if (!is_status_bar_visible()) { - if (!(playerStatus->curButtons & (Z_TRIG | R_TRIG)) && (pressedButtons & BUTTON_C_UP) && func_800E9860()) { - open_status_bar_long(); - + if (!(playerStatus->curButtons & (Z_TRIG | R_TRIG)) + && (pressedButtons & BUTTON_C_UP) + && can_control_status_bar() + ) { + open_status_bar_slowly(); #if VERSION_JP sfx_play_sound(SOUND_LOWER_STATUS_BAR); #else @@ -396,7 +416,10 @@ void check_input_status_bar(void) { } #endif } - } else if (!(playerStatus->curButtons & (Z_TRIG | R_TRIG)) && (pressedButtons & BUTTON_C_UP) && func_800E9860()) { + } else if (!(playerStatus->curButtons & (Z_TRIG | R_TRIG)) + && (pressedButtons & BUTTON_C_UP) + && can_control_status_bar() + ) { close_status_bar(); #if VERSION_JP sfx_play_sound(SOUND_RAISE_STATUS_BAR); diff --git a/src/world/partner/bombette.c b/src/world/partner/bombette.c index fe0ad4f57c..71c311e82b 100644 --- a/src/world/partner/bombette.c +++ b/src/world/partner/bombette.c @@ -200,7 +200,7 @@ s32 N(can_use_ability)(Npc* npc) { return TRUE; } -s32 N(can_player_pause)(Npc* npc) { +s32 N(can_open_menus)(Npc* npc) { return gPartnerStatus.partnerActionState == PARTNER_ACTION_NONE; } @@ -345,7 +345,7 @@ API_CALLABLE(N(UseAbility)) { y = npc->pos.y + 14.0f; z = npc->pos.z; hitDepth = 16.0f; - if (npc_raycast_down_around(COLLISION_CHANNEL_10000, &x, &y, &z, &hitDepth, npc->yaw, npc->collisionDiameter)) { + if (npc_raycast_down_around(COLLIDER_FLAG_IGNORE_PLAYER, &x, &y, &z, &hitDepth, npc->yaw, npc->collisionDiameter)) { s32 surfaceType = get_collider_flags(NpcHitQueryColliderID) & COLLIDER_FLAGS_SURFACE_TYPE_MASK; if (surfaceType == SURFACE_TYPE_SPIKES || surfaceType == SURFACE_TYPE_LAVA) { if (playerStatus->actionState == ACTION_STATE_IDLE) { diff --git a/src/world/partner/bombette.h b/src/world/partner/bombette.h index d908ff5fb8..f19744e1d8 100644 --- a/src/world/partner/bombette.h +++ b/src/world/partner/bombette.h @@ -7,7 +7,7 @@ void world_bombette_init(Npc*); s32 world_bombette_test_first_strike(Npc*, Npc*); s32 world_bombette_can_use_ability(Npc* npc); -s32 world_bombette_can_player_pause(Npc* ); +s32 world_bombette_can_open_menus(Npc* ); void world_bombette_pre_battle(Npc*); extern EvtScript EVS_WorldBombette_TakeOut; diff --git a/src/world/partner/bow.c b/src/world/partner/bow.c index 2c8fc5960b..e56eb9c017 100644 --- a/src/world/partner/bow.c +++ b/src/world/partner/bow.c @@ -160,7 +160,7 @@ s32 N(check_for_treadmill_overlaps)(void) { z = playerStatus->pos.z; add_vec2D_polar(&x, &z, playerStatus->colliderDiameter * 0.5f, clamp_angle(yaw + 180.0f)); - return player_test_lateral_overlap(0, playerStatus, &x, &y, &z, playerStatus->colliderDiameter, yaw); + return player_test_lateral_overlap(PLAYER_COLLISION_0, playerStatus, &x, &y, &z, playerStatus->colliderDiameter, yaw); } API_CALLABLE(N(UseAbility)) { @@ -282,7 +282,7 @@ API_CALLABLE(N(UseAbility)) { bow->duration--; if (bow->duration == 0) { bow->yaw = playerStatus->targetYaw; - npc_set_imgfx_params(bow, IMGFX_SET_ALPHA, playerStatus->alpha1, 0, 0, 0, 0); + npc_set_imgfx_params(bow, IMGFX_SET_ALPHA, playerStatus->curAlpha, 0, 0, 0, 0); suggest_player_anim_always_forward(ANIM_Mario1_Crouch); sfx_play_sound_at_npc(SOUND_BOW_VANISH, SOUND_SPACE_DEFAULT, NPC_PARTNER); script->USE_STATE = OUTTA_SIGHT_VANISH; @@ -294,17 +294,17 @@ API_CALLABLE(N(UseAbility)) { case OUTTA_SIGHT_VANISH: if (collisionStatus->curFloor >= 0) { - playerStatus->alpha1 -= 8; - if (playerStatus->alpha1 <= 128) { - playerStatus->alpha1 = 128; + playerStatus->curAlpha -= 8; + if (playerStatus->curAlpha <= 128) { + playerStatus->curAlpha = 128; bow->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2; script->USE_STATE++; // OUTTA_SIGHT_IDLE playerStatus->flags &= ~PS_FLAG_PAUSE_DISABLED; bow->flags |= NPC_FLAG_IGNORE_WORLD_COLLISION; } - get_shadow_by_index(bow->shadowIndex)->alpha = playerStatus->alpha1 >> 1; - npc_set_imgfx_params(bow, IMGFX_SET_ALPHA, playerStatus->alpha1, 0, 0, 0, 0); + get_shadow_by_index(bow->shadowIndex)->alpha = playerStatus->curAlpha >> 1; + npc_set_imgfx_params(bow, IMGFX_SET_ALPHA, playerStatus->curAlpha, 0, 0, 0, 0); bow->pos.x = playerStatus->pos.x - N(OuttaSightPosX); bow->pos.y = playerStatus->pos.y - N(OuttaSightPosY); bow->pos.z = playerStatus->pos.z - N(OuttaSightPosZ); @@ -367,10 +367,10 @@ void N(end_outta_sight_cleanup)(Npc* bow) { PartnerStatus* partnerStatus = &gPartnerStatus; s32 actionState; - playerStatus->alpha1 = 255; + playerStatus->curAlpha = 255; npc_set_imgfx_params(bow, IMGFX_CLEAR, 0, 0, 0, 0, 0); bow->renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; - get_shadow_by_index(bow->shadowIndex)->alpha = playerStatus->alpha1 / 2; + get_shadow_by_index(bow->shadowIndex)->alpha = playerStatus->curAlpha / 2; if (N(LockingPlayerInput)) { enable_player_input(); diff --git a/src/world/partner/goombario.c b/src/world/partner/goombario.c index 5854c5bc2f..dcda2f03dd 100644 --- a/src/world/partner/goombario.c +++ b/src/world/partner/goombario.c @@ -66,7 +66,7 @@ s32 N(get_trigger_tattle)(s32 tattleColliderID) { Trigger* trigger = get_trigger_by_id(i); if (trigger != NULL - && trigger->flags.flags & TRIGGER_WALL_PRESS_A + && trigger->flags & TRIGGER_WALL_PRESS_A && trigger->location.colliderID == tattleColliderID ) { return trigger->tattleMsg; @@ -201,7 +201,7 @@ EvtScript EVS_WorldGoombario_Update = { EVT_END }; -s32 N(can_pause)(Npc* goombario) { +s32 N(can_open_menus)(Npc* goombario) { PartnerStatus* partnerStatus = &gPartnerStatus; s32 new_var; diff --git a/src/world/partner/goombario.h b/src/world/partner/goombario.h index 51f377edc5..9caac685ce 100644 --- a/src/world/partner/goombario.h +++ b/src/world/partner/goombario.h @@ -5,7 +5,7 @@ #include "script_api/map.h" void world_goombario_init(Npc* partner); -s32 world_goombario_can_pause(Npc* partner); +s32 world_goombario_can_open_menus(Npc* partner); void world_goombario_pre_battle(Npc* partner); extern EvtScript EVS_WorldGoombario_TakeOut; diff --git a/src/world/partner/kooper.c b/src/world/partner/kooper.c index abccd5b139..fe51ae388d 100644 --- a/src/world/partner/kooper.c +++ b/src/world/partner/kooper.c @@ -73,7 +73,7 @@ s32 N(check_for_item_collision)(Npc* kooper) { void N(init)(Npc* kooper) { kooper->collisionHeight = 37; kooper->collisionDiameter = 24; - kooper->collisionChannel = COLLISION_CHANNEL_10000; + kooper->collisionChannel = COLLIDER_FLAG_IGNORE_PLAYER; N(TriggeredBattle) = FALSE; } @@ -341,7 +341,7 @@ API_CALLABLE(N(UseAbility)) { suggest_player_anim_allow_backward(ANIM_Mario1_Jump); N(ShellTossKickFalling) = FALSE; - sfx_play_sound_at_npc(SOUND_JUMP_2081, SOUND_SPACE_DEFAULT, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_QUICK_PLAYER_JUMP, SOUND_SPACE_DEFAULT, NPC_PARTNER); script->USE_STATE = SHELL_TOSS_STATE_JUMP; // fallthrough @@ -368,7 +368,7 @@ API_CALLABLE(N(UseAbility)) { posZ = playerStatus->pos.z; testLength = hitLength = playerStatus->colliderHeight / 2; - if ((npc_raycast_up(COLLISION_CHANNEL_10000, &posX, &posY, &posZ, &hitLength)) && (hitLength < testLength)) { + if ((npc_raycast_up(COLLIDER_FLAG_IGNORE_PLAYER, &posX, &posY, &posZ, &hitLength)) && (hitLength < testLength)) { collisionStatus->curCeiling = NpcHitQueryColliderID; playerStatus->pos.y = posY - playerStatus->colliderHeight; N(vertical_hit_interactable_entity)(kooper); @@ -396,8 +396,8 @@ API_CALLABLE(N(UseAbility)) { script->USE_STATE = SHELL_TOSS_STATE_KICK; N(ShellTossKickFalling) = FALSE; gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_IGNORE_PLAYER_Y; - sfx_play_sound_at_npc(SOUND_0283, SOUND_SPACE_DEFAULT, NPC_PARTNER); - sfx_play_sound_at_npc(SOUND_0284, SOUND_SPACE_DEFAULT, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_KOOPER_SHELL_KICK, SOUND_SPACE_DEFAULT, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_KOOPER_SHELL_SWIRL, SOUND_SPACE_DEFAULT, NPC_PARTNER); } break; @@ -415,7 +415,7 @@ API_CALLABLE(N(UseAbility)) { posX = kooper->pos.x, \ posY = kooper->pos.y, \ posZ = kooper->pos.z, \ - npc_test_move_taller_with_slipping(COLLISION_CHANNEL_8000, \ + npc_test_move_taller_with_slipping(COLLIDER_FLAG_IGNORE_SHELL, \ &posX, &posY, &posZ, kooper->moveSpeed, testAngle, \ kooper->collisionHeight, kooper->collisionDiameter / 2) \ ) @@ -481,7 +481,7 @@ API_CALLABLE(N(UseAbility)) { } if (N(check_for_item_collision)(kooper)) { - sfx_play_sound_at_npc(SOUND_0286, SOUND_SPACE_DEFAULT, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_KOOPER_PICKUP, SOUND_SPACE_DEFAULT, NPC_PARTNER); fx_damage_stars(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_NONE, SOUND_SPACE_DEFAULT, NPC_PARTNER); @@ -518,7 +518,7 @@ API_CALLABLE(N(UseAbility)) { posY = kooper->pos.y; posZ = kooper->pos.z; - npc_test_move_taller_with_slipping(COLLISION_CHANNEL_8000, + npc_test_move_taller_with_slipping(COLLIDER_FLAG_IGNORE_SHELL, &posX, &posY, &posZ, kooper->moveSpeed, kooper->yaw, kooper->collisionHeight, ( kooper->collisionDiameter / 2)); @@ -576,7 +576,7 @@ API_CALLABLE(N(UseAbility)) { posY = kooper->pos.y; posZ = kooper->pos.z; - if (npc_test_move_taller_with_slipping(COLLISION_CHANNEL_8000, + if (npc_test_move_taller_with_slipping(COLLIDER_FLAG_IGNORE_SHELL, &posX, &posY, &posZ, kooper->moveSpeed, clamp_angle(kooper->yaw + 180.0f), kooper->collisionHeight, kooper->collisionDiameter) ) { @@ -629,7 +629,7 @@ API_CALLABLE(N(UseAbility)) { kooper->jumpVel = 0.0f; kooper->collisionHeight = 24; kooper->curAnim = ANIM_WorldKooper_Walk; - sfx_stop_sound(SOUND_0284); + sfx_stop_sound(SOUND_KOOPER_SHELL_SWIRL); disable_npc_blur(kooper); if (N(HasItem)) { @@ -750,7 +750,7 @@ void N(pre_battle)(Npc* kooper) { kooper->flags &= ~NPC_FLAG_JUMPING; kooper->flags &= ~NPC_FLAG_IGNORE_WORLD_COLLISION; - sfx_stop_sound(SOUND_0284); + sfx_stop_sound(SOUND_KOOPER_SHELL_SWIRL); set_action_state(ACTION_STATE_IDLE); partner_clear_player_tracking(kooper); disable_npc_blur(kooper); diff --git a/src/world/partner/lakilester.c b/src/world/partner/lakilester.c index e59a820a12..68468722d1 100644 --- a/src/world/partner/lakilester.c +++ b/src/world/partner/lakilester.c @@ -77,7 +77,7 @@ void N(sync_player_position)(void) { void N(init)(Npc* lakilester) { lakilester->collisionHeight = 38; lakilester->collisionDiameter = 36; - lakilester->collisionChannel = COLLISION_CHANNEL_10000; + lakilester->collisionChannel = COLLIDER_FLAG_IGNORE_PLAYER; N(PlayerBounceOffset) = 0; N(LockingPlayerInput) = FALSE; N(PlayerCollisionDisabled) = FALSE; @@ -709,7 +709,7 @@ API_CALLABLE(N(UseAbility)) { x = lakilester->moveToPos.x; y = lakilester->moveToPos.y; z = lakilester->moveToPos.z; - npc_test_move_simple_with_slipping(COLLISION_CHANNEL_10000, &x, &y, &z, lakilester->moveSpeed, + npc_test_move_simple_with_slipping(COLLIDER_FLAG_IGNORE_PLAYER, &x, &y, &z, lakilester->moveSpeed, yaw, lakilester->collisionHeight, lakilester->collisionDiameter); lakilester->moveToPos.x = x; lakilester->moveToPos.y = y; @@ -726,7 +726,7 @@ API_CALLABLE(N(UseAbility)) { N(AbilityState) = RIDE_STATE_MOUNT_2; break; case RIDE_STATE_MOUNT_2: - sfx_play_sound_at_npc(SOUND_JUMP_2081, SOUND_SPACE_DEFAULT, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_QUICK_PLAYER_JUMP, SOUND_SPACE_DEFAULT, NPC_PARTNER); suggest_player_anim_allow_backward(ANIM_Mario1_Jump); // fallthrough case RIDE_STATE_MOUNT_3: diff --git a/src/world/partner/parakarry.c b/src/world/partner/parakarry.c index 5751ab79cc..8bc27d66d0 100644 --- a/src/world/partner/parakarry.c +++ b/src/world/partner/parakarry.c @@ -305,7 +305,7 @@ API_CALLABLE(N(UseAbility)) { parakarry->curAnim = ANIM_WorldParakarry_CarryHeavy; parakarry->planarFlyDist = 0; suggest_player_anim_always_forward(ANIM_MarioW2_HoldOnto); - sfx_play_sound_at_npc(SOUND_2009, SOUND_SPACE_DEFAULT, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_PARAKARRY_FLAP, SOUND_SPACE_DEFAULT, NPC_PARTNER); gCollisionStatus.lastTouchedFloor = NO_COLLIDER; gCollisionStatus.curFloor = NO_COLLIDER; parakarry->curFloor = NO_COLLIDER; @@ -330,7 +330,7 @@ API_CALLABLE(N(UseAbility)) { } if (gGameStatusPtr->frameCounter % 6 == 0) { - sfx_play_sound_at_npc(SOUND_2009, SOUND_SPACE_DEFAULT, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_PARAKARRY_FLAP, SOUND_SPACE_DEFAULT, NPC_PARTNER); } length = fabsf(sin_rad(DEG_TO_RAD((20 - N(AbilityStateTime)) * 18))) * 1.3; @@ -342,7 +342,7 @@ API_CALLABLE(N(UseAbility)) { length = parakarry->collisionHeight / 2.0f; halfCollisionHeight = length; - if (npc_raycast_up(COLLISION_CHANNEL_10000, &x, &y, &z, &length)) { + if (npc_raycast_up(COLLIDER_FLAG_IGNORE_PLAYER, &x, &y, &z, &length)) { if (length < halfCollisionHeight) { N(AbilityStateTime) = 0; } @@ -362,7 +362,7 @@ API_CALLABLE(N(UseAbility)) { x = playerStatus->pos.x; y = playerStatus->pos.y; z = playerStatus->pos.z; - hitCount = npc_test_move_complex_with_slipping(COLLISION_CHANNEL_10000, &x, &y, &z, parakarry->moveSpeed, parakarry->yaw, playerStatus->colliderHeight, playerStatus->colliderDiameter); + hitCount = npc_test_move_complex_with_slipping(COLLIDER_FLAG_IGNORE_PLAYER, &x, &y, &z, parakarry->moveSpeed, parakarry->yaw, playerStatus->colliderHeight, playerStatus->colliderDiameter); if (hitCount > 1) { playerStatus->pos.x += (x - playerStatus->pos.x) / 8.0f; playerStatus->pos.z += (z - playerStatus->pos.z) / 8.0f; @@ -373,7 +373,7 @@ API_CALLABLE(N(UseAbility)) { x = parakarry->pos.x; y = parakarry->pos.y; z = parakarry->pos.z; - hitCount = npc_test_move_complex_with_slipping(COLLISION_CHANNEL_10000, &x, &y, &z, parakarry->moveSpeed, parakarry->yaw, parakarry->collisionHeight, parakarry->collisionDiameter); + hitCount = npc_test_move_complex_with_slipping(COLLIDER_FLAG_IGNORE_PLAYER, &x, &y, &z, parakarry->moveSpeed, parakarry->yaw, parakarry->collisionHeight, parakarry->collisionDiameter); if (hitCount > 1) { playerDeltaX = (x - playerStatus->pos.x) / 8.0f; playerDeltaZ = (z - playerStatus->pos.z) / 8.0f; @@ -386,7 +386,7 @@ API_CALLABLE(N(UseAbility)) { x = parakarry->pos.x; y = parakarry->pos.y; z = parakarry->pos.z; - hitCount = npc_test_move_complex_with_slipping(COLLISION_CHANNEL_10000, &x, &y, &z, parakarry->moveSpeed, parakarry->yaw, parakarry->collisionHeight, parakarry->collisionDiameter); + hitCount = npc_test_move_complex_with_slipping(COLLIDER_FLAG_IGNORE_PLAYER, &x, &y, &z, parakarry->moveSpeed, parakarry->yaw, parakarry->collisionHeight, parakarry->collisionDiameter); if (hitCount == 0) { playerStatus->pos.x += playerDeltaX; playerStatus->pos.z += playerDeltaZ; @@ -405,7 +405,7 @@ API_CALLABLE(N(UseAbility)) { y = playerStatus->pos.y + playerStatus->colliderHeight / 2.0f; z = playerStatus->pos.z; length = playerStatus->colliderHeight / 2.0f; - if (npc_raycast_down_around(COLLISION_CHANNEL_10000, &x, &y, &z, &length, parakarry->yaw, parakarry->collisionDiameter)) { + if (npc_raycast_down_around(COLLIDER_FLAG_IGNORE_PLAYER, &x, &y, &z, &length, parakarry->yaw, parakarry->collisionDiameter)) { s32 surfaceType = get_collider_flags(NpcHitQueryColliderID) & COLLIDER_FLAGS_SURFACE_TYPE_MASK; if (surfaceType == SURFACE_TYPE_SPIKES || surfaceType == SURFACE_TYPE_LAVA) { playerStatus->hazardType = HAZARD_TYPE_SPIKES; @@ -467,7 +467,7 @@ API_CALLABLE(N(UseAbility)) { } if (gGameStatusPtr->frameCounter % 6 == 0) { - sfx_play_sound_at_npc(SOUND_2009, SOUND_SPACE_DEFAULT, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_PARAKARRY_FLAP, SOUND_SPACE_DEFAULT, NPC_PARTNER); } parakarry->jumpVel -= parakarry->jumpScale; @@ -497,7 +497,7 @@ API_CALLABLE(N(UseAbility)) { x = playerStatus->pos.x; y = playerStatus->pos.y; z = playerStatus->pos.z; - if (npc_test_move_complex_with_slipping(COLLISION_CHANNEL_10000, + if (npc_test_move_complex_with_slipping(COLLIDER_FLAG_IGNORE_PLAYER, &x, &y, &z, parakarry->moveSpeed, parakarry->yaw, playerStatus->colliderHeight, playerStatus->colliderDiameter) ) { @@ -509,7 +509,7 @@ API_CALLABLE(N(UseAbility)) { x = parakarry->pos.x; y = parakarry->pos.y; z = parakarry->pos.z; - if (!npc_test_move_complex_with_slipping(COLLISION_CHANNEL_10000, + if (!npc_test_move_complex_with_slipping(COLLIDER_FLAG_IGNORE_PLAYER, &x, &y, &z, parakarry->moveSpeed, parakarry->yaw, parakarry->collisionHeight, parakarry->collisionDiameter) ) { @@ -520,7 +520,7 @@ API_CALLABLE(N(UseAbility)) { length = parakarry->collisionHeight / 2.0f; halfCollisionHeight = length; - if (npc_raycast_up(COLLISION_CHANNEL_10000, &x, &y, &z, &length) && (length < halfCollisionHeight)) { + if (npc_raycast_up(COLLIDER_FLAG_IGNORE_PLAYER, &x, &y, &z, &length) && (length < halfCollisionHeight)) { parakarry->pos.y = y - parakarry->collisionHeight; playerStatus->pos.y = parakarry->pos.y - 32.0f; hitAbove = TRUE; @@ -530,7 +530,7 @@ API_CALLABLE(N(UseAbility)) { z = playerStatus->pos.z; length = playerStatus->colliderHeight / 2.0f; - if (npc_raycast_down_around(COLLISION_CHANNEL_10000, &x, &y, &z, &length, parakarry->yaw, parakarry->collisionDiameter)) { + if (npc_raycast_down_around(COLLIDER_FLAG_IGNORE_PLAYER, &x, &y, &z, &length, parakarry->yaw, parakarry->collisionDiameter)) { playerStatus->pos.y += (y - playerStatus->pos.y) / 4.0f; parakarry->pos.y = playerStatus->pos.y + 32.0f; y = parakarry->pos.y; @@ -545,7 +545,7 @@ API_CALLABLE(N(UseAbility)) { } if (!phys_adjust_cam_on_landing()) { - gCameras[CAM_DEFAULT].moveFlags &= ~CAMERA_MOVE_FLAG_2; + gCameras[CAM_DEFAULT].moveFlags &= ~CAMERA_MOVE_NO_INTERP_Y; } gCameras[CAM_DEFAULT].targetPos.x = playerStatus->pos.x; gCameras[CAM_DEFAULT].targetPos.y = playerStatus->pos.y; @@ -586,7 +586,7 @@ API_CALLABLE(N(UseAbility)) { partnerStatus->actingPartner = PARTNER_NONE; partnerStatus->partnerActionState = PARTNER_ACTION_NONE; enable_partner_ai(); - sfx_stop_sound(SOUND_2009); + sfx_stop_sound(SOUND_PARAKARRY_FLAP); if (N(LockingPlayerInput)) { enable_player_input(); } diff --git a/src/world/partner/sushie.c b/src/world/partner/sushie.c index 7c3e155674..e43f1c6d0b 100644 --- a/src/world/partner/sushie.c +++ b/src/world/partner/sushie.c @@ -337,7 +337,7 @@ s32 N(test_ray_to_wall_center)(s32 unused, f32* x, f32* y, f32* z, f32 length, f sin_cos_rad(DEG_TO_RAD(*yaw), &sinAngle, &cosAngle); cosAngle = -cosAngle; totalLength = radius + length; - hitResult = test_ray_colliders(COLLISION_CHANNEL_10000, *x, *y, *z, sinAngle, 0.0f, cosAngle, + hitResult = test_ray_colliders(COLLIDER_FLAG_IGNORE_PLAYER, *x, *y, *z, sinAngle, 0.0f, cosAngle, &hitX, &hitY, &hitZ, &totalLength, &hitNx, &hitNy, &hitNz); if (hitResult >= 0) { @@ -451,7 +451,7 @@ API_CALLABLE(N(UseAbility)) { set_action_state(ACTION_STATE_RIDE); disable_player_static_collisions(); disable_player_input(); - sushie->collisionChannel = COLLISION_CHANNEL_80000; + sushie->collisionChannel = COLLIDER_FLAG_DOCK_WALL; sushie->moveToPos.x = playerStatus->pos.x; sushie->moveToPos.y = playerStatus->pos.y; sushie->moveToPos.z = playerStatus->pos.z; @@ -479,12 +479,12 @@ API_CALLABLE(N(UseAbility)) { sushie->duration--; if (sushie->duration != 0) { if (sushie->duration == 2) { - sfx_play_sound_at_npc(SOUND_JUMP_2081, SOUND_SPACE_DEFAULT, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_QUICK_PLAYER_JUMP, SOUND_SPACE_DEFAULT, NPC_PARTNER); suggest_player_anim_allow_backward(ANIM_Mario1_BeforeJump); } break; } - sushie->collisionChannel = COLLISION_CHANNEL_10000; + sushie->collisionChannel = COLLIDER_FLAG_IGNORE_PLAYER; sushie->flags |= NPC_FLAG_FLYING; sushie->flags &= ~(NPC_FLAG_GRAVITY | NPC_FLAG_IGNORE_WORLD_COLLISION); disable_npc_shadow(sushie); @@ -654,7 +654,7 @@ API_CALLABLE(N(UseAbility)) { sushie->duration = (2.0f * sushie->jumpVel) / 0.6f; sushie->moveSpeed = dist / sushie->duration; sushie->jumpVel += (sushie->moveToPos.y - playerStatus->pos.y) / sushie->duration; - sfx_play_sound_at_npc(SOUND_JUMP_2081, SOUND_SPACE_DEFAULT, NPC_PARTNER); + sfx_play_sound_at_npc(SOUND_QUICK_PLAYER_JUMP, SOUND_SPACE_DEFAULT, NPC_PARTNER); suggest_player_anim_allow_backward(ANIM_Mario1_BeforeJump); enable_player_shadow(); playerStatus->flags |= PS_FLAG_MOVEMENT_LOCKED; @@ -742,7 +742,7 @@ EvtScript EVS_WorldSushie_UseAbility = { void N(init)(Npc* sushie) { sushie->collisionHeight = 24; sushie->collisionDiameter = 36; - sushie->collisionChannel = COLLISION_CHANNEL_10000; + sushie->collisionChannel = COLLIDER_FLAG_IGNORE_PLAYER; N(IsRiding) = FALSE; N(DiveState) = DIVE_STATE_NONE; N(DiveTime) = 0; diff --git a/src/world/partners.c b/src/world/partners.c index 0383c1de60..ce1a0a07d1 100644 --- a/src/world/partners.c +++ b/src/world/partners.c @@ -155,7 +155,7 @@ extern Addr world_partner_twink_VRAM; #endif s32 partner_is_idle(Npc* partner); -s32 world_partner_can_player_pause_default(Npc* partner); +s32 world_partner_can_open_menus_default(Npc* partner); void _use_partner_ability(void); void partner_flying_follow_player(Npc*); void partner_move_to_goal(Npc*, s32); @@ -225,8 +225,8 @@ WorldPartner wPartners[] = { .useAbility = &EVS_WorldGoombario_UseAbility, .putAway = &EVS_WorldGoombario_PutAway, .idle = ANIM_WorldGoombario_Idle, - .canUseAbility = world_goombario_can_pause, - .canPlayerPause = world_goombario_can_pause, + .canUseAbility = world_goombario_can_open_menus, + .canPlayerOpenMenus = world_goombario_can_open_menus, .preBattle = world_goombario_pre_battle, }, [PARTNER_KOOPER] { @@ -242,7 +242,7 @@ WorldPartner wPartners[] = { .idle = ANIM_WorldKooper_Idle, .testFirstStrike = world_kooper_test_first_strike, .canUseAbility = partner_is_idle, - .canPlayerPause = partner_is_idle, + .canPlayerOpenMenus = partner_is_idle, .preBattle = world_kooper_pre_battle, .postBattle = world_kooper_post_battle, }, @@ -259,7 +259,7 @@ WorldPartner wPartners[] = { .idle = ANIM_WorldBombette_Idle, .testFirstStrike = world_bombette_test_first_strike, .canUseAbility = world_bombette_can_use_ability, - .canPlayerPause = world_bombette_can_player_pause, + .canPlayerOpenMenus = world_bombette_can_open_menus, .preBattle = world_bombette_pre_battle, }, [PARTNER_PARAKARRY] { @@ -273,7 +273,7 @@ WorldPartner wPartners[] = { .useAbility = &EVS_WorldParakarry_UseAbility, .putAway = &EVS_WorldParakarry_PutAway, .idle = ANIM_WorldParakarry_Idle, - .canPlayerPause = partner_is_idle, + .canPlayerOpenMenus = partner_is_idle, .preBattle = world_parakarry_pre_battle, .postBattle = world_parakarry_post_battle, }, @@ -300,7 +300,7 @@ WorldPartner wPartners[] = { .useAbility = &EVS_WorldWatt_UseAbility, .putAway = &EVS_WorldWatt_PutAway, .idle = ANIM_WorldWatt_Idle, - .canPlayerPause = world_partner_can_player_pause_default, + .canPlayerOpenMenus = world_partner_can_open_menus_default, .preBattle = world_watt_pre_battle, .postBattle = world_watt_post_battle, .onEnterMap = &EVS_WorldWatt_EnterMap, @@ -316,7 +316,7 @@ WorldPartner wPartners[] = { .useAbility = &EVS_WorldSushie_UseAbility, .putAway = &EVS_WorldSushie_PutAway, .idle = ANIM_WorldSushie_Idle, - .canPlayerPause = world_partner_can_player_pause_default, + .canPlayerOpenMenus = world_partner_can_open_menus_default, .preBattle = world_sushie_pre_battle, .postBattle = world_sushie_post_battle, .onEnterMap = &EVS_WorldSushie_EnterMap, @@ -332,7 +332,7 @@ WorldPartner wPartners[] = { .useAbility = &EVS_WorldLakilester_UseAbility, .putAway = &EVS_WorldLakilester_PutAway, .idle = ANIM_WorldLakilester_Idle, - .canPlayerPause = world_partner_can_player_pause_default, + .canPlayerOpenMenus = world_partner_can_open_menus_default, .preBattle = world_lakilester_pre_battle, .postBattle = world_lakilester_post_battle, .onEnterMap = &EVS_WorldLakilester_EnterMap, @@ -349,7 +349,7 @@ WorldPartner wPartners[] = { .putAway = &EVS_WorldBow_PutAway, .idle = ANIM_WorldBow_Idle, .canUseAbility = partner_is_idle, - .canPlayerPause = world_partner_can_player_pause_default, + .canPlayerOpenMenus = world_partner_can_open_menus_default, .preBattle = world_bow_pre_battle, }, [PARTNER_GOOMBARIA] { @@ -364,7 +364,7 @@ WorldPartner wPartners[] = { .putAway = &EVS_WorldGoombaria_PutAway, .idle = ANIM_Goombaria_Idle, .canUseAbility = partner_is_idle, - .canPlayerPause = partner_is_idle, + .canPlayerOpenMenus = partner_is_idle, }, [PARTNER_TWINK] { .dmaStart = &world_partner_twink_ROM_START, @@ -378,7 +378,7 @@ WorldPartner wPartners[] = { .putAway = &EVS_WorldTwink_PutAway, .idle = ANIM_Twink_Idle, .canUseAbility = partner_is_idle, - .canPlayerPause = partner_is_idle, + .canPlayerOpenMenus = partner_is_idle, }, }; @@ -567,7 +567,7 @@ s32 partner_is_idle(Npc* partner) { return gPartnerStatus.partnerActionState == PARTNER_ACTION_NONE; } -s32 world_partner_can_player_pause_default(Npc* partner) { +s32 world_partner_can_open_menus_default(Npc* partner) { return TRUE; } @@ -1017,10 +1017,10 @@ s32 partner_use_ability(void) { return FALSE; } -s32 partner_player_can_pause(void) { +s32 partner_can_open_world_menus(void) { if (wPartner != NULL - && wPartner->canPlayerPause != NULL - && !wPartner->canPlayerPause(wPartnerNpc) + && wPartner->canPlayerOpenMenus != NULL + && !wPartner->canPlayerOpenMenus(wPartnerNpc) ) { return FALSE; } @@ -1203,7 +1203,7 @@ void partner_walking_enable(Npc* partner, s32 val) { wPartnerTetherDistance = 40.0f; partner->curAnim = gPartnerAnimations[wCurrentPartnerId].idle; func_800EA5B8(partner); - partner->collisionChannel = COLLISION_CHANNEL_10000; + partner->collisionChannel = COLLIDER_FLAG_IGNORE_PLAYER; partner->jumpVel = 0.0f; partner->flags |= NPC_FLAG_TOUCHES_GROUND | NPC_FLAG_GRAVITY | NPC_FLAG_IGNORE_PLAYER_COLLISION; partner->jumpScale = 1.8f; @@ -1358,9 +1358,10 @@ void partner_walking_follow_player(Npc* partner) { npc_move_heading(partner, partner->moveSpeed, partner->yaw); spawn_surface_effects(partner, (partner->moveSpeed < 4.0) ? SURFACE_INTERACT_WALK : SURFACE_INTERACT_RUN); surfaceType = get_collider_flags(partner->curFloor); - if (surfaceType == SURFACE_TYPE_SPIKES || - surfaceType == SURFACE_TYPE_LAVA || - (partner->flags & (NPC_FLAG_GROUNDED | NPC_FLAG_COLLDING_FORWARD_WITH_WORLD)) == (NPC_FLAG_GROUNDED | NPC_FLAG_COLLDING_FORWARD_WITH_WORLD)) { + if (surfaceType == SURFACE_TYPE_SPIKES + || surfaceType == SURFACE_TYPE_LAVA + || ((partner->flags & NPC_FLAG_GROUNDED) && (partner->flags & NPC_FLAG_COLLDING_FORWARD_WITH_WORLD)) + ) { if (!func_800EA4B0(partner->curWall)) { D_8010CFBC++; if (D_8010CFBC >= 40) { @@ -1779,7 +1780,7 @@ void partner_flying_enable(Npc* partner, s32 val) { wPartnerTetherDistance = 40.0f; partner->curAnim = gPartnerAnimations[wCurrentPartnerId].idle; func_800EA5B8(partner); - partner->collisionChannel = COLLISION_CHANNEL_10000; + partner->collisionChannel = COLLIDER_FLAG_IGNORE_PLAYER; partner->flags |= NPC_FLAG_IGNORE_PLAYER_COLLISION; partner->flags &= ~NPC_FLAG_GRAVITY; } @@ -1856,7 +1857,7 @@ void partner_flying_update_motion(Npc* partner) { y = partner->pos.y; z = partner->pos.z; hitDepth = 1000.0f; - if (npc_raycast_down_around(COLLISION_CHANNEL_10000, &x, &y, &z, &hitDepth, partner->yaw, partner->collisionDiameter) == 0) { + if (npc_raycast_down_around(COLLIDER_FLAG_IGNORE_PLAYER, &x, &y, &z, &hitDepth, partner->yaw, partner->collisionDiameter) == 0) { y = playerStatus->pos.y; } @@ -2169,7 +2170,7 @@ void partner_flying_follow_player(Npc* partner) { z = partner->pos.z; distance = partner->collisionHeight + 1; wPartnerMoveTime--; - if (npc_raycast_down_around(COLLISION_CHANNEL_10000, &x, &y, &z, &distance, partner->yaw, partner->collisionDiameter) == 0) { + if (npc_raycast_down_around(COLLIDER_FLAG_IGNORE_PLAYER, &x, &y, &z, &distance, partner->yaw, partner->collisionDiameter) == 0) { if (partner->collisionHeight + 5 < fabs((partner->pos.y - playerStatus->pos.y))) { partner->pos.y += (playerStatus->pos.y - partner->pos.y) / 10.0f; } @@ -2212,7 +2213,7 @@ void partner_flying_follow_player(Npc* partner) { } s32 partner_init_put_away(Npc* partner) { - partner->collisionChannel = COLLISION_CHANNEL_10000; + partner->collisionChannel = COLLIDER_FLAG_IGNORE_PLAYER; wPartnerFollowState = 0; partner->flags |= NPC_FLAG_IGNORE_PLAYER_COLLISION; return wPartnerFollowState; @@ -2286,7 +2287,7 @@ s32 partner_put_away(Npc* partner) { } s32 partner_init_get_out(Npc* npc) { - npc->collisionChannel = COLLISION_CHANNEL_10000; + npc->collisionChannel = COLLIDER_FLAG_IGNORE_PLAYER; wPartnerFollowState = 0; npc->flags |= NPC_FLAG_IGNORE_PLAYER_COLLISION; return wPartnerFollowState; @@ -2323,7 +2324,7 @@ s32 partner_get_out(Npc* partner) { z = moveToZ; add_vec2D_polar(&x, &z, 2.0f, gCameras[gCurrentCameraID].curYaw); hitDepth = 1000.0f; - if (npc_raycast_down_around(COLLISION_CHANNEL_10000, &x, &y, &z, &hitDepth, partner->yaw, partner->collisionDiameter)) { + if (npc_raycast_down_around(COLLIDER_FLAG_IGNORE_PLAYER, &x, &y, &z, &hitDepth, partner->yaw, partner->collisionDiameter)) { // @bug? collider flags not properly masked with COLLIDER_FLAG_SURFACE_TYPE s32 surfaceType = get_collider_flags(NpcHitQueryColliderID); diff --git a/src/world/partners.h b/src/world/partners.h index b2a9e2c303..095cedf7a7 100644 --- a/src/world/partners.h +++ b/src/world/partners.h @@ -18,7 +18,7 @@ typedef struct WorldPartner { /* 0x24 */ s32 idle; /* 0x28 */ PartnerTesHitFunc testFirstStrike; /* 0x2C */ PartnerBoolFunc canUseAbility; - /* 0x30 */ PartnerBoolFunc canPlayerPause; + /* 0x30 */ PartnerBoolFunc canPlayerOpenMenus; /* 0x34 */ PartnerFunc preBattle; /* 0x38 */ PartnerFunc postBattle; /* 0x3C */ EvtScript* onEnterMap; diff --git a/src/world/script_api/shops.c b/src/world/script_api/shops.c index c577ebda6c..880e1d5bc7 100644 --- a/src/world/script_api/shops.c +++ b/src/world/script_api/shops.c @@ -10,37 +10,37 @@ extern HudScript HES_Item_Coin; s32 shop_get_sell_price(s32 itemID); -API_CALLABLE(func_802803C8); -API_CALLABLE(func_80280410); +API_CALLABLE(CanInteractWithShopItem); +API_CALLABLE(BeginShopItemInteraction); API_CALLABLE(ShowShopPurchaseDialog); API_CALLABLE(ShowShopOwnerDialog); -EvtScript ShopBeginSpeech = { +EvtScript EVS_ShopBeginSpeech = { EVT_CALL(SpeakToPlayer, LVar1, LVar2, LVar3, 0, LVar0) EVT_RETURN EVT_END }; -EvtScript ShopContinueSpeech = { +EvtScript EVS_ShopContinueSpeech = { EVT_CALL(ContinueSpeech, LVar1, LVar2, LVar3, 0, LVar0) EVT_RETURN EVT_END }; -EvtScript ShopResetSpeech = { +EvtScript EVS_ShopResetSpeech = { EVT_CALL(EndSpeech, LVar1, LVar2, LVar3, 0) EVT_CALL(SpeakToPlayer, LVar1, LVar2, LVar3, 0, LVar0) EVT_RETURN EVT_END }; -EvtScript ShopEndSpeech = { +EvtScript EVS_ShopEndSpeech = { EVT_CALL(EndSpeech, LVar0, LVar1, LVar2, 0) EVT_RETURN EVT_END }; -EvtScript D_80283F58_7E4DD8 = { +EvtScript EVS_ShopItemInteract = { EVT_CALL(GetPartnerInUse, LVar1) EVT_IF_EQ(LVar1, PARTNER_NONE) EVT_GOTO(10) @@ -53,22 +53,22 @@ EvtScript D_80283F58_7E4DD8 = { EVT_END_IF EVT_RETURN EVT_LABEL(10) - EVT_CALL(func_802803C8) - EVT_IF_EQ(LVar2, 0) + EVT_CALL(CanInteractWithShopItem) + EVT_IF_FALSE(LVar2) EVT_RETURN EVT_END_IF - EVT_CALL(func_80280410, LVar0) + EVT_CALL(BeginShopItemInteraction, LVar0) EVT_RETURN EVT_END }; -EvtScript BadgeShopInteract = { +EvtScript EVS_ShopPurchaseDialog = { EVT_CALL(ShowShopPurchaseDialog, LVar0) EVT_RETURN EVT_END }; -EvtScript ItemShopInteract = { +EvtScript EVS_ShopOwnerDialog = { EVT_CALL(ShowShopOwnerDialog) EVT_RETURN EVT_END @@ -77,7 +77,7 @@ EvtScript ItemShopInteract = { s32 shop_owner_begin_speech(s32 messageIndex) { Shop* shop = gGameStatusPtr->mapShop; s32 shopMsgID = shop->owner->shopMsgIDs[messageIndex]; - Evt* script = start_script(&ShopBeginSpeech, EVT_PRIORITY_1, 0); + Evt* script = start_script(&EVS_ShopBeginSpeech, EVT_PRIORITY_1, 0); script->varTable[0] = shopMsgID; script->varTable[1] = shop->owner->npcID; @@ -93,21 +93,21 @@ s32 shop_owner_buy_dialog(s32 messageIndex, s32 itemName, s32 coinCost, s32 bpCo Evt* script; u8* suffix; - set_message_msg(itemName, 0); - set_message_value(coinCost, 1); + set_message_text_var(itemName, 0); + set_message_int_var(coinCost, 1); if (bpCost > 0) { - set_message_value(bpCost, 2); + set_message_int_var(bpCost, 2); } else { if (coinCost == 1) { suffix = MessageSingular; } else { suffix = MessagePlural; } - set_message_msg((s32) suffix, 2); + set_message_text_var((s32) suffix, 2); } - script = start_script(&ShopBeginSpeech, EVT_PRIORITY_1, 0); + script = start_script(&EVS_ShopBeginSpeech, EVT_PRIORITY_1, 0); script->varTable[0] = shopMsgID; script->varTable[1] = shop->owner->npcID; script->varTable[2] = shop->owner->talkAnim; @@ -119,7 +119,7 @@ s32 shop_owner_buy_dialog(s32 messageIndex, s32 itemName, s32 coinCost, s32 bpCo s32 shop_owner_continue_speech(s32 messageIndex) { Shop* shop = gGameStatusPtr->mapShop; s32 shopMsgID = shop->owner->shopMsgIDs[messageIndex]; - Evt* script = start_script(&ShopContinueSpeech, EVT_PRIORITY_1, 0); + Evt* script = start_script(&EVS_ShopContinueSpeech, EVT_PRIORITY_1, 0); script->varTable[0] = shopMsgID; script->varTable[1] = shop->owner->npcID; @@ -135,7 +135,7 @@ s32 shop_owner_continue_speech_with_quantity(s32 messageIndex, s32 amount) { u8* suffixMsg; Evt* script; - set_message_value(amount, 0); + set_message_int_var(amount, 0); if (amount == 1) { suffixMsg = MessageSingular; @@ -143,9 +143,9 @@ s32 shop_owner_continue_speech_with_quantity(s32 messageIndex, s32 amount) { suffixMsg = MessagePlural; } - set_message_msg((s32) suffixMsg, 1); + set_message_text_var((s32) suffixMsg, 1); - script = start_script(&ShopContinueSpeech, EVT_PRIORITY_1, 0); + script = start_script(&EVS_ShopContinueSpeech, EVT_PRIORITY_1, 0); script->varTable[0] = shopMsgID; script->varTable[1] = shop->owner->npcID; script->varTable[2] = shop->owner->talkAnim; @@ -157,7 +157,7 @@ s32 shop_owner_continue_speech_with_quantity(s32 messageIndex, s32 amount) { s32 shop_owner_reset_speech(s32 messageIndex) { Shop* shop = gGameStatusPtr->mapShop; s32 shopMsgID = shop->owner->shopMsgIDs[messageIndex]; - Evt* script = start_script(&ShopResetSpeech, EVT_PRIORITY_1, 0); + Evt* script = start_script(&EVS_ShopResetSpeech, EVT_PRIORITY_1, 0); script->varTable[0] = shopMsgID; script->varTable[1] = shop->owner->npcID; @@ -169,7 +169,7 @@ s32 shop_owner_reset_speech(s32 messageIndex) { s32 shop_owner_end_speech(void) { Shop* shop = gGameStatusPtr->mapShop; - Evt* script = start_script(&ShopEndSpeech, EVT_PRIORITY_1, 0); + Evt* script = start_script(&EVS_ShopEndSpeech, EVT_PRIORITY_1, 0); script->varTable[0] = shop->owner->npcID; script->varTable[1] = shop->owner->talkAnim; @@ -178,7 +178,7 @@ s32 shop_owner_end_speech(void) { return script->id; } -API_CALLABLE(func_802803C8) { +API_CALLABLE(CanInteractWithShopItem) { PlayerStatus* playerStatus = &gPlayerStatus; script->varTable[2] = FALSE; @@ -196,17 +196,17 @@ API_CALLABLE(func_802803C8) { return ApiStatus_DONE2; } -API_CALLABLE(func_80280410) { +API_CALLABLE(BeginShopItemInteraction) { static Evt* ShopInteractScript; static s32 ShopInteractScriptID; Shop* shop = gGameStatusPtr->mapShop; s32 currentItemSlot = evt_get_variable(script, *script->ptrReadPos); - if (!(shop->flags & SHOP_FLAG_8)) { + if (!(shop->flags & SHOP_FLAG_INTERACT_SCRIPT_RUNNING)) { shop->curItemSlot = currentItemSlot; - shop->flags |= SHOP_FLAG_1; - func_800E98EC(); + shop->flags |= SHOP_FLAG_SHOWING_ITEM_INFO; + status_bar_always_show_on(); shop->unk_358 = 5; if (gGameStatusPtr->pressedButtons[0] & BUTTON_A) { @@ -215,11 +215,11 @@ API_CALLABLE(func_80280410) { disable_player_input(); disable_player_static_collisions(); - childScript = start_script(&BadgeShopInteract, EVT_PRIORITY_1, 0); + childScript = start_script(&EVS_ShopPurchaseDialog, EVT_PRIORITY_1, 0); childScript->varTable[0] = currentItemSlot; ShopInteractScript = childScript; ShopInteractScriptID = childScript->id; - shop->flags |= SHOP_FLAG_8; + shop->flags |= SHOP_FLAG_INTERACT_SCRIPT_RUNNING; return ApiStatus_BLOCK; } else { return ApiStatus_DONE2; @@ -228,7 +228,7 @@ API_CALLABLE(func_80280410) { return ApiStatus_BLOCK; } - shop->flags &= ~SHOP_FLAG_8; + shop->flags &= ~SHOP_FLAG_INTERACT_SCRIPT_RUNNING; enable_player_static_collisions(); enable_player_input(); return ApiStatus_DONE2; @@ -262,8 +262,8 @@ API_CALLABLE(ShowShopPurchaseDialog) { // functionTemp[1] is speech script ID // functionTemp[2] is speech printer isClosed writeback - shop->flags &= ~SHOP_FLAG_1; - func_800E9900(); + shop->flags &= ~SHOP_FLAG_SHOWING_ITEM_INFO; + status_bar_always_show_off(); if (isInitialCall) { wShopSelectedItem = ITEM_NONE; @@ -275,7 +275,7 @@ API_CALLABLE(ShowShopPurchaseDialog) { script->functionTemp[1] = shop_owner_buy_dialog(SHOP_MSG_BUY_CONFIRM, shopItem->nameMsg, shopInventory->price, bpCost); script->functionTemp[0] = PURCHASE_DIALOG_STATE_INIT; increment_status_bar_disabled(); - func_800E9900(); + status_bar_always_show_off(); show_coin_counter(); } @@ -377,15 +377,15 @@ void shop_open_item_select_popup(s32 mode) { switch (mode) { case 0: popupType = POPUP_MENU_SELL_ITEM; - numItemSlots = 10; + numItemSlots = ARRAY_COUNT(gPlayerData.invItems); break; case 1: popupType = POPUP_MENU_CHECK_ITEM; - numItemSlots = 10; + numItemSlots = ARRAY_COUNT(gPlayerData.invItems); break; default: popupType = POPUP_MENU_CLAIM_ITEM; - numItemSlots = 32; + numItemSlots = ARRAY_COUNT(gPlayerData.storedItems); break; } @@ -426,8 +426,8 @@ void shop_open_item_select_popup(s32 mode) { menu->initialPos = 0; create_shop_popup_menu(menu); status_bar_ignore_changes(); - func_800E98EC(); - open_status_bar_short(); + status_bar_always_show_on(); + open_status_bar_quickly(); } s32 shop_update_item_select_popup(s32* selectedIndex) { @@ -452,7 +452,7 @@ s32 shop_update_item_select_popup(s32* selectedIndex) { void shop_close_item_select_popup(void) { destroy_popup_menu(); - func_800E9900(); + status_bar_always_show_off(); status_bar_respond_to_changes(); close_status_bar(); } @@ -463,11 +463,10 @@ s32 shop_get_sell_price(s32 itemID) { ShopSellPriceData* items = shop->staticPriceList; s32 i; - if (shop) { + if (shop != NULL) { i = 0; } // TODO fake match - for (i = 0; i < numItems; i++) { if (items[i].itemID == itemID) { return items[i].sellPrice; @@ -482,7 +481,7 @@ API_CALLABLE(ShowShopOwnerDialog) { PlayerData* playerData = &gPlayerData; Shop* shop = gameStatus->mapShop; - static MessagePrintState* D_80286538; + static MessagePrintState* ShopOwnerPrintState; enum { DIALOG_STATE_DONE_INSTRUCTIONS = 0, @@ -523,12 +522,12 @@ API_CALLABLE(ShowShopOwnerDialog) { if (!does_script_exist(script->functionTemp[1])) { script->functionTemp[0] = DIALOG_STATE_AWAIT_MAIN_MENU; script->functionTemp[2] = 0; - D_80286538 = msg_get_printer_for_msg(MSG_Choice_0003, &script->functionTemp[2]); + ShopOwnerPrintState = msg_get_printer_for_msg(MSG_Choice_0003, &script->functionTemp[2]); } break; case DIALOG_STATE_AWAIT_MAIN_MENU: if (script->functionTemp[2] == 1) { - switch (D_80286538->curOption) { + switch (ShopOwnerPrintState->curOption) { case 0: script->functionTemp[1] = shop_owner_continue_speech(SHOP_MSG_INSTRUCTIONS); script->functionTemp[0] = DIALOG_STATE_DONE_INSTRUCTIONS; @@ -609,12 +608,12 @@ API_CALLABLE(ShowShopOwnerDialog) { if (!does_script_exist(script->functionTemp[1])) { script->functionTemp[0] = DIALOG_STATE_HANDLE_SELL_CHOICE; script->functionTemp[2] = 0; - D_80286538 = msg_get_printer_for_msg(MSG_Choice_0002, &script->functionTemp[2]); + ShopOwnerPrintState = msg_get_printer_for_msg(MSG_Choice_0002, &script->functionTemp[2]); } break; case DIALOG_STATE_HANDLE_SELL_CHOICE: if (script->functionTemp[2] == 1) { - if (D_80286538->curOption == 0) { + if (ShopOwnerPrintState->curOption == 0) { add_coins(shop_get_sell_price(playerData->invItems[shop->selectedStoreItemSlot])); playerData->invItems[shop->selectedStoreItemSlot] = ITEM_NONE; if (get_item_count() == 0) { @@ -636,12 +635,12 @@ API_CALLABLE(ShowShopOwnerDialog) { if (!does_script_exist(script->functionTemp[1])) { script->functionTemp[0] = DIALOG_STATE_AWAIT_SELL_MORE_CHOICE; script->functionTemp[2] = 0; - D_80286538 = msg_get_printer_for_msg(MSG_Choice_0004, &script->functionTemp[2]); + ShopOwnerPrintState = msg_get_printer_for_msg(MSG_Choice_0004, &script->functionTemp[2]); } break; case DIALOG_STATE_AWAIT_SELL_MORE_CHOICE: if (script->functionTemp[2] == 1) { - if (D_80286538->curOption == 0) { + if (ShopOwnerPrintState->curOption == 0) { script->functionTemp[1] = shop_owner_end_speech(); script->functionTemp[0] = DIALOG_STATE_INIT_SELL_CHOICE; hide_coin_counter_immediately(); @@ -691,12 +690,12 @@ API_CALLABLE(ShowShopOwnerDialog) { if (!does_script_exist(script->functionTemp[1])) { script->functionTemp[0] = DIALOG_STATE_AWAIT_CHECK_MORE_CHOICE; script->functionTemp[2] = 0; - D_80286538 = msg_get_printer_for_msg(MSG_Choice_0005, &script->functionTemp[2]); + ShopOwnerPrintState = msg_get_printer_for_msg(MSG_Choice_0005, &script->functionTemp[2]); } break; case DIALOG_STATE_AWAIT_CHECK_MORE_CHOICE: if (script->functionTemp[2] == 1) { - if (D_80286538->curOption == 0) { + if (ShopOwnerPrintState->curOption == 0) { script->functionTemp[1] = shop_owner_end_speech(); script->functionTemp[0] = DIALOG_STATE_INIT_CHECK_CHOICE; } else { @@ -744,12 +743,12 @@ API_CALLABLE(ShowShopOwnerDialog) { if (!does_script_exist(script->functionTemp[1])) { script->functionTemp[0] = DIALOG_STATE_AWAIT_CLAIM_MORE_CHOICE; script->functionTemp[2] = 0; - D_80286538 = msg_get_printer_for_msg(MSG_Choice_0005, &script->functionTemp[2]); + ShopOwnerPrintState = msg_get_printer_for_msg(MSG_Choice_0005, &script->functionTemp[2]); } break; case DIALOG_STATE_AWAIT_CLAIM_MORE_CHOICE: if (script->functionTemp[2] == 1) { - if (D_80286538->curOption == 0) { + if (ShopOwnerPrintState->curOption == 0) { script->functionTemp[1] = shop_owner_end_speech(); script->functionTemp[0] = DIALOG_STATE_INIT_CLAIM_CHOICE; } else { @@ -771,7 +770,7 @@ API_CALLABLE(ShowShopOwnerDialog) { start_script(shop->owner->onTalkEvt, EVT_PRIORITY_1, 0); } } - open_status_bar_short(); + open_status_bar_quickly(); return ApiStatus_DONE1; } return ApiStatus_BLOCK; @@ -804,7 +803,7 @@ void draw_shop_items(void) { f32 inX, inY, inZ; ShopItemEntity* shopItemEntities; - if (shop->flags & SHOP_FLAG_1) { + if (shop->flags & SHOP_FLAG_SHOWING_ITEM_INFO) { set_window_update(WINDOW_ID_ITEM_INFO_NAME, (s32) basic_window_update); set_window_update(WINDOW_ID_ITEM_INFO_DESC, (s32) basic_window_update); } else { @@ -812,7 +811,7 @@ void draw_shop_items(void) { set_window_update(WINDOW_ID_ITEM_INFO_DESC, (s32) basic_hidden_window_update); } - if (shop->flags & SHOP_FLAG_1) { + if (shop->flags & SHOP_FLAG_SHOWING_ITEM_INFO) { camera = &gCameras[gCurrentCameraID]; itemData = shop->staticInventory; shopItemEntities = gGameStatusPtr->shopItemEntities; @@ -856,8 +855,8 @@ void draw_shop_items(void) { if (shop->unk_358 > 0) { shop->unk_358--; } else { - shop->flags &= ~SHOP_FLAG_1; - func_800E9900(); + shop->flags &= ~SHOP_FLAG_SHOWING_ITEM_INFO; + status_bar_always_show_off(); } } @@ -922,7 +921,7 @@ API_CALLABLE(MakeShop) { inventory = shop->staticInventory; itemDataPositions = shop->itemDataPositions; numShopItems = 0; - while (inventory->itemID != 0) { + while (inventory->itemID != ITEM_NONE) { get_model_center_and_size(itemDataPositions->posModelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); centerY += 6; gGameStatusPtr->shopItemEntities[numShopItems].pos.x = centerX; @@ -933,8 +932,8 @@ API_CALLABLE(MakeShop) { gGameStatusPtr->shopItemEntities[numShopItems].index = make_item_entity_nodelay(inventory->itemID | shop->inventoryItemFlags, centerX, centerY, centerZ, 1, 0); set_item_entity_flags(gGameStatusPtr->shopItemEntities[numShopItems].index, ITEM_ENTITY_RESIZABLE); - bind_trigger_1(&D_80283F58_7E4DD8, TRIGGER_FLOOR_TOUCH, itemDataPositions->triggerColliderID, numShopItems, 0, 3); - bind_trigger_1(&D_80283F58_7E4DD8, TRIGGER_FLOOR_PRESS_A, itemDataPositions->triggerColliderID, numShopItems, 0, 3); + bind_trigger_1(&EVS_ShopItemInteract, TRIGGER_FLOOR_TOUCH, itemDataPositions->triggerColliderID, numShopItems, 0, 3); + bind_trigger_1(&EVS_ShopItemInteract, TRIGGER_FLOOR_PRESS_A, itemDataPositions->triggerColliderID, numShopItems, 0, 3); itemDataPositions++; inventory++; numShopItems++; diff --git a/tools/ignored_funcs.txt b/tools/ignored_funcs.txt index 600e0712df..f04a8fb242 100644 --- a/tools/ignored_funcs.txt +++ b/tools/ignored_funcs.txt @@ -253,7 +253,7 @@ dead_get_entity_by_index = 0x80118BB0; dead_cos_rad = 0x8002B4C0; dead_fx_sun = 0x80077BD0; dead_spawn_surface_effects = 0x80041080; -dead_set_max_SP = 0x800F1D9C; +dead_set_max_star_power = 0x800F1D9C; dead_sync_status_bar = 0x800F1730; dead_get_npc_by_index = 0x8003C43C; dead_evt_set_float_variable = 0x802D5A10; @@ -268,7 +268,7 @@ dead_create_standard_popup_menu = 0x800FCD0C; dead_hide_popup_menu = 0x800F9260; dead_destroy_popup_menu = 0x800F93E8; dead_switch_to_partner = 0x800F2D5C; -dead_set_message_msg = 0x80130C74; +dead_set_message_text_var = 0x80130C74; dead_fx_energy_orb_wave = 0x800769D0; dead_fx_radial_shimmer = 0x80075E30; func_8002B524 = 0x8002B524; diff --git a/ver/ique/asm/bss.s b/ver/ique/asm/bss.s index 17210c8c00..7d3d9ef767 100644 --- a/ver/ique/asm/bss.s +++ b/ver/ique/asm/bss.s @@ -145,7 +145,7 @@ dlabel nuGfxCfb_ptr dlabel gOverrideFlags .space 4 -dlabel D_8009A654 +dlabel HasPreBattleSongPushed .space 4 dlabel nuGfxCfb @@ -186,7 +186,7 @@ dlabel D_8009A680 dlabel D_8009A684 .space 0x0000000c -dlabel D_8009A690 +dlabel SoftResetDelay .space 4 dlabel D_8009A694 diff --git a/ver/ique/asm/bss3.s b/ver/ique/asm/bss3.s index 881803603a..b1a3b79dd2 100644 --- a/ver/ique/asm/bss3.s +++ b/ver/ique/asm/bss3.s @@ -428,7 +428,7 @@ dlabel msg_drawState dlabel D_8015DD78 .space 8 -dlabel D_80155D80 +dlabel UnusedItemPhysicsScriptID .space 4 dlabel ItemEntityAlternatingSpawn @@ -437,13 +437,13 @@ dlabel ItemEntityAlternatingSpawn dlabel ItemEntityRenderGroup .space 4 -dlabel D_80155D8C +dlabel CoinSparkleCenterX .space 2 -dlabel D_80155D8E +dlabel CoinSparkleCenterY .space 2 -dlabel D_80155D90 +dlabel CoinSparkleCenterZ .space 2 dlabel pad_ItemEntity @@ -461,7 +461,7 @@ dlabel gCurrentItemEntities dlabel isPickingUpItem .space 2 -dlabel D_801565A6 +dlabel ItemSpawnWithinPlayerPickupDelay .space 2 dlabel D_801565A8 @@ -470,7 +470,7 @@ dlabel D_801565A8 dlabel D_801565AC .space 4 -dlabel D_801565B0 +dlabel ItemPickupMenu .space 0x00000330 dlabel ItemPickupIconID @@ -479,10 +479,10 @@ dlabel ItemPickupIconID dlabel ItemPickupStateDelay .space 4 -dlabel D_801568E8 +dlabel ThrowAwayMenuIdx .space 4 -dlabel D_801568EC +dlabel ThrowAwayItemID .space 4 dlabel ItemPickupGotOutline diff --git a/ver/ique/symbol_addrs.txt b/ver/ique/symbol_addrs.txt index e79d2df6d3..55632eba93 100644 --- a/ver/ique/symbol_addrs.txt +++ b/ver/ique/symbol_addrs.txt @@ -574,7 +574,7 @@ charset_postcard_png = 0x00054fa8; charset_postcard_pal + 5 = 0x00056e70; D_80159B50 = 0x8015bed0; gOverrideFlags = 0x80099228; -D_801565A6 = 0x80158926; +ItemSpawnWithinPlayerPickupDelay = 0x80158926; gHudElementCacheTableRaster = 0x8014fa58; D_8015131C = 0x8014faac; gItemIconRasterOffsets = 0x8008d038; diff --git a/ver/ique/undefined_syms.txt b/ver/ique/undefined_syms.txt index fbd4efa563..3b045e926c 100644 --- a/ver/ique/undefined_syms.txt +++ b/ver/ique/undefined_syms.txt @@ -837,7 +837,7 @@ DeleteNpc = 0x802cdc1c; draw_box = 0x800f36c0; draw_status_ui = 0x800e7b1c; evt_get_float_variable = 0x802c842c; -func_800E97E4 = 0x800e7bc4; +setup_status_bar_for_world = 0x800e7bc4; func_800EF3D4 = 0x800ed7b4; set_npc_imgfx_all = 0x802de894; func_802DDEC4 = 0x802ddec4; diff --git a/ver/jp/asm/bss2_2.s b/ver/jp/asm/bss2_2.s index 936065bab4..dd58463ae8 100644 --- a/ver/jp/asm/bss2_2.s +++ b/ver/jp/asm/bss2_2.s @@ -174,7 +174,7 @@ dlabel PopupNotDipping dlabel PopupDipMode .space 1 -dlabel D_8010D69A +dlabel PopupMenu_WasStatusBarIgnoringChanges .space 2 dlabel gPopupMenu @@ -204,7 +204,7 @@ dlabel gSpinHistoryPosX dlabel gSpinHistoryPosZ .space 0x18 -dlabel gUIStatus +dlabel gStatusBar .space 0x70 dlabel gPlayerStatus diff --git a/ver/jp/asm/main.bss.s b/ver/jp/asm/main.bss.s index 77720f0cbb..bc50a14a74 100644 --- a/ver/jp/asm/main.bss.s +++ b/ver/jp/asm/main.bss.s @@ -109,7 +109,7 @@ dlabel nuGfxCfb_ptr dlabel gOverrideFlags .space 4 -dlabel D_8009A654 +dlabel HasPreBattleSongPushed .space 4 dlabel nuGfxCfb @@ -139,7 +139,7 @@ dlabel D_8009A678 dlabel D_8009A680 .space 0x00000010 -dlabel D_8009A690 +dlabel SoftResetDelay .space 0x00000010 dlabel D_8009A6A0 diff --git a/ver/jp/splat.yaml b/ver/jp/splat.yaml index 52bc1ed063..1baf10393c 100644 --- a/ver/jp/splat.yaml +++ b/ver/jp/splat.yaml @@ -446,10 +446,10 @@ segments: - [auto, c, npc_collision] - [auto, c, 77480] - [auto, c, 7B440] - - [auto, c, 7bb60_len_41b0] + - [auto, c, 7BB60] - [auto, c, 7E9D0] - - [auto, c, 7fd10_len_b40] - - [auto, c, 80850_len_3060] + - [auto, c, world/menus] + - [auto, c, inventory] - [auto, c, world/actions] # DUMMY ROM - [auto, c, world/partners] - [auto, hasm, bss2_2] @@ -463,10 +463,10 @@ segments: - [0xA2AF0, bin] - [0xA5250, .rodata, 77480] - [auto, .rodata, 7B440] - - [auto, .rodata, 7bb60_len_41b0] + - [auto, .rodata, 7BB60] - [auto, .rodata, 7E9D0] - - [auto, .rodata, 7fd10_len_b40] - - [auto, .rodata, 80850_len_3060] + - [auto, .rodata, world/menus] + - [auto, .rodata, inventory] - [auto, .rodata, world/partners] - [auto, .rodata, 891b0_len_fb0] - [0xA5910, bin] diff --git a/ver/jp/symbol_addrs.txt b/ver/jp/symbol_addrs.txt index b0eb014e04..9eaa4e7da0 100644 --- a/ver/jp/symbol_addrs.txt +++ b/ver/jp/symbol_addrs.txt @@ -160,7 +160,7 @@ D_80073E0A = 0x80073DEA; D_80073E10 = 0x80073DF0; D_80074010 = 0x80073FF0; gGameStatusPtr = 0x8007417C; -D_800741A2 = 0x80074182; +SoftResetState = 0x80074182; gMatrixListPos = 0x800741D0; gRandSeed = 0x800743F0; theater_walls_png = 0x800745C0; @@ -207,7 +207,7 @@ nuGfxCfb = 0x8009A638; gMainGfxPos = 0x8009A64C; gDisplayContext = 0x8009A654; D_8009A680 = 0x8009A660; -D_8009A690 = 0x8009A670; +SoftResetDelay = 0x8009A670; D_8009A6A0 = 0x8009A680; D_8009A6A2 = 0x8009A682; D_8009A6A4 = 0x8009A684; @@ -293,7 +293,7 @@ hud_element_clear_cache = 0x801461B0; update_hud_elements = 0x801466C0; render_hud_elements_backUI = 0x801472C0; render_hud_elements_frontUI = 0x801477CC; -render_hud_elements_world = 0x80148764; +render_transformed_hud_elements = 0x80148764; clear_saved_variables = 0x8014A3D0; clear_trigger_data = 0x8014A730; update_triggers = 0x8014A910; diff --git a/ver/jp/undefined_syms.txt b/ver/jp/undefined_syms.txt index 428032c7c1..3cb0e3eda0 100644 --- a/ver/jp/undefined_syms.txt +++ b/ver/jp/undefined_syms.txt @@ -200,7 +200,7 @@ hud_element_create = 0x80146554; update_hud_elements = 0x801466C0; render_hud_elements_backUI = 0x801472C0; render_hud_elements_frontUI = 0x801477CC; -render_hud_elements_world = 0x80148764; +render_transformed_hud_elements = 0x80148764; hud_element_draw_next = 0x80149874; hud_element_set_script = 0x801498AC; get_hud_element = 0x80149984; @@ -1212,7 +1212,7 @@ EVS_WorldGoombario_TakeOut = 0x802BDD6C; EVS_WorldGoombario_Update = 0x802BDD8C; EVS_WorldGoombario_UseAbility = 0x802BDDA8; EVS_WorldGoombario_PutAway = 0x802BDE60; -world_goombario_can_pause = 0x802BD5A8; +world_goombario_can_open_menus = 0x802BD5A8; world_goombario_pre_battle = 0x802BDBC0; world_partner_kooper_ROM_START = 0x323530; @@ -1237,7 +1237,7 @@ EVS_WorldBombette_UseAbility = 0x802BE8BC; EVS_WorldBombette_PutAway = 0x802BE8D8; world_bombette_test_first_strike = 0x802BE520; world_bombette_can_use_ability = 0x802BD720; -world_bombette_can_player_pause = 0x802BD748; +world_bombette_can_open_menus = 0x802BD748; world_bombette_pre_battle = 0x802BE6E8; world_partner_parakarry_ROM_START = 0x321a80; diff --git a/ver/pal/asm/bss2_2.s b/ver/pal/asm/bss2_2.s index 936065bab4..dd58463ae8 100644 --- a/ver/pal/asm/bss2_2.s +++ b/ver/pal/asm/bss2_2.s @@ -174,7 +174,7 @@ dlabel PopupNotDipping dlabel PopupDipMode .space 1 -dlabel D_8010D69A +dlabel PopupMenu_WasStatusBarIgnoringChanges .space 2 dlabel gPopupMenu @@ -204,7 +204,7 @@ dlabel gSpinHistoryPosX dlabel gSpinHistoryPosZ .space 0x18 -dlabel gUIStatus +dlabel gStatusBar .space 0x70 dlabel gPlayerStatus diff --git a/ver/pal/asm/bss3.s b/ver/pal/asm/bss3.s index 3f347a5893..0f1993f818 100644 --- a/ver/pal/asm/bss3.s +++ b/ver/pal/asm/bss3.s @@ -425,7 +425,7 @@ dlabel msg_drawState dlabel D_8015DD78 .space 8 -dlabel D_80155D80 +dlabel UnusedItemPhysicsScriptID .space 4 dlabel ItemEntityAlternatingSpawn @@ -434,13 +434,13 @@ dlabel ItemEntityAlternatingSpawn dlabel ItemEntityRenderGroup .space 4 -dlabel D_80155D8C +dlabel CoinSparkleCenterX .space 2 -dlabel D_80155D8E +dlabel CoinSparkleCenterY .space 2 -dlabel D_80155D90 +dlabel CoinSparkleCenterZ .space 2 dlabel pad_ItemEntity @@ -458,7 +458,7 @@ dlabel gCurrentItemEntities dlabel isPickingUpItem .space 2 -dlabel D_801565A6 +dlabel ItemSpawnWithinPlayerPickupDelay .space 2 dlabel D_801565A8 @@ -467,7 +467,7 @@ dlabel D_801565A8 dlabel D_801565AC .space 4 -dlabel D_801565B0 +dlabel ItemPickupMenu .space 0x00000330 .space 0x14 @@ -477,10 +477,10 @@ dlabel ItemPickupIconID dlabel ItemPickupStateDelay .space 4 -dlabel D_801568E8 +dlabel ThrowAwayMenuIdx .space 4 -dlabel D_801568EC +dlabel ThrowAwayItemID .space 4 dlabel ItemPickupGotOutline diff --git a/ver/pal/asm/nonmatchings/filemenu/filemenu_yesno/filemenu_yesno_handle_input.s b/ver/pal/asm/nonmatchings/filemenu/filemenu_yesno/filemenu_yesno_handle_input.s index 6343fe6112..04cfc6ad19 100644 --- a/ver/pal/asm/nonmatchings/filemenu/filemenu_yesno/filemenu_yesno_handle_input.s +++ b/ver/pal/asm/nonmatchings/filemenu/filemenu_yesno/filemenu_yesno_handle_input.s @@ -518,7 +518,7 @@ glabel filemenu_yesno_handle_input /* 17453C 8024BB1C AC620040 */ sw $v0, 0x40($v1) /* 174540 8024BB20 24020001 */ addiu $v0, $zero, 0x1 /* 174544 8024BB24 00441023 */ subu $v0, $v0, $a0 -/* 174548 8024BB28 0C00AC15 */ jal fio_flush_globals +/* 174548 8024BB28 0C00AC15 */ jal fio_save_globals /* 17454C 8024BB2C AC620038 */ sw $v0, 0x38($v1) .Lfilemenu_8024BB30: /* 174550 8024BB30 0C00ACD3 */ jal fio_load_game diff --git a/ver/pal/splat.yaml b/ver/pal/splat.yaml index c29ff16b97..f2e425e65e 100644 --- a/ver/pal/splat.yaml +++ b/ver/pal/splat.yaml @@ -44,10 +44,10 @@ segments: - [auto, c, npc_collision] - [auto, c, 77480] - [auto, c, 7B440] - - [auto, c, 7bb60_len_41b0] + - [auto, c, 7BB60] - [auto, c, 7E9D0] - - [auto, c, 7fd10_len_b40] - - [auto, c, 80850_len_3060] + - [auto, c, world/menus] + - [auto, c, inventory] - [auto, c, world/actions] # DUMMY ROM - [auto, c, world/partners] - [auto, hasm, bss2_2] diff --git a/ver/pal/undefined_syms.txt b/ver/pal/undefined_syms.txt index 9f863cae43..0d91e755a5 100644 --- a/ver/pal/undefined_syms.txt +++ b/ver/pal/undefined_syms.txt @@ -43,8 +43,8 @@ general_heap_malloc = 0x8002ABA8; general_heap_free = 0x8002ABF8; heap_malloc = 0x8002AC64; heap_free = 0x8002ACAC; -fio_has_valid_globals = 0x8002AFE0; -fio_flush_globals = 0x8002B054; +fio_load_globals = 0x8002AFE0; +fio_save_globals = 0x8002B054; fio_load_game = 0x8002B34C; fio_save_game = 0x8002B41C; fio_erase_game = 0x8002B510; @@ -613,7 +613,7 @@ bMarioIdleAnims = 0x80283628; GetGridIndexFromPos = 0x802836C8; bMarioHideAnims = 0x80283760; SetPushBlockFallEffect = 0x802837BC; -ItemShopInteract = 0x80284064; +EVS_ShopOwnerDialog = 0x80284064; EMS_StarIcon = 0x802843A8; EnterWalk = 0x80285970; EnterWalkShort = 0x80285A70; diff --git a/ver/us/asm/bss.s b/ver/us/asm/bss.s index b91edfb2bc..33d34356ac 100644 --- a/ver/us/asm/bss.s +++ b/ver/us/asm/bss.s @@ -132,7 +132,7 @@ dlabel nuGfxCfb_ptr dlabel gOverrideFlags .space 4 -dlabel D_8009A654 +dlabel HasPreBattleSongPushed .space 4 dlabel nuGfxCfb @@ -171,7 +171,7 @@ dlabel D_8009A680 dlabel D_8009A684 .space 0x0000000c -dlabel D_8009A690 +dlabel SoftResetDelay .space 4 dlabel D_8009A694 diff --git a/ver/us/asm/bss2_2.s b/ver/us/asm/bss2_2.s index 936065bab4..dd58463ae8 100644 --- a/ver/us/asm/bss2_2.s +++ b/ver/us/asm/bss2_2.s @@ -174,7 +174,7 @@ dlabel PopupNotDipping dlabel PopupDipMode .space 1 -dlabel D_8010D69A +dlabel PopupMenu_WasStatusBarIgnoringChanges .space 2 dlabel gPopupMenu @@ -204,7 +204,7 @@ dlabel gSpinHistoryPosX dlabel gSpinHistoryPosZ .space 0x18 -dlabel gUIStatus +dlabel gStatusBar .space 0x70 dlabel gPlayerStatus diff --git a/ver/us/asm/bss3.s b/ver/us/asm/bss3.s index 42a53690bb..f5d1088ba4 100644 --- a/ver/us/asm/bss3.s +++ b/ver/us/asm/bss3.s @@ -425,7 +425,7 @@ dlabel msg_drawState dlabel D_8015DD78 .space 8 -dlabel D_80155D80 +dlabel UnusedItemPhysicsScriptID .space 4 dlabel ItemEntityAlternatingSpawn @@ -434,13 +434,13 @@ dlabel ItemEntityAlternatingSpawn dlabel ItemEntityRenderGroup .space 4 -dlabel D_80155D8C +dlabel CoinSparkleCenterX .space 2 -dlabel D_80155D8E +dlabel CoinSparkleCenterY .space 2 -dlabel D_80155D90 +dlabel CoinSparkleCenterZ .space 2 dlabel pad_ItemEntity @@ -458,7 +458,7 @@ dlabel gCurrentItemEntities dlabel isPickingUpItem .space 2 -dlabel D_801565A6 +dlabel ItemSpawnWithinPlayerPickupDelay .space 2 dlabel D_801565A8 @@ -467,7 +467,7 @@ dlabel D_801565A8 dlabel D_801565AC .space 4 -dlabel D_801565B0 +dlabel ItemPickupMenu .space 0x00000330 dlabel ItemPickupIconID @@ -476,10 +476,10 @@ dlabel ItemPickupIconID dlabel ItemPickupStateDelay .space 4 -dlabel D_801568E8 +dlabel ThrowAwayMenuIdx .space 4 -dlabel D_801568EC +dlabel ThrowAwayItemID .space 4 dlabel ItemPickupGotOutline diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 3b387b4dcc..66c2670fd4 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -395,10 +395,10 @@ segments: - [auto, c, npc_collision] - [auto, c, 77480] - [auto, c, 7B440] - - [auto, c, 7bb60_len_41b0] + - [auto, c, 7BB60] - [auto, c, 7E9D0] - - [auto, c, 7fd10_len_b40] - - [auto, c, 80850_len_3060] + - [auto, c, world/menus] + - [auto, c, inventory] - [auto, c, world/actions] # DUMMY ROM - [auto, c, world/partners] - [auto, hasm, bss2_2] diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 01939f59bc..4599d65866 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -92,8 +92,8 @@ collision_heap_free = 0x8002ADF4; // type:func rom:0x61F4 get_spirits_rescued = 0x8002AE40; // type:func rom:0x6240 fio_calc_globals_checksum = 0x8002AF40; // type:func rom:0x6340 fio_validate_globals_checksums = 0x8002AF70; // type:func rom:0x6370 -fio_has_valid_globals = 0x8002AFD8; // type:func rom:0x63D8 -fio_flush_globals = 0x8002B04C; // type:func rom:0x644C +fio_load_globals = 0x8002AFD8; // type:func rom:0x63D8 +fio_save_globals = 0x8002B04C; // type:func rom:0x644C fio_calc_file_checksum = 0x8002B0D0; // type:func rom:0x64D0 fio_validate_file_checksum = 0x8002B0F8; // type:func rom:0x64F8 fio_fetch_saved_file_info = 0x8002B154; // type:func rom:0x6554 @@ -1303,8 +1303,8 @@ gGameStepDelayAmount = 0x80074020; // rom:0x4F420 gGameStepDelayCount = 0x80074021; // rom:0x4F421 gGameStatus = 0x80074024; // rom:0x4F424 gGameStatusPtr = 0x8007419C; // rom:0x4F59C -D_800741A0 = 0x800741A0; // rom:0x4F5A0 -D_800741A2 = 0x800741A2; // rom:0x4F5A2 +SoftResetOverlayAlpha = 0x800741A0; // rom:0x4F5A0 +SoftResetState = 0x800741A2; // rom:0x4F5A2 D_800741A4 = 0x800741A4; // rom:0x4F5A4 MasterIdentityMtx = 0x800741A8; // rom:0x4F5A8 gMatrixListPos = 0x800741F0; // rom:0x4F5F0 @@ -2586,7 +2586,7 @@ gSoundManager = 0x8009A640; // rom:0x75A40 D_8009A644 = 0x8009A644; // rom:0x75A44 nuGfxCfb_ptr = 0x8009A64C; // rom:0x75A4C gOverrideFlags = 0x8009A650; // rom:0x75A50 -D_8009A654 = 0x8009A654; // rom:0x75A54 +HasPreBattleSongPushed = 0x8009A654; // rom:0x75A54 nuGfxCfb = 0x8009A658; // rom:0x75A58 D_8009A65C = 0x8009A65C; // rom:0x75A5C __osFinalrom = 0x8009A660; // rom:0x75A60 @@ -2599,7 +2599,7 @@ D_8009A678 = 0x8009A678; // rom:0x75A78 D_8009A67C = 0x8009A67C; // rom:0x75A7C D_8009A680 = 0x8009A680; // rom:0x75A80 D_8009A684 = 0x8009A684; // rom:0x75A84 -D_8009A690 = 0x8009A690; // rom:0x75A90 +SoftResetDelay = 0x8009A690; // rom:0x75A90 D_8009A694 = 0x8009A694; // rom:0x75A94 D_8009A6A0 = 0x8009A6A0; // rom:0x75AA0 D_8009A6A2 = 0x8009A6A2; // rom:0x75AA2 @@ -2687,7 +2687,7 @@ func_800E06C0 = 0x800E06C0; // type:func rom:0x79B70 func_800E06D8 = 0x800E06D8; // type:func rom:0x79B88 check_for_interactables = 0x800E0818; // type:func rom:0x79CC8 render_interact_prompt = 0x800E0AD0; // type:func rom:0x79F80 -func_800E0B14 = 0x800E0B14; // type:func rom:0x79FC4 +clear_interact_prompt = 0x800E0B14; // type:func rom:0x79FC4 update_partner_timers = 0x800E0B38; // type:func rom:0x79FE8 func_800E0B90 = 0x800E0B90; // type:func rom:0x7A040 get_player_back_anim = 0x800E0FEC; // type:func rom:0x7A49C @@ -2871,10 +2871,10 @@ peach_check_for_parasol_input = 0x800E6428; // type:func rom:0x7F8D8 peach_sync_disguise_npc = 0x800E6500; // type:func rom:0x7F9B0 peach_make_disguise_npc = 0x800E657C; // type:func rom:0x7FA2C peach_disguise_check_overlaps = 0x800E66C4; // type:func rom:0x7FB74 -func_800E6860 = 0x800E6860; // type:func rom:0x7FD10 -func_800E6904 = 0x800E6904; // type:func rom:0x7FDB4 -can_pause = 0x800E69DC; // type:func rom:0x7FE8C -func_800E6B68 = 0x800E6B68; // type:func rom:0x80018 +reset_outta_sight_alpha_on_menu_close = 0x800E6860; // type:func rom:0x7FD10 +should_cancel_open_world_menu = 0x800E6904; // type:func rom:0x7FDB4 +can_open_world_menu = 0x800E69DC; // type:func rom:0x7FE8C +clear_world_menus = 0x800E6B68; // type:func rom:0x80018 setup_partner_popup = 0x800E6B78; // type:func rom:0x80028 setup_item_popup = 0x800E6C44; // type:func rom:0x800F4 check_input_open_menus = 0x800E6CE4; // type:func rom:0x80194 @@ -2903,20 +2903,20 @@ hide_coin_counter = 0x800E9698; // type:func rom:0x82B48 hide_coin_counter_immediately = 0x800E96C8; // type:func rom:0x82B78 ShowCoinCounter = 0x800E96F8; // type:func rom:0x82BA8 draw_status_ui = 0x800E973C; // type:func rom:0x82BEC -open_status_bar_long = 0x800E9760; // type:func rom:0x82C10 -open_status_bar_short = 0x800E978C; // type:func rom:0x82C3C +open_status_bar_slowly = 0x800E9760; // type:func rom:0x82C10 +open_status_bar_quickly = 0x800E978C; // type:func rom:0x82C3C close_status_bar = 0x800E97B8; // type:func rom:0x82C68 -func_800E97E4 = 0x800E97E4; // type:func rom:0x82C94 -func_800E9810 = 0x800E9810; // type:func rom:0x82CC0 -func_800E983C = 0x800E983C; // type:func rom:0x82CEC -func_800E984C = 0x800E984C; // type:func rom:0x82CFC -func_800E9860 = 0x800E9860; // type:func rom:0x82D10 +setup_status_bar_for_world = 0x800E97E4; // type:func rom:0x82C94 +setup_status_bar_for_battle = 0x800E9810; // type:func rom:0x82CC0 +enable_status_bar_input = 0x800E983C; // type:func rom:0x82CEC +disable_status_bar_input = 0x800E984C; // type:func rom:0x82CFC +can_control_status_bar = 0x800E9860; // type:func rom:0x82D10 status_bar_ignore_changes = 0x800E9894; // type:func rom:0x82D44 -func_800E98A8 = 0x800E98A8; // type:func rom:0x82D58 +status_bar_show_and_ignore_changes = 0x800E98A8; // type:func rom:0x82D58 status_bar_respond_to_changes = 0x800E98C4; // type:func rom:0x82D74 -func_800E98D4 = 0x800E98D4; // type:func rom:0x82D84 -func_800E98EC = 0x800E98EC; // type:func rom:0x82D9C -func_800E9900 = 0x800E9900; // type:func rom:0x82DB0 +status_bar_is_ignoring_changes = 0x800E98D4; // type:func rom:0x82D84 +status_bar_always_show_on = 0x800E98EC; // type:func rom:0x82D9C +status_bar_always_show_off = 0x800E9900; // type:func rom:0x82DB0 is_status_bar_visible = 0x800E9910; // type:func rom:0x82DC0 status_bar_start_blinking_hp = 0x800E9920; // type:func rom:0x82DD0 status_bar_stop_blinking_hp = 0x800E9964; // type:func rom:0x82E14 @@ -2938,9 +2938,9 @@ is_partner_ability_active = 0x800EA0B8; // type:func rom:0x83568 add_coins = 0x800EA0C0; // type:func rom:0x83570 add_star_points = 0x800EA128; // type:func rom:0x835D8 add_star_pieces = 0x800EA170; // type:func rom:0x83620 -increment_max_SP = 0x800EA1B4; // type:func rom:0x83664 -set_max_SP = 0x800EA1D8; // type:func rom:0x83688 -add_SP = 0x800EA1F4; // type:func rom:0x836A4 +increment_max_star_power = 0x800EA1B4; // type:func rom:0x83664 +set_max_star_power = 0x800EA1D8; // type:func rom:0x83688 +add_star_power = 0x800EA1F4; // type:func rom:0x836A4 recover_fp = 0x800EA264; // type:func rom:0x83714 recover_hp = 0x800EA2CC; // type:func rom:0x8377C subtract_hp = 0x800EA334; // type:func rom:0x837E4 @@ -2954,7 +2954,7 @@ remove_consumable = 0x800EA47C; // type:func rom:0x8392C func_800EA4B0 = 0x800EA4B0; // type:func rom:0x83960 partner_is_idle = 0x800EA514; // type:func rom:0x839C4 nuScAudioStack = 0x800A85D0; // rom:0x839D0 -world_partner_can_player_pause_default = 0x800EA524; // type:func rom:0x839D4 +world_partner_can_open_menus_default = 0x800EA524; // type:func rom:0x839D4 func_800EA52C = 0x800EA52C; // type:func rom:0x839DC partner_is_flying = 0x800EA5A4; // type:func rom:0x83A54 func_800EA5B8 = 0x800EA5B8; // type:func rom:0x83A68 @@ -2964,7 +2964,7 @@ switch_to_partner = 0x800EB168; // type:func rom:0x84618 partner_init_after_battle = 0x800EB200; // type:func rom:0x846B0 func_800EB2A4 = 0x800EB2A4; // type:func rom:0x84754 partner_use_ability = 0x800EB314; // type:func rom:0x847C4 -partner_player_can_pause = 0x800EB3E0; // type:func rom:0x84890 +partner_can_open_world_menus = 0x800EB3E0; // type:func rom:0x84890 partner_can_use_ability = 0x800EB42C; // type:func rom:0x848DC partner_reset_data = 0x800EB474; // type:func rom:0x84924 partner_initialize_data = 0x800EB580; // type:func rom:0x84A30 @@ -3793,16 +3793,16 @@ PlayerYInterpUpdateDelay = 0x8010C9A0; // rom:0xA5E50 D_8010C9A4 = 0x8010C9A4; // rom:0xA5E54 D_8010C9B0 = 0x8010C9B0; // rom:0xA5E60 D_8010C9B4 = 0x8010C9B4; // rom:0xA5E64 -D_8010C9C0 = 0x8010C9C0; // rom:0xA5E70 +SwappedWorldMenus = 0x8010C9C0; // rom:0xA5E70 D_8010C9C4 = 0x8010C9C4; // rom:0xA5E74 -D_8010C9C8 = 0x8010C9C8; // rom:0xA5E78 +WorldPopupMenu = 0x8010C9C8; // rom:0xA5E78 D_8010C9CC = 0x8010C9CC; // rom:0xA5E7C update_shadows = 0x8010FA98; // type:func rom:0xA6198 -D_8010CCF8 = 0x8010CCF8; // rom:0xA61A8 -D_8010CCFA = 0x8010CCFA; // rom:0xA61AA -D_8010CCFC = 0x8010CCFC; // rom:0xA61AC -D_8010CCFE = 0x8010CCFE; // rom:0xA61AE -D_8010CD00 = 0x8010CD00; // rom:0xA61B0 +WorldMenuType = 0x8010CCF8; // rom:0xA61A8 +WorldMenuDelay = 0x8010CCFA; // rom:0xA61AA +WorldPopupResult = 0x8010CCFC; // rom:0xA61AC +OpenMenuDisableCount = 0x8010CCFE; // rom:0xA61AE +WorldMenuState = 0x8010CD00; // rom:0xA61B0 D_8010CD04 = 0x8010CD04; // rom:0xA61B4 D_8010CD10 = 0x8010CD10; // rom:0xA61C0 D_8010CD12 = 0x8010CD12; // rom:0xA61C2 @@ -3878,7 +3878,7 @@ D_8010D693 = 0x8010D693; // rom:0xA6B43 gPopupWorker = 0x8010D694; // rom:0xA6B44 PopupNotDipping = 0x8010D698; // rom:0xA6B48 PopupDipMode = 0x8010D699; // rom:0xA6B49 -D_8010D69A = 0x8010D69A; // rom:0xA6B4A +PopupMenu_WasStatusBarIgnoringChanges = 0x8010D69A; // rom:0xA6B4A gPopupMenu = 0x8010D69C; // rom:0xA6B4C D_8010D6A0 = 0x8010D6A0; // rom:0xA6B50 D_8010D6A4 = 0x8010D6A4; // rom:0xA6B54 @@ -3916,7 +3916,7 @@ create_shadow_from_data = 0x80111BD8; // type:func rom:0xA82D8 gSpinHistoryPosY = 0x8010EF10; // rom:0xA83C0 gSpinHistoryPosX = 0x8010EF28; // rom:0xA83D8 gSpinHistoryPosZ = 0x8010EF40; // rom:0xA83F0 -gUIStatus = 0x8010EF58; // rom:0xA8408 +gStatusBar = 0x8010EF58; // rom:0xA8408 MakeEntity = 0x80111D38; // type:func rom:0xA8438 D_8010EF92 = 0x8010EF92; // rom:0xA8442 D_8010EF94 = 0x8010EF94; // rom:0xA8444 @@ -4182,8 +4182,8 @@ msg_printer_load_msg = 0x80125A68; // type:func rom:0xBC168 msg_printer_set_origin_pos = 0x80125AB8; // type:func rom:0xBC1B8 cancel_message = 0x80125B08; // type:func rom:0xBC208 set_message_images = 0x80125B2C; // type:func rom:0xBC22C -set_message_msg = 0x80125B3C; // type:func rom:0xBC23C -set_message_value = 0x80125BE8; // type:func rom:0xBC2E8 +set_message_text_var = 0x80125B3C; // type:func rom:0xBC23C +set_message_int_var = 0x80125BE8; // type:func rom:0xBC2E8 close_message = 0x80125C70; // type:func rom:0xBC370 msg_get_print_char_width = 0x80125C84; // type:func rom:0xBC384 msg_get_draw_char_width = 0x80125DF4; // type:func rom:0xBC4F4 @@ -4315,7 +4315,7 @@ hud_element_update = 0x80141704; // type:func rom:0xD7E04 render_hud_elements_backUI = 0x80142210; // type:func rom:0xD8910 render_hud_elements_frontUI = 0x8014271C; // type:func rom:0xD8E1C render_hud_element = 0x80142BFC; // type:func rom:0xD92FC -render_hud_elements_world = 0x801436B4; // type:func rom:0xD9DB4 +render_transformed_hud_elements = 0x801436B4; // type:func rom:0xD9DB4 func_80143C48 = 0x80143C48; // type:func rom:0xDA348 func_80144218 = 0x80144218; // type:func rom:0xDA918 func_80144238 = 0x80144238; // type:func rom:0xDA938 @@ -4569,7 +4569,7 @@ D_8014C5E0 = 0x8014C5E0; // rom:0xE2CE0 D_8014C620 = 0x8014C620; // rom:0xE2D20 D_8014C678 = 0x8014C678; // rom:0xE2D78 D_8014C6A0 = 0x8014C6A0; // rom:0xE2DA0 -D_8014C6C8 = 0x8014C6C8; // rom:0xE2DC8 +ItemEntityLights = 0x8014C6C8; // rom:0xE2DC8 PickupHeaderWindowHeight = 0x8014C6E0; // rom:0xE2DE0 PickupMessageWindowYOffsets = 0x8014C6E4; // rom:0xE2DE4 CurrentScreenTransition = 0x8014C6F0; // rom:0xE2DF0 @@ -4605,7 +4605,7 @@ D_8014F068 = 0x8014F068; // rom:0xE5768 gHudElementsDLBackUI = 0x8014F078; // rom:0xE5778 gHudElementsDLFrontUI = 0x8014F0A0; // rom:0xE57A0 D_8014F0C8 = 0x8014F0C8; // rom:0xE57C8 -D_8014F108 = 0x8014F108; // rom:0xE5808 +HudElementLights = 0x8014F108; // rom:0xE5808 D_8014F110 = 0x8014F110; // rom:0xE5810 gCloudyFlowerFieldsBg = 0x8014F120; // rom:0xE5820 gSunnyFlowerFieldsBg = 0x8014F128; // rom:0xE5828 @@ -5045,12 +5045,12 @@ D_8015DD24 = 0x80155D24; // rom:0xEC424 evt_get_variable = 0x802C7ABC; // type:func rom:0xEC46C msg_drawState = 0x80155D74; // rom:0xEC474 D_8015DD78 = 0x80155D78; // rom:0xEC478 -D_80155D80 = 0x80155D80; // rom:0xEC480 +UnusedItemPhysicsScriptID = 0x80155D80; // rom:0xEC480 ItemEntityAlternatingSpawn = 0x80155D84; // rom:0xEC484 ItemEntityRenderGroup = 0x80155D88; // rom:0xEC488 -D_80155D8C = 0x80155D8C; // rom:0xEC48C -D_80155D8E = 0x80155D8E; // rom:0xEC48E -D_80155D90 = 0x80155D90; // rom:0xEC490 +CoinSparkleCenterX = 0x80155D8C; // rom:0xEC48C +CoinSparkleCenterY = 0x80155D8E; // rom:0xEC48E +CoinSparkleCenterZ = 0x80155D90; // rom:0xEC490 WorldItemEntities = 0x80155DA0; // rom:0xEC4A0 evt_get_variable_index = 0x802C7DA8; // type:func rom:0xEC758 BattleItemEntities = 0x801561A0; // rom:0xEC8A0 @@ -5058,15 +5058,15 @@ evt_get_variable_index_alt = 0x802C7F20; // type:func rom:0xEC8D0 evt_set_variable = 0x802C8098; // type:func rom:0xECA48 gCurrentItemEntities = 0x801565A0; // rom:0xECCA0 isPickingUpItem = 0x801565A4; // rom:0xECCA4 -D_801565A6 = 0x801565A6; // rom:0xECCA6 +ItemSpawnWithinPlayerPickupDelay = 0x801565A6; // rom:0xECCA6 D_801565A8 = 0x801565A8; // rom:0xECCA8 D_801565AC = 0x801565AC; // rom:0xECCAC -D_801565B0 = 0x801565B0; // rom:0xECCB0 +ItemPickupMenu = 0x801565B0; // rom:0xECCB0 evt_get_float_variable = 0x802C842C; // type:func rom:0xECDDC ItemPickupIconID = 0x801568E0; // rom:0xECFE0 ItemPickupStateDelay = 0x801568E4; // rom:0xECFE4 -D_801568E8 = 0x801568E8; // rom:0xECFE8 -D_801568EC = 0x801568EC; // rom:0xECFEC +ThrowAwayMenuIdx = 0x801568E8; // rom:0xECFE8 +ThrowAwayItemID = 0x801568EC; // rom:0xECFEC evt_set_float_variable = 0x802C8640; // type:func rom:0xECFF0 GotItemTutorialPrinter = 0x801568F4; // rom:0xECFF4 GotItemTutorialClosed = 0x801568F8; // rom:0xECFF8 @@ -6424,7 +6424,7 @@ D_80249D70 = 0x80249D70; // rom:0x16A5D0 filemenu_common_windowBPs = 0x80249DAC; // rom:0x16A60C D_80249DCC = 0x80249DCC; // rom:0x16A62C D_80249DD0 = 0x80249DD0; // rom:0x16A630 -get_dpad_input_radial = 0x8023E000; // type:func rom:0x16C8E0 +get_stick_input_radial = 0x8023E000; // type:func rom:0x16C8E0 filemenu_pressedButtons = 0x8024C084; // rom:0x16C8E4 filemenu_cursorHudElem = 0x8024C088; // rom:0x16C8E8 filemenu_heldButtons = 0x8024C08C; // rom:0x16C8EC @@ -6578,8 +6578,8 @@ btl_show_battle_message = 0x8024F960; // type:func rom:0x17E240 btl_show_variable_battle_message = 0x8024FA04; // type:func rom:0x17E2E4 btl_is_popup_displayed = 0x8024FAB4; // type:func rom:0x17E394 btl_set_popup_duration = 0x8024FAC4; // type:func rom:0x17E3A4 -func_8024FAE8 = 0x8024FAE8; // type:func rom:0x17E3C8 -func_8024FAFC = 0x8024FAFC; // type:func rom:0x17E3DC +btl_message_lock_box_pos = 0x8024FAE8; // type:func rom:0x17E3C8 +btl_message_unlock_box_pos = 0x8024FAFC; // type:func rom:0x17E3DC close_action_command_instruction_popup = 0x8024FB0C; // type:func rom:0x17E3EC btl_update_message_popup = 0x8024FB3C; // type:func rom:0x17E41C btl_message_popup_draw_content = 0x80250818; // type:func rom:0x17F0F8 @@ -6590,8 +6590,8 @@ IsMessageBoxDisplayed = 0x80251384; // type:func rom:0x17FC64 WaitForMessageBoxDone = 0x802513CC; // type:func rom:0x17FCAC ForceCloseMessageBox = 0x802513F0; // type:func rom:0x17FCD0 SetMessageBoxDuration = 0x80251408; // type:func rom:0x17FCE8 -func_80251434 = 0x80251434; // type:func rom:0x17FD14 -func_80251454 = 0x80251454; // type:func rom:0x17FD34 +LockMessageBoxPosition = 0x80251434; // type:func rom:0x17FD14 +UnlockMessageBoxPosition = 0x80251454; // type:func rom:0x17FD34 apply_shock_effect = 0x80251474; // type:func rom:0x17FD54 calc_item_check_hit = 0x802515D0; // type:func rom:0x17FEB0 calc_item_damage_enemy = 0x802516E8; // type:func rom:0x17FFC8 @@ -6818,11 +6818,11 @@ inflict_status_set_duration = 0x80266CF0; // type:func rom:0x1955D0 set_part_pal_adjustment = 0x80266D6C; // type:func rom:0x19564C set_actor_pal_adjustment = 0x80266DAC; // type:func rom:0x19568C clear_part_pal_adjustment = 0x80266E14; // type:func rom:0x1956F4 -func_80266E40 = 0x80266E40; // type:func rom:0x195720 -set_part_pal_effect = 0x80266EA8; // type:func rom:0x195788 -set_actor_pal_effect = 0x80266EE8; // type:func rom:0x1957C8 -clear_part_pal_effect = 0x80266F60; // type:func rom:0x195840 -clear_actor_pal_effect = 0x80266F8C; // type:func rom:0x19586C +clear_actor_static_pal_adjustments = 0x80266E40; // type:func rom:0x195720 +set_part_glow_pal = 0x80266EA8; // type:func rom:0x195788 +set_actor_glow_pal = 0x80266EE8; // type:func rom:0x1957C8 +clear_part_glow_pal = 0x80266F60; // type:func rom:0x195840 +clear_actor_glow_pal = 0x80266F8C; // type:func rom:0x19586C set_part_flash_mode = 0x80266FD8; // type:func rom:0x1958B8 set_actor_flash_mode = 0x80267018; // type:func rom:0x1958F8 clear_part_flash_mode = 0x8026709C; // type:func rom:0x19597C @@ -7060,8 +7060,8 @@ dispatch_event_player_continue_turn = 0x802716E4; // type:func rom:0x19FFC4 calc_player_test_enemy = 0x80271754; // type:func rom:0x1A0034 calc_player_damage_enemy = 0x80271944; // type:func rom:0x1A0224 dispatch_damage_event_player = 0x802731BC; // type:func rom:0x1A1A9C -dispatch_damage_event_player_0 = 0x8027337C; // type:func rom:0x1A1C5C -dispatch_damage_event_player_1 = 0x802733A8; // type:func rom:0x1A1C88 +dispatch_damage_tick_event_player = 0x8027337C; // type:func rom:0x1A1C5C +dispatch_hazard_event_player = 0x802733A8; // type:func rom:0x1A1C88 GetMenuSelection = 0x802733C4; // type:func rom:0x1A1CA4 func_80273444 = 0x80273444; // type:func rom:0x1A1D24 PlayerFallToGoal = 0x80273894; // type:func rom:0x1A2174 @@ -7626,7 +7626,7 @@ world_goombario_init = 0x802BD174; // type:func rom:0x317094 world_goombario_TakeOut = 0x802BD188; // type:func rom:0x3170A8 world_goombario_Update = 0x802BD1D0; // type:func rom:0x3170F0 world_goombario_try_cancel_tweester = 0x802BD564; // type:func rom:0x317484 -world_goombario_can_pause = 0x802BD5A8; // type:func rom:0x3174C8 +world_goombario_can_open_menus = 0x802BD5A8; // type:func rom:0x3174C8 world_goombario_SelectTattleMsg = 0x802BD5D8; // type:func rom:0x3174F8 world_goombario_TattleEnd = 0x802BDB30; // type:func rom:0x317A50 world_goombario_PutAway = 0x802BDB84; // type:func rom:0x317AA4 @@ -7650,7 +7650,7 @@ world_bombette_TakeOut = 0x802BD300; // type:func rom:0x318050 world_bombette_Update = 0x802BD338; // type:func rom:0x318088 world_bombette_try_cancel_tweester = 0x802BD6DC; // type:func rom:0x31842C world_bombette_can_use_ability = 0x802BD720; // type:func rom:0x318470 -world_bombette_can_player_pause = 0x802BD748; // type:func rom:0x318498 +world_bombette_can_open_menus = 0x802BD748; // type:func rom:0x318498 world_bombette_UseAbility = 0x802BD758; // type:func rom:0x3184A8 world_bombette_PutAway = 0x802BE4E8; // type:func rom:0x319238 world_bombette_test_first_strike = 0x802BE520; // type:func rom:0x319270 @@ -14536,7 +14536,7 @@ battle_move_auto_smash_ShouldMovesAutoSucceed = 0x802A1050; // type:func rom:0x7 battle_move_auto_jump_UnkMoveFunc1 = 0x802A1000; // type:func rom:0x765C20 battle_move_auto_jump_D_802A10F0 = 0x802A10F0; // rom:0x765D10 battle_move_auto_jump_CheckForAPress = 0x802A1130; // rom:0x765D50 -EVS_JumpSupport_A = 0x802A11AC; // rom:0x765DCC +EVS_JumpSupport_Approach = 0x802A11AC; // rom:0x765DCC EVS_JumpSupport_B = 0x802A1320; // rom:0x765F40 EVS_JumpSupport_C = 0x802A1408; // rom:0x766028 EVS_JumpSupport_D = 0x802A14F0; // rom:0x766110 @@ -14545,7 +14545,7 @@ D_802A17C4 = 0x802A17C4; // rom:0x7663E4 EVS_JumpSupport_H = 0x802A1B9C; // rom:0x7667BC EVS_JumpSupport_I = 0x802A1D88; // rom:0x7669A8 EVS_JumpSupport_Miss = 0x802A1FEC; // rom:0x766C0C -EVS_JumpSupport_K = 0x802A2184; // rom:0x766DA4 +EVS_JumpSupport_InitCommand = 0x802A2184; // rom:0x766DA4 EVS_JumpSupport_L = 0x802A2230; // rom:0x766E50 EVS_JumpSupport_M = 0x802A2384; // rom:0x766FA4 D_802A2600 = 0x802A2600; // rom:0x767220 @@ -14919,8 +14919,8 @@ shop_owner_continue_speech = 0x8028017C; // type:func rom:0x7E0FFC shop_owner_continue_speech_with_quantity = 0x80280208; // type:func rom:0x7E1088 shop_owner_reset_speech = 0x802802D0; // type:func rom:0x7E1150 shop_owner_end_speech = 0x8028035C; // type:func rom:0x7E11DC -func_802803C8 = 0x802803C8; // type:func rom:0x7E1248 -func_80280410 = 0x80280410; // type:func rom:0x7E1290 +CanInteractWithShopItem = 0x802803C8; // type:func rom:0x7E1248 +BeginShopItemInteraction = 0x80280410; // type:func rom:0x7E1290 ShowShopPurchaseDialog = 0x8028051C; // type:func rom:0x7E139C shop_open_item_select_popup = 0x80280954; // type:func rom:0x7E17D4 shop_update_item_select_popup = 0x80280AC4; // type:func rom:0x7E1944 @@ -14977,13 +14977,13 @@ SetupSingleDoor = 0x80283D00; // type:func rom:0x7E4B80 SetupSplitSingleDoor = 0x80283D6C; // type:func rom:0x7E4BEC SetupDoubleDoors = 0x80283DF0; // type:func rom:0x7E4C70 SetupSplitDoubleDoors = 0x80283E2C; // type:func rom:0x7E4CAC -ShopBeginSpeech = 0x80283E80; // rom:0x7E4D00 -ShopContinueSpeech = 0x80283EB0; // rom:0x7E4D30 -ShopResetSpeech = 0x80283EE0; // rom:0x7E4D60 -ShopEndSpeech = 0x80283F2C; // rom:0x7E4DAC -D_80283F58_7E4DD8 = 0x80283F58; // rom:0x7E4DD8 -BadgeShopInteract = 0x80284034; // rom:0x7E4EB4 -ItemShopInteract = 0x80284054; // rom:0x7E4ED4 +EVS_ShopBeginSpeech = 0x80283E80; // rom:0x7E4D00 +EVS_ShopContinueSpeech = 0x80283EB0; // rom:0x7E4D30 +EVS_ShopResetSpeech = 0x80283EE0; // rom:0x7E4D60 +EVS_ShopEndSpeech = 0x80283F2C; // rom:0x7E4DAC +EVS_ShopItemInteract = 0x80283F58; // rom:0x7E4DD8 +EVS_ShopPurchaseDialog = 0x80284034; // rom:0x7E4EB4 +EVS_ShopOwnerDialog = 0x80284054; // rom:0x7E4ED4 machi_CheckGameVarRanges = 0x80240000; // type:func rom:0x7E73A0 machi_DoNothing1 = 0x80240030; // type:func rom:0x7E73D0 machi_DoNothing2 = 0x80240038; // type:func rom:0x7E73D8 @@ -25936,13 +25936,13 @@ NpcHitQueryAheadCollider = 0x8010C98C; // PlayerNormalPitch = 0x8010C990; // PlayerYInterpUpdateDelay = 0x8010C9A0; // D_8010C9B0 = 0x8010C9B0; // -D_8010C9C0 = 0x8010C9C0; // -D_8010C9C8 = 0x8010C9C8; // -D_8010CCF8 = 0x8010CCF8; // -D_8010CCFA = 0x8010CCFA; // -D_8010CCFC = 0x8010CCFC; // -D_8010CCFE = 0x8010CCFE; // -D_8010CD00 = 0x8010CD00; // +SwappedWorldMenus = 0x8010C9C0; // +WorldPopupMenu = 0x8010C9C8; // +WorldMenuType = 0x8010CCF8; // +WorldMenuDelay = 0x8010CCFA; // +WorldPopupResult = 0x8010CCFC; // +OpenMenuDisableCount = 0x8010CCFE; // +WorldMenuState = 0x8010CD00; // D_8010CD10 = 0x8010CD10; // D_8010CD12 = 0x8010CD12; // D_8010CD20 = 0x8010CD20; // @@ -26719,8 +26719,7 @@ D_80286528 = 0x80286528; // wShopBuyCallbackScript = 0x8028652C; // wShopSelectedItem = 0x80286530; // wShopBuyResult = 0x80286534; // -D_80286538 = 0x80286538; // -D_80286540 = 0x80286540; // +ShopOwnerPrintState = 0x80286538; // EVS_RunAwayStart = 0x802868BC; // EVS_RunAwayFail = 0x80287078; // EVS_PlayerDies = 0x80287128; // @@ -26815,10 +26814,10 @@ HID_BattleMessage1 = 0x8029F642; // HID_BattleMessage2 = 0x8029F644; // HID_BattleMessage3 = 0x8029F646; // HID_BattleMessage4 = 0x8029F648; // -D_8029F64A = 0x8029F64A; // -D_8029F64C = 0x8029F64C; // -D_8029F64E = 0x8029F64E; // -D_8029F650 = 0x8029F650; // +ActionCommandTipVisible = 0x8029F64A; // +BattleMessage_BoxPosLocked = 0x8029F64C; // +BattleMessage_CurBoxPosY = 0x8029F64E; // +BattleMessage_CurBoxOffsetY = 0x8029F650; // gSpeakingActorPrintCtx = 0x8029FA60; // D_8029FA64 = 0x8029FA64; // gSpeakingActorPrintIsDone = 0x8029FA68; // diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index bd4eb36524..c6567f052e 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -232,7 +232,7 @@ dead_npc_test_move_simple_without_slipping = npc_test_move_simple_without_slippi dead_decrement_status_bar_disabled = decrement_status_bar_disabled + 0x7BC4; dead_increment_status_bar_disabled = increment_status_bar_disabled + 0x7BC4; dead_sync_status_bar = sync_status_bar + 0x7BC4; -dead_set_max_SP = set_max_SP + 0x7BC4; +dead_set_max_star_power = set_max_star_power + 0x7BC4; dead_subtract_hp = subtract_hp + 0x7BC4; dead_switch_to_partner = switch_to_partner + 0x7BF4; dead_func_800EB2A4 = func_800EB2A4 + 0x7BF4; @@ -263,7 +263,7 @@ dead_mdl_get_copied_gfx = mdl_get_copied_gfx + 0xA448; dead_queue_render_task = queue_render_task + 0xAC00; dead_create_worker_world = create_worker_world + 0xAE90; dead_set_message_images = set_message_images + 0xB138; -dead_set_message_msg = set_message_msg + 0xB138; +dead_set_message_text_var = set_message_text_var + 0xB138; dead_get_item_entity = get_item_entity + 0xC040; dead_set_screen_overlay_params_front = set_screen_overlay_params_front + 0xC3F0; dead_set_screen_overlay_params_back = set_screen_overlay_params_back + 0xC3F0;