diff --git a/include/common_structs.h b/include/common_structs.h index 170f0e1f1e..7c75638e63 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -227,7 +227,7 @@ typedef struct Npc { /* 0x01C */ f32 jumpVel; /* 0x020 */ union { void* any; - NpcMotionBlur* motion; ///< Null unless flag 0x100000 is set. + NpcMotionBlur* motion; ///< Null unless flag NPC_FLAG_MOTION_BLUR is set. NpcChompBlur* chomp; NpcQuizmoBlur* quizmo; NpcFollowData* followData; diff --git a/include/enums.h b/include/enums.h index 9d83dfeb1e..7447d741a7 100644 --- a/include/enums.h +++ b/include/enums.h @@ -1904,7 +1904,7 @@ enum EncounterOutcomes { OUTCOME_PLAYER_LOST = 1, OUTCOME_PLAYER_FLED = 2, OUTCOME_ENEMY_FLED = 3, - OUTCOME_4 = 4, + OUTCOME_SKIP = 4, }; enum MerleeSpellType { @@ -2992,11 +2992,11 @@ enum NpcPalSwapState { NPC_PALSWAP_HOLDING_A = 0, NPC_PALSWAP_FROM_A_TO_B = 1, NPC_PALSWAP_HOLDING_B = 2, - NPC_PALSWAP_FROM_B_TO_A = 3 + NPC_PALSWAP_FROM_B_TO_A = 3, }; enum NpcFlags { - NPC_FLAG_ENABLED = 0x00000001, // Does nothing aside from making npc->flags != + NPC_FLAG_ENABLED = 0x00000001, // Does nothing aside from making npc->flags != 0 NPC_FLAG_INVISIBLE = 0x00000002, // NPC will not be drawn or cause surface effects while moving NPC_FLAG_INACTIVE = 0x00000004, // NPC will not render, move, or have collisions with other NPCs. They may still be interacted with. NPC_FLAG_FLYING = 0x00000008, @@ -3017,15 +3017,15 @@ enum NpcFlags { NPC_FLAG_IGNORE_CAMERA_FOR_YAW = 0x00040000, // Do not adjust renderYaw to face the camera NPC_FLAG_REFLECT_FLOOR = 0x00080000, // Mirror rendering across y=0 NPC_FLAG_MOTION_BLUR = 0x00100000, // Gives motion blur effect as NPC moves. Set by enable_npc_blur - NPC_FLAG_200000 = 0x00200000, + NPC_FLAG_FLIP_INSTANTLY = 0x00200000, // Flip instantly when changing facing direction NPC_FLAG_TOUCHES_GROUND = 0x00400000, // Can cause effects to play when touching special surface types NPC_FLAG_HIDING = 0x00800000, NPC_FLAG_HAS_NO_SPRITE = 0x01000000, NPC_FLAG_COLLIDING_WITH_NPC = 0x02000000, NPC_FLAG_PARTNER = 0x04000000, NPC_FLAG_WORLD_COLLISION_DIRTY = 0x08000000, - NPC_FLAG_10000000 = 0x10000000, - NPC_FLAG_20000000 = 0x20000000, + NPC_FLAG_USE_INSPECT_ICON = 0x10000000, // Approaching this NPC will cause a red ! to appear. + NPC_FLAG_RAYCAST_TO_INTERACT = 0x20000000, // Intended to require a line of sight raycast before conversations can be triggered. Seems bugged. NPC_FLAG_NO_ANIMS_LOADED = 0x40000000, // Npc has no animations loaded NPC_FLAG_SUSPENDED = 0x80000000, }; @@ -3455,14 +3455,14 @@ enum AnyEnemyAnims { ENEMY_ANIM_F = 0x210, }; -enum FirstStrikes { +enum FirstStrikeType { FIRST_STRIKE_NONE = 0, FIRST_STRIKE_PLAYER = 1, FIRST_STRIKE_ENEMY = 2, }; enum TimeFreezeMode { - TIME_FREEZE_NORMAL = 0, + TIME_FREEZE_NONE = 0, TIME_FREEZE_PARTIAL = 1, TIME_FREEZE_FULL = 2, TIME_FREEZE_POPUP_MENU = 3, @@ -4520,8 +4520,8 @@ enum MapRoomNotifications { enum EnemyFlags { ENEMY_FLAG_PASSIVE = 0x00000001, // Not hostile; collision does not trigger battle - ENEMY_FLAG_2 = 0x00000002, // Unused - ENEMY_FLAG_4 = 0x00000004, + ENEMY_FLAG_UNUSED_2 = 0x00000002, // Unused + ENEMY_FLAG_DO_NOT_KILL = 0x00000004, // Enemy will not be killed after being defeated in battle ENEMY_FLAG_ENABLE_HIT_SCRIPT = 0x00000008, ENEMY_FLAG_FLED = 0x00000010, ENEMY_FLAG_DISABLE_AI = 0x00000020, // Disable movement AI and collision (idle animation plays) @@ -4534,14 +4534,14 @@ enum EnemyFlags { ENEMY_FLAG_GRAVITY = 0x00001000, ENEMY_FLAG_NO_SHADOW_RAYCAST = 0x00002000, ENEMY_FLAG_HAS_NO_SPRITE = 0x00004000, - ENEMY_FLAG_8000 = 0x00008000, // Corresponds with NPC_FLAG_10000000 - ENEMY_FLAG_10000 = 0x00010000, // Corresponds with NPC_FLAG_20000000 + ENEMY_FLAG_USE_INSPECT_ICON = 0x00008000, // Corresponds with NPC_FLAG_USE_INSPECT_ICON + ENEMY_FLAG_RAYCAST_TO_INTERACT = 0x00010000, // Intended to require a line of sight raycast before conversations can be triggered. Seems bugged. Corresponds with NPC_FLAG_RAYCAST_TO_INTERACT ENEMY_FLAG_USE_PLAYER_SPRITE = 0x00020000, // Used for Peach NPCs - ENEMY_FLAG_40000 = 0x00040000, - ENEMY_FLAG_80000 = 0x00080000, - ENEMY_FLAG_100000 = 0x00100000, + ENEMY_FLAG_NO_DELAY_AFTER_FLEE = 0x00040000, + ENEMY_FLAG_DONT_SUSPEND_SCRIPTS = 0x00080000, // Do not suspend ai/aux scripts when aiSuspendTime != 0 + ENEMY_FLAG_SKIP_BATTLE = 0x00100000, ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN = 0x00200000, - ENEMY_FLAG_400000 = 0x00400000, + ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER = 0x00400000, ENEMY_FLAG_NO_DROPS = 0x00800000, // Do not drop hearts, flowers, or coins on defeat ENEMY_FLAG_IGNORE_TOUCH = 0x01000000, ENEMY_FLAG_IGNORE_JUMP = 0x02000000, @@ -4553,12 +4553,17 @@ enum EnemyFlags { ENEMY_FLAG_SUSPENDED = 0x80000000, }; -#define COMMON_PASSIVE_FLAGS \ - ENEMY_FLAG_PASSIVE \ - | ENEMY_FLAG_ENABLE_HIT_SCRIPT \ +#define BASE_PASSIVE_FLAGS \ + ( ENEMY_FLAG_PASSIVE \ | ENEMY_FLAG_IGNORE_WORLD_COLLISION \ | ENEMY_FLAG_IGNORE_ENTITY_COLLISION \ - | ENEMY_FLAG_FLYING + | ENEMY_FLAG_FLYING \ + ) + +#define COMMON_PASSIVE_FLAGS \ + ( BASE_PASSIVE_FLAGS \ + | ENEMY_FLAG_ENABLE_HIT_SCRIPT \ + ) // used with enemy->aiFlags enum EnemyAIFlags { @@ -4708,7 +4713,7 @@ enum PlayerCollisionTests { PLAYER_COLLISION_0 = 0, PLAYER_COLLISION_1 = 1, PLAYER_COLLISION_2 = 2, - PLAYER_COLLISION_3 = 3, + PLAYER_COLLISION_HAMMER = 3, PLAYER_COLLISION_4 = 4, }; @@ -4978,50 +4983,21 @@ enum { SHOP_BUY_RESULT_NOT_ENOUGH_ROOM = 5, }; -enum EncounterStatusFlags { - ENCOUNTER_STATUS_FLAG_0 = 0x00000000, - ENCOUNTER_STATUS_FLAG_1 = 0x00000001, - ENCOUNTER_STATUS_FLAG_2 = 0x00000002, - ENCOUNTER_STATUS_FLAG_4 = 0x00000004, - ENCOUNTER_STATUS_FLAG_8 = 0x00000008, - ENCOUNTER_STATUS_FLAG_10 = 0x00000010, - ENCOUNTER_STATUS_FLAG_20 = 0x00000020, - ENCOUNTER_STATUS_FLAG_40 = 0x00000040, - ENCOUNTER_STATUS_FLAG_80 = 0x00000080, - ENCOUNTER_STATUS_FLAG_100 = 0x00000100, - ENCOUNTER_STATUS_FLAG_200 = 0x00000200, - ENCOUNTER_STATUS_FLAG_400 = 0x00000400, - ENCOUNTER_STATUS_FLAG_800 = 0x00000800, - ENCOUNTER_STATUS_FLAG_1000 = 0x00001000, - ENCOUNTER_STATUS_FLAG_2000 = 0x00002000, - ENCOUNTER_STATUS_FLAG_4000 = 0x00004000, - ENCOUNTER_STATUS_FLAG_8000 = 0x00008000, - ENCOUNTER_STATUS_FLAG_10000 = 0x00010000, - ENCOUNTER_STATUS_FLAG_20000 = 0x00020000, - ENCOUNTER_STATUS_FLAG_40000 = 0x00040000, - ENCOUNTER_STATUS_FLAG_80000 = 0x00080000, - ENCOUNTER_STATUS_FLAG_100000 = 0x00100000, - ENCOUNTER_STATUS_FLAG_200000 = 0x00200000, - ENCOUNTER_STATUS_FLAG_400000 = 0x00400000, - ENCOUNTER_STATUS_FLAG_800000 = 0x00800000, - ENCOUNTER_STATUS_FLAG_1000000 = 0x01000000, - ENCOUNTER_STATUS_FLAG_2000000 = 0x02000000, - ENCOUNTER_STATUS_FLAG_4000000 = 0x04000000, - ENCOUNTER_STATUS_FLAG_8000000 = 0x08000000, - ENCOUNTER_STATUS_FLAG_10000000 = 0x10000000, - ENCOUNTER_STATUS_FLAG_20000000 = 0x20000000, - ENCOUNTER_STATUS_FLAG_40000000 = 0x40000000, - ENCOUNTER_STATUS_FLAG_80000000 = 0x80000000, +enum EncounterFlags { + ENCOUNTER_FLAG_NONE = 0x00000000, + ENCOUNTER_FLAG_THUMBS_UP = 0x00000001, ///< Mario will do a 'thumbs up' animation after winning + ENCOUNTER_FLAG_CANT_SKIP_WIN_DELAY = 0x00000002, + ENCOUNTER_FLAG_SKIP_FLEE_DROPS = 0x00000004, }; enum WindowFlags { - WINDOW_FLAG_INITIALIZED = 0x00000001, - WINDOW_FLAG_FPUPDATE_CHANGED = 0x00000002, - WINDOW_FLAG_HIDDEN = 0x00000004, ///< Updated but not rendered - WINDOW_FLAG_INITIAL_ANIMATION = 0x00000008, - WINDOW_FLAG_HAS_CHILDREN = 0x00000010, - WINDOW_FLAG_DISABLED = 0x00000020, ///< Not updated or rendered - WINDOW_FLAG_40 = 0x00000040, + WINDOW_FLAG_INITIALIZED = 0x00000001, + WINDOW_FLAG_FPUPDATE_CHANGED = 0x00000002, + WINDOW_FLAG_HIDDEN = 0x00000004, ///< Updated but not rendered + WINDOW_FLAG_INITIAL_ANIMATION = 0x00000008, + WINDOW_FLAG_HAS_CHILDREN = 0x00000010, + WINDOW_FLAG_DISABLED = 0x00000020, ///< Not updated or rendered + WINDOW_FLAG_40 = 0x00000040, }; enum DrawFlags { @@ -6319,46 +6295,46 @@ enum EncounterStates { }; enum EncounterCreateSubStates { - ENCOUNTER_SUBSTATE_CREATE_INIT = 0, - ENCOUNTER_SUBSTATE_CREATE_RUN_INIT_SCRIPT = 1, - ENCOUNTER_SUBSTATE_CREATE_RUN_AI = 2, + ENCOUNTER_SUBSTATE_CREATE_INIT = 0, + ENCOUNTER_SUBSTATE_CREATE_RUN_INIT_SCRIPT = 1, + ENCOUNTER_SUBSTATE_CREATE_RUN_AI = 2, }; enum EncounterNeutralSubStates { - ENCOUNTER_SUBSTATE_NEUTRAL = 0, + ENCOUNTER_SUBSTATE_NEUTRAL = 0, }; enum EncounterPreBattleSubStates { - ENCOUNTER_SUBSTATE_PRE_BATTLE_INIT = 0, - ENCOUNTER_SUBSTATE_PRE_BATTLE_LOAD_BATTLE = 1, - ENCOUNTER_SUBSTATE_PRE_BATTLE_AUTO_WIN = 2, - ENCOUNTER_SUBSTATE_PRE_BATTLE_3 = 3, + ENCOUNTER_SUBSTATE_PRE_BATTLE_INIT = 0, + ENCOUNTER_SUBSTATE_PRE_BATTLE_LOAD = 1, + ENCOUNTER_SUBSTATE_PRE_BATTLE_AUTO_WIN = 2, + ENCOUNTER_SUBSTATE_PRE_BATTLE_SKIP = 3, }; enum EncounterConversationSubStates { - ENCOUNTER_SUBSTATE_CONVERSATION_INIT = 0, - ENCOUNTER_SUBSTATE_CONVERSATION_END = 1, + ENCOUNTER_SUBSTATE_CONVERSATION_INIT = 0, + ENCOUNTER_SUBSTATE_CONVERSATION_END = 1, }; enum EncounterPostBattleSubStates { - ENCOUNTER_SUBSTATE_POST_BATTLE_INIT = 0, - ENCOUNTER_SUBSTATE_POST_BATTLE_WON_WAIT = 2, - ENCOUNTER_SUBSTATE_POST_BATTLE_WON_KILL = 3, - ENCOUNTER_SUBSTATE_POST_BATTLE_WON_TO_NEUTRAL = 4, - ENCOUNTER_SUBSTATE_POST_BATTLE_WON_CHECK_MERLEE_BONUS = 10, - ENCOUNTER_SUBSTATE_POST_BATTLE_PLAY_NPC_DEFEAT = 11, - ENCOUNTER_SUBSTATE_POST_BATTLE_FLED_INIT = 100, - ENCOUNTER_SUBSTATE_POST_BATTLE_FLED_WAIT = 101, - ENCOUNTER_SUBSTATE_POST_BATTLE_102 = 102, - ENCOUNTER_SUBSTATE_POST_BATTLE_103 = 103, - ENCOUNTER_SUBSTATE_POST_BATTLE_LOST_INIT = 200, - ENCOUNTER_SUBSTATE_POST_BATTLE_LOST_WAIT = 201, - ENCOUNTER_SUBSTATE_POST_BATTLE_202 = 202, - ENCOUNTER_SUBSTATE_POST_BATTLE_LOST_TO_NEUTRAL = 203, - ENCOUNTER_SUBSTATE_POST_BATTLE_300 = 300, - ENCOUNTER_SUBSTATE_POST_BATTLE_ENEMY_FLED_INIT = 400, - ENCOUNTER_SUBSTATE_POST_BATTLE_ENEMY_FLED_WAIT = 401, - ENCOUNTER_SUBSTATE_POST_BATTLE_ENEMY_FLED_TO_NEUTRAL = 402, + ENCOUNTER_SUBSTATE_POST_BATTLE_INIT = 0, + ENCOUNTER_SUBSTATE_POST_BATTLE_WON_FADE_IN = 2, + ENCOUNTER_SUBSTATE_POST_BATTLE_WON_KILL = 3, + ENCOUNTER_SUBSTATE_POST_BATTLE_WON_RESUME = 4, + ENCOUNTER_SUBSTATE_POST_BATTLE_WON_CHECK_MERLEE = 10, + ENCOUNTER_SUBSTATE_POST_BATTLE_PLAY_NPC_DEFEAT = 11, + ENCOUNTER_SUBSTATE_POST_BATTLE_FLED_INIT = 100, + ENCOUNTER_SUBSTATE_POST_BATTLE_FLED_FADE_IN = 101, + ENCOUNTER_SUBSTATE_POST_BATTLE_FLED_RESUME = 102, + ENCOUNTER_SUBSTATE_POST_BATTLE_FLED_DELAY = 103, // delay before battle can be retriggered + ENCOUNTER_SUBSTATE_POST_BATTLE_LOST_INIT = 200, + ENCOUNTER_SUBSTATE_POST_BATTLE_LOST_FADE_IN = 201, + ENCOUNTER_SUBSTATE_POST_BATTLE_LOST_RESUME = 202, + ENCOUNTER_SUBSTATE_POST_BATTLE_LOST_DELAY = 203, + ENCOUNTER_SUBSTATE_POST_BATTLE_SKIP = 300, + ENCOUNTER_SUBSTATE_POST_BATTLE_ENEMY_FLED_INIT = 400, + ENCOUNTER_SUBSTATE_POST_BATTLE_ENEMY_FLED_FADE_IN = 401, + ENCOUNTER_SUBSTATE_POST_BATTLE_ENEMY_FLED_RESUME = 402, }; enum PlayerSpriteSets { diff --git a/include/evt.h b/include/evt.h index 33d7f51c2f..aeb357f762 100644 --- a/include/evt.h +++ b/include/evt.h @@ -125,29 +125,38 @@ enum EventCommandResults { EVT_CMD_RESULT_ERROR = 1, }; +// EventGroupFlags determine when scripts are paused and resumed. +// Each flag corresponds to a set of circumstances which may pause scripts independently of the others. +// These group flags are inherited when one script launches another. enum EventGroupFlags { - EVT_GROUP_00 = 0x00, - EVT_GROUP_0A = 0x0A, // 8 | 2 - EVT_GROUP_0B = 0x0B, // 8 | 4 | 1 - EVT_GROUP_1B = 0x1B, // 10 | 8 | 4 | 1 - EVT_GROUP_EF = 0xEF, // ~10 - EVT_GROUP_01 = 0x01, - EVT_GROUP_02 = 0x02, - EVT_GROUP_SHAKE_CAM = 0x04, - EVT_GROUP_08 = 0x08, - EVT_GROUP_10 = 0x10, + // Each flag represents a distinct condition for suspending or resuming script execution. + // These flags are named based on the scenarios that trigger suspension. + EVT_GROUP_FLAG_INTERACT = 0x01, // Suspended during certain scenes, interactions, and NPC dialogue. + EVT_GROUP_FLAG_MENUS = 0x02, // Suspended when menus are open, during pause, item pickups, or "got item" scenes. + EVT_GROUP_FLAG_CAM = 0x04, // Never suspended; used exclusively with camera shake (ShakeCam) scripts. + EVT_GROUP_FLAG_UNUSED = 0x08, // Unused flag; its original purpose is unknown. + EVT_GROUP_FLAG_BATTLE = 0x10, // Suspended during battle entry and exit transitions. + + // Combinations of flags used to assign specific behaviors to scripts. + // These groups are named after their most common script use-cases. + EVT_GROUP_NEVER_PAUSE = 0x00, // Never paused; default for map scripts derived from the main script, which always uses this group. + EVT_GROUP_PASSIVE_NPC = EVT_GROUP_FLAG_MENUS | EVT_GROUP_FLAG_UNUSED, // 0xA -- Pauses similar to passive NPC scripts. + EVT_GROUP_HOSTILE_NPC = EVT_GROUP_FLAG_INTERACT | EVT_GROUP_FLAG_MENUS | EVT_GROUP_FLAG_UNUSED, // 0xB -- Pauses similar to hostile NPC scripts; used for platforms, machinery, etc. + EVT_GROUP_EXIT_MAP = EVT_GROUP_FLAG_INTERACT | EVT_GROUP_FLAG_MENUS | EVT_GROUP_FLAG_UNUSED | EVT_GROUP_FLAG_BATTLE, // 0x1B -- Used for exit map scripts. + EVT_GROUP_SHAKE_CAM = EVT_GROUP_FLAG_CAM, // Only used by ShakeCam scripts. + EVT_GROUP_NOT_BATTLE = 0xFF & ~EVT_GROUP_FLAG_BATTLE, // 0xEF -- Pauses from anything except battles; default for scripts started via start_script, common in many battle scripts. }; enum EventPriority { - EVT_PRIORITY_0 = 0x00, // map main script - EVT_PRIORITY_1 = 0x01, - EVT_PRIORITY_A = 0x0A, - EVT_PRIORITY_14 = 0x14, + EVT_PRIORITY_0 = 0x00, // map main script + EVT_PRIORITY_1 = 0x01, + EVT_PRIORITY_A = 0x0A, + EVT_PRIORITY_14 = 0x14, }; enum EventStateFlags { EVT_FLAG_ACTIVE = 0x01, - EVT_FLAG_SUSPENDED_IN_GROUP = 0x02, + EVT_FLAG_PAUSED = 0x02, ///< paused through suspend_group_script / resume_group_script EVT_FLAG_BLOCKED_BY_CHILD = 0x10, EVT_FLAG_RUN_IMMEDIATELY = 0x20, ///< don't wait for next `update_scripts` call EVT_FLAG_THREAD = 0x40, diff --git a/include/functions.h b/include/functions.h index 95c2067405..cc783fc12b 100644 --- a/include/functions.h +++ b/include/functions.h @@ -73,7 +73,12 @@ void player_input_to_move_vector(f32* angle, f32* magnitude); void game_input_to_move_vector(f32* x, f32* y); void exec_ShakeCamX(s32 arg0, s32 arg1, s32 arg2, f32 arg3); void exec_ShakeCam1(s32 arg0, s32 arg1, s32 arg2); -f32 func_800E5348(void); + +// returns the angle that the player is facing "toward" in world-space. +// this will always be to the left or the right relative to the current camera position. +// note that this is NOT the direction the player character is moving, nor the orientation of the sprite itself. +// think of this as the direction of a hammer impact relative to the center of the player. +f32 player_get_side_angle(void); void draw_number(s32 value, s32 x, s32 y, s32 variableWidthChars, s32 palette, s32 opacity, u16 style); @@ -137,7 +142,7 @@ void player_handle_floor_collider_type(s32 colliderID); f32 player_fall_distance(void); void func_800E4AD8(s32 arg0); f32 player_check_collision_below(f32, s32* colliderID); -s32 can_trigger_loading_zone(void); +b32 can_trigger_loading_zone(void); void update_damage_popups(void); void show_action_rating(s32, Actor*, f32, f32, f32); s32 render_with_adjusted_palettes(s32, ActorPart*, s32, Matrix4f, s32); @@ -197,7 +202,7 @@ s32 get_model_list_index_from_tree_index(s32 treeIndex); s32 get_transform_group_index(s32); void get_model_center_and_size(u16 modelID, f32* centerX, f32* centerY, f32* centerZ, f32* sizeX, f32* sizeY, f32* sizeZ); -s32 collision_main_above(void); +HitID collision_main_above(void); void collision_lava_reset_check_additional_overlaps(void); s32 player_test_lateral_overlap(s32, PlayerStatus*, f32*, f32*, f32*, f32, f32); Npc* peach_make_disguise_npc(s32 peachDisguise); @@ -419,9 +424,9 @@ PlayerData* get_player_data(void); b32 npc_raycast_down_around(s32, f32*, f32*, f32*, f32*, f32, f32); b32 npc_raycast_down_sides(s32 ignoreFlags, f32* posX, f32* posY, f32* posZ, f32* hitDepth); -s32 npc_raycast_up(s32, f32*, f32*, f32*, f32*); +b32 npc_raycast_up(s32, f32*, f32*, f32*, f32*); HitID npc_raycast_up_corners(s32 ignoreFlags, f32* posX, f32* posY, f32* posZ, f32* hitDepth, f32 yaw, f32 radius); -s32 player_raycast_up_corners(PlayerStatus*, f32*, f32*, f32*, f32*, f32); +HitID player_raycast_up_corners(PlayerStatus*, f32*, f32*, f32*, f32*, f32); HitID player_raycast_below_cam_relative(PlayerStatus* playerStatus, f32* outX, f32* outY, f32* outZ, f32* outLength, f32* hitRx, f32* hitRz, f32* hitDirX, f32* hitDirZ); b32 npc_test_move_taller_with_slipping(s32, f32*, f32*, f32*, f32, f32, f32, f32); @@ -1075,7 +1080,7 @@ s32 lookup_defense(s32*, s32); s32 lookup_status_chance(s32*, s32); void peach_check_for_parasol_input(void); void peach_sync_disguise_npc(void); -s32 check_conversation_trigger(void); +b32 check_conversation_trigger(void); void clear_player_status(void); void clear_entity_models(void); diff --git a/include/npc.h b/include/npc.h index c97a87f55a..8b3c52aae4 100644 --- a/include/npc.h +++ b/include/npc.h @@ -377,13 +377,13 @@ typedef struct FieldStatus { } FieldStatus; typedef struct EncounterStatus { - /* 0x000 */ s32 flags; - /* 0x004 */ s8 firstStrikeType; /* 0 = none, 1 = player, 2 = enemy */ - /* 0x005 */ s8 hitType; /* 1 = none/enemy, 2 = jump */ - /* 0x006 */ s8 hitTier; /* 0 = normal, 1 = super, 2 = ultra */ + /* 0x000 */ s32 flags; // see enum: EncounterFlags + /* 0x004 */ s8 firstStrikeType; // see enum: FirstStrikeType + /* 0x005 */ s8 hitType; // see enum: EncounterTriggers + /* 0x006 */ s8 hitTier; // 0 = normal, 1 = super, 2 = ultra /* 0x007 */ char unk_07; /* 0x008 */ s8 unk_08; - /* 0x009 */ s8 battleOutcome; /* 0 = won, 1 = lost */ + /* 0x009 */ s8 battleOutcome; // see enum: EncounterOutcomes /* 0x00A */ s8 battleTriggerCooldown; ///< set to 15 after victory, 45 after fleeing /* 0x00B */ b8 hasMerleeCoinBonus; /* triple coins when TRUE */ /* 0x00C */ u8 damageTaken; /* valid after battle */ @@ -394,7 +394,7 @@ typedef struct EncounterStatus { /* 0x012 */ s8 scriptedBattle; ///< battle started by StartBattle but not by encounter /* 0x013 */ s8 dropWhackaBump; /* 0x014 */ s32 songID; - /* 0x018 */ s32 unk_18; + /* 0x018 */ s32 unk_18; // unused, related to songID. perhaps was meant for variation, but not implemented. /* 0x01C */ s8 numEncounters; /* number of encounters for current map (in list) */ /* 0x01D */ s8 curAreaIndex; /* 0x01E */ u8 curMapIndex; @@ -407,7 +407,7 @@ typedef struct EncounterStatus { /* 0x088 */ Encounter* curEncounter; /* 0x08C */ Enemy* curEnemy; /* 0x090 */ s32 fadeOutAmount; - /* 0x094 */ s32 unk_94; + /* 0x094 */ s32 substateDelay; /* 0x098 */ s32 fadeOutAccel; /* 0x09C */ s32 battleStartCountdown; /* 0x0A0 */ FieldStatus dizzyAttack; diff --git a/include/script_api/macros.h b/include/script_api/macros.h index de355624f2..f24bd71f08 100644 --- a/include/script_api/macros.h +++ b/include/script_api/macros.h @@ -659,7 +659,7 @@ #define EVT_EXIT_WALK(walkDistance, exitIdx, map, entryIdx) \ { \ - SetGroup(EVT_GROUP_1B) \ + SetGroup(EVT_GROUP_EXIT_MAP) \ Call(UseExitHeading, walkDistance, exitIdx) \ Exec(ExitWalk) \ Call(GotoMap, Ref(map), entryIdx) \ @@ -668,7 +668,7 @@ End \ } -// alternate version of EVT_EXIT_WALK used on Pleasant Path which does not join EVT_GROUP_1B +// alternate version of EVT_EXIT_WALK used on Pleasant Path which does not join EVT_GROUP_EXIT_MAP #define EVT_EXIT_WALK_NOK(walkDistance, exitIdx, map, entryIdx) \ { \ Call(UseExitHeading, walkDistance, exitIdx) \ @@ -682,7 +682,7 @@ // alternate version of EVT_EXIT_WALK which includes a call to DisablePlayerInput #define EVT_EXIT_WALK_FIXED(walkDistance, exitIdx, map, entryIdx) \ { \ - SetGroup(EVT_GROUP_1B) \ + SetGroup(EVT_GROUP_EXIT_MAP) \ Call(DisablePlayerInput, TRUE) \ Call(UseExitHeading, walkDistance, exitIdx) \ Exec(ExitWalk) \ @@ -694,7 +694,7 @@ #define EVT_EXIT_SINGLE_DOOR(exitIdx, map, entryIdx, colliderID, modelID, swingDir) \ { \ - SetGroup(EVT_GROUP_1B) \ + SetGroup(EVT_GROUP_EXIT_MAP) \ Call(DisablePlayerInput, TRUE) \ Set(LVar0, exitIdx) \ Set(LVar1, colliderID) \ @@ -710,7 +710,7 @@ #define EVT_EXIT_SPLIT_SINGLE_DOOR(exitIdx, map, entryIdx, colliderID, topModelID, bottomModelID, swingDir) \ { \ - SetGroup(EVT_GROUP_1B) \ + SetGroup(EVT_GROUP_EXIT_MAP) \ Call(DisablePlayerInput, TRUE) \ Set(LVar0, exitIdx) \ Set(LVar1, colliderID) \ @@ -727,7 +727,7 @@ #define EVT_EXIT_DOUBLE_DOOR(exitIdx, map, entryIdx, colliderID, leftDoorModelID, rightDoorModelID) \ { \ - SetGroup(EVT_GROUP_1B) \ + SetGroup(EVT_GROUP_EXIT_MAP) \ Call(DisablePlayerInput, TRUE) \ Set(LVar0, exitIdx) \ Set(LVar1, colliderID) \ diff --git a/include/variables.h b/include/variables.h index 5274c463af..5cd6b316f5 100644 --- a/include/variables.h +++ b/include/variables.h @@ -93,8 +93,8 @@ extern Vec3s StandardActorHomePositions[]; extern SaveData gCurrentSaveFile; extern s32 gEncounterSubState; -extern s32 timeFreezeMode; -extern s32 D_8009A678; +extern s32 gTimeFreezeMode; +extern b32 EncounterStateChanged; extern u8 IntroMessageIdx; extern s32 PartnerIDFromMenuIndex[12]; // partner IDs diff --git a/src/111f0_len_860.c b/src/111f0_len_860.c index e40213da4e..c104a94fec 100644 --- a/src/111f0_len_860.c +++ b/src/111f0_len_860.c @@ -40,7 +40,7 @@ void init_enter_world_shared(void) { gOverrideFlags |= GLOBAL_OVERRIDES_DISABLE_DRAW_FRAME; evt_set_variable(NULL, GB_Unused_EVT_01, gGameStatusPtr->unk_A9); - timeFreezeMode = 0; + gTimeFreezeMode = TIME_FREEZE_NONE; } void state_step_enter_world(void) { @@ -61,7 +61,7 @@ void state_step_enter_world(void) { } gGameStatusPtr->prevArea = gGameStatusPtr->areaID; - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); if (gGameStatusPtr->demoState == DEMO_STATE_NONE) { disable_player_input(); } @@ -158,7 +158,7 @@ void state_step_change_map(void) { gGameStatusPtr->context = CONTEXT_WORLD; gGameStatusPtr->debugScripts = DEBUG_SCRIPTS_NONE; load_map_by_IDs(gGameStatusPtr->areaID, gGameStatusPtr->mapID, LOAD_FROM_MAP); - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); nuContRmbForceStopEnd(); if (gGameStatusPtr->demoState == DEMO_STATE_NONE) { disable_player_input(); diff --git a/src/23680.c b/src/23680.c index 85f94c3287..8ae15119e2 100644 --- a/src/23680.c +++ b/src/23680.c @@ -327,7 +327,7 @@ s32 get_coin_drop_amount(Enemy* enemy) { amt += currentEncounter->coinsEarned; - if (enemy->flags & (ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_40000)) { + if (enemy->flags & (ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE)) { amt = 0; } diff --git a/src/77480.c b/src/77480.c index f74676062f..5fb2de7cd5 100644 --- a/src/77480.c +++ b/src/77480.c @@ -404,7 +404,7 @@ HitID player_test_lateral_overlap(s32 mode, PlayerStatus* playerStatus, f32* x, hitDepth = length + radius; hitID = player_raycast_general(mode, *x, *y + height, *z, sinTheta, 0, cosTheta, &hitX, &hitY, &hitZ, &hitDepth, &hitNx, &hitNy, &hitNz); - if (mode == 3) { + if (mode == PLAYER_COLLISION_HAMMER) { targetDx = 0.0f; targetDz = 0.0f; } else { @@ -452,12 +452,12 @@ HitID player_raycast_general(s32 mode, f32 startX, f32 startY, f32 startZ, f32 d } else { ret = entityID | COLLISION_WITH_ENTITY_BIT; } - } else if (mode == PLAYER_COLLISION_3) { + } else if (mode == PLAYER_COLLISION_HAMMER) { ret = test_ray_colliders(COLLIDER_FLAG_IGNORE_SHELL, startX, startY, startZ, dirX, dirY, dirZ, hitX, hitY, hitZ, hitDepth, hitNx, hitNy, hitNz); } - if (mode == PLAYER_COLLISION_1 || mode == PLAYER_COLLISION_3) { + if (mode == PLAYER_COLLISION_1 || mode == PLAYER_COLLISION_HAMMER) { return ret; } @@ -1098,7 +1098,7 @@ s32 has_valid_conversation_npc(void) { s32 ret = FALSE; s32 cond; - if (npc != NULL && !(npc->flags & NPC_FLAG_10000000)) { + if (npc != NULL && !(npc->flags & NPC_FLAG_USE_INSPECT_ICON)) { cond = !(playerStatus->flags & PS_FLAG_INPUT_DISABLED) && (playerStatus->flags & PS_FLAG_HAS_CONVERSATION_NPC); ret = cond; } @@ -1160,7 +1160,7 @@ s32 func_800E06D8(void) { if (playerStatus->flags & PS_FLAG_HAS_CONVERSATION_NPC && !(playerStatus->flags & PS_FLAG_INPUT_DISABLED) && npc != NULL - && npc->flags & NPC_FLAG_10000000 + && npc->flags & NPC_FLAG_USE_INSPECT_ICON ) { playerStatus->interactingWithID = NO_COLLIDER; return TRUE; @@ -1236,7 +1236,7 @@ void check_for_interactables(void) { (!(playerStatus->flags & PS_FLAG_INPUT_DISABLED)) && (playerStatus->flags & PS_FLAG_HAS_CONVERSATION_NPC) && (npc != NULL) - && (npc->flags & NPC_FLAG_10000000) + && (npc->flags & NPC_FLAG_USE_INSPECT_ICON) ) { curInteraction = npc->npcID | COLLISION_WITH_NPC_BIT; if (playerStatus->interactingWithID == curInteraction) { diff --git a/src/7BB60.c b/src/7BB60.c index ac3c0db241..00dc672fa1 100644 --- a/src/7BB60.c +++ b/src/7BB60.c @@ -10,15 +10,15 @@ f32 StepUpLastYaw; extern f32 GravityParamsStartJump[]; -s32 collision_check_player_intersecting_world(s32 mode, s32 arg1, f32 yaw); -s32 phys_check_interactable_collision(void); +HitID collision_check_player_intersecting_world(s32 mode, s32 arg1, f32 yaw); +HitID phys_check_interactable_collision(void); void phys_save_ground_pos(void); void record_jump_apex(void) { gPlayerStatus.jumpApexHeight = gPlayerStatus.pos.y; } -s32 can_trigger_loading_zone(void) { +b32 can_trigger_loading_zone(void) { PlayerData* playerData = &gPlayerData; s32 actionState = gPlayerStatusPtr->actionState; PartnerStatus* partnerStatus = &gPartnerStatus; @@ -64,15 +64,15 @@ void move_player(s32 duration, f32 heading, f32 speed) { } } -s32 collision_main_above(void) { +HitID collision_main_above(void) { PlayerStatus* playerStatus = &gPlayerStatus; CollisionStatus* collisionStatus = &gCollisionStatus; + HitID hitResult; f32 x, y, z; f32 new_var; f32 moveAngle; f32 moveMagnitude; f32 sp2C; - s32 hitResult; f32 phi_f2; new_var = sp2C = playerStatus->colliderHeight * 0.5f; @@ -522,7 +522,7 @@ void collision_main_lateral(void) { switch (playerStatus->actionState) { case ACTION_STATE_STEP_UP: - collision_check_player_intersecting_world(0, 0, + collision_check_player_intersecting_world(PLAYER_COLLISION_0, 0, playerStatus->spriteFacingAngle - 90.0f + gCameras[gCurrentCameraID].curYaw); break; case ACTION_STATE_RIDE: @@ -539,7 +539,7 @@ void collision_main_lateral(void) { gCameras[CAM_DEFAULT].targetPos.y = playerStatus->pos.y; gCameras[CAM_DEFAULT].targetPos.z = playerStatus->pos.z; if (playerStatus->curAlpha != 128) { - collision_check_player_intersecting_world(0, 0, + collision_check_player_intersecting_world(PLAYER_COLLISION_0, 0, atan2(0.0f, 0.0f, playerStatus->pushVel.x, playerStatus->pushVel.z)); } } @@ -562,7 +562,7 @@ void collision_main_lateral(void) { playerStatus->pushVel.y != 0.0f || playerStatus->pushVel.z != 0.0f) { - collision_check_player_intersecting_world(0, 0, + collision_check_player_intersecting_world(PLAYER_COLLISION_0, 0, playerStatus->spriteFacingAngle - 90.0f + gCameras[gCurrentCameraID].curYaw); } break; @@ -595,7 +595,7 @@ void collision_main_lateral(void) { playerStatus->pushVel.y != 0.0f || playerStatus->pushVel.z != 0.0f) { - collision_check_player_intersecting_world(0, 0, + collision_check_player_intersecting_world(PLAYER_COLLISION_0, 0, playerStatus->spriteFacingAngle - 90.0f + gCameras[gCurrentCameraID].curYaw); } break; @@ -685,7 +685,7 @@ void collision_main_lateral(void) { collisionStatus->curWall = result; if (!(playerStatus->flags & PS_FLAG_MOVEMENT_LOCKED) && playerStatus->actionState != ACTION_STATE_HAMMER) { if (speed == 0.0f) { - collision_check_player_intersecting_world(0, 0, + collision_check_player_intersecting_world(PLAYER_COLLISION_0, 0, playerStatus->spriteFacingAngle - 90.0f + gCameras[gCurrentCameraID].curYaw); break; } @@ -736,8 +736,8 @@ void collision_main_lateral(void) { } else { yaw2 = playerStatus->spriteFacingAngle - 90.0f + gCameras[gCurrentCameraID].curYaw; } - if (collision_check_player_intersecting_world(0, 0, yaw2) <= NO_COLLIDER) { - collision_check_player_intersecting_world(1, playerStatus->colliderHeight * 0.75f, yaw2); + if (collision_check_player_intersecting_world(PLAYER_COLLISION_0, 0, yaw2) <= NO_COLLIDER) { + collision_check_player_intersecting_world(PLAYER_COLLISION_1, playerStatus->colliderHeight * 0.75f, yaw2); } } } @@ -756,9 +756,9 @@ void collision_main_lateral(void) { } } -s32 collision_check_player_intersecting_world(s32 mode, s32 arg1, f32 yaw) { +HitID collision_check_player_intersecting_world(s32 mode, s32 arg1, f32 yaw) { + HitID ret = NO_COLLIDER; f32 angle = 0.0f; - s32 ret = -1; s32 i; for (i = 0; i < 4; i++) { @@ -791,16 +791,16 @@ s32 collision_check_player_intersecting_world(s32 mode, s32 arg1, f32 yaw) { return ret; } -s32 func_800E4404(s32 mode, s32 arg1, f32 arg2, f32* outX, f32* outY, f32* outZ) { +HitID func_800E4404(s32 mode, s32 offsetY, f32 arg2, f32* outX, f32* outY, f32* outZ) { + HitID ret = NO_COLLIDER; f32 angle = 0.0f; - s32 ret = -1; s32 i; for (i = 0; i < 4; i++) { f32 x = *outX; - f32 y = *outY + arg1; + f32 y = *outY + offsetY; f32 z = *outZ; - s32 hitID = player_test_lateral_overlap(mode, gPlayerStatusPtr, &x, &y, &z, 0, angle); + s32 hitID = player_test_lateral_overlap(mode, gPlayerStatusPtr, &x, &y, &z, 0.0f, angle); if (hitID > NO_COLLIDER) { ret = hitID; @@ -989,80 +989,80 @@ void phys_main_collision_below(void) { } void func_800E4AD8(s32 mode) { - Camera* currentCamera = &gCameras[gCurrentCameraID]; + f32 camYaw = gCameras[gCurrentCameraID].curYaw; - collision_check_player_intersecting_world(mode, 0, gPlayerStatus.spriteFacingAngle - 90.0f + currentCamera->curYaw); + collision_check_player_intersecting_world(mode, 0, gPlayerStatus.spriteFacingAngle - 90.0f + camYaw); } -void func_800E4B40(s32 mode, f32* arg1, f32* arg2, f32* arg3) { - Camera* currentCamera = &gCameras[gCurrentCameraID]; +void func_800E4B40(s32 mode, f32* outX, f32* outY, f32* outZ) { + f32 camYaw = gCameras[gCurrentCameraID].curYaw; - func_800E4404(mode, 0, gPlayerStatus.spriteFacingAngle - 90.0f + currentCamera->curYaw, arg1, arg2, arg3); + func_800E4404(mode, 0, gPlayerStatus.spriteFacingAngle - 90.0f + camYaw, outX, outY, outZ); } void collision_lava_reset_check_additional_overlaps(void) { PlayerStatus* playerStatus = &gPlayerStatus; f32 x, y, z; - f32 temp_f0; + f32 yaw; if (playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS) { collision_lateral_peach(); return; } - temp_f0 = clamp_angle(playerStatus->targetYaw - 30.0); + yaw = clamp_angle(playerStatus->targetYaw - 30.0); y = playerStatus->pos.y + (playerStatus->colliderHeight * 0.75f); x = playerStatus->pos.x; z = playerStatus->pos.z; - player_test_lateral_overlap(PLAYER_COLLISION_0, &gPlayerStatus, &x, &y, &z, 0.0f, temp_f0); + player_test_lateral_overlap(PLAYER_COLLISION_0, &gPlayerStatus, &x, &y, &z, 0.0f, yaw); playerStatus->pos.x = x; playerStatus->pos.z = z; - temp_f0 = clamp_angle(playerStatus->targetYaw + 30.0); + yaw = clamp_angle(playerStatus->targetYaw + 30.0); y = playerStatus->pos.y + (playerStatus->colliderHeight * 0.75f); x = playerStatus->pos.x; z = playerStatus->pos.z; - player_test_lateral_overlap(PLAYER_COLLISION_0, &gPlayerStatus, &x, &y, &z, 0.0f, temp_f0); + player_test_lateral_overlap(PLAYER_COLLISION_0, &gPlayerStatus, &x, &y, &z, 0.0f, yaw); playerStatus->pos.x = x; playerStatus->pos.z = z; - temp_f0 = clamp_angle(playerStatus->targetYaw - 30.0); + yaw = clamp_angle(playerStatus->targetYaw - 30.0); x = playerStatus->pos.x; y = playerStatus->pos.y; z = playerStatus->pos.z; - player_test_lateral_overlap(PLAYER_COLLISION_0, &gPlayerStatus, &x, &y, &z, 0.0f, temp_f0); + player_test_lateral_overlap(PLAYER_COLLISION_0, &gPlayerStatus, &x, &y, &z, 0.0f, yaw); playerStatus->pos.x = x; playerStatus->pos.z = z; - temp_f0 = clamp_angle(playerStatus->targetYaw + 30.0); + yaw = clamp_angle(playerStatus->targetYaw + 30.0); x = playerStatus->pos.x; y = playerStatus->pos.y; z = playerStatus->pos.z; - player_test_lateral_overlap(PLAYER_COLLISION_0, &gPlayerStatus, &x, &y, &z, 0.0f, temp_f0); + player_test_lateral_overlap(PLAYER_COLLISION_0, &gPlayerStatus, &x, &y, &z, 0.0f, yaw); playerStatus->pos.x = x; playerStatus->pos.z = z; - temp_f0 = clamp_angle(playerStatus->targetYaw + 90.0); + yaw = clamp_angle(playerStatus->targetYaw + 90.0); x = playerStatus->pos.x; y = playerStatus->pos.y; z = playerStatus->pos.z; - player_test_lateral_overlap(PLAYER_COLLISION_0, &gPlayerStatus, &x, &y, &z, 0.0f, temp_f0); + player_test_lateral_overlap(PLAYER_COLLISION_0, &gPlayerStatus, &x, &y, &z, 0.0f, yaw); playerStatus->pos.x = x; playerStatus->pos.z = z; - temp_f0 = clamp_angle(playerStatus->targetYaw - 90.0); + yaw = clamp_angle(playerStatus->targetYaw - 90.0); x = playerStatus->pos.x; y = playerStatus->pos.y; z = playerStatus->pos.z; - player_test_lateral_overlap(PLAYER_COLLISION_0, &gPlayerStatus, &x, &y, &z, 0.0f, temp_f0); + player_test_lateral_overlap(PLAYER_COLLISION_0, &gPlayerStatus, &x, &y, &z, 0.0f, yaw); playerStatus->pos.x = x; playerStatus->pos.z = z; - temp_f0 = clamp_angle(playerStatus->targetYaw + 180.0); + yaw = clamp_angle(playerStatus->targetYaw + 180.0); x = playerStatus->pos.x; y = playerStatus->pos.y; z = playerStatus->pos.z; - player_test_lateral_overlap(PLAYER_COLLISION_0, &gPlayerStatus, &x, &y, &z, 0.0f, temp_f0); + player_test_lateral_overlap(PLAYER_COLLISION_0, &gPlayerStatus, &x, &y, &z, 0.0f, yaw); playerStatus->pos.x = x; playerStatus->pos.z = z; } @@ -1141,10 +1141,10 @@ void phys_update_interact_collider(void) { gCollisionStatus.curInspect = phys_check_interactable_collision(); } -s32 phys_check_interactable_collision(void) { +HitID phys_check_interactable_collision(void) { PlayerStatus* playerStatus = &gPlayerStatus; + HitID ret = NO_COLLIDER; f32 x, y, z, yaw; - s32 ret = -1; if (playerStatus->flags & PS_FLAG_INPUT_DISABLED) { return ret; @@ -1190,7 +1190,7 @@ s32 phys_can_player_interact(void) { return ret; } -f32 func_800E5348(void) { +f32 player_get_side_angle(void) { f32 deltaYaw = get_clamped_angle_diff(gCameras[gCurrentCameraID].curYaw, gPlayerStatus.curYaw); if (deltaYaw < -5.0f && deltaYaw > -175.0f) { diff --git a/src/7E9D0.c b/src/7E9D0.c index 8c10002144..87f6282a18 100644 --- a/src/7E9D0.c +++ b/src/7E9D0.c @@ -678,7 +678,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(PLAYER_COLLISION_3, playerStatus, &x, &y, &z, 4.0f, yaw); + hitID = player_test_lateral_overlap(PLAYER_COLLISION_HAMMER, playerStatus, &x, &y, &z, 4.0f, yaw); if (hitID >= 0) { break; } 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 5fe4859217..245006e1b5 100644 --- a/src/battle/area/trd_part_2/actor/fake_bowser.c +++ b/src/battle/area/trd_part_2/actor/fake_bowser.c @@ -450,7 +450,7 @@ EvtScript N(EVS_AnimBowser_DeathMain) = { UseArray(FakeBowserAnimState) Call(N(StartRumbleWithParams), 256, 30) Thread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(ShakeCam, CAM_BATTLE, 0, 20, Float(3.0)) EndThread Call(SetPartFlagBits, ACTOR_SELF, PRT_HEAD, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, TRUE) @@ -476,35 +476,35 @@ EvtScript N(EVS_AnimBowser_DeathMain) = { Wait(30) Call(PlaySoundAtModel, MODEL_k1, SOUND_DISTANT_THUD, SOUND_SPACE_DEFAULT) Thread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(ShakeCam, CAM_BATTLE, 0, 5, Float(1.0)) EndThread Call(N(StartRumbleWithParams), 100, 20) Wait(20) Call(PlaySoundAtModel, MODEL_u1, SOUND_DISTANT_THUD, SOUND_SPACE_DEFAULT) Thread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(ShakeCam, CAM_BATTLE, 0, 10, Float(1.5)) EndThread Call(N(StartRumbleWithParams), 150, 20) Wait(30) Call(PlaySoundAtModel, MODEL_p1, SOUND_DISTANT_THUD, SOUND_SPACE_DEFAULT) Thread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(ShakeCam, CAM_BATTLE, 0, 10, Float(1.0)) EndThread Call(N(StartRumbleWithParams), 100, 20) Wait(30) Call(PlaySoundAtModel, MODEL_d1, SOUND_DISTANT_THUD, SOUND_SPACE_DEFAULT) Thread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(ShakeCam, CAM_BATTLE, 0, 5, Float(0.7)) EndThread Call(N(StartRumbleWithParams), 70, 20) Wait(20) Call(PlaySoundAtModel, MODEL_s1, SOUND_DISTANT_THUD, SOUND_SPACE_DEFAULT) Thread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(ShakeCam, CAM_BATTLE, 0, 10, Float(1.0)) EndThread Call(N(StartRumbleWithParams), 100, 20) @@ -512,12 +512,12 @@ EvtScript N(EVS_AnimBowser_DeathMain) = { Call(PlaySoundAtModel, MODEL_km1, SOUND_DISTANT_THUD, SOUND_SPACE_DEFAULT) Call(N(StartRumbleWithParams), 60, 20) Thread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(ShakeCam, CAM_BATTLE, 0, 5, Float(0.6)) EndThread Wait(20) Thread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(ShakeCam, CAM_BATTLE, 0, 5, Float(0.3)) EndThread Call(N(StartRumbleWithParams), 30, 20) diff --git a/src/battle/player_events.c b/src/battle/player_events.c index ba53ffb8c4..ea114a3e42 100644 --- a/src/battle/player_events.c +++ b/src/battle/player_events.c @@ -19,16 +19,22 @@ extern EvtScript EVS_Player_NoDamageHit; extern PlayerCelebrationAnimOptions bPlayerCelebrations; -BSS s32 D_8029FB90; -BSS f32 D_8029FB94; +BSS s32 BattleMerleeEffectsTime; +BSS f32 BattleMerleeBasePosY; BSS EffectInstance* BattleMerleeOrbEffect; BSS EffectInstance* BattleMerleeWaveEffect; -BSS s32 RefundHudElem; -BSS s16 D_8029FBA4; -BSS s32 D_8029FBA8; -BSS s32 D_8029FBAC; +BSS s32 HID_Refund; +BSS s16 BattleMerleeEffectsState; +BSS s32 HID_Happy; +BSS s32 HID_HPDrain; BSS s32 D_8029FBB0[3]; +enum { + MERLEE_EFFECTS_HOLD = 0, // effects appear and track Merlee's position + MERLEE_EFFECTS_RELEASE = 1, // effects grow larger before vanishing + MERLEE_EFFECTS_DISMISS = 2, // effects vanish and are dismissed +}; + API_CALLABLE(ForceDisablePlayerBlurImmediately); void btl_set_player_idle_anims(void) { @@ -207,8 +213,8 @@ API_CALLABLE(GiveRefund) { posY = player->curPos.y; posZ = player->curPos.z; get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ); - RefundHudElem = hud_element_create(&HES_Refund); - hud_element_set_render_pos(RefundHudElem, iconPosX + 36, iconPosY - 63); + HID_Refund = hud_element_create(&HES_Refund); + hud_element_set_render_pos(HID_Refund, iconPosX + 36, iconPosY - 63); } script->varTable[0] = delayTime; @@ -220,7 +226,7 @@ API_CALLABLE(GiveRefundCleanup) { s32 sellValue = gItemTable[gBattleStatus.moveArgument].sellValue; if (player_team_is_ability_active(gBattleStatus.playerActor, ABILITY_REFUND) && sellValue > 0) { - hud_element_free(RefundHudElem); + hud_element_free(HID_Refund); } return ApiStatus_DONE2; @@ -410,14 +416,14 @@ API_CALLABLE(BattleMerleeUpdateFX) { if (isInitialCall) { script->functionTemp[1] = 0; - D_8029FB94 = merlee->pos.y; + BattleMerleeBasePosY = merlee->pos.y; BattleMerleeOrbEffect = fx_energy_orb_wave(0, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.4f, 0); BattleMerleeWaveEffect = fx_energy_orb_wave(3, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.00001f, 0); - D_8029FBA4 = 0; - D_8029FB90 = 12; + BattleMerleeEffectsState = MERLEE_EFFECTS_HOLD; + BattleMerleeEffectsTime = 12; sfx_play_sound(SOUND_MAGIC_ASCENDING); } - merlee->pos.y = D_8029FB94 + (sin_rad(DEG_TO_RAD(script->functionTemp[1])) * 3.0f); + merlee->pos.y = BattleMerleeBasePosY + (sin_rad(DEG_TO_RAD(script->functionTemp[1])) * 3.0f); script->functionTemp[1] += 10; script->functionTemp[1] = clamp_angle(script->functionTemp[1]); @@ -432,7 +438,7 @@ API_CALLABLE(BattleMerleeUpdateFX) { data->pos.y = merlee->pos.y + 16.0f; data->pos.z = merlee->pos.z + 5.0f; - if (D_8029FBA4 == 2) { + if (BattleMerleeEffectsState == MERLEE_EFFECTS_DISMISS) { BattleMerleeOrbEffect->data.energyOrbWave->scale = 0.00001f; BattleMerleeWaveEffect->data.energyOrbWave->scale = 0.00001f; BattleMerleeOrbEffect->flags |= FX_INSTANCE_FLAG_DISMISS; @@ -440,28 +446,28 @@ API_CALLABLE(BattleMerleeUpdateFX) { return ApiStatus_DONE1; } - if (D_8029FBA4 == 1) { + if (BattleMerleeEffectsState == MERLEE_EFFECTS_RELEASE) { data = BattleMerleeOrbEffect->data.energyOrbWave; data->scale += 0.35; if (data->scale > 3.5) { - data->scale = 3.5f; + data->scale = 3.5; } - if (D_8029FB90 != 0) { - D_8029FB90--; + if (BattleMerleeEffectsTime != 0) { + BattleMerleeEffectsTime--; } else { data = BattleMerleeWaveEffect->data.energyOrbWave; data->scale += 0.5; if (data->scale > 5.0) { - D_8029FBA4 = 2; + BattleMerleeEffectsState = MERLEE_EFFECTS_DISMISS; } } } return ApiStatus_BLOCK; } -API_CALLABLE(func_802619B4) { - D_8029FBA4 = 1; +API_CALLABLE(BattleMerleeStopFX) { + BattleMerleeEffectsState = MERLEE_EFFECTS_RELEASE; return ApiStatus_DONE2; } @@ -490,24 +496,24 @@ API_CALLABLE(SpawnTurnEndFX) { screenY -= 19; if (script->varTable[10] > 0) { - D_8029FBAC = hud_element_create(&HES_HPDrain); - hud_element_set_render_pos(D_8029FBAC, screenX, screenY); + HID_HPDrain = hud_element_create(&HES_HPDrain); + hud_element_set_render_pos(HID_HPDrain, screenX, screenY); screenY += 9; } if (script->varTable[11] > 0 || script->varTable[12] > 0) { - D_8029FBA8 = hud_element_create(&HES_Happy); - hud_element_set_render_pos(D_8029FBA8, screenX, screenY); + HID_Happy = hud_element_create(&HES_Happy); + hud_element_set_render_pos(HID_Happy, screenX, screenY); } return ApiStatus_DONE2; } API_CALLABLE(RemoveTurnEndFX) { if (script->varTable[10] > 0) { - hud_element_free(D_8029FBAC); + hud_element_free(HID_HPDrain); } if (script->varTable[11] > 0 || script->varTable[12] > 0) { - hud_element_free(D_8029FBA8); + hud_element_free(HID_Happy); } return ApiStatus_DONE2; } @@ -1611,7 +1617,7 @@ EvtScript EVS_MerleeAttackBonus = { Call(BattleFadeInMerlee) Wait(30) Call(SetNpcAnimation, NPC_BTL_MERLEE, ANIM_BattleMerlee_Release) - Call(func_802619B4) + Call(BattleMerleeStopFX) Call(UseBattleCamPreset, BTL_CAM_DEFAULT) Call(MoveBattleCamOver, 4) Call(BattleMerleeFadeStageFromBlack) @@ -1660,7 +1666,7 @@ EvtScript EVS_MerleeDefenseBonus = { Call(BattleFadeInMerlee) Wait(30) Call(SetNpcAnimation, NPC_BTL_MERLEE, ANIM_BattleMerlee_Release) - Call(func_802619B4) + Call(BattleMerleeStopFX) Call(UseBattleCamPreset, BTL_CAM_DEFAULT) Call(MoveBattleCamOver, 4) Call(BattleMerleeFadeStageFromBlack) @@ -1714,7 +1720,7 @@ EvtScript EVS_MerleeExpBonus = { Call(BattleFadeInMerlee) Wait(30) Call(SetNpcAnimation, NPC_BTL_MERLEE, ANIM_BattleMerlee_Release) - Call(func_802619B4) + Call(BattleMerleeStopFX) Call(UseBattleCamPreset, BTL_CAM_DEFAULT) Call(MoveBattleCamOver, 4) Call(BattleMerleeFadeStageFromBlack) diff --git a/src/bss/main_pre_bss.c b/src/bss/main_pre_bss.c index 9236be55ee..66f5235b48 100644 --- a/src/bss/main_pre_bss.c +++ b/src/bss/main_pre_bss.c @@ -27,7 +27,7 @@ BSS s32 gEncounterSubState; BSS u32 __osBbRCountWraps; #endif BSS void *CurrentSefCmdHandler; -BSS s32 timeFreezeMode; +BSS s32 gTimeFreezeMode; #ifdef BBPLAYER BSS u32 __osBbLastRCount; #endif @@ -64,7 +64,7 @@ BSS OSPiHandle* nuPiCartHandle; #ifdef BBPLAYER BSS u32 __osBbVCountWraps; #endif -BSS s8 D_8009A63C; +BSS s8 PendingPartnerAbilityResume; BSS SoundManager* gSoundManager; BSS s32 D_8009A644; BSS s32 D_8009A648; @@ -77,9 +77,9 @@ BSS u32 __osFinalrom; BSS BGMPlayer* gBGMPlayerA; BSS s16 gFirstStrikeMessagePos; BSS Gfx* gMainGfxPos; -BSS s8 D_8009A670; +BSS s8 LastBattleStartedBySpin; BSS DisplayContext* gDisplayContext; -BSS s32 D_8009A678; +BSS b32 EncounterStateChanged; BSS s32 D_8009A67C; #if VERSION_IQUE BSS s32 D_80099258[2]; diff --git a/src/cam_main.c b/src/cam_main.c index 2f3b2d7215..01516d79ec 100644 --- a/src/cam_main.c +++ b/src/cam_main.c @@ -366,7 +366,7 @@ Camera* initialize_next_camera(CameraInitData* initData) { camera->lookAt_obj.x = 0; camera->lookAt_obj.y = 0; camera->lookAt_obj.z = -100.0f; - camera->curYaw = 0; + camera->curYaw = 0.0f; camera->curBoomLength = 0; camera->targetOffsetY = 0; camera->curBoomYaw = 0.0f; diff --git a/src/encounter.c b/src/encounter.c index af15ca7617..e80bd74309 100644 --- a/src/encounter.c +++ b/src/encounter.c @@ -18,7 +18,9 @@ API_CALLABLE(MerleeStopFX); API_CALLABLE(PlayMerleeGatherFX); API_CALLABLE(PlayMerleeOrbFX); -s32 D_80077C40 = 0; +b32 D_80077C40 = FALSE; + +b32 EncounterStateChanged; EvtScript EVS_MerleeDropCoins = { Wait(10) @@ -161,7 +163,7 @@ EvtScript EnemyNpcDefeat = { CaseEq(OUTCOME_PLAYER_FLED) Call(OnPlayerFled, 0) CaseEq(OUTCOME_ENEMY_FLED) - Call(SetEnemyFlagBits, -1, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) EndSwitch Return @@ -171,19 +173,25 @@ EvtScript EnemyNpcDefeat = { s32 gEncounterState; s32 gEncounterSubState; EncounterStatus gCurrentEncounter; -s8 D_8009A63C; -s8 HasPreBattleSongPushed; -s16 gFirstStrikeMessagePos; -s8 D_8009A670; -s32 D_8009A678; -BSS s32 D_800A0BA0; -BSS f32 D_800A0BA4; +s8 HasPreBattleSongPushed; +b8 PendingPartnerAbilityResume; +b8 LastBattleStartedBySpin; +s16 gFirstStrikeMessagePos; + +BSS s32 WorldMerleeEffectsTime; +BSS f32 WorldMerleeBasePosY; BSS EffectInstance* WorldMerleeOrbEffect; BSS EffectInstance* WorldMerleeWaveEffect; -BSS Evt* D_800A0BB0; -BSS s32 D_800A0BB4; -BSS s16 D_800A0BB8; +BSS Evt* MerleeDropCoinsEvt; +BSS s32 MerleeDropCoinsEvtID; +BSS s16 WorldMerleeEffectsState; + +enum { + MERLEE_EFFECTS_HOLD = 0, // effects appear and track Merlee's position + MERLEE_EFFECTS_RELEASE = 1, // effects grow larger before vanishing + MERLEE_EFFECTS_DISMISS = 2, // effects vanish and are dismissed +}; void set_battle_formation(Battle*); void setup_status_bar_for_world(void); @@ -312,15 +320,15 @@ API_CALLABLE(MerleeUpdateFX) { if (isInitialCall) { script->functionTemp[1] = 0; - D_800A0BA4 = merlee->pos.y; + WorldMerleeBasePosY = merlee->pos.y; WorldMerleeOrbEffect = fx_energy_orb_wave(0, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.4f, 0); WorldMerleeWaveEffect = fx_energy_orb_wave(3, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.00001f, 0); - D_800A0BB8 = 0; - D_800A0BA0 = 12; + WorldMerleeEffectsState = MERLEE_EFFECTS_HOLD; + WorldMerleeEffectsTime = 12; sfx_play_sound(SOUND_MAGIC_ASCENDING); } - merlee->pos.y = D_800A0BA4 + sin_rad(DEG_TO_RAD(script->functionTemp[1])) * 3.0f; + merlee->pos.y = WorldMerleeBasePosY + sin_rad(DEG_TO_RAD(script->functionTemp[1])) * 3.0f; script->functionTemp[1] += 10; script->functionTemp[1] = clamp_angle(script->functionTemp[1]); @@ -335,7 +343,7 @@ API_CALLABLE(MerleeUpdateFX) { effectData->pos.y = merlee->pos.y + 16.0f; effectData->pos.z = merlee->pos.z + 5.0f; - if (D_800A0BB8 == 2) { + if (WorldMerleeEffectsState == MERLEE_EFFECTS_DISMISS) { WorldMerleeOrbEffect->data.energyOrbWave->scale = 0.00001f; WorldMerleeWaveEffect->data.energyOrbWave->scale = 0.00001f; WorldMerleeOrbEffect->flags |= FX_INSTANCE_FLAG_DISMISS; @@ -343,20 +351,20 @@ API_CALLABLE(MerleeUpdateFX) { return ApiStatus_DONE1; } - if (D_800A0BB8 == 1) { + if (WorldMerleeEffectsState == MERLEE_EFFECTS_RELEASE) { effectData = WorldMerleeOrbEffect->data.energyOrbWave; effectData->scale += 0.35; if (effectData->scale > 3.5) { - effectData->scale = 3.5f; + effectData->scale = 3.5; } - if (D_800A0BA0 != 0) { - D_800A0BA0--; + if (WorldMerleeEffectsTime != 0) { + WorldMerleeEffectsTime--; } else { effectData = WorldMerleeWaveEffect->data.energyOrbWave; effectData->scale += 0.5; if (effectData->scale > 5.0) { - D_800A0BB8 = 2; + WorldMerleeEffectsState = MERLEE_EFFECTS_DISMISS; } } } @@ -364,7 +372,7 @@ API_CALLABLE(MerleeUpdateFX) { } API_CALLABLE(MerleeStopFX) { - D_800A0BB8 = 1; + WorldMerleeEffectsState = MERLEE_EFFECTS_RELEASE; return ApiStatus_DONE2; } @@ -516,9 +524,9 @@ void update_encounters_neutral(void) { currentEncounter->hitType = 0; currentEncounter->allowFleeing = FALSE; currentEncounter->dropWhackaBump = FALSE; - currentEncounter->flags &= ~ENCOUNTER_STATUS_FLAG_1; - currentEncounter->flags &= ~ENCOUNTER_STATUS_FLAG_2; - currentEncounter->flags &= ~ENCOUNTER_STATUS_FLAG_4; + currentEncounter->flags &= ~ENCOUNTER_FLAG_THUMBS_UP; + currentEncounter->flags &= ~ENCOUNTER_FLAG_CANT_SKIP_WIN_DELAY; + currentEncounter->flags &= ~ENCOUNTER_FLAG_SKIP_FLEE_DROPS; playerX = playerStatus->pos.x; playerY = playerStatus->pos.y; @@ -570,6 +578,7 @@ void update_encounters_neutral(void) { npc->flags &= ~NPC_FLAG_SUSPENDED; enemy->flags &= ~ENEMY_FLAG_SUSPENDED; } + script = get_script_by_id(enemy->auxScriptID); if (script != NULL) { set_script_flags(script, EVT_FLAG_SUSPENDED); @@ -578,7 +587,8 @@ void update_encounters_neutral(void) { if (script != NULL) { set_script_flags(script, EVT_FLAG_SUSPENDED); } - if (enemy->flags & ENEMY_FLAG_80000) { + + if (enemy->flags & ENEMY_FLAG_DONT_SUSPEND_SCRIPTS) { script = get_script_by_id(enemy->auxScriptID); if (script != NULL) { clear_script_flags(script, EVT_FLAG_SUSPENDED); @@ -630,7 +640,7 @@ void update_encounters_neutral(void) { continue; } if (enemy->flags & ENEMY_FLAG_PASSIVE) { - if (!(enemy->flags & ENEMY_FLAG_400000)) { + if (!(enemy->flags & ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER)) { if (npc == playerStatus->encounteredNPC) { enemy->savedNpcYaw = npc->yaw; npc->yaw = atan2(npc->pos.x, npc->pos.z, playerStatus->pos.x, playerStatus->pos.z); @@ -994,10 +1004,10 @@ START_BATTLE: sfx_play_sound_at_position(SOUND_HIT_PLAYER_NORMAL, SOUND_SPACE_DEFAULT, npc->pos.x, npc->pos.y, npc->pos.z); } currentEncounter->scriptedBattle = FALSE; - gEncounterState = ENCOUNTER_STATE_PRE_BATTLE; currentEncounter->fadeOutAmount = 0; - currentEncounter->unk_94 = 0; - D_8009A678 = 1; + currentEncounter->substateDelay = 0; + gEncounterState = ENCOUNTER_STATE_PRE_BATTLE; + EncounterStateChanged = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_PRE_BATTLE_INIT; break; case ENCOUNTER_TRIGGER_SPIN: @@ -1037,10 +1047,10 @@ START_BATTLE: disable_player_input(); partner_disable_input(); currentEncounter->scriptedBattle = FALSE; - gEncounterState = ENCOUNTER_STATE_PRE_BATTLE; currentEncounter->fadeOutAmount = 0; - currentEncounter->unk_94 = 0; - D_8009A678 = 1; + currentEncounter->substateDelay = 0; + gEncounterState = ENCOUNTER_STATE_PRE_BATTLE; + EncounterStateChanged = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_PRE_BATTLE_INIT; playerStatus->flags |= PS_FLAG_ENTERING_BATTLE; break; @@ -1100,11 +1110,11 @@ START_BATTLE: start_bounce_a(); } currentEncounter->fadeOutAmount = 0; - currentEncounter->unk_94 = 0; + currentEncounter->substateDelay = 0; currentEncounter->scriptedBattle = FALSE; sfx_play_sound(SOUND_NONE); gEncounterState = ENCOUNTER_STATE_PRE_BATTLE; - D_8009A678 = 1; + EncounterStateChanged = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_PRE_BATTLE_INIT; break; case ENCOUNTER_TRIGGER_HAMMER: @@ -1154,16 +1164,16 @@ START_BATTLE: disable_player_input(); partner_disable_input(); currentEncounter->fadeOutAmount = 0; - currentEncounter->unk_94 = 0; + currentEncounter->substateDelay = 0; currentEncounter->scriptedBattle = FALSE; playerStatus->flags |= PS_FLAG_ENTERING_BATTLE; sfx_play_sound(SOUND_NONE); gEncounterState = ENCOUNTER_STATE_PRE_BATTLE; - D_8009A678 = 1; + EncounterStateChanged = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_PRE_BATTLE_INIT; break; case ENCOUNTER_TRIGGER_CONVERSATION: - suspend_all_group(EVT_GROUP_01); + suspend_all_group(EVT_GROUP_FLAG_INTERACT); enemy = currentEncounter->curEnemy; if (enemy != NULL && enemy->aiScript != NULL) { suspend_all_script(enemy->aiScriptID); @@ -1182,10 +1192,10 @@ START_BATTLE: partner_disable_input(); set_action_state(ACTION_STATE_TALK); currentEncounter->fadeOutAmount = 0; - currentEncounter->unk_94 = 0; + currentEncounter->substateDelay = 0; func_800EF3D4(1); gEncounterState = ENCOUNTER_STATE_CONVERSATION; - D_8009A678 = 1; + EncounterStateChanged = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_CONVERSATION_INIT; break; case ENCOUNTER_TRIGGER_PARTNER: @@ -1236,12 +1246,12 @@ START_BATTLE: disable_player_input(); partner_disable_input(); currentEncounter->fadeOutAmount = 0; - currentEncounter->unk_94 = 0; + currentEncounter->substateDelay = 0; currentEncounter->scriptedBattle = FALSE; playerStatus->flags |= PS_FLAG_ENTERING_BATTLE; sfx_play_sound(SOUND_NONE); gEncounterState = ENCOUNTER_STATE_PRE_BATTLE; - D_8009A678 = 1; + EncounterStateChanged = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_PRE_BATTLE_INIT; break; } @@ -1261,13 +1271,14 @@ void update_encounters_pre_battle(void) { switch (gEncounterSubState) { case ENCOUNTER_SUBSTATE_PRE_BATTLE_INIT: currentEncounter->fadeOutAmount = 0; - currentEncounter->unk_94 = 1; + currentEncounter->substateDelay = 1; currentEncounter->fadeOutAccel = 1; currentEncounter->unk_08 = -1; HasPreBattleSongPushed = FALSE; - D_80077C40 = 0; - suspend_all_group(EVT_GROUP_10); + D_80077C40 = FALSE; + suspend_all_group(EVT_GROUP_FLAG_BATTLE); + // suspend all ai scripts for (i = 0; i < currentEncounter->numEncounters; i++) { encounter = currentEncounter->encounterList[i]; @@ -1286,23 +1297,26 @@ void update_encounters_pre_battle(void) { } } + // try skip-on-contact enemy = currentEncounter->curEnemy; - if ((enemy->flags & ENEMY_FLAG_100000) && !currentEncounter->scriptedBattle) { - currentEncounter->unk_94 = 0; + if ((enemy->flags & ENEMY_FLAG_SKIP_BATTLE) && !currentEncounter->scriptedBattle) { + currentEncounter->substateDelay = 0; currentEncounter->battleStartCountdown = 0; partner_handle_before_battle(); - gEncounterSubState = ENCOUNTER_SUBSTATE_PRE_BATTLE_3; + gEncounterSubState = ENCOUNTER_SUBSTATE_PRE_BATTLE_SKIP; return; } + // try kill-on-contact if (gGameStatusPtr->debugEnemyContact == DEBUG_CONTACT_DIE_ON_TOUCH) { - currentEncounter->unk_94 = 0; + currentEncounter->substateDelay = 0; currentEncounter->battleStartCountdown = 10; partner_handle_before_battle(); gEncounterSubState = ENCOUNTER_SUBSTATE_PRE_BATTLE_AUTO_WIN; return; } + // try first attack kill enemy = currentEncounter->curEnemy; if (currentEncounter->hitType != ENCOUNTER_TRIGGER_NONE && currentEncounter->hitType != ENCOUNTER_TRIGGER_SPIN @@ -1311,44 +1325,52 @@ void update_encounters_pre_battle(void) { && !(enemy->flags & ENEMY_FLAG_PROJECTILE) && !currentEncounter->scriptedBattle ) { - currentEncounter->unk_94 = 0; + currentEncounter->substateDelay = 0; currentEncounter->battleStartCountdown = 10; - D_80077C40 = 1; + D_80077C40 = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_PRE_BATTLE_AUTO_WIN; return; } + // try bump attack kill enemy = currentEncounter->curEnemy; - if (( - (is_ability_active(ABILITY_BUMP_ATTACK)) && - (playerData->level >= enemy->npcSettings->level) && - (!(enemy->flags & ENEMY_FLAG_PROJECTILE) && - !(currentEncounter->scriptedBattle)) - ) || ( - (enemy = currentEncounter->curEnemy, - (currentEncounter->hitType == ENCOUNTER_TRIGGER_SPIN)) && - (is_ability_active(ABILITY_SPIN_ATTACK)) && - playerData->level >= enemy->npcSettings->level && - !(enemy->flags & ENEMY_FLAG_PROJECTILE) && - !currentEncounter->scriptedBattle - )) - { + if (is_ability_active(ABILITY_BUMP_ATTACK) + && (playerData->level >= enemy->npcSettings->level) + && !(enemy->flags & ENEMY_FLAG_PROJECTILE) + && !(currentEncounter->scriptedBattle) + ) { + currentEncounter->substateDelay = 0; currentEncounter->battleStartCountdown = 10; - D_80077C40 = 1; - currentEncounter->unk_94 = 0; + D_80077C40 = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_PRE_BATTLE_AUTO_WIN; return; } + // try spin attack kill + enemy = currentEncounter->curEnemy; + if (currentEncounter->hitType == ENCOUNTER_TRIGGER_SPIN + && is_ability_active(ABILITY_SPIN_ATTACK) + && playerData->level >= enemy->npcSettings->level + && !(enemy->flags & ENEMY_FLAG_PROJECTILE) + && !currentEncounter->scriptedBattle + ) { + currentEncounter->substateDelay = 0; + currentEncounter->battleStartCountdown = 10; + D_80077C40 = TRUE; + gEncounterSubState = ENCOUNTER_SUBSTATE_PRE_BATTLE_AUTO_WIN; + return; + } + + // start battle music if (currentEncounter->songID < 0) { switch (currentEncounter->firstStrikeType) { - case 0: + case FIRST_STRIKE_NONE: bgm_set_battle_song(SONG_NORMAL_BATTLE, FIRST_STRIKE_NONE); break; - case 1: + case FIRST_STRIKE_PLAYER: bgm_set_battle_song(SONG_NORMAL_BATTLE, FIRST_STRIKE_PLAYER); break; - case 2: + case FIRST_STRIKE_ENEMY: bgm_set_battle_song(SONG_NORMAL_BATTLE, FIRST_STRIKE_ENEMY); break; } @@ -1357,59 +1379,67 @@ void update_encounters_pre_battle(void) { } bgm_push_battle_song(); HasPreBattleSongPushed = TRUE; + currentEncounter->battleStartCountdown = 10; - gEncounterSubState = ENCOUNTER_SUBSTATE_PRE_BATTLE_LOAD_BATTLE; - case ENCOUNTER_SUBSTATE_PRE_BATTLE_LOAD_BATTLE: - if (currentEncounter->fadeOutAmount == 255) { - if (currentEncounter->battleStartCountdown != 0) { - currentEncounter->battleStartCountdown--; - break; - } - - encounter = currentEncounter->curEncounter; - for (i = 0; i < encounter->count; i++) { - enemy = encounter->enemy[i]; - if (enemy != NULL && - ((!(enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) || enemy == currentEncounter->curEnemy)) && - !(enemy->flags & ENEMY_FLAG_DISABLE_AI) && - enemy->hitScript != NULL) - { - kill_script_by_ID(enemy->hitScriptID); - enemy->hitScript = NULL; - } - } - - partner_handle_before_battle(); - 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->dizzyAttack.status = 4; - currentEncounter->dizzyAttack.duration = 3; - } - - sfx_stop_sound(SOUND_SPIN); - sfx_stop_sound(SOUND_SPEEDY_SPIN); - sfx_stop_sound(SOUND_SPIN_ATTACK); - sfx_stop_sound(SOUND_SPEEDY_SPIN_ATTACK); - set_battle_formation(NULL); - set_battle_stage(encounter->stage); - load_battle(encounter->battle); - currentEncounter->unk_07 = 1; - currentEncounter->unk_08 = 0; - currentEncounter->hasMerleeCoinBonus = FALSE; - currentEncounter->damageTaken = 0; - currentEncounter->coinsEarned = 0; - currentEncounter->fadeOutAccel = 0; - currentEncounter->fadeOutAmount = 255; - set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, 255.0f); - gEncounterState = ENCOUNTER_STATE_POST_BATTLE; - D_8009A678 = 1; - gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_INIT; + gEncounterSubState = ENCOUNTER_SUBSTATE_PRE_BATTLE_LOAD; + // fallthrough + case ENCOUNTER_SUBSTATE_PRE_BATTLE_LOAD: + // wait for screen to fade out + if (currentEncounter->fadeOutAmount != 255) { + break; } + // delay before loading the battle + if (currentEncounter->battleStartCountdown != 0) { + currentEncounter->battleStartCountdown--; + break; + } + + // kill all enemy hit scripts + encounter = currentEncounter->curEncounter; + for (i = 0; i < encounter->count; i++) { + enemy = encounter->enemy[i]; + if (enemy != NULL && + ((!(enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) || enemy == currentEncounter->curEnemy)) && + !(enemy->flags & ENEMY_FLAG_DISABLE_AI) && + enemy->hitScript != NULL) + { + kill_script_by_ID(enemy->hitScriptID); + enemy->hitScript = NULL; + } + } + + partner_handle_before_battle(); + 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->dizzyAttack.status = 4; + currentEncounter->dizzyAttack.duration = 3; + } + + sfx_stop_sound(SOUND_SPIN); + sfx_stop_sound(SOUND_SPEEDY_SPIN); + sfx_stop_sound(SOUND_SPIN_ATTACK); + sfx_stop_sound(SOUND_SPEEDY_SPIN_ATTACK); + set_battle_formation(NULL); + set_battle_stage(encounter->stage); + load_battle(encounter->battle); + currentEncounter->unk_07 = 1; + currentEncounter->unk_08 = 0; + currentEncounter->hasMerleeCoinBonus = FALSE; + currentEncounter->damageTaken = 0; + currentEncounter->coinsEarned = 0; + currentEncounter->fadeOutAccel = 0; + currentEncounter->fadeOutAmount = 255; + set_screen_overlay_params_front(OVERLAY_SCREEN_COLOR, 255.0f); + + // prepare to resume after battle + gEncounterState = ENCOUNTER_STATE_POST_BATTLE; + EncounterStateChanged = TRUE; + gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_INIT; break; case ENCOUNTER_SUBSTATE_PRE_BATTLE_AUTO_WIN: if (currentEncounter->battleStartCountdown != 0) { @@ -1435,20 +1465,22 @@ void update_encounters_pre_battle(void) { currentEncounter->battleOutcome = OUTCOME_PLAYER_WON; currentEncounter->hasMerleeCoinBonus = FALSE; currentEncounter->damageTaken = 0; - gEncounterState = ENCOUNTER_STATE_POST_BATTLE; currentEncounter->coinsEarned = 0; + currentEncounter->fadeOutAccel = 0; currentEncounter->fadeOutAmount = 0; - D_8009A678 = 1; + gEncounterState = ENCOUNTER_STATE_POST_BATTLE; + EncounterStateChanged = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_INIT; break; - case ENCOUNTER_SUBSTATE_PRE_BATTLE_3: - currentEncounter->battleOutcome = OUTCOME_4; + case ENCOUNTER_SUBSTATE_PRE_BATTLE_SKIP: + currentEncounter->battleOutcome = OUTCOME_SKIP; currentEncounter->unk_08 = 1; + currentEncounter->fadeOutAmount = 0; currentEncounter->fadeOutAccel = 0; gEncounterState = ENCOUNTER_STATE_POST_BATTLE; - D_8009A678 = 1; + EncounterStateChanged = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_INIT; break; } @@ -1459,7 +1491,7 @@ void draw_encounters_pre_battle(void) { Npc* npc = get_npc_unsafe(encounter->curEnemy->npcID); PlayerStatus* playerStatus = &gPlayerStatus; - if (encounter->unk_94 != 0) { + if (encounter->substateDelay != 0) { f32 playerX, playerY, playerZ; f32 otherX, otherY, otherZ; s32 pScreenX, pScreenY, pScreenZ; @@ -1517,7 +1549,7 @@ void show_first_strike_message(void) { s32 xOffset; s32 screenWidthHalf; - if (currentEncounter->unk_94 == 0) { + if (currentEncounter->substateDelay == 0) { gFirstStrikeMessagePos = -200; return; } @@ -1601,27 +1633,28 @@ void update_encounters_post_battle(void) { } currentEncounter->fadeOutAccel = 1; currentEncounter->battleStartCountdown = 0; - D_8009A670 = FALSE; + LastBattleStartedBySpin = FALSE; gPlayerStatus.flags &= ~PS_FLAG_ENTERING_BATTLE; if (currentEncounter->hitType == ENCOUNTER_TRIGGER_SPIN) { - D_8009A670 = TRUE; + LastBattleStartedBySpin = TRUE; } currentEncounter->hitType = 0; - if (D_80077C40 == 0) { + if (!D_80077C40) { partner_handle_after_battle(); } - D_8009A63C = FALSE; + PendingPartnerAbilityResume = FALSE; if (partnerStatus->shouldResumeAbility) { - D_8009A63C = TRUE; - } else if (D_8009A670 == 0 && - !(gPlayerStatus.flags & (PS_FLAG_JUMPING | PS_FLAG_FALLING)) && - gPlayerStatus.actionState != ACTION_STATE_RIDE && - gPlayerStatus.actionState != ACTION_STATE_USE_SPINNING_FLOWER) { + PendingPartnerAbilityResume = TRUE; + } else if (!LastBattleStartedBySpin + && !(gPlayerStatus.flags & (PS_FLAG_JUMPING | PS_FLAG_FALLING)) + && gPlayerStatus.actionState != ACTION_STATE_RIDE + && gPlayerStatus.actionState != ACTION_STATE_USE_SPINNING_FLOWER + ) { set_action_state(ACTION_STATE_IDLE); } switch (currentEncounter->battleOutcome) { case OUTCOME_PLAYER_WON: - gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_WON_CHECK_MERLEE_BONUS; + gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_WON_CHECK_MERLEE; break; case OUTCOME_PLAYER_LOST: gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_LOST_INIT; @@ -1629,20 +1662,20 @@ void update_encounters_post_battle(void) { case OUTCOME_PLAYER_FLED: gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_FLED_INIT; break; - case OUTCOME_4: - gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_300; + case OUTCOME_SKIP: + gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_SKIP; break; case OUTCOME_ENEMY_FLED: gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_ENEMY_FLED_INIT; break; } break; - case ENCOUNTER_SUBSTATE_POST_BATTLE_WON_CHECK_MERLEE_BONUS: + case ENCOUNTER_SUBSTATE_POST_BATTLE_WON_CHECK_MERLEE: if (currentEncounter->hasMerleeCoinBonus) { if (get_coin_drop_amount(currentEncounter->curEnemy) != 0) { - D_800A0BB0 = start_script(&EVS_MerleeDropCoins, EVT_PRIORITY_A, 0); - D_800A0BB0->groupFlags = 0; - D_800A0BB4 = D_800A0BB0->id; + MerleeDropCoinsEvt = start_script(&EVS_MerleeDropCoins, EVT_PRIORITY_A, 0); + MerleeDropCoinsEvt->groupFlags = EVT_GROUP_NEVER_PAUSE; + MerleeDropCoinsEvtID = MerleeDropCoinsEvt->id; } else { playerData->merleeTurnCount = 0; playerData->merleeCastsLeft++; @@ -1651,16 +1684,20 @@ void update_encounters_post_battle(void) { gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_PLAY_NPC_DEFEAT; break; case ENCOUNTER_SUBSTATE_POST_BATTLE_PLAY_NPC_DEFEAT: - if (currentEncounter->hasMerleeCoinBonus && (get_coin_drop_amount(currentEncounter->curEnemy) != 0)) { - currentEncounter->fadeOutAccel += 4; - currentEncounter->fadeOutAmount -= currentEncounter->fadeOutAccel; - if (currentEncounter->fadeOutAmount < 0) { - currentEncounter->fadeOutAmount = 0; - } - if (does_script_exist(D_800A0BB4)) { - break; + // fade screen in and wait for merlee bonus to finish (if applicable) + if (currentEncounter->hasMerleeCoinBonus) { + if (get_coin_drop_amount(currentEncounter->curEnemy) != 0) { + currentEncounter->fadeOutAccel += 4; + currentEncounter->fadeOutAmount -= currentEncounter->fadeOutAccel; + if (currentEncounter->fadeOutAmount < 0) { + currentEncounter->fadeOutAmount = 0; + } + if (does_script_exist(MerleeDropCoinsEvtID)) { + break; + } } } + // start defeat scripts for current enemy encounter = currentEncounter->curEncounter; for (i = 0; i < encounter->count; i++) { enemy = encounter->enemy[i]; @@ -1674,28 +1711,32 @@ void update_encounters_post_battle(void) { continue; } if (enemy->defeatBytecode != NULL) { - script = start_script_in_group(enemy->defeatBytecode, EVT_PRIORITY_A, 0, 0); + script = start_script_in_group(enemy->defeatBytecode, EVT_PRIORITY_A, 0, EVT_GROUP_NEVER_PAUSE); enemy->defeatScript = script; enemy->defeatScriptID = script->id; script->owner1.enemy = enemy; script->owner2.npcID = enemy->npcID; - script->groupFlags = 0; + script->groupFlags = EVT_GROUP_NEVER_PAUSE; currentEncounter->battleStartCountdown = 1; } else { - script = start_script_in_group(&EVS_NpcDefeat, EVT_PRIORITY_A, 0, 0); + script = start_script_in_group(&EVS_NpcDefeat, EVT_PRIORITY_A, 0, EVT_GROUP_NEVER_PAUSE); enemy->defeatScript = script; enemy->defeatScriptID = script->id; script->owner1.enemy = enemy; script->owner2.npcID = enemy->npcID; - script->groupFlags = 0; + script->groupFlags = EVT_GROUP_NEVER_PAUSE; } } - if (!(currentEncounter->flags & ENCOUNTER_STATUS_FLAG_1) && !D_8009A63C && currentEncounter->battleStartCountdown == 0 && D_8009A670 == 0) { - suggest_player_anim_allow_backward(0x10032); + if (!(currentEncounter->flags & ENCOUNTER_FLAG_THUMBS_UP) + && !PendingPartnerAbilityResume + && currentEncounter->battleStartCountdown == 0 + && !LastBattleStartedBySpin + ) { + suggest_player_anim_allow_backward(ANIM_Mario1_ThumbsUp); } - gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_WON_WAIT; + gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_WON_FADE_IN; break; - case ENCOUNTER_SUBSTATE_POST_BATTLE_WON_WAIT: + case ENCOUNTER_SUBSTATE_POST_BATTLE_WON_FADE_IN: if (currentEncounter->fadeOutAmount == 0) { gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_WON_KILL; } else { @@ -1707,6 +1748,7 @@ void update_encounters_post_battle(void) { } break; case ENCOUNTER_SUBSTATE_POST_BATTLE_WON_KILL: + // wait for all defeat scripts to finish hasDefeatScript = FALSE; encounter = currentEncounter->curEncounter; for (i = 0; i < encounter->count; i++) { @@ -1726,8 +1768,12 @@ void update_encounters_post_battle(void) { enemy->defeatScript = NULL; } } + // kill defeated enemies if (!hasDefeatScript) { - if (!(currentEncounter->flags & ENCOUNTER_STATUS_FLAG_1) && !D_8009A63C && currentEncounter->battleStartCountdown == 1) { + if (!(currentEncounter->flags & ENCOUNTER_FLAG_THUMBS_UP) + && !PendingPartnerAbilityResume + && currentEncounter->battleStartCountdown == 1 + ) { suggest_player_anim_allow_backward(ANIM_Mario1_ThumbsUp); } encounter = currentEncounter->curEncounter; @@ -1737,7 +1783,7 @@ void update_encounters_post_battle(void) { if (enemy == NULL) { continue; } - if (enemy->flags & ENEMY_FLAG_4) { + if (enemy->flags & ENEMY_FLAG_DO_NOT_KILL) { continue; } if ((enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) && enemy != currentEncounter->curEnemy) { @@ -1751,19 +1797,24 @@ void update_encounters_post_battle(void) { kill_enemy(enemy); } - currentEncounter->unk_94 = 0; - if (!(currentEncounter->flags & ENCOUNTER_STATUS_FLAG_1) && !D_8009A63C && currentEncounter->battleStartCountdown == 1) { - currentEncounter->unk_94 = 30; + currentEncounter->substateDelay = 0; + if (!(currentEncounter->flags & ENCOUNTER_FLAG_THUMBS_UP) + && !PendingPartnerAbilityResume + && currentEncounter->battleStartCountdown == 1 + ) { + currentEncounter->substateDelay = 30; } - gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_WON_TO_NEUTRAL; + gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_WON_RESUME; } break; - case ENCOUNTER_SUBSTATE_POST_BATTLE_WON_TO_NEUTRAL: - if (!(currentEncounter->flags & ENCOUNTER_STATUS_FLAG_2) && (gGameStatusPtr->stickX[0] != 0 || gGameStatusPtr->stickY[0] != 0)) { - currentEncounter->unk_94 = 0; + case ENCOUNTER_SUBSTATE_POST_BATTLE_WON_RESUME: + if (!(currentEncounter->flags & ENCOUNTER_FLAG_CANT_SKIP_WIN_DELAY)) { + if (gGameStatusPtr->stickX[0] != 0 || gGameStatusPtr->stickY[0] != 0) { + currentEncounter->substateDelay = 0; + } } - if (currentEncounter->unk_94 != 0) { - currentEncounter->unk_94--; + if (currentEncounter->substateDelay != 0) { + currentEncounter->substateDelay--; break; } @@ -1789,13 +1840,13 @@ void update_encounters_post_battle(void) { currentEncounter->battleTriggerCooldown = 15; enable_player_input(); partner_enable_input(); - if (!D_8009A63C) { + if (!PendingPartnerAbilityResume) { suggest_player_anim_allow_backward(ANIM_Mario1_Idle); } set_screen_overlay_params_front(OVERLAY_NONE, -1.0f); - resume_all_group(EVT_GROUP_10); + resume_all_group(EVT_GROUP_FLAG_BATTLE); gEncounterState = ENCOUNTER_STATE_NEUTRAL; - D_8009A678 = 1; + EncounterStateChanged = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_NEUTRAL; break; case ENCOUNTER_SUBSTATE_POST_BATTLE_FLED_INIT: @@ -1808,7 +1859,6 @@ void update_encounters_post_battle(void) { if ((enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) && enemy != currentEncounter->curEnemy) { continue; } - if (enemy->flags & ENEMY_FLAG_DISABLE_AI) { continue; } @@ -1817,17 +1867,17 @@ void update_encounters_post_battle(void) { script = start_script(enemy->defeatBytecode, EVT_PRIORITY_A, 0); enemy->defeatScript = script; enemy->defeatScriptID = script->id; - enemy->aiFlags |= 1; + enemy->aiFlags |= AI_FLAG_1; script->owner1.enemy = enemy; script->owner2.npcID = enemy->npcID; script->groupFlags = enemy->scriptGroup; } } - gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_FLED_WAIT; + gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_FLED_FADE_IN; break; - case ENCOUNTER_SUBSTATE_POST_BATTLE_FLED_WAIT: + case ENCOUNTER_SUBSTATE_POST_BATTLE_FLED_FADE_IN: if (currentEncounter->fadeOutAmount == 0) { - gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_102; + gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_FLED_RESUME; } else { currentEncounter->fadeOutAccel += 4; currentEncounter->fadeOutAmount -= currentEncounter->fadeOutAccel; @@ -1836,7 +1886,7 @@ void update_encounters_post_battle(void) { } } break; - case ENCOUNTER_SUBSTATE_POST_BATTLE_102: + case ENCOUNTER_SUBSTATE_POST_BATTLE_FLED_RESUME: encounter = currentEncounter->curEncounter; hasDefeatScript = FALSE; for (i = 0; i < encounter->count; i++) { @@ -1874,7 +1924,7 @@ void update_encounters_post_battle(void) { enemy = currentEncounter->curEnemy; encounter = currentEncounter->curEncounter; - if (!(enemy->flags & ENEMY_FLAG_40000)) { + if (!(enemy->flags & ENEMY_FLAG_NO_DELAY_AFTER_FLEE)) { enemy->aiSuspendTime = 45; playerStatus->blinkTimer = 45; for (j = 0; j < encounter->count; j++) { @@ -1894,7 +1944,7 @@ void update_encounters_post_battle(void) { } enemy = currentEncounter->curEnemy; - if (!(currentEncounter->flags & ENCOUNTER_STATUS_FLAG_4)) { + if (!(currentEncounter->flags & ENCOUNTER_FLAG_SKIP_FLEE_DROPS)) { script = start_script(&EVS_FleeBattleDrops, EVT_PRIORITY_A, 0); enemy->defeatScript = script; enemy->defeatScriptID = script->id; @@ -1908,27 +1958,27 @@ void update_encounters_post_battle(void) { enable_player_input(); partner_enable_input(); set_screen_overlay_params_front(OVERLAY_NONE, -1.0f); - if (!D_8009A63C) { - currentEncounter->unk_94 = 15; + if (!PendingPartnerAbilityResume) { + currentEncounter->substateDelay = 15; } else { - currentEncounter->unk_94 = 0; + currentEncounter->substateDelay = 0; } - gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_103; + gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_FLED_DELAY; } break; - case ENCOUNTER_SUBSTATE_POST_BATTLE_103: - if (currentEncounter->unk_94 != 0) { - currentEncounter->unk_94--; + case ENCOUNTER_SUBSTATE_POST_BATTLE_FLED_DELAY: + if (currentEncounter->substateDelay != 0) { + currentEncounter->substateDelay--; if (gGameStatusPtr->curButtons[0] == 0 && gGameStatusPtr->stickX[0] == 0 && gGameStatusPtr->stickY[0] == 0) { break; } } - if (!D_8009A63C && playerStatus->anim == ANIM_MarioB3_Hustled) { + if (!PendingPartnerAbilityResume && playerStatus->anim == ANIM_MarioB3_Hustled) { suggest_player_anim_allow_backward(ANIM_Mario1_Idle); } - resume_all_group(EVT_GROUP_10); + resume_all_group(EVT_GROUP_FLAG_BATTLE); gEncounterState = ENCOUNTER_STATE_NEUTRAL; - D_8009A678 = 1; + EncounterStateChanged = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_NEUTRAL; break; case ENCOUNTER_SUBSTATE_POST_BATTLE_LOST_INIT: @@ -1956,11 +2006,11 @@ void update_encounters_post_battle(void) { script->groupFlags = enemy->scriptGroup; } } - gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_LOST_WAIT; + gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_LOST_FADE_IN; break; - case ENCOUNTER_SUBSTATE_POST_BATTLE_LOST_WAIT: + case ENCOUNTER_SUBSTATE_POST_BATTLE_LOST_FADE_IN: if (currentEncounter->fadeOutAmount == 0) { - gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_202; + gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_LOST_RESUME; } else { currentEncounter->fadeOutAccel += 4; currentEncounter->fadeOutAmount -= currentEncounter->fadeOutAccel; @@ -1969,7 +2019,7 @@ void update_encounters_post_battle(void) { } } break; - case ENCOUNTER_SUBSTATE_POST_BATTLE_202: + case ENCOUNTER_SUBSTATE_POST_BATTLE_LOST_RESUME: hasDefeatScript = FALSE; encounter = currentEncounter->curEncounter; for (i = 0; i < encounter->count; i++) { @@ -2007,23 +2057,24 @@ void update_encounters_post_battle(void) { enable_player_input(); partner_enable_input(); set_screen_overlay_params_front(OVERLAY_NONE, -1.0f); - currentEncounter->unk_94 = 15; - gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_LOST_TO_NEUTRAL; + currentEncounter->substateDelay = 15; + gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_LOST_DELAY; } break; - case ENCOUNTER_SUBSTATE_POST_BATTLE_LOST_TO_NEUTRAL: - if (currentEncounter->unk_94 != 0) { - currentEncounter->unk_94--; + case ENCOUNTER_SUBSTATE_POST_BATTLE_LOST_DELAY: + if (currentEncounter->substateDelay != 0) { + currentEncounter->substateDelay--; if (gGameStatusPtr->curButtons[0] == 0 && gGameStatusPtr->stickX[0] == 0 && gGameStatusPtr->stickY[0] == 0) { break; } } - resume_all_group(EVT_GROUP_10); + resume_all_group(EVT_GROUP_FLAG_BATTLE); gEncounterState = ENCOUNTER_STATE_NEUTRAL; - D_8009A678 = 1; + EncounterStateChanged = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_NEUTRAL; break; - case ENCOUNTER_SUBSTATE_POST_BATTLE_300: + case ENCOUNTER_SUBSTATE_POST_BATTLE_SKIP: + // resume all ai scripts for (i = 0; i < currentEncounter->numEncounters; i++) { encounter = currentEncounter->encounterList[i]; if (encounter == NULL) { @@ -2045,9 +2096,9 @@ void update_encounters_post_battle(void) { enable_player_input(); partner_enable_input(); set_screen_overlay_params_front(OVERLAY_NONE, -1.0f); - resume_all_group(EVT_GROUP_10); + resume_all_group(EVT_GROUP_FLAG_BATTLE); gEncounterState = ENCOUNTER_STATE_NEUTRAL; - D_8009A678 = 1; + EncounterStateChanged = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_NEUTRAL; break; case ENCOUNTER_SUBSTATE_POST_BATTLE_ENEMY_FLED_INIT: @@ -2074,11 +2125,11 @@ void update_encounters_post_battle(void) { script->groupFlags = enemy->scriptGroup; } } - gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_ENEMY_FLED_WAIT; + gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_ENEMY_FLED_FADE_IN; break; - case ENCOUNTER_SUBSTATE_POST_BATTLE_ENEMY_FLED_WAIT: + case ENCOUNTER_SUBSTATE_POST_BATTLE_ENEMY_FLED_FADE_IN: if (currentEncounter->fadeOutAmount == 0) { - gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_ENEMY_FLED_TO_NEUTRAL; + gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_ENEMY_FLED_RESUME; } else { currentEncounter->fadeOutAccel += 4; currentEncounter->fadeOutAmount -= currentEncounter->fadeOutAccel; @@ -2087,7 +2138,7 @@ void update_encounters_post_battle(void) { } } break; - case ENCOUNTER_SUBSTATE_POST_BATTLE_ENEMY_FLED_TO_NEUTRAL: + case ENCOUNTER_SUBSTATE_POST_BATTLE_ENEMY_FLED_RESUME: hasDefeatScript = FALSE; encounter = currentEncounter->curEncounter; for (i = 0; i < encounter->count; i++) { @@ -2124,7 +2175,7 @@ void update_encounters_post_battle(void) { } enemy = currentEncounter->curEnemy; - if (!(enemy->flags & ENEMY_FLAG_4)) { + if (!(enemy->flags & ENEMY_FLAG_DO_NOT_KILL)) { encounter = currentEncounter->curEncounter; enemy->aiSuspendTime = 45; playerStatus->blinkTimer = 45; @@ -2148,9 +2199,9 @@ void update_encounters_post_battle(void) { enable_player_input(); partner_enable_input(); set_screen_overlay_params_front(OVERLAY_NONE, -1.0f); - resume_all_group(EVT_GROUP_10); + resume_all_group(EVT_GROUP_FLAG_BATTLE); gEncounterState = ENCOUNTER_STATE_NEUTRAL; - D_8009A678 = 1; + EncounterStateChanged = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_NEUTRAL; } break; @@ -2223,7 +2274,7 @@ void update_encounters_conversation(void) { } break; case ENCOUNTER_SUBSTATE_CONVERSATION_END: - resume_all_group(EVT_GROUP_01); + resume_all_group(EVT_GROUP_FLAG_INTERACT); currentEnemy = encounter->curEnemy; if (currentEnemy != NULL && currentEnemy->aiScript != NULL) { @@ -2239,9 +2290,9 @@ void update_encounters_conversation(void) { func_800EF3D4(0); encounter->hitType = 0; - resume_all_group(EVT_GROUP_10); + resume_all_group(EVT_GROUP_FLAG_BATTLE); gEncounterState = ENCOUNTER_STATE_NEUTRAL; - D_8009A678 = 1; + EncounterStateChanged = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_NEUTRAL; break; } @@ -2250,33 +2301,33 @@ void update_encounters_conversation(void) { void draw_encounters_conversation(void) { } -s32 check_conversation_trigger(void) { +b32 check_conversation_trigger(void) { PlayerStatus* playerStatus = &gPlayerStatus; Camera* camera = &gCameras[gCurrentCameraID]; EncounterStatus* encounterStatus = &gCurrentEncounter; f32 npcX, npcY, npcZ; f32 angle; f32 deltaX, deltaZ; - Encounter* encounter; + Encounter* resultEncounter; f32 playerX, playerY, playerZ; - f32 playerColliderHeight; - f32 playerColliderRadius; + f32 playerHeight; + f32 playerRadius; f32 length; - f32 npcCollisionHeight; - f32 npcCollisionRadius; - Encounter* encounterTemp; + f32 npcHeight; + f32 npcRadius; + Encounter* encounter; + Npc* resultNpc; Npc* npc; - Npc* encounterNpc; + Enemy* resultEnemy; Enemy* enemy; - Enemy* encounterEnemy; f32 minLength; - f32 xTemp, yTemp, zTemp; s32 i, j; + f32 yaw; playerStatus->encounteredNPC = NULL; playerStatus->flags &= ~PS_FLAG_HAS_CONVERSATION_NPC; - playerColliderHeight = playerStatus->colliderHeight; - playerColliderRadius = playerStatus->colliderDiameter / 2; + playerHeight = playerStatus->colliderHeight; + playerRadius = playerStatus->colliderDiameter / 2; playerX = playerStatus->pos.x; playerY = playerStatus->pos.y; playerZ = playerStatus->pos.z; @@ -2285,51 +2336,52 @@ s32 check_conversation_trigger(void) { return FALSE; } - encounter = NULL; - npc = NULL; - enemy = NULL; + resultEncounter = NULL; + resultNpc = NULL; + resultEnemy = NULL; minLength = 65535.0f; for (i = 0; i < encounterStatus->numEncounters; i++) { - encounterTemp = encounterStatus->encounterList[i]; + encounter = encounterStatus->encounterList[i]; - if (encounterTemp == NULL) { + if (encounter == NULL) { continue; } - for (j = 0; j < encounterTemp->count; j++) { - encounterEnemy = encounterTemp->enemy[j]; + for (j = 0; j < encounter->count; j++) { + enemy = encounter->enemy[j]; - if (encounterEnemy == NULL) { + if (enemy == NULL) { continue; } - if (encounterEnemy->flags & (ENEMY_FLAG_SUSPENDED | ENEMY_FLAG_DISABLE_AI)) { + if (enemy->flags & (ENEMY_FLAG_SUSPENDED | ENEMY_FLAG_DISABLE_AI)) { continue; } - if (!(encounterEnemy->flags & ENEMY_FLAG_PASSIVE)) { + if (!(enemy->flags & ENEMY_FLAG_PASSIVE)) { continue; } - if ((encounterEnemy->flags & ENEMY_FLAG_CANT_INTERACT) || encounterEnemy->interactBytecode == NULL) { + if ((enemy->flags & ENEMY_FLAG_CANT_INTERACT) || enemy->interactBytecode == NULL) { continue; } - encounterNpc = get_npc_unsafe(encounterEnemy->npcID); + npc = get_npc_unsafe(enemy->npcID); - npcX = encounterNpc->pos.x; - npcY = encounterNpc->pos.y; - npcZ = encounterNpc->pos.z; + npcX = npc->pos.x; + npcY = npc->pos.y; + npcZ = npc->pos.z; deltaX = npcX - playerX; deltaZ = npcZ - playerZ; - npcCollisionHeight = encounterNpc->collisionHeight; - npcCollisionRadius = encounterNpc->collisionDiameter; + npcHeight = npc->collisionHeight; + npcRadius = npc->collisionDiameter; length = sqrtf(SQ(deltaX) + SQ(deltaZ)); - if ((playerColliderRadius + npcCollisionRadius <= length) || - (npcY + npcCollisionHeight < playerY) || - (playerY + playerColliderHeight < npcY)) { + // check cylinder-cylinder overlap + if ((playerRadius + npcRadius <= length) || + (npcY + npcHeight < playerY) || + (playerY + playerHeight < npcY)) { continue; } @@ -2345,41 +2397,42 @@ s32 check_conversation_trigger(void) { } } - if (fabsf(get_clamped_angle_diff(angle, atan2(playerX, playerZ, npcX, npcZ))) > 90.0f) { + yaw = atan2(playerX, playerZ, npcX, npcZ); + if (fabsf(get_clamped_angle_diff(angle, yaw)) > 90.0f) { continue; } - if (!(encounterEnemy->flags & ENEMY_FLAG_10000) && encounterNpc->flags & NPC_FLAG_20000000) { - xTemp = npcX; - yTemp = npcY; - zTemp = npcZ; + // only allow interact if line of sight exists + // @bug? flag combination does not make sense + if (!(enemy->flags & ENEMY_FLAG_RAYCAST_TO_INTERACT) && npc->flags & NPC_FLAG_RAYCAST_TO_INTERACT) { + f32 x = npcX; + f32 y = npcY; + f32 z = npcZ; + yaw = atan2(npcX, npcZ, playerX, playerZ); - if (npc_test_move_taller_with_slipping(0, &xTemp, &yTemp, &zTemp, length, - atan2(npcX, npcZ, playerX, playerZ), - npcCollisionHeight, - 2.0f * npcCollisionRadius)) { + if (npc_test_move_taller_with_slipping(0, &x, &y, &z, length, yaw, npcHeight, 2.0f * npcRadius)) { continue; } } if (length < minLength) { minLength = length; - encounter = encounterTemp; - npc = encounterNpc; - enemy = encounterEnemy; + resultEncounter = encounter; + resultNpc = npc; + resultEnemy = enemy; } } } - if (!(playerStatus->animFlags & PA_FLAG_8BIT_MARIO) && npc != NULL && !is_picking_up_item()) { - playerStatus->encounteredNPC = npc; + if (!(playerStatus->animFlags & PA_FLAG_8BIT_MARIO) && resultNpc != NULL && !is_picking_up_item()) { + playerStatus->encounteredNPC = resultNpc; playerStatus->flags |= PS_FLAG_HAS_CONVERSATION_NPC; if (playerStatus->pressedButtons & BUTTON_A) { close_status_bar(); gCurrentEncounter.hitType = ENCOUNTER_TRIGGER_CONVERSATION; - enemy->encountered = ENCOUNTER_TRIGGER_CONVERSATION; - encounterStatus->curEncounter = encounter; - encounterStatus->curEnemy = enemy; + resultEnemy->encountered = ENCOUNTER_TRIGGER_CONVERSATION; + encounterStatus->curEncounter = resultEncounter; + encounterStatus->curEnemy = resultEnemy; encounterStatus->firstStrikeType = FIRST_STRIKE_PLAYER; return TRUE; } @@ -2584,18 +2637,18 @@ void create_encounters(void) { if (enemy->flags & ENEMY_FLAG_NO_SHADOW_RAYCAST) { newNpc->flags |= NPC_FLAG_NO_SHADOW_RAYCAST; } - if (enemy->flags & ENEMY_FLAG_8000) { - newNpc->flags |= NPC_FLAG_10000000; + if (enemy->flags & ENEMY_FLAG_USE_INSPECT_ICON) { + newNpc->flags |= NPC_FLAG_USE_INSPECT_ICON; } - if (enemy->flags & ENEMY_FLAG_10000) { - newNpc->flags |= NPC_FLAG_20000000; + if (enemy->flags & ENEMY_FLAG_RAYCAST_TO_INTERACT) { + newNpc->flags |= NPC_FLAG_RAYCAST_TO_INTERACT; } if (enemy->flags & ENEMY_FLAG_DONT_UPDATE_SHADOW_Y) { newNpc->flags |= NPC_FLAG_DONT_UPDATE_SHADOW_Y; } - enemy->scriptGroup = EVT_GROUP_0B; + enemy->scriptGroup = EVT_GROUP_HOSTILE_NPC; if (enemy->flags & ENEMY_FLAG_PASSIVE) { - enemy->scriptGroup = EVT_GROUP_0A; + enemy->scriptGroup = EVT_GROUP_PASSIVE_NPC; } if (npcSettings->otherAI != NULL) { script = start_script(npcSettings->otherAI, EVT_PRIORITY_A, 0); @@ -2733,9 +2786,9 @@ void create_encounters(void) { } } } - resume_all_group(EVT_GROUP_10); + resume_all_group(EVT_GROUP_FLAG_BATTLE); gEncounterState = ENCOUNTER_STATE_NEUTRAL; - D_8009A678 = 1; + EncounterStateChanged = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_NEUTRAL; break; } diff --git a/src/encounter_api.c b/src/encounter_api.c index 4970ae73ed..f737f4f1e0 100644 --- a/src/encounter_api.c +++ b/src/encounter_api.c @@ -199,7 +199,7 @@ void start_battle(Evt* script, s32 songID) { Encounter* encounter; s32 i; - resume_all_group(EVT_GROUP_01); + resume_all_group(EVT_GROUP_FLAG_INTERACT); currentEncounter->hitType = ENCOUNTER_TRIGGER_NONE; enemy->encountered = TRUE; @@ -243,10 +243,10 @@ void start_battle(Evt* script, s32 songID) { } currentEncounter->fadeOutAmount = 0; - currentEncounter->unk_94 = 0; + currentEncounter->substateDelay = 0; currentEncounter->scriptedBattle = TRUE; gEncounterState = ENCOUNTER_STATE_PRE_BATTLE; - D_8009A678 = 1; + EncounterStateChanged = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_PRE_BATTLE_INIT; } @@ -270,7 +270,7 @@ API_CALLABLE(StartBossBattle) { Encounter* encounter; s32 i; - resume_all_group(EVT_GROUP_01); + resume_all_group(EVT_GROUP_FLAG_INTERACT); currentEncounter->hitType = ENCOUNTER_TRIGGER_NONE; enemy->encountered = TRUE; @@ -312,10 +312,10 @@ API_CALLABLE(StartBossBattle) { } currentEncounter->fadeOutAmount = 0; - currentEncounter->unk_94 = 0; + currentEncounter->substateDelay = 0; currentEncounter->scriptedBattle = TRUE; gEncounterState = ENCOUNTER_STATE_PRE_BATTLE; - D_8009A678 = 1; + EncounterStateChanged = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_PRE_BATTLE_INIT; return ApiStatus_DONE1; @@ -362,9 +362,9 @@ API_CALLABLE(BindNpcAI) { } if (enemy->flags & ENEMY_FLAG_PASSIVE) { - groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + groupFlags = EVT_GROUP_PASSIVE_NPC; } else { - groupFlags = EVT_GROUP_08 | EVT_GROUP_02 | EVT_GROUP_01; + groupFlags = EVT_GROUP_HOSTILE_NPC; } if (enemy->aiScript != NULL) { @@ -415,9 +415,9 @@ API_CALLABLE(RestartNpcAI) { enemy = get_enemy(npcID); if (enemy->flags & ENEMY_FLAG_PASSIVE) { - groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + groupFlags = EVT_GROUP_PASSIVE_NPC; } else { - groupFlags = EVT_GROUP_08 | EVT_GROUP_02 | EVT_GROUP_01; + groupFlags = EVT_GROUP_HOSTILE_NPC; } if (enemy->aiScript != NULL) { @@ -536,9 +536,9 @@ API_CALLABLE(RestartNpcAux) { enemy = get_enemy(npcID); if (enemy->flags & ENEMY_FLAG_PASSIVE) { - groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + groupFlags = EVT_GROUP_PASSIVE_NPC; } else { - groupFlags = EVT_GROUP_08 | EVT_GROUP_02 | EVT_GROUP_01; + groupFlags = EVT_GROUP_HOSTILE_NPC; } if (enemy->auxScript != NULL) { diff --git a/src/entity/HeartBlock.c b/src/entity/HeartBlock.c index 42d6effded..aabb61d816 100644 --- a/src/entity/HeartBlock.c +++ b/src/entity/HeartBlock.c @@ -285,7 +285,7 @@ void entity_HeartBlockContent__anim_heal(Entity* entity, s32 arg1) { case 5: playerStatus->animFlags &= ~PA_FLAG_RAISED_ARMS; enable_player_input(); - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); gOverrideFlags &= ~GLOBAL_OVERRIDES_40; exec_entity_commandlist(entity); break; @@ -380,7 +380,7 @@ void entity_HeartBlock_show_tutorial_message(Entity* entity) { void entity_HeartBlock_wait_for_close_tutorial(Entity* entity) { if (HeartBlockPrinterClosed) { exec_entity_commandlist(entity); - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); gOverrideFlags &= ~GLOBAL_OVERRIDES_40; enable_player_input(); } diff --git a/src/entity/HiddenPanel.c b/src/entity/HiddenPanel.c index 1f234451fd..c5d80f3b1d 100644 --- a/src/entity/HiddenPanel.c +++ b/src/entity/HiddenPanel.c @@ -238,7 +238,7 @@ void entity_HiddenPanel_flip_over(Entity* entity) { data->state = 0; exec_entity_commandlist(entity); if (data->unk_02) { - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); gPlayerStatusPtr->animFlags &= ~PA_FLAG_OPENED_HIDDEN_PANEL; } entity->flags &= ~ENTITY_FLAG_DISABLE_COLLISION; diff --git a/src/entity/SaveBlock.c b/src/entity/SaveBlock.c index 364ca3e831..ed9b0bdaee 100644 --- a/src/entity/SaveBlock.c +++ b/src/entity/SaveBlock.c @@ -91,7 +91,7 @@ void entity_SaveBlock_pause_game(void) { } void entity_SaveBlock_resume_game(void) { - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); enable_player_input(); } diff --git a/src/entity/sbk_omo/StarBoxLauncher.c b/src/entity/sbk_omo/StarBoxLauncher.c index 617ac956b5..479c0117fd 100644 --- a/src/entity/sbk_omo/StarBoxLauncher.c +++ b/src/entity/sbk_omo/StarBoxLauncher.c @@ -73,7 +73,7 @@ void entity_StarBoxLauncher_check_launch(Entity* entity) { z = playerStatus->pos.z; hitDepth = 10.0f; - add_vec2D_polar(&x, &z, 10.0f, func_800E5348()); + add_vec2D_polar(&x, &z, 10.0f, player_get_side_angle()); 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_LAUNCHER; diff --git a/src/entity/sbk_omo/Tweester.c b/src/entity/sbk_omo/Tweester.c index d426d3bdf9..d9f5c93aa0 100644 --- a/src/entity/sbk_omo/Tweester.c +++ b/src/entity/sbk_omo/Tweester.c @@ -207,7 +207,7 @@ void entity_Tweester_idle(Entity* entity) { f32 delta; f32 targetRotationSpeed; - if (get_time_freeze_mode() == TIME_FREEZE_NORMAL && + if (get_time_freeze_mode() == TIME_FREEZE_NONE && !is_picking_up_item() && !(playerStatus->flags & PS_FLAG_PAUSED) && (playerData->curPartner != PARTNER_GOOMBARIO || diff --git a/src/evt/cam_api.c b/src/evt/cam_api.c index 219338082c..6d9794719b 100644 --- a/src/evt/cam_api.c +++ b/src/evt/cam_api.c @@ -2,14 +2,14 @@ #include "camera.h" EvtScript ShakeCam1 = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(ShakeCam, LVar0, LVar1, LVar2, Float(1.0)) Return End }; EvtScript ShakeCamX = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(ShakeCam, LVar0, LVar1, LVar2, LVar3) Return End diff --git a/src/evt/evt.c b/src/evt/evt.c index 949afc5772..25447ae6ef 100644 --- a/src/evt/evt.c +++ b/src/evt/evt.c @@ -920,11 +920,11 @@ ApiStatus evt_handle_call(Evt* script) { ApiStatus evt_handle_exec1(Evt* script) { Bytecode* args = script->ptrReadPos; + EvtScript* newSource = (EvtScript*)evt_get_variable(script, *args++); Evt* newScript; s32 i; - newScript = start_script_in_group((EvtScript*)evt_get_variable(script, *args++), script->priority, 0, - script->groupFlags); + newScript = start_script_in_group(newSource, script->priority, 0, script->groupFlags); newScript->owner1 = script->owner1; newScript->owner2 = script->owner2; @@ -947,7 +947,7 @@ ApiStatus evt_handle_exec1(Evt* script) { ApiStatus evt_handle_exec1_get_id(Evt* script) { Bytecode* args = script->ptrReadPos; EvtScript* newSource = (EvtScript*)evt_get_variable(script, *args++); - Bytecode arg2 = *args++; + Bytecode outVar = *args++; Evt* newScript; s32 i; @@ -967,15 +967,16 @@ ApiStatus evt_handle_exec1_get_id(Evt* script) { newScript->array = script->array; newScript->flagArray = script->flagArray; - evt_set_variable(script, arg2, newScript->id); + evt_set_variable(script, outVar, newScript->id); return ApiStatus_DONE2; } ApiStatus evt_handle_exec_wait(Evt* script) { Bytecode* args = script->ptrReadPos; + EvtScript* newSource = (EvtScript*)evt_get_variable(script, *args++); - start_child_script(script, (EvtScript*) evt_get_variable(script, *args++), 0); + start_child_script(script, newSource, 0); script->curOpcode = EVT_OP_INTERNAL_FETCH; return ApiStatus_FINISH; } diff --git a/src/evt/script_list.c b/src/evt/script_list.c index 1130be3c1a..e73813434a 100644 --- a/src/evt/script_list.c +++ b/src/evt/script_list.c @@ -218,23 +218,21 @@ void init_script_list(void) { init_model_animators(); } +// enforces current gTimeFreezeMode on newly created script void suspend_frozen_scripts(Evt* script) { - s32 groupFlags; - - switch (timeFreezeMode) { + switch (gTimeFreezeMode) { default: - case 0: - case 4: + case TIME_FREEZE_NONE: + case TIME_FREEZE_EXIT: + return; + case TIME_FREEZE_PARTIAL: + suspend_all_group(EVT_GROUP_FLAG_INTERACT); + return; + case TIME_FREEZE_FULL: + case TIME_FREEZE_POPUP_MENU: + suspend_all_group(EVT_GROUP_FLAG_MENUS); return; - case 1: - groupFlags = EVT_GROUP_01; - break; - case 2: - case 3: - groupFlags = EVT_GROUP_02; - break; } - suspend_all_group(groupFlags); } Evt* start_script(EvtScript* source, s32 priority, s32 flags) { @@ -271,7 +269,7 @@ Evt* start_script(EvtScript* source, s32 priority, s32 flags) { newScript->owner2.npcID = -1; newScript->loopDepth = -1; newScript->switchDepth = -1; - newScript->groupFlags = ~EVT_GROUP_10; + newScript->groupFlags = EVT_GROUP_NOT_BATTLE; newScript->ptrSavedPos = NULL; newScript->frameCounter = 0.0f; newScript->unk_158 = 0; @@ -593,7 +591,7 @@ void update_scripts(void) { if (script != NULL && script->id == gScriptIdList[i] && script->stateFlags != 0 && - !(script->stateFlags & (EVT_FLAG_SUSPENDED | EVT_FLAG_BLOCKED_BY_CHILD | EVT_FLAG_SUSPENDED_IN_GROUP))) + !(script->stateFlags & (EVT_FLAG_SUSPENDED | EVT_FLAG_BLOCKED_BY_CHILD | EVT_FLAG_PAUSED))) { s32 stop = FALSE; s32 status; @@ -801,7 +799,7 @@ void suspend_group_script(Evt* script, s32 groupFlags) { } if ((script->groupFlags & groupFlags) != 0) { - script->stateFlags |= EVT_FLAG_SUSPENDED_IN_GROUP; + script->stateFlags |= EVT_FLAG_PAUSED; } } @@ -822,7 +820,7 @@ void resume_group_script(Evt* script, s32 groupFlags) { } if ((script->groupFlags & groupFlags) != 0) { - script->stateFlags &= ~EVT_FLAG_SUSPENDED_IN_GROUP; + script->stateFlags &= ~EVT_FLAG_PAUSED; } } @@ -833,7 +831,7 @@ s32 suspend_all_script(s32 id) { Evt* scriptContextPtr = (*gCurrentScriptListPtr)[i]; if (scriptContextPtr != NULL && scriptContextPtr->id == id) { - suspend_group_script(scriptContextPtr, 0xEF); + suspend_group_script(scriptContextPtr, EVT_GROUP_NOT_BATTLE); } } } @@ -845,7 +843,7 @@ s32 resume_all_script(s32 id) { for (i = 0; i < MAX_SCRIPTS; i++) { scriptContextPtr = (*gCurrentScriptListPtr)[i]; if (scriptContextPtr != NULL && scriptContextPtr->id == id) { - resume_group_script(scriptContextPtr, 0xEF); + resume_group_script(scriptContextPtr, EVT_GROUP_NOT_BATTLE); } } } diff --git a/src/inspect_icon.c b/src/inspect_icon.c index 9c4842e5d5..0a70c7a1b3 100644 --- a/src/inspect_icon.c +++ b/src/inspect_icon.c @@ -117,7 +117,7 @@ s32 should_continue_inspect(void) { } else if (!(playerStatus->flags & PS_FLAG_INPUT_DISABLED) && (playerStatus->flags & PS_FLAG_HAS_CONVERSATION_NPC) && (npc != NULL) - && (npc->flags & NPC_FLAG_10000000) + && (npc->flags & NPC_FLAG_USE_INSPECT_ICON) ) { curInteraction = npc->npcID | COLLISION_WITH_NPC_BIT; if (playerStatus->interactingWithID == curInteraction) { diff --git a/src/item_entity.c b/src/item_entity.c index 6027f0a383..a7f4bb2471 100644 --- a/src/item_entity.c +++ b/src/item_entity.c @@ -1378,7 +1378,7 @@ b32 test_item_player_collision(ItemEntity* item) { } hammerHitboxHeight = tmpYTopThreshold; - if (get_time_freeze_mode() != TIME_FREEZE_NORMAL) { + if (get_time_freeze_mode() != TIME_FREEZE_NONE) { return FALSE; } @@ -2036,7 +2036,7 @@ void update_item_entity_collectable(ItemEntity* item) { D_801565A8 = FALSE; #endif remove_item_entity_by_reference(item); - resume_all_group(EVT_GROUP_02); + resume_all_group(EVT_GROUP_FLAG_MENUS); } } @@ -2364,7 +2364,7 @@ block_47: // TODO required to match } case ITEM_PICKUP_STATE_DONE: if (!(item->flags & ITEM_ENTITY_FLAG_2000000)) { - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); enable_player_input(); partner_enable_input(); gOverrideFlags &= ~GLOBAL_OVERRIDES_40; @@ -2470,7 +2470,7 @@ block_47: // TODO required to match break; case ITEM_PICKUP_STATE_THROW_AWAY_DONE: suggest_player_anim_always_forward(ANIM_Mario1_Idle); - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); enable_player_input(); partner_enable_input(); gOverrideFlags &= ~GLOBAL_OVERRIDES_40; diff --git a/src/main_loop.c b/src/main_loop.c index f26cba09a7..1231722247 100644 --- a/src/main_loop.c +++ b/src/main_loop.c @@ -7,7 +7,7 @@ #include "game_modes.h" s32 gOverrideFlags; -s32 timeFreezeMode; +s32 gTimeFreezeMode; u16** nuGfxCfb; BSS s16 SoftResetDelay; @@ -273,7 +273,7 @@ void load_engine_data(void) { gGameStatusPtr->multiplayerEnabled = FALSE; gGameStatusPtr->altViewportOffset.x = -8; gGameStatusPtr->altViewportOffset.y = 4; - timeFreezeMode = 0; + gTimeFreezeMode = TIME_FREEZE_NONE; gGameStatusPtr->debugQuizmo = gGameStatusPtr->unk_13C = 0; gGameStepDelayCount = 5; gGameStatusPtr->saveCount = 0; @@ -321,45 +321,45 @@ void load_engine_data(void) { } /// Time freeze modes: -/// 0: normal +/// 0: none /// 1: NPCs move, can't be interacted with /// 2: NPCs don't move, no partner ability, can't interact, can't use exits /// 3: NPCs don't more or animate /// 4: NPCs can move, animations don't update, can use exits void set_time_freeze_mode(s32 mode) { switch (mode) { - case TIME_FREEZE_NORMAL: - timeFreezeMode = mode; + case TIME_FREEZE_NONE: + gTimeFreezeMode = mode; gOverrideFlags &= ~(GLOBAL_OVERRIDES_800 | GLOBAL_OVERRIDES_400 | GLOBAL_OVERRIDES_200 | GLOBAL_OVERRIDES_DISABLE_BATTLES); - resume_all_group(EVT_GROUP_01 | EVT_GROUP_02); + resume_all_group(EVT_GROUP_FLAG_INTERACT | EVT_GROUP_FLAG_MENUS); break; case TIME_FREEZE_PARTIAL: - timeFreezeMode = mode; + gTimeFreezeMode = mode; gOverrideFlags &= ~(GLOBAL_OVERRIDES_800 | GLOBAL_OVERRIDES_400 | GLOBAL_OVERRIDES_200); gOverrideFlags |= GLOBAL_OVERRIDES_DISABLE_BATTLES; - suspend_all_group(EVT_GROUP_01); + suspend_all_group(EVT_GROUP_FLAG_INTERACT); break; case TIME_FREEZE_FULL: - timeFreezeMode = mode; + gTimeFreezeMode = mode; gOverrideFlags &= ~(GLOBAL_OVERRIDES_400 | GLOBAL_OVERRIDES_800); gOverrideFlags |= GLOBAL_OVERRIDES_200 | GLOBAL_OVERRIDES_DISABLE_BATTLES; - suspend_all_group(EVT_GROUP_02); + suspend_all_group(EVT_GROUP_FLAG_MENUS); break; case TIME_FREEZE_POPUP_MENU: - timeFreezeMode = mode; + gTimeFreezeMode = mode; gOverrideFlags &= ~GLOBAL_OVERRIDES_800; gOverrideFlags |= GLOBAL_OVERRIDES_400 | GLOBAL_OVERRIDES_200 | GLOBAL_OVERRIDES_DISABLE_BATTLES; - suspend_all_group(EVT_GROUP_02); + suspend_all_group(EVT_GROUP_FLAG_MENUS); break; case TIME_FREEZE_EXIT: - timeFreezeMode = mode; + gTimeFreezeMode = mode; gOverrideFlags |= GLOBAL_OVERRIDES_800 | GLOBAL_OVERRIDES_400 | GLOBAL_OVERRIDES_200 | GLOBAL_OVERRIDES_DISABLE_BATTLES; break; } } s32 get_time_freeze_mode(void) { - return timeFreezeMode; + return gTimeFreezeMode; } #if VERSION_IQUE diff --git a/src/npc.c b/src/npc.c index 73bec256d8..5a71e31016 100644 --- a/src/npc.c +++ b/src/npc.c @@ -817,7 +817,7 @@ f32 npc_get_render_yaw(Npc* npc) { } } - if (npc->flags & NPC_FLAG_200000) { + if (npc->flags & NPC_FLAG_FLIP_INSTANTLY) { npc->turnAroundYawAdjustment = 0; } @@ -2446,7 +2446,7 @@ void init_encounter_status(void) { currentEncounter->encounterList[i] = 0; } - currentEncounter->flags = ENCOUNTER_STATUS_FLAG_0; + currentEncounter->flags = ENCOUNTER_FLAG_NONE; currentEncounter->numEncounters = 0; currentEncounter->firstStrikeType = FIRST_STRIKE_NONE; currentEncounter->hitType = 0; @@ -2602,7 +2602,7 @@ void make_npcs(s32 flags, s32 mapID, s32* npcGroupList) { if (npcGroupList != NULL) { gEncounterState = ENCOUNTER_STATE_CREATE; - D_8009A678 = 1; + EncounterStateChanged = TRUE; gEncounterSubState = ENCOUNTER_SUBSTATE_CREATE_INIT; } } @@ -2671,7 +2671,7 @@ void kill_enemy(Enemy* enemy) { } do { - if (!(enemy->flags & ENEMY_FLAG_4) + if (!(enemy->flags & ENEMY_FLAG_DO_NOT_KILL) && (!(enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) || (enemy == encounterStatus->curEnemy)) && !(enemy->flags & ENEMY_FLAG_PASSIVE) ) { diff --git a/src/npc_collision.c b/src/npc_collision.c index 79388645ac..a6c338984a 100644 --- a/src/npc_collision.c +++ b/src/npc_collision.c @@ -7,7 +7,7 @@ s32 NpcHitQueryAheadY; s32 NpcHitQueryBehindLeftY; s32 NpcHitQueryColliderID; -PlayerStatus* gPlayerStatusPtr = &gPlayerStatus; // maybe wPlayerStatus +PlayerStatus* gPlayerStatusPtr = &gPlayerStatus; // not used outside this file HitID npc_raycast_down(s32 ignoreFlags, f32* startX, f32* startY, f32* startZ, f32* hitDepth) { @@ -275,7 +275,7 @@ b32 npc_raycast_down_sides(s32 ignoreFlags, f32* posX, f32* posY, f32* posZ, f32 return FALSE; } -s32 npc_raycast_up(s32 ignoreFlags, f32* startX, f32* startY, f32* startZ, f32* hitDepth) { +b32 npc_raycast_up(s32 ignoreFlags, f32* startX, f32* startY, f32* startZ, f32* hitDepth) { f32 cHitX; f32 cHitY; f32 cHitZ; @@ -331,7 +331,7 @@ s32 npc_raycast_up(s32 ignoreFlags, f32* startX, f32* startY, f32* startZ, f32* } } -s32 npc_raycast_up_corner(s32 ignoreFlags, f32* x, f32* y, f32* z, f32* length) { +HitID npc_raycast_up_corner(s32 ignoreFlags, f32* x, f32* y, f32* z, f32* length) { f32 hitX; f32 hitY; f32 hitZ; @@ -343,7 +343,7 @@ s32 npc_raycast_up_corner(s32 ignoreFlags, f32* x, f32* y, f32* z, f32* length) s32 entityID; f32 sx, sy, sz; f32 sx2, sy2, sz2; - s32 ret = NO_COLLIDER; + HitID ret = NO_COLLIDER; // needed to match sx2 = sx = *x; @@ -444,9 +444,9 @@ HitID npc_raycast_up_corners(s32 ignoreFlags, f32* posX, f32* posY, f32* posZ, f return ret; } -s32 npc_raycast_general(s32 flags, f32 startX, f32 startY, f32 startZ, f32 dirX, f32 dirY, f32 dirZ, f32* hitX, +HitID npc_raycast_general(s32 flags, f32 startX, f32 startY, f32 startZ, f32 dirX, f32 dirY, f32 dirZ, f32* hitX, f32* hitY, f32* hitZ, f32* outDepth, f32* hitNx, f32* hitNy, f32* hitNz) { - s32 ret; + HitID ret; s32 entityID; ret = NO_COLLIDER; diff --git a/src/state_battle.c b/src/state_battle.c index 63ee4687b6..cb7293554a 100644 --- a/src/state_battle.c +++ b/src/state_battle.c @@ -99,7 +99,7 @@ void state_step_battle(void) { D_800A0904 = gPlayerStatusPtr->animFlags; gPlayerStatusPtr->animFlags &= ~PA_FLAG_PULSE_STONE_VISIBLE; D_800A0908 = get_time_freeze_mode(); - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); gOverrideFlags &= ~GLOBAL_OVERRIDES_DISABLE_DRAW_FRAME; if (D_800A0900 >= 0) { diff --git a/src/state_file_select.c b/src/state_file_select.c index cef428fde2..a9a199659f 100644 --- a/src/state_file_select.c +++ b/src/state_file_select.c @@ -364,7 +364,7 @@ void state_step_exit_language_select(void) { } break; case 4: - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); update_player(); update_npcs(); update_encounters(); @@ -407,7 +407,7 @@ void state_step_exit_file_select(void) { set_windows_visible(WINDOW_GROUP_ALL); D_800A0931 = 3; case 3: - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); if (temp_s0 == 0) { set_game_mode(GAME_MODE_TITLE_SCREEN); gOverrideFlags &= ~GLOBAL_OVERRIDES_WINDOWS_OVER_CURTAINS; diff --git a/src/state_pause.c b/src/state_pause.c index 917dec7bf9..ecddbc0336 100644 --- a/src/state_pause.c +++ b/src/state_pause.c @@ -240,7 +240,7 @@ void state_step_unpause(void) { } break; case 4: - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); update_encounters(); update_npcs(); update_player(); diff --git a/src/state_title_screen.c b/src/state_title_screen.c index 751ea3da6b..fa3944afd5 100644 --- a/src/state_title_screen.c +++ b/src/state_title_screen.c @@ -119,7 +119,7 @@ void state_init_title_screen(void) { void* titleData; gOverrideFlags = 0; - timeFreezeMode = 0; + gTimeFreezeMode = TIME_FREEZE_NONE; D_8014C248 = TRUE; general_heap_create(); clear_printers(); diff --git a/src/world/action/hammer.c b/src/world/action/hammer.c index 1a17f93cf7..1a781a90c5 100644 --- a/src/world/action/hammer.c +++ b/src/world/action/hammer.c @@ -22,7 +22,7 @@ BSS HammerHitData D_802B6E90; HammerHitData* HammerHit = &D_802B6E90; -void func_802B6820_E256F0(void); +void action_hammer_end_swing(void); s32 action_hammer_is_swinging_away(s32 animID) { if (animID & SPRITE_ID_BACK_FACING) { @@ -69,7 +69,7 @@ void action_hammer_play_hit_fx(s32 hitID) { soundID = SOUND_HAMMER_STRIKE_1; } - theta = DEG_TO_RAD(func_800E5348()); + theta = DEG_TO_RAD(player_get_side_angle()); sinTheta = sin_rad(theta) * 25.0f; cosTheta = cos_rad(theta) * -25.0f; @@ -86,7 +86,7 @@ void action_hammer_play_hit_fx(s32 hitID) { radius = 1; } - exec_ShakeCamX(0, 2, time, shakeAmt); + exec_ShakeCamX(CAM_DEFAULT, CAM_SHAKE_DECAYING_VERTICAL, time, shakeAmt); fx_smoke_impact(0, x, y, z, radius, numParticles, 0, (time + 3) * 3); switch (is_ability_active(ABILITY_ATTACK_FX)) { @@ -114,19 +114,19 @@ void action_hammer_play_hit_fx(s32 hitID) { start_rumble(256, 50); } -s32 func_802B62A4_E25174(void) { +HitID action_hammer_test_swing_collision(void) { PlayerStatus* playerStatus = &gPlayerStatus; + HitID ret; f32 yaw; f32 angle; f32 outSinTheta; f32 outCosTheta; f32 playerX, playerY, playerZ; f32 x, y, z; - s32 ret; s32 i; // first attempt - yaw = func_800E5348(); + yaw = player_get_side_angle(); if (action_hammer_is_swinging_away(playerStatus->trueAnimation)) { angle = clamp_angle(yaw + 90.0f - gCameras[gCurrentCameraID].curYaw); if (angle >= 90.0f && angle < 270.0f) { @@ -141,11 +141,12 @@ s32 func_802B62A4_E25174(void) { playerY = playerStatus->pos.y; playerZ = playerStatus->pos.z; + // check collision along 16 points in a line away from the player for (i = 1; i < 16; i++) { x = playerX + (outSinTheta * i); y = playerY; z = playerZ - (outCosTheta * i); - ret = player_test_lateral_overlap(PLAYER_COLLISION_3, playerStatus, &x, &y, &z, 4.0f, yaw); + ret = player_test_lateral_overlap(PLAYER_COLLISION_HAMMER, playerStatus, &x, &y, &z, 4.0f, yaw); if (ret > NO_COLLIDER) { HammerHit->hitPos.x = x; HammerHit->hitPos.y = y; @@ -156,7 +157,7 @@ s32 func_802B62A4_E25174(void) { // second attempt if (i >= 16) { - yaw = func_800E5348(); + yaw = player_get_side_angle(); if (!action_hammer_is_swinging_away(playerStatus->trueAnimation)) { angle = clamp_angle(yaw + 90.0f - gCameras[gCurrentCameraID].curYaw); if (angle >= 90.0f && angle < 270.0f) { @@ -166,13 +167,14 @@ s32 func_802B62A4_E25174(void) { } } + // check collision along 16 points in a line away from the player sin_cos_rad(DEG_TO_RAD(yaw), &outSinTheta, &outCosTheta); for (i = 1; i < 16; i++) { x = playerX + (outSinTheta * i); y = playerY; z = playerZ - (outCosTheta * i); - ret = player_test_lateral_overlap(PLAYER_COLLISION_3, playerStatus, &x, &y, &z, 4.0f, yaw); + ret = player_test_lateral_overlap(PLAYER_COLLISION_HAMMER, playerStatus, &x, &y, &z, 4.0f, yaw); if (ret > NO_COLLIDER) { HammerHit->hitPos.x = x; HammerHit->hitPos.y = y; @@ -240,7 +242,7 @@ void action_update_hammer(void) { playerStatus->actionSubstate = SUBSTATE_HAMMER_0; playerStatus->curSpeed = 0.0f; playerStatus->animNotifyValue = 0; - HammerHit->hitID = func_802B62A4_E25174(); + HammerHit->hitID = action_hammer_test_swing_collision(); if (gPlayerData.hammerLevel == 2) { soundID = SOUND_HAMMER_SWING_3; @@ -278,11 +280,11 @@ void action_update_hammer(void) { } else if (HammerHit->timer < 2) { HammerHit->timer++; } else { - func_802B6820_E256F0(); + action_hammer_end_swing(); } } -void func_802B6820_E256F0(void) { +void action_hammer_end_swing(void) { PlayerStatus* playerStatus = &gPlayerStatus; CollisionStatus* collisionStatus; f32 yaw; @@ -303,7 +305,7 @@ void func_802B6820_E256F0(void) { collisionStatus = &gCollisionStatus; } while (0); // required to match; - yaw = func_800E5348(); + yaw = player_get_side_angle(); if (action_hammer_is_swinging_away(playerStatus->trueAnimation)) { angle = clamp_angle(yaw + 90.0f - gCameras[gCurrentCameraID].curYaw); if (angle >= 90.0f && angle < 270.0f) { @@ -318,12 +320,12 @@ void func_802B6820_E256F0(void) { playerY = playerStatus->pos.y; playerZ = playerStatus->pos.z; - // check collision allong 16 points in a line away from the player + // check collision along 16 points in a line away from the player for (i = 1; i < 16; i++) { x = playerX + (outSinTheta * i); y = playerY; z = playerZ - (outCosTheta * i); - result = player_test_lateral_overlap(PLAYER_COLLISION_3, playerStatus, &x, &y, &z, 4.0f, yaw); + result = player_test_lateral_overlap(PLAYER_COLLISION_HAMMER, playerStatus, &x, &y, &z, 4.0f, yaw); if (HammerHit->unk_14 == 0) { collisionStatus->lastWallHammered = result; if (result > NO_COLLIDER) { @@ -339,7 +341,7 @@ void func_802B6820_E256F0(void) { } if (i >= 16) { - yaw = func_800E5348(); + yaw = player_get_side_angle(); if (action_hammer_is_swinging_away(playerStatus->trueAnimation) == 0) { angle = clamp_angle(yaw + 90.0f - gCameras[gCurrentCameraID].curYaw); if (angle >= 90.0f && angle < 270.0f) { @@ -350,11 +352,12 @@ void func_802B6820_E256F0(void) { } sin_cos_rad(DEG_TO_RAD(yaw), &outSinTheta, &outCosTheta); + // check collision along 16 points in a line away from the player for (i = 1; i < 16; i++) { x = playerX + (outSinTheta * i); y = playerY; z = playerZ - (outCosTheta * i); - result = player_test_lateral_overlap(PLAYER_COLLISION_3, playerStatus, &x, &y, &z, 4.0f, yaw); + result = player_test_lateral_overlap(PLAYER_COLLISION_HAMMER, playerStatus, &x, &y, &z, 4.0f, yaw); if (HammerHit->unk_14 == 0) { collisionStatus->lastWallHammered = result; if (result > NO_COLLIDER) { diff --git a/src/world/action/hit_lava.c b/src/world/action/hit_lava.c index 8d91921e09..3a034a4527 100644 --- a/src/world/action/hit_lava.c +++ b/src/world/action/hit_lava.c @@ -170,7 +170,7 @@ void action_update_hit_lava(void) { } playerStatus->pos.y = player_check_collision_below(player_fall_distance(), &completeAxes); if (completeAxes >= 0) { - exec_ShakeCamX(0, 2, 1, 0.8f); + exec_ShakeCamX(CAM_DEFAULT, CAM_SHAKE_DECAYING_VERTICAL, 1, 0.8f); start_rumble(256, 50); phys_adjust_cam_on_landing(); gCameras[CAM_DEFAULT].moveFlags &= ~CAMERA_MOVE_NO_INTERP_Y; diff --git a/src/world/action/sneaky_parasol.c b/src/world/action/sneaky_parasol.c index 91493fc44f..412ab2123f 100644 --- a/src/world/action/sneaky_parasol.c +++ b/src/world/action/sneaky_parasol.c @@ -57,7 +57,7 @@ Npc* parasol_get_npc(void) { ret = NULL; } else { angle = clamp_angle(atan2(playerStatus->pos.x, playerStatus->pos.z, ret->pos.x, ret->pos.z)); - if (fabs(angle - func_800E5348()) > 30.0) { + if (fabs(angle - player_get_side_angle()) > 30.0) { ret = NULL; } } @@ -228,7 +228,7 @@ void action_update_parasol(void) { break; case SUBSTATE_DISGUISE_DONE: if (--playerStatus->curStateTime == 0) { - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); disguiseNpc = get_npc_by_index(PeachDisguiseNpcIndex); disguiseNpc->flags &= ~NPC_FLAG_IGNORE_CAMERA_FOR_YAW; playerStatus->flags &= ~PS_FLAG_ROTATION_LOCKED; @@ -310,7 +310,7 @@ void action_update_parasol(void) { break; case SUBSTATE_REVERT_DONE: if (--playerStatus->curStateTime == 0) { - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); playerStatus->flags &= ~PS_FLAG_ROTATION_LOCKED; set_action_state(ACTION_STATE_IDLE); enable_player_static_collisions(); diff --git a/src/world/area_arn/arn_03/npc.c b/src/world/area_arn/arn_03/npc.c index f18f73ef7f..a05d9c6928 100644 --- a/src/world/area_arn/arn_03/npc.c +++ b/src/world/area_arn/arn_03/npc.c @@ -393,7 +393,7 @@ NpcData N(NpcData_Boo_01) = { }, .init = &N(EVS_NpcInit_Boo_01), .settings = &N(NpcSettings_Boo_Patrol), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_LovesBow, @@ -405,7 +405,7 @@ NpcData N(NpcData_Boo_02) = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_02), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_BooA, @@ -431,7 +431,7 @@ NpcData N(NpcData_Boo_03) = { }, .init = &N(EVS_NpcInit_Boo_03), .settings = &N(NpcSettings_Boo_Patrol), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_BooB, @@ -443,7 +443,7 @@ NpcData N(NpcData_Boo_04) = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_04), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_BooC, @@ -455,7 +455,7 @@ NpcData N(NpcData_Boo_05) = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_05), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }; @@ -519,7 +519,7 @@ NpcData N(NpcData_Boo_06)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_06), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }, @@ -529,7 +529,7 @@ NpcData N(NpcData_Boo_06)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_07), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }, @@ -539,7 +539,7 @@ NpcData N(NpcData_Boo_06)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_08), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }, @@ -549,7 +549,7 @@ NpcData N(NpcData_Boo_06)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_09), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }, diff --git a/src/world/area_arn/arn_05/npc.c b/src/world/area_arn/arn_05/npc.c index c8c305a022..e473f0a359 100644 --- a/src/world/area_arn/arn_05/npc.c +++ b/src/world/area_arn/arn_05/npc.c @@ -249,7 +249,7 @@ NpcData N(NpcData_Boo_01)[] = { }, .init = &N(EVS_NpcInit_Boo_01), .settings = &N(NpcSettings_Boo_Patrol), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_BooD, @@ -260,7 +260,7 @@ NpcData N(NpcData_Boo_01)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Boo_02), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_BooE, @@ -271,7 +271,7 @@ NpcData N(NpcData_Boo_01)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Boo_03), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_BooF, @@ -282,7 +282,7 @@ NpcData N(NpcData_Boo_01)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Boo_04), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_BooG, @@ -307,7 +307,7 @@ NpcData N(NpcData_Boo_01)[] = { }, .init = &N(EVS_NpcInit_Boo_05), .settings = &N(NpcSettings_Boo_Patrol), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_ARN_BooH, @@ -705,7 +705,7 @@ NpcData N(NpcData_Boo_06)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_06), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }, @@ -715,7 +715,7 @@ NpcData N(NpcData_Boo_06)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_07), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }, @@ -725,7 +725,7 @@ NpcData N(NpcData_Boo_06)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_08), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }, @@ -735,7 +735,7 @@ NpcData N(NpcData_Boo_06)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_09), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }, diff --git a/src/world/area_arn/arn_07/entity.c b/src/world/area_arn/arn_07/entity.c index e61017240c..eac8159952 100644 --- a/src/world/area_arn/arn_07/entity.c +++ b/src/world/area_arn/arn_07/entity.c @@ -7,18 +7,18 @@ MAP_RODATA_PAD(1,entity); #include "world/common/todo/GetEntityPosition.inc.c" EvtScript N(EVS_UnlockDoor) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowKeyChoicePopup) IfEq(LVar0, 0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf IfEq(LVar0, -1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf Call(FindKeyItem, ITEM_MYSTICAL_KEY, LVar0) @@ -29,7 +29,7 @@ EvtScript N(EVS_UnlockDoor) = { Call(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) Set(LVar0, MV_Unk_00) Call(N(RemovePadlock)) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Unbind Return End diff --git a/src/world/area_arn/arn_07/npc.c b/src/world/area_arn/arn_07/npc.c index 9b8fe5e03e..a2ca96035d 100644 --- a/src/world/area_arn/arn_07/npc.c +++ b/src/world/area_arn/arn_07/npc.c @@ -306,7 +306,7 @@ EvtScript N(EVS_NpcIdle_Boo) = { }; EvtScript N(EVS_NpcDefeat_Tubba) = { - Call(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_2, TRUE) + Call(SetEncounterStatusFlags, ENCOUNTER_FLAG_CANT_SKIP_WIN_DELAY, TRUE) Call(GetBattleOutcome, LVar0) Switch(LVar0) CaseEq(OUTCOME_PLAYER_WON) @@ -566,7 +566,7 @@ NpcData N(NpcData_Tubba)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Tubba), .settings = &N(NpcSettings_TubbaBlubba), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = TUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Tubba), @@ -577,7 +577,7 @@ NpcData N(NpcData_Tubba)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TubbasHeart), .settings = &N(NpcSettings_TubbasHeart), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = TUBBAS_HEART_ANIMS, }, @@ -590,7 +590,7 @@ NpcData N(NpcData_Boos)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Boo), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .extraAnimations = N(ExtraAnims_GustyBoo), @@ -601,7 +601,7 @@ NpcData N(NpcData_Boos)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Boo), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .extraAnimations = N(ExtraAnims_GustyBoo), @@ -612,7 +612,7 @@ NpcData N(NpcData_Boos)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Boo), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .extraAnimations = N(ExtraAnims_GustyBoo), @@ -623,7 +623,7 @@ NpcData N(NpcData_Boos)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Boo), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .extraAnimations = N(ExtraAnims_GustyBoo), @@ -634,7 +634,7 @@ NpcData N(NpcData_Boos)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Boo), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, .extraAnimations = N(ExtraAnims_Boo), @@ -645,7 +645,7 @@ NpcData N(NpcData_Boos)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Boo), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, .extraAnimations = N(ExtraAnims_Boo), @@ -658,7 +658,7 @@ NpcData N(NpcData_Bow) = { .yaw = 0, .init = &N(EVS_NpcInit_Bow), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldBow_Idle, @@ -686,7 +686,7 @@ NpcData N(NpcData_Bootler) = { .yaw = 0, .init = &N(EVS_NpcInit_Bootler), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = { .idle = ANIM_Bootler_Idle, @@ -797,7 +797,7 @@ NpcData N(NpcData_Skolar) = { .yaw = 0, .init = &N(EVS_NpcInit_Skolar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = SKOLAR_ANIMS, }; diff --git a/src/world/area_arn/arn_08/main.c b/src/world/area_arn/arn_08/main.c index 7d14300ae0..4812a5218a 100644 --- a/src/world/area_arn/arn_08/main.c +++ b/src/world/area_arn/arn_08/main.c @@ -1,7 +1,7 @@ #include "arn_08.h" EvtScript N(EVS_ExitDoor_arn_07_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(ClearDefeatedEnemies) Set(LVar0, arn_08_ENTRY_0) diff --git a/src/world/area_arn/arn_08/npc.c b/src/world/area_arn/arn_08/npc.c index 25d2b7b345..e6da3f6e5a 100644 --- a/src/world/area_arn/arn_08/npc.c +++ b/src/world/area_arn/arn_08/npc.c @@ -51,7 +51,7 @@ NpcData N(NpcData_TubbasHeart) = { .yaw = 270, .init = &N(EVS_NpcInit_TubbasHeart), .settings = &N(NpcSettings_TubbasHeart), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL, .drops = NO_DROPS, .animations = TUBBAS_HEART_ANIMS, }; diff --git a/src/world/area_arn/arn_09/npc.c b/src/world/area_arn/arn_09/npc.c index 98e6191556..055cb9c196 100644 --- a/src/world/area_arn/arn_09/npc.c +++ b/src/world/area_arn/arn_09/npc.c @@ -51,7 +51,7 @@ NpcData N(NpcData_TubbasHeart) = { .yaw = 270, .init = &N(EVS_NpcInit_TubbasHeart), .settings = &N(NpcSettings_TubbasHeart), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL, .drops = NO_DROPS, .animations = TUBBAS_HEART_ANIMS, }; diff --git a/src/world/area_arn/arn_10/npc.c b/src/world/area_arn/arn_10/npc.c index e8878f1c47..c6a46139b9 100644 --- a/src/world/area_arn/arn_10/npc.c +++ b/src/world/area_arn/arn_10/npc.c @@ -65,7 +65,7 @@ NpcData N(NpcData_TubbasHeart) = { .yaw = 270, .init = &N(EVS_NpcInit_TubbasHeart), .settings = &N(NpcSettings_TubbasHeart), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL, .drops = NO_DROPS, .animations = TUBBAS_HEART_ANIMS, }; diff --git a/src/world/area_arn/arn_11/main.c b/src/world/area_arn/arn_11/main.c index cb7ec254a8..e85891d032 100644 --- a/src/world/area_arn/arn_11/main.c +++ b/src/world/area_arn/arn_11/main.c @@ -52,7 +52,7 @@ EvtScript N(EVS_Scene_MeetHeart) = { }; EvtScript N(EVS_ExitDoor_arn_13_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, arn_11_ENTRY_0) Set(LVar1, COLLIDER_ttw) diff --git a/src/world/area_arn/arn_11/npc.c b/src/world/area_arn/arn_11/npc.c index 0cb7c69aa3..ce492d6af5 100644 --- a/src/world/area_arn/arn_11/npc.c +++ b/src/world/area_arn/arn_11/npc.c @@ -155,7 +155,7 @@ NpcData N(NpcData_TubbasHeart) = { .yaw = 270, .init = &N(EVS_NpcInit_TubbasHeart), .settings = &N(NpcSettings_TubbasHeart), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = NO_DROPS, .animations = TUBBAS_HEART_ANIMS, }; diff --git a/src/world/area_arn/arn_12/npc.c b/src/world/area_arn/arn_12/npc.c index 7ee57bec6b..ae30fb77ef 100644 --- a/src/world/area_arn/arn_12/npc.c +++ b/src/world/area_arn/arn_12/npc.c @@ -66,7 +66,7 @@ NpcData N(NpcData_TubbasHeart) = { .yaw = 270, .init = &N(EVS_NpcInit_TubbasHeart), .settings = &N(NpcSettings_TubbasHeart), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL, .drops = NO_DROPS, .animations = TUBBAS_HEART_ANIMS, }; diff --git a/src/world/area_arn/arn_13/npc.c b/src/world/area_arn/arn_13/npc.c index 17cc0be90d..25a87d3f9c 100644 --- a/src/world/area_arn/arn_13/npc.c +++ b/src/world/area_arn/arn_13/npc.c @@ -66,7 +66,7 @@ NpcData N(NpcData_TubbasHeart) = { .yaw = 270, .init = &N(EVS_NpcInit_TubbasHeart), .settings = &N(NpcSettings_TubbasHeart), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL, .drops = NO_DROPS, .animations = TUBBAS_HEART_ANIMS, }; diff --git a/src/world/area_dgb/dgb_00/main.c b/src/world/area_dgb/dgb_00/main.c index 937ed3a7a4..7858b4423c 100644 --- a/src/world/area_dgb/dgb_00/main.c +++ b/src/world/area_dgb/dgb_00/main.c @@ -10,7 +10,7 @@ s32 N(map_init)(void) { EvtScript N(EVS_ExitWalk_arn_04_1) = EVT_EXIT_WALK(60, dgb_00_ENTRY_0, "arn_04", arn_04_ENTRY_1); EvtScript N(EVS_ExitDoors_dgb_01_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_00_ENTRY_1) diff --git a/src/world/area_dgb/dgb_00/npc.c b/src/world/area_dgb/dgb_00/npc.c index 8cec8cfd49..060926a4f5 100644 --- a/src/world/area_dgb/dgb_00/npc.c +++ b/src/world/area_dgb/dgb_00/npc.c @@ -200,7 +200,7 @@ EvtScript N(EVS_LeaderBooShivering) = { }; EvtScript N(EVS_TubbaTaunting) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Loop(0) Call(RandInt, 50 * DT, LVar0) Add(LVar0, 80 * DT) @@ -442,7 +442,7 @@ NpcData N(NpcData_Boo_01) = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_01), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, .tattle = MSG_NpcTattle_BraveBoo, @@ -454,7 +454,7 @@ NpcData N(NpcData_Boo_02) = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_02), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }; @@ -465,7 +465,7 @@ NpcData N(NpcData_Boo_03) = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_03), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }; @@ -476,7 +476,7 @@ NpcData N(NpcData_Boo_04) = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_04), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }; @@ -487,7 +487,7 @@ NpcData N(NpcData_Boo_05) = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_05), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }; @@ -498,7 +498,7 @@ NpcData N(NpcData_Boo_06) = { .yaw = 90, .init = &N(EVS_NpcInit_Boo_06), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = GUSTY_BOO_ANIMS, }; @@ -655,7 +655,7 @@ NpcData N(NpcData_Sentinel) = { .yaw = 90, .init = &N(EVS_NpcInit_Sentinel), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = SENTINEL_ANIMS, }; diff --git a/src/world/area_dgb/dgb_01/entity.c b/src/world/area_dgb/dgb_01/entity.c index 6cb09d5666..542da53e5e 100644 --- a/src/world/area_dgb/dgb_01/entity.c +++ b/src/world/area_dgb/dgb_01/entity.c @@ -5,18 +5,18 @@ #include "world/common/todo/GetEntityPosition.inc.c" EvtScript N(EVS_UnlockPrompt_Door) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(ShowKeyChoicePopup) IfEq(LVar0, 0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf IfEq(LVar0, -1) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf Call(FindKeyItem, ITEM_TUBBA_CASTLE_KEY, LVar0) @@ -27,7 +27,7 @@ EvtScript N(EVS_UnlockPrompt_Door) = { Call(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) Set(LVar0, MV_PadlockEntityID) Call(N(RemovePadlock)) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End diff --git a/src/world/area_dgb/dgb_01/main.c b/src/world/area_dgb/dgb_01/main.c index 2f4f1d53df..aa45ed8095 100644 --- a/src/world/area_dgb/dgb_01/main.c +++ b/src/world/area_dgb/dgb_01/main.c @@ -1,7 +1,7 @@ #include "dgb_01.h" EvtScript N(EVS_ExitDoors_dgb_00_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_01_ENTRY_0) @@ -17,7 +17,7 @@ EvtScript N(EVS_ExitDoors_dgb_00_1) = { }; EvtScript N(EVS_ExitDoors_dgb_02_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_01_ENTRY_1) @@ -33,7 +33,7 @@ EvtScript N(EVS_ExitDoors_dgb_02_1) = { }; EvtScript N(EVS_ExitDoors_dgb_08_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_01_ENTRY_2) @@ -49,7 +49,7 @@ EvtScript N(EVS_ExitDoors_dgb_08_0) = { }; EvtScript N(EVS_ExitDoors_dgb_09_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_01_ENTRY_3) @@ -65,7 +65,7 @@ EvtScript N(EVS_ExitDoors_dgb_09_1) = { }; EvtScript N(EVS_ExitDoors_dgb_08_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_01_ENTRY_4) @@ -81,7 +81,7 @@ EvtScript N(EVS_ExitDoors_dgb_08_1) = { }; EvtScript N(EVS_ExitDoors_dgb_17_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_01_ENTRY_5) @@ -97,7 +97,7 @@ EvtScript N(EVS_ExitDoors_dgb_17_1) = { }; EvtScript N(EVS_ExitDoors_dgb_18_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_01_ENTRY_6) diff --git a/src/world/area_dgb/dgb_02/main.c b/src/world/area_dgb/dgb_02/main.c index fbc360b079..5b8fc76f6c 100644 --- a/src/world/area_dgb/dgb_02/main.c +++ b/src/world/area_dgb/dgb_02/main.c @@ -1,7 +1,7 @@ #include "dgb_02.h" EvtScript N(EVS_ExitDoors_dgb_03_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_02_ENTRY_0) @@ -17,7 +17,7 @@ EvtScript N(EVS_ExitDoors_dgb_03_1) = { }; EvtScript N(EVS_ExitDoors_dgb_01_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_02_ENTRY_1) @@ -33,7 +33,7 @@ EvtScript N(EVS_ExitDoors_dgb_01_1) = { }; EvtScript N(EVS_ExitDoor_dgb_07_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, dgb_02_ENTRY_2) @@ -49,7 +49,7 @@ EvtScript N(EVS_ExitDoor_dgb_07_0) = { }; EvtScript N(EVS_ExitDoor_dgb_11_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, dgb_02_ENTRY_3) diff --git a/src/world/area_dgb/dgb_03/clock.c b/src/world/area_dgb/dgb_03/clock.c index 7527374288..bed1975bc2 100644 --- a/src/world/area_dgb/dgb_03/clock.c +++ b/src/world/area_dgb/dgb_03/clock.c @@ -4,7 +4,7 @@ #include "world/common/todo/UnkFunc12.inc.c" EvtScript N(EVS_PushClock_Impl) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Loop(20) Call(GetPartnerInUse, LVarA) IfNe(LVarA, PARTNER_NONE) diff --git a/src/world/area_dgb/dgb_03/entity.c b/src/world/area_dgb/dgb_03/entity.c index 9e1b728d8e..ebfe4f1cbd 100644 --- a/src/world/area_dgb/dgb_03/entity.c +++ b/src/world/area_dgb/dgb_03/entity.c @@ -5,18 +5,18 @@ #include "world/common/todo/GetEntityPosition.inc.c" EvtScript N(EVS_UnlockPrompt_UpperDoor) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(ShowKeyChoicePopup) IfEq(LVar0, 0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf IfEq(LVar0, -1) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf Call(FindKeyItem, ITEM_TUBBA_CASTLE_KEY, LVar0) @@ -27,7 +27,7 @@ EvtScript N(EVS_UnlockPrompt_UpperDoor) = { Call(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) Set(LVar0, MV_PadlockEntityID) Call(N(RemovePadlock)) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End diff --git a/src/world/area_dgb/dgb_03/main.c b/src/world/area_dgb/dgb_03/main.c index d56b401bea..09cdea07e9 100644 --- a/src/world/area_dgb/dgb_03/main.c +++ b/src/world/area_dgb/dgb_03/main.c @@ -1,7 +1,7 @@ #include "dgb_03.h" EvtScript N(EVS_ExitDoors_dgb_02_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_03_ENTRY_1) @@ -17,7 +17,7 @@ EvtScript N(EVS_ExitDoors_dgb_02_0) = { }; EvtScript N(EVS_ExitDoors_dgb_09_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_03_ENTRY_4) @@ -33,7 +33,7 @@ EvtScript N(EVS_ExitDoors_dgb_09_0) = { }; EvtScript N(EVS_ExitDoors_dgb_04_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_03_ENTRY_0) @@ -51,7 +51,7 @@ EvtScript N(EVS_ExitDoors_dgb_04_0) = { EvtScript N(EVS_ExitWalk_dgb_13_0) = EVT_EXIT_WALK(26, dgb_03_ENTRY_2, "dgb_13", dgb_13_ENTRY_0); EvtScript N(EVS_ExitDoors_dgb_05_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, dgb_03_ENTRY_2) @@ -67,7 +67,7 @@ EvtScript N(EVS_ExitDoors_dgb_05_0) = { }; EvtScript N(EVS_ExitDoors_dgb_14_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_03_ENTRY_3) diff --git a/src/world/area_dgb/dgb_04/main.c b/src/world/area_dgb/dgb_04/main.c index 504e2a254c..f317837d84 100644 --- a/src/world/area_dgb/dgb_04/main.c +++ b/src/world/area_dgb/dgb_04/main.c @@ -1,7 +1,7 @@ #include "dgb_04.h" EvtScript N(EVS_ExitDoor_dgb_06_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, dgb_04_ENTRY_0) @@ -17,7 +17,7 @@ EvtScript N(EVS_ExitDoor_dgb_06_0) = { }; EvtScript N(EVS_ExitDoors_dgb_03_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_04_ENTRY_1) diff --git a/src/world/area_dgb/dgb_05/main.c b/src/world/area_dgb/dgb_05/main.c index 59a4140bf1..9a91637df4 100644 --- a/src/world/area_dgb/dgb_05/main.c +++ b/src/world/area_dgb/dgb_05/main.c @@ -1,7 +1,7 @@ #include "dgb_05.h" EvtScript N(EVS_ExitDoor_dgb_03_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, dgb_05_ENTRY_0) diff --git a/src/world/area_dgb/dgb_06/main.c b/src/world/area_dgb/dgb_06/main.c index bfa7fde064..cfe056ec66 100644 --- a/src/world/area_dgb/dgb_06/main.c +++ b/src/world/area_dgb/dgb_06/main.c @@ -1,7 +1,7 @@ #include "dgb_06.h" EvtScript N(EVS_ExitDoor_dgb_04_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, dgb_06_ENTRY_0) diff --git a/src/world/area_dgb/dgb_07/main.c b/src/world/area_dgb/dgb_07/main.c index 08401b9ff5..07cd44ecd0 100644 --- a/src/world/area_dgb/dgb_07/main.c +++ b/src/world/area_dgb/dgb_07/main.c @@ -1,7 +1,7 @@ #include "dgb_07.h" EvtScript N(EVS_ExitDoor_dgb_02_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, dgb_07_ENTRY_0) diff --git a/src/world/area_dgb/dgb_08/main.c b/src/world/area_dgb/dgb_08/main.c index fda02840c5..9747e81246 100644 --- a/src/world/area_dgb/dgb_08/main.c +++ b/src/world/area_dgb/dgb_08/main.c @@ -1,7 +1,7 @@ #include "dgb_08.h" EvtScript N(EVS_ExitDoors_dgb_01_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_08_ENTRY_0) @@ -17,7 +17,7 @@ EvtScript N(EVS_ExitDoors_dgb_01_2) = { }; EvtScript N(EVS_ExitDoors_dgb_01_4) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_08_ENTRY_1) diff --git a/src/world/area_dgb/dgb_08/npc.c b/src/world/area_dgb/dgb_08/npc.c index 004544ff73..60ddf66986 100644 --- a/src/world/area_dgb/dgb_08/npc.c +++ b/src/world/area_dgb/dgb_08/npc.c @@ -198,7 +198,7 @@ NpcData N(NpcData_Tubba) = { }, .init = &N(EVS_NpcInit_Tubba), .settings = &N(NpcSettings_TubbaBlubba), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = CLUBBA_DROPS, .animations = TUBBA_ANGRY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -412,7 +412,7 @@ NpcData N(NpcData_LastClubba) = { }, .init = &N(EVS_NpcInit_LastClubba), .settings = &N(NpcSettings_LastClubba), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = CLUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_dgb/dgb_09/main.c b/src/world/area_dgb/dgb_09/main.c index 791dd30915..72db2ed421 100644 --- a/src/world/area_dgb/dgb_09/main.c +++ b/src/world/area_dgb/dgb_09/main.c @@ -1,7 +1,7 @@ #include "dgb_09.h" EvtScript N(exitDoubleDoor_80243920) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_09_ENTRY_0) @@ -17,7 +17,7 @@ EvtScript N(exitDoubleDoor_80243920) = { }; EvtScript N(exitDoubleDoor_802439D4) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_09_ENTRY_1) @@ -33,7 +33,7 @@ EvtScript N(exitDoubleDoor_802439D4) = { }; EvtScript N(exitSingleDoor_80243A88) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, dgb_09_ENTRY_2) diff --git a/src/world/area_dgb/dgb_11/main.c b/src/world/area_dgb/dgb_11/main.c index 9ec444b0b4..f8d5e9482b 100644 --- a/src/world/area_dgb/dgb_11/main.c +++ b/src/world/area_dgb/dgb_11/main.c @@ -1,7 +1,7 @@ #include "dgb_11.h" EvtScript N(EVS_ExitDoor_dgb_02_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, dgb_11_ENTRY_0) diff --git a/src/world/area_dgb/dgb_12/main.c b/src/world/area_dgb/dgb_12/main.c index f5187146c1..7a3be6cc8c 100644 --- a/src/world/area_dgb/dgb_12/main.c +++ b/src/world/area_dgb/dgb_12/main.c @@ -1,7 +1,7 @@ #include "dgb_12.h" EvtScript N(EVS_ExitDoor_dgb_09_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, dgb_12_ENTRY_0) diff --git a/src/world/area_dgb/dgb_12/spikes.c b/src/world/area_dgb/dgb_12/spikes.c index 1d34559125..ea1eb225bf 100644 --- a/src/world/area_dgb/dgb_12/spikes.c +++ b/src/world/area_dgb/dgb_12/spikes.c @@ -6,7 +6,7 @@ LavaReset N(SafeFloorColliders)[] = { }; EvtScript N(EVS_SetupSpikes) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o202, SURFACE_TYPE_SPIKES) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o215, SURFACE_TYPE_SPIKES) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o216, SURFACE_TYPE_SPIKES) diff --git a/src/world/area_dgb/dgb_14/main.c b/src/world/area_dgb/dgb_14/main.c index 3c6359551e..f7a1168b8c 100644 --- a/src/world/area_dgb/dgb_14/main.c +++ b/src/world/area_dgb/dgb_14/main.c @@ -2,7 +2,7 @@ #include "sprite/player.h" EvtScript N(EVS_ExitDoors_dgb_03_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_14_ENTRY_1) @@ -18,7 +18,7 @@ EvtScript N(EVS_ExitDoors_dgb_03_3) = { }; EvtScript N(EVS_ExitDoors_dgb_15_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_14_ENTRY_0) diff --git a/src/world/area_dgb/dgb_15/entity.c b/src/world/area_dgb/dgb_15/entity.c index a1e2c487c4..477b5dfbf6 100644 --- a/src/world/area_dgb/dgb_15/entity.c +++ b/src/world/area_dgb/dgb_15/entity.c @@ -5,18 +5,18 @@ #include "world/common/todo/RemovePadlock.inc.c" EvtScript N(EVS_UnlockPrompt_Door) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(ShowKeyChoicePopup) IfEq(LVar0, 0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf IfEq(LVar0, -1) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf Call(FindKeyItem, ITEM_TUBBA_CASTLE_KEY, LVar0) @@ -27,7 +27,7 @@ EvtScript N(EVS_UnlockPrompt_Door) = { Call(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) Set(LVar0, MV_PadlockEntityID) Call(N(RemovePadlock)) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End diff --git a/src/world/area_dgb/dgb_15/main.c b/src/world/area_dgb/dgb_15/main.c index 0431a57cc6..1d0905c038 100644 --- a/src/world/area_dgb/dgb_15/main.c +++ b/src/world/area_dgb/dgb_15/main.c @@ -6,7 +6,7 @@ s32 N(KeyList)[] = { }; EvtScript N(EVS_ExitDoors_dgb_14_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_15_ENTRY_0) @@ -22,7 +22,7 @@ EvtScript N(EVS_ExitDoors_dgb_14_1) = { }; EvtScript N(EVS_ExitDoors_dgb_17_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_15_ENTRY_1) @@ -38,7 +38,7 @@ EvtScript N(EVS_ExitDoors_dgb_17_0) = { }; EvtScript N(EVS_ExitDoors_dgb_16_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, dgb_15_ENTRY_2) diff --git a/src/world/area_dgb/dgb_15/npc.c b/src/world/area_dgb/dgb_15/npc.c index 30ebcaa08d..f57250ac02 100644 --- a/src/world/area_dgb/dgb_15/npc.c +++ b/src/world/area_dgb/dgb_15/npc.c @@ -187,7 +187,7 @@ NpcData N(NpcData_Tubba) = { }, .init = &N(EVS_NpcInit_Tubba), .settings = &N(NpcSettings_TubbaBlubba), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = CLUBBA_DROPS, .animations = TUBBA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_dgb/dgb_16/main.c b/src/world/area_dgb/dgb_16/main.c index e2d58a0f41..37f95d4b49 100644 --- a/src/world/area_dgb/dgb_16/main.c +++ b/src/world/area_dgb/dgb_16/main.c @@ -1,7 +1,7 @@ #include "dgb_16.h" EvtScript N(EVS_ExitDoors_dgb_15_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, dgb_16_ENTRY_0) diff --git a/src/world/area_dgb/dgb_17/main.c b/src/world/area_dgb/dgb_17/main.c index a620266303..7e5813bea3 100644 --- a/src/world/area_dgb/dgb_17/main.c +++ b/src/world/area_dgb/dgb_17/main.c @@ -1,7 +1,7 @@ #include "dgb_17.h" EvtScript N(EVS_ExitDoors_dgb_15_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_17_ENTRY_0) @@ -17,7 +17,7 @@ EvtScript N(EVS_ExitDoors_dgb_15_1) = { }; EvtScript N(EVS_ExitDoors_dgb_01_5) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_17_ENTRY_1) diff --git a/src/world/area_dgb/dgb_18/main.c b/src/world/area_dgb/dgb_18/main.c index 252cb03ccc..c6fb76efae 100644 --- a/src/world/area_dgb/dgb_18/main.c +++ b/src/world/area_dgb/dgb_18/main.c @@ -1,7 +1,7 @@ #include "dgb_18.h" EvtScript N(EVS_ExitDoors_dgb_01_6) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, dgb_18_ENTRY_0) diff --git a/src/world/area_dgb/dgb_18/npc.c b/src/world/area_dgb/dgb_18/npc.c index 8e9aa80416..b9faa650dc 100644 --- a/src/world/area_dgb/dgb_18/npc.c +++ b/src/world/area_dgb/dgb_18/npc.c @@ -297,7 +297,7 @@ EvtScript N(EVS_NpcIdle_Tubba_Asleep) = { }; EvtScript N(EVS_NpcAI_Tubba_WakeUp) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(PlaySoundAtNpc, NPC_SELF, SOUND_TUBBA_SNORE_EXHALE, SOUND_SPACE_DEFAULT) Call(ShowSleepBubble, NPC_Tubba, 0, 50, 2, 552, 111, 128, 30, LVar0) Wait(360) @@ -322,7 +322,7 @@ EvtScript N(EVS_NpcAI_Tubba_WakeUp) = { }; EvtScript N(EVS_NpcAI_Tubba_Chase) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(SetNpcAnimation, NPC_Tubba, ANIM_WorldTubba_Anim0D) Thread Loop(0) @@ -510,7 +510,7 @@ NpcData N(NpcData_Tubba) = { }, .init = &N(EVS_NpcInit_Tubba), .settings = &N(NpcSettings_TubbaBlubba), - .flags = ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = TUBBA_ANGRY_ANIMS, }; diff --git a/src/world/area_dro/dro_01/main.c b/src/world/area_dro/dro_01/main.c index 5d3934130e..607ceb6233 100644 --- a/src/world/area_dro/dro_01/main.c +++ b/src/world/area_dro/dro_01/main.c @@ -5,7 +5,7 @@ #include "world/common/atomic/ApplyTint.inc.c" EvtScript N(EVS_ExitWalk_sbk_36_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Set(GF_DRO01_HeardHintAboutSpinningRoof, 0) Call(UseExitHeading, 60, 0) Exec(ExitWalk) diff --git a/src/world/area_dro/dro_01/npc.c b/src/world/area_dro/dro_01/npc.c index cf766b84f9..14275070b7 100644 --- a/src/world/area_dro/dro_01/npc.c +++ b/src/world/area_dro/dro_01/npc.c @@ -196,7 +196,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Mouser_01), .settings = &N(NpcSettings_Mouser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = MOUSER_BLUE_ANIMS, .tattle = MSG_NpcTattle_DRO_Greeter, @@ -219,7 +219,7 @@ NpcData N(PassiveNPCs)[] = { }, .init = &N(EVS_NpcInit_Dryite_01), .settings = &N(NpcSettings_Dryite_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = DRYITE_YELLOW_ANIMS, .tattle = MSG_NpcTattle_DRO_DryiteA, @@ -230,7 +230,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 61, .init = &N(EVS_NpcInit_Dryite_02), .settings = &N(NpcSettings_Dryite), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = DRYITE_BLUE_ANIMS, .tattle = MSG_NpcTattle_DRO_DryiteD, @@ -241,7 +241,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 74, .init = &N(EVS_NpcInit_HintDryite), .settings = &N(NpcSettings_Dryite), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = DRYITE_GREEN_ANIMS, .tattle = MSG_NpcTattle_DRO_DryiteB, @@ -252,7 +252,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 257, .init = &N(EVS_NpcInit_Dryite_04), .settings = &N(NpcSettings_Dryite), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = DRYITE_GREEN_ANIMS, .tattle = MSG_NpcTattle_DRO_DryiteC, @@ -263,7 +263,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 271, .init = &N(EVS_NpcInit_Composer), .settings = &N(NpcSettings_Dryite), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { .idle = ANIM_Musician_Composer_Idle, @@ -291,7 +291,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 180, .init = &N(EVS_NpcInit_ShopOwner), .settings = &N(NpcSettings_Mouser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = MOUSER_PURPLE_ANIMS, .tattle = MSG_NpcTattle_DRO_ShopOwner, @@ -303,7 +303,7 @@ NpcData N(PassiveNPCs)[] = { .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_DRO, QUIZ_COUNT_DRO, QUIZ_MAP_DRO_01 }}, .settings = &N(NpcSettings_ChuckQuizmo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = { .idle = ANIM_ChuckQuizmo_Idle, @@ -343,7 +343,7 @@ NpcData N(PassiveNPCs)[] = { }, .init = &N(EVS_NpcInit_DojoGrad), .settings = &N(NpcSettings_Dryite_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = DRYITE_BROWN_ANIMS, .tattle = MSG_NpcTattle_DRO_DojoGraduate, @@ -382,7 +382,7 @@ NpcData N(ThreeSisterNPCs)[] = { .yaw = 62, .init = &N(EVS_NpcInit_Toadette), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidA, @@ -393,7 +393,7 @@ NpcData N(ThreeSisterNPCs)[] = { .yaw = 63, .init = &N(EVS_NpcInit_Toadette), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidB, @@ -404,7 +404,7 @@ NpcData N(ThreeSisterNPCs)[] = { .yaw = 244, .init = &N(EVS_NpcInit_Toadette), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidC, diff --git a/src/world/area_dro/dro_02/npc.c b/src/world/area_dro/dro_02/npc.c index ac0a2f2e91..9d98a9da11 100644 --- a/src/world/area_dro/dro_02/npc.c +++ b/src/world/area_dro/dro_02/npc.c @@ -374,7 +374,7 @@ NpcData N(PassiveNPCs)[] = { }, .init = &N(EVS_NpcInit_Archeologist), .settings = &N(NpcSettings_Archeologist), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { .idle = ANIM_Archeologist_Idle, @@ -414,7 +414,7 @@ NpcData N(PassiveNPCs)[] = { }, .init = &N(EVS_NpcInit_MrE), .settings = &N(NpcSettings_Dryite_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = DRYITE_BLUE_ANIMS, .tattle = MSG_NpcTattle_DRO_DryiteE, @@ -425,7 +425,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 90, .init = &N(EVS_NpcInit_DisguisedMoustafa), .settings = &N(NpcSettings_Mouser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = DISGUISED_MOUSTAFA_ANIMS, .tattle = MSG_NpcTattle_Sheek, @@ -436,7 +436,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 180, .init = &N(EVS_NpcInit_ToadHouseKeeper), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_DRO_ToadHouseToad, @@ -447,7 +447,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 180, .init = &N(EVS_NpcAuxAI_Merlee), .settings = &N(NpcSettings_Merlee), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldMerlee_Idle, @@ -475,7 +475,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Moustafa), .settings = &N(NpcSettings_Mouser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = MOUSTAFA_ANIMS, .tattle = MSG_NpcTattle_Moustafa, @@ -486,7 +486,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Dryite_02), .settings = &N(NpcSettings_Dryite), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = DRYITE_GREEN_ANIMS, .tattle = MSG_NpcTattle_DRO_DryiteF, @@ -497,7 +497,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Dryite_03), .settings = &N(NpcSettings_Dryite), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = DRYITE_GREEN_ANIMS, .tattle = MSG_NpcTattle_DRO_VisitedShootingStarSummit, @@ -508,7 +508,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 180, .init = &N(EVS_NpcInit_Mouser_01), .settings = &N(NpcSettings_Mouser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = MOUSER_BLUE_ANIMS, .tattle = MSG_NpcTattle_DRO_CrushingOnMerlee, @@ -519,7 +519,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Mouser_02), .settings = &N(NpcSettings_Mouser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = MOUSER_BLUE_ANIMS, .tattle = MSG_NpcTattle_DRO_TellsTales, @@ -530,7 +530,7 @@ NpcData N(PassiveNPCs)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Mouser_03), .settings = &N(NpcSettings_Mouser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = MOUSER_PURPLE_ANIMS, }, diff --git a/src/world/area_dro/dro_02/npc_moustafa.c b/src/world/area_dro/dro_02/npc_moustafa.c index f76c029bec..904e3acdee 100644 --- a/src/world/area_dro/dro_02/npc_moustafa.c +++ b/src/world/area_dro/dro_02/npc_moustafa.c @@ -256,7 +256,7 @@ EvtScript N(EVS_NpcInit_DisguisedMoustafa) = { CaseOrEq(dro_02_ENTRY_3) Call(SetNpcPos, NPC_SELF, 200, 0, -15) Call(InterpNpcYaw, NPC_SELF, 270, 0) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_200000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_FLIP_INSTANTLY, TRUE) Call(SetNpcAnimation, NPC_SELF, ANIM_DisguisedMoustafa_GrabCloak) EndCaseGroup CaseDefault diff --git a/src/world/area_dro/dro_02/rooms.c b/src/world/area_dro/dro_02/rooms.c index ab14184a4a..5e0ea56768 100644 --- a/src/world/area_dro/dro_02/rooms.c +++ b/src/world/area_dro/dro_02/rooms.c @@ -129,7 +129,7 @@ EvtScript N(EVS_RoomListener_Hideout) = { }; EvtScript N(EVS_OpenSecretDoor_FromOutside) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(DisablePlayerInput, TRUE) Call(func_802D2C14, 1) Call(PlayerMoveTo, 230, 10, 20) @@ -163,7 +163,7 @@ EvtScript N(EVS_OpenSecretDoor_FromOutside) = { }; EvtScript N(EVS_OpenSecretDoor_FromInside) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(DisablePlayerInput, TRUE) Call(func_802D2C14, 1) Call(PlayerMoveTo, 230, -70, 20) diff --git a/src/world/area_flo/common/FlowerSpawnRegion.inc.c b/src/world/area_flo/common/FlowerSpawnRegion.inc.c index 6cab4a68e6..23e6fc220f 100644 --- a/src/world/area_flo/common/FlowerSpawnRegion.inc.c +++ b/src/world/area_flo/common/FlowerSpawnRegion.inc.c @@ -2,7 +2,7 @@ #include "effects.h" EvtScript N(EVS_FlowerSpawnRegion) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) // save input args Set(LVarA, LVar0) // minX Set(LVarB, LVar1) // minZ diff --git a/src/world/area_flo/flo_00/beanstalk.c b/src/world/area_flo/flo_00/beanstalk.c index 369b7350ec..2fe252d2f1 100644 --- a/src/world/area_flo/flo_00/beanstalk.c +++ b/src/world/area_flo/flo_00/beanstalk.c @@ -466,7 +466,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { Call(func_802CF56C, 2) Call(DisablePlayerInput, FALSE) IfEq(GF_FLO00_PlacedFertileSoil, FALSE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Label(10) Call(ShowKeyChoicePopup) @@ -474,7 +474,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { Switch(LVar2) CaseLe(ITEM_NONE) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(AwaitPlayerLeave, -85, 85, 28) Return CaseEq(ITEM_FERTILE_SOIL) @@ -502,7 +502,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { Set(GF_FLO00_PlacedFertileSoil, TRUE) EndIf IfEq(GF_FLO00_PlacedMagicalBean, FALSE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Label(20) Call(ShowKeyChoicePopup) @@ -510,7 +510,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { Switch(LVar2) CaseLe(ITEM_NONE) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(AwaitPlayerLeave, -85, 85, 28) Return CaseEq(ITEM_MAGICAL_BEAN) @@ -539,7 +539,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { EndIf Set(GF_FLO00_PlacedMagicalBean, TRUE) EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Label(30) Call(ShowKeyChoicePopup) @@ -547,7 +547,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { Switch(LVar2) CaseLe(ITEM_NONE) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(AwaitPlayerLeave, -85, 85, 28) Return CaseEq(ITEM_MIRACLE_WATER) diff --git a/src/world/area_flo/flo_00/npc.c b/src/world/area_flo/flo_00/npc.c index 9c3ee3d166..4a194f6ed9 100644 --- a/src/world/area_flo/flo_00/npc.c +++ b/src/world/area_flo/flo_00/npc.c @@ -739,7 +739,7 @@ NpcData N(NpcData_Tolielup) = { .yaw = 90, .init = &N(EVS_NpcInit_Tolielup), .settings = &N(NpcSettings_Tolielup), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOLIELUP_ANIMS, .tattle = MSG_NpcTattle_Tolielup, @@ -751,7 +751,7 @@ NpcData N(NpcData_Klevar) = { .yaw = 0, .init = &N(EVS_NpcInit_Klevar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = KLEVAR_ANIMS, }; @@ -762,7 +762,7 @@ NpcData N(NpcData_Lakilulu) = { .yaw = 270, .init = &N(EVS_NpcInit_Lakilulu), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = { .idle = ANIM_Lakilulu_Idle, diff --git a/src/world/area_flo/flo_03/npc.c b/src/world/area_flo/flo_03/npc.c index 3027018f0f..e3d71241a9 100644 --- a/src/world/area_flo/flo_03/npc.c +++ b/src/world/area_flo/flo_03/npc.c @@ -233,11 +233,11 @@ EvtScript N(EVS_NpcInteract_Petunia) = { Set(LVar4, Float(90.0)) ExecWait(N(EVS_FocusCamBetween)) Call(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0057) - Call(SetEnemyFlagBits, NPC_Dayzee, ENEMY_FLAG_PASSIVE, 0) - Call(SetEnemyFlagBits, NPC_MontyMole_01, ENEMY_FLAG_PASSIVE, 0) - Call(SetEnemyFlagBits, NPC_MontyMole_02, ENEMY_FLAG_PASSIVE, 0) - Call(SetEnemyFlagBits, NPC_MontyMole_03, ENEMY_FLAG_PASSIVE, 0) - Call(SetEnemyFlagBits, NPC_MontyMole_04, ENEMY_FLAG_PASSIVE, 0) + Call(SetEnemyFlagBits, NPC_Dayzee, ENEMY_FLAG_PASSIVE, FALSE) + Call(SetEnemyFlagBits, NPC_MontyMole_01, ENEMY_FLAG_PASSIVE, FALSE) + Call(SetEnemyFlagBits, NPC_MontyMole_02, ENEMY_FLAG_PASSIVE, FALSE) + Call(SetEnemyFlagBits, NPC_MontyMole_03, ENEMY_FLAG_PASSIVE, FALSE) + Call(SetEnemyFlagBits, NPC_MontyMole_04, ENEMY_FLAG_PASSIVE, FALSE) Call(BindNpcAI, NPC_Dayzee, Ref(N(EVS_NpcAI_Dayzee))) Set(MV_PauseBurrowing, FALSE) Set(MV_NextBurrowTriggerRadius, 60) @@ -297,7 +297,7 @@ EvtScript N(EVS_NpcInit_Dayzee) = { Call(SetNpcPos, NPC_Dayzee, NPC_DISPOSE_LOCATION) CaseDefault IfEq(GF_FLO03_Defeated_Dayzee, FALSE) - Call(SetEnemyFlagBits, NPC_Dayzee, ENEMY_FLAG_PASSIVE, 0) + Call(SetEnemyFlagBits, NPC_Dayzee, ENEMY_FLAG_PASSIVE, FALSE) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcAI_Dayzee))) Else Call(SetNpcPos, NPC_Dayzee, NPC_DISPOSE_LOCATION) @@ -404,7 +404,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { Call(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) Call(ShowEmote, NPC_MontyMole_01, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) Wait(LVar1) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, TRUE) EndIf Call(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_DIG, SOUND_SPACE_DEFAULT) Call(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim11) @@ -432,7 +432,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { Call(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_SURFACE, SOUND_SPACE_DEFAULT) Call(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim10) Wait(10) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, FALSE) Call(RandInt, 30, LVar0) Add(LVar0, 60) Set(MV_NextBurrowTime_Mole_01, LVar0) @@ -483,7 +483,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { Call(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) Call(ShowEmote, NPC_MontyMole_02, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) Wait(LVar1) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, TRUE) EndIf Call(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_BURROW_DIG, SOUND_SPACE_DEFAULT) Call(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim11) @@ -511,7 +511,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { Call(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_BURROW_SURFACE, SOUND_SPACE_DEFAULT) Call(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim10) Wait(10) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, FALSE) Call(RandInt, 35, LVar0) Add(LVar0, 55) Set(MV_NextBurrowTime_Mole_02, LVar0) @@ -562,7 +562,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { Call(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) Call(ShowEmote, NPC_MontyMole_03, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) Wait(LVar1) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, TRUE) EndIf Call(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_BURROW_DIG, SOUND_SPACE_DEFAULT) Call(SetNpcAnimation, NPC_MontyMole_03, ANIM_MontyMole_Dark_Anim11) @@ -590,7 +590,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { Call(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_BURROW_SURFACE, SOUND_SPACE_DEFAULT) Call(SetNpcAnimation, NPC_MontyMole_03, ANIM_MontyMole_Dark_Anim10) Wait(10) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, FALSE) Call(RandInt, 40, LVar0) Add(LVar0, 50) Set(MV_NextBurrowTime_Mole_03, LVar0) @@ -641,7 +641,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { Call(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) Call(ShowEmote, NPC_MontyMole_04, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) Wait(LVar1) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, TRUE) EndIf Call(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_BURROW_DIG, SOUND_SPACE_DEFAULT) Call(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim11) @@ -669,7 +669,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { Call(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_BURROW_SURFACE, SOUND_SPACE_DEFAULT) Call(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim10) Wait(10) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, FALSE) Call(RandInt, 45, LVar0) Add(LVar0, 45) Set(MV_NextBurrowTime_Mole_04, LVar0) @@ -697,7 +697,7 @@ EvtScript N(EVS_NpcInit_MontyMole_01) = { IfEq(GF_FLO03_Defeated_MontyMoleA, FALSE) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_MontyMole_01))) Call(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim10) - Call(SetEnemyFlagBits, NPC_MontyMole_01, ENEMY_FLAG_PASSIVE, 0) + Call(SetEnemyFlagBits, NPC_MontyMole_01, ENEMY_FLAG_PASSIVE, FALSE) Else Call(SetNpcPos, NPC_MontyMole_01, NPC_DISPOSE_LOCATION) EndIf @@ -720,7 +720,7 @@ EvtScript N(EVS_NpcInit_MontyMole_02) = { IfEq(GF_FLO03_Defeated_MontyMoleB, FALSE) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_MontyMole_02))) Call(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim10) - Call(SetEnemyFlagBits, NPC_MontyMole_02, ENEMY_FLAG_PASSIVE, 0) + Call(SetEnemyFlagBits, NPC_MontyMole_02, ENEMY_FLAG_PASSIVE, FALSE) Else Call(SetNpcPos, NPC_MontyMole_02, NPC_DISPOSE_LOCATION) EndIf @@ -743,7 +743,7 @@ EvtScript N(EVS_NpcInit_MontyMole_03) = { IfEq(GF_FLO03_Defeated_MontyMoleC, FALSE) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_MontyMole_03))) Call(SetNpcAnimation, NPC_MontyMole_03, ANIM_MontyMole_Dark_Anim10) - Call(SetEnemyFlagBits, NPC_MontyMole_03, ENEMY_FLAG_PASSIVE, 0) + Call(SetEnemyFlagBits, NPC_MontyMole_03, ENEMY_FLAG_PASSIVE, FALSE) Else Call(SetNpcPos, NPC_MontyMole_03, NPC_DISPOSE_LOCATION) EndIf @@ -766,7 +766,7 @@ EvtScript N(EVS_NpcInit_MontyMole_04) = { IfEq(GF_FLO03_Defeated_MontyMoleD, FALSE) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_MontyMole_04))) Call(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim10) - Call(SetEnemyFlagBits, NPC_MontyMole_04, ENEMY_FLAG_PASSIVE, 0) + Call(SetEnemyFlagBits, NPC_MontyMole_04, ENEMY_FLAG_PASSIVE, FALSE) Else Call(SetNpcPos, NPC_MontyMole_04, NPC_DISPOSE_LOCATION) EndIf @@ -783,7 +783,7 @@ NpcData N(NpcData_Petunia) = { .yaw = 270, .init = &N(EVS_NpcInit_Petunia), .settings = &N(NpcSettings_Petunia), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = { .idle = ANIM_Petunia_Idle, @@ -812,7 +812,7 @@ NpcData N(NpcData_Dayzee) = { .yaw = 90, .init = &N(EVS_NpcInit_Dayzee), .settings = &N(NpcSettings_Dayzee), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = { .idle = ANIM_Dayzee_Anim01, @@ -840,7 +840,7 @@ NpcData N(NpcData_MontyMole_01) = { .yaw = 90, .init = &N(EVS_NpcInit_MontyMole_01), .settings = &N(NpcSettings_Dayzee), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_MontyMole_Dark_Anim01, @@ -868,7 +868,7 @@ NpcData N(NpcData_MontyMole_02) = { .yaw = 90, .init = &N(EVS_NpcInit_MontyMole_02), .settings = &N(NpcSettings_Dayzee), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_MontyMole_Dark_Anim01, @@ -896,7 +896,7 @@ NpcData N(NpcData_MontyMole_03) = { .yaw = 270, .init = &N(EVS_NpcInit_MontyMole_03), .settings = &N(NpcSettings_Dayzee), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_MontyMole_Dark_Anim01, @@ -924,7 +924,7 @@ NpcData N(NpcData_MontyMole_04) = { .yaw = 270, .init = &N(EVS_NpcInit_MontyMole_04), .settings = &N(NpcSettings_Dayzee), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_MontyMole_Dark_Anim01, diff --git a/src/world/area_flo/flo_07/npc.c b/src/world/area_flo/flo_07/npc.c index 227fdaa1a4..aee6716a6d 100644 --- a/src/world/area_flo/flo_07/npc.c +++ b/src/world/area_flo/flo_07/npc.c @@ -237,7 +237,7 @@ NpcData N(NpcData_Posie) = { .yaw = 90, .init = &N(EVS_NpcInit_Posie), .settings = &N(NpcSettings_Posie), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = POSIE_ANIMS, .tattle = MSG_NpcTattle_Posie, diff --git a/src/world/area_flo/flo_08/npc.c b/src/world/area_flo/flo_08/npc.c index 0625168eaa..2b65ec529b 100644 --- a/src/world/area_flo/flo_08/npc.c +++ b/src/world/area_flo/flo_08/npc.c @@ -164,7 +164,7 @@ NpcData N(NpcData_GateFlower) = { .yaw = 270, .init = &N(EVS_NpcInit_GateFlower), .settings = &N(NpcSettings_GateFlower), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = GATE_FLOWER_YELLOW_ANIMS, .tattle = MSG_NpcTattle_YellowGateFlower, diff --git a/src/world/area_flo/flo_09/npc.c b/src/world/area_flo/flo_09/npc.c index 0692d7515a..67d6ccf71c 100644 --- a/src/world/area_flo/flo_09/npc.c +++ b/src/world/area_flo/flo_09/npc.c @@ -145,7 +145,7 @@ NpcData N(NpcData_Bzzap_02) = { }, .init = &N(EVS_NpcInit_Bzzap_02), .settings = &N(NpcSettings_Bzzap_02), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BZZAP_DROPS, .animations = BZZAP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_flo/flo_10/npc.c b/src/world/area_flo/flo_10/npc.c index d1b9e3aa01..8b321d28d9 100644 --- a/src/world/area_flo/flo_10/npc.c +++ b/src/world/area_flo/flo_10/npc.c @@ -36,14 +36,14 @@ EvtScript N(EVS_OnInteract_WaterStoneSocket) = { Return EndIf Call(DisablePlayerInput, TRUE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowKeyChoicePopup) Set(LVar2, LVar0) Switch(LVar2) CaseEq(-1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Wait(10 * DT) Call(SpeakToPlayer, NPC_Lily, ANIM_Lily_TalkPlead, ANIM_Lily_IdlePlead, 0, MSG_CH6_0081) CaseDefault @@ -59,7 +59,7 @@ EvtScript N(EVS_OnInteract_WaterStoneSocket) = { Call(MakeItemEntity, ITEM_WATER_STONE, 0, -60, 6, ITEM_SPAWN_MODE_DECORATION, 0) Set(LVarA, LVar0) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) ExecWait(N(EVS_Scene_ReleaseFountain)) EndSwitch Call(DisablePlayerInput, FALSE) @@ -159,7 +159,7 @@ EvtScript N(EVS_NpcInteract_Lily) = { EndSwitch Wait(10 * DT) Set(GF_FLO10_LilyRequestedWaterStone, TRUE) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_400000, 0) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, FALSE) Else Call(SpeakToPlayer, NPC_SELF, ANIM_Lily_TalkPlead, ANIM_Lily_IdlePlead, 5, MSG_CH6_007F) EndIf @@ -188,7 +188,7 @@ EvtScript N(EVS_NpcInit_Lily) = { IfEq(GF_FLO10_LilyRequestedWaterStone, FALSE) Call(SetNpcAnimation, NPC_SELF, ANIM_Lily_IdlePlead) Call(InterpNpcYaw, NPC_SELF, 90, 1) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_400000, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, TRUE) EndIf CaseEq(STORY_CH6_GOT_WATER_STONE) Call(InterpNpcYaw, NPC_SELF, 270, 1) @@ -205,7 +205,7 @@ NpcData N(NpcData_Lily) = { .yaw = 270, .init = &N(EVS_NpcInit_Lily), .settings = &N(NpcSettings_Lily), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = LILY_ANIMS, .tattle = MSG_NpcTattle_Lily, diff --git a/src/world/area_flo/flo_11/main.c b/src/world/area_flo/flo_11/main.c index 5b32316a72..2b78ee3573 100644 --- a/src/world/area_flo/flo_11/main.c +++ b/src/world/area_flo/flo_11/main.c @@ -16,7 +16,7 @@ EvtScript N(EVS_ExitWalk_flo_12_0) = EVT_EXIT_WALK(60, flo_11_ENTRY_1, "flo_12", // template for GotoMap exits used with pipes in the maze #define Goto_MAP(mapName, entry) \ { \ - SetGroup(EVT_GROUP_1B) \ + SetGroup(EVT_GROUP_EXIT_MAP) \ Call(GotoMap, Ref(mapName), entry) \ Wait(100) \ Return \ diff --git a/src/world/area_flo/flo_11/npc.c b/src/world/area_flo/flo_11/npc.c index a3042d8e71..c15ae73e72 100644 --- a/src/world/area_flo/flo_11/npc.c +++ b/src/world/area_flo/flo_11/npc.c @@ -375,7 +375,7 @@ NpcData N(NpcData_Lakitus)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Lakitu_01), .settings = &N(NpcSettings_Lakitu), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, }, @@ -385,7 +385,7 @@ NpcData N(NpcData_Lakitus)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Lakitu_02), .settings = &N(NpcSettings_Lakitu), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, }, diff --git a/src/world/area_flo/flo_12/npc.c b/src/world/area_flo/flo_12/npc.c index a8d6d1a292..3dfaca618d 100644 --- a/src/world/area_flo/flo_12/npc.c +++ b/src/world/area_flo/flo_12/npc.c @@ -196,7 +196,7 @@ NpcData N(NpcData_Rosie)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Rosie), .settings = &N(NpcSettings_Rosie), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = ROSIE_ANIMS, .tattle = MSG_NpcTattle_Rosie, diff --git a/src/world/area_flo/flo_13/npc.c b/src/world/area_flo/flo_13/npc.c index 0b4787277d..5ed1f8987a 100644 --- a/src/world/area_flo/flo_13/npc.c +++ b/src/world/area_flo/flo_13/npc.c @@ -599,7 +599,7 @@ NpcData N(NpcData_Lakilester) = { .yaw = 90, .init = &N(EVS_NpcInit_Lakilester), .settings = &N(NpcSettings_Lakilester), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldLakilester_Idle, @@ -627,7 +627,7 @@ NpcData N(NpcData_Lakilulu) = { .yaw = 90, .init = &N(EVS_NpcInit_Lakilulu), .settings = &N(NpcSettings_Lakilester), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = { .idle = ANIM_Lakilulu_Idle, @@ -656,7 +656,7 @@ NpcData N(NpcData_Lakilulu_Spiny) = { .yaw = 90, .init = &N(EVS_NpcInit_Lakilulu_Spiny), .settings = &N(NpcSettings_Lakilester), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_Lakilulu_Idle, @@ -744,7 +744,7 @@ NpcData N(NpcData_Spiny_01) = { }, .init = &N(EVS_NpcInit_Spiny), .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -768,7 +768,7 @@ NpcData N(NpcData_Spiny_02) = { }, .init = &N(EVS_NpcInit_Spiny), .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -792,7 +792,7 @@ NpcData N(NpcData_Spiny_03) = { }, .init = &N(EVS_NpcInit_Spiny), .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -816,7 +816,7 @@ NpcData N(NpcData_Spiny_04) = { }, .init = &N(EVS_NpcInit_Spiny), .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -840,7 +840,7 @@ NpcData N(NpcData_Spiny_05) = { }, .init = &N(EVS_NpcInit_Spiny), .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -864,7 +864,7 @@ NpcData N(NpcData_Spiny_06) = { }, .init = &N(EVS_NpcInit_Spiny), .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_flo/flo_14/bubbles.c b/src/world/area_flo/flo_14/bubbles.c index 3bd9cc4543..9f9aa61d9f 100644 --- a/src/world/area_flo/flo_14/bubbles.c +++ b/src/world/area_flo/flo_14/bubbles.c @@ -291,7 +291,7 @@ void N(gfx_build_bubble_flower)(void) { } EvtScript N(EVS_ManageBlownBubble) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Set(LVarF, LVar0) Label(0) IfEq(AF_FLO_PauseBlowingBubbles, TRUE) diff --git a/src/world/area_flo/flo_14/npc.c b/src/world/area_flo/flo_14/npc.c index d9d4d61ca4..6092048d1d 100644 --- a/src/world/area_flo/flo_14/npc.c +++ b/src/world/area_flo/flo_14/npc.c @@ -84,7 +84,7 @@ NpcData N(NpcData_BubbleFlower) = { .yaw = 270, .init = &N(EVS_NpcInit_BubbleFlower), .settings = &N(NpcSettings_BubbleFlower), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_HAS_NO_SPRITE, .drops = NO_DROPS, .animations = BUBULB_PINK_ANIMS, .tattle = MSG_NpcTattle_BubblePlant, diff --git a/src/world/area_flo/flo_15/npc.c b/src/world/area_flo/flo_15/npc.c index 3fc66c3afe..f14ddc5f10 100644 --- a/src/world/area_flo/flo_15/npc.c +++ b/src/world/area_flo/flo_15/npc.c @@ -205,7 +205,7 @@ NpcData N(NpcData_Sun)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Sun_01), .settings = &N(NpcSettings_Sun), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = SUN_ANIMS, .tattle = MSG_NpcTattle_TheSun, @@ -216,7 +216,7 @@ NpcData N(NpcData_Sun)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Sun_02), .settings = &N(NpcSettings_Sun), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_8000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_USE_INSPECT_ICON, .drops = NO_DROPS, .animations = SUN_ANIMS, .tattle = MSG_NpcTattle_TheSun, diff --git a/src/world/area_flo/flo_17/npc.c b/src/world/area_flo/flo_17/npc.c index 4ceb5ab503..028450adff 100644 --- a/src/world/area_flo/flo_17/npc.c +++ b/src/world/area_flo/flo_17/npc.c @@ -69,7 +69,7 @@ NpcData N(NpcData_Spiny_01) = { } }, .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -92,7 +92,7 @@ NpcData N(NpcData_Spiny_02) = { } }, .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -115,7 +115,7 @@ NpcData N(NpcData_Spiny_03) = { } }, .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -138,7 +138,7 @@ NpcData N(NpcData_Spiny_04) = { } }, .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_flo/flo_18/machine.c b/src/world/area_flo/flo_18/machine.c index 4c76ee36e7..0429c83de0 100644 --- a/src/world/area_flo/flo_18/machine.c +++ b/src/world/area_flo/flo_18/machine.c @@ -22,7 +22,7 @@ API_CALLABLE(N(SetMachineLightningColor)) { } EvtScript N(EVS_AnimateMachineLightning) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Loop(0) PlayEffect(EFFECT_LIGHTNING_BOLT, 0, Float(-16.0), Float(102.0), Float(-4.1), Float(80.9), Float(102.0), Float(-4.1), Float(0.5), 6) Call(N(SetMachineLightningColor)) diff --git a/src/world/area_flo/flo_18/npc.c b/src/world/area_flo/flo_18/npc.c index f9b113b321..ea6c8e226b 100644 --- a/src/world/area_flo/flo_18/npc.c +++ b/src/world/area_flo/flo_18/npc.c @@ -605,7 +605,7 @@ NpcData N(NpcData_MachineGang)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Lakitu_01), .settings = &N(NpcSettings_Lakitu), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, @@ -616,7 +616,7 @@ NpcData N(NpcData_MachineGang)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Lakitu_02), .settings = &N(NpcSettings_Lakitu), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, @@ -627,7 +627,7 @@ NpcData N(NpcData_MachineGang)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Lakitu_03), .settings = &N(NpcSettings_Lakitu), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, @@ -638,7 +638,7 @@ NpcData N(NpcData_MachineGang)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Magikoopa), .settings = &N(NpcSettings_Magikoopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = MAGINO_DROPS, .animations = MAGIKOOPA_YELLOW_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, @@ -649,7 +649,7 @@ NpcData N(NpcData_MachineGang)[] = { .yaw = 270, .init = &N(EVS_NpcInit_FlyingMagikoopa), .settings = &N(NpcSettings_Magikoopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = MAGINO_DROPS, .animations = FLYING_MAGIKOOPA_YELLOW_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, diff --git a/src/world/area_flo/flo_19/clouds.c b/src/world/area_flo/flo_19/clouds.c index 8f15c31918..4b3aff5de8 100644 --- a/src/world/area_flo/flo_19/clouds.c +++ b/src/world/area_flo/flo_19/clouds.c @@ -25,7 +25,7 @@ API_CALLABLE(N(CosInterpAbsMinMax)) { } EvtScript N(EVS_AnimatePlatforms) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Set(LVarF, 0) Label(0) SetF(LVar0, Float(-215.4375)) diff --git a/src/world/area_flo/flo_21/npc.c b/src/world/area_flo/flo_21/npc.c index d430721329..bc6d79657b 100644 --- a/src/world/area_flo/flo_21/npc.c +++ b/src/world/area_flo/flo_21/npc.c @@ -510,7 +510,7 @@ EvtScript N(EVS_NpcDefeat_HuffNPuff_Main) = { Call(GetBattleOutcome, LVar0) Switch(LVar0) CaseEq(OUTCOME_PLAYER_WON) - Call(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_1, TRUE) + Call(SetEncounterStatusFlags, ENCOUNTER_FLAG_THUMBS_UP, TRUE) Call(SetNpcYaw, NPC_PARTNER, 90) Call(GetPlayerPos, LVar0, LVar1, LVar3) Call(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) @@ -532,7 +532,7 @@ EvtScript N(EVS_NpcDefeat_HuffNPuff_Aux) = { EvtScript N(EVS_NpcInit_HuffNPuff_Face) = { IfLt(GB_StoryProgress, STORY_CH6_DEFEATED_HUFF_N_PUFF) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_400000, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, TRUE) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_HuffNPuff_01))) Call(BindNpcDefeat, NPC_SELF, Ref(N(EVS_NpcDefeat_HuffNPuff_Main))) Call(SetNpcAnimation, NPC_SELF, ANIM_HuffNPuff_Anim02) @@ -545,7 +545,7 @@ EvtScript N(EVS_NpcInit_HuffNPuff_Face) = { EvtScript N(EVS_NpcInit_HuffNPuff_Body) = { IfLt(GB_StoryProgress, STORY_CH6_DEFEATED_HUFF_N_PUFF) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_400000, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, TRUE) Call(BindNpcDefeat, NPC_SELF, Ref(N(EVS_NpcDefeat_HuffNPuff_Aux))) Call(SetNpcAnimation, NPC_SELF, ANIM_HuffNPuff_Anim01) Exec(N(EVS_HuffNPuff_AnimateBodyScale)) @@ -558,7 +558,7 @@ EvtScript N(EVS_NpcInit_HuffNPuff_Body) = { EvtScript N(EVS_NpcInit_HuffNPuff_Arms) = { IfLt(GB_StoryProgress, STORY_CH6_DEFEATED_HUFF_N_PUFF) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_400000, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, TRUE) Call(BindNpcDefeat, NPC_SELF, Ref(N(EVS_NpcDefeat_HuffNPuff_Aux))) Call(SetNpcAnimation, NPC_SELF, ANIM_HuffNPuff_Anim19) Else @@ -594,7 +594,7 @@ NpcData N(NpcData_HuffNPuff)[] = { .yaw = 270, .init = &N(EVS_NpcInit_HuffNPuff_Face), .settings = &N(NpcSettings_HuffNPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = NO_DROPS, .animations = HUFF_N_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_HuffNPuff), @@ -605,7 +605,7 @@ NpcData N(NpcData_HuffNPuff)[] = { .yaw = 270, .init = &N(EVS_NpcInit_HuffNPuff_Body), .settings = &N(NpcSettings_HuffNPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = NO_DROPS, .animations = HUFF_N_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_HuffNPuff), @@ -616,7 +616,7 @@ NpcData N(NpcData_HuffNPuff)[] = { .yaw = 270, .init = &N(EVS_NpcInit_HuffNPuff_Arms), .settings = &N(NpcSettings_HuffNPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = NO_DROPS, .animations = HUFF_N_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_HuffNPuff), @@ -635,7 +635,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -646,7 +646,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -657,7 +657,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -668,7 +668,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -679,7 +679,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -690,7 +690,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -701,7 +701,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -712,7 +712,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -723,7 +723,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -734,7 +734,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -745,7 +745,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -756,7 +756,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -767,7 +767,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -778,7 +778,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), @@ -789,7 +789,7 @@ NpcData N(NpcData_RuffPuffs)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff), .settings = &N(NpcSettings_RuffPuff), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RUFF_PUFF_ANIMS, .extraAnimations = N(ExtraAnims_RuffPuff), diff --git a/src/world/area_flo/flo_22/npc.c b/src/world/area_flo/flo_22/npc.c index d3e022cd59..232210bf52 100644 --- a/src/world/area_flo/flo_22/npc.c +++ b/src/world/area_flo/flo_22/npc.c @@ -110,7 +110,7 @@ NpcData N(NpcData_Bzzap) = { .yaw = 270, .init = &N(EVS_NpcInit_Bzzap), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = BZZAP_ANIMS, }; @@ -121,7 +121,7 @@ NpcData N(NpcData_Dayzee) = { .yaw = 270, .init = &N(EVS_NpcInit_Dayzee), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_flo/flo_23/npc.c b/src/world/area_flo/flo_23/npc.c index 5d27852054..32b296ff1f 100644 --- a/src/world/area_flo/flo_23/npc.c +++ b/src/world/area_flo/flo_23/npc.c @@ -164,7 +164,7 @@ NpcData N(NpcData_GateFlower) = { .yaw = 90, .init = &N(EVS_NpcInit_GateFlower), .settings = &N(NpcSettings_GateFlower), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = GATE_FLOWER_BLUE_ANIMS, .tattle = MSG_NpcTattle_BlueGateFlower, diff --git a/src/world/area_flo/flo_25/npc.c b/src/world/area_flo/flo_25/npc.c index 709bc02301..600617370e 100644 --- a/src/world/area_flo/flo_25/npc.c +++ b/src/world/area_flo/flo_25/npc.c @@ -164,7 +164,7 @@ NpcData N(NpcData_GateFlower) = { .yaw = 90, .init = &N(EVS_NpcInit_GateFlower), .settings = &N(NpcSettings_GateFlower), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = GATE_FLOWER_RED_ANIMS, .tattle = MSG_NpcTattle_RedGateFlower, diff --git a/src/world/area_hos/common/FallingStars.inc.c b/src/world/area_hos/common/FallingStars.inc.c index d93ecf4400..6d11a239ce 100644 --- a/src/world/area_hos/common/FallingStars.inc.c +++ b/src/world/area_hos/common/FallingStars.inc.c @@ -127,9 +127,9 @@ EvtScript N(EVS_Starfall_Directed) = { #define LV_Time LVarD #define LV_SoundDelay LVarE #if VERSION_JP - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) #else - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) #endif Set(LV_Time, 0) Set(LV_SoundDelay, 0) @@ -194,7 +194,7 @@ EvtScript N(EVS_Starfall_Directed) = { }; EvtScript N(EVS_Starfall_Random) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Thread Label(0) Call(RandInt, 50, LVar0) diff --git a/src/world/area_hos/hos_00/main.c b/src/world/area_hos/hos_00/main.c index 7a7d255292..b4a373c0de 100644 --- a/src/world/area_hos/hos_00/main.c +++ b/src/world/area_hos/hos_00/main.c @@ -3,7 +3,7 @@ #include "../common/FallingStars.inc.c" EvtScript N(EVS_ExitWalk_osr) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, hos_00_ENTRY_0) Exec(ExitWalk) Switch(GB_StoryProgress) @@ -29,7 +29,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_TexPan_Unknown) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Set(LVar0, 0) Loop(0) Call(SetTexPanOffset, TEX_PANNER_D, TEX_PANNER_MAIN, LVar0, 0) diff --git a/src/world/area_hos/hos_00/npc.c b/src/world/area_hos/hos_00/npc.c index a90720b9eb..cfc33991c4 100644 --- a/src/world/area_hos/hos_00/npc.c +++ b/src/world/area_hos/hos_00/npc.c @@ -129,7 +129,7 @@ NpcData N(NpcData_Twink) = { .yaw = 90, .init = &N(EVS_NpcInit_Twink), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = TWINK_ANIMS, }; @@ -140,7 +140,7 @@ NpcData N(NpcData_FlyingMagikoopa) = { .yaw = 270, .init = &N(EVS_NpcInit_FlyingMagikoopa), .settings = &N(NpcSettings_FlyingMagikoopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = FLYING_MAGIKOOPA_ANIMS, }; diff --git a/src/world/area_hos/hos_00/scenes.c b/src/world/area_hos/hos_00/scenes.c index 2ec8b94dc2..beed3bbd11 100644 --- a/src/world/area_hos/hos_00/scenes.c +++ b/src/world/area_hos/hos_00/scenes.c @@ -572,7 +572,7 @@ EvtScript N(EVS_Scene_TwinkDeparts) = { Call(SetPlayerAnimation, ANIM_Mario1_Idle) Thread Set(GB_StoryProgress, STORY_CH0_TWINK_GAVE_LUCKY_STAR) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(ResetCam, CAM_DEFAULT, Float(4.0 / DT)) EndThread Wait(10 * DT) diff --git a/src/world/area_hos/hos_01/main.c b/src/world/area_hos/hos_01/main.c index d793d795c8..e537a85403 100644 --- a/src/world/area_hos/hos_01/main.c +++ b/src/world/area_hos/hos_01/main.c @@ -14,7 +14,7 @@ EvtScript N(EVS_GotoMap_kmr_24_0) = { EvtScript N(EVS_ExitWalk_hos_00_1) = EVT_EXIT_WALK(60, hos_01_ENTRY_0, "hos_00", hos_00_ENTRY_1); EvtScript N(EVS_ExitStarBeam) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) IfLt(GB_StoryProgress, STORY_CH8_OPENED_PATH_TO_STAR_WAY) Return EndIf diff --git a/src/world/area_hos/hos_01/star_way.c b/src/world/area_hos/hos_01/star_way.c index 455a5c67a8..02ade9983c 100644 --- a/src/world/area_hos/hos_01/star_way.c +++ b/src/world/area_hos/hos_01/star_way.c @@ -79,7 +79,7 @@ EvtScript N(EVS_Scene_StarWayOpened) = { Call(ResetCam, CAM_DEFAULT, Float(5.0)) Set(GB_StoryProgress, STORY_CH8_OPENED_PATH_TO_STAR_WAY) Call(SetMusicTrack, 0, SONG_SHOOTING_STAR_SUMMIT, 0, 8) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(DisablePlayerInput, FALSE) Return End diff --git a/src/world/area_hos/hos_02/main.c b/src/world/area_hos/hos_02/main.c index 9d51d953c1..628dded37a 100644 --- a/src/world/area_hos/hos_02/main.c +++ b/src/world/area_hos/hos_02/main.c @@ -1,7 +1,7 @@ #include "hos_02.h" EvtScript N(EVS_ExitStarBeam) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(GetPartnerInUse, LVar0) IfNe(LVar0, PARTNER_NONE) diff --git a/src/world/area_hos/hos_04/main.c b/src/world/area_hos/hos_04/main.c index 357a071b3b..20365571e4 100644 --- a/src/world/area_hos/hos_04/main.c +++ b/src/world/area_hos/hos_04/main.c @@ -4,7 +4,7 @@ EvtScript N(EVS_ExitWalk_hos_03_1) = EVT_EXIT_WALK(60, hos_04_ENTRY_0, "hos_03", #if VERSION_JP EvtScript N(EVS_ExitWalk_hos_05_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o162, COLLIDER_FLAGS_UPPER_MASK) Call(UseExitHeading, 60, hos_04_ENTRY_1) Exec(ExitWalk) diff --git a/src/world/area_hos/hos_06/chest.c b/src/world/area_hos/hos_06/chest.c index 9af1627faa..a9a9c1bfd8 100644 --- a/src/world/area_hos/hos_06/chest.c +++ b/src/world/area_hos/hos_06/chest.c @@ -19,11 +19,11 @@ s32** N(varStash) = NULL; #define NAME_SUFFIX EvtScript N(EVS_Chest_ShowGotItem) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_FULL) Wait(40) Call(ShowGotItem, LVar0, FALSE, 0) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return Return End @@ -190,10 +190,10 @@ EvtScript N(EVS_Interact_MagicChest_Mario) = { CaseOrEq(ITEM_POWER_RUSH) CaseOrEq(ITEM_DEEP_FOCUS_A) CaseOrEq(ITEM_LAST_STAND) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_FULL) Call(ShowGotItem, LVar0, FALSE, 0) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(AddBadge, LVar0, LVar1) Call(N(SetItemRetrieved)) EndCaseGroup diff --git a/src/world/area_hos/hos_06/merlow.c b/src/world/area_hos/hos_06/merlow.c index 180254102e..eb2e40e858 100644 --- a/src/world/area_hos/hos_06/merlow.c +++ b/src/world/area_hos/hos_06/merlow.c @@ -263,7 +263,7 @@ NpcData N(NpcData_Merluvlee)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Merluvlee_Passthrough), .settings = &N(NpcSettings_Merluvlee), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL, .drops = NO_DROPS, .animations = { .idle = ANIM_Merluvlee_Idle, @@ -276,7 +276,7 @@ NpcData N(NpcData_Merluvlee)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Merlow), .settings = &N(NpcSettings_Merlow), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL, .drops = NO_DROPS, .animations = { .idle = ANIM_Merlow_Idle, diff --git a/src/world/area_hos/hos_10/npc1.c b/src/world/area_hos/hos_10/npc1.c index c983d96988..0aaec104e4 100644 --- a/src/world/area_hos/hos_10/npc1.c +++ b/src/world/area_hos/hos_10/npc1.c @@ -131,7 +131,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Peach), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_PLAYER_SPRITE, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_PLAYER_SPRITE, .drops = NO_DROPS, .animations = { .idle = ANIM_Peach1_Still, @@ -159,7 +159,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Twink), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_Twink), @@ -170,7 +170,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Eldstar), @@ -181,7 +181,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Mamar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = MAMAR_ANIMS, .extraAnimations = N(ExtraAnims_Mamar), @@ -192,7 +192,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Skolar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = SKOLAR_ANIMS, .extraAnimations = N(ExtraAnims_Skolar), @@ -203,7 +203,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Muskular), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, .extraAnimations = N(ExtraAnims_Muskular), @@ -214,7 +214,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Misstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Misstar), @@ -225,7 +225,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Klevar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KLEVAR_ANIMS, .extraAnimations = N(ExtraAnims_Klevar), @@ -236,7 +236,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Kalmar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KALMAR_ANIMS, .extraAnimations = N(ExtraAnims_Kalmar), diff --git a/src/world/area_hos/hos_10/npc2.c b/src/world/area_hos/hos_10/npc2.c index cdcdcc9308..a0185b4175 100644 --- a/src/world/area_hos/hos_10/npc2.c +++ b/src/world/area_hos/hos_10/npc2.c @@ -116,7 +116,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Twink), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_Twink), @@ -127,7 +127,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Eldstar), @@ -138,7 +138,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Mamar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = MAMAR_ANIMS, .extraAnimations = N(ExtraAnims_Mamar), @@ -149,7 +149,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Skolar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = SKOLAR_ANIMS, .extraAnimations = N(ExtraAnims_Skolar), @@ -160,7 +160,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Muskular), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, .extraAnimations = N(ExtraAnims_Muskular), @@ -171,7 +171,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Misstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Misstar), @@ -182,7 +182,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Klevar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KLEVAR_ANIMS, .extraAnimations = N(ExtraAnims_Klevar), @@ -193,7 +193,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Kalmar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KALMAR_ANIMS, .extraAnimations = N(ExtraAnims_Kalmar), diff --git a/src/world/area_hos/hos_20/main.c b/src/world/area_hos/hos_20/main.c index 87017db43b..7b37437963 100644 --- a/src/world/area_hos/hos_20/main.c +++ b/src/world/area_hos/hos_20/main.c @@ -3,7 +3,7 @@ #include "world/common/atomic/TexturePan.inc.c" EvtScript N(EVS_TexPan_MotionLines) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(GetEntryID, LVar0) IfEq(LVar0, hos_20_ENTRY_2) Call(RotateModel, MODEL_h1, 180, 0, 0, 1) diff --git a/src/world/area_isk/isk_01/music.c b/src/world/area_isk/isk_01/music.c index c849dbb0fa..719bd22123 100644 --- a/src/world/area_isk/isk_01/music.c +++ b/src/world/area_isk/isk_01/music.c @@ -7,12 +7,12 @@ EvtScript N(EVS_SetupMusic) = { Call(FadeOutMusic, 0, 2000) Call(DisablePlayerInput, TRUE) Wait(20) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowMessageAtScreenPos, MSG_CH2_00DD, 160, 40) Set(GF_ISK01_FirstWarning, TRUE) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(FadeInMusic, 0, SONG_DRY_DRY_RUINS, 0, 2000, 0, 127) Call(FadeOutMusic, 1, 2000) EndThread diff --git a/src/world/area_isk/isk_02/npc.c b/src/world/area_isk/isk_02/npc.c index f4279d7b91..7109e39b59 100644 --- a/src/world/area_isk/isk_02/npc.c +++ b/src/world/area_isk/isk_02/npc.c @@ -3,7 +3,7 @@ #include "world/common/enemy/PokeyMummy.inc.c" EvtScript N(EVS_NpcIdle_Pokey_01) = { - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, TRUE) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) Label(1) IfEq(AF_ISK02_OpeningSarcophagus1, FALSE) @@ -12,17 +12,17 @@ EvtScript N(EVS_NpcIdle_Pokey_01) = { EndIf Wait(15) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, FALSE) Call(NpcMoveTo, NPC_SELF, -315, 455, 10) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, TRUE) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_NpcAI_PokeyMummy))) Return End }; EvtScript N(EVS_NpcIdle_Pokey_02) = { - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, TRUE) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) Label(1) IfEq(AF_ISK02_OpeningSarcophagus2, FALSE) @@ -31,17 +31,17 @@ EvtScript N(EVS_NpcIdle_Pokey_02) = { EndIf Wait(15) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, FALSE) Call(NpcMoveTo, NPC_SELF, -145, 535, 10) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, TRUE) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_NpcAI_PokeyMummy))) Return End }; EvtScript N(EVS_NpcIdle_Pokey_03) = { - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, TRUE) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) Label(1) IfEq(AF_ISK02_OpeningSarcophagus3, FALSE) @@ -50,10 +50,10 @@ EvtScript N(EVS_NpcIdle_Pokey_03) = { EndIf Wait(15) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, FALSE) Call(NpcMoveTo, NPC_SELF, 50, 550, 10) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, TRUE) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_NpcAI_PokeyMummy))) Return End diff --git a/src/world/area_isk/isk_04/music.c b/src/world/area_isk/isk_04/music.c index ba7f36c4ba..7bc065ac0d 100644 --- a/src/world/area_isk/isk_04/music.c +++ b/src/world/area_isk/isk_04/music.c @@ -7,12 +7,12 @@ EvtScript N(EVS_SetupMusic) = { Call(FadeOutMusic, 0, 2000) Call(DisablePlayerInput, TRUE) Wait(20) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowMessageAtScreenPos, MSG_CH2_00DE, 160, 40) Set(GF_ISK04_SecondWarning, TRUE) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(FadeInMusic, 0, SONG_DRY_DRY_RUINS, 0, 2000, 0, 127) Call(FadeOutMusic, 1, 2000) EndThread diff --git a/src/world/area_isk/isk_05/npc.c b/src/world/area_isk/isk_05/npc.c index ab375588b7..654b4d380e 100644 --- a/src/world/area_isk/isk_05/npc.c +++ b/src/world/area_isk/isk_05/npc.c @@ -155,14 +155,14 @@ API_CALLABLE(N(func_80241E24_97F8F4)) { } EvtScript N(EVS_NpcIdle_StoneChomp) = { - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, TRUE) Label(100) IfEq(GF_ISK05_Hammer2Block, FALSE) Wait(1) Goto(100) EndIf Call(PlaySound, SOUND_CHIME_BEGIN_AMBUSH) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, FALSE) Thread Wait(5) Call(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_ISK_DOOR_CLOSE, SOUND_SPACE_DEFAULT) @@ -287,7 +287,7 @@ NpcData N(NpcData_StoneChomp) = { .initVarCount = 1, .initVar = { .value = 0 }, .settings = &N(NpcSettings_StoneChomp), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = STONE_CHOMP_DROPS, .animations = STONE_CHOMP_ANIMS, }; diff --git a/src/world/area_isk/isk_07/lock.c b/src/world/area_isk/isk_07/lock.c index a126a2bcb1..942afe203c 100644 --- a/src/world/area_isk/isk_07/lock.c +++ b/src/world/area_isk/isk_07/lock.c @@ -8,18 +8,18 @@ s32 N(ItemList_RuinsKey)[] = { }; EvtScript N(EVS_UnlockPrompt_RuinsDoor) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowKeyChoicePopup) Switch(LVar0) CaseEq(0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return CaseEq(-1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndSwitch Call(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, -300, -380, 530) @@ -40,7 +40,7 @@ EvtScript N(EVS_UnlockPrompt_RuinsDoor) = { EndIf Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittw, COLLIDER_FLAGS_UPPER_MASK) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Unbind Return End diff --git a/src/world/area_isk/isk_07/npc.c b/src/world/area_isk/isk_07/npc.c index 01b058289d..2cfa3fa086 100644 --- a/src/world/area_isk/isk_07/npc.c +++ b/src/world/area_isk/isk_07/npc.c @@ -62,7 +62,7 @@ EvtScript N(EVS_NpcDefeat_Pokey_01) = { Call(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) Wait(1) Call(PanToTarget, CAM_DEFAULT, 0, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(DisablePlayerInput, FALSE) EndIf EndThread @@ -71,7 +71,7 @@ EvtScript N(EVS_NpcDefeat_Pokey_01) = { CaseEq(OUTCOME_PLAYER_FLED) Call(OnPlayerFled, 0) CaseEq(OUTCOME_ENEMY_FLED) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) EndSwitch Return @@ -79,7 +79,7 @@ EvtScript N(EVS_NpcDefeat_Pokey_01) = { }; EvtScript N(EVS_NpcIdle_Pokey_01) = { - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, TRUE) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) Label(1) IfEq(AF_ISK07_MummiesReleased, FALSE) @@ -89,17 +89,17 @@ EvtScript N(EVS_NpcIdle_Pokey_01) = { Call(SetNpcYaw, NPC_SELF, 105) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, FALSE) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, FALSE) Call(NpcMoveTo, NPC_SELF, -140, 528, 10) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, TRUE) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_NpcAI_PokeyMummy))) Return End }; EvtScript N(EVS_NpcIdle_Pokey_02) = { - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, TRUE) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) Label(1) IfEq(AF_ISK07_MummiesReleased, FALSE) @@ -109,17 +109,17 @@ EvtScript N(EVS_NpcIdle_Pokey_02) = { Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, FALSE) Wait(15) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, FALSE) Call(NpcMoveTo, NPC_SELF, 47, 543, 10) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, TRUE) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_NpcAI_PokeyMummy))) Return End }; EvtScript N(EVS_NpcIdle_Pokey_03) = { - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, TRUE) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, TRUE) Label(1) IfEq(AF_ISK07_MummiesReleased, FALSE) @@ -129,10 +129,10 @@ EvtScript N(EVS_NpcIdle_Pokey_03) = { Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, FALSE) Wait(15) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, TRUE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, FALSE) Call(NpcMoveTo, NPC_SELF, 227, 489, 10) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, TRUE) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_NpcAI_PokeyMummy))) Return End diff --git a/src/world/area_isk/isk_09/music.c b/src/world/area_isk/isk_09/music.c index c6b19d93f0..c549046b9a 100644 --- a/src/world/area_isk/isk_09/music.c +++ b/src/world/area_isk/isk_09/music.c @@ -7,12 +7,12 @@ EvtScript N(EVS_SetupMusic) = { Call(FadeOutMusic, 0, 2000) Call(DisablePlayerInput, TRUE) Wait(20) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowMessageAtScreenPos, MSG_CH2_00DF, 160, 40) Set(GF_ISK09_ThirdWarning, TRUE) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(FadeInMusic, 0, SONG_DRY_DRY_RUINS, 0, 2000, 0, 127) Call(FadeOutMusic, 1, 2000) EndThread diff --git a/src/world/area_isk/isk_11/music.c b/src/world/area_isk/isk_11/music.c index 83ec829e9e..a0f496aff4 100644 --- a/src/world/area_isk/isk_11/music.c +++ b/src/world/area_isk/isk_11/music.c @@ -7,12 +7,12 @@ EvtScript N(EVS_SetupMusic) = { Call(FadeOutMusic, 0, 2000) Call(DisablePlayerInput, TRUE) Wait(20) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowMessageAtScreenPos, MSG_CH2_00E0, 160, 40) Set(GF_ISK11_FourthWarning, TRUE) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(FadeInMusic, 0, SONG_DRY_DRY_RUINS, 0, 2000, 0, 127) Call(FadeOutMusic, 1, 2000) EndThread diff --git a/src/world/area_isk/isk_11/puzzle.c b/src/world/area_isk/isk_11/puzzle.c index a96d7c2757..2117042f0d 100644 --- a/src/world/area_isk/isk_11/puzzle.c +++ b/src/world/area_isk/isk_11/puzzle.c @@ -63,7 +63,7 @@ EvtScript N(EVS_ItemPrompt_Socket1) = { Unbind Return EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) IfNe(GB_ISK11_ItemSocket1, 0) Call(DisablePlayerInput, TRUE) @@ -82,7 +82,7 @@ EvtScript N(EVS_ItemPrompt_Socket1) = { Call(ShowGotItem, LVar0, FALSE, ITEM_PICKUP_FLAG_NO_SOUND) EndIf Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf Call(ShowKeyChoicePopup) @@ -91,11 +91,11 @@ EvtScript N(EVS_ItemPrompt_Socket1) = { CaseEq(0) Call(ShowMessageAtScreenPos, MSG_Menus_Inspect_ChompStatue, 160, 40) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return CaseEq(-1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndSwitch Set(GB_ISK11_ItemSocket1, LVar2) @@ -104,7 +104,7 @@ EvtScript N(EVS_ItemPrompt_Socket1) = { Set(MV_Socket1_ItemEntity, LVar0) Call(CloseChoicePopup) Call(PlaySoundAtCollider, COLLIDER_o2087, SOUND_ISK_PLACE_IN_SOCKET, SOUND_SPACE_DEFAULT) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; @@ -114,7 +114,7 @@ EvtScript N(EVS_ItemPrompt_Socket2) = { Unbind Return EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) IfNe(GB_ISK11_ItemSocket2, 0) Call(DisablePlayerInput, TRUE) @@ -133,7 +133,7 @@ EvtScript N(EVS_ItemPrompt_Socket2) = { Call(ShowGotItem, LVar0, FALSE, ITEM_PICKUP_FLAG_NO_SOUND) EndIf Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf Call(ShowKeyChoicePopup) @@ -142,11 +142,11 @@ EvtScript N(EVS_ItemPrompt_Socket2) = { CaseEq(0) Call(ShowMessageAtScreenPos, MSG_Menus_Inspect_ChompStatue, 160, 40) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return CaseEq(-1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndSwitch Set(GB_ISK11_ItemSocket2, LVar2) @@ -154,7 +154,7 @@ EvtScript N(EVS_ItemPrompt_Socket2) = { Call(MakeItemEntity, GB_ISK11_ItemSocket2, -44, -508, 508, ITEM_SPAWN_MODE_DECORATION, 0) Set(MV_Socket2_ItemEntity, LVar0) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(PlaySoundAtCollider, COLLIDER_o2091, SOUND_ISK_PLACE_IN_SOCKET, SOUND_SPACE_DEFAULT) Return End @@ -165,7 +165,7 @@ EvtScript N(EVS_ItemPrompt_Socket3) = { Unbind Return EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) IfNe(GB_ISK11_ItemSocket3, 0) Call(DisablePlayerInput, TRUE) @@ -184,7 +184,7 @@ EvtScript N(EVS_ItemPrompt_Socket3) = { Call(ShowGotItem, LVar0, FALSE, ITEM_PICKUP_FLAG_NO_SOUND) EndIf Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf Call(ShowKeyChoicePopup) @@ -193,11 +193,11 @@ EvtScript N(EVS_ItemPrompt_Socket3) = { CaseEq(0) Call(ShowMessageAtScreenPos, MSG_Menus_Inspect_ChompStatue, 160, 40) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return CaseEq(-1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndSwitch Set(GB_ISK11_ItemSocket3, LVar2) @@ -205,7 +205,7 @@ EvtScript N(EVS_ItemPrompt_Socket3) = { Call(MakeItemEntity, GB_ISK11_ItemSocket3, 0, -508, 510, ITEM_SPAWN_MODE_DECORATION, 0) Set(MV_Socket3_ItemEntity, LVar0) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(PlaySoundAtCollider, COLLIDER_o2090, SOUND_ISK_PLACE_IN_SOCKET, SOUND_SPACE_DEFAULT) Return End @@ -216,7 +216,7 @@ EvtScript N(EVS_ItemPrompt_Socket4) = { Unbind Return EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) IfNe(GB_ISK11_ItemSocket4, 0) Call(DisablePlayerInput, TRUE) @@ -235,7 +235,7 @@ EvtScript N(EVS_ItemPrompt_Socket4) = { Call(ShowGotItem, LVar0, FALSE, ITEM_PICKUP_FLAG_NO_SOUND) EndIf Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf Call(ShowKeyChoicePopup) @@ -244,11 +244,11 @@ EvtScript N(EVS_ItemPrompt_Socket4) = { CaseEq(0) Call(ShowMessageAtScreenPos, MSG_Menus_Inspect_ChompStatue, 160, 40) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return CaseEq(-1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndSwitch Set(GB_ISK11_ItemSocket4, LVar2) @@ -256,7 +256,7 @@ EvtScript N(EVS_ItemPrompt_Socket4) = { Call(MakeItemEntity, GB_ISK11_ItemSocket4, 44, -508, 508, ITEM_SPAWN_MODE_DECORATION, 0) Set(MV_Socket4_ItemEntity, LVar0) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(PlaySoundAtCollider, COLLIDER_o2089, SOUND_ISK_PLACE_IN_SOCKET, SOUND_SPACE_DEFAULT) Return End @@ -267,7 +267,7 @@ EvtScript N(EVS_ItemPrompt_Socket5) = { Unbind Return EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) IfNe(GB_ISK11_ItemSocket5, 0) Call(DisablePlayerInput, TRUE) @@ -286,7 +286,7 @@ EvtScript N(EVS_ItemPrompt_Socket5) = { Call(ShowGotItem, LVar0, FALSE, ITEM_PICKUP_FLAG_NO_SOUND) EndIf Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf Call(ShowKeyChoicePopup) @@ -295,11 +295,11 @@ EvtScript N(EVS_ItemPrompt_Socket5) = { CaseEq(0) Call(ShowMessageAtScreenPos, MSG_Menus_Inspect_ChompStatue, 160, 40) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return CaseEq(-1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndSwitch Set(GB_ISK11_ItemSocket5, LVar2) @@ -307,7 +307,7 @@ EvtScript N(EVS_ItemPrompt_Socket5) = { Call(MakeItemEntity, GB_ISK11_ItemSocket5, 88, -508, 502, ITEM_SPAWN_MODE_DECORATION, 0) Set(MV_Socket5_ItemEntity, LVar0) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(PlaySoundAtCollider, COLLIDER_o2088, SOUND_ISK_PLACE_IN_SOCKET, SOUND_SPACE_DEFAULT) Return End diff --git a/src/world/area_isk/isk_13/npc.c b/src/world/area_isk/isk_13/npc.c index aa9eb56f25..d4023a15ad 100644 --- a/src/world/area_isk/isk_13/npc.c +++ b/src/world/area_isk/isk_13/npc.c @@ -316,7 +316,7 @@ NpcData N(NpcData_StoneChomp) = { .initVarCount = 1, .initVar = { .value = -650 }, .settings = &N(NpcSettings_StoneChomp), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE, .drops = STONE_CHOMP_DROPS, .animations = STONE_CHOMP_ANIMS, }; diff --git a/src/world/area_isk/isk_14/npc.c b/src/world/area_isk/isk_14/npc.c index ba7b56ec79..a682981aba 100644 --- a/src/world/area_isk/isk_14/npc.c +++ b/src/world/area_isk/isk_14/npc.c @@ -167,7 +167,7 @@ EvtScript N(EVS_NpcIdle_StoneChomp) = { Wait(1) Call(N(DestroyAmbushWorker)) Call(SetNpcImgFXParams, NPC_SELF, IMGFX_CLEAR, 0, 0, 0, 0) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_4 | ENEMY_FLAG_100000, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_SKIP_BATTLE, FALSE) Wait(3) Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(SetNpcJumpscale, NPC_SELF, 1) @@ -236,7 +236,7 @@ NpcData N(NpcData_StoneChomp) = { .initVarCount = 1, .initVar = { .value = -780 }, .settings = &N(NpcSettings_StoneChomp), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = STONE_CHOMP_DROPS, .animations = STONE_CHOMP_ANIMS, }; diff --git a/src/world/area_isk/isk_16/npc.c b/src/world/area_isk/isk_16/npc.c index e0b9cfe325..a0b61d6e5c 100644 --- a/src/world/area_isk/isk_16/npc.c +++ b/src/world/area_isk/isk_16/npc.c @@ -16,7 +16,7 @@ EvtScript N(EVS_NpcDefeat_Tutankoopa_01) = { Call(GetBattleOutcome, LVar0) Switch(LVar0) CaseEq(OUTCOME_PLAYER_WON) - Call(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_1, TRUE) + Call(SetEncounterStatusFlags, ENCOUNTER_FLAG_THUMBS_UP, TRUE) Call(InterpPlayerYaw, 90, 0) ExecWait(N(EVS_Scene_TutankoopaDefeated)) Exec(N(EVS_SpawnStarCard)) @@ -72,7 +72,7 @@ NpcData N(NpcData_Tutankoopa)[] = { .initVarCount = 1, .initVar = { .value = 0 }, .settings = &N(NpcSettings_Tutankoopa_01), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_Tutankoopa_Idle, @@ -98,7 +98,7 @@ NpcData N(NpcData_Tutankoopa)[] = { .pos = { 500.0f, -1300.0f, 316.0f }, .yaw = 230, .settings = &N(NpcSettings_Tutankoopa_02), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_Tutankoopa_Idle, @@ -127,7 +127,7 @@ NpcData N(NpcData_ChainChomp) = { .yaw = 230, .init = &N(EVS_NpcInit_ChainChomp), .settings = &N(NpcSettings_ChainChomp), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_ChainChomp_Still, diff --git a/src/world/area_isk/isk_19/music.c b/src/world/area_isk/isk_19/music.c index 3a46a68963..1b4083b742 100644 --- a/src/world/area_isk/isk_19/music.c +++ b/src/world/area_isk/isk_19/music.c @@ -7,12 +7,12 @@ EvtScript N(EVS_SetupMusic) = { Call(FadeOutMusic, 0, 2000) Call(DisablePlayerInput, TRUE) Wait(20) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowMessageAtScreenPos, MSG_CH2_00E1, 160, 40) Set(GF_ISK19_FinalWarning, TRUE) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(FadeInMusic, 0, SONG_RUINS_BASEMENT, 0, 2000, 0, 127) Call(FadeOutMusic, 1, 2000) EndThread diff --git a/src/world/area_iwa/common/UnkScriptJP00.inc.c b/src/world/area_iwa/common/UnkScriptJP00.inc.c index ff40e727f9..28b5c5a3d3 100644 --- a/src/world/area_iwa/common/UnkScriptJP00.inc.c +++ b/src/world/area_iwa/common/UnkScriptJP00.inc.c @@ -49,11 +49,11 @@ EvtScript N(EVS_UnkJP00) = { }; EvtScript N(EVS_Chest_ShowGotItem) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_FULL) Wait(40) Call(ShowGotItem, LVar0, FALSE, 0) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return Return End diff --git a/src/world/area_iwa/iwa_00/npc.c b/src/world/area_iwa/iwa_00/npc.c index 46db5d8a91..93da41e4e6 100644 --- a/src/world/area_iwa/iwa_00/npc.c +++ b/src/world/area_iwa/iwa_00/npc.c @@ -320,7 +320,7 @@ EvtScript N(EVS_NpcInit_Whacka_01) = { Call(BindNpcInteract, NPC_SELF, Ref(N(EVS_NpcInteract_Whacka_01))) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_Whacka_01))) Call(EnableNpcShadow, NPC_SELF, FALSE) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_200000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_FLIP_INSTANTLY, TRUE) Else Call(RemoveNpc, NPC_SELF) EndIf @@ -346,7 +346,7 @@ NpcData N(NpcData_Whacka)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Whacka_01), .settings = &N(NpcSettings_Whacka), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = WHACKA_ANIMS, .tattle = MSG_NpcTattle_Whacka, @@ -357,7 +357,7 @@ NpcData N(NpcData_Whacka)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Whacka_02), .settings = &N(NpcSettings_Whacka), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = WHACKA_ANIMS, .tattle = MSG_NpcTattle_Whacka, diff --git a/src/world/area_iwa/iwa_04/npc.c b/src/world/area_iwa/iwa_04/npc.c index f02b13d77c..6edfda94ee 100644 --- a/src/world/area_iwa/iwa_04/npc.c +++ b/src/world/area_iwa/iwa_04/npc.c @@ -306,7 +306,7 @@ NpcData N(NpcData_Buzzar) = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_Buzzar), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = { .dropFlags = NPC_DROP_FLAG_80, .heartDrops = STANDARD_HEART_DROPS(3), diff --git a/src/world/area_iwa/iwa_10/npc.c b/src/world/area_iwa/iwa_10/npc.c index 1b4b3d4567..7787e06a32 100644 --- a/src/world/area_iwa/iwa_10/npc.c +++ b/src/world/area_iwa/iwa_10/npc.c @@ -134,7 +134,7 @@ NpcData N(NpcData_TrainToad)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TrainToad_01), .settings = &N(NpcSettings_TrainToad), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TRAIN_TOAD_WHITE_ANIMS, .tattle = MSG_NpcTattle_IWA_StationMaster, @@ -145,7 +145,7 @@ NpcData N(NpcData_TrainToad)[] = { .yaw = 0, .init = &N(EVS_NpcInit_TrainToad_02), .settings = &N(NpcSettings_TrainToad), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, }, @@ -157,7 +157,7 @@ NpcData N(NpcData_Toad) = { .yaw = 270, .init = &N(EVS_NpcInit_Toad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_IWA_TravelAgent, @@ -170,7 +170,7 @@ NpcData N(NpcData_Toadette)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toadette_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidA, @@ -181,7 +181,7 @@ NpcData N(NpcData_Toadette)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toadette_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidB, @@ -192,7 +192,7 @@ NpcData N(NpcData_Toadette)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Toadette_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidC, @@ -206,7 +206,7 @@ NpcData N(NpcData_Dryite)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Dryite), .settings = &N(NpcSettings_Dryite), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = DRYITE_GREEN_ANIMS, .tattle = MSG_NpcTattle_IWA_StationLoiterer, @@ -217,7 +217,7 @@ NpcData N(NpcData_Dryite)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toadette_01), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOADETTE_GREEN_ANIMS, .tattle = MSG_NpcTattle_IWA_Conservationist, diff --git a/src/world/area_iwa/iwa_11/npc.c b/src/world/area_iwa/iwa_11/npc.c index 87be4a8559..4785f3d2b9 100644 --- a/src/world/area_iwa/iwa_11/npc.c +++ b/src/world/area_iwa/iwa_11/npc.c @@ -24,7 +24,7 @@ NpcData N(NpcData_TrainToad) = { .yaw = 90, .init = &N(EVS_NpcInit_TrainToad), .settings = &N(NpcSettings_TrainToad), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, }; diff --git a/src/world/area_jan/jan_00/npc.c b/src/world/area_jan/jan_00/npc.c index 0d3bcae2d2..5b5413102f 100644 --- a/src/world/area_jan/jan_00/npc.c +++ b/src/world/area_jan/jan_00/npc.c @@ -646,7 +646,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado_01), .settings = &N(NpcSettings_Kolorado_01), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Whale, @@ -657,7 +657,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado_02), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -668,7 +668,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_JrTroopa), .settings = &N(NpcSettings_JrTroopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = JR_TROOPA_ANIMS, }, @@ -679,7 +679,7 @@ NpcData N(NpcData_HeartPlant_01) = { .pos = { 455.0f, 0.0f, 115.0f }, .yaw = 270, .settings = &N(NpcSettings_HeartPlant), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_INSPECT_ICON | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, @@ -690,7 +690,7 @@ NpcData N(NpcData_HeartPlant_02) = { .pos = { 167.0f, 0.0f, 404.0f }, .yaw = 270, .settings = &N(NpcSettings_HeartPlant), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_INSPECT_ICON | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, @@ -701,7 +701,7 @@ NpcData N(NpcData_HeartPlant_03) = { .pos = { 90.0f, 0.0f, 316.0f }, .yaw = 270, .settings = &N(NpcSettings_HeartPlant), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_INSPECT_ICON | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, @@ -712,7 +712,7 @@ NpcData N(NpcData_HeartPlant_04) = { .pos = { 424.0f, 0.0f, 182.0f }, .yaw = 270, .settings = &N(NpcSettings_HeartPlant), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_INSPECT_ICON | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, @@ -723,7 +723,7 @@ NpcData N(NpcData_HeartPlant_05) = { .pos = { 143.0f, 0.0f, 260.0f }, .yaw = 270, .settings = &N(NpcSettings_HeartPlant), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_INSPECT_ICON | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, diff --git a/src/world/area_jan/jan_00/whale.c b/src/world/area_jan/jan_00/whale.c index 909acd1324..a643088395 100644 --- a/src/world/area_jan/jan_00/whale.c +++ b/src/world/area_jan/jan_00/whale.c @@ -216,7 +216,7 @@ EvtScript N(D_8024652C_B26A6C) = { }; EvtScript N(EVS_802467AC) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(MakeLocalVertexCopy, VTX_COPY_1, MODEL_karada, TRUE) Call(SetCustomGfxBuilders, CUSTOM_GFX_1, Ref(N(unkAngleFunc002)), NULL) Call(SetModelCustomGfx, MODEL_karada, CUSTOM_GFX_1, -1) diff --git a/src/world/area_jan/jan_01/npc.c b/src/world/area_jan/jan_01/npc.c index a95c587e2e..2464cdb034 100644 --- a/src/world/area_jan/jan_01/npc.c +++ b/src/world/area_jan/jan_01/npc.c @@ -91,7 +91,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { Call(DisablePlayerInput, FALSE) EndIf CaseEq(1) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(func_802D2C14, 1) Wait(10 * DT) @@ -101,8 +101,8 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { Set(GB_StoryProgress, STORY_CH5_KOLORADO_ESCAPED_FUZZIES) ExecWait(N(EVS_Kolorado_RunToVillage)) Call(func_802D2C14, 0) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) - SetGroup(EVT_GROUP_0B) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(DisablePlayerInput, FALSE) EndSwitch Call(GetSelfVar, 0, LVar0) @@ -162,11 +162,11 @@ EvtScript N(EVS_NpcIdle_JungleFuzzy_01) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Switch(LVar0) CaseRange(LVar3, LVar4) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH, 0) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_PARTNER, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH, FALSE) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_PARTNER, FALSE) CaseDefault - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH, 1) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH, TRUE) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_PARTNER, TRUE) EndSwitch Wait(1) EndLoop @@ -275,7 +275,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -287,7 +287,7 @@ NpcData N(NpcData_JungleFuzzy_01) = { .yaw = 270, .init = &N(EVS_NpcInit_JungleFuzzy_01), .settings = &N(NpcSettings_JungleFuzzy), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = JUNGLE_FUZZY_ANIMS, }; @@ -318,7 +318,7 @@ NpcData N(NpcData_JungleFuzzy_02) = { }, .init = &N(EVS_NpcInit_JungleFuzzy_02), .settings = &N(NpcSettings_JungleFuzzy_Wander), - .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = JUNGLE_FUZZY_DROPS, .animations = JUNGLE_FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -342,7 +342,7 @@ NpcData N(NpcData_JungleFuzzy_03) = { }, .init = &N(EVS_NpcInit_JungleFuzzy_02), .settings = &N(NpcSettings_JungleFuzzy_Wander), - .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = JUNGLE_FUZZY_DROPS, .animations = JUNGLE_FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -366,7 +366,7 @@ NpcData N(NpcData_JungleFuzzy_04) = { }, .init = &N(EVS_NpcInit_JungleFuzzy_02), .settings = &N(NpcSettings_JungleFuzzy_Wander), - .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = JUNGLE_FUZZY_DROPS, .animations = JUNGLE_FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_jan/jan_02/main.c b/src/world/area_jan/jan_02/main.c index eabe51719b..21f3981471 100644 --- a/src/world/area_jan/jan_02/main.c +++ b/src/world/area_jan/jan_02/main.c @@ -33,7 +33,7 @@ API_CALLABLE(N(SpawnSunEffect)) { } EvtScript N(EVS_ExitWalk_jan_01_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(N(ClearTrackVols)) Call(UseExitHeading, 60, jan_02_ENTRY_0) Exec(ExitWalk) diff --git a/src/world/area_jan/jan_02/npc.c b/src/world/area_jan/jan_02/npc.c index f767c29f9d..13ef92b183 100644 --- a/src/world/area_jan/jan_02/npc.c +++ b/src/world/area_jan/jan_02/npc.c @@ -396,7 +396,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 270, .init = &N(EVS_NpcInit_VillageLeader), .settings = &N(NpcSettings_Yoshi), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = YOSHI_LEADER_ANIMS, .tattle = MSG_NpcTattle_VillageLeader, @@ -407,7 +407,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Councillor), .settings = &N(NpcSettings_Yoshi), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = YOSHI_COUNCILLOR_ANIMS, .extraAnimations = N(ExtraAnims_Councillor), diff --git a/src/world/area_jan/jan_03/npc.c b/src/world/area_jan/jan_03/npc.c index 781055fe9c..430d72e849 100644 --- a/src/world/area_jan/jan_03/npc.c +++ b/src/world/area_jan/jan_03/npc.c @@ -708,7 +708,7 @@ EvtScript N(EVS_NpcInit_Kolorado) = { Set(LVar0, 1) CaseEq(STORY_CH5_STAR_SPRIT_DEPARTED) Call(SetNpcPos, NPC_SELF, -433, 0, -205) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_400000, 0) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, FALSE) Set(LVar0, 1) EndSwitch IfEq(LVar0, 1) @@ -1041,7 +1041,7 @@ NpcData N(NpcData_Ravens)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Raven), .settings = &N(NpcSettings_Raven), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = RAVEN_ANIMS, .extraAnimations = N(ExtraAnims_Raven), @@ -1053,7 +1053,7 @@ NpcData N(NpcData_Ravens)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Raven), .settings = &N(NpcSettings_Raven), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = RAVEN_ANIMS, #if VERSION_JP @@ -1066,7 +1066,7 @@ NpcData N(NpcData_Ravens)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Raven), .settings = &N(NpcSettings_Raven), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenC, @@ -1077,7 +1077,7 @@ NpcData N(NpcData_Ravens)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Raven), .settings = &N(NpcSettings_Raven), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenD, @@ -1088,7 +1088,7 @@ NpcData N(NpcData_Ravens)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Raven), .settings = &N(NpcSettings_Raven), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenE, diff --git a/src/world/area_jan/jan_04/main.c b/src/world/area_jan/jan_04/main.c index 3c1ff168bf..98a2ff3be0 100644 --- a/src/world/area_jan/jan_04/main.c +++ b/src/world/area_jan/jan_04/main.c @@ -9,7 +9,7 @@ EvtScript N(EVS_GotoMap_kmr_24_0) = { }; //@bug script not terminated EvtScript N(EVS_ExitWalk_jan_05_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, jan_04_ENTRY_0) Exec(ExitWalk) Call(GotoMap, Ref("jan_05"), jan_05_ENTRY_2) diff --git a/src/world/area_jan/jan_04/npc.c b/src/world/area_jan/jan_04/npc.c index 4de5e796e7..852fa26211 100644 --- a/src/world/area_jan/jan_04/npc.c +++ b/src/world/area_jan/jan_04/npc.c @@ -266,7 +266,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Sushie), .settings = &N(NpcSettings_Sushie), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = SUSHIE_ANIMS, }, @@ -276,7 +276,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Bubulb), .settings = &N(NpcSettings_Bubulb), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = BUBULB_YELLOW_ANIMS, .tattle = MSG_NpcTattle_JAN_Bubulb_Revealed, @@ -289,7 +289,7 @@ NpcData N(NpcData_YoshiKids)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, .settings = &N(NpcSettings_YoshiKid), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL, .drops = NO_DROPS, .animations = YOSHI_KID_GREEN_ANIMS, .tattle = MSG_NpcTattle_GreenYoshiKid, @@ -299,7 +299,7 @@ NpcData N(NpcData_YoshiKids)[] = { .pos = { 45.0f, 0.0f, -70.0f }, .yaw = 90, .settings = &N(NpcSettings_YoshiKid), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL, .drops = NO_DROPS, .animations = YOSHI_KID_RED_ANIMS, .tattle = MSG_NpcTattle_RedYoshiKid, @@ -309,7 +309,7 @@ NpcData N(NpcData_YoshiKids)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, .settings = &N(NpcSettings_YoshiKid), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL, .drops = NO_DROPS, .animations = YOSHI_KID_BLUE_ANIMS, .tattle = MSG_NpcTattle_BlueYoshiKid, @@ -319,7 +319,7 @@ NpcData N(NpcData_YoshiKids)[] = { .pos = { 20.0f, 0.0f, -70.0f }, .yaw = 270, .settings = &N(NpcSettings_YoshiKid), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL, .drops = NO_DROPS, .animations = YOSHI_KID_YELLOW_ANIMS, .tattle = MSG_NpcTattle_YellowYoshiKid, @@ -329,7 +329,7 @@ NpcData N(NpcData_YoshiKids)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, .settings = &N(NpcSettings_YoshiKid), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL, .drops = NO_DROPS, .animations = YOSHI_KID_PURPLE_ANIMS, .tattle = MSG_NpcTattle_PurpleYoshiKid, diff --git a/src/world/area_jan/jan_05/npc.c b/src/world/area_jan/jan_05/npc.c index 97dfaaa304..2162e2c615 100644 --- a/src/world/area_jan/jan_05/npc.c +++ b/src/world/area_jan/jan_05/npc.c @@ -31,7 +31,7 @@ EvtScript N(EVS_NpcIdle_JungleFuzzy) = { EvtScript N(EVS_NpcInit_JungleFuzzy) = { Call(SetSelfVar, 7, 0) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, TRUE) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_FLYING, TRUE) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_JungleFuzzy))) @@ -226,7 +226,7 @@ NpcData N(NpcData_YoshiKid) = { .yaw = 270, .init = &N(EVS_NpcInit_YoshiKid), .settings = &N(NpcSettings_YoshiKid), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = YOSHI_KID_PURPLE_ANIMS, .tattle = MSG_NpcTattle_PurpleYoshiKid, @@ -258,7 +258,7 @@ NpcData N(NpcData_JungleFuzzy) = { }, .init = &N(EVS_NpcInit_JungleFuzzy), .settings = &N(NpcSettings_JungleFuzzy_Wander), - .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = JUNGLE_FUZZY_DROPS, .animations = JUNGLE_FUZZY_ANIMS, .extraAnimations = N(ExtraAnims_JungleFuzzy), @@ -297,7 +297,7 @@ NpcData N(NpcData_HeartPlant) = { .pos = { 430.0f, 0.0f, 205.0f }, .yaw = 270, .settings = &N(NpcSettings_HeartPlant), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_USE_INSPECT_ICON | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, @@ -320,7 +320,7 @@ NpcData N(NpcData_MBush) = { .pos = { 400.0f, 0.0f, -75.0f }, .yaw = 90, .settings = &N(NpcSettings_MBush), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_USE_INSPECT_ICON | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = MBUSH_DROPS, .animations = MBUSH_ANIMS, .tattle = MSG_NpcTattle_MBush, diff --git a/src/world/area_jan/jan_06/npc.c b/src/world/area_jan/jan_06/npc.c index b9052e770f..038b197d62 100644 --- a/src/world/area_jan/jan_06/npc.c +++ b/src/world/area_jan/jan_06/npc.c @@ -30,7 +30,7 @@ NpcData N(NpcData_JungleFuzzy) = { } }, .settings = &N(NpcSettings_JungleFuzzy_Wander), - .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = JUNGLE_FUZZY_DROPS, .animations = JUNGLE_FUZZY_ANIMS, .extraAnimations = N(ExtraAnims_JungleFuzzy), @@ -71,7 +71,7 @@ NpcData N(NpcData_SpearGuy)[] = { } }, .settings = &N(NpcSettings_SpearGuy_Wander), - .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = SPEAR_GUY_DROPS, .animations = SPEAR_GUY_ANIMS, .extraAnimations = N(ExtraAnims_SpearGuy_Custom), @@ -85,7 +85,7 @@ NpcData N(NpcData_HeartPlant) = { .pos = { 410.0f, 0.0f, -30.0f }, .yaw = 270, .settings = &N(NpcSettings_HeartPlant), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_USE_INSPECT_ICON | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, @@ -96,7 +96,7 @@ NpcData N(NpcData_HurtPlant_01) = { .pos = { 110.0f, 0.0f, 55.0f }, .yaw = 90, .settings = &N(NpcSettings_HurtPlant), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_USE_INSPECT_ICON | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = HURT_PLANT_DROPS, .animations = HURT_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, @@ -107,7 +107,7 @@ NpcData N(NpcData_HurtPlant_02) = { .pos = { -430.0f, 0.0f, -80.0f }, .yaw = 90, .settings = &N(NpcSettings_HurtPlant), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_USE_INSPECT_ICON | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = HURT_PLANT_DROPS, .animations = HURT_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, diff --git a/src/world/area_jan/jan_06/statue.c b/src/world/area_jan/jan_06/statue.c index 5c32fc09cd..ccdd59811d 100644 --- a/src/world/area_jan/jan_06/statue.c +++ b/src/world/area_jan/jan_06/statue.c @@ -105,7 +105,7 @@ EvtScript N(EVS_Scene_MoveStatue) = { }; EvtScript N(ItemPrompt_Statue) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowKeyChoicePopup) IfLe(LVar0, 0) @@ -113,7 +113,7 @@ EvtScript N(ItemPrompt_Statue) = { Call(ShowMessageAtScreenPos, MSG_Menus_Inspect_RaphaelStatue, 160, 40) EndIf Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf Call(DisablePlayerInput, TRUE) @@ -121,7 +121,7 @@ EvtScript N(ItemPrompt_Statue) = { Call(MakeItemEntity, ITEM_JADE_RAVEN, 0, 15, -400, ITEM_SPAWN_MODE_DECORATION, 0) Set(MV_JadeRavenItemIdx, LVar0) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(SetPlayerAnimation, ANIM_MarioW1_PlaceItem | SPRITE_ID_BACK_FACING) Wait(20) Call(SetPlayerAnimation, ANIM_Mario1_Still) diff --git a/src/world/area_jan/jan_07/npc.c b/src/world/area_jan/jan_07/npc.c index cd095de574..299edfedcb 100644 --- a/src/world/area_jan/jan_07/npc.c +++ b/src/world/area_jan/jan_07/npc.c @@ -145,18 +145,18 @@ EvtScript N(EVS_NpcInit_YoshiKid) = { EvtScript N(EVS_NpcIdle_PutridPiranha) = { #if VERSION_PAL - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH, 1) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH, TRUE) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_PARTNER, TRUE) #elif VERSION_US || VERSION_IQUE ChildThread Loop(0) Call(GetPlayerPos, LVar0, LVar1, LVar2) IfLt(LVar0, -190) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH, 1) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH, TRUE) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_PARTNER, TRUE) Else - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH, 0) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_PARTNER, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH, FALSE) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_PARTNER, FALSE) EndIf Wait(1) EndLoop @@ -335,7 +335,7 @@ NpcData N(NpcData_PutridPiranhas)[] = { .yaw = 90, .init = &N(EVS_NpcInit_PutridPiranha), .settings = &N(NpcSettings_PutridPiranha), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = PUTRID_PIRANHA_ANIMS, }, @@ -344,7 +344,7 @@ NpcData N(NpcData_PutridPiranhas)[] = { .pos = { 80.0f, 0.0f, 20.0f }, .yaw = 270, .settings = &N(NpcSettings_PutridPiranha), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = PUTRID_PIRANHA_ANIMS, }, @@ -356,7 +356,7 @@ NpcData N(NpcData_YoshiKid) = { .yaw = 90, .init = &N(EVS_NpcInit_YoshiKid), .settings = &N(NpcSettings_YoshiKid), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = YOSHI_KID_YELLOW_ANIMS, .tattle = MSG_NpcTattle_YellowYoshiKid, diff --git a/src/world/area_jan/jan_08/npc.c b/src/world/area_jan/jan_08/npc.c index 9336effb30..3d90a920c8 100644 --- a/src/world/area_jan/jan_08/npc.c +++ b/src/world/area_jan/jan_08/npc.c @@ -127,7 +127,7 @@ EvtScript N(EVS_NpcDefeat_MBush_Copy) = { Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_NpcAI_MBush))) CaseEq(OUTCOME_ENEMY_FLED) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) EndSwitch Return @@ -231,7 +231,7 @@ NpcData N(NpcData_YoshiKid) = { .yaw = 90, .init = &N(EVS_NpcInit_YoshiKid), .settings = &N(NpcSettings_YoshiKid), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = YOSHI_KID_RED_ANIMS, .tattle = MSG_NpcTattle_RedYoshiKid, diff --git a/src/world/area_jan/jan_09/main.c b/src/world/area_jan/jan_09/main.c index c0d8b6909a..3f9d5e6669 100644 --- a/src/world/area_jan/jan_09/main.c +++ b/src/world/area_jan/jan_09/main.c @@ -9,7 +9,7 @@ EvtScript N(EVS_ExitWalk_jan_08_2) = EVT_EXIT_WALK(60, jan_09_ENTRY_0, "jan_08", EvtScript N(EVS_ExitWalk_jan_06_3) = EVT_EXIT_WALK(60, jan_09_ENTRY_1, "jan_06", jan_06_ENTRY_3); EvtScript N(EVS_GotoMap_jan_11_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(GotoMap, Ref("jan_11"), jan_11_ENTRY_0) Wait(100) Return @@ -17,7 +17,7 @@ EvtScript N(EVS_GotoMap_jan_11_0) = { }; EvtScript N(EVS_TouchFloor_Pipe) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Set(LVarA, LVar0) Set(LVarB, LVar1) Set(LVarC, LVar2) diff --git a/src/world/area_jan/jan_10/npc.c b/src/world/area_jan/jan_10/npc.c index 38f05e4d40..893cda287a 100644 --- a/src/world/area_jan/jan_10/npc.c +++ b/src/world/area_jan/jan_10/npc.c @@ -27,7 +27,7 @@ EvtScript N(EVS_NpcIdle_JungleFuzzy) = { EvtScript N(EVS_NpcInit_JungleFuzzy) = { Call(SetSelfVar, 7, FALSE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, TRUE) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_FLYING, TRUE) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_JungleFuzzy))) @@ -111,7 +111,7 @@ NpcData N(NpcData_YoshiKid) = { .yaw = 270, .init = &N(EVS_NpcInit_YoshiKid), .settings = &N(NpcSettings_YoshiKid), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = YOSHI_KID_BLUE_ANIMS, .tattle = MSG_NpcTattle_BlueYoshiKid, @@ -135,7 +135,7 @@ NpcData N(NpcData_JungleFuzzy) = { }, .init = &N(EVS_NpcInit_JungleFuzzy), .settings = &N(NpcSettings_JungleFuzzy_Wander), - .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = JUNGLE_FUZZY_DROPS, .animations = JUNGLE_FUZZY_ANIMS, }; diff --git a/src/world/area_jan/jan_11/npc.c b/src/world/area_jan/jan_11/npc.c index e0d4d5225c..325479ded5 100644 --- a/src/world/area_jan/jan_11/npc.c +++ b/src/world/area_jan/jan_11/npc.c @@ -127,7 +127,7 @@ NpcData N(NpcData_YoshiKid) = { .yaw = 90, .init = &N(EVS_NpcInit_YoshiKid), .settings = &N(NpcSettings_YoshiKid), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = YOSHI_KID_GREEN_ANIMS, .tattle = MSG_NpcTattle_GreenYoshiKid, diff --git a/src/world/area_jan/jan_12/npc.c b/src/world/area_jan/jan_12/npc.c index 4b5cfe5bdf..c757285574 100644 --- a/src/world/area_jan/jan_12/npc.c +++ b/src/world/area_jan/jan_12/npc.c @@ -20,7 +20,7 @@ NpcData N(NpcData_SpearGuy)[] = { } }, .settings = &N(NpcSettings_SpearGuy_Wander), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = SPEAR_GUY_DROPS, .animations = SPEAR_GUY_ANIMS, }, diff --git a/src/world/area_jan/jan_15/main.c b/src/world/area_jan/jan_15/main.c index 39efe142cd..18aa1bf097 100644 --- a/src/world/area_jan/jan_15/main.c +++ b/src/world/area_jan/jan_15/main.c @@ -1,7 +1,7 @@ #include "jan_15.h" EvtScript N(EVS_ExitWalk_jan_16) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, jan_15_ENTRY_1) Exec(ExitWalk) IfLt(GB_StoryProgress, STORY_CH5_REACHED_RAPHAELS_TREE) diff --git a/src/world/area_jan/jan_15/npc.c b/src/world/area_jan/jan_15/npc.c index f7de8ad38e..98b14fdf7b 100644 --- a/src/world/area_jan/jan_15/npc.c +++ b/src/world/area_jan/jan_15/npc.c @@ -181,7 +181,7 @@ NpcData N(NpcData_Piranhas)[] = { .yaw = 270, .init = &N(EVS_NpcInit_PutridPiranha), .settings = &N(NpcSettings_PutridPiranhaSentinel), - .flags = ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = PIRANHA_NO_DROPS, .animations = PIRANHA_SENTINEL_ANIMS, }, @@ -190,7 +190,7 @@ NpcData N(NpcData_Piranhas)[] = { .pos = { 325.0f, 0.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_PutridPiranhaSentinel), - .flags = ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = PIRANHA_NO_DROPS, .animations = PIRANHA_SENTINEL_ANIMS, }, @@ -199,7 +199,7 @@ NpcData N(NpcData_Piranhas)[] = { .pos = { 375.0f, 0.0f, 45.0f }, .yaw = 270, .settings = &N(NpcSettings_PutridPiranhaSentinel), - .flags = ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = PIRANHA_NO_DROPS, .animations = PIRANHA_SENTINEL_ANIMS, }, @@ -210,7 +210,7 @@ NpcData N(NpcData_HeartPlant_01) = { .pos = { -183.0f, 0.0f, 47.0f }, .yaw = 270, .settings = &N(NpcSettings_HeartPlant), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_INSPECT_ICON | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, @@ -221,7 +221,7 @@ NpcData N(NpcData_HeartPlant_02) = { .pos = { -124.0f, 0.0f, 20.0f }, .yaw = 270, .settings = &N(NpcSettings_HeartPlant), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_INSPECT_ICON | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, diff --git a/src/world/area_jan/jan_16/npc.c b/src/world/area_jan/jan_16/npc.c index 8935eb9ed9..dfa5467e9b 100644 --- a/src/world/area_jan/jan_16/npc.c +++ b/src/world/area_jan/jan_16/npc.c @@ -229,7 +229,7 @@ NpcData N(NpcData_RaphaelRaven)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RaphaelRaven), .settings = &N(NpcSettings_RaphaelRaven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_RaphaelRaven_Idle, @@ -257,7 +257,7 @@ NpcData N(NpcData_RaphaelRaven)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Raven), .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_Raven_Idle, @@ -285,7 +285,7 @@ NpcData N(NpcData_RaphaelRaven)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Raven), .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_Raven_Idle, @@ -317,7 +317,7 @@ NpcData N(NpcData_RaphaelRaven)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Raven), .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_Raven_Idle, @@ -345,7 +345,7 @@ NpcData N(NpcData_RaphaelRaven)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Raven), .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_Raven_Idle, @@ -373,7 +373,7 @@ NpcData N(NpcData_RaphaelRaven)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Raven), .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_Raven_Idle, diff --git a/src/world/area_jan/jan_22/main.c b/src/world/area_jan/jan_22/main.c index 4a22bef9be..2724216d76 100644 --- a/src/world/area_jan/jan_22/main.c +++ b/src/world/area_jan/jan_22/main.c @@ -15,7 +15,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_TexPan_LavaFalls) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_o262, TEX_PANNER_1) Call(SetTexPanner, MODEL_o269, TEX_PANNER_1) Call(SetTexPanner, MODEL_o261, TEX_PANNER_1) @@ -30,7 +30,7 @@ EvtScript N(EVS_TexPan_LavaFalls) = { }; EvtScript N(EVS_TexPan_LavaSpread) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_o275, TEX_PANNER_2) Call(SetTexPanner, MODEL_o274, TEX_PANNER_2) Set(LVar0, 0) @@ -44,7 +44,7 @@ EvtScript N(EVS_TexPan_LavaSpread) = { }; EvtScript N(EVS_TexPan_LavaFlow) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_o263, TEX_PANNER_3) Call(SetTexPanner, MODEL_o271, TEX_PANNER_3) Set(LVar0, 0) @@ -58,7 +58,7 @@ EvtScript N(EVS_TexPan_LavaFlow) = { }; EvtScript N(EVS_TexPan_LavaGather) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_o267, TEX_PANNER_4) Call(SetTexPanner, MODEL_o272, TEX_PANNER_4) Set(LVar0, 0) diff --git a/src/world/area_jan/jan_22/npc.c b/src/world/area_jan/jan_22/npc.c index 11540157f9..1af06dc813 100644 --- a/src/world/area_jan/jan_22/npc.c +++ b/src/world/area_jan/jan_22/npc.c @@ -749,7 +749,7 @@ EvtScript N(EVS_NpcIdle_Kolorado_HeldCaptive) = { Call(DisablePlayerInput, FALSE) EndIf CaseEq(1) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(func_802D2C14, 1) Wait(10 * DT) @@ -760,8 +760,8 @@ EvtScript N(EVS_NpcIdle_Kolorado_HeldCaptive) = { EndIf Call(SetSelfVar, 0, 2) Call(func_802D2C14, 0) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) - SetGroup(EVT_GROUP_0B) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(DisablePlayerInput, FALSE) CaseEq(2) Call(DisablePlayerInput, TRUE) @@ -1064,11 +1064,11 @@ EvtScript N(EVS_NpcIdle_SpearGuy) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Switch(LVar0) CaseRange(LVar3, LVar4) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH, 0) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_PARTNER, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH, FALSE) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_PARTNER, FALSE) CaseDefault - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH, 1) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH, TRUE) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_PARTNER, TRUE) EndSwitch Wait(1) EndLoop @@ -1428,7 +1428,7 @@ NpcData N(NpcData_Kolorado)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado_HeldCaptive), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -1439,7 +1439,7 @@ NpcData N(NpcData_Kolorado)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado_WaitingToExplore), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -1450,7 +1450,7 @@ NpcData N(NpcData_Kolorado)[] = { .yaw = 90, .init = &N(EVS_NpcInit_ZiplineDummy), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -1461,7 +1461,7 @@ NpcData N(NpcData_Kolorado)[] = { .yaw = 90, .init = &N(EVS_NpcInit_ZiplineDummy), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -1489,7 +1489,7 @@ NpcData N(NpcData_SpearGuy) = { }, .init = &N(EVS_NpcInit_SpearGuy), .settings = &N(NpcSettings_SpearGuy_Patrol), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = SPEAR_GUY_ANIMS, }; @@ -1501,7 +1501,7 @@ NpcData N(NpcData_RaphaelRaven)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RaphaelRaven), .settings = &N(NpcSettings_RaphaelRaven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = RAPHAEL_RAVEN_ANIMS, .tattle = MSG_NpcTattle_RaphaelRaven, @@ -1512,7 +1512,7 @@ NpcData N(NpcData_RaphaelRaven)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Raven), .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenA, @@ -1522,7 +1522,7 @@ NpcData N(NpcData_RaphaelRaven)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = RAVEN_ANIMS, #if VERSION_JP @@ -1534,7 +1534,7 @@ NpcData N(NpcData_RaphaelRaven)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenC, @@ -1544,7 +1544,7 @@ NpcData N(NpcData_RaphaelRaven)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenD, @@ -1554,7 +1554,7 @@ NpcData N(NpcData_RaphaelRaven)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenE, @@ -1567,7 +1567,7 @@ NpcData N(NpcData_Misstar) = { .yaw = 90, .init = &N(EVS_NpcInit_Misstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, }; diff --git a/src/world/area_jan/jan_23/npc.c b/src/world/area_jan/jan_23/npc.c index b4a5496346..b44194d32c 100644 --- a/src/world/area_jan/jan_23/npc.c +++ b/src/world/area_jan/jan_23/npc.c @@ -596,7 +596,7 @@ NpcData N(NpcData_Ravens)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RaphaelRaven), .settings = &N(NpcSettings_RaphaelRaven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY, .drops = NO_DROPS, .animations = RAPHAEL_RAVEN_ANIMS, .tattle = MSG_NpcTattle_RaphaelRaven, @@ -607,7 +607,7 @@ NpcData N(NpcData_Ravens)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Raven_01), .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenA, @@ -618,7 +618,7 @@ NpcData N(NpcData_Ravens)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Raven_02), .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = RAVEN_ANIMS, #if VERSION_JP @@ -631,7 +631,7 @@ NpcData N(NpcData_Ravens)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Raven_03), .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenC, @@ -642,7 +642,7 @@ NpcData N(NpcData_Ravens)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Raven_04), .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenD, @@ -653,7 +653,7 @@ NpcData N(NpcData_Ravens)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Raven_05), .settings = &N(NpcSettings_Raven), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = RAVEN_ANIMS, .tattle = MSG_NpcTattle_RavenE, diff --git a/src/world/area_kgr/kgr_02/npc.c b/src/world/area_kgr/kgr_02/npc.c index 861503a713..937666e5dd 100644 --- a/src/world/area_kgr/kgr_02/npc.c +++ b/src/world/area_kgr/kgr_02/npc.c @@ -114,11 +114,11 @@ EvtScript N(EVS_Fuzzipede_ReactToLight) = { Set(LVarB, 1) Call(DisablePlayerInput, FALSE) EndIf - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, FALSE) Set(LVarA, 1) Else Call(N(AwaitPartnerNotWatt)) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, TRUE) Set(LVarA, 0) EndIf Wait(1) @@ -167,7 +167,7 @@ EvtScript N(EVS_NpcAI_Fuzzipede) = { EndIf Wait(1) EndLoop - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE, FALSE) Call(StartBossBattle, SONG_SPECIAL_BATTLE) Return End @@ -292,7 +292,7 @@ NpcData N(NpcData_Fuzzipede) = { .pos = { 333.0f, -10.0f, -130.0f }, .yaw = 90, .settings = &N(NpcSettings_Fuzzipede), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_8000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_INSPECT_ICON | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = { .idle = ANIM_Fuzzipede_Anim04, diff --git a/src/world/area_kkj/kkj_00/main.c b/src/world/area_kkj/kkj_00/main.c index e72d52f856..c56ab61554 100644 --- a/src/world/area_kkj/kkj_00/main.c +++ b/src/world/area_kkj/kkj_00/main.c @@ -1,7 +1,7 @@ #include "kkj_00.h" EvtScript N(D_80241140_ABC3D0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_LARGE) Set(LVar0, kkj_00_ENTRY_1) @@ -17,7 +17,7 @@ EvtScript N(D_80241140_ABC3D0) = { }; EvtScript N(D_802411F4_ABC484) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, kkj_00_ENTRY_3) diff --git a/src/world/area_kkj/kkj_00/npc_ending.c b/src/world/area_kkj/kkj_00/npc_ending.c index eb1f95efe6..5e9e3a8a3d 100644 --- a/src/world/area_kkj/kkj_00/npc_ending.c +++ b/src/world/area_kkj/kkj_00/npc_ending.c @@ -236,7 +236,7 @@ NpcData N(NpcData_Peach) = { .pos = { 0.0f, 100.0f, -440.0f }, .yaw = 270, .settings = &N(NpcSettings_Peach), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_PLAYER_SPRITE, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_PLAYER_SPRITE, .drops = NO_DROPS, .animations = PEACH_ANIMS, .extraAnimations = N(ExtraAnims_Peach), @@ -248,7 +248,7 @@ NpcData N(NpcData_SpecialToads)[] = { .pos = { 100.0f, 0.0f, 250.0f }, .yaw = 270, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOAD_MINISTER_ANIMS, .extraAnimations = N(ExtraAnims_Minister), @@ -258,7 +258,7 @@ NpcData N(NpcData_SpecialToads)[] = { .pos = { -200.0f, 0.0f, 260.0f }, .yaw = 90, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_TayceT_Idle, @@ -271,7 +271,7 @@ NpcData N(NpcData_SpecialToads)[] = { .yaw = 90, .init = &N(EVS_NpcInit_RussT), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_RussT_Idle, @@ -299,7 +299,7 @@ NpcData N(NpcData_SpecialToads)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShiverToad_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_ShiverToad_Green_Idle, @@ -329,7 +329,7 @@ NpcData N(NpcData_Party)[] = { .pos = { 180.0f, 0.0f, 80.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldGoombario_Idle, @@ -356,7 +356,7 @@ NpcData N(NpcData_Party)[] = { .pos = { 225.0f, 0.0f, 225.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldKooper_Idle, @@ -383,7 +383,7 @@ NpcData N(NpcData_Party)[] = { .pos = { 270.0f, 0.0f, 115.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldBombette_Idle, @@ -410,7 +410,7 @@ NpcData N(NpcData_Party)[] = { .pos = { 325.0f, 10.0f, 175.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldParakarry_Idle, @@ -437,7 +437,7 @@ NpcData N(NpcData_Party)[] = { .pos = { -270.0f, 0.0f, 145.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldBow_Idle, @@ -466,7 +466,7 @@ NpcData N(NpcData_Party)[] = { .initVarCount = 1, .initVar = { .value = 0 }, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldWatt_Idle, @@ -493,7 +493,7 @@ NpcData N(NpcData_Party)[] = { .pos = { -190.0f, 0.0f, 50.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldSushie_Idle, @@ -520,7 +520,7 @@ NpcData N(NpcData_Party)[] = { .pos = { -320.0f, 0.0f, -60.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldLakilester_Idle, @@ -550,7 +550,7 @@ NpcData N(NpcData_Wizards)[] = { .pos = { -145.0f, 0.0f, 415.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Merlon_Idle, @@ -562,7 +562,7 @@ NpcData N(NpcData_Wizards)[] = { .pos = { -225.0f, 0.0f, 380.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Merluvlee_Idle, @@ -574,7 +574,7 @@ NpcData N(NpcData_Wizards)[] = { .pos = { -175.0f, 0.0f, 330.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Merlow_Idle, @@ -586,7 +586,7 @@ NpcData N(NpcData_Wizards)[] = { .pos = { -250.0f, 0.0f, 350.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldMerlee_Idle, @@ -613,7 +613,7 @@ NpcData N(NpcData_Wizards)[] = { .pos = { -220.0f, 0.0f, 450.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Merle_Idle, @@ -643,7 +643,7 @@ NpcData N(NpcData_PartyFamily)[] = { .pos = { -365.0f, 0.0f, -60.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Lakilulu_Idle, @@ -670,7 +670,7 @@ NpcData N(NpcData_PartyFamily)[] = { .pos = { -340.0f, 0.0f, 100.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Bootler_Idle, @@ -697,7 +697,7 @@ NpcData N(NpcData_PartyFamily)[] = { .pos = { 170.0f, 0.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Goompa_Idle, @@ -724,7 +724,7 @@ NpcData N(NpcData_PartyFamily)[] = { .pos = { 140.0f, 0.0f, 50.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Goombaria_Idle, @@ -754,7 +754,7 @@ NpcData N(NpcData_Visitors)[] = { .pos = { -340.0f, 0.0f, 310.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Yoshi_Blue_Idle, @@ -781,7 +781,7 @@ NpcData N(NpcData_Visitors)[] = { .pos = { 225.0f, 0.0f, -80.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Penguin_Idle, @@ -808,7 +808,7 @@ NpcData N(NpcData_Visitors)[] = { .pos = { -250.0f, 0.0f, -150.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Penguin_Idle, @@ -835,7 +835,7 @@ NpcData N(NpcData_Visitors)[] = { .pos = { -320.0f, 0.0f, 245.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Dryite_Yellow_Idle, @@ -862,7 +862,7 @@ NpcData N(NpcData_Visitors)[] = { .pos = { -395.0f, 68.0f, 50.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_Ninji_Idle, @@ -892,7 +892,7 @@ NpcData N(NpcData_Toads)[] = { .pos = { 200.0f, 0.0f, 420.0f }, .yaw = 270, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .extraAnimations = N(ExtraAnims_Toad), @@ -902,7 +902,7 @@ NpcData N(NpcData_Toads)[] = { .pos = { -120.0f, 0.0f, 205.0f }, .yaw = 90, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOAD_YELLOW_ANIMS, .extraAnimations = N(ExtraAnims_Toad), @@ -912,7 +912,7 @@ NpcData N(NpcData_Toads)[] = { .pos = { -440.0f, 0.0f, 220.0f }, .yaw = 90, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOAD_GREEN_ANIMS, .extraAnimations = N(ExtraAnims_Toad), @@ -922,7 +922,7 @@ NpcData N(NpcData_Toads)[] = { .pos = { 285.0f, 0.0f, 290.0f }, .yaw = 270, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .extraAnimations = N(ExtraAnims_Toad), @@ -936,7 +936,7 @@ NpcData N(NpcData_Toadettes)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toadette_03), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .extraAnimations = N(ExtraAnims_Toadette), @@ -947,7 +947,7 @@ NpcData N(NpcData_Toadettes)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Toadette_04), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOADETTE_GREEN_ANIMS, .extraAnimations = N(ExtraAnims_Toadette), @@ -957,7 +957,7 @@ NpcData N(NpcData_Toadettes)[] = { .pos = { -190.0f, 0.0f, 160.0f }, .yaw = 90, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOADETTE_ORANGE_ANIMS, .extraAnimations = N(ExtraAnims_Toadette), @@ -967,7 +967,7 @@ NpcData N(NpcData_Toadettes)[] = { .pos = { 190.0f, 0.0f, 300.0f }, .yaw = 270, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOADETTE_PURPLE_ANIMS, .extraAnimations = N(ExtraAnims_Toadette), @@ -981,7 +981,7 @@ NpcData N(NpcData_ToadGuards)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ToadGuard_03), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOAD_GUARD_RED_ANIMS, .extraAnimations = N(ExtraAnims_ToadGuard), @@ -991,7 +991,7 @@ NpcData N(NpcData_ToadGuards)[] = { .pos = { -50.0f, 100.0f, -365.0f }, .yaw = 270, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOAD_GUARD_BLUE_ANIMS, .extraAnimations = N(ExtraAnims_ToadGuard), @@ -1001,7 +1001,7 @@ NpcData N(NpcData_ToadGuards)[] = { .pos = { 225.0f, 0.0f, 125.0f }, .yaw = 270, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOAD_GUARD_RED_ANIMS, .extraAnimations = N(ExtraAnims_ToadGuard), @@ -1011,7 +1011,7 @@ NpcData N(NpcData_ToadGuards)[] = { .pos = { -392.0f, 40.0f, -230.0f }, .yaw = 90, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOAD_GUARD_GREEN_ANIMS, .extraAnimations = N(ExtraAnims_ToadGuard), @@ -1021,7 +1021,7 @@ NpcData N(NpcData_ToadGuards)[] = { .pos = { -392.0f, 40.0f, -230.0f }, .yaw = 90, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = TOAD_GUARD_YELLOW_ANIMS, .extraAnimations = N(ExtraAnims_ToadGuard), diff --git a/src/world/area_kkj/kkj_00/npc_intro.c b/src/world/area_kkj/kkj_00/npc_intro.c index 7778169d28..4b456ba9f8 100644 --- a/src/world/area_kkj/kkj_00/npc_intro.c +++ b/src/world/area_kkj/kkj_00/npc_intro.c @@ -273,7 +273,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Luigi), .settings = &N(NpcSettings_Luigi), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = LUIGI_ANIMS, }, @@ -283,7 +283,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Toad_01), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, }, @@ -307,7 +307,7 @@ NpcData N(NpcData_Characters)[] = { }, .init = &N(EVS_NpcInit_Toad_02), .settings = &N(NpcSettings_Toad_Patrol), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, }, @@ -317,7 +317,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Toad_03), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = TOAD_YELLOW_ANIMS, }, @@ -327,7 +327,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toadette_01), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, }, @@ -337,7 +337,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Toadette_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOADETTE_GREEN_ANIMS, }, @@ -347,7 +347,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_RussT), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_RussT_Idle, @@ -374,7 +374,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShiverToad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_ShiverToad_Green_Idle, @@ -401,7 +401,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Penguin_01), .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, }, @@ -411,7 +411,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ToadGuard_01), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOAD_GUARD_RED_ANIMS, }, @@ -421,7 +421,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ToadGuard_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOAD_GUARD_BLUE_ANIMS, }, diff --git a/src/world/area_kkj/kkj_01/main.c b/src/world/area_kkj/kkj_01/main.c index 42c8c656db..d4ff2693da 100644 --- a/src/world/area_kkj/kkj_01/main.c +++ b/src/world/area_kkj/kkj_01/main.c @@ -1,7 +1,7 @@ #include "kkj_01.h" EvtScript N(EVS_ExitDoors_kkj_00_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_LARGE) Set(LVar0, kkj_01_ENTRY_0) @@ -17,7 +17,7 @@ EvtScript N(EVS_ExitDoors_kkj_00_1) = { }; EvtScript N(EVS_ExitDoors_kkj_02_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_LARGE) Set(LVar0, kkj_01_ENTRY_1) @@ -33,7 +33,7 @@ EvtScript N(EVS_ExitDoors_kkj_02_0) = { }; EvtScript N(EVS_ExitDoors_kkj_14_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, kkj_01_ENTRY_4) diff --git a/src/world/area_kkj/kkj_01/npc.c b/src/world/area_kkj/kkj_01/npc.c index 27f3e6790b..840294bba9 100644 --- a/src/world/area_kkj/kkj_01/npc.c +++ b/src/world/area_kkj/kkj_01/npc.c @@ -401,7 +401,7 @@ NpcData N(NpcData_ToadMinister)[] = { .init = &N(EVS_NpcInit_Dryite), .drops = NO_DROPS, .settings = &N(NpcSettings_Dryite), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .animations = DRYITE_YELLOW_ANIMS, }, { @@ -411,7 +411,7 @@ NpcData N(NpcData_ToadMinister)[] = { .init = &N(EVS_NpcInit_Mouser), .drops = NO_DROPS, .settings = &N(NpcSettings_Mouser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .animations = MOUSER_BLUE_ANIMS, }, { @@ -421,7 +421,7 @@ NpcData N(NpcData_ToadMinister)[] = { .init = &N(EVS_NpcInit_MayorPenguin), .drops = NO_DROPS, .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .animations = MAYOR_PENGUIN_ANIMS, }, { @@ -431,7 +431,7 @@ NpcData N(NpcData_ToadMinister)[] = { .init = &N(EVS_NpcInit_Koopa), .drops = NO_DROPS, .settings = &N(NpcSettings_Koopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .animations = KOOPA_ANIMS, }, }; diff --git a/src/world/area_kkj/kkj_02/npc.c b/src/world/area_kkj/kkj_02/npc.c index 64f1835f82..cd9d44bf78 100644 --- a/src/world/area_kkj/kkj_02/npc.c +++ b/src/world/area_kkj/kkj_02/npc.c @@ -46,7 +46,7 @@ NpcData N(NpcData_Toads)[] = { }, .init = &N(EVS_NpcInit_Toad), .settings = &N(NpcSettings_Toad_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, }, @@ -56,7 +56,7 @@ NpcData N(NpcData_Toads)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ToadGuard), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = TOAD_GUARD_RED_ANIMS, }, diff --git a/src/world/area_kkj/kkj_03/npc.c b/src/world/area_kkj/kkj_03/npc.c index a3eca9f67e..bb196424ef 100644 --- a/src/world/area_kkj/kkj_03/npc.c +++ b/src/world/area_kkj/kkj_03/npc.c @@ -8,7 +8,7 @@ NpcData N(NpcData_Peach) = { .pos = { 670.0f, 0.0f, -12.0f }, .yaw = 270, .settings = &N(NpcSettings_Peach), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_PLAYER_SPRITE, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_PLAYER_SPRITE, .drops = NO_DROPS, .animations = PEACH_ANIMS, }; diff --git a/src/world/area_kkj/kkj_10/main.c b/src/world/area_kkj/kkj_10/main.c index f3ecfb9162..cb8b1fd503 100644 --- a/src/world/area_kkj/kkj_10/main.c +++ b/src/world/area_kkj/kkj_10/main.c @@ -13,7 +13,7 @@ API_CALLABLE(N(DisableAllLightSources)) { #include "../common/SetAvailableDisguise.inc.c" EvtScript N(EVS_ExitDoors_osr_02_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_LARGE) Set(LVar0, kkj_10_ENTRY_0) @@ -29,7 +29,7 @@ EvtScript N(EVS_ExitDoors_osr_02_1) = { }; EvtScript N(EVS_ExitDoors_kkj_11_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_LARGE) Set(LVar0, kkj_10_ENTRY_1) @@ -45,7 +45,7 @@ EvtScript N(EVS_ExitDoors_kkj_11_0) = { }; EvtScript N(EVS_ExitDoors_kkj_21_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, kkj_10_ENTRY_2) @@ -61,7 +61,7 @@ EvtScript N(EVS_ExitDoors_kkj_21_0) = { }; EvtScript N(EVS_ExitDoors_kkj_19_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, kkj_10_ENTRY_3) @@ -77,7 +77,7 @@ EvtScript N(EVS_ExitDoors_kkj_19_0) = { }; EvtScript N(EVS_ExitDoors_kkj_20_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, kkj_10_ENTRY_4) @@ -93,7 +93,7 @@ EvtScript N(EVS_ExitDoors_kkj_20_0) = { }; EvtScript N(EVS_ExitDoors_kkj_29_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, kkj_10_ENTRY_2) diff --git a/src/world/area_kkj/kkj_10/npcs_early.c b/src/world/area_kkj/kkj_10/npcs_early.c index c4abb4f302..e52bdb38fc 100644 --- a/src/world/area_kkj/kkj_10/npcs_early.c +++ b/src/world/area_kkj/kkj_10/npcs_early.c @@ -9,7 +9,7 @@ EvtScript N(EVS_CapturePeach) = { Call(DisablePlayerInput, TRUE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) Call(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) @@ -32,7 +32,7 @@ EvtScript N(EVS_CapturePeach) = { Call(GotoMapSpecial, Ref("kkj_14"), kkj_14_ENTRY_B, TRANSITION_PEACH_CAPTURED) Wait(100) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; @@ -134,7 +134,7 @@ NpcData N(NpcData_Koopatrol)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_01), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -145,7 +145,7 @@ NpcData N(NpcData_Koopatrol)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_02), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), diff --git a/src/world/area_kkj/kkj_10/npcs_later.c b/src/world/area_kkj/kkj_10/npcs_later.c index 2ae0ff1ab8..b59705217a 100644 --- a/src/world/area_kkj/kkj_10/npcs_later.c +++ b/src/world/area_kkj/kkj_10/npcs_later.c @@ -27,7 +27,7 @@ AnimID N(ExtraAnims_Koopatrol)[] = { EvtScript N(EVS_CapturePeach) = { Call(DisablePlayerInput, TRUE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(N(PreventNextPeachDisguise)) Call(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) @@ -51,7 +51,7 @@ EvtScript N(EVS_CapturePeach) = { Call(GotoMapSpecial, Ref("kkj_14"), kkj_14_ENTRY_B, TRANSITION_PEACH_CAPTURED) Wait(100) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; @@ -64,13 +64,13 @@ EvtScript N(EVS_NpcIdle_Koopatrol_01) = { IfEq(LVar2, 0) Call(N(GetPeachDisguise), LVar1) IfEq(LVar1, PEACH_DISGUISE_NONE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, TRUE) IfNe(LVar0, 0) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_CapturePeach))) Set(LVar2, 1) EndIf Else - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, FALSE) EndIf EndIf Wait(1) @@ -103,13 +103,13 @@ EvtScript N(EVS_NpcIdle_Koopatrol_02) = { IfEq(LVar2, 0) Call(N(GetPeachDisguise), LVar1) IfEq(LVar1, PEACH_DISGUISE_NONE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, FALSE) IfNe(LVar0, 0) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_CapturePeach))) Set(LVar2, 1) EndIf Else - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, FALSE) EndIf EndIf Wait(1) @@ -195,7 +195,7 @@ NpcData N(NpcData_Koopatrol)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_01), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -206,7 +206,7 @@ NpcData N(NpcData_Koopatrol)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_02), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), diff --git a/src/world/area_kkj/kkj_11/main.c b/src/world/area_kkj/kkj_11/main.c index ca90239d5a..2357973094 100644 --- a/src/world/area_kkj/kkj_11/main.c +++ b/src/world/area_kkj/kkj_11/main.c @@ -13,7 +13,7 @@ API_CALLABLE(N(DisableAllLightSources)) { #include "../common/SetAvailableDisguise.inc.c" EvtScript N(EVS_ExitDoors_kkj_10_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_LARGE) Set(LVar0, kkj_11_ENTRY_0) @@ -29,7 +29,7 @@ EvtScript N(EVS_ExitDoors_kkj_10_1) = { }; EvtScript N(EVS_ExitDoors_kkj_12_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_LARGE) Set(LVar0, kkj_11_ENTRY_1) @@ -45,7 +45,7 @@ EvtScript N(EVS_ExitDoors_kkj_12_0) = { }; EvtScript N(EVS_ExitDoor_kkj_14_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, kkj_11_ENTRY_4) @@ -61,7 +61,7 @@ EvtScript N(EVS_ExitDoor_kkj_14_0) = { }; EvtScript N(EVS_ExitDoor_kkj_16_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, kkj_11_ENTRY_2) @@ -77,7 +77,7 @@ EvtScript N(EVS_ExitDoor_kkj_16_0) = { }; EvtScript N(EVS_ExitDoor_kkj_15_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, kkj_11_ENTRY_3) @@ -93,7 +93,7 @@ EvtScript N(EVS_ExitDoor_kkj_15_0) = { }; EvtScript N(EVS_ExitDoor_kkj_17_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, kkj_11_ENTRY_5) @@ -109,7 +109,7 @@ EvtScript N(EVS_ExitDoor_kkj_17_0) = { }; EvtScript N(EVS_ExitDoor_kkj_18_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, kkj_11_ENTRY_6) diff --git a/src/world/area_kkj/kkj_11/npcs_early.c b/src/world/area_kkj/kkj_11/npcs_early.c index a5cefb4d41..e00a70f217 100644 --- a/src/world/area_kkj/kkj_11/npcs_early.c +++ b/src/world/area_kkj/kkj_11/npcs_early.c @@ -10,7 +10,7 @@ EvtScript N(EVS_NpcAI_Koopatrol_01) = { Call(DisablePlayerInput, TRUE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) Call(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) @@ -33,7 +33,7 @@ EvtScript N(EVS_NpcAI_Koopatrol_01) = { Call(GotoMapSpecial, Ref("kkj_14"), kkj_14_ENTRY_B, TRANSITION_PEACH_CAPTURED) Wait(100) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; @@ -160,7 +160,7 @@ EvtScript N(EVS_NpcIdle_Koopatrol_04) = { Wait(1) EndLoop Call(DisablePlayerInput, TRUE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) Call(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) @@ -175,7 +175,7 @@ EvtScript N(EVS_NpcIdle_Koopatrol_04) = { Call(GotoMapSpecial, Ref("kkj_14"), kkj_14_ENTRY_B, TRANSITION_PEACH_CAPTURED) Wait(100) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; @@ -245,7 +245,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_01), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -256,7 +256,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_02), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -267,7 +267,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_03), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -278,7 +278,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_04), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -289,7 +289,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_05), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), diff --git a/src/world/area_kkj/kkj_11/npcs_later.c b/src/world/area_kkj/kkj_11/npcs_later.c index feaf6f8744..da5aff312a 100644 --- a/src/world/area_kkj/kkj_11/npcs_later.c +++ b/src/world/area_kkj/kkj_11/npcs_later.c @@ -27,7 +27,7 @@ AnimID N(ExtraAnims_Koopatrol)[] = { EvtScript N(EVS_CapturePeach) = { Call(DisablePlayerInput, TRUE) Call(N(PreventNextPeachDisguise)) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) Call(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) @@ -50,7 +50,7 @@ EvtScript N(EVS_CapturePeach) = { Call(GotoMapSpecial, Ref("kkj_14"), kkj_14_ENTRY_B, TRANSITION_PEACH_CAPTURED) Wait(100) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; @@ -97,7 +97,7 @@ EvtScript N(EVS_NpcIdle_Koopatrol_01) = { Exec(N(EVS_CheckForPeach_Koopatrol_01)) Call(GetEntryID, LVar0) IfEq(LVar0, kkj_11_ENTRY_1) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, TRUE) Call(WaitForPlayerInputEnabled) Thread Call(DisablePlayerInput, TRUE) @@ -110,7 +110,7 @@ EvtScript N(EVS_NpcIdle_Koopatrol_01) = { Call(NpcMoveTo, NPC_SELF, 0, -350, 0) Call(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01) Call(InterpNpcYaw, NPC_SELF, 220, 5) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, FALSE) EndIf Loop(0) Wait(1) @@ -123,7 +123,7 @@ EvtScript N(EVS_NpcIdle_Koopatrol_04) = { Exec(N(EVS_CheckForPeach_Koopatrol_01)) Call(GetEntryID, LVar0) IfEq(LVar0, kkj_11_ENTRY_4) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, TRUE) Call(WaitForPlayerInputEnabled) Thread Call(DisablePlayerInput, TRUE) @@ -136,7 +136,7 @@ EvtScript N(EVS_NpcIdle_Koopatrol_04) = { Call(NpcMoveTo, NPC_SELF, 0, -240, 0) Call(SetNpcAnimation, NPC_SELF, ANIM_WorldKoopatrol_Anim01) Call(InterpNpcYaw, NPC_SELF, 220, 5) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, FALSE) EndIf Loop(0) Wait(1) @@ -321,7 +321,7 @@ NpcData N(NpcData_Minions_Later)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_01), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -332,7 +332,7 @@ NpcData N(NpcData_Minions_Later)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_02), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -343,7 +343,7 @@ NpcData N(NpcData_Minions_Later)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_03), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -354,7 +354,7 @@ NpcData N(NpcData_Minions_Later)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_04), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), diff --git a/src/world/area_kkj/kkj_12/npc.c b/src/world/area_kkj/kkj_12/npc.c index e85a277aed..837570b8eb 100644 --- a/src/world/area_kkj/kkj_12/npc.c +++ b/src/world/area_kkj/kkj_12/npc.c @@ -115,7 +115,7 @@ EvtScript N(EVS_NpcInteract_Koopatrol_02) = { EvtScript N(EVS_CapturePeach) = { Call(DisablePlayerInput, TRUE) Call(N(PreventNextPeachDisguise)) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) Call(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) @@ -138,7 +138,7 @@ EvtScript N(EVS_CapturePeach) = { Call(GotoMapSpecial, Ref("kkj_14"), kkj_14_ENTRY_B, TRANSITION_PEACH_CAPTURED) Wait(100) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; @@ -151,13 +151,13 @@ EvtScript N(EVS_NpcIdle_Koopatrol_01) = { IfEq(LVar2, 0) Call(N(GetPeachDisguise), LVar1) IfEq(LVar1, PEACH_DISGUISE_NONE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, TRUE) IfNe(LVar0, 0) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_CapturePeach))) Set(LVar2, 1) EndIf Else - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, FALSE) EndIf EndIf Wait(1) @@ -184,13 +184,13 @@ EvtScript N(EVS_NpcIdle_Koopatrol_02) = { IfEq(LVar2, 0) Call(N(GetPeachDisguise), LVar1) IfEq(LVar1, PEACH_DISGUISE_NONE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, TRUE) IfNe(LVar0, 0) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_CapturePeach))) Set(LVar2, 1) EndIf Else - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, FALSE) EndIf EndIf Wait(1) @@ -232,7 +232,7 @@ NpcData N(NpcData_Koopatrol_01)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_01), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -243,7 +243,7 @@ NpcData N(NpcData_Koopatrol_01)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_02), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -253,7 +253,7 @@ NpcData N(NpcData_Koopatrol_01)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = CLUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Clubba), diff --git a/src/world/area_kkj/kkj_13/npcs_finale.c b/src/world/area_kkj/kkj_13/npcs_finale.c index 7d5848b11a..5ff1370842 100644 --- a/src/world/area_kkj/kkj_13/npcs_finale.c +++ b/src/world/area_kkj/kkj_13/npcs_finale.c @@ -288,7 +288,7 @@ EvtScript N(EVS_NpcDefeat_Bowser_Body) = { Call(GetBattleOutcome, LVar0) Switch(LVar0) CaseEq(OUTCOME_PLAYER_WON) - Call(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_2, TRUE) + Call(SetEncounterStatusFlags, ENCOUNTER_FLAG_CANT_SKIP_WIN_DELAY, TRUE) Exec(N(EVS_Scene_BowserDefeated)) CaseEq(OUTCOME_PLAYER_LOST) CaseEq(OUTCOME_PLAYER_FLED) @@ -354,7 +354,7 @@ NpcData N(NpcData_Bowser_Body) = { .yaw = 270, .init = &N(EVS_NpcInit_Bowser_Body), .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -366,7 +366,7 @@ NpcData N(NpcData_Bowser_Prop) = { .yaw = 270, .init = &N(EVS_NpcInit_Bowser_Prop), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -378,7 +378,7 @@ NpcData N(NpcData_CaptivePeach) = { .yaw = 270, .init = &N(EVS_NpcInit_CaptivePeach), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_PLAYER_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_PLAYER_SPRITE | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = PEACH_ANIMS, }; diff --git a/src/world/area_kkj/kkj_13/npcs_intro.c b/src/world/area_kkj/kkj_13/npcs_intro.c index e051907f7b..112aef2f96 100644 --- a/src/world/area_kkj/kkj_13/npcs_intro.c +++ b/src/world/area_kkj/kkj_13/npcs_intro.c @@ -81,7 +81,7 @@ NpcData N(NpcData_Bowser) = { .yaw = 270, .init = &N(EVS_NpcInit_Bowser_Body), .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -93,7 +93,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -103,7 +103,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -113,7 +113,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -123,7 +123,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Kammy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), @@ -133,7 +133,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 670.0f, 0.0f, -12.0f }, .yaw = 270, .settings = &N(NpcSettings_Peach), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_PLAYER_SPRITE, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_PLAYER_SPRITE, .drops = NO_DROPS, .animations = PEACH_ANIMS, }, diff --git a/src/world/area_kkj/kkj_14/main.c b/src/world/area_kkj/kkj_14/main.c index 3e914657d7..6b5016b54a 100644 --- a/src/world/area_kkj/kkj_14/main.c +++ b/src/world/area_kkj/kkj_14/main.c @@ -36,7 +36,7 @@ EvtScript N(EVS_EndPeachChapter7) = { }; EvtScript N(EVS_ExitDoor_GrandHall) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(AF_KKJ_13, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) @@ -57,7 +57,7 @@ EvtScript N(EVS_ExitDoor_GrandHall) = { }; EvtScript N(EVS_ExitDoors_Balcony) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(AF_KKJ_13, FALSE) Call(UseDoorSounds, DOOR_SOUNDS_DOOR) @@ -76,7 +76,7 @@ EvtScript N(EVS_ExitDoors_Balcony) = { }; EvtScript N(EVS_ExitWalk_SecretPassage) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Set(AF_KKJ_13, FALSE) Call(UseExitHeading, 60, kkj_14_ENTRY_2) Exec(ExitWalk) diff --git a/src/world/area_kkj/kkj_14/npc_ch0.c b/src/world/area_kkj/kkj_14/npc_ch0.c index e14eb6f719..383d442ac7 100644 --- a/src/world/area_kkj/kkj_14/npc_ch0.c +++ b/src/world/area_kkj/kkj_14/npc_ch0.c @@ -30,7 +30,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -40,7 +40,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Kammy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), diff --git a/src/world/area_kkj/kkj_14/npc_ch2.c b/src/world/area_kkj/kkj_14/npc_ch2.c index 4760af3c15..dbd875932f 100644 --- a/src/world/area_kkj/kkj_14/npc_ch2.c +++ b/src/world/area_kkj/kkj_14/npc_ch2.c @@ -31,7 +31,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -41,7 +41,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Kammy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), diff --git a/src/world/area_kkj/kkj_14/npc_ch7.c b/src/world/area_kkj/kkj_14/npc_ch7.c index 413c939c08..08affb6865 100644 --- a/src/world/area_kkj/kkj_14/npc_ch7.c +++ b/src/world/area_kkj/kkj_14/npc_ch7.c @@ -45,7 +45,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -55,7 +55,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -65,7 +65,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -75,7 +75,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Kammy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), diff --git a/src/world/area_kkj/kkj_14/npc_guards.c b/src/world/area_kkj/kkj_14/npc_guards.c index 18a0b6aa39..54a05f4930 100644 --- a/src/world/area_kkj/kkj_14/npc_guards.c +++ b/src/world/area_kkj/kkj_14/npc_guards.c @@ -209,7 +209,7 @@ NpcData N(NpcData_Guards)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -219,7 +219,7 @@ NpcData N(NpcData_Guards)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), diff --git a/src/world/area_kkj/kkj_15/main.c b/src/world/area_kkj/kkj_15/main.c index c987277d69..a6e0a741a4 100644 --- a/src/world/area_kkj/kkj_15/main.c +++ b/src/world/area_kkj/kkj_15/main.c @@ -47,7 +47,7 @@ EvtScript N(EVS_EndPeachChapter3) = { }; //@bug script not properly terminated EvtScript N(EVS_ExitDoor_kkj_11_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kkj_15_ENTRY_0) Set(LVar1, COLLIDER_tte) diff --git a/src/world/area_kkj/kkj_15/npc_chapter0.c b/src/world/area_kkj/kkj_15/npc_chapter0.c index ad13ceea47..379c555401 100644 --- a/src/world/area_kkj/kkj_15/npc_chapter0.c +++ b/src/world/area_kkj/kkj_15/npc_chapter0.c @@ -51,7 +51,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -61,7 +61,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Kammy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), @@ -71,7 +71,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = BLACK_KOOPA_BROS_ANIMS, .extraAnimations = N(ExtraAnims_KoopaBros), @@ -81,7 +81,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = RED_KOOPA_BROS_ANIMS, .extraAnimations = N(ExtraAnims_KoopaBros), @@ -91,7 +91,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = YELLOW_KOOPA_BROS_ANIMS, .extraAnimations = N(ExtraAnims_KoopaBros), @@ -101,7 +101,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = GREEN_KOOPA_BROS_ANIMS, .extraAnimations = N(ExtraAnims_KoopaBros), diff --git a/src/world/area_kkj/kkj_15/npc_chapter1.c b/src/world/area_kkj/kkj_15/npc_chapter1.c index 807e2e40a8..c55a93f0e4 100644 --- a/src/world/area_kkj/kkj_15/npc_chapter1.c +++ b/src/world/area_kkj/kkj_15/npc_chapter1.c @@ -30,7 +30,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -40,7 +40,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -50,7 +50,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), diff --git a/src/world/area_kkj/kkj_15/npc_chapter3.c b/src/world/area_kkj/kkj_15/npc_chapter3.c index 7e4b44fdd5..ba7a60922c 100644 --- a/src/world/area_kkj/kkj_15/npc_chapter3.c +++ b/src/world/area_kkj/kkj_15/npc_chapter3.c @@ -41,7 +41,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -51,7 +51,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Kammy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), @@ -61,7 +61,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -71,7 +71,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), diff --git a/src/world/area_kkj/kkj_16/main.c b/src/world/area_kkj/kkj_16/main.c index 8cc2178dee..cff33e3147 100644 --- a/src/world/area_kkj/kkj_16/main.c +++ b/src/world/area_kkj/kkj_16/main.c @@ -12,7 +12,7 @@ EvtScript N(EVS_EndPeachChapter2) = { }; //@bug script not properly terminated EvtScript N(EVS_ExitDoor_kkj_11_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kkj_16_ENTRY_0) Set(LVar1, COLLIDER_tte) diff --git a/src/world/area_kkj/kkj_16/npcs_early.c b/src/world/area_kkj/kkj_16/npcs_early.c index b8f9a75bd7..bc64997c89 100644 --- a/src/world/area_kkj/kkj_16/npcs_early.c +++ b/src/world/area_kkj/kkj_16/npcs_early.c @@ -11,7 +11,7 @@ EvtScript N(EVS_CapturePeach) = { Call(DisablePlayerInput, TRUE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) Call(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) @@ -196,7 +196,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_HammerBros), .settings = &N(NpcSettings_HammerBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = HAMMER_BROS_ANIMS, .extraAnimations = N(ExtraAnims_HammerBros), @@ -207,7 +207,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_01), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -218,7 +218,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_02), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -229,7 +229,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_03), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -240,7 +240,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_04), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), diff --git a/src/world/area_kkj/kkj_16/npcs_later.c b/src/world/area_kkj/kkj_16/npcs_later.c index 3673a8ddf9..6108be7e5c 100644 --- a/src/world/area_kkj/kkj_16/npcs_later.c +++ b/src/world/area_kkj/kkj_16/npcs_later.c @@ -69,7 +69,7 @@ EvtScript N(EVS_NpcInteract_HammerBros_03) = { EvtScript N(EVS_CapturePeach) = { Call(DisablePlayerInput, TRUE) Call(N(PreventNextPeachDisguise)) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) Call(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) @@ -100,14 +100,14 @@ EvtScript N(EVS_WatchForPlayer) = { Loop(0) Call(N(GetPeachDisguise), LVar1) IfEq(LVar1, PEACH_DISGUISE_NONE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, TRUE) Call(N(UnkPhysicsFunc), LVar0, 85, 60, 38) IfNe(LVar0, 0) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_CapturePeach))) Return EndIf Else - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, FALSE) EndIf Wait(1) EndLoop @@ -193,7 +193,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_HammerBros_01), .settings = &N(NpcSettings_HammerBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = HAMMER_BROS_ANIMS, .extraAnimations = N(ExtraAnims_HammerBros), @@ -204,7 +204,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_HammerBros_02), .settings = &N(NpcSettings_HammerBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = HAMMER_BROS_ANIMS, .extraAnimations = N(ExtraAnims_HammerBros), @@ -215,7 +215,7 @@ NpcData N(NpcData_Minions)[] = { .yaw = 0, .init = &N(EVS_NpcInit_HammerBros_03), .settings = &N(NpcSettings_HammerBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = HAMMER_BROS_ANIMS, .extraAnimations = N(ExtraAnims_HammerBros), diff --git a/src/world/area_kkj/kkj_17/chest.c b/src/world/area_kkj/kkj_17/chest.c index bf8f9ae7c9..891507d015 100644 --- a/src/world/area_kkj/kkj_17/chest.c +++ b/src/world/area_kkj/kkj_17/chest.c @@ -18,11 +18,11 @@ extern IconHudScriptPair gItemHudScripts[]; s32** N(varStash) = NULL; EvtScript N(EVS_Chest_ShowGotItem) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_FULL) Wait(40) Call(ShowGotItem, LVar0, FALSE, 0) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return Return End @@ -236,10 +236,10 @@ EvtScript N(EVS_UseMagicChest_Mario) = { CaseOrEq(269) CaseOrEq(297) CaseOrEq(273) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_FULL) Call(ShowGotItem, LVar0, FALSE, 0) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(AddBadge, LVar0, LVar1) Call(N(SetItemRetrieved)) EndCaseGroup diff --git a/src/world/area_kkj/kkj_17/main.c b/src/world/area_kkj/kkj_17/main.c index 7537013ef0..73f90df0bc 100644 --- a/src/world/area_kkj/kkj_17/main.c +++ b/src/world/area_kkj/kkj_17/main.c @@ -1,7 +1,7 @@ #include "kkj_17.h" EvtScript N(EVS_ExitDoors_kkj_11_5) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kkj_17_ENTRY_0) Set(LVar1, COLLIDER_ttw) diff --git a/src/world/area_kkj/kkj_18/gourmet.c b/src/world/area_kkj/kkj_18/gourmet.c index 2ae5170dfd..a710d5b382 100644 --- a/src/world/area_kkj/kkj_18/gourmet.c +++ b/src/world/area_kkj/kkj_18/gourmet.c @@ -528,7 +528,7 @@ EvtScript N(EVS_Scene_JudgeCake) = { Call(DisablePlayerInput, FALSE) Return EndIf - Call(SetEnemyFlagBits, NPC_GourmetGuy, ENEMY_FLAG_CANT_INTERACT, 1) + Call(SetEnemyFlagBits, NPC_GourmetGuy, ENEMY_FLAG_CANT_INTERACT, TRUE) ExecWait(N(EVS_GourmetGuy_LovesCake)) Call(SetNpcVar, NPC_GourmetGuy, 0, 1) Exec(N(EVS_GourmetGuy_RunAround)) diff --git a/src/world/area_kkj/kkj_18/main.c b/src/world/area_kkj/kkj_18/main.c index 3862655571..6aeaa89767 100644 --- a/src/world/area_kkj/kkj_18/main.c +++ b/src/world/area_kkj/kkj_18/main.c @@ -56,7 +56,7 @@ EvtScript N(EVS_UpdateClockPendulum) = { }; EvtScript N(EVS_ExitDoor_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kkj_18_ENTRY_0) Set(LVar1, COLLIDER_ttw) diff --git a/src/world/area_kkj/kkj_18/npc.c b/src/world/area_kkj/kkj_18/npc.c index c791ef2588..721aaa04a5 100644 --- a/src/world/area_kkj/kkj_18/npc.c +++ b/src/world/area_kkj/kkj_18/npc.c @@ -89,7 +89,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Kammy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), @@ -99,7 +99,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -109,7 +109,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 0, .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -120,7 +120,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_GourmetGuy), .settings = &N(NpcSettings_GourmetGuy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = GOURMET_GUY_ANIMS, .extraAnimations = N(ExtraAnims_GourmetGuy), @@ -130,7 +130,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { -250.0f, 10.0f, 85.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = GOURMET_GUY_ANIMS, .extraAnimations = N(ExtraAnims_GourmetGuy), @@ -140,7 +140,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { -250.0f, 10.0f, 85.0f }, .yaw = 90, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = GOURMET_GUY_ANIMS, .extraAnimations = N(ExtraAnims_GourmetGuy), diff --git a/src/world/area_kkj/kkj_19/baking.c b/src/world/area_kkj/kkj_19/baking.c index e4797ebc4d..e315d83ba1 100644 --- a/src/world/area_kkj/kkj_19/baking.c +++ b/src/world/area_kkj/kkj_19/baking.c @@ -522,18 +522,18 @@ EvtScript N(EVS_ItemPrompt_AddIngredient) = { IfEq(AB_KKJ19_CurrentBakeStep, BAKE_STEP_DONE) Return EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowKeyChoicePopup) Set(LVar2, LVar0) Switch(LVar2) CaseEq(0) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return CaseEq(-1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndSwitch Call(RemoveKeyItemAt, LVar1) @@ -603,7 +603,7 @@ EvtScript N(EVS_ItemPrompt_AddIngredient) = { EndSwitch Add(AB_KKJ19_BakeStepProgress, 1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; @@ -740,7 +740,7 @@ EvtScript N(EVS_FocusCam_Table) = { }; EvtScript N(EVS_Twink_FlyToPlayer) = { - Call(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, 1) + Call(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, TRUE) Call(SetNpcVar, NPC_Twink, 1, 0) Call(GetNpcPos, NPC_PARTNER, LVar3, LVar1, LVar2) Call(GetPlayerPos, LVar0, LVar1, LVar2) @@ -936,7 +936,7 @@ EvtScript N(EVS_ManageBaking) = { Set(AF_KKJ_FinishedBakingCake, FALSE) Set(AF_KKJ19_FailedBakingTask, FALSE) Set(AB_KKJ19_HeldIngredient, PEACH_BAKING_NONE) - Call(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, 1) + Call(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, TRUE) Call(SetNpcVar, NPC_Twink, 1, 0) IfEq(AB_KKJ_CompletedBakeStep, CAKE_TYPE_READY_TO_MIX) // resume mixing @@ -999,7 +999,7 @@ EvtScript N(EVS_ManageBaking) = { Wait(20) Thread ExecWait(N(EVS_Twink_FlyToHighPos)) - Call(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, 0) + Call(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, FALSE) Call(SetNpcVar, NPC_Twink, 1, 1) EndThread Set(LVarA, 1) @@ -1022,14 +1022,14 @@ EvtScript N(EVS_ManageBaking) = { Set(LVarA, 1) Thread ExecWait(N(EVS_Twink_FlyToHighPos)) - Call(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, 0) + Call(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, FALSE) Call(SetNpcVar, NPC_Twink, 1, 1) EndThread // wait for peach to tell twink shes done Label(LBL_ADD_SUGAR_EGGS_WAITING) Call(ResetCam, CAM_DEFAULT, Float(4.0 / DT)) IfEq(LVarA, 0) - Call(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, 0) + Call(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, FALSE) Call(SetNpcVar, NPC_Twink, 1, 1) EndIf Call(DisablePlayerInput, FALSE) @@ -1163,14 +1163,14 @@ EvtScript N(EVS_ManageBaking) = { Set(LVarA, 1) Thread ExecWait(N(EVS_Twink_FlyToHighPos)) - Call(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, 0) + Call(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, FALSE) Call(SetNpcVar, NPC_Twink, 1, 1) EndThread // wait for peach to tell twink shes done Label(LBL_ADD_FLOUR_BUTTER_WAITING) Call(ResetCam, CAM_DEFAULT, Float(4.0 / DT)) IfEq(LVarA, 0) - Call(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, 0) + Call(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, FALSE) Call(SetNpcVar, NPC_Twink, 1, 1) EndIf Call(DisablePlayerInput, FALSE) @@ -1380,7 +1380,7 @@ EvtScript N(EVS_ManageBaking) = { Label(LBL_DECORATE_WAITING) Call(ResetCam, CAM_DEFAULT, Float(4.0 / DT)) IfEq(LVarA, 0) - Call(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, 0) + Call(SetEnemyFlagBits, NPC_Twink, ENEMY_FLAG_CANT_INTERACT, FALSE) Call(SetNpcVar, NPC_Twink, 1, 1) EndIf Call(DisablePlayerInput, FALSE) diff --git a/src/world/area_kkj/kkj_19/main.c b/src/world/area_kkj/kkj_19/main.c index cf88129a90..b3fd8bfc14 100644 --- a/src/world/area_kkj/kkj_19/main.c +++ b/src/world/area_kkj/kkj_19/main.c @@ -161,7 +161,7 @@ API_CALLABLE(N(CreateIngredientInfoWindows)) { } EvtScript N(EVS_ExitDoor_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kkj_19_ENTRY_0) Set(LVar1, COLLIDER_ttse) diff --git a/src/world/area_kkj/kkj_19/npcs_peach.c b/src/world/area_kkj/kkj_19/npcs_peach.c index 94b55b907a..4f016deb92 100644 --- a/src/world/area_kkj/kkj_19/npcs_peach.c +++ b/src/world/area_kkj/kkj_19/npcs_peach.c @@ -42,7 +42,7 @@ NpcData N(NpcData_Twink) = { .yaw = 0, .init = &N(EVS_NpcInit_Twink), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_CANT_INTERACT, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_CANT_INTERACT, .drops = NO_DROPS, .animations = TWINK_ANIMS, }; diff --git a/src/world/area_kkj/kkj_20/main.c b/src/world/area_kkj/kkj_20/main.c index ecec77b763..7d80b5bd4f 100644 --- a/src/world/area_kkj/kkj_20/main.c +++ b/src/world/area_kkj/kkj_20/main.c @@ -1,7 +1,7 @@ #include "kkj_20.h" EvtScript N(EVS_ExitDoor_kkj_10_4) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kkj_20_ENTRY_0) Set(LVar1, COLLIDER_ttw) diff --git a/src/world/area_kkj/kkj_20/npc.c b/src/world/area_kkj/kkj_20/npc.c index 984fd0cf70..144d87fd99 100644 --- a/src/world/area_kkj/kkj_20/npc.c +++ b/src/world/area_kkj/kkj_20/npc.c @@ -344,7 +344,7 @@ NpcData N(NpcData_Toad) = { .yaw = 0, .init = &N(EVS_NpcInit_Toad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KKJ_ToadHouseToad, diff --git a/src/world/area_kkj/kkj_21/main.c b/src/world/area_kkj/kkj_21/main.c index 9ad73dc6db..3cc38ad556 100644 --- a/src/world/area_kkj/kkj_21/main.c +++ b/src/world/area_kkj/kkj_21/main.c @@ -1,7 +1,7 @@ #include "kkj_21.h" EvtScript N(EVS_ExitDoor_kkj_10_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kkj_21_ENTRY_0) Set(LVar1, COLLIDER_tte) diff --git a/src/world/area_kkj/kkj_23/main.c b/src/world/area_kkj/kkj_23/main.c index ba4ef7e837..7304a8566e 100644 --- a/src/world/area_kkj/kkj_23/main.c +++ b/src/world/area_kkj/kkj_23/main.c @@ -12,7 +12,7 @@ EvtScript N(EVS_EndPeachChapter6) = { }; //@bug script not properly terminated EvtScript N(EVS_ExitDoors_kkj_22_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kkj_23_ENTRY_0) Set(LVar1, COLLIDER_tte) diff --git a/src/world/area_kkj/kkj_23/npcs_finale.c b/src/world/area_kkj/kkj_23/npcs_finale.c index 7347e1378e..c7e4af1679 100644 --- a/src/world/area_kkj/kkj_23/npcs_finale.c +++ b/src/world/area_kkj/kkj_23/npcs_finale.c @@ -174,7 +174,7 @@ NpcData N(NpcData_Bowser_Body) = { .yaw = 270, .init = &N(EVS_NpcInit_Bowser_Body), .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL, .drops = NO_DROPS, .animations = BOWSER_ANIMS, }; @@ -185,7 +185,7 @@ NpcData N(NpcData_Bowser_Prop) = { .yaw = 270, .init = &N(EVS_NpcInit_Bowser_Propeller), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = BOWSER_ANIMS, }; @@ -196,7 +196,7 @@ NpcData N(NpcData_Peach) = { .yaw = 270, .init = &N(EVS_NpcInit_Peach), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_PLAYER_SPRITE, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_PLAYER_SPRITE, .drops = NO_DROPS, .animations = PEACH_ANIMS, }; diff --git a/src/world/area_kkj/kkj_23/npcs_peach.c b/src/world/area_kkj/kkj_23/npcs_peach.c index 98607444d4..9efbac613e 100644 --- a/src/world/area_kkj/kkj_23/npcs_peach.c +++ b/src/world/area_kkj/kkj_23/npcs_peach.c @@ -45,7 +45,7 @@ EvtScript N(EVS_NpcInteract_Koopatrol_01) = { EvtScript N(EVS_CapturePeach) = { Call(DisablePlayerInput, TRUE) Call(N(PreventNextPeachDisguise)) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) Call(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) @@ -76,11 +76,11 @@ EvtScript N(EVS_Koopatrol_WatchForPeach) = { Loop(0) Call(N(GetPeachDisguise), LVar1) IfEq(LVar1, PEACH_DISGUISE_NONE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, TRUE) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_CapturePeach))) Return Else - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, FALSE) EndIf Wait(1) EndLoop @@ -99,7 +99,7 @@ EvtScript N(EVS_NpcIdle_Koopatrol_01) = { EndIf EndLoop KillThread(LVarA) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, TRUE) Return End }; @@ -136,7 +136,7 @@ NpcData N(NpcData_Kammy)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Kammy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), @@ -147,7 +147,7 @@ NpcData N(NpcData_Kammy)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_01), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -158,7 +158,7 @@ NpcData N(NpcData_Kammy)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_02), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), diff --git a/src/world/area_kkj/kkj_25/npc_final.c b/src/world/area_kkj/kkj_25/npc_final.c index 68e5606444..117c3d0e25 100644 --- a/src/world/area_kkj/kkj_25/npc_final.c +++ b/src/world/area_kkj/kkj_25/npc_final.c @@ -102,7 +102,7 @@ NpcData N(NpcData_Bowser) = { .yaw = 270, .init = &N(EVS_NpcInit_Bowser_03), .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -114,7 +114,7 @@ NpcData N(NpcData_Peach) = { .yaw = 270, .init = &N(EVS_NpcInit_Peach), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_PLAYER_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_PLAYER_SPRITE | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = PEACH_ANIMS, .extraAnimations = N(ExtraAnims_Peach), @@ -126,7 +126,7 @@ NpcData N(NpcData_Kammy) = { .yaw = 270, .init = &N(EVS_NpcInit_Kammy_Broom), .settings = &N(NpcSettings_Kammy_Flying), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_BattleKammy_Anim00, @@ -155,7 +155,7 @@ NpcData N(NpcData_Twink) = { .yaw = 270, .init = &N(EVS_NpcInit_Twink_02), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_Twink), @@ -167,7 +167,7 @@ NpcData N(NpcData_StarRod) = { .yaw = 270, .init = &N(EVS_NpcInit_StarRod), .settings = &N(NpcSettings_StarRod), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = STAR_ROD_ANIMS, }; diff --git a/src/world/area_kkj/kkj_25/npc_initial.c b/src/world/area_kkj/kkj_25/npc_initial.c index f0398f3ac6..334fadcc1d 100644 --- a/src/world/area_kkj/kkj_25/npc_initial.c +++ b/src/world/area_kkj/kkj_25/npc_initial.c @@ -199,7 +199,7 @@ NpcData N(NpcData_Bowser) = { .yaw = 270, .init = &N(EVS_NpcInit_Bowser), .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -211,7 +211,7 @@ NpcData N(NpcData_Peach) = { .yaw = 270, .init = &N(EVS_NpcInit_BattleKooper_01), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_PLAYER_SPRITE, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_PLAYER_SPRITE, .drops = NO_DROPS, .animations = PEACH_ANIMS, .extraAnimations = N(ExtraAnims_Peach), @@ -224,7 +224,7 @@ NpcData N(NpcData_Kammy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Kammy_Broom), .settings = &N(NpcSettings_Kammy_Flying), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_BattleKammy_Anim00, @@ -252,7 +252,7 @@ NpcData N(NpcData_Kammy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Kammy), .settings = &N(NpcSettings_Kammy_Flying), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_BattleKammy_Anim00, @@ -282,7 +282,7 @@ NpcData N(NpcData_Twink) = { .yaw = 270, .init = &N(EVS_NpcInit_Twink), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_Twink), diff --git a/src/world/area_kkj/kkj_25/npc_midpoint.c b/src/world/area_kkj/kkj_25/npc_midpoint.c index f2d497ad5c..e945e562a1 100644 --- a/src/world/area_kkj/kkj_25/npc_midpoint.c +++ b/src/world/area_kkj/kkj_25/npc_midpoint.c @@ -40,7 +40,7 @@ EvtScript N(EVS_NpcIdle_Bowser) = { #include "world/common/todo/UnkFunc1.inc.c" EvtScript N(EVS_NpcDefeat_Bowser) = { - Call(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_2, TRUE) + Call(SetEncounterStatusFlags, ENCOUNTER_FLAG_CANT_SKIP_WIN_DELAY, TRUE) Call(N(UnkFunc1)) Set(GF_KKJ25_Defeated_Bowser, TRUE) // reload the map in the 'final' configuration @@ -242,7 +242,7 @@ NpcData N(NpcData_Bowser) = { .yaw = 270, .init = &N(EVS_NpcInit_Bowser), .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -254,7 +254,7 @@ NpcData N(NpcData_Peach) = { .yaw = 270, .init = &N(EVS_NpcInit_Peach), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_PLAYER_SPRITE, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_PLAYER_SPRITE, .drops = NO_DROPS, .animations = PEACH_ANIMS, .extraAnimations = N(ExtraAnims_Peach), @@ -267,7 +267,7 @@ NpcData N(NpcData_Kammy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Kammy_Broom), .settings = &N(NpcSettings_Kammy_Flying), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_BattleKammy_Anim00, @@ -295,7 +295,7 @@ NpcData N(NpcData_Kammy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Kammy), .settings = &N(NpcSettings_Kammy_Flying), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = { .idle = ANIM_BattleKammy_Anim00, @@ -325,7 +325,7 @@ NpcData N(NpcData_Twink) = { .yaw = 270, .init = &N(EVS_NpcInit_Twink), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_Twink), @@ -337,7 +337,7 @@ NpcData N(NpcData_Eldstar) = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Eldstar), @@ -349,7 +349,7 @@ NpcData N(NpcData_Mamar) = { .yaw = 270, .init = &N(EVS_NpcInit_Mamar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = MAMAR_ANIMS, .extraAnimations = N(ExtraAnims_Mamar), @@ -361,7 +361,7 @@ NpcData N(NpcData_Skolar) = { .yaw = 270, .init = &N(EVS_NpcInit_Skolar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = SKOLAR_ANIMS, .extraAnimations = N(ExtraAnims_Skolar), @@ -373,7 +373,7 @@ NpcData N(NpcData_Muskular) = { .yaw = 270, .init = &N(EVS_NpcInit_Muskular), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, .extraAnimations = N(ExtraAnims_Muskular), @@ -385,7 +385,7 @@ NpcData N(NpcData_Misstar) = { .yaw = 270, .init = &N(EVS_NpcInit_Misstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Misstar), @@ -397,7 +397,7 @@ NpcData N(NpcData_Klevar) = { .yaw = 270, .init = &N(EVS_NpcInit_Klevar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KLEVAR_ANIMS, .extraAnimations = N(ExtraAnims_Klevar), @@ -409,7 +409,7 @@ NpcData N(NpcData_Kalmar) = { .yaw = 270, .init = &N(EVS_NpcInit_Kalmar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KALMAR_ANIMS, .extraAnimations = N(ExtraAnims_Kalmar), diff --git a/src/world/area_kkj/kkj_26/main.c b/src/world/area_kkj/kkj_26/main.c index a655a05357..5ef1b7ac8a 100644 --- a/src/world/area_kkj/kkj_26/main.c +++ b/src/world/area_kkj/kkj_26/main.c @@ -11,7 +11,7 @@ EvtScript N(EVS_GotoMap_hos_00_1) = { }; EvtScript N(EVS_ExitDoors_kkj_14_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kkj_26_ENTRY_0) Set(LVar1, COLLIDER_ttw) diff --git a/src/world/area_kkj/kkj_27/rotating_wall.c b/src/world/area_kkj/kkj_27/rotating_wall.c index b44779ea89..096cff77d0 100644 --- a/src/world/area_kkj/kkj_27/rotating_wall.c +++ b/src/world/area_kkj/kkj_27/rotating_wall.c @@ -73,7 +73,7 @@ EvtScript N(EVS_Scene_RotatingWall) = { }; EvtScript N(EVS_UseRotatingWall) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(PlayerMoveTo, -205, -10, 15 * DT) Call(InterpPlayerYaw, 270, 5) @@ -93,7 +93,7 @@ EvtScript N(EVS_UseRotatingWall) = { }; EvtScript N(EVS_UseRotatingWall_FirstTime) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(FacePlayerTowardPoint, -222, 0, 5) Wait(10 * DT) diff --git a/src/world/area_kkj/kkj_28/main.c b/src/world/area_kkj/kkj_28/main.c index d6c91ecec7..e04d96d06e 100644 --- a/src/world/area_kkj/kkj_28/main.c +++ b/src/world/area_kkj/kkj_28/main.c @@ -1,7 +1,7 @@ #include "kkj_28.h" EvtScript N(EVS_ExitDoor_kkj_10_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kkj_28_ENTRY_0) Set(LVar1, COLLIDER_tte) diff --git a/src/world/area_kkj/kkj_29/main.c b/src/world/area_kkj/kkj_29/main.c index 47dacb9c59..145f9d18b9 100644 --- a/src/world/area_kkj/kkj_29/main.c +++ b/src/world/area_kkj/kkj_29/main.c @@ -11,7 +11,7 @@ EvtScript N(EVS_EndPeachChapter5) = { }; //@bug script not properly terminated EvtScript N(EVS_ExitDoor_kkj_10_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kkj_29_ENTRY_0) Set(LVar1, COLLIDER_tte) diff --git a/src/world/area_kkj/kkj_29/npc.c b/src/world/area_kkj/kkj_29/npc.c index 4f891300de..e1425155ea 100644 --- a/src/world/area_kkj/kkj_29/npc.c +++ b/src/world/area_kkj/kkj_29/npc.c @@ -68,7 +68,7 @@ NpcData N(NpcData_Characters)[] = { .pos = { 0.0f, -500.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_Bowser), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = BOWSER_ANIMS, .extraAnimations = N(ExtraAnims_Bowser), @@ -79,7 +79,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_01), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -90,7 +90,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Koopatrol_02), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, .extraAnimations = N(ExtraAnims_Koopatrol), @@ -101,7 +101,7 @@ NpcData N(NpcData_Characters)[] = { .yaw = 0, .init = &N(EVS_NpcInit_HammerBros), .settings = &N(NpcSettings_HammerBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = NO_DROPS, .animations = HAMMER_BROS_ANIMS, .extraAnimations = N(ExtraAnims_HammerBros), diff --git a/src/world/area_kmr/kmr_00/npc.c b/src/world/area_kmr/kmr_00/npc.c index 542b561bab..bf930ff71d 100644 --- a/src/world/area_kmr/kmr_00/npc.c +++ b/src/world/area_kmr/kmr_00/npc.c @@ -112,7 +112,7 @@ NpcData N(NpcData_Goombaria) = { .yaw = 0, .init = &N(EVS_NpcInit_Goombaria), .settings = &N(NpcSettings_Goombaria_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = GOOMBARIA_ANIMS, }; @@ -124,7 +124,7 @@ NpcData N(NpcData_StarSpirits)[] = { .yaw = 0, .init = &N(EVS_NpcInit_StarSpirit), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, }, @@ -134,7 +134,7 @@ NpcData N(NpcData_StarSpirits)[] = { .yaw = 0, .init = &N(EVS_NpcInit_StarSpirit), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = MAMAR_ANIMS, }, @@ -144,7 +144,7 @@ NpcData N(NpcData_StarSpirits)[] = { .yaw = 0, .init = &N(EVS_NpcInit_StarSpirit), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = SKOLAR_ANIMS, }, @@ -154,7 +154,7 @@ NpcData N(NpcData_StarSpirits)[] = { .yaw = 0, .init = &N(EVS_NpcInit_StarSpirit), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, }, @@ -164,7 +164,7 @@ NpcData N(NpcData_StarSpirits)[] = { .yaw = 0, .init = &N(EVS_NpcInit_StarSpirit), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, }, @@ -174,7 +174,7 @@ NpcData N(NpcData_StarSpirits)[] = { .yaw = 0, .init = &N(EVS_NpcInit_StarSpirit), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = KLEVAR_ANIMS, }, @@ -184,7 +184,7 @@ NpcData N(NpcData_StarSpirits)[] = { .yaw = 0, .init = &N(EVS_NpcInit_StarSpirit), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = KALMAR_ANIMS, }, diff --git a/src/world/area_kmr/kmr_02/npc.c b/src/world/area_kmr/kmr_02/npc.c index 43d7287196..5648455bf4 100644 --- a/src/world/area_kmr/kmr_02/npc.c +++ b/src/world/area_kmr/kmr_02/npc.c @@ -1953,7 +1953,7 @@ NpcData N(NpcData_ChuckQuizmo) = { .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_KMR, QUIZ_COUNT_KMR, QUIZ_MAP_KMR_02 }}, .settings = &N(NpcSettings_ChuckQuizmo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = QUIZMO_ANIMS, .tattle = MSG_NpcTattle_ChuckQuizmo, diff --git a/src/world/area_kmr/kmr_03/npc.c b/src/world/area_kmr/kmr_03/npc.c index d4931f654e..d24f4b9c9d 100644 --- a/src/world/area_kmr/kmr_03/npc.c +++ b/src/world/area_kmr/kmr_03/npc.c @@ -170,7 +170,7 @@ NpcData N(NpcData_GoombaFamily) = { .yaw = 45, .init = &N(EVS_NpcInit_Goompa), .settings = &N(NpcSettings_Goompa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_Goompa_Idle, diff --git a/src/world/area_kmr/kmr_04/npc.c b/src/world/area_kmr/kmr_04/npc.c index dad9b7f797..7fc52c0945 100644 --- a/src/world/area_kmr/kmr_04/npc.c +++ b/src/world/area_kmr/kmr_04/npc.c @@ -250,7 +250,7 @@ NpcSettings N(NpcSettings_Goompa) = { .ai = &N(EVS_NpcAI_Goompa), .aux = &N(EVS_NpcAux_Goompa), .onDefeat = &N(EVS_NpcDefeat_Goompa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION, }; EvtScript N(EVS_NpcInit_JrTroopa) = { @@ -268,7 +268,7 @@ NpcData N(NpcData_JrTroopa) = { .yaw = 0, .init = &N(EVS_NpcInit_JrTroopa), .settings = &N(NpcSettings_JrTroopa), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_JrTroopa_Idle, diff --git a/src/world/area_kmr/kmr_05/npc.c b/src/world/area_kmr/kmr_05/npc.c index 83da6dab1e..fe2f56528f 100644 --- a/src/world/area_kmr/kmr_05/npc.c +++ b/src/world/area_kmr/kmr_05/npc.c @@ -57,7 +57,7 @@ EvtScript N(EVS_NpcIdle_SpikedGoomba) = { Call(SetNpcJumpscale, NPC_SELF, Float(1.0)) Call(SetNpcSpeed, NPC_SELF, Float(5.0)) Call(NpcJump0, NPC_SELF, 685, 100, -35, 0) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, TRUE) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_NpcAI_SpikedGoomba_Wander))) CaseOrEq(102) CaseOrEq(3) diff --git a/src/world/area_kmr/kmr_06/sticker_sign.c b/src/world/area_kmr/kmr_06/sticker_sign.c index da53b68626..ad13ce70a5 100644 --- a/src/world/area_kmr/kmr_06/sticker_sign.c +++ b/src/world/area_kmr/kmr_06/sticker_sign.c @@ -218,8 +218,8 @@ API_CALLABLE(N(DeleteSticker)) { } EvtScript N(EVS_OnInspect_StickerSign) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(DisablePlayerInput, TRUE) Call(ShowMessageAtScreenPos, MSG_Menus_Sign_EatMushroomsTip, 160, 40) IfEq(GF_KMR06_Item_Mushroom, FALSE) @@ -244,7 +244,7 @@ EvtScript N(EVS_OnInspect_StickerSign) = { Wait(10) EndIf EndIf - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Call(DisablePlayerInput, FALSE) Return End diff --git a/src/world/area_kmr/kmr_07/npc.c b/src/world/area_kmr/kmr_07/npc.c index 893fb43ffc..68be2069c7 100644 --- a/src/world/area_kmr/kmr_07/npc.c +++ b/src/world/area_kmr/kmr_07/npc.c @@ -34,7 +34,7 @@ EvtScript N(EVS_NpcIdle_GoombaBros_Red) = { Goto(0) EndIf Call(SetMusicTrack, 0, SONG_MINIBOSS_BATTLE, 0, 8) - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Thread Wait(3) Call(DisablePlayerInput, TRUE) @@ -226,7 +226,7 @@ NpcData N(NpcData_GoombaBros_Red)[] = { }, .init = &N(EVS_NpcInit_GoombaBros_Red), .settings = &N(NpcSettings_GoombaBros_Guard), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = GOOMBA_BROS_RED_ANIMS, }, @@ -248,7 +248,7 @@ NpcData N(NpcData_GoombaBros_Red)[] = { }, .init = &N(EVS_NpcInit_GoombaBros_Blue), .settings = &N(NpcSettings_GoombaBros_Guard), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = GOOMBA_BROS_BLUE_ANIMS, }, diff --git a/src/world/area_kmr/kmr_09/npc.c b/src/world/area_kmr/kmr_09/npc.c index 88e8bb4a00..594db71b74 100644 --- a/src/world/area_kmr/kmr_09/npc.c +++ b/src/world/area_kmr/kmr_09/npc.c @@ -54,11 +54,11 @@ API_CALLABLE(N(GetAmbushEnemy)) { } EvtScript N(EVS_OnReadBillboard) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(DisablePlayerInput, TRUE) Call(ShowMessageAtScreenPos, MSG_Menus_Sign_BewareOfGoombas, 160, 40) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Set(LFlag0, FALSE) Call(N(GetAmbushEnemy)) IfNe(LVar0, NULL) @@ -80,7 +80,7 @@ EvtScript N(EVS_OnReadBillboard) = { EvtScript N(EVS_NpcIdle_Goomba_Ambush) = { Call(SetNpcAnimation, NPC_SELF, ANIM_Goomba_Still) Call(EnableNpcShadow, NPC_SELF, FALSE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, TRUE) Label(0) Call(GetSelfVar, 0, LVar0) IfEq(LVar0, 0) @@ -112,8 +112,8 @@ EvtScript N(EVS_NpcIdle_Goomba_Ambush) = { Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_NO_SHADOW_RAYCAST, TRUE) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, TRUE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, 0) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, FALSE) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, TRUE) BindTrigger(Ref(N(EVS_OnReadBillboard)), TRIGGER_WALL_PRESS_A, COLLIDER_kan, 1, 0) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_NpcAI_Goomba_Wander))) Return diff --git a/src/world/area_kmr/kmr_10/npc.c b/src/world/area_kmr/kmr_10/npc.c index 354bf332af..da29067d2d 100644 --- a/src/world/area_kmr/kmr_10/npc.c +++ b/src/world/area_kmr/kmr_10/npc.c @@ -14,7 +14,7 @@ NpcData N(NpcData_Toad) = { .yaw = 0, .init = &N(EVS_NpcInit_Toad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, }; diff --git a/src/world/area_kmr/kmr_11/main.c b/src/world/area_kmr/kmr_11/main.c index 7bcddcfbbb..821ba15ed9 100644 --- a/src/world/area_kmr/kmr_11/main.c +++ b/src/world/area_kmr/kmr_11/main.c @@ -42,7 +42,7 @@ EvtScript N(EVS_BadExit_kmr_24_0) = { }; EvtScript N(EVS_ExitWalk_kmr_12_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, kmr_11_ENTRY_0) Exec(ExitWalk) Call(GotoMap, Ref("kmr_12"), kmr_12_ENTRY_1) @@ -52,7 +52,7 @@ EvtScript N(EVS_ExitWalk_kmr_12_1) = { }; EvtScript N(EVS_ExitWalk_kmr_10_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, kmr_11_ENTRY_1) Exec(ExitWalk) IfGe(GB_StoryProgress, STORY_CH0_KAMMY_RETURNED_TO_BOWSER) diff --git a/src/world/area_kmr/kmr_11/npc.c b/src/world/area_kmr/kmr_11/npc.c index 40c51fd2ae..eeb672eab2 100644 --- a/src/world/area_kmr/kmr_11/npc.c +++ b/src/world/area_kmr/kmr_11/npc.c @@ -63,7 +63,7 @@ EvtScript N(EVS_NpcIdle_GoombaKing) = { }; EvtScript N(EVS_Scene_BossDefeated) = { - Call(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_2, TRUE) + Call(SetEncounterStatusFlags, ENCOUNTER_FLAG_CANT_SKIP_WIN_DELAY, TRUE) Call(N(SetupFog)) Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) @@ -288,7 +288,7 @@ NpcSettings N(NpcSettings_Kammy) = { .otherAI = &N(EVS_NpcAuxAI_Kammy), .ai = &N(EVS_NpcAI_Kammy), .aux = &N(EVS_NpcAux_Kammy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, }; NpcData N(NpcData_Enemies)[] = { @@ -310,7 +310,7 @@ NpcData N(NpcData_Enemies)[] = { }, .init = &N(EVS_NpcInit_GoombaBros_01), .settings = &N(NpcSettings_GoombaBros_Guard), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_GoombaBros_Blue_Idle, @@ -349,7 +349,7 @@ NpcData N(NpcData_Enemies)[] = { }, .init = &N(EVS_NpcInit_GoombaBros_02), .settings = &N(NpcSettings_GoombaBros_Guard), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_GoombaBros_Red_Idle, @@ -388,7 +388,7 @@ NpcData N(NpcData_Enemies)[] = { }, .init = &N(EVS_NpcInit_GoombaKing), .settings = &N(NpcSettings_GoombaBros_Guard), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_GoombaKing_Idle, diff --git a/src/world/area_kmr/kmr_12/entity.c b/src/world/area_kmr/kmr_12/entity.c index ae2ba1c8da..eb295ee4db 100644 --- a/src/world/area_kmr/kmr_12/entity.c +++ b/src/world/area_kmr/kmr_12/entity.c @@ -6,12 +6,12 @@ EvtScript N(EVS_ReadSign) = { IfEq(LVar0, TRUE) Return EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(DisablePlayerInput, TRUE) Call(ShowMessageAtScreenPos, MSG_Menus_Sign_GoombaKingsFortress, 160, 40) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; diff --git a/src/world/area_kmr/kmr_12/npc.c b/src/world/area_kmr/kmr_12/npc.c index 6dbd593f33..91ad776e39 100644 --- a/src/world/area_kmr/kmr_12/npc.c +++ b/src/world/area_kmr/kmr_12/npc.c @@ -9,11 +9,11 @@ API_CALLABLE(N(GetAmbushEnemy)) { } EvtScript N(EVS_OnReadBillboard) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(DisablePlayerInput, TRUE) Call(ShowMessageAtScreenPos, MSG_Menus_Sign_EatMushroomsTrap, 160, 40) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Set(LFlag0, FALSE) Call(N(GetAmbushEnemy)) IfNe(LVar0, NULL) @@ -37,14 +37,14 @@ EvtScript N(EVS_NpcIdle_Goomba) = { Call(SetSelfVar, 0, 0) Call(SetNpcAnimation, NPC_SELF, ANIM_Goomba_FakeMushroom) Call(EnableNpcShadow, NPC_SELF, FALSE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, TRUE) Label(0) Call(GetSelfVar, 0, LVar0) Wait(1) IfEq(LVar0, 0) Goto(0) EndIf - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_CAMERA_FOR_YAW | NPC_FLAG_200000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_CAMERA_FOR_YAW | NPC_FLAG_FLIP_INSTANTLY, TRUE) Wait(3) SetF(LVar0, Float(0.0)) Loop(9) @@ -72,9 +72,9 @@ EvtScript N(EVS_NpcIdle_Goomba) = { Call(NpcJump0, NPC_SELF, -35, 0, 30, 23) Call(SetNpcImgFXParams, NPC_SELF, IMGFX_CLEAR, 0, 0, 0, 0) Call(InterpNpcYaw, NPC_SELF, 90, 0) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_CAMERA_FOR_YAW | NPC_FLAG_200000, FALSE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, 0) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_CAMERA_FOR_YAW | NPC_FLAG_FLIP_INSTANTLY, FALSE) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, FALSE) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, TRUE) BindTrigger(Ref(N(EVS_OnReadBillboard)), TRIGGER_WALL_PRESS_A, COLLIDER_o78, 1, 0) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_NpcAI_Goomba_Wander))) Return diff --git a/src/world/area_kmr/kmr_20/entity.c b/src/world/area_kmr/kmr_20/entity.c index 0a695ebbca..901a3272a6 100644 --- a/src/world/area_kmr/kmr_20/entity.c +++ b/src/world/area_kmr/kmr_20/entity.c @@ -65,7 +65,7 @@ EvtScript N(EVS_UseSpring_Basement) = { EvtScript N(EVS_Luigi_JumpFromBlock) = { Call(DisablePlayerInput, TRUE) - Call(SetEnemyFlagBits, NPC_Luigi_1, ENEMY_FLAG_IGNORE_WORLD_COLLISION, 0) + Call(SetEnemyFlagBits, NPC_Luigi_1, ENEMY_FLAG_IGNORE_WORLD_COLLISION, FALSE) Call(SetNpcFlagBits, NPC_Luigi_1, NPC_FLAG_GRAVITY, TRUE) Call(SetNpcVar, NPC_Luigi_1, 0, 1) Call(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Jump) @@ -81,7 +81,7 @@ EvtScript N(EVS_Luigi_JumpFromBlock) = { EvtScript N(EVS_Luigi_JumpFromHighBlock) = { Call(DisablePlayerInput, TRUE) - Call(SetEnemyFlagBits, NPC_Luigi_1, ENEMY_FLAG_IGNORE_WORLD_COLLISION, 0) + Call(SetEnemyFlagBits, NPC_Luigi_1, ENEMY_FLAG_IGNORE_WORLD_COLLISION, FALSE) Call(SetNpcFlagBits, NPC_Luigi_1, NPC_FLAG_GRAVITY, TRUE) Call(SetNpcVar, NPC_Luigi_1, 0, 1) Call(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Jump) diff --git a/src/world/area_kmr/kmr_20/main.c b/src/world/area_kmr/kmr_20/main.c index 9c1afec5e5..69ccf4df0e 100644 --- a/src/world/area_kmr/kmr_20/main.c +++ b/src/world/area_kmr/kmr_20/main.c @@ -16,7 +16,7 @@ EvtScript N(EVS_GotoMap_mac_00_4) = { }; EvtScript N(EVS_ExitPipe_mac_00_4) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Set(LVarA, kmr_20_ENTRY_4) Set(LVarB, COLLIDER_o244) Set(LVarC, Ref(N(EVS_GotoMap_mac_00_4))) diff --git a/src/world/area_kmr/kmr_20/npc.c b/src/world/area_kmr/kmr_20/npc.c index 10ef2d759f..05c9582350 100644 --- a/src/world/area_kmr/kmr_20/npc.c +++ b/src/world/area_kmr/kmr_20/npc.c @@ -596,7 +596,7 @@ EvtScript N(EVS_NpcInit_Luigi_1) = { CaseLt(STORY_EPILOGUE) Call(SetNpcPos, NPC_SELF, 306, 30, -145) Call(InterpNpcYaw, NPC_SELF, 39, 0) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_400000, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, TRUE) EndSwitch Return End @@ -608,7 +608,7 @@ NpcData N(NpcData_Luigi_0) = { .yaw = 90, .init = &N(EVS_NpcInit_Luigi_0), .settings = &N(NpcSettings_Luigi), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = LUIGI_ANIMS, .tattle = MSG_NpcTattle_Luigi, @@ -620,7 +620,7 @@ NpcData N(NpcData_Luigi_1) = { .yaw = 90, .init = &N(EVS_NpcInit_Luigi_1), .settings = &N(NpcSettings_Luigi), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = LUIGI_ANIMS, .tattle = MSG_NpcTattle_Luigi, @@ -696,7 +696,7 @@ EvtScript N(EVS_NpcHit_ShyGuy) = { Set(GF_KMR20_ChasedOffShyGuy, TRUE) Call(SetNpcVar, NPC_Luigi_1, 0, 1) Wait(2) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, TRUE) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_NpcAI_ShyGuy))) Return End @@ -727,7 +727,7 @@ NpcData N(NpcData_ShyGuy) = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; diff --git a/src/world/area_kmr/kmr_20/npc_scenes.c b/src/world/area_kmr/kmr_20/npc_scenes.c index dd59b0ceae..7234bf2167 100644 --- a/src/world/area_kmr/kmr_20/npc_scenes.c +++ b/src/world/area_kmr/kmr_20/npc_scenes.c @@ -27,7 +27,7 @@ NpcData N(NpcData_Scenes)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, .settings = &N(NpcSettings_Scenes), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldParakarry_Idle, @@ -54,7 +54,7 @@ NpcData N(NpcData_Scenes)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Luigi_Scenes), .settings = &N(NpcSettings_Scenes), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_GRAVITY, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_GRAVITY, .drops = NO_DROPS, .animations = { .idle = ANIM_Luigi_Still, diff --git a/src/world/area_kmr/kmr_22/npc.c b/src/world/area_kmr/kmr_22/npc.c index c6bbf5002c..cb47bbeca4 100644 --- a/src/world/area_kmr/kmr_22/npc.c +++ b/src/world/area_kmr/kmr_22/npc.c @@ -41,7 +41,7 @@ NpcData N(NpcData_Chapter1)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, }, @@ -51,7 +51,7 @@ NpcData N(NpcData_Chapter1)[] = { .yaw = 270, .init = &N(EVS_NpcInit_KoopaBros), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = BLACK_KOOPA_BROS_ANIMS, }, @@ -61,7 +61,7 @@ NpcData N(NpcData_Chapter1)[] = { .yaw = 270, .init = &N(EVS_NpcInit_KoopaBros), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = BLACK_KOOPA_BROS_ANIMS, }, @@ -71,7 +71,7 @@ NpcData N(NpcData_Chapter1)[] = { .yaw = 270, .init = &N(EVS_NpcInit_KoopaBros), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = BLACK_KOOPA_BROS_ANIMS, }, @@ -81,7 +81,7 @@ NpcData N(NpcData_Chapter1)[] = { .yaw = 270, .init = &N(EVS_NpcInit_KoopaBros), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = BLACK_KOOPA_BROS_ANIMS, }, @@ -98,7 +98,7 @@ NpcData N(NpcData_Chapter2)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Mamar), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = MAMAR_ANIMS, }, @@ -108,7 +108,7 @@ NpcData N(NpcData_Chapter2)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Tutankoopa), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_Tutankoopa_Idle, @@ -135,7 +135,7 @@ NpcData N(NpcData_Chapter2)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ChainChomp), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_ChainChomp_Still, @@ -161,7 +161,7 @@ NpcData N(NpcData_Chapter2)[] = { .pos = { 23.0f, -4.0f, -180.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_ChainChomp_Still, @@ -187,7 +187,7 @@ NpcData N(NpcData_Chapter2)[] = { .pos = { 23.0f, -4.0f, -180.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_ChainChomp_Still, @@ -213,7 +213,7 @@ NpcData N(NpcData_Chapter2)[] = { .pos = { 23.0f, -4.0f, -180.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_ChainChomp_Still, @@ -239,7 +239,7 @@ NpcData N(NpcData_Chapter2)[] = { .pos = { 23.0f, -4.0f, -180.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_ChainChomp_Still, @@ -273,7 +273,7 @@ NpcData N(NpcData_Chapter3)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Skolar), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = SKOLAR_ANIMS, }, @@ -283,7 +283,7 @@ NpcData N(NpcData_Chapter3)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Tubba), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldTubba_Anim06, @@ -317,7 +317,7 @@ NpcData N(NpcData_Chapter4)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Muskular), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, }, @@ -327,7 +327,7 @@ NpcData N(NpcData_Chapter4)[] = { .yaw = 270, .init = &N(EVS_NpcInit_GeneralGuy), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_GeneralGuy_Anim02, @@ -354,7 +354,7 @@ NpcData N(NpcData_Chapter4)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -364,7 +364,7 @@ NpcData N(NpcData_Chapter4)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -381,7 +381,7 @@ NpcData N(NpcData_Chapter5)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Misstar), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, }, @@ -391,7 +391,7 @@ NpcData N(NpcData_Chapter5)[] = { .yaw = 270, .init = &N(EVS_NpcInit_LavaPiranhaHead), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_4, + .flags = ENEMY_FLAG_DO_NOT_KILL, .drops = NO_DROPS, .animations = LAVA_PIRANHA_HEAD_ANIMS, .extraAnimations = N(D_80243848_902EB8), @@ -402,7 +402,7 @@ NpcData N(NpcData_Chapter5)[] = { .yaw = 270, .init = &N(EVS_NpcInit_LavaBud_01), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL, .drops = NO_DROPS, .animations = LAVA_PIRANHA_BUD_ANIMS, .extraAnimations = N(D_80243854_902EC4), @@ -413,7 +413,7 @@ NpcData N(NpcData_Chapter5)[] = { .yaw = 270, .init = &N(EVS_NpcInit_LavaBud_01), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL, .drops = NO_DROPS, .animations = LAVA_PIRANHA_BUD_ANIMS, .extraAnimations = N(D_80243854_902EC4), @@ -431,7 +431,7 @@ NpcData N(NpcData_Chapter6)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Klevar), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = KLEVAR_ANIMS, }, @@ -441,7 +441,7 @@ NpcData N(NpcData_Chapter6)[] = { .yaw = 270, .init = &N(EVS_NpcInit_HuffNPuff_Body), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_HuffNPuff_Anim01, @@ -468,7 +468,7 @@ NpcData N(NpcData_Chapter6)[] = { .yaw = 270, .init = &N(EVS_NpcInit_HuffNPuff_Face), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_HuffNPuff_Anim01, @@ -495,7 +495,7 @@ NpcData N(NpcData_Chapter6)[] = { .yaw = 270, .init = &N(EVS_NpcInit_HuffNPuff_Arms), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_HuffNPuff_Anim01, @@ -522,7 +522,7 @@ NpcData N(NpcData_Chapter6)[] = { .yaw = 270, .init = &N(EVS_NpcInit_RuffPuff_01), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_RuffPuff_Still, @@ -548,7 +548,7 @@ NpcData N(NpcData_Chapter6)[] = { .pos = { 14.0f, 61.0f, 1.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_RuffPuff_Still, @@ -582,7 +582,7 @@ NpcData N(NpcData_Chapter7)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Kalmar), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = KALMAR_ANIMS, }, @@ -592,7 +592,7 @@ NpcData N(NpcData_Chapter7)[] = { .yaw = 270, .init = &N(EVS_NpcInit_CrystalKing), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_CrystalKing_Anim09, @@ -619,7 +619,7 @@ NpcData N(NpcData_Chapter7)[] = { .yaw = 270, .init = &N(EVS_NpcInit_IceCube), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_CrystalKing_Anim09, @@ -646,7 +646,7 @@ NpcData N(NpcData_Chapter7)[] = { .yaw = 270, .init = &N(EVS_NpcInit_IceSphere), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_CrystalKing_Anim09, @@ -673,7 +673,7 @@ NpcData N(NpcData_Chapter7)[] = { .yaw = 270, .init = &N(EVS_NpcInit_IceSpike), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_CrystalKing_Anim09, @@ -702,7 +702,7 @@ NpcData N(NpcData_Chapter8) = { .yaw = 270, .init = &N(EVS_NpcInit_Bowser), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldBowser_Idle, diff --git a/src/world/area_kmr/kmr_23/npc.c b/src/world/area_kmr/kmr_23/npc.c index d820c4a016..b0cc54edc8 100644 --- a/src/world/area_kmr/kmr_23/npc.c +++ b/src/world/area_kmr/kmr_23/npc.c @@ -551,7 +551,7 @@ NpcData N(NpcData_Eldstar)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_01), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, }, @@ -561,7 +561,7 @@ NpcData N(NpcData_Eldstar)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_02), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, }, @@ -574,7 +574,7 @@ NpcData N(NpcData_Mamar)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_01), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = MAMAR_ANIMS, }, @@ -584,7 +584,7 @@ NpcData N(NpcData_Mamar)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_02), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = MAMAR_ANIMS, }, @@ -597,7 +597,7 @@ NpcData N(NpcData_Skolar)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_01), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = SKOLAR_ANIMS, }, @@ -607,7 +607,7 @@ NpcData N(NpcData_Skolar)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_02), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = SKOLAR_ANIMS, }, @@ -620,7 +620,7 @@ NpcData N(NpcData_Muskular)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_01), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, }, @@ -630,7 +630,7 @@ NpcData N(NpcData_Muskular)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_02), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, }, @@ -643,7 +643,7 @@ NpcData N(NpcData_Misstar)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_01), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, }, @@ -653,7 +653,7 @@ NpcData N(NpcData_Misstar)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_02), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, }, @@ -666,7 +666,7 @@ NpcData N(NpcData_Klevar)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_01), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = KLEVAR_ANIMS, }, @@ -676,7 +676,7 @@ NpcData N(NpcData_Klevar)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_02), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = KLEVAR_ANIMS, }, @@ -689,7 +689,7 @@ NpcData N(NpcData_Kalmar)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_01), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = KALMAR_ANIMS, }, @@ -699,7 +699,7 @@ NpcData N(NpcData_Kalmar)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar_02), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = KALMAR_ANIMS, }, diff --git a/src/world/area_kmr/kmr_30/npc.c b/src/world/area_kmr/kmr_30/npc.c index ec443c8012..ad0591a4a3 100644 --- a/src/world/area_kmr/kmr_30/npc.c +++ b/src/world/area_kmr/kmr_30/npc.c @@ -11,7 +11,7 @@ NpcData N(NpcData_ParadePeach) = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_ParadePeach), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = { .idle = ANIM_ParadePeach_IdleRaisedArms, diff --git a/src/world/area_kpa/kpa_01/main.c b/src/world/area_kpa/kpa_01/main.c index fd5e9553c2..620d28053c 100644 --- a/src/world/area_kpa/kpa_01/main.c +++ b/src/world/area_kpa/kpa_01/main.c @@ -3,7 +3,7 @@ #include "world/common/atomic/CreateDarkness.inc.c" EvtScript N(EVS_ExitDoor_kpa_14_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kpa_01_ENTRY_0) Set(LVar1, COLLIDER_tte) diff --git a/src/world/area_kpa/kpa_08/entity.c b/src/world/area_kpa/kpa_08/entity.c index f2ef4c78dd..1dac8451f1 100644 --- a/src/world/area_kpa/kpa_08/entity.c +++ b/src/world/area_kpa/kpa_08/entity.c @@ -22,7 +22,7 @@ EvtScript N(EVS_ActivateSwitch) = { Set(AF_KPA08_PlatformRaised, TRUE) Call(N(EnableCameraFollowPlayerY)) Thread - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(PlaySoundAtCollider, COLLIDER_o19, SOUND_KPA_RAISE_STONE_PLATFORM, SOUND_SPACE_DEFAULT) Call(MakeLerp, -50, 0, 15, EASING_COS_IN_OUT) Loop(0) @@ -50,7 +50,7 @@ EvtScript N(EVS_ActivateSwitch) = { EndLoop EndThread Thread - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(DisablePlayerInput, TRUE) Call(PlaySoundAtCollider, COLLIDER_o90, SOUND_KPA_RAISE_STONE_PLATFORM, SOUND_SPACE_DEFAULT) Call(MakeLerp, -99, 0, 15, EASING_COS_IN_OUT) diff --git a/src/world/area_kpa/kpa_09/entity.c b/src/world/area_kpa/kpa_09/entity.c index 600d5781af..af88cf2a02 100644 --- a/src/world/area_kpa/kpa_09/entity.c +++ b/src/world/area_kpa/kpa_09/entity.c @@ -22,7 +22,7 @@ EvtScript N(EVS_ActivateSwitch) = { Set(AF_KPA09_PlatformRaised, TRUE) Call(N(EnableCameraFollowPlayerY)) Thread - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(PlaySoundAtCollider, COLLIDER_o19, SOUND_KPA_RAISE_STONE_PLATFORM, SOUND_SPACE_DEFAULT) Call(MakeLerp, -50, 0, 15, EASING_COS_IN_OUT) Loop(0) @@ -50,7 +50,7 @@ EvtScript N(EVS_ActivateSwitch) = { EndLoop EndThread Thread - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(DisablePlayerInput, TRUE) Call(PlaySoundAtCollider, COLLIDER_o106, SOUND_KPA_RAISE_STONE_PLATFORM, SOUND_SPACE_DEFAULT) Call(EnableGroup, MODEL_move2, TRUE) diff --git a/src/world/area_kpa/kpa_10/npc.c b/src/world/area_kpa/kpa_10/npc.c index 7a81d9e8e4..b4a173a1e2 100644 --- a/src/world/area_kpa/kpa_10/npc.c +++ b/src/world/area_kpa/kpa_10/npc.c @@ -12,7 +12,7 @@ NpcData N(NpcData_Prisoners)[] = { #endif .yaw = 0, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadA, @@ -26,7 +26,7 @@ NpcData N(NpcData_Prisoners)[] = { #endif .yaw = 0, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadB, @@ -40,7 +40,7 @@ NpcData N(NpcData_Prisoners)[] = { #endif .yaw = 0, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_GUARD_YELLOW_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveSoldierA, diff --git a/src/world/area_kpa/kpa_11/npc.c b/src/world/area_kpa/kpa_11/npc.c index 33e67411c1..ccd8dc9dae 100644 --- a/src/world/area_kpa/kpa_11/npc.c +++ b/src/world/area_kpa/kpa_11/npc.c @@ -16,7 +16,7 @@ EvtScript N(EVS_NpcDefeat_Koopatrol) = { Set(GF_KPA11_Defeated_Guard, TRUE) Call(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) Call(MakeItemEntity, ITEM_BOWSER_CASTLE_KEY, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_TOSS_NEVER_VANISH, GF_KPA11_Item_CastleKey2) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) EndSwitch Return @@ -51,7 +51,7 @@ NpcData N(NpcData_Koopatrol) = { }, .init = &N(EVS_NpcInit_Koopatrol), .settings = &N(NpcSettings_Koopatrol_Wander), - .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, }; @@ -72,7 +72,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Prisoner), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadA, @@ -87,7 +87,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Prisoner), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadB, @@ -102,7 +102,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Prisoner), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_GUARD_YELLOW_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveSoldierA, diff --git a/src/world/area_kpa/kpa_111/statues.c b/src/world/area_kpa/kpa_111/statues.c index ff5bd41329..b7457dfc7d 100644 --- a/src/world/area_kpa/kpa_111/statues.c +++ b/src/world/area_kpa/kpa_111/statues.c @@ -5,7 +5,7 @@ EvtScript N(EVS_PushRightStatue_Impl) = { #if !VERSION_JP - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) #endif Loop(20) #if !VERSION_JP diff --git a/src/world/area_kpa/kpa_113/statues.c b/src/world/area_kpa/kpa_113/statues.c index a5905b48cf..b05c30d4d7 100644 --- a/src/world/area_kpa/kpa_113/statues.c +++ b/src/world/area_kpa/kpa_113/statues.c @@ -5,7 +5,7 @@ EvtScript N(EVS_PushLeftStatue_Impl) = { #if !VERSION_JP - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) #endif Loop(20) #if !VERSION_JP diff --git a/src/world/area_kpa/kpa_115/statues.c b/src/world/area_kpa/kpa_115/statues.c index 69963773b0..7d540e6a37 100644 --- a/src/world/area_kpa/kpa_115/statues.c +++ b/src/world/area_kpa/kpa_115/statues.c @@ -5,7 +5,7 @@ EvtScript N(EVS_PushMiddleStatue_Impl) = { #if !VERSION_JP - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) #endif Loop(20) #if !VERSION_JP diff --git a/src/world/area_kpa/kpa_12/main.c b/src/world/area_kpa/kpa_12/main.c index b980b9c263..dd241734aa 100644 --- a/src/world/area_kpa/kpa_12/main.c +++ b/src/world/area_kpa/kpa_12/main.c @@ -3,7 +3,7 @@ #include "world/common/atomic/TexturePan.inc.c" EvtScript N(EVS_ExitWalk_kpa_1X_Upper) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, kpa_12_ENTRY_0) Exec(ExitWalk) IfEq(GF_KPA16_ShutOffLava, FALSE) @@ -17,7 +17,7 @@ EvtScript N(EVS_ExitWalk_kpa_1X_Upper) = { }; EvtScript N(EVS_ExitWalk_kpa_1X_Lower) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, kpa_12_ENTRY_2) Exec(ExitWalk) IfEq(GF_KPA16_ShutOffLava, FALSE) diff --git a/src/world/area_kpa/kpa_12/platforms.c b/src/world/area_kpa/kpa_12/platforms.c index 31adbe1d9d..7178967246 100644 --- a/src/world/area_kpa/kpa_12/platforms.c +++ b/src/world/area_kpa/kpa_12/platforms.c @@ -38,7 +38,7 @@ API_CALLABLE(N(IsPartnerLakilester)) { } EvtScript N(EVS_SinkingPlatform_Update) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) SetF(LVar0, Float(0.0)) Label(0) Call(TranslateGroup, LVar1, 0, LVar0, 0) @@ -107,7 +107,7 @@ EvtScript N(EVS_Touch_SinkingPlatform4) = { }; EvtScript N(EVS_SinkingPlatform_Idle) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Label(0) Call(MakeLerp, 0, -3, 20, EASING_LINEAR) Label(1) @@ -153,7 +153,7 @@ EvtScript N(EVS_SetupSinkingPlatforms) = { }; EvtScript N(EVS_SetupMovingPlatform) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(ParentColliderToModel, COLLIDER_o414, MODEL_o522) Set(LVar0, 0) Set(LVar3, 0) diff --git a/src/world/area_kpa/kpa_121/main.c b/src/world/area_kpa/kpa_121/main.c index d578c62e6f..794b2b8c47 100644 --- a/src/world/area_kpa/kpa_121/main.c +++ b/src/world/area_kpa/kpa_121/main.c @@ -3,7 +3,7 @@ EvtScript N(EVS_ExitDoors_kpa_83_1) = EVT_EXIT_DOUBLE_DOOR(kpa_121_ENTRY_0, "kpa_83", kpa_83_ENTRY_1, COLLIDER_deilitw, MODEL_o348, MODEL_o356); EvtScript N(EVS_ExitDoor_osr_02_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) IfLt(GB_StoryProgress, STORY_CH8_REACHED_PEACHS_CASTLE) Set(GB_StoryProgress, STORY_CH8_REACHED_PEACHS_CASTLE) diff --git a/src/world/area_kpa/kpa_13/platforms.c b/src/world/area_kpa/kpa_13/platforms.c index 4d6d3d3ca7..985e7a4609 100644 --- a/src/world/area_kpa/kpa_13/platforms.c +++ b/src/world/area_kpa/kpa_13/platforms.c @@ -38,7 +38,7 @@ API_CALLABLE(N(IsPartnerLakilester)) { } EvtScript N(EVS_SetupPlatforms) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Thread Call(ParentColliderToModel, COLLIDER_o1070, MODEL_o1083) Call(TranslateGroup, MODEL_dai05, 125, 0, 0) diff --git a/src/world/area_kpa/kpa_130/npc.c b/src/world/area_kpa/kpa_130/npc.c index fdf6a55b04..ed959e69cf 100644 --- a/src/world/area_kpa/kpa_130/npc.c +++ b/src/world/area_kpa/kpa_130/npc.c @@ -60,7 +60,7 @@ EvtScript N(EVS_NpcDefeat_BombshellBlaster) = { CaseEq(OUTCOME_PLAYER_FLED) Call(OnPlayerFled, 0) CaseEq(OUTCOME_ENEMY_FLED) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) EndSwitch Return @@ -95,7 +95,7 @@ EvtScript N(EVS_NpcDefeat_BombshellBill) = { CaseEq(OUTCOME_PLAYER_FLED) Call(OnPlayerFled, 0) CaseEq(OUTCOME_ENEMY_FLED) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) EndSwitch Return diff --git a/src/world/area_kpa/kpa_133/main.c b/src/world/area_kpa/kpa_133/main.c index 47c57d5b89..74025551fb 100644 --- a/src/world/area_kpa/kpa_133/main.c +++ b/src/world/area_kpa/kpa_133/main.c @@ -47,8 +47,8 @@ BombTrigger N(BombPos_Wall) = { EvtScript N(EVS_BlastWall) = { PlayEffect(EFFECT_BOMBETTE_BREAKING, 0, 56, 56, 1, 10, 30) - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(EnableModel, MODEL_o235, TRUE) Loop(10) Call(EnableModel, MODEL_o477, TRUE) @@ -60,7 +60,7 @@ EvtScript N(EVS_BlastWall) = { EndLoop Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_ttae, COLLIDER_FLAGS_UPPER_MASK) Set(GF_KPA133_Item_BombedWall, TRUE) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End diff --git a/src/world/area_kpa/kpa_133/npc.c b/src/world/area_kpa/kpa_133/npc.c index 2cc47f779a..f0cd14382f 100644 --- a/src/world/area_kpa/kpa_133/npc.c +++ b/src/world/area_kpa/kpa_133/npc.c @@ -14,7 +14,7 @@ NpcData N(NpcData_Dummy) = { .yaw = 0, .init = &N(EVS_NpcInit_Toad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, }; diff --git a/src/world/area_kpa/kpa_134/npc.c b/src/world/area_kpa/kpa_134/npc.c index bfc6fd8431..f3024ec9e6 100644 --- a/src/world/area_kpa/kpa_134/npc.c +++ b/src/world/area_kpa/kpa_134/npc.c @@ -14,7 +14,7 @@ NpcData N(NpcData_Dummy) = { .yaw = 0, .init = &N(EVS_NpcInit_Toad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, }; diff --git a/src/world/area_kpa/kpa_14/entity.c b/src/world/area_kpa/kpa_14/entity.c index f986c8a540..074e1f8e9d 100644 --- a/src/world/area_kpa/kpa_14/entity.c +++ b/src/world/area_kpa/kpa_14/entity.c @@ -11,11 +11,11 @@ s32** N(varStash) = NULL; EvtScript N(EVS_Chest_ShowGotItem) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_FULL) Wait(40) Call(ShowGotItem, LVar0, FALSE, 0) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return Return End diff --git a/src/world/area_kpa/kpa_14/main.c b/src/world/area_kpa/kpa_14/main.c index 02bff3e813..6c4ec423d0 100644 --- a/src/world/area_kpa/kpa_14/main.c +++ b/src/world/area_kpa/kpa_14/main.c @@ -16,7 +16,7 @@ API_CALLABLE(N(GetActingPartner)) { EvtScript N(EVS_ExitWalk_kpa_13_1) = EVT_EXIT_WALK(60, kpa_14_ENTRY_0, "kpa_13", kpa_13_ENTRY_1); EvtScript N(EVS_ExitDoor_kpa_01_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kpa_14_ENTRY_1) Set(LVar1, COLLIDER_deilitte) @@ -126,7 +126,7 @@ EvtScript N(EVS_MakeSmokeEffects) = { }; EvtScript N(EVS_SetupLavaFall) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Loop(0) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o854, COLLIDER_FLAGS_UPPER_MASK) Call(N(GetActingPartner)) diff --git a/src/world/area_kpa/kpa_14/platforms.c b/src/world/area_kpa/kpa_14/platforms.c index 4171fe374c..b9128d79ca 100644 --- a/src/world/area_kpa/kpa_14/platforms.c +++ b/src/world/area_kpa/kpa_14/platforms.c @@ -44,7 +44,7 @@ API_CALLABLE(N(IsPartnerLakilester)) { } EvtScript N(EVS_SetupPlatforms) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(ParentColliderToModel, COLLIDER_o852, MODEL_o860) Set(LVar0, 0) Set(LVar3, 0) diff --git a/src/world/area_kpa/kpa_16/npc.c b/src/world/area_kpa/kpa_16/npc.c index 4612bf9791..da915c7a62 100644 --- a/src/world/area_kpa/kpa_16/npc.c +++ b/src/world/area_kpa/kpa_16/npc.c @@ -293,7 +293,7 @@ NpcData N(NpcData_Guards)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Guards), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, }, @@ -302,7 +302,7 @@ NpcData N(NpcData_Guards)[] = { .pos = { 525.0f, 230.0f, -165.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, }, @@ -311,7 +311,7 @@ NpcData N(NpcData_Guards)[] = { .pos = { 550.0f, 230.0f, -120.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, }, @@ -320,7 +320,7 @@ NpcData N(NpcData_Guards)[] = { .pos = { 505.0f, 230.0f, -120.0f }, .yaw = 270, .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = MAGINO_DROPS, .animations = MAGIKOOPA_ANIMS, }, diff --git a/src/world/area_kpa/kpa_17/main.c b/src/world/area_kpa/kpa_17/main.c index b39d202a08..d4ce29c60b 100644 --- a/src/world/area_kpa/kpa_17/main.c +++ b/src/world/area_kpa/kpa_17/main.c @@ -1,7 +1,7 @@ #include "kpa_17.h" EvtScript N(EVS_ExitWalk_kpa_1X_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, kpa_17_ENTRY_1) Exec(ExitWalk) IfEq(GF_KPA16_ShutOffLava, FALSE) diff --git a/src/world/area_kpa/kpa_17/npc.c b/src/world/area_kpa/kpa_17/npc.c index 948f9e2d06..bcd801ed3d 100644 --- a/src/world/area_kpa/kpa_17/npc.c +++ b/src/world/area_kpa/kpa_17/npc.c @@ -195,7 +195,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Toad_01), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadA, @@ -206,7 +206,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Toad_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadB, @@ -217,7 +217,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_ToadGuard), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = TOAD_GUARD_YELLOW_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveSoldierA, @@ -228,7 +228,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_ToadMinister), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = TOAD_MINISTER_ANIMS, .tattle = MSG_NpcTattle_KPA_ToadMinister, diff --git a/src/world/area_kpa/kpa_40/main.c b/src/world/area_kpa/kpa_40/main.c index 9905c1c0ac..825804971d 100644 --- a/src/world/area_kpa/kpa_40/main.c +++ b/src/world/area_kpa/kpa_40/main.c @@ -5,7 +5,7 @@ EvtScript N(EVS_ExitDoors_kpa_52_1) = EVT_EXIT_DOUBLE_DOOR(kpa_40_ENTRY_0, "kpa_ EvtScript N(EVS_ExitWalk_kpa_40_3) = EVT_EXIT_WALK(60, kpa_40_ENTRY_1, "kpa_40", kpa_40_ENTRY_3); EvtScript N(EVS_ExitWalk_kpa_41_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, kpa_40_ENTRY_2) Exec(ExitWalk) Set(AB_KPA_MazeProgress, 1) diff --git a/src/world/area_kpa/kpa_41/main.c b/src/world/area_kpa/kpa_41/main.c index 9e312f9d28..9007ae25ec 100644 --- a/src/world/area_kpa/kpa_41/main.c +++ b/src/world/area_kpa/kpa_41/main.c @@ -3,7 +3,7 @@ EvtScript N(EVS_ExitWalk_LowerLeft) = EVT_EXIT_WALK(60, kpa_41_ENTRY_0, "kpa_40", kpa_40_ENTRY_1); EvtScript N(EVS_ExitWalk_LowerRight) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, kpa_41_ENTRY_1) Exec(ExitWalk) Switch(AB_KPA_MazeProgress) @@ -27,7 +27,7 @@ EvtScript N(EVS_ExitWalk_LowerRight) = { EvtScript N(EVS_ExitWalk_UpperLeft) = EVT_EXIT_WALK(60, kpa_41_ENTRY_3, "kpa_40", kpa_40_ENTRY_2); EvtScript N(EVS_ExitWalk_UpperRight) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, kpa_41_ENTRY_2) Exec(ExitWalk) Switch(AB_KPA_MazeProgress) diff --git a/src/world/area_kpa/kpa_53/npc.c b/src/world/area_kpa/kpa_53/npc.c index 57594ed834..7fd4927d1b 100644 --- a/src/world/area_kpa/kpa_53/npc.c +++ b/src/world/area_kpa/kpa_53/npc.c @@ -234,7 +234,7 @@ EvtScript N(EVS_NpcHit_Guardian) = { Call(SpeakToPlayer, NPC_Follower, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, MSG_CH8_002B) Else Call(SpeakToPlayer, NPC_Follower, ANIM_Peach2_Talk, ANIM_Peach2_TalkIdle, 0, MSG_CH8_002C) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, TRUE) Call(BindNpcAI, NPC_Duplighost, Ref(N(EVS_NpcAI_Duplighost_Caught))) EndIf EndSwitch @@ -347,7 +347,7 @@ NpcData N(NpcData_Imposter)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Follower), .settings = &N(NpcSettings_Peach), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_PLAYER_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_PLAYER_SPRITE | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = PEACH_ANIMS, .tattle = MSG_NpcTattle_KPA_FakePrincessPeach, @@ -358,7 +358,7 @@ NpcData N(NpcData_Imposter)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Guardian), .settings = &N(NpcSettings_Peach), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH, .drops = NO_DROPS, .animations = PEACH_ANIMS, .tattle = MSG_NpcTattle_KPA_FakePrincessPeach, @@ -369,7 +369,7 @@ NpcData N(NpcData_Imposter)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Duplighost), .settings = &N(NpcSettings_Duplighost), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, diff --git a/src/world/area_kpa/kpa_60/main.c b/src/world/area_kpa/kpa_60/main.c index 51ab6e7513..b4e3a81673 100644 --- a/src/world/area_kpa/kpa_60/main.c +++ b/src/world/area_kpa/kpa_60/main.c @@ -53,7 +53,7 @@ EvtScript N(EVS_CloseAirshipDockDoor) = { }; EvtScript N(EVS_ExitDoor_kpa_70_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_METAL) Set(LVar0, kpa_60_ENTRY_0) @@ -69,7 +69,7 @@ EvtScript N(EVS_ExitDoor_kpa_70_0) = { }; EvtScript N(EVS_ExitWalk_kpa_1X_Upper) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, kpa_60_ENTRY_1) Exec(ExitWalk) IfEq(GF_KPA16_ShutOffLava, FALSE) @@ -83,7 +83,7 @@ EvtScript N(EVS_ExitWalk_kpa_1X_Upper) = { }; EvtScript N(EVS_ExitWalk_kpa_1X_Lower) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, kpa_60_ENTRY_2) Exec(ExitWalk) IfEq(GF_KPA16_ShutOffLava, FALSE) @@ -97,7 +97,7 @@ EvtScript N(EVS_ExitWalk_kpa_1X_Lower) = { }; EvtScript N(EVS_ExitDoor_kpa_63_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) ExecWait(N(EVS_OpenAirshipDockDoor)) Wait(15) diff --git a/src/world/area_kpa/kpa_62/main.c b/src/world/area_kpa/kpa_62/main.c index f19fdd1b22..a66a8e5855 100644 --- a/src/world/area_kpa/kpa_62/main.c +++ b/src/world/area_kpa/kpa_62/main.c @@ -53,7 +53,7 @@ EvtScript N(EVS_CloseAirshipDockDoor) = { }; EvtScript N(EVS_ExitDoors_kpa_70_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_METAL) Set(LVar0, kpa_62_ENTRY_0) @@ -69,7 +69,7 @@ EvtScript N(EVS_ExitDoors_kpa_70_0) = { }; EvtScript N(EVS_ExitWalk_kpa_1X_Upper) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, kpa_62_ENTRY_1) Exec(ExitWalk) IfEq(GF_KPA16_ShutOffLava, FALSE) @@ -83,7 +83,7 @@ EvtScript N(EVS_ExitWalk_kpa_1X_Upper) = { }; EvtScript N(EVS_ExitWalk_kpa_1X_Lower) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, kpa_62_ENTRY_2) Exec(ExitWalk) IfEq(GF_KPA16_ShutOffLava, FALSE) @@ -97,7 +97,7 @@ EvtScript N(EVS_ExitWalk_kpa_1X_Lower) = { }; EvtScript N(EVS_ExitDoor_kpa_63_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) ExecWait(N(EVS_OpenAirshipDockDoor)) Wait(15) diff --git a/src/world/area_kpa/kpa_63/main.c b/src/world/area_kpa/kpa_63/main.c index e868c89dc4..70a524c20f 100644 --- a/src/world/area_kpa/kpa_63/main.c +++ b/src/world/area_kpa/kpa_63/main.c @@ -35,7 +35,7 @@ EvtScript N(EVS_CloseHangerDoor) = { }; EvtScript N(EVS_ExitDoor_kpa_62_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Exec(N(EVS_OpenHangerDoor)) Wait(15) diff --git a/src/world/area_kpa/kpa_70/main.c b/src/world/area_kpa/kpa_70/main.c index a99395eacd..0241770669 100644 --- a/src/world/area_kpa/kpa_70/main.c +++ b/src/world/area_kpa/kpa_70/main.c @@ -12,7 +12,7 @@ EvtScript N(EVS_SetupChainDrive) = { }; EvtScript N(EVS_ExitDoors_kpa_62_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Wait(3) Set(LVar0, kpa_70_ENTRY_0) diff --git a/src/world/area_kpa/kpa_81/main.c b/src/world/area_kpa/kpa_81/main.c index 0d84eaf9fa..7866a7e24a 100644 --- a/src/world/area_kpa/kpa_81/main.c +++ b/src/world/area_kpa/kpa_81/main.c @@ -29,7 +29,7 @@ s32 N(LeftDoorModels)[] = { EvtScript N(EVS_ExitDoors_kpa_50_1) = EVT_EXIT_DOUBLE_DOOR(kpa_81_ENTRY_0, "kpa_50", kpa_50_ENTRY_1, COLLIDER_deilittw, MODEL_o174, MODEL_o173); EvtScript N(EVS_ExitDoors_kpa_32_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kpa_81_ENTRY_2) Set(LVar1, COLLIDER_o166) diff --git a/src/world/area_kpa/kpa_81/npc.c b/src/world/area_kpa/kpa_81/npc.c index 2becbefb08..742724f9b9 100644 --- a/src/world/area_kpa/kpa_81/npc.c +++ b/src/world/area_kpa/kpa_81/npc.c @@ -211,7 +211,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EvtScript N(EVS_NpcInit_Door) = { Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_Door))) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_USE_INSPECT_ICON, TRUE) Call(EnableNpcShadow, NPC_SELF, FALSE) Call(SetNpcPos, NPC_SELF, 184, 20, 150) Return @@ -224,7 +224,7 @@ NpcData N(NpcData_Door) = { .yaw = 0, .init = &N(EVS_NpcInit_Door), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, }; diff --git a/src/world/area_kpa/kpa_82/main.c b/src/world/area_kpa/kpa_82/main.c index aed021c761..265af0da41 100644 --- a/src/world/area_kpa/kpa_82/main.c +++ b/src/world/area_kpa/kpa_82/main.c @@ -29,7 +29,7 @@ s32 N(LeftDoorModels)[] = { EvtScript N(EVS_ExitDoors_kpa_113_1) = EVT_EXIT_DOUBLE_DOOR(kpa_82_ENTRY_0, "kpa_113", kpa_113_ENTRY_1, COLLIDER_deilittw, MODEL_o174, MODEL_o173); EvtScript N(EVS_ExitDoors_kpa_61_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kpa_82_ENTRY_1) Set(LVar1, COLLIDER_o166) diff --git a/src/world/area_kpa/kpa_82/npc.c b/src/world/area_kpa/kpa_82/npc.c index 41c710c2d5..918539b728 100644 --- a/src/world/area_kpa/kpa_82/npc.c +++ b/src/world/area_kpa/kpa_82/npc.c @@ -1231,7 +1231,7 @@ EvtScript N(EVS_NpcInit_Door) = { Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_Door))) EndIf Call(BindNpcDefeat, NPC_SELF, Ref(N(EVS_NpcDefeat_Door))) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_USE_INSPECT_ICON, TRUE) Call(EnableNpcShadow, NPC_SELF, FALSE) Call(SetNpcPos, NPC_SELF, 184, 20, 150) Return @@ -1275,6 +1275,37 @@ EvtScript N(EVS_NpcInit_AntiGuy) = { End }; +#define QUIZ_DOOR_ENEMY_FLAGS \ + ( ENEMY_FLAG_DO_NOT_KILL \ + | ENEMY_FLAG_ENABLE_HIT_SCRIPT \ + | ENEMY_FLAG_IGNORE_WORLD_COLLISION \ + | ENEMY_FLAG_IGNORE_PLAYER_COLLISION \ + | ENEMY_FLAG_IGNORE_ENTITY_COLLISION \ + | ENEMY_FLAG_FLYING \ + | ENEMY_FLAG_HAS_NO_SPRITE \ + | ENEMY_FLAG_NO_DELAY_AFTER_FLEE \ + | ENEMY_FLAG_SKIP_BATTLE \ + | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN \ + | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER \ + | ENEMY_FLAG_NO_DROPS \ + | ENEMY_FLAG_IGNORE_TOUCH \ + | ENEMY_FLAG_IGNORE_JUMP \ + ) + +#define QUIZ_ANTI_GUY_ENEMY_FLAGS \ + ( ENEMY_FLAG_ENABLE_HIT_SCRIPT \ + | ENEMY_FLAG_IGNORE_WORLD_COLLISION \ + | ENEMY_FLAG_IGNORE_PLAYER_COLLISION \ + | ENEMY_FLAG_IGNORE_ENTITY_COLLISION \ + | ENEMY_FLAG_FLYING \ + | ENEMY_FLAG_NO_DELAY_AFTER_FLEE \ + | ENEMY_FLAG_SKIP_BATTLE \ + | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER \ + | ENEMY_FLAG_NO_DROPS \ + | ENEMY_FLAG_IGNORE_TOUCH \ + | ENEMY_FLAG_IGNORE_JUMP \ + ) + NpcData N(NpcData_AntiGuys)[] = { { .id = NPC_Dummy, @@ -1282,7 +1313,7 @@ NpcData N(NpcData_AntiGuys)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Door), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_DOOR_ENEMY_FLAGS, .drops = NO_DROPS, .animations = ANTI_GUY_ANIMS, }, @@ -1292,7 +1323,7 @@ NpcData N(NpcData_AntiGuys)[] = { .yaw = 0, .init = &N(EVS_NpcInit_AntiGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_ANTI_GUY_ENEMY_FLAGS, .drops = NO_DROPS, .animations = ANTI_GUY_ANIMS, }, @@ -1302,7 +1333,7 @@ NpcData N(NpcData_AntiGuys)[] = { .yaw = 0, .init = &N(EVS_NpcInit_AntiGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_ANTI_GUY_ENEMY_FLAGS, .drops = NO_DROPS, .animations = ANTI_GUY_ANIMS, }, @@ -1312,12 +1343,27 @@ NpcData N(NpcData_AntiGuys)[] = { .yaw = 0, .init = &N(EVS_NpcInit_AntiGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_ANTI_GUY_ENEMY_FLAGS, .drops = NO_DROPS, .animations = ANTI_GUY_ANIMS, }, }; +#define QUIZ_GAME_ENEMY_FLAGS \ + ( ENEMY_FLAG_ENABLE_HIT_SCRIPT \ + | ENEMY_FLAG_IGNORE_WORLD_COLLISION \ + | ENEMY_FLAG_IGNORE_PLAYER_COLLISION \ + | ENEMY_FLAG_IGNORE_ENTITY_COLLISION \ + | ENEMY_FLAG_FLYING \ + | ENEMY_FLAG_NO_DELAY_AFTER_FLEE \ + | ENEMY_FLAG_SKIP_BATTLE \ + | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN \ + | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER \ + | ENEMY_FLAG_NO_DROPS \ + | ENEMY_FLAG_IGNORE_TOUCH \ + | ENEMY_FLAG_IGNORE_JUMP \ + ) + NpcData N(NpcData_Goombas)[] = { { .id = NPC_Goomba_01, @@ -1337,7 +1383,7 @@ NpcData N(NpcData_Goombas)[] = { }, .init = &N(EVS_NpcInit_Goomba), .settings = &N(NpcSettings_Short), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, }, @@ -1359,7 +1405,7 @@ NpcData N(NpcData_Goombas)[] = { }, .init = &N(EVS_NpcInit_Goomba), .settings = &N(NpcSettings_Short), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, }, @@ -1381,7 +1427,7 @@ NpcData N(NpcData_Goombas)[] = { }, .init = &N(EVS_NpcInit_Goomba), .settings = &N(NpcSettings_Short), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, }, @@ -1403,7 +1449,7 @@ NpcData N(NpcData_Goombas)[] = { }, .init = &N(EVS_NpcInit_Goomba), .settings = &N(NpcSettings_Short), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, }, @@ -1425,7 +1471,7 @@ NpcData N(NpcData_Goombas)[] = { }, .init = &N(EVS_NpcInit_Goomba), .settings = &N(NpcSettings_Short), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = GOOMBA_DROPS, .animations = GOOMBA_ANIMS, }, @@ -1450,7 +1496,7 @@ NpcData N(NpcData_RedShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = SHY_GUY_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -1472,7 +1518,7 @@ NpcData N(NpcData_RedShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = SHY_GUY_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -1494,7 +1540,7 @@ NpcData N(NpcData_RedShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = SHY_GUY_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -1516,7 +1562,7 @@ NpcData N(NpcData_RedShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = SHY_GUY_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -1538,7 +1584,7 @@ NpcData N(NpcData_RedShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = SHY_GUY_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -1563,7 +1609,7 @@ NpcData N(NpcData_BlueShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = SHY_GUY_DROPS, .animations = BLUE_SHY_GUY_ANIMS, }, @@ -1585,7 +1631,7 @@ NpcData N(NpcData_BlueShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = SHY_GUY_DROPS, .animations = BLUE_SHY_GUY_ANIMS, }, @@ -1607,7 +1653,7 @@ NpcData N(NpcData_BlueShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = SHY_GUY_DROPS, .animations = BLUE_SHY_GUY_ANIMS, }, @@ -1629,7 +1675,7 @@ NpcData N(NpcData_BlueShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = SHY_GUY_DROPS, .animations = BLUE_SHY_GUY_ANIMS, }, @@ -1651,7 +1697,7 @@ NpcData N(NpcData_BlueShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = SHY_GUY_DROPS, .animations = BLUE_SHY_GUY_ANIMS, }, @@ -1676,7 +1722,7 @@ NpcData N(NpcData_GreenShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = SHY_GUY_DROPS, .animations = GREEN_SHY_GUY_ANIMS, }, @@ -1698,7 +1744,7 @@ NpcData N(NpcData_GreenShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = SHY_GUY_DROPS, .animations = GREEN_SHY_GUY_ANIMS, }, @@ -1720,7 +1766,7 @@ NpcData N(NpcData_GreenShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = SHY_GUY_DROPS, .animations = GREEN_SHY_GUY_ANIMS, }, @@ -1742,7 +1788,7 @@ NpcData N(NpcData_GreenShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = SHY_GUY_DROPS, .animations = GREEN_SHY_GUY_ANIMS, }, @@ -1764,7 +1810,7 @@ NpcData N(NpcData_GreenShyGuys)[] = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = SHY_GUY_DROPS, .animations = GREEN_SHY_GUY_ANIMS, }, @@ -1789,7 +1835,7 @@ NpcData N(NpcData_DarkTroopas)[] = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_KoopaTroopa), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = DARK_TROOPA_ANIMS, }, @@ -1811,7 +1857,7 @@ NpcData N(NpcData_DarkTroopas)[] = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_KoopaTroopa), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = DARK_TROOPA_ANIMS, }, @@ -1833,7 +1879,7 @@ NpcData N(NpcData_DarkTroopas)[] = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_KoopaTroopa), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = DARK_TROOPA_ANIMS, }, @@ -1855,7 +1901,7 @@ NpcData N(NpcData_DarkTroopas)[] = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_KoopaTroopa), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = DARK_TROOPA_ANIMS, }, @@ -1877,7 +1923,7 @@ NpcData N(NpcData_DarkTroopas)[] = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_KoopaTroopa), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = DARK_TROOPA_ANIMS, }, @@ -1902,7 +1948,7 @@ NpcData N(NpcData_KoopaTroopas)[] = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_KoopaTroopa), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = KOOPA_TROOPA_ANIMS, }, @@ -1924,7 +1970,7 @@ NpcData N(NpcData_KoopaTroopas)[] = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_KoopaTroopa), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = KOOPA_TROOPA_ANIMS, }, @@ -1946,7 +1992,7 @@ NpcData N(NpcData_KoopaTroopas)[] = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_KoopaTroopa), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = KOOPA_TROOPA_ANIMS, }, @@ -1968,7 +2014,7 @@ NpcData N(NpcData_KoopaTroopas)[] = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_KoopaTroopa), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = KOOPA_TROOPA_ANIMS, }, @@ -1990,7 +2036,7 @@ NpcData N(NpcData_KoopaTroopas)[] = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_KoopaTroopa), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = KOOPA_TROOPA_NOK_DROPS, .animations = KOOPA_TROOPA_ANIMS, }, @@ -2015,7 +2061,7 @@ NpcData N(NpcData_Bobombs)[] = { }, .init = &N(EVS_NpcInit_Bobomb), .settings = &N(NpcSettings_Short), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = NO_DROPS, .animations = BOBOMB_GREEN_ANIMS, }, @@ -2037,7 +2083,7 @@ NpcData N(NpcData_Bobombs)[] = { }, .init = &N(EVS_NpcInit_Bobomb), .settings = &N(NpcSettings_Short), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = NO_DROPS, .animations = BOBOMB_GREEN_ANIMS, }, @@ -2059,7 +2105,7 @@ NpcData N(NpcData_Bobombs)[] = { }, .init = &N(EVS_NpcInit_Bobomb), .settings = &N(NpcSettings_Short), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = NO_DROPS, .animations = BOBOMB_GREEN_ANIMS, }, @@ -2081,7 +2127,7 @@ NpcData N(NpcData_Bobombs)[] = { }, .init = &N(EVS_NpcInit_Bobomb), .settings = &N(NpcSettings_Short), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = NO_DROPS, .animations = BOBOMB_GREEN_ANIMS, }, @@ -2103,7 +2149,7 @@ NpcData N(NpcData_Bobombs)[] = { }, .init = &N(EVS_NpcInit_Bobomb), .settings = &N(NpcSettings_Short), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = QUIZ_GAME_ENEMY_FLAGS, .drops = NO_DROPS, .animations = BOBOMB_GREEN_ANIMS, }, diff --git a/src/world/area_kpa/kpa_83/main.c b/src/world/area_kpa/kpa_83/main.c index a6e1f59f6a..e0d8573d4a 100644 --- a/src/world/area_kpa/kpa_83/main.c +++ b/src/world/area_kpa/kpa_83/main.c @@ -29,7 +29,7 @@ s32 N(LeftDoorModels)[] = { EvtScript N(EVS_ExitDoors_kpa_53_1) = EVT_EXIT_DOUBLE_DOOR(kpa_83_ENTRY_0, "kpa_53", kpa_53_ENTRY_1, COLLIDER_deilittw, MODEL_o174, MODEL_o173); EvtScript N(EVS_ExitDoors_kpa_121_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, kpa_83_ENTRY_1) Set(LVar1, COLLIDER_o166) diff --git a/src/world/area_kpa/kpa_83/npc.c b/src/world/area_kpa/kpa_83/npc.c index 23ec0e131d..a2c9695727 100644 --- a/src/world/area_kpa/kpa_83/npc.c +++ b/src/world/area_kpa/kpa_83/npc.c @@ -481,7 +481,7 @@ EvtScript N(EVS_NpcInit_Door) = { IfEq(GB_KPA83_BowserDoorState, 0) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_Door))) Call(BindNpcDefeat, NPC_SELF, Ref(N(EVS_NpcDefeat_Door))) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_USE_INSPECT_ICON, TRUE) Call(SetNpcPos, NPC_SELF, 184, 20, 150) Call(EnableNpcShadow, NPC_SELF, FALSE) EndIf @@ -518,7 +518,7 @@ NpcData N(NpcData_Enemies)[] = { .yaw = 270, .init = &N(EVS_NpcInit_KoopaBros), .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = BLACK_KOOPA_BROS_ANIMS, .extraAnimations = N(ExtraAnims_KoopaBros), @@ -529,7 +529,7 @@ NpcData N(NpcData_Enemies)[] = { .yaw = 270, .init = &N(EVS_NpcInit_KoopaBros), .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = RED_KOOPA_BROS_ANIMS, .extraAnimations = N(ExtraAnims_KoopaBros), @@ -540,7 +540,7 @@ NpcData N(NpcData_Enemies)[] = { .yaw = 270, .init = &N(EVS_NpcInit_KoopaBros), .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = YELLOW_KOOPA_BROS_ANIMS, .extraAnimations = N(ExtraAnims_KoopaBros), @@ -551,7 +551,7 @@ NpcData N(NpcData_Enemies)[] = { .yaw = 270, .init = &N(EVS_NpcInit_KoopaBros), .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = GREEN_KOOPA_BROS_ANIMS, .extraAnimations = N(ExtraAnims_KoopaBros), @@ -562,7 +562,7 @@ NpcData N(NpcData_Enemies)[] = { .yaw = 90, .init = &N(EVS_NpcInit_JrTroopa), .settings = &N(NpcSettings_JrTroopa), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = { .idle = ANIM_JrTroopa_Idle, @@ -589,7 +589,7 @@ NpcData N(NpcData_Enemies)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Door), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, }, diff --git a/src/world/area_kpa/kpa_91/npc.c b/src/world/area_kpa/kpa_91/npc.c index 9aeead3cf7..6e7e04a2d6 100644 --- a/src/world/area_kpa/kpa_91/npc.c +++ b/src/world/area_kpa/kpa_91/npc.c @@ -160,7 +160,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Toad_01), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_ToadHouseToadA, @@ -171,7 +171,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Toad_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadC, @@ -182,7 +182,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_ToadGuard), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = TOAD_GUARD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveSoldierB, @@ -193,7 +193,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Dryite), .settings = &N(NpcSettings_Dryite), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = DRYITE_GREEN_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveDryite, @@ -213,7 +213,7 @@ EvtScript N(EVS_NpcDefeat_Koopatrol) = { Set(GF_KPA91_Defeated_Guard, TRUE) Call(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) Call(MakeItemEntity, ITEM_PRISON_KEY, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_TOSS_NEVER_VANISH, GF_KPA91_Item_PrisonKey1) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) EndSwitch Return @@ -250,7 +250,7 @@ NpcData N(NpcData_Koopatrol) = { }, .init = &N(EVS_NpcInit_Koopatrol), .settings = &N(NpcSettings_Koopatrol_Patrol), - .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, }; diff --git a/src/world/area_kpa/kpa_95/npc.c b/src/world/area_kpa/kpa_95/npc.c index 5aebdabf31..074f89b353 100644 --- a/src/world/area_kpa/kpa_95/npc.c +++ b/src/world/area_kpa/kpa_95/npc.c @@ -161,7 +161,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Toad_01), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_ToadHouseToadB, @@ -172,7 +172,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Toad_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadD, @@ -183,7 +183,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_ToadGuard), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = TOAD_GUARD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveSoldierC, @@ -194,7 +194,7 @@ NpcData N(NpcData_Prisoners)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Penguin), .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptivePenguin, @@ -214,7 +214,7 @@ EvtScript N(EVS_NpcDefeat_Koopatrol) = { Set(GF_KPA95_Defeated_Guard, TRUE) Call(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) Call(MakeItemEntity, ITEM_PRISON_KEY, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_TOSS_NEVER_VANISH, GF_KPA95_Item_PrisonKey1) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) EndSwitch Return @@ -251,7 +251,7 @@ NpcData N(NpcData_Koopatrol) = { }, .init = &N(EVS_NpcInit_Koopatrol), .settings = &N(NpcSettings_Koopatrol_Patrol), - .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, }; diff --git a/src/world/area_kpa/kpa_96/npc.c b/src/world/area_kpa/kpa_96/npc.c index 94118dd2da..5dcacd9391 100644 --- a/src/world/area_kpa/kpa_96/npc.c +++ b/src/world/area_kpa/kpa_96/npc.c @@ -146,7 +146,7 @@ NpcData N(NpcData_SpikedGoomba) = { .yaw = 90, .init = &N(EVS_NpcInit_SpikedGoomba), .settings = &N(NpcSettings_SpikedGoomba), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_SpikedGoomba_Idle, diff --git a/src/world/area_kzn/common/SmokeTexPanners.inc.c b/src/world/area_kzn/common/SmokeTexPanners.inc.c index 1725fb66b9..def62a99da 100644 --- a/src/world/area_kzn/common/SmokeTexPanners.inc.c +++ b/src/world/area_kzn/common/SmokeTexPanners.inc.c @@ -3,7 +3,7 @@ #include "world/common/atomic/TexturePan.inc.c" EvtScript N(EVS_StartTexPanner_SmokeLeft) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, LVar0, TEX_PANNER_3) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_3) @@ -17,7 +17,7 @@ EvtScript N(EVS_StartTexPanner_SmokeLeft) = { }; EvtScript N(EVS_StartTexPanner_SmokeRight) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, LVar0, TEX_PANNER_4) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_4) diff --git a/src/world/area_kzn/kzn_01/npc.c b/src/world/area_kzn/kzn_01/npc.c index 1ebf1b4bf6..e408aecaed 100644 --- a/src/world/area_kzn/kzn_01/npc.c +++ b/src/world/area_kzn/kzn_01/npc.c @@ -51,7 +51,7 @@ NpcData N(NpcPutridPiranha) = { .yaw = 270, .init = &N(EVS_NpcInit_PutridPiranha), .settings = &N(NpcSettings_PutridPiranhaSentinel), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = PIRANHA_NO_DROPS, .animations = PIRANHA_SENTINEL_ANIMS, }; diff --git a/src/world/area_kzn/kzn_02/main.c b/src/world/area_kzn/kzn_02/main.c index 015435c0c6..4dbb06d871 100644 --- a/src/world/area_kzn/kzn_02/main.c +++ b/src/world/area_kzn/kzn_02/main.c @@ -3,7 +3,7 @@ #include "world/common/atomic/TexturePan.inc.c" EvtScript N(EVS_UpdateTexPanner3) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, LVar0, TEX_PANNER_3) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_3) @@ -17,7 +17,7 @@ EvtScript N(EVS_UpdateTexPanner3) = { }; EvtScript N(EVS_UpdateTexPanner4) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, LVar0, TEX_PANNER_4) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_4) @@ -53,7 +53,7 @@ EvtScript N(EVS_EnterMap) = { }; EvtScript N(EVS_StartTexPanners_Lava) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(EnableTexPanning, MODEL_yougan1_1, TRUE) Call(EnableTexPanning, MODEL_yougan1_2, TRUE) Call(EnableTexPanning, MODEL_toro, TRUE) diff --git a/src/world/area_kzn/kzn_02/npc.c b/src/world/area_kzn/kzn_02/npc.c index 90a38f7ea0..2784537936 100644 --- a/src/world/area_kzn/kzn_02/npc.c +++ b/src/world/area_kzn/kzn_02/npc.c @@ -169,7 +169,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, diff --git a/src/world/area_kzn/kzn_02/platforms.c b/src/world/area_kzn/kzn_02/platforms.c index c4d4b2a1b0..1311f062da 100644 --- a/src/world/area_kzn/kzn_02/platforms.c +++ b/src/world/area_kzn/kzn_02/platforms.c @@ -85,7 +85,7 @@ EvtScript N(EVS_KoloradoSinkingPlatform) = { }; EvtScript N(EVS_UpdateSinkingPlatform) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(N(GetCurrentFloor), LVarA) SetF(LVar0, Float(0.0)) Label(0) @@ -273,7 +273,7 @@ EvtScript N(EVS_OnTouchSinkingPlatform6) = { }; EvtScript N(EVS_UpdatePlatformBobbing) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Label(0) Call(MakeLerp, 0, -3, 30, EASING_LINEAR) Label(1) @@ -361,7 +361,7 @@ EvtScript N(EVS_StartBobbingPlatform6) = { }; EvtScript N(EVS_UpdateMovingPlatform) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(ParentColliderToModel, COLLIDER_o128, MODEL_o123) Call(ParentColliderToModel, COLLIDER_o129, MODEL_o124) Call(ParentColliderToModel, COLLIDER_o130, MODEL_o125) diff --git a/src/world/area_kzn/kzn_03/main.c b/src/world/area_kzn/kzn_03/main.c index 32ca55eee2..261f593e5c 100644 --- a/src/world/area_kzn/kzn_03/main.c +++ b/src/world/area_kzn/kzn_03/main.c @@ -20,7 +20,7 @@ EvtScript N(EVS_BindTriggers) = { }; EvtScript N(EVS_StartTexPanners_Lava) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(EnableTexPanning, MODEL_o112, TRUE) Call(EnableTexPanning, MODEL_o151, TRUE) Call(EnableTexPanning, MODEL_toro, TRUE) diff --git a/src/world/area_kzn/kzn_03/npc.c b/src/world/area_kzn/kzn_03/npc.c index bc15ba6ace..83326e0964 100644 --- a/src/world/area_kzn/kzn_03/npc.c +++ b/src/world/area_kzn/kzn_03/npc.c @@ -164,7 +164,7 @@ NpcData N(NpcData_PassiveNPCs)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -175,7 +175,7 @@ NpcData N(NpcData_PassiveNPCs)[] = { .yaw = 90, .init = &N(EVS_NpcInit_ZiplineDummy), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -186,7 +186,7 @@ NpcData N(NpcData_PassiveNPCs)[] = { .yaw = 90, .init = &N(EVS_NpcInit_ZiplineDummy), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, diff --git a/src/world/area_kzn/kzn_06/extra.c b/src/world/area_kzn/kzn_06/extra.c index 3271869ea0..a9c714a390 100644 --- a/src/world/area_kzn/kzn_06/extra.c +++ b/src/world/area_kzn/kzn_06/extra.c @@ -179,7 +179,7 @@ EvtScript N(EVS_SetupLavaPuzzle) = { SetF(MV_GlowIntensity, Float(0.5)) EndIf Thread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(N(ApplyLavaGlowLighting), LAVA_GLOW_MODE_1, NULL) EndThread Thread diff --git a/src/world/area_kzn/kzn_06/main.c b/src/world/area_kzn/kzn_06/main.c index 3a2bfafccd..3cdbec94ca 100644 --- a/src/world/area_kzn/kzn_06/main.c +++ b/src/world/area_kzn/kzn_06/main.c @@ -17,7 +17,7 @@ EvtScript N(EVS_BindExitTriggers) = { MAP_RODATA_PAD(1, unk); // can be fixed with subalign 16 for this map EvtScript N(EVS_StartTexPanners) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_yo1, TEX_PANNER_0) Call(SetTexPanner, MODEL_o349, TEX_PANNER_0) Thread diff --git a/src/world/area_kzn/kzn_07/main.c b/src/world/area_kzn/kzn_07/main.c index ea29f4d33a..39ad1ff601 100644 --- a/src/world/area_kzn/kzn_07/main.c +++ b/src/world/area_kzn/kzn_07/main.c @@ -19,7 +19,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_SetupTexPanners) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_yougan, TEX_PANNER_0) Call(SetTexPanner, MODEL_yougan1, TEX_PANNER_1) Call(SetTexPanner, MODEL_spot, TEX_PANNER_1) @@ -66,7 +66,7 @@ EvtScript N(EVS_Main) = { Exec(EnterWalk) Wait(1) Thread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(N(ApplyLavaGlowLighting), LAVA_GLOW_MODE_0, NULL) EndThread Thread diff --git a/src/world/area_kzn/kzn_08/main.c b/src/world/area_kzn/kzn_08/main.c index e8ab5e512a..14d38753f6 100644 --- a/src/world/area_kzn/kzn_08/main.c +++ b/src/world/area_kzn/kzn_08/main.c @@ -23,7 +23,7 @@ API_CALLABLE(func_80240718_C71B98) { } EvtScript N(EVS_StartTexPanner_SmokeLeft) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, LVar0, TEX_PANNER_3) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_3) @@ -37,7 +37,7 @@ EvtScript N(EVS_StartTexPanner_SmokeLeft) = { }; EvtScript N(EVS_StartTexPanner_SmokeRight) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, LVar0, TEX_PANNER_4) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_4) @@ -64,7 +64,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_StartTexPanner0) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_yougan1, TEX_PANNER_0) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_0) @@ -78,7 +78,7 @@ EvtScript N(EVS_StartTexPanner0) = { }; EvtScript N(EVS_StartTexPanner1) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_yougan, TEX_PANNER_1) Call(SetTexPanner, MODEL_o640, TEX_PANNER_1) Thread @@ -158,7 +158,7 @@ EvtScript N(EVS_Main) = { Call(TranslateModel, MODEL_yougan, 0, 40, 0) Set(MV_GlowIntensity, 0) Thread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(N(ApplyLavaGlowLighting), LAVA_GLOW_MODE_2, NULL) EndThread Thread diff --git a/src/world/area_kzn/kzn_09/npc.c b/src/world/area_kzn/kzn_09/npc.c index f985af7204..d48bcbf8fc 100644 --- a/src/world/area_kzn/kzn_09/npc.c +++ b/src/world/area_kzn/kzn_09/npc.c @@ -233,7 +233,7 @@ NpcData N(NpcData_PassiveNPCs)[] = { .yaw = 90, .init = &N(EVS_Kolorado_Init), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -244,7 +244,7 @@ NpcData N(NpcData_PassiveNPCs)[] = { .yaw = 90, .init = &N(EVS_Dummy_Init), .settings = &N(NpcSettings_Zipline), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, diff --git a/src/world/area_kzn/kzn_10/tromp.c b/src/world/area_kzn/kzn_10/tromp.c index 970bf161a8..ff5f980c66 100644 --- a/src/world/area_kzn/kzn_10/tromp.c +++ b/src/world/area_kzn/kzn_10/tromp.c @@ -51,7 +51,7 @@ EvtScript N(EVS_SpinyTromp_ManageCamera) = { }; EvtScript N(D_80241224_C7F3A4) = { - SetGroup(EVT_GROUP_0A) + SetGroup(EVT_GROUP_PASSIVE_NPC) Loop(5) PlayEffect(EFFECT_DUST, 1, -430, 100, 0, 30) Wait(2) @@ -85,7 +85,7 @@ EvtScript N(EVS_SpinyTromp_ShakeCam) = { }; EvtScript N(EVS_SetupSpinyTromp) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(SetGroupVisibility, MODEL_goron, MODEL_GROUP_HIDDEN) Call(EnableModel, MODEL_me, FALSE) Call(TranslateGroup, MODEL_goron, 0, 0, 0) diff --git a/src/world/area_kzn/kzn_11/main.c b/src/world/area_kzn/kzn_11/main.c index 2ceba2a6dd..3f362e6d10 100644 --- a/src/world/area_kzn/kzn_11/main.c +++ b/src/world/area_kzn/kzn_11/main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_StartTexPanners_Lava) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_yougan1_1, TEX_PANNER_2) Call(EnableTexPanning, MODEL_toro, TRUE) Call(EnableTexPanning, MODEL_poko, TRUE) diff --git a/src/world/area_kzn/kzn_11/platforms.c b/src/world/area_kzn/kzn_11/platforms.c index 85733123bf..45c187f86a 100644 --- a/src/world/area_kzn/kzn_11/platforms.c +++ b/src/world/area_kzn/kzn_11/platforms.c @@ -40,7 +40,7 @@ API_CALLABLE(N(IsPartnerLakilester)) { } EvtScript N(EVS_UpdateLeftPlatform) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(ParentColliderToModel, COLLIDER_o67, MODEL_o67) Call(ParentColliderToModel, COLLIDER_o68, MODEL_o68) Call(ParentColliderToModel, COLLIDER_o69, MODEL_o69) @@ -105,7 +105,7 @@ EvtScript N(EVS_UpdateLeftPlatform) = { }; EvtScript N(EVS_UpdateRightPlatform) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(ParentColliderToModel, COLLIDER_o26, MODEL_o26) Call(ParentColliderToModel, COLLIDER_o27, MODEL_o27) Call(ParentColliderToModel, COLLIDER_o28, MODEL_o28) diff --git a/src/world/area_kzn/kzn_17/npc.c b/src/world/area_kzn/kzn_17/npc.c index 9956f86464..63e1acbabc 100644 --- a/src/world/area_kzn/kzn_17/npc.c +++ b/src/world/area_kzn/kzn_17/npc.c @@ -41,7 +41,7 @@ EvtScript N(EVS_Kolorado_TrompPanic) = { }; EvtScript N(EVS_Kolorado_TrompImpact) = { - Call(SetEnemyFlagBits, NPC_Kolorado, ENEMY_FLAG_400000, 1) + Call(SetEnemyFlagBits, NPC_Kolorado, ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, TRUE) Call(SetNpcRotationPivot, NPC_Kolorado, 13) Call(SetNpcRotation, NPC_Kolorado, 0, 0, 250) Call(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_HurtStill) @@ -66,7 +66,7 @@ EvtScript N(EVS_Kolorado_TrompImpact) = { EvtScript N(EVS_Kolorado_HurtInit) = { Call(SetNpcPos, NPC_Kolorado, 447, 0, 70) Call(SetNpcYaw, NPC_Kolorado, 270) - Call(SetEnemyFlagBits, NPC_Kolorado, ENEMY_FLAG_400000, 1) + Call(SetEnemyFlagBits, NPC_Kolorado, ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, TRUE) Call(SetNpcRotationPivot, NPC_Kolorado, 13) Call(SetNpcRotation, NPC_Kolorado, 0, 0, 250) Call(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_HurtStill) @@ -139,7 +139,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, diff --git a/src/world/area_kzn/kzn_17/tromp.c b/src/world/area_kzn/kzn_17/tromp.c index 2e86db95e9..e59e9fc380 100644 --- a/src/world/area_kzn/kzn_17/tromp.c +++ b/src/world/area_kzn/kzn_17/tromp.c @@ -46,7 +46,7 @@ EvtScript N(EVS_SpinyTromp_ShakeCam) = { }; EvtScript N(EVS_SetupSpinyTromp) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) IfGe(GB_StoryProgress, STORY_CH5_HIDDEN_PASSAGE_OPEN) Call(SetGroupVisibility, MODEL_goron, MODEL_GROUP_HIDDEN) Call(EnableModel, MODEL_me, FALSE) diff --git a/src/world/area_kzn/kzn_18/main.c b/src/world/area_kzn/kzn_18/main.c index ff8482ec8f..3c5192d753 100644 --- a/src/world/area_kzn/kzn_18/main.c +++ b/src/world/area_kzn/kzn_18/main.c @@ -18,7 +18,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_StartTexPanners_Lava) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(EnableTexPanning, MODEL_yougan1_1, TRUE) Call(EnableTexPanning, MODEL_off1, TRUE) Call(EnableTexPanning, MODEL_toro, TRUE) diff --git a/src/world/area_kzn/kzn_18/npc.c b/src/world/area_kzn/kzn_18/npc.c index f85c8dd46a..86488cceb2 100644 --- a/src/world/area_kzn/kzn_18/npc.c +++ b/src/world/area_kzn/kzn_18/npc.c @@ -149,7 +149,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -161,7 +161,7 @@ NpcData N(NpcData_Piranha) = { .yaw = 270, .init = &N(EVS_NpcInit_Piranha), .settings = &N(NpcSettings_PutridPiranhaSentinel), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = PIRANHA_NO_DROPS, .animations = PIRANHA_SENTINEL_ANIMS, }; diff --git a/src/world/area_kzn/kzn_19/main.c b/src/world/area_kzn/kzn_19/main.c index 817f4cf19d..3e2a61b1f0 100644 --- a/src/world/area_kzn/kzn_19/main.c +++ b/src/world/area_kzn/kzn_19/main.c @@ -99,7 +99,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_StartTexPanners_Lava) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_yougan1_1, TEX_PANNER_2) Call(EnableTexPanning, MODEL_toro, TRUE) Call(EnableTexPanning, MODEL_poko, TRUE) @@ -139,7 +139,7 @@ EvtScript N(EVS_StartTexPanners_Lava) = { }; EvtScript N(EVS_UpdateLavaWaves) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Loop(0) Call(MakeLerp, 0, 180, 40, EASING_COS_IN) Loop(0) diff --git a/src/world/area_kzn/kzn_19/npc.c b/src/world/area_kzn/kzn_19/npc.c index 2fd69f94ed..c5607cd9e1 100644 --- a/src/world/area_kzn/kzn_19/npc.c +++ b/src/world/area_kzn/kzn_19/npc.c @@ -543,7 +543,7 @@ EvtScript N(EVS_NpcDefeat_LavaPiranha) = { Call(GetBattleOutcome, LVar0) Switch(LVar0) CaseEq(OUTCOME_PLAYER_WON) - Call(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_2, TRUE) + Call(SetEncounterStatusFlags, ENCOUNTER_FLAG_CANT_SKIP_WIN_DELAY, TRUE) Call(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) Call(SetPlayerPos, 125, 25, -35) Call(SetNpcPos, NPC_PARTNER, 100, 25, -35) @@ -621,7 +621,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -632,7 +632,7 @@ NpcData N(NpcData_Misstar) = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .tattle = MSG_NpcTattle_Misstar, @@ -656,7 +656,7 @@ NpcData N(NpcData_LavaPiranha)[] = { .yaw = 270, .init = &N(EVS_NpcInit_LavaPiranha), .settings = &N(NpcSettings_LavaPiranhaHead), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = LAVA_PIRANHA_DROPS, .animations = LAVA_PIRANHA_HEAD_ANIMS, .extraAnimations = N(ExtraAnims_LavaPiranha), @@ -668,7 +668,7 @@ NpcData N(NpcData_LavaPiranha)[] = { .yaw = 270, .init = &N(EVS_NpcInit_LavaBud), .settings = &N(NpcSettings_LavaPiranhaHead), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = LAVA_PIRANHA_DROPS, .animations = LAVA_PIRANHA_BUD_ANIMS, .extraAnimations = N(ExtraAnims_LavaBud), @@ -680,7 +680,7 @@ NpcData N(NpcData_LavaPiranha)[] = { .yaw = 270, .init = &N(EVS_NpcInit_LavaBud), .settings = &N(NpcSettings_LavaPiranhaHead), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = LAVA_PIRANHA_DROPS, .animations = LAVA_PIRANHA_BUD_ANIMS, .extraAnimations = N(ExtraAnims_LavaBud), diff --git a/src/world/area_kzn/kzn_20/main.c b/src/world/area_kzn/kzn_20/main.c index c488795198..8f83f7d3e8 100644 --- a/src/world/area_kzn/kzn_20/main.c +++ b/src/world/area_kzn/kzn_20/main.c @@ -14,7 +14,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_UpdateTexPan_Lava) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(EnableTexPanning, MODEL_yu, TRUE) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_1) @@ -77,7 +77,7 @@ EvtScript N(EVS_InterruptPartnersInLava) = { }; EvtScript N(EVS_UpdateLavaWaves) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(EnableModel, MODEL_yu, FALSE) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_yu, COLLIDER_FLAGS_UPPER_MASK) Call(ParentColliderToModel, COLLIDER_yu, MODEL_yu) diff --git a/src/world/area_kzn/kzn_20/npc.c b/src/world/area_kzn/kzn_20/npc.c index 5fbe05be07..0b159fc8ee 100644 --- a/src/world/area_kzn/kzn_20/npc.c +++ b/src/world/area_kzn/kzn_20/npc.c @@ -33,7 +33,7 @@ EVT_LETTER_PROMPT(Kolorado, NPC_Kolorado, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle EVT_LETTER_REWARD(Kolorado); EvtScript N(EVS_SpawnFallingDust) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Loop(0) Call(RandInt, 100, LVar0) Sub(LVar0, 100) @@ -48,7 +48,7 @@ EvtScript N(EVS_SpawnFallingDust) = { }; EvtScript N(EVS_ShakingWorld) = { - SetGroup(EVT_GROUP_0A) + SetGroup(EVT_GROUP_PASSIVE_NPC) IfGe(GB_StoryProgress, STORY_CH5_OPENED_ESCAPE_ROUTE) Exec(N(EVS_SpawnFallingDust)) Else @@ -104,7 +104,7 @@ s32 N(Kolorado_Wander2)[] = { }; EvtScript N(EVS_Kolorado_CalmIdle) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Label(0) Call(RandInt, 1, LVar1) IfEq(LVar1, 0) @@ -135,7 +135,7 @@ EvtScript N(EVS_Kolorado_CalmIdle) = { Wait(20) EndLoop Wait(LVar2) - Goto(10) + Goto(10) Return End }; @@ -532,7 +532,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -544,7 +544,7 @@ NpcData N(NpcData_Misstar) = { .yaw = 270, .init = &N(EVS_NpcInit_Misstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .tattle = MSG_NpcTattle_Misstar, diff --git a/src/world/area_kzn/kzn_22/main.c b/src/world/area_kzn/kzn_22/main.c index d16e6bdb98..ca359eed69 100644 --- a/src/world/area_kzn/kzn_22/main.c +++ b/src/world/area_kzn/kzn_22/main.c @@ -11,7 +11,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_UpdateTexPan_LavaRiver) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(EnableTexPanning, MODEL_yougan1_1, TRUE) Set(LVar0, 0) Set(LVar1, 0) @@ -29,7 +29,7 @@ EvtScript N(EVS_UpdateTexPan_LavaRiver) = { }; EvtScript N(EVS_UpdateTexPan_LavaFall) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(EnableTexPanning, MODEL_yougan2_2, TRUE) Set(LVar0, 0) Set(LVar1, 0) @@ -73,7 +73,7 @@ API_CALLABLE(N(GetFloorCollider1)) { } EvtScript N(EVS_UpdateLavaLevel) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(SetTexPanner, MODEL_yu1, TEX_PANNER_2) Call(SetTexPanner, MODEL_yu, TEX_PANNER_2) Call(EnableModel, MODEL_yu, FALSE) diff --git a/src/world/area_kzn/kzn_22/npc.c b/src/world/area_kzn/kzn_22/npc.c index 7ff099ec39..facaadd5a9 100644 --- a/src/world/area_kzn/kzn_22/npc.c +++ b/src/world/area_kzn/kzn_22/npc.c @@ -269,7 +269,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -281,7 +281,7 @@ NpcData N(NpcData_Misstar) = { .yaw = 270, .init = &N(EVS_NpcInit_Misstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .tattle = MSG_NpcTattle_Misstar, diff --git a/src/world/area_kzn/kzn_23/main.c b/src/world/area_kzn/kzn_23/main.c index 8e60aa1654..52b2f50f08 100644 --- a/src/world/area_kzn/kzn_23/main.c +++ b/src/world/area_kzn/kzn_23/main.c @@ -24,7 +24,7 @@ EvtScript N(EVS_ModulateLavaLevel) = { EvtScript N(EVS_RaiseLava) = { Exec(N(EVS_ModulateLavaLevel)) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_yu, TEX_PANNER_0) Set(LVar0, 0) Set(LVar1, 0) diff --git a/src/world/area_kzn/kzn_23/npc.c b/src/world/area_kzn/kzn_23/npc.c index 7691d0da99..597f2f6c0f 100644 --- a/src/world/area_kzn/kzn_23/npc.c +++ b/src/world/area_kzn/kzn_23/npc.c @@ -282,7 +282,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -294,7 +294,7 @@ NpcData N(NpcData_Misstar) = { .yaw = 270, .init = &N(EVS_NpcInit_Misstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, }; diff --git a/src/world/area_mac/mac_00/epilogue_npc.c b/src/world/area_mac/mac_00/epilogue_npc.c index 1fc3c12ce1..3f4ec06bac 100644 --- a/src/world/area_mac/mac_00/epilogue_npc.c +++ b/src/world/area_mac/mac_00/epilogue_npc.c @@ -151,7 +151,7 @@ NpcData N(NpcData_Luigi_Epilogue) = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, .settings = &N(NpcSettings_Luigi_Epilogue), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = LUIGI_ANIMS, .extraAnimations = N(ExtraAnims_Luigi_Epilogue), @@ -185,7 +185,7 @@ NpcData N(NpcData_GoombaFamilypa_Epilogue)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Goompapa_Epilogue), .settings = &N(NpcSettings_GoombaFamily_Epilogue), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT, .drops = NO_DROPS, .animations = GOOMPAPA_ANIMS, .extraAnimations = N(ExtraAnims_Goompapa_Epilogue), @@ -197,7 +197,7 @@ NpcData N(NpcData_GoombaFamilypa_Epilogue)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Goomama_Epilogue), .settings = &N(NpcSettings_GoombaFamily_Epilogue), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT, .drops = NO_DROPS, .animations = GOOMAMA_ANIMS, .extraAnimations = N(ExtraAnims_Goomama_Epilogue), @@ -209,7 +209,7 @@ NpcData N(NpcData_GoombaFamilypa_Epilogue)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Gooma_Epilogue), .settings = &N(NpcSettings_GoombaFamily_Epilogue), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT, .drops = NO_DROPS, .animations = GOOMA_ANIMS, .extraAnimations = N(ExtraAnims_Gooma_Epilogue), @@ -320,7 +320,7 @@ NpcData N(NpcData_DojoMembers_Epilogue)[] = { .yaw = 225, .init = &N(EVS_NpcInit_TheMaster_Epilogue), .settings = &N(NpcSettings_Luigi_Epilogue), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT, .drops = NO_DROPS, .animations = { .idle = ANIM_TheMaster_Idle, @@ -349,7 +349,7 @@ NpcData N(NpcData_DojoMembers_Epilogue)[] = { .yaw = 45, .init = &N(EVS_NpcInit_Chan_Epilogue), .settings = &N(NpcSettings_Luigi_Epilogue), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT, .drops = NO_DROPS, .animations = { .idle = ANIM_Chan_Idle, @@ -363,7 +363,7 @@ NpcData N(NpcData_DojoMembers_Epilogue)[] = { .yaw = 45, .init = &N(EVS_NpcInit_Lee_Epilogue), .settings = &N(NpcSettings_Luigi_Epilogue), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT, .drops = NO_DROPS, .animations = { .idle = ANIM_Lee_Idle, @@ -387,7 +387,7 @@ NpcData N(NpcData_Toad_01_Epilogue)[] = { .yaw = 223, .init = &N(EVS_NpcInit_Toad_01_Epilogue), .settings = &N(NpcSettings_Toad_Stationary_Epilogue), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = { .idle = ANIM_HarryT_Idle, @@ -405,7 +405,7 @@ NpcData N(NpcData_Toad_01_Epilogue)[] = { .yaw = 43, .init = &N(EVS_NpcInit_HarryT_Epilogue), .settings = &N(NpcSettings_Toad_Stationary_Epilogue), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = { .idle = ANIM_HarryT_Idle, diff --git a/src/world/area_mac/mac_00/intro_npc.c b/src/world/area_mac/mac_00/intro_npc.c index fe7d656060..bd8c090dba 100644 --- a/src/world/area_mac/mac_00/intro_npc.c +++ b/src/world/area_mac/mac_00/intro_npc.c @@ -40,7 +40,7 @@ NpcData N(NpcData_IntroNPCs)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, .settings = &N(NpcSettings_Luigi_Intro), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = LUIGI_ANIMS, }, @@ -49,7 +49,7 @@ NpcData N(NpcData_IntroNPCs)[] = { .pos = { -150.0f, 0.0f, -275.0f }, .yaw = 90, .settings = &N(NpcSettings_Toad_Stationary_Intro), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_GateGuardian, @@ -76,7 +76,7 @@ NpcData N(NpcData_IntroNPCs)[] = { } }, .settings = &N(NpcSettings_Toad_Wander_Intro), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_ShopLoiterer, @@ -86,7 +86,7 @@ NpcData N(NpcData_IntroNPCs)[] = { .pos = { 424.0f, 20.0f, -85.0f }, .yaw = 270, .settings = &N(NpcSettings_Toad_Stationary_Intro), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_MAC_DojoSpectator, @@ -97,7 +97,7 @@ NpcData N(NpcData_IntroNPCs)[] = { .yaw = 45, .init = &N(EVS_NpcInit_Chan_Intro), .settings = &N(NpcSettings_Toad_Stationary_Intro), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = { .idle = ANIM_Chan_Idle, @@ -111,7 +111,7 @@ NpcData N(NpcData_IntroNPCs)[] = { .yaw = 45, .init = &N(EVS_NpcInit_Lee_Intro), .settings = &N(NpcSettings_Toad_Stationary_Intro), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = { .idle = ANIM_Lee_Idle, diff --git a/src/world/area_mac/mac_00/npc.c b/src/world/area_mac/mac_00/npc.c index 3dca696068..877f10f841 100644 --- a/src/world/area_mac/mac_00/npc.c +++ b/src/world/area_mac/mac_00/npc.c @@ -92,7 +92,7 @@ EvtScript N(EVS_NpcHit_ShyGuy_03) = { Call(PlaySoundAtNpc, NPC_SELF, SOUND_SHY_GUY_OUCH, SOUND_SPACE_DEFAULT) Set(GF_MAC00_ShyGuyChasedFromShop, TRUE) Call(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) - Call(SetEnemyFlagBits, NPC_ShyGuy_02, ENEMY_FLAG_CANT_INTERACT, 1) + Call(SetEnemyFlagBits, NPC_ShyGuy_02, ENEMY_FLAG_CANT_INTERACT, TRUE) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_NpcAI_ShyGuy_03))) Return End @@ -191,7 +191,7 @@ NpcData N(NpcData_ShyGuy_01)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuyThief), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -201,7 +201,7 @@ NpcData N(NpcData_ShyGuy_01)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy_02), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, .tattle = MSG_NpcTattle_MAC_ShyGuyShopOwner, @@ -212,7 +212,7 @@ NpcData N(NpcData_ShyGuy_01)[] = { .yaw = 270, .init = &N(EVS_NpcInit_GardenShyGuy1), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, .tattle = MSG_NpcTattle_MAC_ShyGuyShopOwner, @@ -225,7 +225,7 @@ NpcData N(NpcData_RussT) = { .yaw = 119, .init = &N(EVS_NpcInit_RussT), .settings = &N(NpcSettings_RussT), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = { .idle = ANIM_RussT_Idle, @@ -255,7 +255,7 @@ NpcData N(NpcData_Toad_01)[] = { .yaw = 223, .init = &N(EVS_NpcInit_Toad_01), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = { .idle = ANIM_HarryT_Idle, @@ -272,7 +272,7 @@ NpcData N(NpcData_Toad_01)[] = { .yaw = 223, .init = &N(EVS_NpcInit_Toad_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = { .idle = ANIM_HarryT_Idle, @@ -316,7 +316,7 @@ NpcData N(NpcData_Toad_03)[] = { .yaw = 225, .init = &N(EVS_NpcInit_TheMaster), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_TheMaster_Idle, @@ -345,7 +345,7 @@ NpcData N(NpcData_Toad_03)[] = { .yaw = 45, .init = &N(EVS_NpcInit_Chan), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_Chan_Idle, @@ -359,7 +359,7 @@ NpcData N(NpcData_Toad_03)[] = { .yaw = 45, .init = &N(EVS_NpcInit_Lee), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_Lee_Idle, @@ -389,7 +389,7 @@ NpcData N(NpcData_Waterfront_Family)[] = { .yaw = 133, .init = &N(EVS_NpcInit_WaterfrontDad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = TOAD_GREEN_ANIMS, .tattle = MSG_NpcTattle_MAC_LuckyCastleWorker, @@ -400,7 +400,7 @@ NpcData N(NpcData_Waterfront_Family)[] = { .yaw = 133, .init = &N(EVS_NpcInit_WaterfrontMom), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = TOADETTE_ORANGE_ANIMS, .tattle = MSG_NpcTattle_MAC_Homemaker, @@ -411,7 +411,7 @@ NpcData N(NpcData_Waterfront_Family)[] = { .yaw = 313, .init = &N(EVS_NpcInit_WaterfrontKid1), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = TOAD_KID_GREEN_ANIMS, .tattle = MSG_NpcTattle_MAC_FriendlyToadKid, @@ -422,7 +422,7 @@ NpcData N(NpcData_Waterfront_Family)[] = { .yaw = 313, .init = &N(EVS_NpcInit_WaterfrontKid2), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = TOAD_KID_GREEN_ANIMS, .tattle = MSG_NpcTattle_MAC_PowerHungryToadKid, @@ -435,7 +435,7 @@ NpcData N(NpcData_PrizeToad) = { .yaw = 90, .init = &N(EVS_NpcInit_TradingToad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = { .idle = ANIM_Toad_Pink_Idle, diff --git a/src/world/area_mac/mac_00/npc/dojo_members.inc.c b/src/world/area_mac/mac_00/npc/dojo_members.inc.c index 58b308224c..0d9a42d36b 100644 --- a/src/world/area_mac/mac_00/npc/dojo_members.inc.c +++ b/src/world/area_mac/mac_00/npc/dojo_members.inc.c @@ -63,7 +63,7 @@ EvtScript N(EVS_NpcAI_Chan) = { }; EvtScript N(EVS_NpcDefeat_Chan) = { - Call(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_4, TRUE) + Call(SetEncounterStatusFlags, ENCOUNTER_FLAG_SKIP_FLEE_DROPS, TRUE) Call(N(ResetBackgroundPostBattle)) Thread Call(SetNpcAnimation, NPC_SELF, ANIM_Chan_Walk) @@ -131,7 +131,7 @@ EvtScript N(EVS_NpcAI_Lee) = { }; EvtScript N(EVS_NpcDefeat_Lee) = { - Call(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_4, TRUE) + Call(SetEncounterStatusFlags, ENCOUNTER_FLAG_SKIP_FLEE_DROPS, TRUE) Call(N(ResetBackgroundPostBattle)) Thread Call(SetNpcAnimation, NPC_SELF, ANIM_Lee_Walk) @@ -245,7 +245,7 @@ EvtScript N(EVS_NpcIdle_TheMaster) = { }; EvtScript N(EVS_NpcDefeat_Dojo) = { - Call(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_4, TRUE) + Call(SetEncounterStatusFlags, ENCOUNTER_FLAG_SKIP_FLEE_DROPS, TRUE) Call(N(ResetBackgroundPostBattle)) Call(GetBattleOutcome, LVar0) Call(SetSelfVar, VAR_BATTLE_OUTCOME, LVar0) diff --git a/src/world/area_mac/mac_00/shared_npc.c b/src/world/area_mac/mac_00/shared_npc.c index 081f4194a3..24d9fc724f 100644 --- a/src/world/area_mac/mac_00/shared_npc.c +++ b/src/world/area_mac/mac_00/shared_npc.c @@ -580,7 +580,7 @@ NpcData N(NpcData_SharedTownsfolk)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toad_04), .settings = &N(NpcSettings_Toad_Stationary_Shared), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_GateGuardian, @@ -608,7 +608,7 @@ NpcData N(NpcData_SharedTownsfolk)[] = { }, .init = &N(EVS_NpcInit_Toad_05), .settings = &N(NpcSettings_Toad_Wander_Shared), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_ShopLoiterer, @@ -633,7 +633,7 @@ NpcData N(NpcData_SharedTownsfolk)[] = { }, .init = &N(EVS_NpcInit_Toad_06), .settings = &N(NpcSettings_Toad_Patrol_Shared), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT, .drops = NO_DROPS, .animations = TOAD_YELLOW_ANIMS, .tattle = MSG_NpcTattle_MAC_NewsEnthusiast, @@ -644,7 +644,7 @@ NpcData N(NpcData_SharedTownsfolk)[] = { .yaw = 90, .init = &N(EVS_NpcInit_FickleLover), .settings = &N(NpcSettings_Toad_Stationary_Shared), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_MAC_FickleLovers, @@ -655,7 +655,7 @@ NpcData N(NpcData_SharedTownsfolk)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShamelessLover), .settings = &N(NpcSettings_Toad_Stationary_Shared), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_MAC_ShamelessLover, @@ -666,7 +666,7 @@ NpcData N(NpcData_SharedTownsfolk)[] = { .yaw = 90, .init = &N(EVS_NpcInit_KrisT), .settings = &N(NpcSettings_Toad_Stationary_Shared), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT, .drops = NO_DROPS, .animations = TOADETTE_GREEN_ANIMS, .tattle = MSG_NpcTattle_MAC_ThreeSisters_Eldest, @@ -677,7 +677,7 @@ NpcData N(NpcData_SharedTownsfolk)[] = { .yaw = 180, .init = &N(EVS_NpcInit_MissT), .settings = &N(NpcSettings_Toad_Stationary_Shared), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT, .drops = NO_DROPS, .animations = TOADETTE_ORANGE_ANIMS, .tattle = MSG_NpcTattle_MAC_ThreeSisters_Middle, @@ -688,7 +688,7 @@ NpcData N(NpcData_SharedTownsfolk)[] = { .yaw = 270, .init = &N(EVS_NpcInit_FelissaT), .settings = &N(NpcSettings_Toad_Stationary_Shared), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT, .drops = NO_DROPS, .animations = TOADETTE_PURPLE_ANIMS, .tattle = MSG_NpcTattle_MAC_ThreeSisters_Youngest, @@ -699,7 +699,7 @@ NpcData N(NpcData_SharedTownsfolk)[] = { .yaw = 270, .init = &N(EVS_NpcInit_DojoSpectator), .settings = &N(NpcSettings_Toad_Stationary_Shared), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_MAC_DojoSpectator, @@ -710,7 +710,7 @@ NpcData N(NpcData_SharedTownsfolk)[] = { .yaw = 270, .init = &N(EVS_NpcInit_DojoFan), .settings = &N(NpcSettings_Toad_Stationary_Shared), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT, .drops = NO_DROPS, .animations = TOAD_YELLOW_ANIMS, .tattle = MSG_NpcTattle_MAC_DojoFanToad, diff --git a/src/world/area_mac/mac_01/epilogue_npc.c b/src/world/area_mac/mac_01/epilogue_npc.c index b1adca8baf..c11ec4ab91 100644 --- a/src/world/area_mac/mac_01/epilogue_npc.c +++ b/src/world/area_mac/mac_01/epilogue_npc.c @@ -305,7 +305,7 @@ NpcData N(NpcData_Dryites)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Dryite_01), .settings = &N(NpcSettings_Dryite), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = DRYITE_GREEN_ANIMS, .extraAnimations = N(ExtraAnims_Dryite), @@ -316,7 +316,7 @@ NpcData N(NpcData_Dryites)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Dryite_02), .settings = &N(NpcSettings_Dryite), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = DRYITE_GREEN_ANIMS, .extraAnimations = N(ExtraAnims_Dryite), @@ -345,7 +345,7 @@ NpcData N(NpcData_Artists)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Chanterelle), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_Chanterelle_Idle, @@ -374,7 +374,7 @@ NpcData N(NpcData_Artists)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Poet), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_Musician_Poet_Idle, @@ -403,7 +403,7 @@ NpcData N(NpcData_Artists)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Composer), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_Musician_Composer_Idle, diff --git a/src/world/area_mac/mac_01/intro_npc.c b/src/world/area_mac/mac_01/intro_npc.c index 23184c1ddb..104b77990f 100644 --- a/src/world/area_mac/mac_01/intro_npc.c +++ b/src/world/area_mac/mac_01/intro_npc.c @@ -12,7 +12,7 @@ NpcData N(NpcData_IntroNPCs)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, .settings = &N(NpcSettings_Luigi_Intro), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = LUIGI_ANIMS, }, diff --git a/src/world/area_mac/mac_01/main.c b/src/world/area_mac/mac_01/main.c index 3d44c9fe74..c47f506fba 100644 --- a/src/world/area_mac/mac_01/main.c +++ b/src/world/area_mac/mac_01/main.c @@ -3,7 +3,7 @@ EvtScript N(EVS_ExitWalk_mac_00_1) = EVT_EXIT_WALK(60, mac_01_ENTRY_0, "mac_00", mac_00_ENTRY_1); EvtScript N(EVS_ExitWalk_nok_11_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, mac_01_ENTRY_1) Exec(ExitWalk) IfEq(GF_StartedChapter1, FALSE) @@ -32,7 +32,7 @@ s32 N(Models_CastleGateR)[] = { }; EvtScript N(EVS_ExitDoors_osr_01_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_LARGE) Set(LVar0, 2) @@ -167,7 +167,7 @@ EvtScript N(EVS_Main) = { Wait(1) Call(EnableTexPanning, MODEL_hikari, TRUE) Thread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Set(LVar0, 0) Set(LVar1, 0) Label(0) diff --git a/src/world/area_mac/mac_01/npc.c b/src/world/area_mac/mac_01/npc.c index 936da2403e..f04be3c2dd 100644 --- a/src/world/area_mac/mac_01/npc.c +++ b/src/world/area_mac/mac_01/npc.c @@ -524,13 +524,13 @@ EvtScript N(EVS_MerlonBargeOut) = { EvtScript N(D_80250D14_811594) = { Call(AwaitPlayerApproach, -130, -110, 150) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, TRUE) Call(SetNpcFlagBits, NPC_Merlon, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_GRAVITY, TRUE) Call(NpcMoveTo, NPC_Merlon, 0, 0, 0) Call(NpcMoveTo, NPC_Merlon, 410, 0, 0) Call(SetNpcPos, NPC_Merlon, 410, 0, 0) Call(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Idle) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_CANT_INTERACT, FALSE) Call(SetNpcFlagBits, NPC_Merlon, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_GRAVITY, FALSE) Return End @@ -1069,7 +1069,7 @@ NpcData N(NpcData_Merlon) = { .yaw = 30, .init = &N(EVS_NpcInit_Merlon), .settings = &N(NpcSettings_Merlon), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_Merlon_Idle, @@ -1084,7 +1084,7 @@ NpcData N(NpcData_DarkToads)[] = { .yaw = 270, .init = &N(EVS_NpcInit_DarkToad_01), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_DarkToad_Red_Idle, @@ -1097,7 +1097,7 @@ NpcData N(NpcData_DarkToads)[] = { .yaw = 270, .init = &N(EVS_NpcInit_DarkToad_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_DarkToad_Black_Idle, @@ -1110,7 +1110,7 @@ NpcData N(NpcData_DarkToads)[] = { .yaw = 270, .init = &N(EVS_NpcInit_DarkToad_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_DarkToad_Yellow_Idle, @@ -1123,7 +1123,7 @@ NpcData N(NpcData_DarkToads)[] = { .yaw = 270, .init = &N(EVS_NpcInit_DarkToad_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_DarkToad_Green_Idle, @@ -1146,7 +1146,7 @@ NpcData N(NpcData_KoopaBros)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Black_Idle, @@ -1173,7 +1173,7 @@ NpcData N(NpcData_KoopaBros)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Red_Idle, @@ -1200,7 +1200,7 @@ NpcData N(NpcData_KoopaBros)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Yellow_Idle, @@ -1227,7 +1227,7 @@ NpcData N(NpcData_KoopaBros)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Green_Idle, @@ -1256,7 +1256,7 @@ NpcData N(NpcData_Ninji) = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, .settings = &N(NpcSettings_Ninji), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = { .idle = ANIM_Ninji_Idle, @@ -1936,7 +1936,7 @@ EvtScript N(EVS_NpcHit_ShyGuy_02) = { Set(GF_MAC01_ChasedShyGuyFromToadHouse, TRUE) Set(AF_MAC_43, TRUE) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_NpcAI_ShyGuy_02))) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, TRUE) Return End }; @@ -2267,7 +2267,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 300, .init = &N(EVS_NpcInit_Postmaster), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT, .drops = NO_DROPS, .animations = { .idle = ANIM_Postmaster_Idle, @@ -2319,7 +2319,7 @@ NpcData N(NpcData_Twink) = { .yaw = 274, .init = &N(EVS_NpcInit_Twink), .settings = &N(NpcSettings_Twink), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_Twink), @@ -2342,7 +2342,7 @@ NpcData N(NpcData_ShyGuys)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy_02), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_IGNORE_TOUCH, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -2352,7 +2352,7 @@ NpcData N(NpcData_ShyGuys)[] = { .yaw = 270, .init = &N(EVS_NpcInit_GardenShyGuy1), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_IGNORE_TOUCH, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -2362,7 +2362,7 @@ NpcData N(NpcData_ShyGuys)[] = { .yaw = 270, .init = &N(EVS_NpcInit_GardenShyGuy2), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_IGNORE_TOUCH, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, 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 f24d205b8d..25bce869ea 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 @@ -118,7 +118,7 @@ EvtScript N(EVS_NpcHit_GardenShyGuy1) = { EndIf Set(GF_MAC01_ChasedShyGuysFromGardenA, TRUE) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_GardenShyGuy_RunAway))) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, TRUE) Return End }; @@ -130,7 +130,7 @@ EvtScript N(EVS_NpcHit_GardenShyGuy2) = { EndIf Set(GF_MAC01_ChasedShyGuysFromGardenB, TRUE) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_GardenShyGuy_RunAway))) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, TRUE) Return End }; @@ -589,7 +589,7 @@ EvtScript N(EVS_NpcIdle_MinhT) = { Add(LVar0, GF_MAC01_ChasedShyGuysFromGardenB) IfEq(LVar0, 2) Call(SetNpcAnimation, NPC_SELF, ANIM_MinhT_Idle) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_400000, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, FALSE) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_NpcAI_MinhT))) BreakLoop EndIf @@ -625,7 +625,7 @@ EvtScript N(EVS_NpcInit_MinhT) = { Switch(GB_StoryProgress) CaseRange(STORY_CH3_STAR_SPRIT_DEPARTED, STORY_CH4_STAR_SPIRIT_RESCUED) Set(GF_MAC01_ShyGuysTramplingGarden, TRUE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_400000, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, TRUE) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_MinhT))) EndSwitch Call(SetNpcAnimation, NPC_SELF, ANIM_MinhT_Idle) @@ -637,7 +637,7 @@ EvtScript N(EVS_NpcInit_MinhT) = { // FLOWER GATE EvtScript N(EVS_ExitFlowerGate) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Wait(2) Call(GetPlayerActionState, LVar3) diff --git a/src/world/area_mac/mac_01/rooms.c b/src/world/area_mac/mac_01/rooms.c index a04387b6b7..25ad89161f 100644 --- a/src/world/area_mac/mac_01/rooms.c +++ b/src/world/area_mac/mac_01/rooms.c @@ -176,7 +176,7 @@ EvtScript N(EVS_RoomListener_MerlonHouse) = { }; EvtScript N(EVS_SpinRoof) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Set(LVar0, 0) Label(0) AddF(LVar0, Float(3.0)) diff --git a/src/world/area_mac/mac_02/main.c b/src/world/area_mac/mac_02/main.c index 360807b902..9275fbf2a0 100644 --- a/src/world/area_mac/mac_02/main.c +++ b/src/world/area_mac/mac_02/main.c @@ -24,7 +24,7 @@ EvtScript N(EVS_GotoMap_tik_15_1) = { }; EvtScript N(EVS_SetupPipe) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Set(LVarA, LVar0) Set(LVarB, LVar1) Set(LVarC, LVar2) diff --git a/src/world/area_mac/mac_03/npc.c b/src/world/area_mac/mac_03/npc.c index c129a82d57..fca40e516d 100644 --- a/src/world/area_mac/mac_03/npc.c +++ b/src/world/area_mac/mac_03/npc.c @@ -318,7 +318,7 @@ EvtScript N(EVS_NpcInit_Toad_02) = { }; EvtScript N(EVS_NpcInteract_ToadKid_02) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_FULL) Call(EnableNpcAI, NPC_ToadKid_01, FALSE) Call(EnableNpcAI, NPC_ToadKid_02, FALSE) @@ -393,7 +393,7 @@ EvtScript N(EVS_NpcInteract_ToadKid_02) = { Call(SetNpcAnimation, NPC_ToadKid_02, LVar3) Call(EnableNpcAI, NPC_ToadKid_01, TRUE) Call(EnableNpcAI, NPC_ToadKid_02, TRUE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; @@ -586,7 +586,7 @@ EvtScript N(EVS_NpcHit_ShyGuy) = { Call(PlaySoundAtNpc, NPC_SELF, SOUND_SHY_GUY_OUCH, SOUND_SPACE_DEFAULT) Set(GF_MAC03_ShyGuyChasedOff, TRUE) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_NpcAI_ShyGuy))) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, TRUE) Return End }; @@ -751,7 +751,7 @@ NpcData N(NpcData_Toads)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toad_03), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_LilOinkFan, @@ -765,7 +765,7 @@ NpcData N(NpcData_Toadette)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Toadette_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidA, @@ -776,7 +776,7 @@ NpcData N(NpcData_Toadette)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toadette_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidB, @@ -787,7 +787,7 @@ NpcData N(NpcData_Toadette)[] = { .yaw = 180, .init = &N(EVS_NpcInit_Toadette_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidC, @@ -800,7 +800,7 @@ NpcData N(NpcData_ShyGuy) = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_IGNORE_TOUCH, .drops = NO_DROPS, .animations = { .idle = ANIM_ShyGuy_Red_Anim01, @@ -841,7 +841,7 @@ NpcData N(NpcData_LilOinks)[] = { }, .init = &N(EVS_NpcInit_Toad_04), .settings = &N(NpcSettings_Toad_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, @@ -863,7 +863,7 @@ NpcData N(NpcData_LilOinks)[] = { }, .init = &N(EVS_NpcInit_Toad_04), .settings = &N(NpcSettings_Toad_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, @@ -885,7 +885,7 @@ NpcData N(NpcData_LilOinks)[] = { }, .init = &N(EVS_NpcInit_Toad_04), .settings = &N(NpcSettings_Toad_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, @@ -907,7 +907,7 @@ NpcData N(NpcData_LilOinks)[] = { }, .init = &N(EVS_NpcInit_Toad_04), .settings = &N(NpcSettings_Toad_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, @@ -929,7 +929,7 @@ NpcData N(NpcData_LilOinks)[] = { }, .init = &N(EVS_NpcInit_Toad_04), .settings = &N(NpcSettings_Toad_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, @@ -951,7 +951,7 @@ NpcData N(NpcData_LilOinks)[] = { }, .init = &N(EVS_NpcInit_Toad_04), .settings = &N(NpcSettings_Toad_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, @@ -973,7 +973,7 @@ NpcData N(NpcData_LilOinks)[] = { }, .init = &N(EVS_NpcInit_Toad_04), .settings = &N(NpcSettings_Toad_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, @@ -995,7 +995,7 @@ NpcData N(NpcData_LilOinks)[] = { }, .init = &N(EVS_NpcInit_Toad_04), .settings = &N(NpcSettings_Toad_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, @@ -1017,7 +1017,7 @@ NpcData N(NpcData_LilOinks)[] = { }, .init = &N(EVS_NpcInit_Toad_04), .settings = &N(NpcSettings_Toad_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, @@ -1039,7 +1039,7 @@ NpcData N(NpcData_LilOinks)[] = { }, .init = &N(EVS_NpcInit_Toad_04), .settings = &N(NpcSettings_Toad_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, @@ -1061,7 +1061,7 @@ NpcData N(NpcData_LilOinks)[] = { }, .init = &N(EVS_NpcInit_Toad_14), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, }, diff --git a/src/world/area_mac/mac_03/oinks.c b/src/world/area_mac/mac_03/oinks.c index 63d2b07a90..34b352ac86 100644 --- a/src/world/area_mac/mac_03/oinks.c +++ b/src/world/area_mac/mac_03/oinks.c @@ -178,7 +178,7 @@ EvtScript N(EVS_TurnCrank) = { EndIf Call(PlaySound, SOUND_FLOOR_SWITCH_ACTIVATE) Call(DisablePlayerInput, TRUE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(AddCoin, -LIL_OINK_COIN_COST) Wait(20) @@ -277,13 +277,13 @@ EvtScript N(EVS_TurnCrank) = { Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; EvtScript N(EVS_LilOinkExplanation) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetNpcSpeed, NPC_Toad_03, Float(4.0)) Call(SetNpcAnimation, NPC_Toad_03, ANIM_Toad_Red_Run) Call(NpcMoveTo, NPC_Toad_03, 157, -310, 0) @@ -393,7 +393,7 @@ EvtScript N(EVS_OpenCapsule) = { Return EndIf Call(DisablePlayerInput, TRUE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Set(MF_Unk_07, TRUE) SetF(LVar0, Float(1.0)) @@ -503,7 +503,7 @@ EvtScript N(EVS_OpenCapsule) = { Call(WaitForCam, CAM_DEFAULT, Float(1.0)) Call(PanToTarget, CAM_DEFAULT, 0, FALSE) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; @@ -532,7 +532,7 @@ EvtScript N(EVS_LilOinkFlee) = { EvtScript N(EVS_EnterPen) = { Call(DisablePlayerInput, TRUE) Call(func_802D2C14, 1) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deili, COLLIDER_FLAGS_UPPER_MASK) Call(PlaySoundAtCollider, COLLIDER_deili, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_DEFAULT) @@ -557,7 +557,7 @@ EvtScript N(EVS_EnterPen) = { EndLoop Call(PlaySoundAtCollider, COLLIDER_deili, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_DEFAULT) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deili, COLLIDER_FLAGS_UPPER_MASK) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(func_802D2C14, 0) Call(DisablePlayerInput, FALSE) IfEq(GB_MAC03_LilOinkCount, 0) @@ -578,14 +578,14 @@ EvtScript N(EVS_EnterPen) = { EndIf Wait(1) EndLoop - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(DisablePlayerInput, FALSE) Return End }; EvtScript N(EVS_ExitPen) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(DisablePlayerInput, TRUE) Call(func_802D2C14, 1) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliu, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/area_mac/mac_04/npc.c b/src/world/area_mac/mac_04/npc.c index ee8536c270..1cad3423ad 100644 --- a/src/world/area_mac/mac_04/npc.c +++ b/src/world/area_mac/mac_04/npc.c @@ -54,7 +54,7 @@ EvtScript N(EVS_TossTrainInToybox) = { }; EvtScript N(EVS_ItemPrompt_ToyTrain) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowKeyChoicePopup) Set(LVar2, LVar0) @@ -63,7 +63,7 @@ EvtScript N(EVS_ItemPrompt_ToyTrain) = { Call(ShowMessageAtScreenPos, MSG_Menus_Inspect_Toybox, 160, 40) EndIf Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf Call(DisablePlayerInput, TRUE) @@ -97,7 +97,7 @@ EvtScript N(EVS_ItemPrompt_ToyTrain) = { Call(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_OMO_TOYBOX_LID, SOUND_SPACE_DEFAULT) Call(CloseChoicePopup) Set(GB_StoryProgress, STORY_CH4_RETURNED_TOY_TRAIN) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Unbind Call(GotoMap, Ref("omo_03"), omo_03_ENTRY_6) Wait(100) 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 d429c4150c..cde7cd1fcf 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 @@ -125,7 +125,7 @@ EvtScript N(EVS_SuspiciousGuy_RunAway) = { }; EvtScript N(EVS_HiddenRoom_WaitForOuttaSight) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) IfNe(GB_StoryProgress, STORY_CH4_MET_WITH_TWINK) Return EndIf diff --git a/src/world/area_mac/mac_04/wish_scene.c b/src/world/area_mac/mac_04/wish_scene.c index bc116f4e06..0741f3afd4 100644 --- a/src/world/area_mac/mac_04/wish_scene.c +++ b/src/world/area_mac/mac_04/wish_scene.c @@ -42,7 +42,7 @@ NpcData N(NpcData_WishSceneToads)[] = { .yaw = 270, .init = &N(EVS_NpcInit_WishingToadKid), .settings = &N(NpcSettings_Toad_Stationary_Wish), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOAD_KID_RED_ANIMS, }, diff --git a/src/world/area_mac/mac_05/main.c b/src/world/area_mac/mac_05/main.c index cdc98328c3..93bfd42f58 100644 --- a/src/world/area_mac/mac_05/main.c +++ b/src/world/area_mac/mac_05/main.c @@ -12,7 +12,7 @@ API_CALLABLE(N(func_8024047C_8525EC)) { } EvtScript N(D_8024457C_8566EC) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Set(LVarC, 0) Label(0) IfGe(LVarC, 60) @@ -57,7 +57,7 @@ EvtScript N(D_80244648_8567B8) = { EvtScript N(EVS_ExitWalk_mac_04_1) = EVT_EXIT_WALK(60, mac_05_ENTRY_0, "mac_04", mac_04_ENTRY_1); EvtScript N(D_80244810_856980) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, mac_05_ENTRY_3) Exec(ExitWalk) Set(GB_StoryProgress, STORY_CH5_ENTERED_WHALE) @@ -97,7 +97,7 @@ EvtScript N(D_802448C4_856A34) = { Call(DisablePlayerPhysics, TRUE) Call(SetPlayerPos, -160, -10, 371) Call(SetNpcPos, NPC_PARTNER, -160, -10, 371) - Call(SetEnemyFlagBits, NPC_Whale, ENEMY_FLAG_CANT_INTERACT, 1) + Call(SetEnemyFlagBits, NPC_Whale, ENEMY_FLAG_CANT_INTERACT, TRUE) Call(DisablePartnerAI, 0) Call(InterruptUsePartner) Wait(10) @@ -122,7 +122,7 @@ EvtScript N(D_802448C4_856A34) = { Set(LVar0, Ref(N(EVS_BindExitTriggers))) ExecWait(EnterWalk) Call(SetNpcPos, NPC_Whale, -220, 10, 372) - Call(SetEnemyFlagBits, NPC_Whale, ENEMY_FLAG_CANT_INTERACT, 0) + Call(SetEnemyFlagBits, NPC_Whale, ENEMY_FLAG_CANT_INTERACT, FALSE) EndSwitch Return End diff --git a/src/world/area_mac/mac_05/npc.c b/src/world/area_mac/mac_05/npc.c index 8e02f8ad16..0a1e8834d6 100644 --- a/src/world/area_mac/mac_05/npc.c +++ b/src/world/area_mac/mac_05/npc.c @@ -1472,7 +1472,7 @@ EvtScript N(EVS_NpcInit_Fishmael) = { IfLt(GB_StoryProgress, STORY_CH3_STAR_SPIRIT_RESCUED) Call(BindNpcInteract, NPC_SELF, Ref(N(EVS_NpcInteract_Fuzzipede1))) Else - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_400000, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, FALSE) Call(BindNpcInteract, NPC_SELF, Ref(N(EVS_NpcInteract_Fishmael))) EndIf Return @@ -1486,7 +1486,7 @@ EvtScript N(EVS_NpcInit_Fuzzipede) = { CaseLt(STORY_CH5_DEFEATED_FUZZIPEDE) Call(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) CaseDefault - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_400000, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, FALSE) Call(SetNpcPos, NPC_SELF, -575, 40, 120) Call(BindNpcInteract, NPC_SELF, Ref(N(EVS_NpcInteract_Fuzzipede2))) CaseDefault @@ -1989,7 +1989,7 @@ API_CALLABLE(N(func_8024335C_8554CC)) { EvtScript N(D_8024E23C_8603AC) = { Set(AF_JAN01_TreeDrop_StarPiece, TRUE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_400000 | ENEMY_FLAG_CANT_INTERACT, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_CANT_INTERACT, TRUE) Call(InterpNpcYaw, NPC_Chanterelle, 270, 0) Call(SetMusicTrack, 0, SONG_POP_DIVA_SONG, 1, 8) ChildThread @@ -2011,7 +2011,7 @@ EvtScript N(D_8024E23C_8603AC) = { EndLoop Exec(N(EVS_802442E8)) Call(SetNpcAnimation, NPC_Chanterelle, ANIM_Chanterelle_Idle) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_400000 | ENEMY_FLAG_CANT_INTERACT, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_CANT_INTERACT, FALSE) Return End }; @@ -2134,7 +2134,7 @@ NpcData N(NpcData_Toad_01) = { .yaw = 270, .init = &N(EVS_NpcInit_Toad_01), .settings = &N(NpcSettings_Whale), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_Whale, @@ -2158,7 +2158,7 @@ NpcData N(NpcData_Fishmael) = { .yaw = 270, .init = &N(EVS_NpcInit_Fishmael), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_Fishmael_Idle, @@ -2181,7 +2181,7 @@ NpcData N(NpcData_Fuzzipede) = { .yaw = 90, .init = &N(EVS_NpcInit_Fuzzipede), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_Fuzzipede_Anim04, @@ -2213,7 +2213,7 @@ NpcData N(NpcData_JrTroopa_01)[] = { .yaw = 270, .init = &N(EVS_NpcInit_JrTroopa_01), .settings = &N(NpcSettings_JrTroopa_01), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_JrTroopa_Idle, @@ -2242,7 +2242,7 @@ NpcData N(NpcData_JrTroopa_01)[] = { .yaw = 270, .init = &N(EVS_NpcInit_JrTroopa_02), .settings = &N(NpcSettings_JrTroopa_01), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = { .idle = ANIM_JrTroopa_Idle, @@ -2515,7 +2515,7 @@ NpcData N(NpcData_Bartender)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TradeEventToad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = { .idle = ANIM_Toad_Pink_Idle, diff --git a/src/world/area_mac/mac_05/whale.c b/src/world/area_mac/mac_05/whale.c index 6f35bc0b61..dc8fd097c7 100644 --- a/src/world/area_mac/mac_05/whale.c +++ b/src/world/area_mac/mac_05/whale.c @@ -227,7 +227,7 @@ EvtScript N(D_802516CC_86383C) = { }; EvtScript N(EVS_SetupWhale) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(MakeLocalVertexCopy, VTX_COPY_1, MODEL_karada, TRUE) Call(SetCustomGfxBuilders, CUSTOM_GFX_1, Ref(N(unkAngleFunc002)), NULL) Call(SetModelCustomGfx, MODEL_karada, CUSTOM_GFX_1, -1) diff --git a/src/world/area_mac/mac_06/main.c b/src/world/area_mac/mac_06/main.c index 56c6f6a303..ba022202f8 100644 --- a/src/world/area_mac/mac_06/main.c +++ b/src/world/area_mac/mac_06/main.c @@ -30,7 +30,7 @@ API_CALLABLE(N(GetWaveAmplitude)) { #include "world/common/todo/SpawnSunEffect.inc.c" EvtScript N(EVS_AnimateWaves) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Set(LVarC, 0) Label(0) IfGe(LVarC, 60) diff --git a/src/world/area_mac/mac_06/npc.c b/src/world/area_mac/mac_06/npc.c index 980dd6c610..c06f285be5 100644 --- a/src/world/area_mac/mac_06/npc.c +++ b/src/world/area_mac/mac_06/npc.c @@ -360,7 +360,7 @@ Vec3f N(FlightPath)[] = { }; EvtScript N(EVS_FlyingGull) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(CloneModel, MODEL_hontai, CLONED_MODEL_GULL) Set(LFlag0, TRUE) Set(LFlag1, FALSE) @@ -578,7 +578,7 @@ NpcData N(NpcData_JrTroopa) = { .yaw = 270, .init = &N(EVS_NpcInit_JrTroopa), .settings = &N(NpcSettings_JrTroopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_JrTroopa_Idle, diff --git a/src/world/area_mac/mac_06/whale.c b/src/world/area_mac/mac_06/whale.c index b5565b92fa..8d2386ffac 100644 --- a/src/world/area_mac/mac_06/whale.c +++ b/src/world/area_mac/mac_06/whale.c @@ -223,7 +223,7 @@ EvtScript N(EVS_WhaleState_Walk) = { }; EvtScript N(EVS_WhaleMain) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(MakeLocalVertexCopy, VTX_COPY_1, MODEL_karada, TRUE) Call(SetCustomGfxBuilders, CUSTOM_GFX_1, Ref(N(unkAngleFunc002)), NULL) Call(SetModelCustomGfx, MODEL_karada, CUSTOM_GFX_1, -1) diff --git a/src/world/area_mac/machi/goomba_king.c b/src/world/area_mac/machi/goomba_king.c index 4231108ef0..daf9c80045 100644 --- a/src/world/area_mac/machi/goomba_king.c +++ b/src/world/area_mac/machi/goomba_king.c @@ -39,5 +39,5 @@ NpcSettings N(NpcSettings_GoombaKing) = { .onInteract = &N(EVS_NpcInteract_GoombaKing), .ai = &N(EVS_NpcAI_GoombaKing), .onHit = &N(EVS_NpcHit_GoombaKing), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, }; diff --git a/src/world/area_mac/machi/npc.c b/src/world/area_mac/machi/npc.c index 0afd692f79..edb4eeeb72 100644 --- a/src/world/area_mac/machi/npc.c +++ b/src/world/area_mac/machi/npc.c @@ -249,7 +249,7 @@ NpcSettings N(NpcSettings_Goompa) = { .otherAI = &N(EVS_NpcAuxAI_Goompa), .onInteract = &N(EVS_NpcInteract_Goompa), .onHit = &N(EVS_NpcHit_Goompa), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE, }; NpcData N(NpcData_05)[] = { diff --git a/src/world/area_mgm/mgm_00/main.c b/src/world/area_mgm/mgm_00/main.c index 2739497493..c422ecf453 100644 --- a/src/world/area_mgm/mgm_00/main.c +++ b/src/world/area_mgm/mgm_00/main.c @@ -16,7 +16,7 @@ EvtScript N(EVS_GotoMap_ToadTown) = { }; EvtScript N(EVS_OnEnterPipe_ToadTown) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Set(LVarA, mgm_00_ENTRY_0) Set(LVarB, COLLIDER_deili1) Set(LVarC, Ref(N(EVS_GotoMap_ToadTown))) @@ -45,7 +45,7 @@ EvtScript N(EVS_GotoMap_SmashAttack) = { MAP_RODATA_PAD(1, unk); EvtScript N(EVS_OnEnterPipe_SmashAttack) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Set(LVarA, mgm_00_ENTRY_2) Set(LVarB, COLLIDER_deili3) Set(LVarC, Ref(N(EVS_GotoMap_SmashAttack))) diff --git a/src/world/area_mgm/mgm_00/npc.c b/src/world/area_mgm/mgm_00/npc.c index d542688682..0dac4a2a5f 100644 --- a/src/world/area_mgm/mgm_00/npc.c +++ b/src/world/area_mgm/mgm_00/npc.c @@ -171,7 +171,7 @@ NpcData N(NpcData_RedToad) = { .yaw = 90, .init = &N(EVS_NpcInit_RedToad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MGM_PlayroomReceptionist, @@ -225,7 +225,7 @@ NpcData N(NpcData_GreenToad) = { }, .init = &N(EVS_NpcInit_GreenToad), .settings = &N(NpcSettings_Toad_Patrol), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_GREEN_ANIMS, .tattle = MSG_NpcTattle_MGM_PlayroomCustomer, @@ -275,7 +275,7 @@ NpcData N(NpcData_BlueToad) = { }, .init = &N(EVS_NpcInit_BlueToad), .settings = &N(NpcSettings_Toad_Patrol), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_MGM_BestPlayroomCustomer, diff --git a/src/world/area_mgm/mgm_01/npc.c b/src/world/area_mgm/mgm_01/npc.c index c6c55daaaa..22eb226516 100644 --- a/src/world/area_mgm/mgm_01/npc.c +++ b/src/world/area_mgm/mgm_01/npc.c @@ -1025,7 +1025,7 @@ NpcData N(NpcData_Toad) = { .yaw = 270, .init = &N(EVS_NpcInit_Toad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MGM_JumpAttackGuide, diff --git a/src/world/area_mgm/mgm_02/npc.c b/src/world/area_mgm/mgm_02/npc.c index 5065bbd4f3..ccd4e90a19 100644 --- a/src/world/area_mgm/mgm_02/npc.c +++ b/src/world/area_mgm/mgm_02/npc.c @@ -1643,7 +1643,7 @@ EvtScript N(EVS_Toad_GovernGame) = { Call(SetNpcPos, NPC_Toad, 358, -20, 185) Call(EnableNpcShadow, NPC_Toad, TRUE) PlayEffect(EFFECT_WALKING_DUST, 1, 358, 5, 189) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, FALSE) EndThread Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(GetNpcPos, NPC_Toad, LVar3, LVar4, LVar5) @@ -1806,7 +1806,7 @@ NpcData N(NpcData_GuideToad) = { .yaw = 270, .init = &N(EVS_NpcInit_Toad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -1890,7 +1890,7 @@ NpcData N(NpcData_Fuzzy_01) = { .yaw = 0, .init = &N(EVS_NpcInit_Fuzzy), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = FUZZY_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -1902,7 +1902,7 @@ NpcData N(NpcData_Fuzzy_02) = { .yaw = 0, .init = &N(EVS_NpcInit_Fuzzy), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = FUZZY_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -1914,7 +1914,7 @@ NpcData N(NpcData_Fuzzy_03) = { .yaw = 0, .init = &N(EVS_NpcInit_Fuzzy), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = FUZZY_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -1926,7 +1926,7 @@ NpcData N(NpcData_Fuzzy_04) = { .yaw = 0, .init = &N(EVS_NpcInit_Fuzzy), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = FUZZY_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -1938,7 +1938,7 @@ NpcData N(NpcData_Fuzzy_05) = { .yaw = 0, .init = &N(EVS_NpcInit_Fuzzy), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = FUZZY_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -1950,7 +1950,7 @@ NpcData N(NpcData_Bobomb_01) = { .yaw = 0, .init = &N(EVS_NpcInit_Bobomb), .settings = &N(NpcSettings_Bobomb), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = BOBOMB_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -1962,7 +1962,7 @@ NpcData N(NpcData_Bobomb_02) = { .yaw = 0, .init = &N(EVS_NpcInit_Bobomb), .settings = &N(NpcSettings_Bobomb), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = BOBOMB_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -1974,7 +1974,7 @@ NpcData N(NpcData_Bobomb_03) = { .yaw = 0, .init = &N(EVS_NpcInit_Bobomb), .settings = &N(NpcSettings_Bobomb), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = BOBOMB_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -1986,7 +1986,7 @@ NpcData N(NpcData_Bobomb_04) = { .yaw = 0, .init = &N(EVS_NpcInit_Bobomb), .settings = &N(NpcSettings_Bobomb), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = BOBOMB_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, @@ -1998,7 +1998,7 @@ NpcData N(NpcData_Bobomb_05) = { .yaw = 0, .init = &N(EVS_NpcInit_Bobomb), .settings = &N(NpcSettings_Bobomb), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = BOBOMB_ANIMS, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, diff --git a/src/world/area_mim/mim_01/entity.c b/src/world/area_mim/mim_01/entity.c index 11b7b9b6ae..133a9f99a5 100644 --- a/src/world/area_mim/mim_01/entity.c +++ b/src/world/area_mim/mim_01/entity.c @@ -7,12 +7,12 @@ EvtScript N(EVS_ReadSign) = { IfEq(LVar0, TRUE) Return EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(DisablePlayerInput, TRUE) Call(ShowMessageAtScreenPos, MSG_Menus_017E, 160, 40) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; diff --git a/src/world/area_mim/mim_02/hint.c b/src/world/area_mim/mim_02/hint.c index b9359cdf20..e05b040871 100644 --- a/src/world/area_mim/mim_02/hint.c +++ b/src/world/area_mim/mim_02/hint.c @@ -1,7 +1,7 @@ #include "mim_02.h" EvtScript N(EVS_SetupExitHint) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Set(LVar0, 0) Call(EnableModel, MODEL_o414, TRUE) Call(EnableModel, MODEL_me, FALSE) diff --git a/src/world/area_mim/mim_02/npc.c b/src/world/area_mim/mim_02/npc.c index 799755c778..c9b81e0cb6 100644 --- a/src/world/area_mim/mim_02/npc.c +++ b/src/world/area_mim/mim_02/npc.c @@ -162,7 +162,7 @@ NpcData N(NpcData_Oaklie) = { .yaw = 270, .init = &N(EVS_NpcInit_Oaklie), .settings = &N(NpcSettings_Oaklie), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = OAKLIE_ANIMS, .tattle = MSG_NpcTattle_Oaklie, diff --git a/src/world/area_mim/mim_04/npc.c b/src/world/area_mim/mim_04/npc.c index e2667e57ff..e387864e2d 100644 --- a/src/world/area_mim/mim_04/npc.c +++ b/src/world/area_mim/mim_04/npc.c @@ -71,7 +71,7 @@ NpcData N(NpcData_Fuzzy) = { } }, .settings = &N(NpcSettings_ForestFuzzy_Wander), - .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = FOREST_FUZZY_DROPS, .animations = FOREST_FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, diff --git a/src/world/area_mim/mim_07/entity.c b/src/world/area_mim/mim_07/entity.c index 3d271febb5..8b2f16a039 100644 --- a/src/world/area_mim/mim_07/entity.c +++ b/src/world/area_mim/mim_07/entity.c @@ -6,12 +6,12 @@ EvtScript N(EVS_ReadSign) = { IfEq(LVar0, TRUE) Return EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(DisablePlayerInput, TRUE) Call(ShowMessageAtScreenPos, MSG_Menus_017F, 160, 40) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; diff --git a/src/world/area_mim/mim_07/npc.c b/src/world/area_mim/mim_07/npc.c index 5daacadbd2..b41eef92c7 100644 --- a/src/world/area_mim/mim_07/npc.c +++ b/src/world/area_mim/mim_07/npc.c @@ -238,7 +238,7 @@ NpcData N(NpcData_JrTroopa) = { .yaw = 0, .init = &N(EVS_NpcInit_JrTroopa), .settings = &N(NpcSettings_JrTroopa), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_JrTroopa_Idle, diff --git a/src/world/area_mim/mim_10/main.c b/src/world/area_mim/mim_10/main.c index 3ed65c8204..423ce34977 100644 --- a/src/world/area_mim/mim_10/main.c +++ b/src/world/area_mim/mim_10/main.c @@ -3,7 +3,7 @@ EvtScript N(EVS_ExitWalk_mac_02_1) = EVT_EXIT_WALK(60, mim_10_ENTRY_0, "mac_02", mac_02_ENTRY_1); EvtScript N(EVS_ExitWalk_mim_01_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, mim_10_ENTRY_1) Exec(ExitWalk) IfEq(GB_StoryProgress, STORY_CH3_INVITED_TO_BOOS_MANSION) diff --git a/src/world/area_mim/mim_10/npc.c b/src/world/area_mim/mim_10/npc.c index 00887e95c1..d3837b05ca 100644 --- a/src/world/area_mim/mim_10/npc.c +++ b/src/world/area_mim/mim_10/npc.c @@ -287,7 +287,7 @@ NpcData N(NpcData_JrTroopa) = { .yaw = 270, .init = &N(EVS_NpcInit_JrTroopa), .settings = &N(NpcSettings_JrTroopa), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = { .idle = ANIM_JrTroopa_Idle, diff --git a/src/world/area_mim/mim_11/main.c b/src/world/area_mim/mim_11/main.c index 1861243c60..22d808ab5c 100644 --- a/src/world/area_mim/mim_11/main.c +++ b/src/world/area_mim/mim_11/main.c @@ -138,7 +138,7 @@ EvtScript N(EVS_ExitWarp_osr_03_4) = { }; EvtScript N(EVS_ExitWalk_mim_07_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, mim_11_ENTRY_0) Exec(ExitWalk) Set(GF_MIM_ChoosingPath, FALSE) @@ -151,7 +151,7 @@ EvtScript N(EVS_ExitWalk_mim_07_3) = { EvtScript N(EVS_ExitWalk_mim_12_0) = EVT_EXIT_WALK(60, mim_11_ENTRY_1, "mim_12", mim_12_ENTRY_0); EvtScript N(EVS_ExitWalk_obk_01_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, mim_11_ENTRY_2) diff --git a/src/world/area_nok/nok_01/main.c b/src/world/area_nok/nok_01/main.c index c7e78571c1..e9f94b5594 100644 --- a/src/world/area_nok/nok_01/main.c +++ b/src/world/area_nok/nok_01/main.c @@ -59,7 +59,7 @@ EvtScript N(EVS_EnterMap) = { }; EvtScript N(EVS_TexPan_Flowers) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_o298, TEX_PANNER_0) Call(SetTexPanner, MODEL_o320, TEX_PANNER_0) Call(SetTexPanner, MODEL_o402, TEX_PANNER_0) diff --git a/src/world/area_nok/nok_01/npc.c b/src/world/area_nok/nok_01/npc.c index 03d7bd91f7..cd14e7c22e 100644 --- a/src/world/area_nok/nok_01/npc.c +++ b/src/world/area_nok/nok_01/npc.c @@ -243,7 +243,7 @@ EvtScript N(EVS_MiscFuzzyFlee) = { EvtScript N(EVS_NpcHit_MiscFuzzy1) = { Call(BindNpcAI, NPC_SELF, Ref(N(EVS_MiscFuzzyFlee))) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, TRUE) Return End }; @@ -279,7 +279,7 @@ EvtScript N(EVS_NpcIdle_MiscFuzzy2) = { EvtScript N(EVS_NpcHit_MiscFuzzy2) = { Call(BindNpcAI, NPC_SELF, Ref(N(EVS_MiscFuzzyFlee))) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, TRUE) Return End }; @@ -446,7 +446,7 @@ NpcData N(NpcData_Crisis)[] = { }, .init = &N(EVS_NpcInit_Koover_Crisis), .settings = &N(NpcSettings_Koopa_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOOPA_ANIMS, .tattle = MSG_NpcTattle_NOK_Greeter, @@ -469,7 +469,7 @@ NpcData N(NpcData_Crisis)[] = { }, .init = &N(EVS_NpcInit_FuzzyWithShell), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }, @@ -512,7 +512,7 @@ NpcData N(NpcData_Crisis)[] = { .yaw = 0, .init = &N(EVS_NpcInit_KoopaShell_02), .settings = &N(NpcSettings_Koopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOOPA_ANIMS, }, @@ -545,7 +545,7 @@ NpcData N(NpcData_Crisis)[] = { .yaw = 0, .init = &N(EVS_NpcInit_KoopaShell_03), .settings = &N(NpcSettings_Koopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOOPA_ANIMS, }, @@ -580,7 +580,7 @@ NpcData N(NpcData_MiscFuzzy1) = { .yaw = 0, .init = &N(EVS_NpcInit_MiscFuzzy1), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }; @@ -592,7 +592,7 @@ NpcData N(NpcData_MiscFuzzy2) = { .yaw = 0, .init = &N(EVS_NpcInit_MiscFuzzy2), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }; @@ -731,7 +731,7 @@ NpcData N(NpcData_Shared)[] = { .yaw = 262, .init = &N(EVS_NpcInit_RelaxedKoopa), .settings = &N(NpcSettings_Koopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOOPA_ANIMS, .tattle = MSG_NpcTattle_NOK_RadioLover, diff --git a/src/world/area_nok/nok_01/npcs_crisis.inc.c b/src/world/area_nok/nok_01/npcs_crisis.inc.c index 9866308b99..ecd74f601d 100644 --- a/src/world/area_nok/nok_01/npcs_crisis.inc.c +++ b/src/world/area_nok/nok_01/npcs_crisis.inc.c @@ -316,7 +316,7 @@ EvtScript N(EVS_NpcIdle_Koover_Crisis) = { }; EvtScript N(EVS_NpcIdle_FuzzyWithShell) = { - SetGroup(EVT_GROUP_0A) + SetGroup(EVT_GROUP_PASSIVE_NPC) IfEq(GF_NOK01_RecoveredShellA, TRUE) Call(SetNpcPos, NPC_FuzzyWithShell, NPC_DISPOSE_LOCATION) Call(SetNpcPos, NPC_KooversShell, NPC_DISPOSE_LOCATION) @@ -371,7 +371,7 @@ EvtScript N(EVS_NpcHit_FuzzyWithShell) = { IfNe(LVar1, 0) Call(DisablePlayerInput, TRUE) Set(GF_NOK01_RecoveredShellA, TRUE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, TRUE) Thread Call(GetNpcPos, NPC_KooversShell, LVar0, LVar1, LVar2) Call(SetNpcAnimation, NPC_FuzzyWithShell, ANIM_Fuzzy_Hurt) @@ -458,7 +458,7 @@ EvtScript N(EVS_NpcHit_FuzzyWithShell) = { Call(ResetCam, CAM_DEFAULT, 4) EndThread Call(DisablePlayerInput, FALSE) - Call(SetEnemyFlagBits, NPC_Koover, ENEMY_FLAG_400000, 0) + Call(SetEnemyFlagBits, NPC_Koover, ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, FALSE) EndIf Return End @@ -506,7 +506,7 @@ EvtScript N(EVS_NpcInit_Koover_Crisis) = { Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_Koover_Crisis))) Call(BindNpcInteract, NPC_SELF, Ref(N(EVS_NpcInteract_Koover_Crisis))) IfEq(GF_NOK01_RecoveredShellA, TRUE) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_400000, 0) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, FALSE) Return EndIf IfGe(GB_StoryProgress, STORY_CH1_ARRIVED_AT_KOOPA_VILLAGE) diff --git a/src/world/area_nok/nok_02/main.c b/src/world/area_nok/nok_02/main.c index 166ac1bc1d..1fab4b9543 100644 --- a/src/world/area_nok/nok_02/main.c +++ b/src/world/area_nok/nok_02/main.c @@ -37,7 +37,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_TexPan_Flowers) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_o312, TEX_PANNER_0) Call(SetTexPanner, MODEL_o460, TEX_PANNER_0) Call(SetTexPanner, MODEL_o461, TEX_PANNER_0) diff --git a/src/world/area_nok/nok_02/npc.c b/src/world/area_nok/nok_02/npc.c index 369929684b..ed994fc30a 100644 --- a/src/world/area_nok/nok_02/npc.c +++ b/src/world/area_nok/nok_02/npc.c @@ -339,7 +339,7 @@ EvtScript N(EVS_MiscFuzzyFlee) = { EvtScript N(EVS_NpcHit_MiscFuzzy1) = { Call(BindNpcAI, NPC_SELF, Ref(N(EVS_MiscFuzzyFlee))) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, TRUE) Return End }; @@ -379,7 +379,7 @@ EvtScript N(EVS_NpcIdle_MiscFuzzy2) = { EvtScript N(EVS_NpcHit_MiscFuzzy2) = { Call(BindNpcAI, NPC_SELF, Ref(N(EVS_MiscFuzzyFlee))) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, TRUE) Return End }; @@ -656,7 +656,7 @@ NpcData N(NpcData_Crisis)[] = { }, .init = &N(EVS_NpcInit_Koopa_01_Crisis), .settings = &N(NpcSettings_Koopa_Wander), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOOPA_ANIMS, .tattle = MSG_NpcTattle_NOK_GenericKoopaC, @@ -667,7 +667,7 @@ NpcData N(NpcData_Crisis)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Fuzzy_Thief), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_IGNORE_TOUCH, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }, @@ -677,7 +677,7 @@ NpcData N(NpcData_Crisis)[] = { .yaw = 0, .init = &N(EVS_NpcInit_KoopaShell_01_Crisis), .settings = &N(NpcSettings_Koopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOOPA_ANIMS, }, @@ -712,7 +712,7 @@ NpcData N(NpcData_Crisis)[] = { .yaw = 0, .init = &N(EVS_NpcInit_KoopaShell_02_Crisis), .settings = &N(NpcSettings_Koopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOOPA_ANIMS, }, @@ -722,7 +722,7 @@ NpcData N(NpcData_Crisis)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Kooper), .settings = &N(NpcSettings_Koopa), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOOPER_ANIMS, .tattle = MSG_NpcTattle_NOK_Kooper, @@ -733,7 +733,7 @@ NpcData N(NpcData_Crisis)[] = { .yaw = 90, .init = &N(EVS_NpcInit_FuzzyBoss), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }, @@ -743,7 +743,7 @@ NpcData N(NpcData_Crisis)[] = { .yaw = 90, .init = &N(EVS_NpcInit_KoopersShell), .settings = &N(NpcSettings_Koopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOOPER_ANIMS, }, @@ -755,7 +755,7 @@ NpcData N(NpcData_Fuzzy_01) = { .yaw = 0, .init = &N(EVS_NpcInit_MiscFuzzy1), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }; @@ -766,7 +766,7 @@ NpcData N(NpcData_Fuzzy_02) = { .yaw = 0, .init = &N(EVS_NpcInit_MiscFuzzy2), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }; @@ -824,7 +824,7 @@ NpcData N(NpcData_Normal)[] = { .yaw = 180, .init = &N(EVS_NpcInit_Bobomb_01), .settings = &N(NpcSettings_Bobomb), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = BOBOMB_BLUE_ANIMS, .tattle = MSG_NpcTattle_NOK_BobombD, @@ -835,7 +835,7 @@ NpcData N(NpcData_Normal)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Bobomb_02), .settings = &N(NpcSettings_Bobomb), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = BOBOMB_GREEN_ANIMS, .tattle = MSG_NpcTattle_NOK_BobombE, @@ -870,7 +870,7 @@ NpcData N(NpcData_Fuzzy_Later) = { .yaw = 0, .init = &N(EVS_NpcInit_Fuzzy_Later), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }; diff --git a/src/world/area_nok/nok_02/npcs_crisis.inc.c b/src/world/area_nok/nok_02/npcs_crisis.inc.c index 228667c597..d96e9c5c45 100644 --- a/src/world/area_nok/nok_02/npcs_crisis.inc.c +++ b/src/world/area_nok/nok_02/npcs_crisis.inc.c @@ -244,7 +244,7 @@ EvtScript N(EVS_FuzzyThief_AvoidCapture) = { }; EvtScript N(EVS_Koopa_01_ChaseThief) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Label(0) Call(GetNpcPos, NPC_KoopaShell_01, LVar0, LVar1, LVar2) Call(GetNpcAnimation, NPC_Koopa_01, LVarF) @@ -270,7 +270,7 @@ EvtScript N(EVS_Koopa_01_FaceShell) = { }; EvtScript N(D_8024BDB0_9E2DD0) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Set(LVar3, 0) Set(LVar4, 0) Loop(0) @@ -433,10 +433,10 @@ EvtScript N(EVS_NpcHit_Fuzzy_Thief) = { Switch(LVar0) CaseEq(ENCOUNTER_TRIGGER_HAMMER) Set(GF_NOK02_RecoveredShellA, TRUE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, TRUE) CaseEq(ENCOUNTER_TRIGGER_JUMP) Set(GF_NOK02_RecoveredShellA, TRUE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, TRUE) EndSwitch Return End diff --git a/src/world/area_nok/nok_02/rooms.c b/src/world/area_nok/nok_02/rooms.c index 53a5579aa4..bc4cb13bf2 100644 --- a/src/world/area_nok/nok_02/rooms.c +++ b/src/world/area_nok/nok_02/rooms.c @@ -36,7 +36,7 @@ EvtScript N(EVS_UpdateKooperFightSounds) = { }; EvtScript N(EVS_PlayKooperVsFuzzyEffects) = { - SetGroup(EVT_GROUP_0A) + SetGroup(EVT_GROUP_PASSIVE_NPC) ExecGetTID(N(EVS_UpdateKooperFightSounds), MV_KooperFightSoundsScript) Label(0) Switch(GB_StoryProgress) diff --git a/src/world/area_nok/nok_03/npc.c b/src/world/area_nok/nok_03/npc.c index e60b65ba1e..da3a72f749 100644 --- a/src/world/area_nok/nok_03/npc.c +++ b/src/world/area_nok/nok_03/npc.c @@ -65,7 +65,7 @@ EvtScript N(EVS_NpcIdle_Fuzzy_01) = { Call(PlaySoundAtNpc, NPC_SELF, SOUND_SEQ_FUZZY_HOP, SOUND_SPACE_DEFAULT) Call(SetNpcJumpscale, NPC_SELF, Float(1.8)) Call(NpcJump0, NPC_SELF, -341, 0, 23, 15) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, TRUE) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_NpcAI_Fuzzy_Wander))) Return End @@ -83,7 +83,7 @@ EvtScript N(EVS_NpcIdle_Fuzzy_02) = { Set(LVar1, 0) Call(SetNpcJumpscale, NPC_SELF, Float(3.0)) Call(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 6) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, TRUE) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_NpcAI_Fuzzy_Wander))) Return End @@ -143,7 +143,7 @@ NpcData N(NpcData_Fuzzy_01) = { }, .init = &N(EVS_NpcInit_Fuzzy_01), .settings = &N(NpcSettings_Fuzzy_Wander), - .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = FUZZY_DROPS, .animations = FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -167,7 +167,7 @@ NpcData N(NpcData_Fuzzy_02) = { }, .init = &N(EVS_NpcInit_Fuzzy_02), .settings = &N(NpcSettings_Fuzzy_Wander), - .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = FUZZY_DROPS, .animations = FUZZY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT, @@ -192,7 +192,7 @@ NpcData N(NpcData_FuzzyBoss)[] = { }, .init = &N(EVS_NpcInit_FuzzyBoss), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = FUZZY_DROPS, .animations = FUZZY_ANIMS, }, @@ -202,7 +202,7 @@ NpcData N(NpcData_FuzzyBoss)[] = { .yaw = 0, .init = &N(EVS_NpcInit_KoopersShell), .settings = &N(NpcSettings_Koopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = FUZZY_DROPS, .animations = KOOPER_ANIMS, }, diff --git a/src/world/area_nok/nok_04/npc.c b/src/world/area_nok/nok_04/npc.c index b716349921..3484888358 100644 --- a/src/world/area_nok/nok_04/npc.c +++ b/src/world/area_nok/nok_04/npc.c @@ -1532,7 +1532,7 @@ NpcData N(NpcData_Minigame)[] = { .yaw = 0, .init = &N(EVS_NpcInit_KoopersShell), .settings = &N(NpcSettings_Koopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = KOOPER_ANIMS, }, @@ -1554,7 +1554,7 @@ NpcData N(NpcData_Minigame)[] = { }, .init = &N(EVS_NpcInit_WrongFuzzy), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }, @@ -1576,7 +1576,7 @@ NpcData N(NpcData_Minigame)[] = { }, .init = &N(EVS_NpcInit_Fuzzy_Aux), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }, @@ -1598,7 +1598,7 @@ NpcData N(NpcData_Minigame)[] = { }, .init = &N(EVS_NpcInit_Fuzzy_Aux), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }, @@ -1620,7 +1620,7 @@ NpcData N(NpcData_Minigame)[] = { }, .init = &N(EVS_NpcInit_Fuzzy_Aux), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }, @@ -1630,7 +1630,7 @@ NpcData N(NpcData_Minigame)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Kooper), .settings = &N(NpcSettings_Koopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = KOOPER_ANIMS, }, @@ -1654,7 +1654,7 @@ NpcData N(NpcData_Miniboss) = { }, .init = &N(EVS_SetupMinigame), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = FUZZY_ANIMS, }; diff --git a/src/world/area_nok/nok_11/npc.c b/src/world/area_nok/nok_11/npc.c index 43b13a7e8b..5e7b9521aa 100644 --- a/src/world/area_nok/nok_11/npc.c +++ b/src/world/area_nok/nok_11/npc.c @@ -547,7 +547,7 @@ NpcData N(NpcData_JrTroopa)[] = { .yaw = 90, .init = &N(EVS_NpcInit_JrTroopa_01), .settings = &N(NpcSettings_JrTroopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = JR_TROOPA_ANIMS, .tattle = MSG_NpcTattle_JrTroopa, @@ -558,7 +558,7 @@ NpcData N(NpcData_JrTroopa)[] = { .yaw = 90, .init = &N(EVS_NpcInit_JrTroopa_02), .settings = &N(NpcSettings_JrTroopa), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = JR_TROOPA_ANIMS, .tattle = MSG_NpcTattle_JrTroopa, @@ -595,7 +595,7 @@ NpcData N(NpcData_KentCKoopa)[] = { .yaw = 270, .init = &N(EVS_NpcInit_KentCKoopa_01), .settings = &N(NpcSettings_KentCKoopa), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = KENT_C_KOOPA_ANIMS, }, @@ -605,7 +605,7 @@ NpcData N(NpcData_KentCKoopa)[] = { .yaw = 270, .init = &N(EVS_NpcInit_KentCKoopa_02), .settings = &N(NpcSettings_KentCKoopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = KENT_C_KOOPA_ANIMS, .tattle = MSG_NpcTattle_KentCKoopa, diff --git a/src/world/area_nok/nok_12/bridge.c b/src/world/area_nok/nok_12/bridge.c index 8c235b4ad5..62b665da25 100644 --- a/src/world/area_nok/nok_12/bridge.c +++ b/src/world/area_nok/nok_12/bridge.c @@ -7,7 +7,7 @@ EvtScript N(EVS_Scene_BuildBridge) = { Call(DisablePlayerInput, TRUE) Wait(20) Call(DisablePlayerPhysics, TRUE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(N(DisableCameraLeadingPlayer)) Call(InterpCamTargetPos, CAM_DEFAULT, 1, -272, 0, -56, 20) @@ -91,7 +91,7 @@ EvtScript N(EVS_Scene_BuildBridge) = { Call(GetPlayerPos, LVar0, LVar1, LVar2) Call(InterpCamTargetPos, CAM_DEFAULT, 1, LVar0, LVar1, LVar2, 10) Call(N(EnableCameraLeadingPlayer)) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(DisablePlayerPhysics, FALSE) Call(DisablePlayerInput, FALSE) Set(GB_StoryProgress, STORY_CH1_MADE_FIRST_BRIDGE) diff --git a/src/world/area_nok/nok_12/entity.c b/src/world/area_nok/nok_12/entity.c index ae2ec99a07..684ba576e6 100644 --- a/src/world/area_nok/nok_12/entity.c +++ b/src/world/area_nok/nok_12/entity.c @@ -32,7 +32,7 @@ EvtScript N(EVS_OnShakeTree_DropSwitch) = { IfLt(GB_StoryProgress, STORY_CH1_KNOCKED_SWITCH_FROM_TREE) Set(GB_StoryProgress, STORY_CH1_KNOCKED_SWITCH_FROM_TREE) Wait(15) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(DisablePlayerInput, TRUE) Call(MakeLerp, 95, 0, 12, EASING_QUADRATIC_IN) @@ -47,7 +47,7 @@ EvtScript N(EVS_OnShakeTree_DropSwitch) = { Call(ShakeCam, CAM_DEFAULT, 0, 5, Float(1.0)) Thread Wait(5) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) EndThread Call(DisablePlayerInput, FALSE) EndIf diff --git a/src/world/area_nok/nok_12/main.c b/src/world/area_nok/nok_12/main.c index d9023db040..f6a7edc45b 100644 --- a/src/world/area_nok/nok_12/main.c +++ b/src/world/area_nok/nok_12/main.c @@ -40,7 +40,7 @@ EvtScript N(EVS_UpdateEnounterStages) = { }; EvtScript N(EVS_TexPan_Flowers) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_hana1, TEX_PANNER_0) Call(SetTexPanner, MODEL_hana2, TEX_PANNER_0) Call(SetTexPanner, MODEL_hana3, TEX_PANNER_0) @@ -64,7 +64,7 @@ EvtScript N(EVS_TexPan_Flowers) = { }; EvtScript N(EVS_TexPan_Water) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Thread Call(SetTexPanner, MODEL_suimen1, TEX_PANNER_1) Set(LVar0, 0) diff --git a/src/world/area_nok/nok_13/entity.c b/src/world/area_nok/nok_13/entity.c index f4f97a92e1..d789c5b759 100644 --- a/src/world/area_nok/nok_13/entity.c +++ b/src/world/area_nok/nok_13/entity.c @@ -32,12 +32,12 @@ EvtScript N(EVS_BreakBlock_Third) = { }; EvtScript N(EVS_ReadSign_Directions) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(DisablePlayerInput, TRUE) Call(ShowMessageAtScreenPos, MSG_Menus_0178, 160, 40) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; diff --git a/src/world/area_nok/nok_14/bridge.c b/src/world/area_nok/nok_14/bridge.c index d3cfe61bf9..f1403846dc 100644 --- a/src/world/area_nok/nok_14/bridge.c +++ b/src/world/area_nok/nok_14/bridge.c @@ -4,7 +4,7 @@ #include "world/common/EnableCameraLeadingPlayer.inc.c" EvtScript N(EVS_Scene_BuildBridge) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(DisablePlayerInput, TRUE) Wait(10) @@ -120,7 +120,7 @@ EvtScript N(EVS_Scene_BuildBridge) = { Call(N(EnableCameraLeadingPlayer)) Call(DisablePlayerPhysics, FALSE) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Unbind Return End diff --git a/src/world/area_nok/nok_14/entity.c b/src/world/area_nok/nok_14/entity.c index 4d13c63005..4a955e686e 100644 --- a/src/world/area_nok/nok_14/entity.c +++ b/src/world/area_nok/nok_14/entity.c @@ -6,12 +6,12 @@ EvtScript N(EVS_ReadSign_NoEntry) = { IfEq(LVar0, TRUE) Return EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(DisablePlayerInput, TRUE) Call(ShowMessageAtScreenPos, MSG_Menus_0179, 160, 40) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; diff --git a/src/world/area_nok/nok_14/main.c b/src/world/area_nok/nok_14/main.c index 06c41dae0b..47457ac79a 100644 --- a/src/world/area_nok/nok_14/main.c +++ b/src/world/area_nok/nok_14/main.c @@ -29,7 +29,7 @@ EvtScript N(EVS_ExitWalk_nok_13_2) = EVT_EXIT_WALK_NOK(60, nok_14_ENTRY_0, "nok_ EvtScript N(EVS_ExitWalk_nok_15_0) = EVT_EXIT_WALK_NOK(60, nok_14_ENTRY_1, "nok_15", nok_15_ENTRY_0); EvtScript N(EVS_TexPan_Flowers) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_hana1, TEX_PANNER_0) Call(SetTexPanner, MODEL_hana3, TEX_PANNER_0) Call(SetTexPanner, MODEL_hana4, TEX_PANNER_0) @@ -48,7 +48,7 @@ EvtScript N(EVS_TexPan_Flowers) = { }; EvtScript N(EVS_TexPan_Water) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Thread Call(SetTexPanner, MODEL_suimen1, TEX_PANNER_1) Call(SetTexPanner, MODEL_suimen2, TEX_PANNER_1) diff --git a/src/world/area_nok/nok_14/npc.c b/src/world/area_nok/nok_14/npc.c index 7d54b0de13..6cdb15f0d0 100644 --- a/src/world/area_nok/nok_14/npc.c +++ b/src/world/area_nok/nok_14/npc.c @@ -18,7 +18,7 @@ EvtScript N(EVS_NpcIdle_KoopaTroopa_01) = { EndLoop EndThread Wait(5) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_CAMERA_FOR_YAW | NPC_FLAG_200000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_CAMERA_FOR_YAW | NPC_FLAG_FLIP_INSTANTLY, TRUE) Thread Call(MakeLerp, 0, 360, 20, EASING_LINEAR) Label(1) @@ -31,7 +31,7 @@ EvtScript N(EVS_NpcIdle_KoopaTroopa_01) = { EndThread Call(SetNpcJumpscale, NPC_SELF, Float(0.6)) Call(NpcJump0, NPC_SELF, -650, 75, -30, 20) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_CAMERA_FOR_YAW | NPC_FLAG_200000, FALSE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_CAMERA_FOR_YAW | NPC_FLAG_FLIP_INSTANTLY, FALSE) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, TRUE) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_NpcAI_KoopaTroopa_Wander))) Return diff --git a/src/world/area_obk/obk_01/main.c b/src/world/area_obk/obk_01/main.c index c5a22ba13c..d92b8e735d 100644 --- a/src/world/area_obk/obk_01/main.c +++ b/src/world/area_obk/obk_01/main.c @@ -1,7 +1,7 @@ #include "obk_01.h" EvtScript N(EVS_ExitDoors_mim_11_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, obk_01_ENTRY_0) @@ -20,7 +20,7 @@ EvtScript N(EVS_ExitDoor_obk_02_0) = { IfLt(GB_StoryProgress, STORY_CH3_WEIGHED_DOWN_CHANDELIER) Return EndIf - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, obk_01_ENTRY_1) @@ -36,7 +36,7 @@ EvtScript N(EVS_ExitDoor_obk_02_0) = { }; EvtScript N(EVS_ExitDoor_obk_05_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) IfLt(GB_StoryProgress, STORY_CH3_TRIGGERED_DOOR_JUMP_SCARE) Exec(N(EVS_Scene_JumpScareBoo)) Return @@ -56,7 +56,7 @@ EvtScript N(EVS_ExitDoor_obk_05_0) = { }; EvtScript N(EVS_ExitDoor_obk_07_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) IfLt(GB_StoryProgress, STORY_CH3_TRIGGERED_DOOR_JUMP_SCARE) Exec(N(EVS_Scene_JumpScareBoo)) Return @@ -76,7 +76,7 @@ EvtScript N(EVS_ExitDoor_obk_07_0) = { }; EvtScript N(EVS_ExitDoor_obk_08_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) IfLt(GB_StoryProgress, STORY_CH3_TRIGGERED_DOOR_JUMP_SCARE) Exec(N(EVS_Scene_JumpScareBoo)) Return @@ -96,7 +96,7 @@ EvtScript N(EVS_ExitDoor_obk_08_0) = { }; EvtScript N(EVS_ExitDoor_obk_09_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, obk_01_ENTRY_5) @@ -112,7 +112,7 @@ EvtScript N(EVS_ExitDoor_obk_09_0) = { }; EvtScript N(EVS_ExitDoor_obk_09_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, obk_01_ENTRY_6) diff --git a/src/world/area_obk/obk_02/main.c b/src/world/area_obk/obk_02/main.c index b3603d76b6..1a262b1b9a 100644 --- a/src/world/area_obk/obk_02/main.c +++ b/src/world/area_obk/obk_02/main.c @@ -9,7 +9,7 @@ enum { }; EvtScript N(EVS_ExitDoor_obk_01_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, obk_02_ENTRY_0) Set(LVar1, COLLIDER_tt1) @@ -24,7 +24,7 @@ EvtScript N(EVS_ExitDoor_obk_01_1) = { }; EvtScript N(EVS_ExitDoor_obk_03_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, obk_02_ENTRY_1) Set(LVar1, COLLIDER_tt2) diff --git a/src/world/area_obk/obk_02/npc.c b/src/world/area_obk/obk_02/npc.c index d47305a8b0..ff5c7977f0 100644 --- a/src/world/area_obk/obk_02/npc.c +++ b/src/world/area_obk/obk_02/npc.c @@ -25,7 +25,7 @@ NpcData N(NpcData_TrafficBoos)[] = { .yaw = 0, .init = &N(EVS_NpcInit_TrafficBoo1), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, @@ -35,7 +35,7 @@ NpcData N(NpcData_TrafficBoos)[] = { .yaw = 0, .init = &N(EVS_NpcInit_TrafficBoo2), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, diff --git a/src/world/area_obk/obk_03/main.c b/src/world/area_obk/obk_03/main.c index 5e5074413a..57752abf50 100644 --- a/src/world/area_obk/obk_03/main.c +++ b/src/world/area_obk/obk_03/main.c @@ -1,7 +1,7 @@ #include "obk_03.h" EvtScript N(EVS_ExitDoor_obk_02_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, obk_03_ENTRY_0) Set(LVar1, COLLIDER_tt2) @@ -17,7 +17,7 @@ EvtScript N(EVS_ExitDoor_obk_02_1) = { }; EvtScript N(EVS_ExitDoor_obk_04_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, obk_03_ENTRY_1) Set(LVar1, COLLIDER_tt1) diff --git a/src/world/area_obk/obk_03/npc.c b/src/world/area_obk/obk_03/npc.c index fd6dbac3f3..b733e33adc 100644 --- a/src/world/area_obk/obk_03/npc.c +++ b/src/world/area_obk/obk_03/npc.c @@ -55,7 +55,7 @@ NpcData N(NpcData_Igor) = { .yaw = 90, .init = &N(EVS_NpcInit_Igor), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, .tattle = MSG_NpcTattle_OBK_ShopOwner, diff --git a/src/world/area_obk/obk_04/npc.c b/src/world/area_obk/obk_04/npc.c index 1aa5cb683e..b83457cded 100644 --- a/src/world/area_obk/obk_04/npc.c +++ b/src/world/area_obk/obk_04/npc.c @@ -492,7 +492,7 @@ NpcData N(NpcData_Boo_01) = { .yaw = 0, .init = &N(EVS_NpcInit_Boo_01), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -503,7 +503,7 @@ NpcData N(NpcData_KeepAwayBoo1) = { .yaw = 270, .init = &N(EVS_NpcInit_KeepAwayBoo1), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -514,7 +514,7 @@ NpcData N(NpcData_KeepAwayBoo2) = { .yaw = 270, .init = &N(EVS_NpcInit_KeepAwayBoo2), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -525,7 +525,7 @@ NpcData N(NpcData_KeepAwayBoo3) = { .yaw = 270, .init = &N(EVS_NpcInit_KeepAwayBoo3), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -536,7 +536,7 @@ NpcData N(NpcData_KeepAwayBoo4) = { .yaw = 270, .init = &N(EVS_NpcInit_KeepAwayBoo4), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -547,7 +547,7 @@ NpcData N(NpcData_KeepAwayBoo5) = { .yaw = 270, .init = &N(EVS_NpcInit_KeepAwayBoo5), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -558,7 +558,7 @@ NpcData N(NpcData_KeepAwayBoo6) = { .yaw = 270, .init = &N(EVS_NpcInit_KeepAwayBoo6), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -569,7 +569,7 @@ NpcData N(NpcData_KeepAwayBoo7) = { .yaw = 270, .init = &N(EVS_NpcInit_KeepAwayBoo7), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -580,7 +580,7 @@ NpcData N(NpcData_KeepAwayBoo8) = { .yaw = 270, .init = &N(EVS_NpcInit_KeepAwayBoo8), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -627,7 +627,7 @@ NpcData N(NpcData_KeepAwayExtras)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Boo_10), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, @@ -637,7 +637,7 @@ NpcData N(NpcData_KeepAwayExtras)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Boo_11), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_HAS_NO_SPRITE, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, @@ -649,7 +649,7 @@ NpcData N(NpcData_TutorialBoo) = { .yaw = 0, .init = &N(EVS_NpcInit_TutorialBoo), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, .tattle = MSG_NpcTattle_OBK_BootsTutor, diff --git a/src/world/area_obk/obk_05/main.c b/src/world/area_obk/obk_05/main.c index cbd4dec13d..ce32a65d59 100644 --- a/src/world/area_obk/obk_05/main.c +++ b/src/world/area_obk/obk_05/main.c @@ -14,7 +14,7 @@ EvtScript N(EVS_EnterDoor_obk_05_0) = { }; EvtScript N(EVS_ExitDoor_obk_01_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, obk_05_ENTRY_0) Set(LVar1, COLLIDER_tt1) diff --git a/src/world/area_obk/obk_05/npc.c b/src/world/area_obk/obk_05/npc.c index 583d4a6fa0..8a56c00e98 100644 --- a/src/world/area_obk/obk_05/npc.c +++ b/src/world/area_obk/obk_05/npc.c @@ -25,7 +25,7 @@ NpcData N(NpcData_Boo_01)[] = { .yaw = 0, .init = &N(EVS_NpcInit_TrafficBoo1), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, @@ -35,7 +35,7 @@ NpcData N(NpcData_Boo_01)[] = { .yaw = 0, .init = &N(EVS_NpcInit_TrafficBoo2), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, diff --git a/src/world/area_obk/obk_07/main.c b/src/world/area_obk/obk_07/main.c index eace8368ae..c6dd77c152 100644 --- a/src/world/area_obk/obk_07/main.c +++ b/src/world/area_obk/obk_07/main.c @@ -11,7 +11,7 @@ EvtScript N(EVS_EnterMap) = { }; EvtScript N(EVS_ExitDoors_obk_01_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, obk_07_ENTRY_0) Set(LVar1, COLLIDER_tt1) diff --git a/src/world/area_obk/obk_07/npc.c b/src/world/area_obk/obk_07/npc.c index c0399b9f22..6e2073a889 100644 --- a/src/world/area_obk/obk_07/npc.c +++ b/src/world/area_obk/obk_07/npc.c @@ -18,7 +18,7 @@ NpcData N(NpcData_TrafficBoo1) = { .yaw = 0, .init = &N(EVS_NpcInit_TrafficBoo1), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -35,7 +35,7 @@ NpcData N(NpcData_TrafficBoo2) = { .yaw = 0, .init = &N(EVS_NpcInit_TrafficBoo2), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -57,7 +57,7 @@ NpcData N(NpcData_GuardBoo) = { .yaw = 270, .init = &N(EVS_NpcInit_GuardBoo), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, .tattle = MSG_NpcTattle_OBK_GuardingChest, diff --git a/src/world/area_obk/obk_08/main.c b/src/world/area_obk/obk_08/main.c index 91e5c1c4cb..90951f60cf 100644 --- a/src/world/area_obk/obk_08/main.c +++ b/src/world/area_obk/obk_08/main.c @@ -11,7 +11,7 @@ EvtScript N(EVS_EnterMap) = { }; EvtScript N(EVS_ExitMap_obk_01_4) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, obk_08_ENTRY_0) Set(LVar1, COLLIDER_tt1) diff --git a/src/world/area_obk/obk_08/npc.c b/src/world/area_obk/obk_08/npc.c index 760bfa2f61..ec3901d7dd 100644 --- a/src/world/area_obk/obk_08/npc.c +++ b/src/world/area_obk/obk_08/npc.c @@ -452,7 +452,7 @@ NpcData N(NpcData_Boo_01) = { .yaw = 0, .init = &N(EVS_NpcInit_Boo_01), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -463,7 +463,7 @@ NpcData N(NpcData_KeepAwayBoo1) = { .yaw = 0, .init = &N(EVS_NpcInit_KeepAwayBoo1), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -474,7 +474,7 @@ NpcData N(NpcData_KeepAwayBoo2) = { .yaw = 0, .init = &N(EVS_NpcInit_KeepAwayBoo2), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -485,7 +485,7 @@ NpcData N(NpcData_KeepAwayBoo3) = { .yaw = 0, .init = &N(EVS_NpcInit_KeepAwayBoo3), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -496,7 +496,7 @@ NpcData N(NpcData_KeepAwayBoo4) = { .yaw = 0, .init = &N(EVS_NpcInit_KeepAwayBoo4), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -507,7 +507,7 @@ NpcData N(NpcData_KeepAwayBoo5) = { .yaw = 0, .init = &N(EVS_NpcInit_KeepAwayBoo5), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -518,7 +518,7 @@ NpcData N(NpcData_KeepAwayBoo6) = { .yaw = 0, .init = &N(EVS_NpcInit_KeepAwayBoo6), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -529,7 +529,7 @@ NpcData N(NpcData_KeepAwayBoo7) = { .yaw = 0, .init = &N(EVS_NpcInit_KeepAwayBoo7), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -540,7 +540,7 @@ NpcData N(NpcData_KeepAwayBoo8) = { .yaw = 0, .init = &N(EVS_NpcInit_KeepAwayBoo8), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -568,7 +568,7 @@ NpcData N(NpcData_TrafficBoos)[] = { .yaw = 0, .init = &N(EVS_NpcInit_TrafficBoo1), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, @@ -578,7 +578,7 @@ NpcData N(NpcData_TrafficBoos)[] = { .yaw = 0, .init = &N(EVS_NpcInit_TrafficBoo2), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, @@ -602,7 +602,7 @@ NpcData N(NpcData_KeepAwayExtras)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Boo_12), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, @@ -612,7 +612,7 @@ NpcData N(NpcData_KeepAwayExtras)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Boo_13), .settings = &N(NpcSettings_Boo), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_HAS_NO_SPRITE, .drops = NO_DROPS, .animations = NORMAL_BOO_ANIMS, }, diff --git a/src/world/area_obk/obk_09/main.c b/src/world/area_obk/obk_09/main.c index cb4488ecb0..19a59a05b4 100644 --- a/src/world/area_obk/obk_09/main.c +++ b/src/world/area_obk/obk_09/main.c @@ -25,7 +25,7 @@ EvtScript N(EVS_EnterMap) = { }; EvtScript N(EVS_ExitDoors_obk_01_5) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, obk_09_ENTRY_0) @@ -41,7 +41,7 @@ EvtScript N(EVS_ExitDoors_obk_01_5) = { }; EvtScript N(EVS_ExitDoors_obk_01_6) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, obk_09_ENTRY_1) diff --git a/src/world/area_omo/omo_01/npc.c b/src/world/area_omo/omo_01/npc.c index 44651e66ce..2dfbfb61c4 100644 --- a/src/world/area_omo/omo_01/npc.c +++ b/src/world/area_omo/omo_01/npc.c @@ -47,7 +47,7 @@ EvtScript N(EVS_NpcDefeat_ShyGuy) = { CaseEq(OUTCOME_PLAYER_FLED) Call(OnPlayerFled, 0) CaseEq(OUTCOME_ENEMY_FLED) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) Call(SetSelfVar, 10, 1) EndSwitch diff --git a/src/world/area_omo/omo_02/npc.c b/src/world/area_omo/omo_02/npc.c index c991cf5986..aabf3ca445 100644 --- a/src/world/area_omo/omo_02/npc.c +++ b/src/world/area_omo/omo_02/npc.c @@ -220,7 +220,7 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Crowd) = { Call(InterpNpcYaw, NPC_SELF, 90, 0) Wait(2) CaseEq(CROWD_STATE_RUN_AWAY) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_WORLD_COLLISION, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_WORLD_COLLISION, TRUE) Call(GetSelfNpcID, LVar0) UseBuf(Ref(N(CrowdFleeScripts))) Loop(LVar0) diff --git a/src/world/area_omo/omo_03/npc.c b/src/world/area_omo/omo_03/npc.c index 08983d68cf..589f20cbfe 100644 --- a/src/world/area_omo/omo_03/npc.c +++ b/src/world/area_omo/omo_03/npc.c @@ -128,7 +128,7 @@ NpcData N(NpcData_TrainToads)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Conductor), .settings = &N(NpcSettings_TrainToad), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, .tattle = MSG_NpcTattle_OMO_TrainConductor, @@ -139,7 +139,7 @@ NpcData N(NpcData_TrainToads)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TrainToad), .settings = &N(NpcSettings_TrainToad), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TRAIN_TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_OMO_TrainConductor, @@ -152,7 +152,7 @@ NpcData N(NpcData_Epilogue)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, .settings = &N(NpcSettings_Parakarry), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL, .drops = NO_DROPS, .animations = PARAKARRY_ANIMS, }, @@ -161,7 +161,7 @@ NpcData N(NpcData_Epilogue)[] = { .pos = { 50.0f, 15.0f, 160.0f }, .yaw = 90, .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldWatt_Idle, @@ -187,7 +187,7 @@ NpcData N(NpcData_Epilogue)[] = { .pos = { 100.0f, 0.0f, 160.0f }, .yaw = 270, .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -196,7 +196,7 @@ NpcData N(NpcData_Epilogue)[] = { .pos = { 115.0f, 0.0f, 200.0f }, .yaw = 270, .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -205,7 +205,7 @@ NpcData N(NpcData_Epilogue)[] = { .pos = { 145.0f, 0.0f, 150.0f }, .yaw = 270, .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, diff --git a/src/world/area_omo/omo_04/npc.c b/src/world/area_omo/omo_04/npc.c index a1070b3323..ec270c1619 100644 --- a/src/world/area_omo/omo_04/npc.c +++ b/src/world/area_omo/omo_04/npc.c @@ -95,7 +95,7 @@ NpcData N(NpcData_Goomba) = { .yaw = 270, .init = &N(EVS_NpcInit_Goomba), .settings = &N(NpcSettings_Goomba), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = GOOMBA_ANIMS, }; @@ -106,7 +106,7 @@ NpcData N(NpcData_Clubba) = { .yaw = 270, .init = &N(EVS_NpcInit_Clubba), .settings = &N(NpcSettings_Clubba), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = CLUBBA_ANIMS_ALT, }; @@ -173,7 +173,7 @@ NpcData N(NpcData_Kammy) = { .yaw = 90, .init = &N(EVS_NpcInit_Kammy), .settings = &N(NpcSettings_Kammy_Flying), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), diff --git a/src/world/area_omo/omo_05/npc.c b/src/world/area_omo/omo_05/npc.c index c25a652fd6..bbe60d90d0 100644 --- a/src/world/area_omo/omo_05/npc.c +++ b/src/world/area_omo/omo_05/npc.c @@ -397,7 +397,7 @@ NpcData N(NpcData_GourmetGuy)[] = { .yaw = 90, .init = &N(EVS_NpcInit_GourmetGuy), .settings = &N(NpcSettings_GourmetGuy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = GOURMET_GUY_ANIMS, .tattle = MSG_NpcTattle_GourmetGuy, diff --git a/src/world/area_omo/omo_06/npc.c b/src/world/area_omo/omo_06/npc.c index 7f766f2d04..7ea3802363 100644 --- a/src/world/area_omo/omo_06/npc.c +++ b/src/world/area_omo/omo_06/npc.c @@ -52,7 +52,7 @@ NpcData N(NpcSettings_Toads)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Conductor), .settings = &N(NpcSettings_TrainToad), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, .tattle = MSG_NpcTattle_OMO_TrainConductor, @@ -63,7 +63,7 @@ NpcData N(NpcSettings_Toads)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TrainToad), .settings = &N(NpcSettings_TrainToad), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TRAIN_TOAD_PINK_ANIMS, .tattle = MSG_NpcTattle_OMO_TrainConductor, diff --git a/src/world/area_omo/omo_07/npc.c b/src/world/area_omo/omo_07/npc.c index 54d00af8ce..63279e17c9 100644 --- a/src/world/area_omo/omo_07/npc.c +++ b/src/world/area_omo/omo_07/npc.c @@ -173,7 +173,7 @@ EvtScript N(EVS_NpcAI_ShyGuy) = { CaseEq(SHYGUY_STATE_RUN_TO_DOOR) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE, FALSE) Call(EnableNpcShadow, NPC_SELF, TRUE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_PASSIVE, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_PASSIVE, FALSE) Call(SetNpcPos, NPC_SELF, 800, 0, 75) Call(SetNpcSpeed, NPC_SELF, Float(4.0)) Call(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim03) @@ -256,7 +256,7 @@ EvtScript N(EVS_NpcDefeat_ShyGuy) = { Switch(LVar0) CaseEq(OUTCOME_PLAYER_WON) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_PASSIVE, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_PASSIVE, TRUE) Call(EnableNpcShadow, NPC_SELF, FALSE) Call(SetSelfVar, SHYGUY_VAR_STATE, SHYGUY_STATE_RECYCLE) Wait(1) @@ -371,7 +371,7 @@ NpcData N(NpcData_ShyGuy) = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Patrol), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -400,7 +400,7 @@ NpcData N(NpcData_ShyGuy_02) = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Patrol), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -429,7 +429,7 @@ NpcData N(NpcData_ShyGuy_03) = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Patrol), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -458,7 +458,7 @@ NpcData N(NpcData_ShyGuy_04) = { }, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Patrol), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -469,7 +469,7 @@ NpcData N(NpcData_Fuzzy) = { .yaw = 270, .init = &N(EVS_NpcInit_Fuzzy), .settings = &N(NpcSettings_Fuzzy), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_Fuzzy_Walk, @@ -497,7 +497,7 @@ NpcData N(NpcData_HammerBros) = { .yaw = 270, .init = &N(EVS_NpcInit_HammerBros), .settings = &N(NpcSettings_HammerBros), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_HammerBros_Anim02, @@ -581,7 +581,7 @@ NpcData N(NpcData_Kammy) = { .yaw = 90, .init = &N(EVS_NpcInit_Kammy), .settings = &N(NpcSettings_Kammy_Flying), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), diff --git a/src/world/area_omo/omo_08/npc.c b/src/world/area_omo/omo_08/npc.c index 7e55fd29c6..d606e31300 100644 --- a/src/world/area_omo/omo_08/npc.c +++ b/src/world/area_omo/omo_08/npc.c @@ -104,7 +104,7 @@ NpcData N(NpcData_Toads)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Conductor), .settings = &N(NpcSettings_TrainToad), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, .tattle = MSG_NpcTattle_OMO_TrainConductor, @@ -115,7 +115,7 @@ NpcData N(NpcData_Toads)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TrainToad), .settings = &N(NpcSettings_TrainToad), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TRAIN_TOAD_GREEN_ANIMS, .tattle = MSG_NpcTattle_OMO_TrainConductor, @@ -140,7 +140,7 @@ NpcData N(NpcData_ShyGuy_01) = { }, .init = &N(EVS_NpcInit_BoxedShyGuy), .settings = &N(NpcSettings_ShyGuy_Wander), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -163,7 +163,7 @@ NpcData N(NpcData_ShyGuy_02) = { }, .init = &N(EVS_NpcInit_BoxedShyGuy), .settings = &N(NpcSettings_ShyGuy_Wander), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -186,7 +186,7 @@ NpcData N(NpcData_ShyGuy_03) = { }, .init = &N(EVS_NpcInit_BoxedShyGuy), .settings = &N(NpcSettings_ShyGuy_Wander), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -209,7 +209,7 @@ NpcData N(NpcData_ShyGuy_04) = { }, .init = &N(EVS_NpcInit_BoxedShyGuy), .settings = &N(NpcSettings_ShyGuy_Wander), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; diff --git a/src/world/area_omo/omo_09/conveyors.c b/src/world/area_omo/omo_09/conveyors.c index db27e438e2..16703947f6 100644 --- a/src/world/area_omo/omo_09/conveyors.c +++ b/src/world/area_omo/omo_09/conveyors.c @@ -105,7 +105,7 @@ API_CALLABLE(N(AddConveyorPush)) { } EvtScript N(EVS_SetupConveyors) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(EnableTexPanning, MODEL_1, TRUE) Call(EnableTexPanning, MODEL_3, TRUE) Call(EnableTexPanning, MODEL_4, TRUE) diff --git a/src/world/area_omo/omo_09/gizmos.c b/src/world/area_omo/omo_09/gizmos.c index 5688d0c3cc..4c3b4cb0ea 100644 --- a/src/world/area_omo/omo_09/gizmos.c +++ b/src/world/area_omo/omo_09/gizmos.c @@ -97,7 +97,7 @@ API_CALLABLE(N(AwaitPlayerNearPlatforms)) { } EvtScript N(EVS_Gizmos_MovingBlocks) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(N(AwaitPlayerNearPlatforms)) Wait(LVar9) Call(ParentColliderToModel, LVar6, LVar7) diff --git a/src/world/area_omo/omo_09/npc.c b/src/world/area_omo/omo_09/npc.c index cecd192de9..a91ed75391 100644 --- a/src/world/area_omo/omo_09/npc.c +++ b/src/world/area_omo/omo_09/npc.c @@ -215,7 +215,7 @@ NpcData N(NpcData_Pokey) = { .yaw = 270, .init = &N(EVS_NpcInit_Pokey), .settings = &N(NpcSettings_Pokey), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = POKEY_ANIMS, }; @@ -226,7 +226,7 @@ NpcData N(NpcData_Koopatrol) = { .yaw = 270, .init = &N(EVS_NpcInit_Koopatrol), .settings = &N(NpcSettings_Koopatrol_Stationary), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOOPATROL_ANIMS, }; @@ -249,7 +249,7 @@ NpcData N(NpcData_ShyGuy_01) = { }, .init = &N(EVS_NpcInit_ShyGuy_Jackpot), .settings = &N(NpcSettings_ShyGuy_Wander), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -272,7 +272,7 @@ NpcData N(NpcData_ShyGuy_02) = { }, .init = &N(EVS_NpcInit_ShyGuy_Jackpot), .settings = &N(NpcSettings_ShyGuy_Wander), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -295,7 +295,7 @@ NpcData N(NpcData_ShyGuy_03) = { }, .init = &N(EVS_NpcInit_ShyGuy_Jackpot), .settings = &N(NpcSettings_ShyGuy_Wander), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -318,7 +318,7 @@ NpcData N(NpcData_ShyGuy_04) = { }, .init = &N(EVS_NpcInit_ShyGuy_Jackpot), .settings = &N(NpcSettings_ShyGuy_Wander), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -341,7 +341,7 @@ NpcData N(NpcData_ShyGuy_05) = { }, .init = &N(EVS_NpcInit_ShyGuy_Jackpot), .settings = &N(NpcSettings_ShyGuy_Wander), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }; @@ -362,7 +362,7 @@ NpcData N(NpcData_Kammy) = { .yaw = 90, .init = &N(EVS_NpcInit_Kammy), .settings = &N(NpcSettings_Kammy_Flying), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), diff --git a/src/world/area_omo/omo_10/npc.c b/src/world/area_omo/omo_10/npc.c index e258254433..ee88c5e128 100644 --- a/src/world/area_omo/omo_10/npc.c +++ b/src/world/area_omo/omo_10/npc.c @@ -42,7 +42,7 @@ NpcData N(NpcData_Toads)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Conductor), .settings = &N(NpcSettings_TrainToad), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, .tattle = MSG_NpcTattle_OMO_TrainConductor, @@ -53,7 +53,7 @@ NpcData N(NpcData_Toads)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TrainToad), .settings = &N(NpcSettings_TrainToad), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TRAIN_TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_OMO_TrainConductor, diff --git a/src/world/area_omo/omo_11/gizmos.c b/src/world/area_omo/omo_11/gizmos.c index d41c618c1d..da47d4ba5e 100644 --- a/src/world/area_omo/omo_11/gizmos.c +++ b/src/world/area_omo/omo_11/gizmos.c @@ -302,7 +302,7 @@ EvtScript N(EVS_UpdateBasicPlatform_Audible) = { }; EvtScript N(EVS_SetupGizmos) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(ParentColliderToModel, COLLIDER_1_0, MODEL_1_0) Call(ParentColliderToModel, COLLIDER_fl, MODEL_fl) Call(ParentColliderToModel, COLLIDER_1_1, MODEL_1_1) diff --git a/src/world/area_omo/omo_12/npc.c b/src/world/area_omo/omo_12/npc.c index 0f08d22531..79962b3ebf 100644 --- a/src/world/area_omo/omo_12/npc.c +++ b/src/world/area_omo/omo_12/npc.c @@ -51,7 +51,7 @@ enum { }; EvtScript N(EVS_ManageLanternLight) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Label(0) Switch(AB_OMO12_LightSource) CaseEq(LIGHT_FROM_DEFAULT) @@ -629,7 +629,7 @@ NpcData N(NpcData_BigLanternGhost) = { .initVarCount = 1, .initVar = { .value = 0 }, .settings = &N(NpcSettings_BigLanternGhost), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = NO_DROPS, .animations = BIG_LANTERN_GHOST_ANIMS, .extraAnimations = N(ExtraAnims_LanternGhost), @@ -675,7 +675,7 @@ NpcData N(NpcData_LanternTop) = { .initVarCount = 1, .initVar = { .value = 0 }, .settings = &N(NpcSettings_Watt), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = BIG_LANTERN_GHOST_ANIMS, .extraAnimations = N(ExtraAnims_LanternGhost), @@ -690,7 +690,7 @@ NpcData N(NpcData_LanternBottom) = { .initVarCount = 1, .initVar = { .value = 0 }, .settings = &N(NpcSettings_Watt), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_CANT_INTERACT, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_CANT_INTERACT, .drops = NO_DROPS, .animations = BIG_LANTERN_GHOST_ANIMS, .extraAnimations = N(ExtraAnims_LanternGhost), diff --git a/src/world/area_omo/omo_13/npc.c b/src/world/area_omo/omo_13/npc.c index dabc37bfe9..6250bad069 100644 --- a/src/world/area_omo/omo_13/npc.c +++ b/src/world/area_omo/omo_13/npc.c @@ -215,7 +215,7 @@ NpcData N(NpcData_AntiGuy) = { .yaw = 270, .init = &N(EVS_NpcInit_AntiGuy), .settings = &N(NpcSettings_AntiGuy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_ShyGuy_Black_Anim01, diff --git a/src/world/area_omo/omo_15/npc.c b/src/world/area_omo/omo_15/npc.c index 25134be223..91f5b26608 100644 --- a/src/world/area_omo/omo_15/npc.c +++ b/src/world/area_omo/omo_15/npc.c @@ -375,7 +375,7 @@ EvtScript N(EVS_NpcDefeat_GeneralGuy) = { Call(SetMusicTrack, 0, SONG_SHY_GUY_TOYBOX, 0, 8) Call(GetSelfNpcID, LVar0) IfEq(LVar0, NPC_GeneralGuy) - Call(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_2, TRUE) + Call(SetEncounterStatusFlags, ENCOUNTER_FLAG_CANT_SKIP_WIN_DELAY, TRUE) UseBuf(Ref(N(FinalSurroundCrowdPositions))) Set(LVar0, NPC_ShyGuy_01) Loop(9) @@ -445,7 +445,7 @@ NpcData N(NpcData_GeneralGuy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_GeneralGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = NO_DROPS, .animations = { .idle = ANIM_GeneralGuy_Anim02, @@ -472,7 +472,7 @@ NpcData N(NpcData_GeneralGuy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -482,7 +482,7 @@ NpcData N(NpcData_GeneralGuy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -492,7 +492,7 @@ NpcData N(NpcData_GeneralGuy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -502,7 +502,7 @@ NpcData N(NpcData_GeneralGuy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -512,7 +512,7 @@ NpcData N(NpcData_GeneralGuy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -522,7 +522,7 @@ NpcData N(NpcData_GeneralGuy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -532,7 +532,7 @@ NpcData N(NpcData_GeneralGuy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -542,7 +542,7 @@ NpcData N(NpcData_GeneralGuy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, @@ -552,7 +552,7 @@ NpcData N(NpcData_GeneralGuy)[] = { .yaw = 270, .init = &N(EVS_NpcInit_ShyGuy), .settings = &N(NpcSettings_ShyGuy_Stationary), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = NO_DROPS, .animations = RED_SHY_GUY_ANIMS, }, diff --git a/src/world/area_omo/omo_16/npc.c b/src/world/area_omo/omo_16/npc.c index 1518f068ce..8c8c3e9e9c 100644 --- a/src/world/area_omo/omo_16/npc.c +++ b/src/world/area_omo/omo_16/npc.c @@ -7,7 +7,7 @@ NpcData N(NpcData_TrainToad) = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, .settings = &N(NpcSettings_TrainToad), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, }; diff --git a/src/world/area_osr/osr_00/main.c b/src/world/area_osr/osr_00/main.c index ce1b25ddfe..974f44822d 100644 --- a/src/world/area_osr/osr_00/main.c +++ b/src/world/area_osr/osr_00/main.c @@ -41,7 +41,7 @@ EvtScript N(EVS_EnterMap) = { }; EvtScript N(EVS_TexPan_Fountain) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_fw1, TEX_PANNER_1) Call(SetTexPanner, MODEL_w2, TEX_PANNER_2) Thread diff --git a/src/world/area_osr/osr_00/npc_epilogue.c b/src/world/area_osr/osr_00/npc_epilogue.c index cae89afbef..25b21e28f5 100644 --- a/src/world/area_osr/osr_00/npc_epilogue.c +++ b/src/world/area_osr/osr_00/npc_epilogue.c @@ -307,7 +307,7 @@ NpcData N(NpcData_Penguins)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Penguin_01), .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .extraAnimations = N(ExtraAnims_Penguin), @@ -318,7 +318,7 @@ NpcData N(NpcData_Penguins)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Penguin_02), .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .extraAnimations = N(ExtraAnims_Penguin), diff --git a/src/world/area_osr/osr_00/npc_intro.c b/src/world/area_osr/osr_00/npc_intro.c index 5d73db517b..7dc6a82ba0 100644 --- a/src/world/area_osr/osr_00/npc_intro.c +++ b/src/world/area_osr/osr_00/npc_intro.c @@ -7,7 +7,7 @@ NpcData N(NpcData_Luigi) = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, .settings = &N(NpcSettings_Luigi), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = LUIGI_ANIMS, }; diff --git a/src/world/area_osr/osr_01/main.c b/src/world/area_osr/osr_01/main.c index 6ee6dd7934..7263661e83 100644 --- a/src/world/area_osr/osr_01/main.c +++ b/src/world/area_osr/osr_01/main.c @@ -14,7 +14,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_TexPan_Fountain) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_o501, TEX_PANNER_1) Call(SetTexPanner, MODEL_w2, TEX_PANNER_2) Thread diff --git a/src/world/area_osr/osr_01/npc.c b/src/world/area_osr/osr_01/npc.c index 4f71e0b6b3..cfe99a6c26 100644 --- a/src/world/area_osr/osr_01/npc.c +++ b/src/world/area_osr/osr_01/npc.c @@ -105,7 +105,7 @@ NpcData N(NpcData_Toad) = { .yaw = 270, .init = &N(EVS_NpcInit_Toad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_OSR_LovesToClean, diff --git a/src/world/area_osr/osr_02/main.c b/src/world/area_osr/osr_02/main.c index 2ab8517be1..7e7eb17164 100644 --- a/src/world/area_osr/osr_02/main.c +++ b/src/world/area_osr/osr_02/main.c @@ -9,7 +9,7 @@ API_CALLABLE(N(SetAvailableDisguise)) { } EvtScript N(EVS_ExitDoor_kpa_121_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_METAL) Set(LVar0, osr_02_ENTRY_0) @@ -25,7 +25,7 @@ EvtScript N(EVS_ExitDoor_kpa_121_1) = { }; EvtScript N(EVS_ExitDoor_kkj_10_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_LARGE) Set(LVar0, osr_02_ENTRY_1) diff --git a/src/world/area_osr/osr_02/npc.c b/src/world/area_osr/osr_02/npc.c index f00c0c7f13..4858bccccd 100644 --- a/src/world/area_osr/osr_02/npc.c +++ b/src/world/area_osr/osr_02/npc.c @@ -535,7 +535,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Peach), .settings = &N(NpcSettings_Peach), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_PLAYER_SPRITE, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_PLAYER_SPRITE, .drops = NO_DROPS, .animations = PEACH_ANIMS, .extraAnimations = N(ExtraAnims_Peach), @@ -546,7 +546,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Twink), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_Twink), @@ -557,7 +557,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Eldstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Eldstar), @@ -568,7 +568,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Mamar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = MAMAR_ANIMS, .extraAnimations = N(ExtraAnims_Mamar), @@ -579,7 +579,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Skolar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = SKOLAR_ANIMS, .extraAnimations = N(ExtraAnims_Skolar), @@ -590,7 +590,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Muskular), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = MUSKULAR_ANIMS, .extraAnimations = N(ExtraAnims_Muskular), @@ -601,7 +601,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Misstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .extraAnimations = N(ExtraAnims_Misstar), @@ -612,7 +612,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Klevar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KLEVAR_ANIMS, .extraAnimations = N(ExtraAnims_Klevar), @@ -623,7 +623,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Kalmar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KALMAR_ANIMS, .extraAnimations = N(ExtraAnims_Kalmar), @@ -634,7 +634,7 @@ NpcData N(NpcData_Spirits)[] = { .yaw = 270, .init = &N(EVS_NpcInit_StarRod), .settings = &N(NpcSettings_StarRod), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = STAR_ROD_ANIMS, }, diff --git a/src/world/area_osr/osr_02/npc_peach.c b/src/world/area_osr/osr_02/npc_peach.c index cb476b5eb3..d48916c199 100644 --- a/src/world/area_osr/osr_02/npc_peach.c +++ b/src/world/area_osr/osr_02/npc_peach.c @@ -79,7 +79,7 @@ NpcData N(NpcData_Clubba) = { .yaw = 270, .init = &N(EVS_NpcInit_Clubba), .settings = &N(NpcSettings_Clubba), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = CLUBBA_ANIMS, .extraAnimations = N(ExtraAnims_Clubba), diff --git a/src/world/area_osr/osr_03/npc.c b/src/world/area_osr/osr_03/npc.c index 689f5d5437..e991aa4c61 100644 --- a/src/world/area_osr/osr_03/npc.c +++ b/src/world/area_osr/osr_03/npc.c @@ -26,7 +26,7 @@ NpcData N(NpcData_Kammy) = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, .settings = &N(NpcSettings_Kammy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = KAMMY_ANIMS, .extraAnimations = N(ExtraAnims_Kammy), diff --git a/src/world/area_osr/osr_04/main.c b/src/world/area_osr/osr_04/main.c index 805584a39f..b3048f86a6 100644 --- a/src/world/area_osr/osr_04/main.c +++ b/src/world/area_osr/osr_04/main.c @@ -1,7 +1,7 @@ #include "osr_04.h" EvtScript N(EVS_TexPan_Smoke) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_ke1, TEX_PANNER_0) Call(SetTexPanner, MODEL_ke2, TEX_PANNER_1) Call(SetTexPanner, MODEL_ke3, TEX_PANNER_2) diff --git a/src/world/area_pra/pra_01/main.c b/src/world/area_pra/pra_01/main.c index 0ffbd68ff8..c4830cd924 100644 --- a/src/world/area_pra/pra_01/main.c +++ b/src/world/area_pra/pra_01/main.c @@ -15,7 +15,7 @@ EvtScript N(EVS_ExitWalk_sam_10_1) = EVT_EXIT_WALK(60, pra_01_ENTRY_0, "sam_10", EvtScript N(EVS_ExitWalk_pra_15_0) = EVT_EXIT_WALK(60, pra_01_ENTRY_3, "pra_15", pra_15_ENTRY_0); EvtScript N(EVS_ExitDoor_pra_02_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_01_ENTRY_1) Set(LVar1, COLLIDER_deilittse) @@ -35,7 +35,7 @@ EvtScript N(EVS_ExitDoor_pra_02_0) = { }; EvtScript N(EVS_ExitDoor_pra_02_5) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_01_ENTRY_2) Set(LVar1, COLLIDER_deilittse) diff --git a/src/world/area_pra/pra_01/npc.c b/src/world/area_pra/pra_01/npc.c index d2212b3f42..b2b87a7adb 100644 --- a/src/world/area_pra/pra_01/npc.c +++ b/src/world/area_pra/pra_01/npc.c @@ -188,7 +188,7 @@ NpcData N(NpcData_Kalmar) = { .yaw = 90, .init = &N(EVS_NpcInit_Kalmar), .settings = &N(NpcSettings_StarSpirit), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KALMAR_ANIMS, }; diff --git a/src/world/area_pra/pra_02/entity.c b/src/world/area_pra/pra_02/entity.c index 19fd50818e..4477d65fd6 100644 --- a/src/world/area_pra/pra_02/entity.c +++ b/src/world/area_pra/pra_02/entity.c @@ -162,18 +162,18 @@ EvtScript N(EVS_UpdatePadlockPositions) = { #include "world/common/todo/GetEntityPosition.inc.c" EvtScript N(EVS_ItemPrompt_RedPadlock) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowKeyChoicePopup) IfEq(LVar0, 0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf IfEq(LVar0, -1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf Call(FindKeyItem, ITEM_RED_KEY, LVar0) @@ -192,25 +192,25 @@ EvtScript N(EVS_ItemPrompt_RedPadlock) = { Set(LVar0, MV_FarRedPadlock) Set(MV_FarRedPadlock, -1) Call(N(RemovePadlock)) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Unbind Return End }; EvtScript N(EVS_ItemPrompt_BluePadlock) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowKeyChoicePopup) IfEq(LVar0, 0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf IfEq(LVar0, -1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return EndIf Call(FindKeyItem, ITEM_BLUE_KEY, LVar0) @@ -229,7 +229,7 @@ EvtScript N(EVS_ItemPrompt_BluePadlock) = { Set(LVar0, MV_FarBluePadlock) Set(MV_FarBluePadlock, -1) Call(N(RemovePadlock)) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Unbind Return End diff --git a/src/world/area_pra/pra_02/main.c b/src/world/area_pra/pra_02/main.c index e231a60d45..e908a4df6e 100644 --- a/src/world/area_pra/pra_02/main.c +++ b/src/world/area_pra/pra_02/main.c @@ -38,7 +38,7 @@ s32 N(FarCenterDoorModels)[] = { MODEL_o774, -1 }; s32 N(EmptyModelList)[] = { -1 }; EvtScript N(EVS_ExitDoors_pra_01_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, pra_02_ENTRY_0) @@ -59,7 +59,7 @@ EvtScript N(EVS_ExitDoors_pra_01_1) = { }; EvtScript N(EVS_ExitDoors_pra_03_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, pra_02_ENTRY_1) @@ -80,7 +80,7 @@ EvtScript N(EVS_ExitDoors_pra_03_0) = { }; EvtScript N(EVS_ExitDoors_pra_16_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, pra_02_ENTRY_2) @@ -101,7 +101,7 @@ EvtScript N(EVS_ExitDoors_pra_16_0) = { }; EvtScript N(EVS_ExitDoors_pra_13_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, pra_02_ENTRY_2) @@ -122,7 +122,7 @@ EvtScript N(EVS_ExitDoors_pra_13_0) = { }; EvtScript N(EVS_ExitDoors_pra_16_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, pra_02_ENTRY_3) @@ -143,7 +143,7 @@ EvtScript N(EVS_ExitDoors_pra_16_3) = { }; EvtScript N(EVS_ExitDoors_pra_13_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, pra_02_ENTRY_3) @@ -165,7 +165,7 @@ End }; EvtScript N(EVS_ExitDoors_pra_04_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, pra_02_ENTRY_4) @@ -186,7 +186,7 @@ EvtScript N(EVS_ExitDoors_pra_04_0) = { }; EvtScript N(EVS_ExitDoors_pra_01_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, pra_02_ENTRY_5) diff --git a/src/world/area_pra/pra_03/main.c b/src/world/area_pra/pra_03/main.c index 9d8a79b18c..8c4eed77ac 100644 --- a/src/world/area_pra/pra_03/main.c +++ b/src/world/area_pra/pra_03/main.c @@ -1,7 +1,7 @@ #include "pra_03.h" EvtScript N(EVS_ExitDoors_pra_02_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_03_ENTRY_0) Set(LVar1, COLLIDER_deilittnnw) diff --git a/src/world/area_pra/pra_04/main.c b/src/world/area_pra/pra_04/main.c index e719bc1608..41a7fac7d8 100644 --- a/src/world/area_pra/pra_04/main.c +++ b/src/world/area_pra/pra_04/main.c @@ -1,7 +1,7 @@ #include "pra_04.h" EvtScript N(EVS_ExitDoor_pra_02_4) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_04_ENTRY_0) Set(LVar1, COLLIDER_deilittssw) diff --git a/src/world/area_pra/pra_05/main.c b/src/world/area_pra/pra_05/main.c index afa02025a6..2db546f655 100644 --- a/src/world/area_pra/pra_05/main.c +++ b/src/world/area_pra/pra_05/main.c @@ -4,7 +4,7 @@ #include "../common/Reflection.data.inc.c" EvtScript N(EVS_ExitDoors_pra_38_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_05_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) diff --git a/src/world/area_pra/pra_06/main.c b/src/world/area_pra/pra_06/main.c index 0355cc293d..9dc6fa1d18 100644 --- a/src/world/area_pra/pra_06/main.c +++ b/src/world/area_pra/pra_06/main.c @@ -11,7 +11,7 @@ s32 N(map_init)(void) { #include "../common/Reflection.data.inc.c" EvtScript N(EVS_ExitDoors_pra_39_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_06_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) diff --git a/src/world/area_pra/pra_09/main.c b/src/world/area_pra/pra_09/main.c index 79d69acd9c..4ca12bb77e 100644 --- a/src/world/area_pra/pra_09/main.c +++ b/src/world/area_pra/pra_09/main.c @@ -5,7 +5,7 @@ #include "../common/Reflection.data.inc.c" EvtScript N(EVS_ExitDoors_pra_03_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_09_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) diff --git a/src/world/area_pra/pra_09/npc.c b/src/world/area_pra/pra_09/npc.c index 71ac9da887..0cbcd03ccf 100644 --- a/src/world/area_pra/pra_09/npc.c +++ b/src/world/area_pra/pra_09/npc.c @@ -687,7 +687,7 @@ EvtScript N(EVS_NpcInteract_Bombette_05) = { EvtScript N(EVS_NpcInit_Duplighost_05) = { Call(BindNpcDefeat, NPC_SELF, Ref(N(EVS_NpcDefeat_Duplighost_05))) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_USE_INSPECT_ICON, TRUE) Exec(N(EVS_ManageImpostersScene)) Return End @@ -734,25 +734,25 @@ EvtScript N(EVS_NpcInit_Bombette_05) = { }; EvtScript N(EVS_NpcInit_Duplighost_01) = { - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_USE_INSPECT_ICON, TRUE) Return End }; EvtScript N(EVS_NpcInit_Duplighost_02) = { - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_USE_INSPECT_ICON, TRUE) Return End }; EvtScript N(EVS_NpcInit_Duplighost_03) = { - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_USE_INSPECT_ICON, TRUE) Return End }; EvtScript N(EVS_NpcInit_Duplighost_04) = { - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_USE_INSPECT_ICON, TRUE) Return End }; @@ -764,7 +764,7 @@ NpcData N(NpcData_InteractableBombettes)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Bombette_01), .settings = &N(NpcSettings_Bombette), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, @@ -774,7 +774,7 @@ NpcData N(NpcData_InteractableBombettes)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Bombette_02), .settings = &N(NpcSettings_Bombette), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, @@ -784,7 +784,7 @@ NpcData N(NpcData_InteractableBombettes)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Bombette_03), .settings = &N(NpcSettings_Bombette), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, @@ -794,7 +794,7 @@ NpcData N(NpcData_InteractableBombettes)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Bombette_04), .settings = &N(NpcSettings_Bombette), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, @@ -804,7 +804,7 @@ NpcData N(NpcData_InteractableBombettes)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Bombette_05), .settings = &N(NpcSettings_Bombette), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, @@ -817,7 +817,7 @@ NpcData N(NpcData_Duplighosts)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Duplighost_01), .settings = &N(NpcSettings_Duplighost), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = DUPLIGHOST_ANIMS, }, @@ -827,7 +827,7 @@ NpcData N(NpcData_Duplighosts)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Duplighost_02), .settings = &N(NpcSettings_Duplighost), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = DUPLIGHOST_ANIMS, }, @@ -837,7 +837,7 @@ NpcData N(NpcData_Duplighosts)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Duplighost_03), .settings = &N(NpcSettings_Duplighost), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = DUPLIGHOST_ANIMS, }, @@ -847,7 +847,7 @@ NpcData N(NpcData_Duplighosts)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Duplighost_04), .settings = &N(NpcSettings_Duplighost), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = DUPLIGHOST_ANIMS, }, @@ -857,7 +857,7 @@ NpcData N(NpcData_Duplighosts)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Duplighost_05), .settings = &N(NpcSettings_Duplighost), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = DUPLIGHOST_ANIMS, }, @@ -966,7 +966,7 @@ EvtScript N(EVS_NpcIdle_TargetBombette_05) = { EvtScript N(EVS_NpcInit_TargetBombette_01) = { Call(BindNpcHit, NPC_SELF, Ref(N(EVS_NpcHit_TargetBombette_01))) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_TargetBombette_01))) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_USE_INSPECT_ICON, TRUE) Return End }; @@ -974,7 +974,7 @@ EvtScript N(EVS_NpcInit_TargetBombette_01) = { EvtScript N(EVS_NpcInit_TargetBombette_02) = { Call(BindNpcHit, NPC_SELF, Ref(N(EVS_NpcHit_TargetBombette_02))) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_TargetBombette_02))) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_USE_INSPECT_ICON, TRUE) Return End }; @@ -982,7 +982,7 @@ EvtScript N(EVS_NpcInit_TargetBombette_02) = { EvtScript N(EVS_NpcInit_TargetBombette_03) = { Call(BindNpcHit, NPC_SELF, Ref(N(EVS_NpcHit_TargetBombette_03))) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_TargetBombette_03))) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_USE_INSPECT_ICON, TRUE) Return End }; @@ -990,7 +990,7 @@ EvtScript N(EVS_NpcInit_TargetBombette_03) = { EvtScript N(EVS_NpcInit_TargetBombette_04) = { Call(BindNpcHit, NPC_SELF, Ref(N(EVS_NpcHit_TargetBombette_04))) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_TargetBombette_04))) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_USE_INSPECT_ICON, TRUE) Return End }; @@ -998,7 +998,7 @@ EvtScript N(EVS_NpcInit_TargetBombette_04) = { EvtScript N(EVS_NpcInit_TargetBombette_05) = { Call(BindNpcHit, NPC_SELF, Ref(N(EVS_NpcHit_TargetBombette_05))) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_TargetBombette_05))) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_USE_INSPECT_ICON, TRUE) Return End }; @@ -1010,7 +1010,7 @@ NpcData N(NpcData_TargetBombettes)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TargetBombette_01), .settings = &N(NpcSettings_Bombette), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, @@ -1020,7 +1020,7 @@ NpcData N(NpcData_TargetBombettes)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TargetBombette_02), .settings = &N(NpcSettings_Bombette), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, @@ -1030,7 +1030,7 @@ NpcData N(NpcData_TargetBombettes)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TargetBombette_03), .settings = &N(NpcSettings_Bombette), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, @@ -1040,7 +1040,7 @@ NpcData N(NpcData_TargetBombettes)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TargetBombette_04), .settings = &N(NpcSettings_Bombette), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, @@ -1050,7 +1050,7 @@ NpcData N(NpcData_TargetBombettes)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TargetBombette_05), .settings = &N(NpcSettings_Bombette), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, diff --git a/src/world/area_pra/pra_10/main.c b/src/world/area_pra/pra_10/main.c index de64046bc1..271638a4fa 100644 --- a/src/world/area_pra/pra_10/main.c +++ b/src/world/area_pra/pra_10/main.c @@ -4,7 +4,7 @@ #include "../common/Reflection.data.inc.c" EvtScript N(EVS_ExitDoors_pra_04_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_10_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) @@ -21,7 +21,7 @@ EvtScript N(EVS_ExitDoors_pra_04_2) = { }; EvtScript N(EVS_ExitDoors_pra_12_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_10_ENTRY_1) Set(LVar1, COLLIDER_deilittse) diff --git a/src/world/area_pra/pra_12/main.c b/src/world/area_pra/pra_12/main.c index 1c059a149b..88bfdbaf04 100644 --- a/src/world/area_pra/pra_12/main.c +++ b/src/world/area_pra/pra_12/main.c @@ -11,7 +11,7 @@ s32 N(map_init)(void) { #include "../common/Reflection.data.inc.c" EvtScript N(EVS_ExitDoors_pra_10_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_12_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) diff --git a/src/world/area_pra/pra_13/main.c b/src/world/area_pra/pra_13/main.c index 8ebd3a6d0b..3c17e3aaf7 100644 --- a/src/world/area_pra/pra_13/main.c +++ b/src/world/area_pra/pra_13/main.c @@ -16,7 +16,7 @@ s32 N(BothLeftDoorModelsL)[] = { MODEL_o772, MODEL_o844, MODEL_o859, MODEL_o860, s32 N(BothLeftDoorModelsR)[] = { MODEL_o768, MODEL_o846, MODEL_o861, MODEL_o862, -1 }; EvtScript N(EVS_ExitDoors_pra_02_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, 0) @@ -51,7 +51,7 @@ EvtScript N(EVS_Unused_2) = { }; EvtScript N(EVS_ExitDoors_pra_02_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, 3) diff --git a/src/world/area_pra/pra_13/npc.c b/src/world/area_pra/pra_13/npc.c index 0177962464..0b8be26328 100644 --- a/src/world/area_pra/pra_13/npc.c +++ b/src/world/area_pra/pra_13/npc.c @@ -137,7 +137,7 @@ EvtScript N(EVS_Scene_DefeatImposters) = { Call(SetNpcPos, NPC_Duplighost_02, 370, 0, -70) Call(SetNpcAnimation, NPC_Duplighost_01, ANIM_Duplighost_Anim02) Call(SetNpcAnimation, NPC_Duplighost_02, ANIM_Duplighost_Anim02) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(SetNpcPos, NPC_FakeBombette, NPC_DISPOSE_LOCATION) Wait(10) @@ -157,15 +157,15 @@ EvtScript N(EVS_Scene_DefeatImposters) = { Call(NpcMoveTo, NPC_Duplighost_02, -30, -70, 45) Call(SetNpcPos, NPC_Duplighost_02, -30, -1000, 0) Set(GB_StoryProgress, STORY_CH7_DEFEATED_MIRROR_DUPLIGHOSTS) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) - SetGroup(EVT_GROUP_0B) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(DisablePlayerInput, FALSE) Return End }; EvtScript N(EVS_NpcInit_FakeMario) = { - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_USE_INSPECT_ICON, TRUE) Call(SetNpcAnimation, NPC_SELF, ANIM_Mario1_Idle) Call(GetEntryID, LVar0) IfEq(LVar0, pra_13_ENTRY_2) @@ -187,7 +187,7 @@ EvtScript N(EVS_NpcInit_FakeMario) = { EvtScript N(EVS_NpcInit_FakeBombette) = { Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_Scene_ImpostersCaught))) Call(BindNpcDefeat, NPC_SELF, Ref(N(EVS_Scene_DefeatImposters))) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_USE_INSPECT_ICON, TRUE) Call(GetEntryID, LVar0) IfEq(LVar0, pra_13_ENTRY_2) IfLt(GB_StoryProgress, STORY_CH7_DEFEATED_MIRROR_DUPLIGHOSTS) @@ -209,13 +209,13 @@ EvtScript N(EVS_NpcInit_FakeBombette) = { }; EvtScript N(EVS_NpcInit_Duplighost_01) = { - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_USE_INSPECT_ICON, TRUE) Return End }; EvtScript N(EVS_NpcInit_Duplighost_02) = { - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_USE_INSPECT_ICON, TRUE) Return End }; @@ -226,7 +226,7 @@ NpcData N(NpcData_FakeMario) = { .yaw = 90, .init = &N(EVS_NpcInit_FakeMario), .settings = &N(NpcSettings_Player), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }; @@ -238,7 +238,7 @@ NpcData N(NpcData_Imposters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_FakeBombette), .settings = &N(NpcSettings_Player), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = BOMBETTE_ANIMS, }, @@ -248,7 +248,7 @@ NpcData N(NpcData_Imposters)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Duplighost_01), .settings = &N(NpcSettings_Player), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = DUPLIGHOST_ANIMS, }, @@ -258,7 +258,7 @@ NpcData N(NpcData_Imposters)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Duplighost_02), .settings = &N(NpcSettings_Player), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = DUPLIGHOST_ANIMS, }, diff --git a/src/world/area_pra/pra_16/main.c b/src/world/area_pra/pra_16/main.c index cacf8cfdb8..d605401be4 100644 --- a/src/world/area_pra/pra_16/main.c +++ b/src/world/area_pra/pra_16/main.c @@ -21,7 +21,7 @@ s32 N(BothLeftDoorModelsL)[] = { MODEL_o874, MODEL_o875, MODEL_o880, MODEL_o881, s32 N(BothLeftDoorModelsR)[] = { MODEL_o876, MODEL_o877, MODEL_o878, MODEL_o879, -1 }; EvtScript N(EVS_ExitDoors_pra_02_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, pra_16_ENTRY_0) @@ -42,7 +42,7 @@ EvtScript N(EVS_ExitDoors_pra_02_2) = { }; EvtScript N(EVS_ExitDoors_pra_18_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, pra_16_ENTRY_1) @@ -63,7 +63,7 @@ EvtScript N(EVS_ExitDoors_pra_18_0) = { }; EvtScript N(EVS_ExitDoors_pra_18_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_BASIC) Set(LVar0, pra_16_ENTRY_2) @@ -84,7 +84,7 @@ EvtScript N(EVS_ExitDoors_pra_18_2) = { }; EvtScript N(EVS_ExitDoors_pra_02_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(UseDoorSounds, DOOR_SOUNDS_CREAKY) Set(LVar0, pra_16_ENTRY_3) diff --git a/src/world/area_pra/pra_18/main.c b/src/world/area_pra/pra_18/main.c index e7088d6f39..b8f12bce1f 100644 --- a/src/world/area_pra/pra_18/main.c +++ b/src/world/area_pra/pra_18/main.c @@ -16,7 +16,7 @@ s32 N(LeftDoorModelsL)[] = { MODEL_o995, MODEL_o996, -1 }; s32 N(LeftDoorModelsR)[] = { MODEL_o997, MODEL_o998, -1 }; EvtScript N(EVS_ExitDoors_pra_16_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_18_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) @@ -36,7 +36,7 @@ EvtScript N(EVS_ExitDoors_pra_16_1) = { }; EvtScript N(EVS_ExitDoors_pra_33_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_18_ENTRY_1) Set(LVar1, COLLIDER_deilittne) @@ -51,7 +51,7 @@ EvtScript N(EVS_ExitDoors_pra_33_1) = { }; EvtScript N(EVS_ExitDoors_pra_16_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_18_ENTRY_2) Set(LVar1, COLLIDER_deilittnw) diff --git a/src/world/area_pra/pra_18/npc.c b/src/world/area_pra/pra_18/npc.c index d173de410f..69dbe756a9 100644 --- a/src/world/area_pra/pra_18/npc.c +++ b/src/world/area_pra/pra_18/npc.c @@ -254,7 +254,7 @@ EvtScript N(EVS_NpcInit_Clubba_01) = { Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_Clubba_01))) Call(BindNpcDefeat, NPC_SELF, Ref(N(EVS_NpcDefeat_Clubba_01))) Call(BindNpcHit, NPC_SELF, Ref(N(EVS_NpcHit_Clubba_01))) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_USE_INSPECT_ICON, TRUE) Return End }; @@ -272,7 +272,7 @@ EvtScript N(EVS_NpcInit_Clubba_02) = { Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_Clubba_02))) Call(BindNpcDefeat, NPC_SELF, Ref(N(EVS_NpcDefeat_Clubba_02))) Call(BindNpcHit, NPC_SELF, Ref(N(EVS_NpcHit_Clubba_02))) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_USE_INSPECT_ICON, TRUE) Return End }; @@ -286,7 +286,7 @@ EvtScript N(EVS_NpcInit_Clubba_03) = { Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_Clubba_03))) Call(BindNpcDefeat, NPC_SELF, Ref(N(EVS_NpcDefeat_Clubba_03))) Call(BindNpcHit, NPC_SELF, Ref(N(EVS_NpcHit_Clubba_03))) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_USE_INSPECT_ICON, TRUE) Return End }; @@ -300,7 +300,7 @@ EvtScript N(EVS_NpcInit_Clubba_01_Aux) = { Call(RemoveNpc, NPC_SELF) Return EndIf - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_USE_INSPECT_ICON, TRUE) Call(BindNpcHit, NPC_SELF, Ref(N(EVS_NpcHit_Clubba_01_Aux))) Return End @@ -315,7 +315,7 @@ EvtScript N(EVS_NpcInit_Clubba_02_Aux) = { Call(RemoveNpc, NPC_SELF) Return EndIf - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_USE_INSPECT_ICON, TRUE) Call(BindNpcHit, NPC_SELF, Ref(N(EVS_NpcHit_Clubba_02_Aux))) Return End @@ -326,7 +326,7 @@ EvtScript N(EVS_NpcInit_Clubba_03_Aux) = { Call(RemoveNpc, NPC_SELF) Return EndIf - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_USE_INSPECT_ICON, TRUE) Call(BindNpcHit, NPC_SELF, Ref(N(EVS_NpcHit_Clubba_03_Aux))) Return End @@ -345,7 +345,7 @@ NpcData N(NpcData_Clubba_01)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Clubba_01), .settings = &N(NpcSettings_Clubba), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | CLUBBA_EXTRA_FLAGS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | CLUBBA_EXTRA_FLAGS, .drops = NO_DROPS, .animations = FROST_CLUBBA_ANIMS, }, @@ -355,7 +355,7 @@ NpcData N(NpcData_Clubba_01)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Clubba_01_Aux), .settings = &N(NpcSettings_Clubba), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_400000 | CLUBBA_EXTRA_FLAGS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | CLUBBA_EXTRA_FLAGS, .drops = NO_DROPS, .animations = FROST_CLUBBA_ANIMS, }, @@ -368,7 +368,7 @@ NpcData N(NpcData_Clubba_02)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Clubba_02), .settings = &N(NpcSettings_Clubba), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | CLUBBA_EXTRA_FLAGS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | CLUBBA_EXTRA_FLAGS, .drops = NO_DROPS, .animations = FROST_CLUBBA_ANIMS, }, @@ -378,7 +378,7 @@ NpcData N(NpcData_Clubba_02)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Clubba_02_Aux), .settings = &N(NpcSettings_Clubba), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_400000 | CLUBBA_EXTRA_FLAGS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | CLUBBA_EXTRA_FLAGS, .drops = NO_DROPS, .animations = FROST_CLUBBA_ANIMS, }, @@ -391,7 +391,7 @@ NpcData N(NpcData_Clubba_03)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Clubba_03), .settings = &N(NpcSettings_Clubba), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | CLUBBA_EXTRA_FLAGS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | CLUBBA_EXTRA_FLAGS, .drops = NO_DROPS, .animations = FROST_CLUBBA_ANIMS, }, @@ -401,7 +401,7 @@ NpcData N(NpcData_Clubba_03)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Clubba_03_Aux), .settings = &N(NpcSettings_Clubba), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_400000 | CLUBBA_EXTRA_FLAGS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | CLUBBA_EXTRA_FLAGS, .drops = NO_DROPS, .animations = FROST_CLUBBA_ANIMS, }, diff --git a/src/world/area_pra/pra_19/main.c b/src/world/area_pra/pra_19/main.c index 042b572b06..5eb44343c8 100644 --- a/src/world/area_pra/pra_19/main.c +++ b/src/world/area_pra/pra_19/main.c @@ -8,7 +8,7 @@ s32 N(DoorModelsL)[] = { MODEL_o772, MODEL_o844, -1 }; s32 N(DoorModelsR)[] = { MODEL_o768, MODEL_o846, -1 }; EvtScript N(EVS_ExitDoor_pra_35_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_19_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) diff --git a/src/world/area_pra/pra_19/npc.c b/src/world/area_pra/pra_19/npc.c index a39ff28357..11056c7ad7 100644 --- a/src/world/area_pra/pra_19/npc.c +++ b/src/world/area_pra/pra_19/npc.c @@ -914,7 +914,7 @@ EvtScript N(EVS_NpcInteract_FakeKolorado) = { EvtScript N(EVS_NpcInit_Duplighost_Controller) = { Call(BindNpcDefeat, NPC_SELF, Ref(N(EVS_Scene_DefeatMiniboss))) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_USE_INSPECT_ICON, TRUE) Exec(N(EVS_ManageImpostersScene)) Return End @@ -961,7 +961,7 @@ EvtScript N(EVS_NpcInit_FakeKolorado) = { }; EvtScript N(EVS_NpcInit_ExamplePlayer) = { - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_USE_INSPECT_ICON, TRUE) Call(SetNpcAnimation, NPC_SELF, ANIM_Mario1_Idle) MallocArray(16, LVarA) Call(N(CreateExamplePlayerRenderer)) @@ -970,31 +970,31 @@ EvtScript N(EVS_NpcInit_ExamplePlayer) = { }; EvtScript N(EVS_NpcInit_ExampleKooper) = { - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_USE_INSPECT_ICON, TRUE) Return End }; EvtScript N(EVS_NpcInit_Duplighost_Goompa) = { - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_USE_INSPECT_ICON, TRUE) Return End }; EvtScript N(EVS_NpcInit_Duplighost_Luigi) = { - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_USE_INSPECT_ICON, TRUE) Return End }; EvtScript N(EVS_NpcInit_Duplighost_KoopaKoot) = { - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_USE_INSPECT_ICON, TRUE) Return End }; EvtScript N(EVS_NpcInit_Duplighost_Kolorado) = { - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_REFLECT_FLOOR | NPC_FLAG_USE_INSPECT_ICON, TRUE) Return End }; @@ -1046,7 +1046,7 @@ NpcData N(NpcData_Imposters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_FakeKooper), .settings = &N(NpcSettings_Kooper), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldKooper_Idle, @@ -1073,7 +1073,7 @@ NpcData N(NpcData_Imposters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_FakeGoompa), .settings = &N(NpcSettings_Goompa), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = { .idle = ANIM_Goompa_Idle, @@ -1101,7 +1101,7 @@ NpcData N(NpcData_Imposters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_FakeLuigi), .settings = &N(NpcSettings_Kooper), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = LUIGI_ANIMS, .extraAnimations = N(ExtraAnims_Luigi), @@ -1112,7 +1112,7 @@ NpcData N(NpcData_Imposters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_FakeKoopaKoot), .settings = &N(NpcSettings_KoopaKoot), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaKoot_Idle, @@ -1140,7 +1140,7 @@ NpcData N(NpcData_Imposters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_FakeKolorado), .settings = &N(NpcSettings_Kolorado), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .extraAnimations = N(ExtraAnims_Kolorado), @@ -1151,7 +1151,7 @@ NpcData N(NpcData_Imposters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_ExamplePlayer), .settings = &N(NpcSettings_Duplighost), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = { .idle = ANIM_Duplighost_Anim02, @@ -1179,7 +1179,7 @@ NpcData N(NpcData_Imposters)[] = { .yaw = 90, .init = &N(EVS_NpcInit_ExampleKooper), .settings = &N(NpcSettings_Kooper), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldKooper_Idle, @@ -1209,7 +1209,7 @@ NpcData N(NpcData_Duplighosts)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Duplighost_Goompa), .settings = &N(NpcSettings_Duplighost), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_Duplighost_Anim02, @@ -1237,7 +1237,7 @@ NpcData N(NpcData_Duplighosts)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Duplighost_Luigi), .settings = &N(NpcSettings_Duplighost), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_Duplighost_Anim02, @@ -1265,7 +1265,7 @@ NpcData N(NpcData_Duplighosts)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Duplighost_KoopaKoot), .settings = &N(NpcSettings_Duplighost), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_Duplighost_Anim02, @@ -1293,7 +1293,7 @@ NpcData N(NpcData_Duplighosts)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Duplighost_Kolorado), .settings = &N(NpcSettings_Duplighost), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_Duplighost_Anim02, @@ -1321,7 +1321,7 @@ NpcData N(NpcData_Duplighosts)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Duplighost_Controller), .settings = &N(NpcSettings_Duplighost), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_Duplighost_Anim02, @@ -1448,7 +1448,7 @@ EvtScript N(EVS_NpcHit_TargetKolorado) = { EvtScript N(EVS_NpcInit_TargetKooper) = { Call(BindNpcHit, NPC_SELF, Ref(N(EVS_NpcHit_TargetKooper))) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_TargetKooper))) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_USE_INSPECT_ICON, TRUE) Return End }; @@ -1456,7 +1456,7 @@ EvtScript N(EVS_NpcInit_TargetKooper) = { EvtScript N(EVS_NpcInit_TargetGoompa) = { Call(BindNpcHit, NPC_SELF, Ref(N(EVS_NpcHit_TargetGoompa))) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_TargetGoompa))) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_USE_INSPECT_ICON, TRUE) Return End }; @@ -1464,7 +1464,7 @@ EvtScript N(EVS_NpcInit_TargetGoompa) = { EvtScript N(EVS_NpcInit_TargetLuigi) = { Call(BindNpcHit, NPC_SELF, Ref(N(EVS_NpcHit_TargetLuigi))) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_TargetLuigi))) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_USE_INSPECT_ICON, TRUE) Return End }; @@ -1472,7 +1472,7 @@ EvtScript N(EVS_NpcInit_TargetLuigi) = { EvtScript N(EVS_NpcInit_TargetKoopaKoot) = { Call(BindNpcHit, NPC_SELF, Ref(N(EVS_NpcHit_TargetKoopaKoot))) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_TargetKoopaKoot))) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_USE_INSPECT_ICON, TRUE) Return End }; @@ -1480,7 +1480,7 @@ EvtScript N(EVS_NpcInit_TargetKoopaKoot) = { EvtScript N(EVS_NpcInit_TargetKolorado) = { Call(BindNpcHit, NPC_SELF, Ref(N(EVS_NpcHit_TargetKolorado))) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_TargetKolorado))) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_USE_INSPECT_ICON, TRUE) Return End }; @@ -1492,7 +1492,7 @@ NpcData N(NpcData_Targets)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TargetKooper), .settings = &N(NpcSettings_Kooper), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldKooper_Idle, @@ -1519,7 +1519,7 @@ NpcData N(NpcData_Targets)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TargetGoompa), .settings = &N(NpcSettings_Goompa), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = { .idle = ANIM_Goompa_Idle, @@ -1547,7 +1547,7 @@ NpcData N(NpcData_Targets)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TargetLuigi), .settings = &N(NpcSettings_Kooper), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = LUIGI_ANIMS, .extraAnimations = N(ExtraAnims_Luigi), @@ -1558,7 +1558,7 @@ NpcData N(NpcData_Targets)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TargetKoopaKoot), .settings = &N(NpcSettings_KoopaKoot), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaKoot_Idle, @@ -1586,7 +1586,7 @@ NpcData N(NpcData_Targets)[] = { .yaw = 90, .init = &N(EVS_NpcInit_TargetKolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .extraAnimations = N(ExtraAnims_Kolorado), diff --git a/src/world/area_pra/pra_20/main.c b/src/world/area_pra/pra_20/main.c index 1b514abcf3..8e1b695314 100644 --- a/src/world/area_pra/pra_20/main.c +++ b/src/world/area_pra/pra_20/main.c @@ -21,7 +21,7 @@ s32 N(ModelListNone)[] = { -1 }; EvtScript N(EVS_ExitWalk_pra_19_1) = EVT_EXIT_WALK(60, pra_20_ENTRY_0, "pra_19", pra_19_ENTRY_1); EvtScript N(EVS_ExitDoor_pra_21_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_20_ENTRY_1) Set(LVar1, COLLIDER_deilittssw) @@ -41,7 +41,7 @@ EvtScript N(EVS_ExitDoor_pra_21_0) = { }; EvtScript N(EVS_ExitDoors_pra_29_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_20_ENTRY_2) Set(LVar1, COLLIDER_deilittse) @@ -61,7 +61,7 @@ EvtScript N(EVS_ExitDoors_pra_29_0) = { }; EvtScript N(EVS_ExitDoors_pra_29_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_20_ENTRY_3) Set(LVar1, COLLIDER_deilittne) @@ -81,7 +81,7 @@ EvtScript N(EVS_ExitDoors_pra_29_3) = { }; EvtScript N(EVS_ExitDoor_pra_22_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_20_ENTRY_4) Set(LVar1, COLLIDER_deilittnnw) diff --git a/src/world/area_pra/pra_21/main.c b/src/world/area_pra/pra_21/main.c index df4dc8bab4..0c2ceb6a08 100644 --- a/src/world/area_pra/pra_21/main.c +++ b/src/world/area_pra/pra_21/main.c @@ -4,7 +4,7 @@ s32 N(DoorModelsL)[] = { MODEL_o977, -1 }; s32 N(DoorModelsR)[] = { MODEL_o976, -1 }; EvtScript N(EVS_ExitDoor_pra_20_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_21_ENTRY_0) Set(LVar1, COLLIDER_deilittnnw) @@ -19,7 +19,7 @@ EvtScript N(EVS_ExitDoor_pra_20_1) = { }; EvtScript N(EVS_ExitDoors_pra_36_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_21_ENTRY_1) Set(LVar1, COLLIDER_deilittnne) diff --git a/src/world/area_pra/pra_22/main.c b/src/world/area_pra/pra_22/main.c index 0f05c0d296..bf22a7c4c2 100644 --- a/src/world/area_pra/pra_22/main.c +++ b/src/world/area_pra/pra_22/main.c @@ -32,7 +32,7 @@ s32 N(DoorModelsL)[] = { MODEL_o1001, -1 }; s32 N(DoorModelsR)[] = { MODEL_o1002, -1 }; EvtScript N(EVS_ExitDoors_pra_20_4) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_22_ENTRY_0) Set(LVar1, COLLIDER_deilittssw) @@ -47,7 +47,7 @@ EvtScript N(EVS_ExitDoors_pra_20_4) = { }; EvtScript N(EVS_ExitDoors_pra_37_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_22_ENTRY_1) Set(LVar1, COLLIDER_deilittsse) diff --git a/src/world/area_pra/pra_27/main.c b/src/world/area_pra/pra_27/main.c index e9e2c06b36..9ea93daaa1 100644 --- a/src/world/area_pra/pra_27/main.c +++ b/src/world/area_pra/pra_27/main.c @@ -14,7 +14,7 @@ s32 N(DoorModelsL)[] = { MODEL_o772, MODEL_o844, -1 }; s32 N(DoorModelsR)[] = { MODEL_o768, MODEL_o846, -1 }; EvtScript N(EVS_ExitDoors_pra_36_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_27_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) diff --git a/src/world/area_pra/pra_28/main.c b/src/world/area_pra/pra_28/main.c index 5544c1dbd1..b07a9ecc2e 100644 --- a/src/world/area_pra/pra_28/main.c +++ b/src/world/area_pra/pra_28/main.c @@ -14,7 +14,7 @@ s32 N(DoorModelsL)[] = { MODEL_o772, MODEL_o844, -1 }; s32 N(DoorModelsR)[] = { MODEL_o768, MODEL_o846, -1 }; EvtScript N(EVS_ExitDoors_pra_37_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_28_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) diff --git a/src/world/area_pra/pra_29/main.c b/src/world/area_pra/pra_29/main.c index ed3ca82c91..4d99a3a7a9 100644 --- a/src/world/area_pra/pra_29/main.c +++ b/src/world/area_pra/pra_29/main.c @@ -20,7 +20,7 @@ s32 N(BothRightDoorModelsL)[] = { MODEL_o995, MODEL_o1096, -1 }; s32 N(BothRightDoorModelsR)[] = { MODEL_o997, MODEL_o1094, -1 }; EvtScript N(EVS_ExitDoors_pra_20_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_29_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) @@ -40,7 +40,7 @@ EvtScript N(EVS_ExitDoors_pra_20_2) = { }; EvtScript N(EVS_ExitDoors_pra_34_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_29_ENTRY_1) Set(LVar1, COLLIDER_deilittse) @@ -60,7 +60,7 @@ EvtScript N(EVS_ExitDoors_pra_34_0) = { }; EvtScript N(EVS_ExitDoors_pra_34_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_29_ENTRY_2) Set(LVar1, COLLIDER_deilittne) @@ -80,7 +80,7 @@ EvtScript N(EVS_ExitDoors_pra_34_3) = { }; EvtScript N(EVS_ExitDoors_pra_20_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_29_ENTRY_3) Set(LVar1, COLLIDER_deilittnw) diff --git a/src/world/area_pra/pra_31/main.c b/src/world/area_pra/pra_31/main.c index a99b6368c3..01e2005820 100644 --- a/src/world/area_pra/pra_31/main.c +++ b/src/world/area_pra/pra_31/main.c @@ -8,7 +8,7 @@ s32 N(FarLeftDoorModelsL)[] = { MODEL_o859, -1 }; s32 N(FarLeftDoorModelsR)[] = { MODEL_o861, -1 }; EvtScript N(EVS_ExitDoors_pra_34_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_31_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) @@ -23,7 +23,7 @@ EvtScript N(EVS_ExitDoors_pra_34_1) = { }; EvtScript N(EVS_ExitDoors_pra_40_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_31_ENTRY_1) Set(LVar1, COLLIDER_deilitte) @@ -38,7 +38,7 @@ EvtScript N(EVS_ExitDoors_pra_40_0) = { }; EvtScript N(EVS_ExitDoors_pra_34_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_31_ENTRY_2) Set(LVar1, COLLIDER_deilittnw) diff --git a/src/world/area_pra/pra_31/npc.c b/src/world/area_pra/pra_31/npc.c index 426766e43d..21e2c0aca5 100644 --- a/src/world/area_pra/pra_31/npc.c +++ b/src/world/area_pra/pra_31/npc.c @@ -173,7 +173,7 @@ NpcData N(NpcData_AlbinoDinos)[] = { .yaw = 270, .init = &N(EVS_NpcInit_AlbinoDino_01), .settings = &N(NpcSettings_AlbinoDino), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = ALBINO_DINO_ANIMS, .tattle = MSG_NpcTattle_AlbinoDino, @@ -184,7 +184,7 @@ NpcData N(NpcData_AlbinoDinos)[] = { .yaw = 270, .init = &N(EVS_NpcInit_AlbinoDino_02), .settings = &N(NpcSettings_AlbinoDino), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = ALBINO_DINO_ANIMS, .tattle = MSG_NpcTattle_AlbinoDino, @@ -195,7 +195,7 @@ NpcData N(NpcData_AlbinoDinos)[] = { .yaw = 270, .init = &N(EVS_NpcInit_AlbinoDino_03), .settings = &N(NpcSettings_AlbinoDino), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = ALBINO_DINO_ANIMS, .tattle = MSG_NpcTattle_AlbinoDino, diff --git a/src/world/area_pra/pra_31/puzzle.c b/src/world/area_pra/pra_31/puzzle.c index 2040397222..f971aef852 100644 --- a/src/world/area_pra/pra_31/puzzle.c +++ b/src/world/area_pra/pra_31/puzzle.c @@ -398,7 +398,7 @@ EvtScript N(EVS_Scene_PuzzleSolved) = { }; EvtScript N(EVS_UpdateStatuePositions) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(N(GetDinoStatuePosRot), NPC_AlbinoDino_01) Set(MV_StatueYaw_01, LVar2) Call(N(GetDinoStatuePosRot), NPC_AlbinoDino_02) diff --git a/src/world/area_pra/pra_32/main.c b/src/world/area_pra/pra_32/main.c index 8a68056066..f495b731dd 100644 --- a/src/world/area_pra/pra_32/main.c +++ b/src/world/area_pra/pra_32/main.c @@ -142,7 +142,7 @@ s32 N(DoorModelsR)[] = { }; EvtScript N(EVS_ExitDoors_pra_40_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_32_ENTRY_0) Set(LVar1, COLLIDER_deilittw) diff --git a/src/world/area_pra/pra_32/npc.c b/src/world/area_pra/pra_32/npc.c index 9f316aefdb..65a543f34a 100644 --- a/src/world/area_pra/pra_32/npc.c +++ b/src/world/area_pra/pra_32/npc.c @@ -132,7 +132,7 @@ EvtScript N(EVS_Scene_BossDefeated) = { Wait(2) Call(FadeOutMusic, 0, 500) EndThread - Call(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_1, TRUE) + Call(SetEncounterStatusFlags, ENCOUNTER_FLAG_THUMBS_UP, TRUE) Call(SetPlayerPos, 475, 100, 116) Call(DisablePartnerAI, 0) Call(GetNpcPos, NPC_CrystalKing_01, LVar0, LVar1, LVar2) @@ -220,7 +220,7 @@ EvtScript N(EVS_NpcInit_CrystalKing) = { Exec(N(EVS_RespawnStarCard)) CaseGt(STORY_CH7_DEFEATED_CRYSTAL_KING) EndSwitch - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_USE_INSPECT_ICON, TRUE) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_HAS_SHADOW, FALSE) Call(SetNpcYaw, NPC_CrystalKing_01, 270) Return @@ -244,7 +244,7 @@ NpcData N(NpcData_CrystalKing_01)[] = { .yaw = 90, .init = &N(EVS_NpcInit_CrystalKing_Aux), .settings = &N(NpcSettings_CrystalKing), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = CRYSTAL_KING_ANIMS, }, @@ -253,7 +253,7 @@ NpcData N(NpcData_CrystalKing_01)[] = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, .settings = &N(NpcSettings_CrystalKing), - .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = CRYSTAL_KING_ANIMS, }, @@ -263,7 +263,7 @@ NpcData N(NpcData_CrystalKing_01)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Kalmar), .settings = &N(NpcSettings_StarSpirit), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KALMAR_ANIMS, }, @@ -273,7 +273,7 @@ NpcData N(NpcData_CrystalKing_01)[] = { .yaw = 90, .init = &N(EVS_NpcInit_CrystalKing), .settings = &N(NpcSettings_CrystalKing), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = CRYSTAL_KING_ANIMS, }, diff --git a/src/world/area_pra/pra_33/main.c b/src/world/area_pra/pra_33/main.c index 9fcb29adee..475a5fdca2 100644 --- a/src/world/area_pra/pra_33/main.c +++ b/src/world/area_pra/pra_33/main.c @@ -12,7 +12,7 @@ s32 N(LeftDoorModelsL)[] = { MODEL_o859, -1 }; s32 N(LeftDoorModelsR)[] = { MODEL_o861, -1 }; EvtScript N(EVS_ExitDoors_pra_35_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_33_ENTRY_0) Set(LVar1, COLLIDER_deilittse) @@ -27,7 +27,7 @@ EvtScript N(EVS_ExitDoors_pra_35_0) = { }; EvtScript N(EVS_ExitDoors_pra_18_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_33_ENTRY_1) Set(LVar1, COLLIDER_deilittnw) diff --git a/src/world/area_pra/pra_34/main.c b/src/world/area_pra/pra_34/main.c index dc784e5a1e..4f58a7374d 100644 --- a/src/world/area_pra/pra_34/main.c +++ b/src/world/area_pra/pra_34/main.c @@ -20,7 +20,7 @@ s32 N(BothRightDoorModelsL)[] = { MODEL_o874, MODEL_o875, MODEL_o880, MODEL_o881 s32 N(BothRightDoorModelsR)[] = { MODEL_o876, MODEL_o877, MODEL_o878, MODEL_o879, -1 }; EvtScript N(EVS_ExitDoors_pra_29_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_34_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) @@ -40,7 +40,7 @@ EvtScript N(EVS_ExitDoors_pra_29_1) = { }; EvtScript N(EVS_ExitDoors_pra_31_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_34_ENTRY_1) Set(LVar1, COLLIDER_deilittse) @@ -60,7 +60,7 @@ EvtScript N(EVS_ExitDoors_pra_31_0) = { }; EvtScript N(EVS_ExitDoors_pra_31_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_34_ENTRY_2) Set(LVar1, COLLIDER_deilittne) @@ -80,7 +80,7 @@ EvtScript N(EVS_ExitDoors_pra_31_2) = { }; EvtScript N(EVS_ExitDoors_pra_29_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_34_ENTRY_3) Set(LVar1, COLLIDER_deilittnw) @@ -108,18 +108,18 @@ s32 N(PalaceKeyList)[] = { }; EvtScript N(EVS_UnlockPrompt_Doors) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(ShowKeyChoicePopup) IfEq(LVar0, 0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf IfEq(LVar0, -1) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf Call(RemoveKeyItemAt, LVar1) @@ -133,7 +133,7 @@ EvtScript N(EVS_UnlockPrompt_Doors) = { Call(N(RemovePadlock)) Set(LVar0, MV_NearPadlockEntityID) Call(N(RemovePadlock)) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End diff --git a/src/world/area_pra/pra_35/main.c b/src/world/area_pra/pra_35/main.c index e0c4dc68a5..f279106656 100644 --- a/src/world/area_pra/pra_35/main.c +++ b/src/world/area_pra/pra_35/main.c @@ -12,7 +12,7 @@ s32 N(RightDoorModelsL)[] = { MODEL_o861, MODEL_o862, -1 }; s32 N(RightDoorModelsR)[] = { MODEL_o859, MODEL_o860, -1 }; EvtScript N(EVS_ExitWalk_pra_33_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_35_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) @@ -27,7 +27,7 @@ EvtScript N(EVS_ExitWalk_pra_33_0) = { }; EvtScript N(EVS_ExitWalk_pra_19_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_35_ENTRY_1) Set(LVar1, COLLIDER_deilittsw) diff --git a/src/world/area_pra/pra_36/main.c b/src/world/area_pra/pra_36/main.c index 457b3e404b..bf98d0e69d 100644 --- a/src/world/area_pra/pra_36/main.c +++ b/src/world/area_pra/pra_36/main.c @@ -11,7 +11,7 @@ s32 N(map_init)(void) { #include "../common/Reflection.data.inc.c" EvtScript N(EVS_ExitDoors_pra_21_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_36_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) @@ -28,7 +28,7 @@ EvtScript N(EVS_ExitDoors_pra_21_1) = { }; EvtScript N(EVS_ExitDoors_pra_27_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_36_ENTRY_1) Set(LVar1, COLLIDER_deilittse) diff --git a/src/world/area_pra/pra_37/main.c b/src/world/area_pra/pra_37/main.c index 56258d6cc9..677f1a6bd5 100644 --- a/src/world/area_pra/pra_37/main.c +++ b/src/world/area_pra/pra_37/main.c @@ -11,7 +11,7 @@ s32 N(map_init)(void) { #include "../common/Reflection.data.inc.c" EvtScript N(EVS_ExitDoors_pra_22_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_37_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) @@ -28,7 +28,7 @@ EvtScript N(EVS_ExitDoors_pra_22_1) = { }; EvtScript N(EVS_ExitDoors_pra_28_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_37_ENTRY_1) Set(LVar1, COLLIDER_deilittse) diff --git a/src/world/area_pra/pra_38/main.c b/src/world/area_pra/pra_38/main.c index 03c470d27c..8c5108c695 100644 --- a/src/world/area_pra/pra_38/main.c +++ b/src/world/area_pra/pra_38/main.c @@ -11,7 +11,7 @@ s32 N(map_init)(void) { #include "../common/Reflection.data.inc.c" EvtScript N(EVS_ExitDoors_pra_03_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_38_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) @@ -28,7 +28,7 @@ EvtScript N(EVS_ExitDoors_pra_03_1) = { }; EvtScript N(EVS_ExitDoors_pra_05_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_38_ENTRY_1) Set(LVar1, COLLIDER_deilittse) diff --git a/src/world/area_pra/pra_39/main.c b/src/world/area_pra/pra_39/main.c index aa4e37e5d9..fd029ebc5d 100644 --- a/src/world/area_pra/pra_39/main.c +++ b/src/world/area_pra/pra_39/main.c @@ -11,7 +11,7 @@ s32 N(map_init)(void) { #include "../common/Reflection.data.inc.c" EvtScript N(EVS_ExitDoors_pra_04_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_39_ENTRY_0) Set(LVar1, COLLIDER_deilittsw) @@ -28,7 +28,7 @@ EvtScript N(EVS_ExitDoors_pra_04_1) = { }; EvtScript N(EVS_ExitDoors_pra_06_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, pra_39_ENTRY_1) Set(LVar1, COLLIDER_deilittse) diff --git a/src/world/area_sam/sam_01/npc.c b/src/world/area_sam/sam_01/npc.c index bfef7037ad..b6e402b4e9 100644 --- a/src/world/area_sam/sam_01/npc.c +++ b/src/world/area_sam/sam_01/npc.c @@ -618,7 +618,7 @@ EvtScript N(EVS_NpcInit_Penguin_08) = { EvtScript N(EVS_NpcInit_Penguin_09) = { IfLt(GB_StoryProgress, STORY_CH7_MAYOR_MURDER_SOLVED) - Call(SetNpcFlagBits, NPC_Penguin_09, NPC_FLAG_INVISIBLE | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_Penguin_09, NPC_FLAG_INVISIBLE | NPC_FLAG_USE_INSPECT_ICON, TRUE) Call(EnableNpcShadow, NPC_Penguin_09, FALSE) Call(SetNpcPos, NPC_Penguin_09, -325, 0, -240) EndIf @@ -633,7 +633,7 @@ NpcData N(NpcData_MayorPenguin)[] = { .yaw = 270, .init = &N(EVS_NpcInit_MayorPenguin), .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = MAYOR_PENGUIN_ANIMS, .tattle = MSG_NpcTattle_MayorPenguin, @@ -644,7 +644,7 @@ NpcData N(NpcData_MayorPenguin)[] = { .yaw = 270, .init = &N(EVS_NpcInit_MayorDummy), .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = MAYOR_PENGUIN_ANIMS, .tattle = MSG_NpcTattle_MayorPenguin, @@ -655,7 +655,7 @@ NpcData N(NpcData_MayorPenguin)[] = { .yaw = 270, .init = &N(EVS_NpcInit_MayorPenguinWife), .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = MAYOR_PENGUIN_WIFE_ANIMS, .tattle = MSG_NpcTattle_MayorPenguinWife, @@ -666,7 +666,7 @@ NpcData N(NpcData_MayorPenguin)[] = { .yaw = 0, .init = &N(EVS_NpcInit_PenguinPatrol), .settings = &N(NpcSettings_Penguin), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_PATROL_ANIMS, .tattle = MSG_NpcTattle_SAM_Patrol, @@ -677,7 +677,7 @@ NpcData N(NpcData_MayorPenguin)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Herringway), .settings = &N(NpcSettings_Penguin), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = HERRINGWAY_ANIMS, .tattle = MSG_NpcTattle_Herringway, @@ -700,7 +700,7 @@ NpcData N(NpcData_MayorPenguin)[] = { }, .init = &N(EVS_NpcInit_Penguin_01), .settings = &N(NpcSettings_Penguin_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_GossipPenguin, @@ -723,7 +723,7 @@ NpcData N(NpcData_MayorPenguin)[] = { }, .init = &N(EVS_NpcInit_Penguin_02), .settings = &N(NpcSettings_Penguin_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_FriendlyPenguin, @@ -746,7 +746,7 @@ NpcData N(NpcData_MayorPenguin)[] = { }, .init = &N(EVS_NpcInit_Penguin_03), .settings = &N(NpcSettings_Penguin_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_CheerfulPenguin, @@ -757,7 +757,7 @@ NpcData N(NpcData_MayorPenguin)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Penguin_04), .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_GenericPenguin, @@ -771,7 +771,7 @@ NpcData N(NpcData_Penguin_05)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Penguin_05), .settings = &N(NpcSettings_Penguin), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_RumorLovingPenguins, @@ -782,7 +782,7 @@ NpcData N(NpcData_Penguin_05)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Penguin_06), .settings = &N(NpcSettings_Penguin), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_NotAdventurous, @@ -793,7 +793,7 @@ NpcData N(NpcData_Penguin_05)[] = { .yaw = 180, .init = &N(EVS_NpcInit_Penguin_07), .settings = &N(NpcSettings_Penguin), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_GenericPenguin, @@ -804,7 +804,7 @@ NpcData N(NpcData_Penguin_05)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Penguin_08), .settings = &N(NpcSettings_Penguin), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_GenericPenguin, @@ -817,7 +817,7 @@ NpcData N(NpcData_Penguin_09) = { .yaw = 0, .init = &N(EVS_NpcInit_Penguin_09), .settings = &N(NpcSettings_Penguin), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, }; diff --git a/src/world/area_sam/sam_02/npc.c b/src/world/area_sam/sam_02/npc.c index 50cafeeaf5..af57e01698 100644 --- a/src/world/area_sam/sam_02/npc.c +++ b/src/world/area_sam/sam_02/npc.c @@ -382,7 +382,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 180, .init = &N(EVS_NpcInit_Penguin_ShopOwner), .settings = &N(NpcSettings_Penguin), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_ShopOwner, @@ -393,7 +393,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 180, .init = &N(EVS_NpcInit_ShiverToad), .settings = &N(NpcSettings_ShiverToad), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = SHIVER_TOAD_RED_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_FLAG_8, @@ -417,7 +417,7 @@ NpcData N(NpcData_Townsfolk)[] = { }, .init = &N(EVS_NpcInit_Penguin_04), .settings = &N(NpcSettings_Penguin_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_CorroboratesRumors, @@ -440,7 +440,7 @@ NpcData N(NpcData_Townsfolk)[] = { }, .init = &N(EVS_NpcInit_Penguin_05), .settings = &N(NpcSettings_Penguin_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_EasyGoing, @@ -463,7 +463,7 @@ NpcData N(NpcData_Townsfolk)[] = { }, .init = &N(EVS_NpcInit_Penguin_06), .settings = &N(NpcSettings_Penguin_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_NeverLeavesTown, @@ -474,7 +474,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Penguin_07), .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_VisitedTheDojo, @@ -488,7 +488,7 @@ NpcData N(NpcData_MysteryOnly)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Penguin_02), .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_RumorLovingPenguins, @@ -511,7 +511,7 @@ NpcData N(NpcData_MysteryOnly)[] = { }, .init = &N(EVS_NpcInit_Penguin_03), .settings = &N(NpcSettings_Penguin_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_NotAdventurous, diff --git a/src/world/area_sam/sam_03/npc1.c b/src/world/area_sam/sam_03/npc1.c index e050f50ff6..b3020cd1e0 100644 --- a/src/world/area_sam/sam_03/npc1.c +++ b/src/world/area_sam/sam_03/npc1.c @@ -151,7 +151,7 @@ NpcData N(NpcData_JrTroopa)[] = { .yaw = 270, .init = &N(EVS_NpcInit_JrTroopa), .settings = &N(NpcSettings_JrTroopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = JR_TROOPA_ANIMS, .tattle = MSG_NpcTattle_JrTroopa, @@ -162,7 +162,7 @@ NpcData N(NpcData_JrTroopa)[] = { .yaw = 270, .init = &N(EVS_NpcInit_JrTroopaHitbox), .settings = &N(NpcSettings_JrTroopa), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_SPIN, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_SPIN, .drops = NO_DROPS, .animations = JR_TROOPA_ANIMS, .tattle = MSG_NpcTattle_JrTroopa, diff --git a/src/world/area_sam/sam_04/npc.c b/src/world/area_sam/sam_04/npc.c index 9da9543062..5294ab452a 100644 --- a/src/world/area_sam/sam_04/npc.c +++ b/src/world/area_sam/sam_04/npc.c @@ -161,7 +161,7 @@ EvtScript N(EVS_NpcInit_Snowman_01) = { EndIf Call(BindNpcInteract, NPC_SELF, Ref(N(EVS_NpcInteract_Snowman_01))) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_Snowman_01))) -Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_10000000, TRUE) +Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_USE_INSPECT_ICON, TRUE) Call(EnableNpcShadow, NPC_SELF, FALSE) Return End @@ -170,7 +170,7 @@ End EvtScript N(EVS_NpcInit_Snowman_02) = { Call(BindNpcInteract, NPC_SELF, Ref(N(EVS_NpcInteract_Snowman_02))) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_Snowman_02))) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_USE_INSPECT_ICON, TRUE) Call(EnableNpcShadow, NPC_SELF, FALSE) Return End @@ -179,7 +179,7 @@ EvtScript N(EVS_NpcInit_Snowman_02) = { EvtScript N(EVS_NpcInit_Snowman_03) = { Call(BindNpcInteract, NPC_SELF, Ref(N(EVS_NpcInteract_Snowman_03))) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_Snowman_03))) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_USE_INSPECT_ICON, TRUE) Call(EnableNpcShadow, NPC_SELF, FALSE) Return End @@ -188,7 +188,7 @@ EvtScript N(EVS_NpcInit_Snowman_03) = { EvtScript N(EVS_NpcInit_Snowman_04) = { Call(BindNpcInteract, NPC_SELF, Ref(N(EVS_NpcInteract_Snowman_04))) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_Snowman_04))) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_USE_INSPECT_ICON, TRUE) Call(EnableNpcShadow, NPC_SELF, FALSE) Return End @@ -197,7 +197,7 @@ EvtScript N(EVS_NpcInit_Snowman_04) = { EvtScript N(EVS_NpcInit_Snowman_05) = { Call(BindNpcInteract, NPC_SELF, Ref(N(EVS_NpcInteract_Snowman_05))) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_Snowman_05))) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_USE_INSPECT_ICON, TRUE) Call(EnableNpcShadow, NPC_SELF, FALSE) Return End @@ -206,14 +206,14 @@ EvtScript N(EVS_NpcInit_Snowman_05) = { EvtScript N(EVS_NpcInit_Snowman_06) = { Call(BindNpcInteract, NPC_SELF, Ref(N(EVS_NpcInteract_Snowman_06))) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_Snowman_06))) - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_USE_INSPECT_ICON, TRUE) Call(EnableNpcShadow, NPC_SELF, FALSE) Return End }; EvtScript N(EVS_NpcInit_Dummy) = { - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_10000000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_USE_INSPECT_ICON, TRUE) Call(EnableNpcShadow, NPC_SELF, FALSE) Return End @@ -226,7 +226,7 @@ NpcData N(NpcData_Snowmen)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Snowman_01), .settings = &N(NpcSettings_Snowman), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_Snowman, @@ -237,7 +237,7 @@ NpcData N(NpcData_Snowmen)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Snowman_02), .settings = &N(NpcSettings_Snowman), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_Snowman, @@ -248,7 +248,7 @@ NpcData N(NpcData_Snowmen)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Snowman_03), .settings = &N(NpcSettings_Snowman), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_Snowman, @@ -259,7 +259,7 @@ NpcData N(NpcData_Snowmen)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Snowman_04), .settings = &N(NpcSettings_Snowman), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_Snowman, @@ -270,7 +270,7 @@ NpcData N(NpcData_Snowmen)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Snowman_05), .settings = &N(NpcSettings_Snowman), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_Snowman, @@ -281,7 +281,7 @@ NpcData N(NpcData_Snowmen)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Snowman_06), .settings = &N(NpcSettings_Snowman), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_Snowman, @@ -294,7 +294,7 @@ NpcData N(NpcData_Dummy) = { .yaw = 0, .init = &N(EVS_NpcInit_Dummy), .settings = &N(NpcSettings_Snowman), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, }; diff --git a/src/world/area_sam/sam_05/npc.c b/src/world/area_sam/sam_05/npc.c index 83dfcc7327..3b42b44406 100644 --- a/src/world/area_sam/sam_05/npc.c +++ b/src/world/area_sam/sam_05/npc.c @@ -163,7 +163,7 @@ NpcData N(NpcData_Monstar) = { .yaw = 270, .init = &N(EVS_NpcInit_Monstar), .settings = &N(NpcSettings_Monstar), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = NO_DROPS, .animations = { .idle = ANIM_Monstar_Idle1, @@ -201,7 +201,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -212,7 +212,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -223,7 +223,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -234,7 +234,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -245,7 +245,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -256,7 +256,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -267,7 +267,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -278,7 +278,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -289,7 +289,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -300,7 +300,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -311,7 +311,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -322,7 +322,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -333,7 +333,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -344,7 +344,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -355,7 +355,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), @@ -366,7 +366,7 @@ NpcData N(NpcData_StarKids)[] = { .yaw = 90, .init = &N(EVS_NpcInit_StarKid), .settings = &N(NpcSettings_Twink), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = TWINK_ANIMS, .extraAnimations = N(ExtraAnims_StarKid), diff --git a/src/world/area_sam/sam_06/npc.c b/src/world/area_sam/sam_06/npc.c index 2e7a8eead6..5494ae8584 100644 --- a/src/world/area_sam/sam_06/npc.c +++ b/src/world/area_sam/sam_06/npc.c @@ -901,7 +901,7 @@ NpcData N(NpcData_Merle)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Merle), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_Merle_Idle, @@ -929,7 +929,7 @@ NpcData N(NpcData_Merle)[] = { .yaw = 0, .init = &N(EVS_NpcInit_ShiverToad_01), .settings = &N(NpcSettings_ShiverToad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_ShiverToad_Red_Idle, @@ -969,7 +969,7 @@ NpcData N(NpcData_Merle)[] = { }, .init = &N(EVS_NpcInit_ShiverToad_02), .settings = &N(NpcSettings_ShiverToad_Wander), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_ShiverToad_Blue_Idle, @@ -997,7 +997,7 @@ NpcData N(NpcData_Merle)[] = { .yaw = 180, .init = &N(EVS_NpcInit_ShiverToad_03), .settings = &N(NpcSettings_ShiverToad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_ShiverToad_Green_Idle, @@ -1037,7 +1037,7 @@ NpcData N(NpcData_Merle)[] = { }, .init = &N(EVS_NpcInit_Ninji_01), .settings = &N(NpcSettings_Ninji_Wander), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_Ninji_Idle, @@ -1077,7 +1077,7 @@ NpcData N(NpcData_Merle)[] = { }, .init = &N(EVS_NpcInit_Ninji_02), .settings = &N(NpcSettings_Ninji_Wander), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_Ninji_Idle, @@ -1105,7 +1105,7 @@ NpcData N(NpcData_Merle)[] = { .yaw = 180, .init = &N(EVS_NpcInit_Ninji_03), .settings = &N(NpcSettings_Ninji_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_Ninji_Idle, @@ -1133,7 +1133,7 @@ NpcData N(NpcData_Merle)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Ninji_04), .settings = &N(NpcSettings_Ninji_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_Ninji_Idle, @@ -1173,7 +1173,7 @@ NpcData N(NpcData_Merle)[] = { }, .init = &N(EVS_NpcInit_StarKid_01), .settings = &N(NpcSettings_StarKid_Wander), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = STAR_KID_ANIMS, .tattle = MSG_NpcTattle_SAM_StarKidA, @@ -1184,7 +1184,7 @@ NpcData N(NpcData_Merle)[] = { .yaw = 180, .init = &N(EVS_NpcInit_StarKid_02), .settings = &N(NpcSettings_StarKid), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = STAR_KID_ANIMS, .tattle = MSG_NpcTattle_SAM_StarKidB, @@ -1195,7 +1195,7 @@ NpcData N(NpcData_Merle)[] = { .yaw = 0, .init = &N(EVS_NpcInit_StarKid_03), .settings = &N(NpcSettings_StarKid), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = STAR_KID_ANIMS, .tattle = MSG_NpcTattle_SAM_PranksterStarKid, @@ -1206,7 +1206,7 @@ NpcData N(NpcData_Merle)[] = { .yaw = 180, .init = &N(EVS_NpcInit_StarKid_04), .settings = &N(NpcSettings_StarKid), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = STAR_KID_ANIMS, .tattle = MSG_NpcTattle_SAM_BabyStarKid, @@ -1217,7 +1217,7 @@ NpcData N(NpcData_Merle)[] = { .yaw = 180, .init = &N(EVS_NpcInit_StarKid_05), .settings = &N(NpcSettings_StarKid), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = STAR_KID_ANIMS, .tattle = MSG_NpcTattle_SAM_StarKidC, @@ -1228,7 +1228,7 @@ NpcData N(NpcData_Merle)[] = { .yaw = 180, .init = &N(EVS_NpcInit_StarKid_06), .settings = &N(NpcSettings_StarKid), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = STAR_KID_ANIMS, .tattle = MSG_NpcTattle_SAM_StarKidD, @@ -1239,7 +1239,7 @@ NpcData N(NpcData_Merle)[] = { .yaw = 180, .init = &N(EVS_NpcInit_ShiverToad_04), .settings = &N(NpcSettings_ShiverToad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_ShiverToad_Red_Idle, diff --git a/src/world/area_sam/sam_08/npc.c b/src/world/area_sam/sam_08/npc.c index 73fdeccf74..f4af819fb5 100644 --- a/src/world/area_sam/sam_08/npc.c +++ b/src/world/area_sam/sam_08/npc.c @@ -130,7 +130,7 @@ NpcData N(NpcData_Ambush)[] = { .yaw = 0, .init = &N(EVS_NpcInit_TrueKooperA), .settings = &N(NpcSettings_Kooper), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldKooper_Idle, @@ -157,7 +157,7 @@ NpcData N(NpcData_Ambush)[] = { .yaw = 0, .init = &N(EVS_NpcInit_RealKooperA), .settings = &N(NpcSettings_Kooper), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldKooper_Idle, @@ -184,7 +184,7 @@ NpcData N(NpcData_Ambush)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Duplighost), .settings = &N(NpcSettings_Duplighost), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_Duplighost_Anim02, @@ -219,7 +219,7 @@ EvtScript N(EVS_NpcIdle_TrueKooperB) = { EvtScript N(EVS_NpcInit_TrueKooperB) = { Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_PASSIVE, 0) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_PASSIVE, FALSE) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_TrueKooperB))) Call(BindNpcHit, NPC_SELF, Ref(N(EVS_NpcHit_TrueKooperB))) IfGe(GB_StoryProgress, STORY_CH7_DEFEATED_FIRST_DUPLIGHOST) @@ -241,7 +241,7 @@ EvtScript N(EVS_NpcIdle_FakeKooperB) = { EvtScript N(EVS_NpcInit_FakeKooperB) = { Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_PASSIVE, 0) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_PASSIVE, FALSE) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_FakeKooperB))) Call(BindNpcHit, NPC_SELF, Ref(N(EVS_NpcHit_FakeKooperB))) IfGe(GB_StoryProgress, STORY_CH7_DEFEATED_FIRST_DUPLIGHOST) @@ -258,7 +258,7 @@ NpcData N(NpcData_Hittable)[] = { .yaw = 0, .init = &N(EVS_NpcInit_TrueKooperB), .settings = &N(NpcSettings_Kooper), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldKooper_Idle, @@ -285,7 +285,7 @@ NpcData N(NpcData_Hittable)[] = { .yaw = 0, .init = &N(EVS_NpcInit_FakeKooperB), .settings = &N(NpcSettings_Kooper), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldKooper_Idle, diff --git a/src/world/area_sam/sam_10/entity.c b/src/world/area_sam/sam_10/entity.c index 41d0ab8cad..c82361b780 100644 --- a/src/world/area_sam/sam_10/entity.c +++ b/src/world/area_sam/sam_10/entity.c @@ -9,11 +9,11 @@ s32** N(varStash) = NULL; EvtScript N(EVS_Chest_ShowGotItem) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_FULL) Wait(40) Call(ShowGotItem, LVar0, FALSE, 0) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return Return End diff --git a/src/world/area_sam/sam_11/entity.c b/src/world/area_sam/sam_11/entity.c index 2c610fa550..aeab2d0fff 100644 --- a/src/world/area_sam/sam_11/entity.c +++ b/src/world/area_sam/sam_11/entity.c @@ -341,7 +341,7 @@ EvtScript N(EVS_TouchFloor_LeftRoof) = { }; EvtScript N(EVS_LandOnRightRoof) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) IfEq(MF_Unk_00, TRUE) Return EndIf diff --git a/src/world/area_sam/sam_11/main.c b/src/world/area_sam/sam_11/main.c index b1000e2685..bd25a9e795 100644 --- a/src/world/area_sam/sam_11/main.c +++ b/src/world/area_sam/sam_11/main.c @@ -54,7 +54,7 @@ EvtScript N(EVS_ExitWalk_sam_02_1) = { IfEq(MV_ThrownOut, 1) Return EndIf - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, sam_11_ENTRY_0) Exec(ExitWalk) Call(GotoMap, Ref("sam_02"), sam_02_ENTRY_1) @@ -64,7 +64,7 @@ EvtScript N(EVS_ExitWalk_sam_02_1) = { }; EvtScript N(EVS_ExitWalk_sam_03_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) IfLt(GB_StoryProgress, STORY_CH7_MAYOR_MURDER_SOLVED) Return EndIf diff --git a/src/world/area_sam/sam_11/npc.c b/src/world/area_sam/sam_11/npc.c index d33567776d..6d028cc6a9 100644 --- a/src/world/area_sam/sam_11/npc.c +++ b/src/world/area_sam/sam_11/npc.c @@ -549,7 +549,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 0, .init = &N(EVS_NpcInit_PenguinPatrol), .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_PATROL_ANIMS, .tattle = MSG_NpcTattle_SAM_Patrol, @@ -560,7 +560,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 180, .init = &N(EVS_NpcInit_PenguinSentry), .settings = &N(NpcSettings_Penguin), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_Gatekeeper, @@ -571,7 +571,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Herringway), .settings = &N(NpcSettings_Penguin), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = HERRINGWAY_ANIMS, .tattle = MSG_NpcTattle_Herringway, @@ -582,7 +582,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Penguin_04), .settings = &N(NpcSettings_Penguin), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_WarehouseGuard, @@ -593,7 +593,7 @@ NpcData N(NpcData_Townsfolk)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Penguin_05), .settings = &N(NpcSettings_Penguin), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_HerringwayLoiterer, @@ -616,7 +616,7 @@ NpcData N(NpcData_Townsfolk)[] = { }, .init = &N(EVS_NpcInit_Penguin_06), .settings = &N(NpcSettings_Penguin_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_TimidPenguin, @@ -642,7 +642,7 @@ NpcData N(NpcData_PondPenginsBefore)[] = { }, .init = &N(EVS_NpcInit_Penguin_02), .settings = &N(NpcSettings_Penguin_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_SnowMaster, @@ -665,7 +665,7 @@ NpcData N(NpcData_PondPenginsBefore)[] = { }, .init = &N(EVS_NpcInit_Penguin_03), .settings = &N(NpcSettings_Penguin_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_Skater, @@ -691,7 +691,7 @@ NpcData N(NpcData_PondPenginsAfter)[] = { }, .init = &N(EVS_NpcInit_Penguin_02), .settings = &N(NpcSettings_Penguin_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_SnowMaster, @@ -714,7 +714,7 @@ NpcData N(NpcData_PondPenginsAfter)[] = { }, .init = &N(EVS_NpcInit_Penguin_03), .settings = &N(NpcSettings_Penguin_Wander), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = PENGUIN_ANIMS, .tattle = MSG_NpcTattle_SAM_Skater, @@ -728,7 +728,7 @@ NpcData N(NpcData_Tourists)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toadette_01), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidA, @@ -739,7 +739,7 @@ NpcData N(NpcData_Tourists)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toadette_02), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidB, @@ -750,7 +750,7 @@ NpcData N(NpcData_Tourists)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Toadette_03), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOADETTE_PINK_ANIMS, .tattle = MSG_NpcTattle_TravelingMaidC, @@ -989,7 +989,7 @@ NpcData N(NpcData_Epilogue)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, }, @@ -999,7 +999,7 @@ NpcData N(NpcData_Epilogue)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Archeologist_01), .settings = &N(NpcSettings_Kolorado), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = ARCHEOLOGIST_ANIMS, }, @@ -1009,7 +1009,7 @@ NpcData N(NpcData_Epilogue)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Archeologist_01), .settings = &N(NpcSettings_Kolorado), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = ARCHEOLOGIST_ANIMS, }, @@ -1019,7 +1019,7 @@ NpcData N(NpcData_Epilogue)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Archeologist_01), .settings = &N(NpcSettings_Kooper), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldKooper_Idle, @@ -1046,7 +1046,7 @@ NpcData N(NpcData_Epilogue)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Archeologist_01), .settings = &N(NpcSettings_Kooper), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldParakarry_Idle, diff --git a/src/world/area_sam/sam_11/rooms.c b/src/world/area_sam/sam_11/rooms.c index 115f955604..7f0b3a91fd 100644 --- a/src/world/area_sam/sam_11/rooms.c +++ b/src/world/area_sam/sam_11/rooms.c @@ -116,18 +116,18 @@ s32 N(KeyList)[] = { #include "world/common/todo/GetEntityPosition.inc.c" EvtScript N(EVS_UnlockPrompt_LeftHouse) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(ShowKeyChoicePopup) IfEq(LVar0, 0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf IfEq(LVar0, -1) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf Call(RemoveKeyItemAt, LVar1) @@ -137,7 +137,7 @@ EvtScript N(EVS_UnlockPrompt_LeftHouse) = { Call(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) Set(LVar0, MV_PadlockEntityID) Call(N(RemovePadlock)) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End diff --git a/src/world/area_sam/sam_12/npc.c b/src/world/area_sam/sam_12/npc.c index 30ea2f1c01..a94c89f5a6 100644 --- a/src/world/area_sam/sam_12/npc.c +++ b/src/world/area_sam/sam_12/npc.c @@ -16,7 +16,7 @@ NpcData N(NpcData_Merlar) = { .yaw = 180, .init = &N(EVS_NpcInit_Merlar), .settings = &N(NpcSettings_Merlar), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = MERLAR_ANIMS, }; diff --git a/src/world/area_sbk/sbk_02/npc.c b/src/world/area_sbk/sbk_02/npc.c index 7b315ecaf4..e535bd0764 100644 --- a/src/world/area_sbk/sbk_02/npc.c +++ b/src/world/area_sbk/sbk_02/npc.c @@ -258,7 +258,7 @@ NpcData N(NpcData_Mamar) = { .yaw = 0, .init = &N(EVS_NpcInit_Mamar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = MAMAR_ANIMS, }; @@ -269,7 +269,7 @@ NpcData N(NpcData_TradingToad) = { .yaw = 90, .init = &N(EVS_NpcInit_TradingToad), .settings = &N(NpcSettings_Toad_Stationary), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = { .idle = ANIM_Toad_Pink_Idle, diff --git a/src/world/area_sbk/sbk_30/npc.c b/src/world/area_sbk/sbk_30/npc.c index 2b973b7231..10abd0af99 100644 --- a/src/world/area_sbk/sbk_30/npc.c +++ b/src/world/area_sbk/sbk_30/npc.c @@ -300,7 +300,7 @@ NpcData N(NpcData_Archeologist_02)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_SBK_Kolorado, @@ -323,7 +323,7 @@ NpcData N(NpcData_Archeologist_02)[] = { }, .init = &N(EVS_NpcInit_Archeologist_01), .settings = &N(NpcSettings_Archeologist_01), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = ARCHEOLOGIST_ANIMS, .tattle = MSG_NpcTattle_SBK_ExcavatorA, @@ -346,7 +346,7 @@ NpcData N(NpcData_Archeologist_02)[] = { }, .init = &N(EVS_NpcInit_Archeologist_02), .settings = &N(NpcSettings_Archeologist_01), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = NO_DROPS, .animations = ARCHEOLOGIST_ANIMS, .tattle = MSG_NpcTattle_SBK_ExcavatorB, diff --git a/src/world/area_sbk/sbk_34/npc.c b/src/world/area_sbk/sbk_34/npc.c index 76b8af392c..ece3e75ba5 100644 --- a/src/world/area_sbk/sbk_34/npc.c +++ b/src/world/area_sbk/sbk_34/npc.c @@ -84,7 +84,7 @@ NpcData N(NpcData_Nomadimouse)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Nomadimouse), .settings = &N(NpcSettings_Nomadimouse), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_Nomadimouse_Idle, @@ -112,7 +112,7 @@ NpcData N(NpcData_Nomadimouse)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Sack), .settings = &N(NpcSettings_Nomadimouse), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = { .idle = ANIM_Nomadimouse_Idle, diff --git a/src/world/area_sbk/sbk_36/entity.c b/src/world/area_sbk/sbk_36/entity.c index af1aaf0d2a..44c0646fe7 100644 --- a/src/world/area_sbk/sbk_36/entity.c +++ b/src/world/area_sbk/sbk_36/entity.c @@ -2,12 +2,12 @@ #include "entity.h" EvtScript N(ReadSign) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(DisablePlayerInput, TRUE) Call(ShowMessageAtScreenPos, MSG_Menus_017A, 160, 40) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; diff --git a/src/world/area_sbk/sbk_56/main.c b/src/world/area_sbk/sbk_56/main.c index 14b3d7cb76..77332fae17 100644 --- a/src/world/area_sbk/sbk_56/main.c +++ b/src/world/area_sbk/sbk_56/main.c @@ -33,7 +33,7 @@ API_CALLABLE(N(StopOasisSongVariation)) { } EvtScript N(EVS_ExitWalk_sbk_55_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, sbk_56_ENTRY_0) Exec(ExitWalk) Call(N(StopOasisSongVariation)) @@ -44,7 +44,7 @@ EvtScript N(EVS_ExitWalk_sbk_55_1) = { }; EvtScript N(EVS_ExitWalk_sbk_46_3) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, sbk_56_ENTRY_2) Exec(ExitWalk) Call(N(StopOasisSongVariation)) @@ -55,7 +55,7 @@ EvtScript N(EVS_ExitWalk_sbk_46_3) = { }; EvtScript N(EVS_ExitWalk_sbk_66_2) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, sbk_56_ENTRY_3) Exec(ExitWalk) Call(N(StopOasisSongVariation)) diff --git a/src/world/area_tik/common/DripVolumes.inc.c b/src/world/area_tik/common/DripVolumes.inc.c index db3f2a1f00..b0f19731b1 100644 --- a/src/world/area_tik/common/DripVolumes.inc.c +++ b/src/world/area_tik/common/DripVolumes.inc.c @@ -124,7 +124,7 @@ EvtScript N(EVS_UpdateDripSplash) = { }; EvtScript N(EVS_UpdateDripVolume) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) UseArray(LVarA) Set(LVar5, ArrayVar(5)) Loop(5) diff --git a/src/world/area_tik/tik_01/npc.c b/src/world/area_tik/tik_01/npc.c index 9dcb0ed69a..43d87deba6 100644 --- a/src/world/area_tik/tik_01/npc.c +++ b/src/world/area_tik/tik_01/npc.c @@ -93,7 +93,7 @@ NpcData N(NpcData_Blooper) = { .yaw = 90, .init = &N(EVS_NpcInit_Blooper), .settings = &N(NpcSettings_Blooper), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = BLOOPER_ANIMS, }; diff --git a/src/world/area_tik/tik_02/npc.c b/src/world/area_tik/tik_02/npc.c index 476a4dbed8..dfa643d461 100644 --- a/src/world/area_tik/tik_02/npc.c +++ b/src/world/area_tik/tik_02/npc.c @@ -111,7 +111,7 @@ NpcData N(NpcData_Blooper) = { .yaw = 90, .init = &N(EVS_NpcInit_Blooper), .settings = &N(NpcSettings_Blooper), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = BLOOPER_ANIMS, }; diff --git a/src/world/area_tik/tik_03/platforms.c b/src/world/area_tik/tik_03/platforms.c index 1a29dcc86c..cb5fe21680 100644 --- a/src/world/area_tik/tik_03/platforms.c +++ b/src/world/area_tik/tik_03/platforms.c @@ -23,7 +23,7 @@ API_CALLABLE(N(PausePlatformsDuringPound)) { } EvtScript N(EVS_UpdatePlatform) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(ParentColliderToModel, LVarB, LVarA) SetF(LVar0, Float(0.0)) SetF(LVarD, Float(-300.0)) diff --git a/src/world/area_tik/tik_07/platforms.c b/src/world/area_tik/tik_07/platforms.c index 813d9838db..40286d7216 100644 --- a/src/world/area_tik/tik_07/platforms.c +++ b/src/world/area_tik/tik_07/platforms.c @@ -23,7 +23,7 @@ API_CALLABLE(N(PausePlatformsDuringPound)) { } EvtScript N(EVS_UpdatePlatform) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(ParentColliderToModel, LVarB, LVarA) SetF(LVar0, Float(0.0)) SetF(LVarD, Float(-90.0)) diff --git a/src/world/area_tik/tik_08/npc.c b/src/world/area_tik/tik_08/npc.c index 458f29c368..265a304fcc 100644 --- a/src/world/area_tik/tik_08/npc.c +++ b/src/world/area_tik/tik_08/npc.c @@ -110,7 +110,7 @@ NpcData N(NpcData_Blooper) = { .yaw = 90, .init = &N(EVS_NpcInit_Blooper), .settings = &N(NpcSettings_Blooper), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = BLOOPER_ANIMS, }; diff --git a/src/world/area_tik/tik_09/main.c b/src/world/area_tik/tik_09/main.c index 5daf4216d6..f2234bd769 100644 --- a/src/world/area_tik/tik_09/main.c +++ b/src/world/area_tik/tik_09/main.c @@ -6,7 +6,7 @@ EvtScript N(EVS_CloseGates) = { Call(DisablePlayerInput, TRUE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(PlaySound, SOUND_CHIME_BEGIN_AMBUSH) Call(PlaySoundAtCollider, COLLIDER_o59, SOUND_LARGE_GATE_OPEN, SOUND_SPACE_DEFAULT) @@ -26,7 +26,7 @@ EvtScript N(EVS_CloseGates) = { Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o59, COLLIDER_FLAGS_UPPER_MASK) Call(DisablePlayerInput, FALSE) Wait(1) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; diff --git a/src/world/area_tik/tik_09/npc.c b/src/world/area_tik/tik_09/npc.c index 550ef8b719..cfd9f949a2 100644 --- a/src/world/area_tik/tik_09/npc.c +++ b/src/world/area_tik/tik_09/npc.c @@ -67,7 +67,7 @@ NpcData N(NpcData_KoopaTroopa_01) = { }, .init = &N(EVS_NpcInit_DarkTroopa), .settings = &N(NpcSettings_DarkTroopa_Wander), - .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = DARK_TROOPA_DROPS, .animations = DARK_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -91,7 +91,7 @@ NpcData N(NpcData_KoopaTroopa_02) = { }, .init = &N(EVS_NpcInit_DarkTroopa), .settings = &N(NpcSettings_DarkTroopa_Wander), - .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = DARK_TROOPA_DROPS, .animations = DARK_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, @@ -115,7 +115,7 @@ NpcData N(NpcData_KoopaTroopa_03) = { }, .init = &N(EVS_NpcInit_DarkTroopa), .settings = &N(NpcSettings_DarkTroopa_Wander), - .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = DARK_TROOPA_DROPS, .animations = DARK_TROOPA_ANIMS, .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/area_tik/tik_12/entity.c b/src/world/area_tik/tik_12/entity.c index 1f2a9508d1..e59d252575 100644 --- a/src/world/area_tik/tik_12/entity.c +++ b/src/world/area_tik/tik_12/entity.c @@ -12,11 +12,11 @@ s32** N(varStash) = NULL; EvtScript N(EVS_Chest_ShowGotItem) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_FULL) Wait(40) Call(ShowGotItem, LVar0, FALSE, 0) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return Return End diff --git a/src/world/area_tik/tik_15/npc.c b/src/world/area_tik/tik_15/npc.c index ecf863b6e1..a71c7d1697 100644 --- a/src/world/area_tik/tik_15/npc.c +++ b/src/world/area_tik/tik_15/npc.c @@ -132,7 +132,7 @@ NpcData N(NpcData_RipCheato) = { .yaw = 270, .init = &N(EVS_NpcInit_RipCheato), .settings = &N(NpcSettings_RipCheato), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = { .idle = ANIM_RipCheato_Idle, diff --git a/src/world/area_tik/tik_21/main.c b/src/world/area_tik/tik_21/main.c index fcdff09f1f..f3667cefe3 100644 --- a/src/world/area_tik/tik_21/main.c +++ b/src/world/area_tik/tik_21/main.c @@ -7,7 +7,7 @@ EvtScript N(EVS_ExitWalk_tik_20_1) = EVT_EXIT_WALK(60, tik_21_ENTRY_0, "tik_20", tik_20_ENTRY_1); EvtScript N(EVS_ExitDoors_tik_22_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(DisablePlayerInput, TRUE) Set(LVar0, tik_21_ENTRY_1) diff --git a/src/world/area_tik/tik_22/main.c b/src/world/area_tik/tik_22/main.c index b7b71893a0..06dd0583d4 100644 --- a/src/world/area_tik/tik_22/main.c +++ b/src/world/area_tik/tik_22/main.c @@ -10,7 +10,7 @@ API_CALLABLE(N(ResetTrackVolumes)) { } EvtScript N(EVS_ExitDoors_tik_21_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Call(N(ResetTrackVolumes)) Set(LVar0, tik_22_ENTRY_0) diff --git a/src/world/area_trd/trd_00/main.c b/src/world/area_trd/trd_00/main.c index 1f2f1d7a27..8fe3baba9f 100644 --- a/src/world/area_trd/trd_00/main.c +++ b/src/world/area_trd/trd_00/main.c @@ -59,8 +59,8 @@ EvtScript N(D_80240B34_99A7A4) = { }; EvtScript N(EVS_EnterMap) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(GetLoadType, LVar1) IfEq(LVar1, 1) Exec(EnterSavePoint) @@ -97,13 +97,13 @@ EvtScript N(EVS_EnterMap) = { CaseEq(trd_00_ENTRY_5) Exec(N(EVS_BindExitTriggers)) EndSwitch - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return End }; EvtScript N(EVS_TexPan_WaterEdge) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_ue, TEX_PANNER_1) Set(LVar0, 0) Set(LVar1, 0) diff --git a/src/world/area_trd/trd_00/npc.c b/src/world/area_trd/trd_00/npc.c index 9c442490d3..244e73be61 100644 --- a/src/world/area_trd/trd_00/npc.c +++ b/src/world/area_trd/trd_00/npc.c @@ -351,7 +351,7 @@ NpcData N(NpcData_Eldstar) = { }, .init = &N(EVS_NpcInit_Eldstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_FLYING, .drops = NO_DROPS, .animations = ELDSTAR_ANIMS, }; diff --git a/src/world/area_trd/trd_01/entity.c b/src/world/area_trd/trd_01/entity.c index 84f7229cd3..3609373366 100644 --- a/src/world/area_trd/trd_01/entity.c +++ b/src/world/area_trd/trd_01/entity.c @@ -27,18 +27,18 @@ EvtScript N(EVS_FocusCamOnLock) = { #include "world/common/todo/GetEntityPosition.inc.c" EvtScript N(EVS_UnlockDoors) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(ShowKeyChoicePopup) IfEq(LVar0, 0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf IfEq(LVar0, -1) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf Call(FindKeyItem, ITEM_KOOPA_FORTRESS_KEY, LVar0) @@ -50,7 +50,7 @@ EvtScript N(EVS_UnlockDoors) = { Set(LVar0, MV_Padlock_EntityIndex) Call(N(RemovePadlock)) Call(PanToTarget, CAM_DEFAULT, 0, FALSE) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End diff --git a/src/world/area_trd/trd_01/main.c b/src/world/area_trd/trd_01/main.c index f558fe7b0f..fe6f726156 100644 --- a/src/world/area_trd/trd_01/main.c +++ b/src/world/area_trd/trd_01/main.c @@ -10,8 +10,8 @@ extern NpcGroupList N(DefaultNPCs); #include "world/common/atomic/TexturePan.inc.c" EvtScript N(EVS_EnterMap) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(GetEntryID, LVar0) Switch(LVar0) CaseEq(trd_01_ENTRY_0) @@ -31,7 +31,7 @@ EvtScript N(EVS_EnterMap) = { Set(LVar3, MODEL_e4_doa2) ExecWait(EnterDoubleDoor) EndSwitch - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return End }; @@ -44,7 +44,7 @@ EvtScript N(EVS_ExitDoors_trd_09_0) = EVT_EXIT_DOUBLE_DOOR(trd_01_ENTRY_3, "trd_ EvtScript N(EVS_Scene_RaiseStairs) = { Call(DisablePlayerInput, TRUE) Set(GB_StoryProgress, STORY_CH1_RAISED_SUBMERGED_STAIRS) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Wait(1) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Wait(20 * DT) @@ -62,7 +62,7 @@ EvtScript N(EVS_Scene_RaiseStairs) = { Call(SetGroupVisibility, MODEL_move_saku, MODEL_GROUP_HIDDEN) Call(PlaySound, SOUND_LOOP_TRD_FLOWING_WATER) ChildThread - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Wait(4 * DT) Call(EnableModel, MODEL_sui1, TRUE) Call(EnableModel, MODEL_sui2, TRUE) @@ -271,14 +271,14 @@ EvtScript N(EVS_Scene_RaiseStairs) = { Call(ResetCam, CAM_DEFAULT, Float(1.5 / DT)) Call(StopSound, SOUND_LOOP_TRD_FLOWING_WATER) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Unbind Return End }; EvtScript N(EVS_TexPan_Water) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_suimenn, TEX_PANNER_1) Set(LVar0, 0) Set(LVar1, 0) diff --git a/src/world/area_trd/trd_02/entity.c b/src/world/area_trd/trd_02/entity.c index 1736248915..34afe8593d 100644 --- a/src/world/area_trd/trd_02/entity.c +++ b/src/world/area_trd/trd_02/entity.c @@ -7,18 +7,18 @@ extern EvtScript N(EVS_ExitDoors_trd_01_2); #include "world/common/todo/GetEntityPosition.inc.c" EvtScript N(D_80242890_9A3870) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(ShowKeyChoicePopup) IfEq(LVar0, 0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf IfEq(LVar0, -1) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf Call(RemoveKeyItemAt, LVar1) @@ -28,7 +28,7 @@ EvtScript N(D_80242890_9A3870) = { Call(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) Set(LVar0, MV_Padlock_EntityIndex) Call(N(RemovePadlock)) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End diff --git a/src/world/area_trd/trd_02/main.c b/src/world/area_trd/trd_02/main.c index 7299edb557..b5dbf9bbf2 100644 --- a/src/world/area_trd/trd_02/main.c +++ b/src/world/area_trd/trd_02/main.c @@ -19,8 +19,8 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_EnterMap) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(GetEntryID, LVar0) Switch(LVar0) CaseEq(trd_02_ENTRY_0) @@ -47,15 +47,15 @@ EvtScript N(EVS_EnterMap) = { Set(LVar0, Ref(N(EVS_BindExitTriggers))) Exec(EnterWalk) EndSwitch - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return End }; EvtScript N(EVS_Scene_LowerStairs) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, 0) - SuspendGroup(EVT_GROUP_01) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(DisablePlayerInput, TRUE) Wait(30) Call(SetGroupVisibility, MODEL_move_saku, MODEL_GROUP_HIDDEN) @@ -112,7 +112,7 @@ EvtScript N(EVS_Scene_LowerStairs) = { Set(GB_StoryProgress, STORY_CH1_LOWERED_SECOND_STAIRS) Call(DisablePlayerInput, FALSE) Call(SetTimeFreezeMode, 0) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End @@ -124,8 +124,8 @@ BombTrigger N(D_8024240C_9A33EC) = { }; EvtScript N(D_8024241C_9A33FC) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) PlayEffect(EFFECT_BOMBETTE_BREAKING, 0, 17, 11, 1, 10, 30) Call(EnableModel, MODEL_anaaki, TRUE) Loop(10) @@ -136,7 +136,7 @@ EvtScript N(D_8024241C_9A33FC) = { EndLoop Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tta, COLLIDER_FLAGS_UPPER_MASK) Set(GF_TRD02_BombedWall, TRUE) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End diff --git a/src/world/area_trd/trd_03/npc.c b/src/world/area_trd/trd_03/npc.c index 93e8327a3f..6452738d7b 100644 --- a/src/world/area_trd/trd_03/npc.c +++ b/src/world/area_trd/trd_03/npc.c @@ -186,7 +186,7 @@ NpcData N(NpcData_KoopaBros) = { .yaw = 270, .init = &N(EVS_NpcInit_KoopaBros), .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Green_Idle, diff --git a/src/world/area_trd/trd_04/entity.c b/src/world/area_trd/trd_04/entity.c index d41cba43ba..c00590ddcb 100644 --- a/src/world/area_trd/trd_04/entity.c +++ b/src/world/area_trd/trd_04/entity.c @@ -33,18 +33,18 @@ s32 N(missing_80244D70_4D70)[] = { }; EvtScript N(EVS_UnlockUpperLeftDoors) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(ShowKeyChoicePopup) IfEq(LVar0, 0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf IfEq(LVar0, -1) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf Call(RemoveKeyItemAt, LVar1) @@ -54,25 +54,25 @@ EvtScript N(EVS_UnlockUpperLeftDoors) = { Call(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) Set(LVar0, MV_Unk_00) Call(N(RemovePadlock)) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End }; EvtScript N(EVS_UnlockLowerRightDoors) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(ShowKeyChoicePopup) IfEq(LVar0, 0) Call(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf IfEq(LVar0, -1) Call(CloseChoicePopup) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return EndIf Call(RemoveKeyItemAt, LVar1) @@ -82,7 +82,7 @@ EvtScript N(EVS_UnlockLowerRightDoors) = { Call(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) Set(LVar0, MV_Unk_01) Call(N(RemovePadlock)) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End diff --git a/src/world/area_trd/trd_04/main.c b/src/world/area_trd/trd_04/main.c index eb6dcd7756..0ec1fc88cf 100644 --- a/src/world/area_trd/trd_04/main.c +++ b/src/world/area_trd/trd_04/main.c @@ -61,8 +61,8 @@ EvtScript N(EVS_EnterMap) = { Exec(N(EVS_BindExitTriggers)) Return EndIf - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(GetEntryID, LVar0) Switch(LVar0) CaseEq(trd_04_ENTRY_0) @@ -94,14 +94,14 @@ EvtScript N(EVS_EnterMap) = { ExecWait(EnterDoubleDoor) Exec(N(EVS_BindExitTriggers)) EndSwitch - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return End }; EvtScript N(EVS_Scene_LowerStairs) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Set(GB_StoryProgress, STORY_CH1_LOWERED_FIRST_STAIRS) Call(DisablePlayerInput, TRUE) Wait(30 * DT) @@ -210,14 +210,14 @@ EvtScript N(EVS_Scene_LowerStairs) = { Call(EnableModel, MODEL_o7, TRUE) Call(EnableModel, MODEL_bero2, TRUE) Call(DisablePlayerInput, FALSE) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End }; EvtScript N(EVS_TexPan_Water) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_suimen, TEX_PANNER_1) Set(LVar0, 0) Set(LVar1, 0) diff --git a/src/world/area_trd/trd_05/main.c b/src/world/area_trd/trd_05/main.c index abd4509feb..b041f6ddb2 100644 --- a/src/world/area_trd/trd_05/main.c +++ b/src/world/area_trd/trd_05/main.c @@ -26,8 +26,8 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_EnterMap) = { - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(GetEntryID, LVar0) Switch(LVar0) CaseEq(trd_05_ENTRY_0) @@ -49,7 +49,7 @@ EvtScript N(EVS_EnterMap) = { ExecWait(EnterDoubleDoor) Exec(N(EVS_BindExitTriggers)) EndSwitch - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return End }; @@ -61,8 +61,8 @@ BombTrigger N(BombPos_Wall) = { EvtScript N(EVS_BombWall) = { PlayEffect(EFFECT_BOMBETTE_BREAKING, 0, 29, 0, 1, 10, 30) - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(SetGroupVisibility, MODEL_ana2, MODEL_GROUP_VISIBLE) Loop(10) Call(SetGroupVisibility, MODEL_ana3, MODEL_GROUP_VISIBLE) @@ -72,14 +72,14 @@ EvtScript N(EVS_BombWall) = { EndLoop Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) Set(GF_TRD05_BombedWall, TRUE) - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Unbind Return End }; EvtScript N(EVS_TexPan_Water) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_suimen, TEX_PANNER_1) Set(LVar0, 0) Set(LVar1, 0) diff --git a/src/world/area_trd/trd_05/npc.c b/src/world/area_trd/trd_05/npc.c index 86b77bf4b2..0174283f58 100644 --- a/src/world/area_trd/trd_05/npc.c +++ b/src/world/area_trd/trd_05/npc.c @@ -208,7 +208,7 @@ NpcData N(NpcData_KoopaBros)[] = { .yaw = 0, .init = &N(EVS_NpcInit_KoopaBros), .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Yellow_Idle, @@ -235,7 +235,7 @@ NpcData N(NpcData_KoopaBros)[] = { .yaw = 0, .init = &N(EVS_NpcInit_KoopaBros), .settings = &N(NpcSettings_KoopaBros), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Yellow_Idle, diff --git a/src/world/area_trd/trd_06/main.c b/src/world/area_trd/trd_06/main.c index 0723ad5ec9..5b73786f47 100644 --- a/src/world/area_trd/trd_06/main.c +++ b/src/world/area_trd/trd_06/main.c @@ -118,7 +118,7 @@ EvtScript N(EVS_BombWall_Cell) = { }; EvtScript N(EVS_TexPan_Water) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_suimen, TEX_PANNER_1) Set(LVar0, 0) Set(LVar1, 0) diff --git a/src/world/area_trd/trd_06/npc_prisoners.c b/src/world/area_trd/trd_06/npc_prisoners.c index 16bf30ebfb..11ebf105e2 100644 --- a/src/world/area_trd/trd_06/npc_prisoners.c +++ b/src/world/area_trd/trd_06/npc_prisoners.c @@ -369,7 +369,7 @@ NpcData N(NpcData_Bombette) = { .yaw = 0, .init = &N(EVS_NpcInit_Bombette), .settings = &N(NpcSettings_Bobomb), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldBombette_Idle, @@ -399,7 +399,7 @@ NpcData N(NpcData_Jailers)[] = { .yaw = 0, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_KoopaTroopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, @@ -435,7 +435,7 @@ NpcData N(NpcData_Jailers)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Bobomb_Jailer), .settings = &N(NpcSettings_Bobomb), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = NO_DROPS, .animations = { .idle = ANIM_Bobomb_Idle, @@ -462,7 +462,7 @@ NpcData N(NpcData_Jailers)[] = { .yaw = 0, .init = &N(EVS_NpcInit_Bobomb_Jailer), .settings = &N(NpcSettings_Bobomb), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = NO_DROPS, .animations = { .idle = ANIM_Bobomb_Idle, diff --git a/src/world/area_trd/trd_07/magic_doors.c b/src/world/area_trd/trd_07/magic_doors.c index f3a86e237a..ca2c9d000f 100644 --- a/src/world/area_trd/trd_07/magic_doors.c +++ b/src/world/area_trd/trd_07/magic_doors.c @@ -205,8 +205,8 @@ EvtScript N(EVS_RaiseMagicDoors) = { Wait(1) Goto(10) EndIf - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Call(DisablePlayerInput, TRUE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(PlaySound, SOUND_CHIME_BEGIN_AMBUSH) @@ -243,8 +243,8 @@ EvtScript N(EVS_RaiseMagicDoors) = { Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_ttw, COLLIDER_FLAGS_UPPER_MASK) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deilite, COLLIDER_FLAGS_UPPER_MASK) Call(DisablePlayerInput, FALSE) - ResumeGroup(EVT_GROUP_01) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; @@ -254,7 +254,7 @@ EvtScript N(EVS_LowerMagicDoors) = { Wait(15) Call(PlaySound, SOUND_CHIME_SOLVED_PUZZLE) Wait(15) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) EVT_VEC3I_SET(LVar0, 220, 0, 0) Call(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) @@ -286,7 +286,7 @@ EvtScript N(EVS_LowerMagicDoors) = { Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_ttw, COLLIDER_FLAGS_UPPER_MASK) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilite, COLLIDER_FLAGS_UPPER_MASK) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return End }; diff --git a/src/world/area_trd/trd_07/main.c b/src/world/area_trd/trd_07/main.c index 633404a18e..c6203dcf90 100644 --- a/src/world/area_trd/trd_07/main.c +++ b/src/world/area_trd/trd_07/main.c @@ -17,7 +17,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_TexPan_1) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Set(LVar0, 0) Set(LVar1, 0) Label(10) diff --git a/src/world/area_trd/trd_07/npc.c b/src/world/area_trd/trd_07/npc.c index 051ff70f6f..701a3f7a0f 100644 --- a/src/world/area_trd/trd_07/npc.c +++ b/src/world/area_trd/trd_07/npc.c @@ -20,7 +20,7 @@ EvtScript N(EVS_NpcDefeat_KoopaTroopa) = { CaseEq(OUTCOME_PLAYER_FLED) Call(OnPlayerFled, 0) CaseEq(OUTCOME_ENEMY_FLED) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) EndSwitch Return @@ -55,7 +55,7 @@ NpcData N(NpcData_KoopaTroopa) = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_KoopaTroopa_Wander), - .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = KOOPA_TROOPA_TRD_DROPS, .animations = KOOPA_TROOPA_ANIMS, }; @@ -78,7 +78,7 @@ NpcData N(NpcData_ParaTroopa_01) = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_ParaTroopa), - .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = PARATROOPA_DROPS, .animations = PARATROOPA_ANIMS, }; @@ -101,7 +101,7 @@ NpcData N(NpcData_ParaTroopa_02) = { }, .init = &N(EVS_NpcInit_KoopaTroopa), .settings = &N(NpcSettings_ParaTroopa), - .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = PARATROOPA_DROPS, .animations = PARATROOPA_ANIMS, }; diff --git a/src/world/area_trd/trd_08/main.c b/src/world/area_trd/trd_08/main.c index dbb73504d8..48614c5fc0 100644 --- a/src/world/area_trd/trd_08/main.c +++ b/src/world/area_trd/trd_08/main.c @@ -15,7 +15,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_TexPan_Water) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_suimen, TEX_PANNER_1) Set(LVar0, 0) Set(LVar1, 0) diff --git a/src/world/area_trd/trd_09/main.c b/src/world/area_trd/trd_09/main.c index 619780ae47..e613e704c0 100644 --- a/src/world/area_trd/trd_09/main.c +++ b/src/world/area_trd/trd_09/main.c @@ -25,8 +25,8 @@ EvtScript N(EVS_EnterMap) = { Exec(N(EVS_BindExitTriggers)) Return EndIf - SetGroup(EVT_GROUP_00) - SuspendGroup(EVT_GROUP_01) + SetGroup(EVT_GROUP_NEVER_PAUSE) + SuspendGroup(EVT_GROUP_FLAG_INTERACT) Exec(N(EVS_BindExitTriggers)) Call(GetEntryID, LVar0) Switch(LVar0) @@ -39,7 +39,7 @@ EvtScript N(EVS_EnterMap) = { Set(LVar3, MODEL_o65) ExecWait(EnterDoubleDoor) EndSwitch - ResumeGroup(EVT_GROUP_01) + ResumeGroup(EVT_GROUP_FLAG_INTERACT) Return End }; diff --git a/src/world/area_trd/trd_09/npc.c b/src/world/area_trd/trd_09/npc.c index d2862b75a2..4422e4c368 100644 --- a/src/world/area_trd/trd_09/npc.c +++ b/src/world/area_trd/trd_09/npc.c @@ -25,7 +25,7 @@ API_CALLABLE(N(GetBulletBillVar)) { } EvtScript N(EVS_NpcAuxAI_BillBlaster) = { - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, TRUE) Return End }; @@ -100,7 +100,7 @@ EvtScript N(D_80240B80_9BE1E0) = { Call(DoNpcDefeat) CaseEq(OUTCOME_PLAYER_FLED) CaseEq(OUTCOME_ENEMY_FLED) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) EndSwitch Return @@ -390,7 +390,7 @@ EvtScript N(EVS_NpcAI_BillBlaster) = { }; EvtScript N(EVS_NpcAI_BulletBill) = { - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, TRUE) Label(1) Call(SetSelfVar, 0, 0) Call(EnableNpcShadow, NPC_SELF, FALSE) @@ -562,7 +562,7 @@ NpcData N(NpcData_BillBlasters)[] = { }, .init = &N(EVS_NpcInit_BillBlaster), .settings = &N(NpcSettings_BillBlaster), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = BILL_BLASTER_ANIMS, }, @@ -583,7 +583,7 @@ NpcData N(NpcData_BillBlasters)[] = { } }, .settings = &N(NpcSettings_BillBlaster), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = BILL_BLASTER_DROPS, .animations = BILL_BLASTER_ANIMS, }, @@ -604,7 +604,7 @@ NpcData N(NpcData_BillBlasters)[] = { } }, .settings = &N(NpcSettings_BillBlaster), - .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_40000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = NO_DROPS, .animations = BILL_BLASTER_ANIMS, }, @@ -711,7 +711,7 @@ NpcData N(NpcData_BulletBill_Demo1) = { .initVarCount = 1, .initVar = { .value = 0 }, .settings = &N(NpcSettings_BulletBill), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_80000, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DONT_SUSPEND_SCRIPTS, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 3, @@ -761,7 +761,7 @@ NpcData N(NpcData_BulletBill_Demo2) = { .initVarCount = 1, .initVar = { .value = 0 }, .settings = &N(NpcSettings_BulletBill), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_80000, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DONT_SUSPEND_SCRIPTS, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 3, @@ -811,7 +811,7 @@ NpcData N(NpcData_BulletBill_Demo3) = { .initVarCount = 1, .initVar = { .value = 0 }, .settings = &N(NpcSettings_BulletBill), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_80000, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DONT_SUSPEND_SCRIPTS, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 3, @@ -861,7 +861,7 @@ NpcData N(NpcData_BulletBill_Demo4) = { .initVarCount = 1, .initVar = { .value = 0 }, .settings = &N(NpcSettings_BulletBill), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_80000, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DONT_SUSPEND_SCRIPTS, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 3, @@ -911,7 +911,7 @@ NpcData N(NpcData_BulletBill_Demo5) = { .initVarCount = 1, .initVar = { .value = 0 }, .settings = &N(NpcSettings_BulletBill), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_80000, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DONT_SUSPEND_SCRIPTS, .drops = { .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 3, diff --git a/src/world/area_trd/trd_10/main.c b/src/world/area_trd/trd_10/main.c index f02fb160f4..db50df9b3d 100644 --- a/src/world/area_trd/trd_10/main.c +++ b/src/world/area_trd/trd_10/main.c @@ -109,7 +109,7 @@ EvtScript N(EVS_EnterMap) = { }; EvtScript N(EVS_ExitDoors_trd_09_1) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerInput, TRUE) Set(LVar0, trd_10_ENTRY_0) Set(LVar1, COLLIDER_ttw) diff --git a/src/world/area_trd/trd_10/npc.c b/src/world/area_trd/trd_10/npc.c index 7df101c940..328b59210d 100644 --- a/src/world/area_trd/trd_10/npc.c +++ b/src/world/area_trd/trd_10/npc.c @@ -122,7 +122,7 @@ EvtScript N(EVS_NpcInteract_KoopaBros_01) = { }; EvtScript N(EVS_NpcDefeat_KoopaBros_01) = { - Call(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_2, TRUE) + Call(SetEncounterStatusFlags, ENCOUNTER_FLAG_CANT_SKIP_WIN_DELAY, TRUE) Call(DisablePlayerInput, TRUE) Call(SetNpcPos, NPC_KoopaBros_01, NPC_DISPOSE_LOCATION) Call(SetNpcFlagBits, NPC_KoopaBros_01, NPC_FLAG_INVISIBLE, FALSE) @@ -341,7 +341,7 @@ NpcData N(NpcData_KoopaBros_01)[] = { .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_KoopaBros_01), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Black_Idle, @@ -367,7 +367,7 @@ NpcData N(NpcData_KoopaBros_01)[] = { .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_KoopaBros_02), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Red_Idle, @@ -393,7 +393,7 @@ NpcData N(NpcData_KoopaBros_01)[] = { .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_KoopaBros_03), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Yellow_Idle, @@ -419,7 +419,7 @@ NpcData N(NpcData_KoopaBros_01)[] = { .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, .settings = &N(NpcSettings_KoopaBros_04), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_NO_DROPS, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_NO_DROPS, .drops = NO_DROPS, .animations = { .idle = ANIM_KoopaBros_Green_Idle, diff --git a/src/world/area_tst/tst_04/npc.c b/src/world/area_tst/tst_04/npc.c index ef3caa2cca..54b2a07324 100644 --- a/src/world/area_tst/tst_04/npc.c +++ b/src/world/area_tst/tst_04/npc.c @@ -48,7 +48,7 @@ NpcSettings N(NpcSettings_Goompa) = { .aux = &N(EVS_NpcAux_Goompa), .onDefeat = &N(EVS_NpcDefeat_Goompa), .unk_24 = 200, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL, }; NpcData N(NpcData_GoombaFamily) = { diff --git a/src/world/area_tst/tst_10/main.c b/src/world/area_tst/tst_10/main.c index ad8090e704..06511ae699 100644 --- a/src/world/area_tst/tst_10/main.c +++ b/src/world/area_tst/tst_10/main.c @@ -18,7 +18,7 @@ MapSettings N(settings) = { .background = &gBackgroundImage, }; -// note: sets DisablePlayerInput, but does not use EVT_GROUP_1B +// note: sets DisablePlayerInput, but does not use EVT_GROUP_EXIT_MAP EvtScript N(EVS_ExitWalk_tst_10_2) = { Call(DisablePlayerInput, TRUE) Call(UseExitHeading, 60, tst_10_ENTRY_0) @@ -29,7 +29,7 @@ EvtScript N(EVS_ExitWalk_tst_10_2) = { End }; -// note: sets DisablePlayerInput, but does not use EVT_GROUP_1B +// note: sets DisablePlayerInput, but does not use EVT_GROUP_EXIT_MAP EvtScript N(EVS_ExitWalk_tst_10_3) = { Call(DisablePlayerInput, TRUE) Call(UseExitHeading, 60, tst_10_ENTRY_1) @@ -40,7 +40,7 @@ EvtScript N(EVS_ExitWalk_tst_10_3) = { End }; -// note: sets DisablePlayerInput, but does not use EVT_GROUP_1B +// note: sets DisablePlayerInput, but does not use EVT_GROUP_EXIT_MAP EvtScript N(EVS_ExitWalk_tst_10_0) = { Call(DisablePlayerInput, TRUE) Call(UseExitHeading, 60, tst_10_ENTRY_2) @@ -51,7 +51,7 @@ EvtScript N(EVS_ExitWalk_tst_10_0) = { End }; -// note: sets DisablePlayerInput, but does not use EVT_GROUP_1B +// note: sets DisablePlayerInput, but does not use EVT_GROUP_EXIT_MAP EvtScript N(EVS_ExitWalk_tst_10_1) = { Call(DisablePlayerInput, TRUE) Call(UseExitHeading, 60, tst_10_ENTRY_3) diff --git a/src/world/area_tst/tst_12/main.c b/src/world/area_tst/tst_12/main.c index 7cf5ea281a..d32c6a3d65 100644 --- a/src/world/area_tst/tst_12/main.c +++ b/src/world/area_tst/tst_12/main.c @@ -15,7 +15,7 @@ MapSettings N(settings) = { }; EvtScript N(D_80240050_B1D340) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Set(LVarA, LVar0) Set(LVarB, LVar1) Set(LVarC, LVar2) diff --git a/src/world/common/atomic/TexturePan.inc.c b/src/world/common/atomic/TexturePan.inc.c index 20ee1ddac4..4dd37c9eda 100644 --- a/src/world/common/atomic/TexturePan.inc.c +++ b/src/world/common/atomic/TexturePan.inc.c @@ -110,7 +110,7 @@ API_CALLABLE(N(UpdateTexturePanStepped)) { } EvtScript N(EVS_UpdateTexturePan) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) IfEq(LVar5, 1) IfEq(LVar6, 1) IfEq(LVar7, 1) diff --git a/src/world/common/complete/Quizmo.inc.c b/src/world/common/complete/Quizmo.inc.c index f00df018e2..536043d9a4 100644 --- a/src/world/common/complete/Quizmo.inc.c +++ b/src/world/common/complete/Quizmo.inc.c @@ -1227,7 +1227,7 @@ NpcSettings N(NpcSettings_ChuckQuizmo) = { .otherAI = &N(EVS_Quizmo_NPC_OtherAI), .onInteract = &N(EVS_Quizmo_NPC_Interact), .aux = &N(EVS_Quizmo_NPC_Aux), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .level = ACTOR_LEVEL_NONE, }; diff --git a/src/world/common/enemy/Bandit.inc.c b/src/world/common/enemy/Bandit.inc.c index 816970ea67..594d8c1122 100644 --- a/src/world/common/enemy/Bandit.inc.c +++ b/src/world/common/enemy/Bandit.inc.c @@ -101,7 +101,7 @@ EvtScript N(EVS_NpcDefeat_Bandit) = { Call(NpcMoveTo, NPC_SELF, LVar7, LVar9, 0) Set(HAS_COIN_FLAG, FALSE) Call(DisablePlayerInput, FALSE) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) EndSwitch Return diff --git a/src/world/common/enemy/BombshellBill.h b/src/world/common/enemy/BombshellBill.h index 4ad923471b..83f0b0064d 100644 --- a/src/world/common/enemy/BombshellBill.h +++ b/src/world/common/enemy/BombshellBill.h @@ -69,7 +69,7 @@ .settings = &N(NpcSettings_BombshellBill), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 0, \ - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_80000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, \ + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DONT_SUSPEND_SCRIPTS | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, \ .drops = BOMBSHELL_BILL_DROPS, \ .territory = { \ .wander = { \ diff --git a/src/world/common/enemy/BulletBill.h b/src/world/common/enemy/BulletBill.h index 2c37c52246..e28905e2c1 100644 --- a/src/world/common/enemy/BulletBill.h +++ b/src/world/common/enemy/BulletBill.h @@ -67,7 +67,7 @@ .settings = &N(NpcSettings_BulletBill), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 270, \ - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_80000, \ + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_DONT_SUSPEND_SCRIPTS, \ .initVarCount = 1, \ .initVar = { .value = 0 }, \ .drops = BULLET_BILL_DROPS, \ diff --git a/src/world/common/enemy/Clubba_Multi.inc.c b/src/world/common/enemy/Clubba_Multi.inc.c index e3d7dd30ad..c506f559e8 100644 --- a/src/world/common/enemy/Clubba_Multi.inc.c +++ b/src/world/common/enemy/Clubba_Multi.inc.c @@ -9,7 +9,7 @@ EvtScript N(EVS_NpcDefeat_Clubba) = { Call(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) Call(OnPlayerFled, 1) CaseEq(OUTCOME_ENEMY_FLED) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) EndSwitch Return diff --git a/src/world/common/enemy/DryBones.inc.c b/src/world/common/enemy/DryBones.inc.c index d7ecf7b97f..cad4620fd4 100644 --- a/src/world/common/enemy/DryBones.inc.c +++ b/src/world/common/enemy/DryBones.inc.c @@ -13,7 +13,7 @@ EvtScript N(EVS_NpcDefeat_ThrownBone) = { Call(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) Call(OnPlayerFled, 1) CaseEq(OUTCOME_ENEMY_FLED) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) EndSwitch Return diff --git a/src/world/common/enemy/FlyingMagikoopa.inc.c b/src/world/common/enemy/FlyingMagikoopa.inc.c index 21c0e8ef89..930143d8de 100644 --- a/src/world/common/enemy/FlyingMagikoopa.inc.c +++ b/src/world/common/enemy/FlyingMagikoopa.inc.c @@ -31,7 +31,7 @@ EvtScript N(EVS_NpcDefeat_FlyingMagikoopa) = { CaseEq(OUTCOME_PLAYER_FLED) Call(OnPlayerFled, 0) CaseEq(OUTCOME_ENEMY_FLED) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) EndSwitch Return @@ -98,7 +98,7 @@ EvtScript N(EVS_NpcDefeat_FlyingMagikoopa_Hitbox) = { Call(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) Call(OnPlayerFled, 1) CaseEq(OUTCOME_ENEMY_FLED) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) EndSwitch Return diff --git a/src/world/common/enemy/FrostClubba_Multi.inc.c b/src/world/common/enemy/FrostClubba_Multi.inc.c index 237267e942..5902aca73a 100644 --- a/src/world/common/enemy/FrostClubba_Multi.inc.c +++ b/src/world/common/enemy/FrostClubba_Multi.inc.c @@ -9,7 +9,7 @@ EvtScript N(EVS_NpcDefeat_FrostClubba) = { Call(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) Call(OnPlayerFled, 1) CaseEq(OUTCOME_ENEMY_FLED) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) EndSwitch Return diff --git a/src/world/common/enemy/HammerBros_Wander.inc.c b/src/world/common/enemy/HammerBros_Wander.inc.c index 74a14de365..2e283fd6f9 100644 --- a/src/world/common/enemy/HammerBros_Wander.inc.c +++ b/src/world/common/enemy/HammerBros_Wander.inc.c @@ -14,7 +14,7 @@ EvtScript N(EVS_NpcDefeat_HammerBros_Hammer) = { Call(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) Call(OnPlayerFled, 1) CaseEq(OUTCOME_ENEMY_FLED) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) EndSwitch Return diff --git a/src/world/common/enemy/HeartPlant.inc.c b/src/world/common/enemy/HeartPlant.inc.c index 1edda0d3c4..0db373f19a 100644 --- a/src/world/common/enemy/HeartPlant.inc.c +++ b/src/world/common/enemy/HeartPlant.inc.c @@ -49,5 +49,5 @@ NpcSettings N(NpcSettings_HeartPlant) = { }; #define HEART_PLANT_FLAGS \ - ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | \ - ENEMY_FLAG_FLYING | ENEMY_FLAG_8000 | ENEMY_FLAG_400000 + ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | \ + ENEMY_FLAG_FLYING | ENEMY_FLAG_USE_INSPECT_ICON | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER diff --git a/src/world/common/enemy/HurtPlant.inc.c b/src/world/common/enemy/HurtPlant.inc.c index 74c1e205b5..1a421ff3a3 100644 --- a/src/world/common/enemy/HurtPlant.inc.c +++ b/src/world/common/enemy/HurtPlant.inc.c @@ -11,7 +11,7 @@ EvtScript N(EVS_NpcAI_HurtPlant) = { Wait(1) Goto(0) EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(DisablePlayerInput, TRUE) Call(NpcFacePlayer, NPC_SELF, 0) @@ -23,7 +23,7 @@ EvtScript N(EVS_NpcAI_HurtPlant) = { Wait(5) Call(SetNpcAnimation, NPC_SELF, ANIM_HurtPlant_Anim02) Call(DisablePlayerInput, FALSE) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(StartBattle) Return End @@ -43,7 +43,7 @@ EvtScript N(EVS_NpcDefeat_HurtPlant) = { CaseEq(OUTCOME_PLAYER_FLED) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_NpcAI_HurtPlant))) CaseEq(OUTCOME_ENEMY_FLED) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) EndSwitch Return @@ -68,5 +68,4 @@ AnimID N(ExtraAnims_HurtPlant)[] = { }; #define HURT_PLANT_FLAGS \ - ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | \ - ENEMY_FLAG_FLYING | ENEMY_FLAG_8000 | ENEMY_FLAG_400000 + BASE_PASSIVE_FLAGS | ENEMY_FLAG_USE_INSPECT_ICON | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER diff --git a/src/world/common/enemy/Lakitu_SpinySpawner.inc.c b/src/world/common/enemy/Lakitu_SpinySpawner.inc.c index 8bae3b2f81..495422e715 100644 --- a/src/world/common/enemy/Lakitu_SpinySpawner.inc.c +++ b/src/world/common/enemy/Lakitu_SpinySpawner.inc.c @@ -78,7 +78,7 @@ EvtScript N(EVS_NpcDefeat_SpawnedSpiny) = { CaseEq(OUTCOME_PLAYER_FLED) Call(OnPlayerFled, 0) CaseEq(OUTCOME_ENEMY_FLED) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) EndSwitch Return diff --git a/src/world/common/enemy/MBush.inc.c b/src/world/common/enemy/MBush.inc.c index 2fe3606096..5b7dda9aab 100644 --- a/src/world/common/enemy/MBush.inc.c +++ b/src/world/common/enemy/MBush.inc.c @@ -11,7 +11,7 @@ EvtScript N(EVS_NpcAI_MBush) = { Wait(1) Goto(0) EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(DisablePlayerInput, TRUE) Call(PlaySoundAtNpc, NPC_SELF, SOUND_SEARCH_BUSH, SOUND_SPACE_DEFAULT) @@ -52,7 +52,7 @@ EvtScript N(EVS_NpcAI_MBush) = { Call(SetNpcAnimation, NPC_SELF, ANIM_MBush_Anim07) Wait(2) Call(SetPlayerAnimation, ANIM_Mario1_Flail) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(DisablePlayerInput, FALSE) Call(StartBattle) }; // fallthrough :( @@ -79,7 +79,7 @@ EvtScript N(EVS_NpcDefeat_MBush) = { Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) Call(BindNpcAI, NPC_SELF, Ref(N(EVS_NpcAI_MBush))) CaseEq(OUTCOME_ENEMY_FLED) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) EndSwitch Return @@ -96,5 +96,4 @@ NpcSettings N(NpcSettings_MBush) = { }; #define MBUSH_FLAGS \ - ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | \ - ENEMY_FLAG_FLYING | ENEMY_FLAG_8000 | ENEMY_FLAG_400000 + BASE_PASSIVE_FLAGS | ENEMY_FLAG_USE_INSPECT_ICON | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER diff --git a/src/world/common/enemy/Magikoopa.inc.c b/src/world/common/enemy/Magikoopa.inc.c index be4c3143d1..1218dd4ce4 100644 --- a/src/world/common/enemy/Magikoopa.inc.c +++ b/src/world/common/enemy/Magikoopa.inc.c @@ -124,7 +124,7 @@ EvtScript N(EVS_NpcDefeat_Magikoopa_Hitbox) = { Call(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) Call(OnPlayerFled, 1) CaseEq(OUTCOME_ENEMY_FLED) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) EndSwitch Return diff --git a/src/world/common/enemy/MontyMole_GroundAmbush.inc.c b/src/world/common/enemy/MontyMole_GroundAmbush.inc.c index eb1333f475..51130d3c5d 100644 --- a/src/world/common/enemy/MontyMole_GroundAmbush.inc.c +++ b/src/world/common/enemy/MontyMole_GroundAmbush.inc.c @@ -39,7 +39,7 @@ MobileAISettings N(AISettings_MontyMole_GroundAmbush) = { EvtScript N(EVS_NpcAI_MontyMole_GroundAmbush) = { Call(func_800445D4, LVar0) IfEq(LVar0, 100) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, TRUE) Label(10) Call(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) Call(IsPlayerWithin, LVar0, LVar2, 80, LVar3) @@ -62,9 +62,9 @@ EvtScript N(EVS_NpcAI_MontyMole_GroundAmbush) = { Call(PlaySoundAtNpc, NPC_SELF, SOUND_MOLE_POP, SOUND_SPACE_DEFAULT) Call(NpcJump0, NPC_SELF, LVar4, LVar5, LVar6, 20) Call(SetNpcPos, LVar0, NPC_DISPOSE_LOCATION) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, FALSE) Call(NpcFacePlayer, NPC_SELF, 0) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, TRUE) Call(BasicAI_Main, Ref(N(AISettings_MontyMole_GroundAmbush))) Return End diff --git a/src/world/common/enemy/MontyMole_StoneThrower.inc.c b/src/world/common/enemy/MontyMole_StoneThrower.inc.c index 2af1336ea6..f0523cdc76 100644 --- a/src/world/common/enemy/MontyMole_StoneThrower.inc.c +++ b/src/world/common/enemy/MontyMole_StoneThrower.inc.c @@ -16,7 +16,7 @@ EvtScript N(EVS_NpcDefeat_MontyMole_Stone) = { Call(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) Call(OnPlayerFled, 1) CaseEq(OUTCOME_ENEMY_FLED) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) EndSwitch Return @@ -34,7 +34,7 @@ MobileAISettings N(AISettings_MontyMole_StoneThrower) = { }; EvtScript N(EVS_NpcAI_MontyMole_StoneThrower) = { - Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_200000, TRUE) + Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_INVISIBLE | NPC_FLAG_FLIP_INSTANTLY, TRUE) Call(EnableNpcShadow, NPC_SELF, FALSE) Label(0) Call(RandInt, 15, LVar0) diff --git a/src/world/common/enemy/MontyMole_WallAmbush.inc.c b/src/world/common/enemy/MontyMole_WallAmbush.inc.c index 96604c2946..ea1776899f 100644 --- a/src/world/common/enemy/MontyMole_WallAmbush.inc.c +++ b/src/world/common/enemy/MontyMole_WallAmbush.inc.c @@ -39,7 +39,7 @@ MobileAISettings N(AISettings_MontyMole_WallAmbush) = { EvtScript N(EVS_NpcAI_MontyMole_WallAmbush) = { Call(func_800445D4, LVar0) IfEq(LVar0, 100) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, TRUE) Label(10) Call(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) Add(LVar2, 130) @@ -66,9 +66,9 @@ EvtScript N(EVS_NpcAI_MontyMole_WallAmbush) = { Call(PlaySoundAtNpc, NPC_SELF, SOUND_MOLE_POP, SOUND_SPACE_DEFAULT) Call(NpcJump0, NPC_SELF, LVar1, LVar2, LVar3, 20) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, FALSE) Call(NpcFacePlayer, NPC_SELF, 0) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_BEGIN_WITH_CHASING, TRUE) EndIf Call(BasicAI_Main, Ref(N(AISettings_MontyMole_WallAmbush))) Return diff --git a/src/world/common/enemy/Sentinel.inc.c b/src/world/common/enemy/Sentinel.inc.c index ac6a845be0..5fbe20cd12 100644 --- a/src/world/common/enemy/Sentinel.inc.c +++ b/src/world/common/enemy/Sentinel.inc.c @@ -5,7 +5,7 @@ #include "world/common/enemy/ai/SentinelAI.inc.c" EvtScript N(EVS_NpcAuxAI_Sentinel) = { - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_SPIN, TRUE) Call(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_DONT_UPDATE_SHADOW_Y | NPC_FLAG_JUMPING, TRUE) Return End @@ -44,7 +44,7 @@ EvtScript N(EVS_NpcAI_Sentinel) = { Call(DisablePlayerPhysics, TRUE) Call(InterruptUsePartner) Call(DisablePartnerAI, 0) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(GetPlayerPos, LVar0, LVar1, LVar2) Add(LVar1, 20) diff --git a/src/world/common/enemy/SpearGuy_Wander.inc.c b/src/world/common/enemy/SpearGuy_Wander.inc.c index 05e0b70113..fd903193e5 100644 --- a/src/world/common/enemy/SpearGuy_Wander.inc.c +++ b/src/world/common/enemy/SpearGuy_Wander.inc.c @@ -29,7 +29,7 @@ EvtScript N(EVS_NpcDefeat_SpearGuy_Hitbox) = { Call(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) Call(OnPlayerFled, 1) CaseEq(OUTCOME_ENEMY_FLED) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) EndSwitch Return diff --git a/src/world/common/enemy/SpyGuy.inc.c b/src/world/common/enemy/SpyGuy.inc.c index d1698fa9a6..a5abbe0785 100644 --- a/src/world/common/enemy/SpyGuy.inc.c +++ b/src/world/common/enemy/SpyGuy.inc.c @@ -19,7 +19,7 @@ EvtScript N(EVS_NpcDefeat_SpyGuyRock) = { Call(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) Call(OnPlayerFled, 1) CaseEq(OUTCOME_ENEMY_FLED) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) EndSwitch Return diff --git a/src/world/common/enemy/ai/BulletBillAI.inc.c b/src/world/common/enemy/ai/BulletBillAI.inc.c index 0f854e0145..c6d7073430 100644 --- a/src/world/common/enemy/ai/BulletBillAI.inc.c +++ b/src/world/common/enemy/ai/BulletBillAI.inc.c @@ -58,7 +58,7 @@ API_CALLABLE(N(BulletBillAI_Main)) { if (enemy->aiFlags & AI_FLAG_SUSPEND) { if (enemy->aiSuspendTime != 0) { - return 0; + return ApiStatus_BLOCK; } enemy->aiFlags &= ~AI_FLAG_SUSPEND; } diff --git a/src/world/common/enemy/ai/CleftAI.inc.c b/src/world/common/enemy/ai/CleftAI.inc.c index 2520ad09e7..79b478f074 100644 --- a/src/world/common/enemy/ai/CleftAI.inc.c +++ b/src/world/common/enemy/ai/CleftAI.inc.c @@ -317,7 +317,7 @@ API_CALLABLE(N(CleftAI_Main)) { } if (enemy->aiFlags & AI_FLAG_SUSPEND) { - if (enemy->aiSuspendTime) { + if (enemy->aiSuspendTime != 0) { return ApiStatus_BLOCK; } enemy->aiFlags &= ~AI_FLAG_SUSPEND; diff --git a/src/world/common/enemy/ai/FireBarAI.inc.c b/src/world/common/enemy/ai/FireBarAI.inc.c index 77aeb74c40..666b1d93f5 100644 --- a/src/world/common/enemy/ai/FireBarAI.inc.c +++ b/src/world/common/enemy/ai/FireBarAI.inc.c @@ -51,7 +51,7 @@ API_CALLABLE(N(FireBarAI_Main)) { data->settings = settings; } - if (get_time_freeze_mode() != TIME_FREEZE_NORMAL) { + if (get_time_freeze_mode() != TIME_FREEZE_NONE) { return 0; } diff --git a/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c b/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c index 232a423bac..b2842aa996 100644 --- a/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c +++ b/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c @@ -296,7 +296,7 @@ API_CALLABLE(N(FlyingMagikoopaAI_Main)) { if (isInitialCall) { npc->flags &= ~NPC_FLAG_GRAVITY; npc->flags |= NPC_FLAG_FLYING; - npc->flags |= NPC_FLAG_200000; + npc->flags |= NPC_FLAG_FLIP_INSTANTLY; enemy->flags |= ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN; enemy->varTable[1] = npc->pos.y * 100.0; enemy->varTable[0] = 0; diff --git a/src/world/common/enemy/ai/FlyingNoAttackAI.inc.c b/src/world/common/enemy/ai/FlyingNoAttackAI.inc.c index e1ddd9d59c..101696afd9 100644 --- a/src/world/common/enemy/ai/FlyingNoAttackAI.inc.c +++ b/src/world/common/enemy/ai/FlyingNoAttackAI.inc.c @@ -128,7 +128,7 @@ API_CALLABLE(N(FlyingNoAttackAI_Main)) { npc->verticalRenderOffset = -2; if (enemy->aiFlags & AI_FLAG_SUSPEND) { - if (enemy->aiSuspendTime) { + if (enemy->aiSuspendTime != 0) { return ApiStatus_BLOCK; } enemy->aiFlags &= ~AI_FLAG_SUSPEND; diff --git a/src/world/common/enemy/ai/GenericHitboxDefeat.inc.c b/src/world/common/enemy/ai/GenericHitboxDefeat.inc.c index bc25252dd3..990e63e705 100644 --- a/src/world/common/enemy/ai/GenericHitboxDefeat.inc.c +++ b/src/world/common/enemy/ai/GenericHitboxDefeat.inc.c @@ -12,7 +12,7 @@ EvtScript N(EVS_GenericHitboxDefeat) = { Call(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) Call(OnPlayerFled, 1) CaseEq(OUTCOME_ENEMY_FLED) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, TRUE) Call(RemoveNpc, NPC_SELF) EndSwitch Return diff --git a/src/world/common/enemy/ai/GuardAI.inc.c b/src/world/common/enemy/ai/GuardAI.inc.c index e346135506..a7347f5914 100644 --- a/src/world/common/enemy/ai/GuardAI.inc.c +++ b/src/world/common/enemy/ai/GuardAI.inc.c @@ -29,7 +29,7 @@ void N(GuardAI_IdleInit)(Evt* script, GuardAISettings* aiSettings, EnemyDetectVo npc->curAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; script->AI_TEMP_STATE = AI_STATE_GUARD_IDLE; - if (enemy->flags & ENEMY_FLAG_100000) { + if (enemy->flags & ENEMY_FLAG_SKIP_BATTLE) { npc->yaw = enemy->varTable[0]; } diff --git a/src/world/common/enemy/ai/MagikoopaAI.inc.c b/src/world/common/enemy/ai/MagikoopaAI.inc.c index 28da0d602b..9e541c7b0b 100644 --- a/src/world/common/enemy/ai/MagikoopaAI.inc.c +++ b/src/world/common/enemy/ai/MagikoopaAI.inc.c @@ -9,7 +9,7 @@ typedef struct MagikoopaTeleportAnim { } MagikoopaTeleportAnim; #define ENEMY_FLAG_COMBINATION (ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_CANT_INTERACT | \ - ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_100000) + ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_SKIP_BATTLE) extern MagikoopaTeleportAnim N(MagikoopaAI_TeleportAnim)[]; @@ -251,7 +251,7 @@ API_CALLABLE(N(MagikoopaAI_Main)) { if (isInitialCall || (enemy->aiFlags & AI_FLAG_SUSPEND)) { npc->curAnim = enemy->animList[0]; npc->flags &= ~NPC_FLAG_JUMPING; - npc->flags |= NPC_FLAG_200000; + npc->flags |= NPC_FLAG_FLIP_INSTANTLY; enemy->flags |= ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN; npc->duration = 0; if (enemy->aiFlags & AI_FLAG_SUSPEND) { diff --git a/src/world/common/enemy/ai/MagikoopaSpellAI.inc.c b/src/world/common/enemy/ai/MagikoopaSpellAI.inc.c index f33298362e..6078361462 100644 --- a/src/world/common/enemy/ai/MagikoopaSpellAI.inc.c +++ b/src/world/common/enemy/ai/MagikoopaSpellAI.inc.c @@ -51,7 +51,7 @@ API_CALLABLE(N(MagikoopaAI_SpellMain)) { if (isInitialCall || (enemy->aiFlags & AI_FLAG_SUSPEND)) { script->functionTemp[0] = 0; npc1->duration = 0; - npc1->flags |= NPC_FLAG_200000 | NPC_FLAG_IGNORE_CAMERA_FOR_YAW | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_INVISIBLE; + npc1->flags |= NPC_FLAG_FLIP_INSTANTLY | NPC_FLAG_IGNORE_CAMERA_FOR_YAW | NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_INVISIBLE; enemy->flags |= ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_PROJECTILE; npc1->scale.x = 0.4f; diff --git a/src/world/common/enemy/ai/MeleeHitbox.inc.c b/src/world/common/enemy/ai/MeleeHitbox.inc.c index f7a7c5c0da..9758049b78 100644 --- a/src/world/common/enemy/ai/MeleeHitbox.inc.c +++ b/src/world/common/enemy/ai/MeleeHitbox.inc.c @@ -116,7 +116,7 @@ API_CALLABLE(N(MeleeHitbox_Main)) { script->functionTemp[0] = 0; hitboxNpc->duration = 0; hitboxNpc->flags |= (NPC_FLAG_INVISIBLE | NPC_FLAG_IGNORE_PLAYER_COLLISION); - hitboxEnemy->flags |= ENEMY_FLAG_100000 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER; + hitboxEnemy->flags |= ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER; hitboxNpc->pos.x = NPC_DISPOSE_POS_X; hitboxNpc->pos.y = NPC_DISPOSE_POS_Y; hitboxNpc->pos.z = NPC_DISPOSE_POS_Z; @@ -148,7 +148,7 @@ API_CALLABLE(N(MeleeHitbox_Main)) { hitboxEnemy->unk_10.z = hitboxNpc->pos.z; hitboxNpc->yaw = atan2(hitboxNpc->pos.x, hitboxNpc->pos.z, gPlayerStatusPtr->pos.x, gPlayerStatusPtr->pos.z); - hitboxEnemy->flags &= ~(ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER); + hitboxEnemy->flags &= ~(ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER); hitboxNpc->duration = 0; script->functionTemp[0] = 1; } @@ -161,7 +161,7 @@ API_CALLABLE(N(MeleeHitbox_Main)) { hitboxEnemy->hitboxIsActive = FALSE; } if (baseEnemy->AI_VAR_ATTACK_STATE == MELEE_HITBOX_STATE_POST) { - hitboxEnemy->flags |= ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER; + hitboxEnemy->flags |= ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER; hitboxNpc->pos.x = NPC_DISPOSE_POS_X; hitboxNpc->pos.y = NPC_DISPOSE_POS_Y; hitboxNpc->pos.z = NPC_DISPOSE_POS_Z; diff --git a/src/world/common/enemy/ai/MontyMoleAI.inc.c b/src/world/common/enemy/ai/MontyMoleAI.inc.c index 8c3f416827..8f7c453f2d 100644 --- a/src/world/common/enemy/ai/MontyMoleAI.inc.c +++ b/src/world/common/enemy/ai/MontyMoleAI.inc.c @@ -28,7 +28,7 @@ enum AiStateMontyMole { }; #define INTANGIBLE_MONTY_MOLE_NPC_FLAGS \ - ENEMY_FLAG_100000 \ + ENEMY_FLAG_SKIP_BATTLE \ | ENEMY_FLAG_IGNORE_TOUCH \ | ENEMY_FLAG_IGNORE_JUMP \ | ENEMY_FLAG_IGNORE_HAMMER \ @@ -256,11 +256,10 @@ API_CALLABLE(N(MontyMoleAI_Main)) { } if (enemy->aiFlags & AI_FLAG_SUSPEND) { - if (enemy->aiSuspendTime == 0) { - enemy->aiFlags &= ~AI_FLAG_SUSPEND; - } else { + if (enemy->aiSuspendTime != 0) { return ApiStatus_BLOCK; } + enemy->aiFlags &= ~AI_FLAG_SUSPEND; } switch (script->AI_TEMP_STATE) { diff --git a/src/world/common/enemy/ai/PiranhaPlantAI.inc.c b/src/world/common/enemy/ai/PiranhaPlantAI.inc.c index 410460b79b..c70a9d6ce3 100644 --- a/src/world/common/enemy/ai/PiranhaPlantAI.inc.c +++ b/src/world/common/enemy/ai/PiranhaPlantAI.inc.c @@ -57,7 +57,7 @@ void N(PiranhaPlantAI_10)(Evt* script, MobileAISettings* aiSettings, EnemyDetect npc->duration--; if (enemy->varTable[9] >= npc->duration) { - enemy->flags |= (ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | + enemy->flags |= (ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER); } @@ -225,7 +225,7 @@ void N(PiranhaPlantAI_11)(Evt* script, MobileAISettings* aiSettings, EnemyDetect npc->duration--; if (enemy->varTable[11] >= npc->duration) { - enemy->flags &= ~(ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER); + enemy->flags &= ~(ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER); } if (npc->duration == 0) { npc->curAnim = enemy->animList[10]; @@ -313,7 +313,7 @@ API_CALLABLE(N(PiranhaPlantAI_Main)) { #ifdef _DEAD_H_ // this function doesn't seem to have a known counterpart, perhaps related to the difference in the Enemy struct func_8004D8E0(enemy); - if (enemy->flags & ENEMY_FLAG_100000) { + if (enemy->flags & ENEMY_FLAG_SKIP_BATTLE) { enemy->unk_114 = 10.0f; enemy->unk_118 = 0.7f; } diff --git a/src/world/common/enemy/ai/ProjectileHitbox.inc.c b/src/world/common/enemy/ai/ProjectileHitbox.inc.c index d0904e508c..1d9dd41c0c 100644 --- a/src/world/common/enemy/ai/ProjectileHitbox.inc.c +++ b/src/world/common/enemy/ai/ProjectileHitbox.inc.c @@ -158,7 +158,7 @@ API_CALLABLE(N(ProjectileAI_Main)) { enemy->varTable[0] = 0; enemy->flags |= ENEMY_FLAG_IGNORE_PARTNER | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN | - ENEMY_FLAG_100000 | ENEMY_FLAG_PROJECTILE; + ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_PROJECTILE; if (enemy->aiFlags & AI_FLAG_SUSPEND) { enemy->aiFlags &= ~AI_FLAG_SUSPEND; } diff --git a/src/world/common/enemy/ai/SentinelAI.inc.c b/src/world/common/enemy/ai/SentinelAI.inc.c index 7b19d319a1..049ca0f092 100644 --- a/src/world/common/enemy/ai/SentinelAI.inc.c +++ b/src/world/common/enemy/ai/SentinelAI.inc.c @@ -47,7 +47,7 @@ void N(SentinelAI_ChaseInit)(Evt* script, MobileAISettings* aiSettings, EnemyDet npc->duration--; if (npc->duration <= 0) { - npc->flags &= ~NPC_FLAG_200000; + npc->flags &= ~NPC_FLAG_FLIP_INSTANTLY; npc->duration = aiSettings->chaseUpdateInterval / 2 + rand_int(aiSettings->chaseUpdateInterval / 2 + 1); npc->curAnim = enemy->animList[ENEMY_ANIM_INDEX_MELEE_PRE]; npc->moveSpeed = aiSettings->chaseSpeed; @@ -79,7 +79,7 @@ void N(SentinelAI_Chase)(Evt* script, MobileAISettings* aiSettings, EnemyDetectV } else { npc->duration--; if (npc->duration <= 0) { - npc->flags |= NPC_FLAG_200000; + npc->flags |= NPC_FLAG_FLIP_INSTANTLY; script->AI_TEMP_STATE = AI_STATE_SENTINEL_CHASE_INIT; } } @@ -121,7 +121,7 @@ void N(SentinelAI_Descend)(Evt* script, MobileAISettings* aiSettings, EnemyDetec if (!basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 1)) { enemy->varTable[0] &= ~SENTINEL_AI_FLAG_CHASING; npc->rot.y = 0.0f; - npc->flags &= ~NPC_FLAG_200000; + npc->flags &= ~NPC_FLAG_FLIP_INSTANTLY; script->AI_TEMP_STATE = AI_STATE_SENTINEL_LOSE_PLAYER_INIT; } else { npc->pos.x = gPlayerStatusPtr->pos.x; @@ -142,7 +142,7 @@ void N(SentinelAI_Descend)(Evt* script, MobileAISettings* aiSettings, EnemyDetec npc->pos.y -= SENTINEL_AI_DESCEND_RATE; } else { npc->rot.y = 0.0f; - npc->flags &= ~NPC_FLAG_200000; + npc->flags &= ~NPC_FLAG_FLIP_INSTANTLY; if (gPartnerStatus.actingPartner != PARTNER_BOW) { disable_player_input(); partner_disable_input(); @@ -224,7 +224,7 @@ void N(SentinelAI_ReturnHomeInit)(Evt* script, MobileAISettings* aiSettings, Ene Npc* npc = get_npc_unsafe(enemy->npcID); enemy->varTable[0] &= ~SENTINEL_AI_FLAG_CHASING; - npc->flags &= ~NPC_FLAG_200000; + npc->flags &= ~NPC_FLAG_FLIP_INSTANTLY; npc->moveSpeed = 2.0 * aiSettings->moveSpeed; enemy->varTable[2] = 0; enemy->varTable[4] = npc->pos.y * 100.0; diff --git a/src/world/common/enemy/ai/SwooperAI.inc.c b/src/world/common/enemy/ai/SwooperAI.inc.c index b2299c93c2..fd78541fd6 100644 --- a/src/world/common/enemy/ai/SwooperAI.inc.c +++ b/src/world/common/enemy/ai/SwooperAI.inc.c @@ -34,11 +34,10 @@ API_CALLABLE(N(SwooperAI_Main)) { } if (enemy->aiFlags & AI_FLAG_SUSPEND) { - if (enemy->aiSuspendTime == 0) { - enemy->aiFlags &= ~AI_FLAG_SUSPEND; - } else { + if (enemy->aiSuspendTime != 0) { return ApiStatus_BLOCK; } + enemy->aiFlags &= ~AI_FLAG_SUSPEND; } switch (script->functionTemp[0]) { diff --git a/src/world/common/entity/Chest.inc.c b/src/world/common/entity/Chest.inc.c index c619c9efc7..61aed3a21f 100644 --- a/src/world/common/entity/Chest.inc.c +++ b/src/world/common/entity/Chest.inc.c @@ -8,11 +8,11 @@ s32** N(varStash) = NULL; EvtScript N(EVS_Chest_ShowGotItem) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_FULL) Wait(40) Call(ShowGotItem, LVar0, FALSE, 0) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Return Return End diff --git a/src/world/common/entity/Pipe.inc.c b/src/world/common/entity/Pipe.inc.c index d9d57b9062..e344bff283 100644 --- a/src/world/common/entity/Pipe.inc.c +++ b/src/world/common/entity/Pipe.inc.c @@ -7,7 +7,7 @@ #define EVT_EXIT_PIPE_HORIZONTAL(entry, collider, script) \ { \ - SetGroup(EVT_GROUP_1B) \ + SetGroup(EVT_GROUP_EXIT_MAP) \ Set(LVarA, entry) \ Set(LVarB, collider) \ Set(LVarC, Ref(script)) \ @@ -18,7 +18,7 @@ #define EVT_EXIT_PIPE_VERTICAL(entry, collider, script) \ { \ - SetGroup(EVT_GROUP_1B) \ + SetGroup(EVT_GROUP_EXIT_MAP) \ Set(LVarA, entry) \ Set(LVarB, collider) \ Set(LVarC, Ref(script)) \ @@ -255,7 +255,7 @@ EvtScript N(EVS_Pipe_ExitVertical) = { EvtScript N(EVS_Pipe_ExitVertical_Impl) = { Call(N(Pipe_SetAnimFlag)) - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(DisablePlayerPhysics, TRUE) Call(HidePlayerShadow, TRUE) Set(LVar0, LVarA) @@ -308,7 +308,7 @@ EvtScript N(EVS_Pipe_ExitHorizontal) = { Else Call(DisablePlayerInput, TRUE) EndIf - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(N(Pipe_SetAnimFlag)) Call(DisablePlayerPhysics, TRUE) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVarB, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/dead/area_flo/flo_00/beanstalk.c b/src/world/dead/area_flo/flo_00/beanstalk.c index 369b7350ec..2fe252d2f1 100644 --- a/src/world/dead/area_flo/flo_00/beanstalk.c +++ b/src/world/dead/area_flo/flo_00/beanstalk.c @@ -466,7 +466,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { Call(func_802CF56C, 2) Call(DisablePlayerInput, FALSE) IfEq(GF_FLO00_PlacedFertileSoil, FALSE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Label(10) Call(ShowKeyChoicePopup) @@ -474,7 +474,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { Switch(LVar2) CaseLe(ITEM_NONE) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(AwaitPlayerLeave, -85, 85, 28) Return CaseEq(ITEM_FERTILE_SOIL) @@ -502,7 +502,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { Set(GF_FLO00_PlacedFertileSoil, TRUE) EndIf IfEq(GF_FLO00_PlacedMagicalBean, FALSE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Label(20) Call(ShowKeyChoicePopup) @@ -510,7 +510,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { Switch(LVar2) CaseLe(ITEM_NONE) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(AwaitPlayerLeave, -85, 85, 28) Return CaseEq(ITEM_MAGICAL_BEAN) @@ -539,7 +539,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { EndIf Set(GF_FLO00_PlacedMagicalBean, TRUE) EndIf - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Label(30) Call(ShowKeyChoicePopup) @@ -547,7 +547,7 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { Switch(LVar2) CaseLe(ITEM_NONE) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Call(AwaitPlayerLeave, -85, 85, 28) Return CaseEq(ITEM_MIRACLE_WATER) diff --git a/src/world/dead/area_flo/flo_00/npc.c b/src/world/dead/area_flo/flo_00/npc.c index 879d8151f3..ece7cf9727 100644 --- a/src/world/dead/area_flo/flo_00/npc.c +++ b/src/world/dead/area_flo/flo_00/npc.c @@ -739,7 +739,7 @@ NpcData N(NpcData_Tolielup) = { .yaw = 90, .init = &N(EVS_NpcInit_Tolielup), .settings = &N(NpcSettings_Tolielup), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = TOLIELUP_ANIMS, .tattle = MSG_NpcTattle_Tolielup, @@ -751,7 +751,7 @@ NpcData N(NpcData_Klevar) = { .yaw = 0, .init = &N(EVS_NpcInit_Klevar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = KLEVAR_ANIMS, }; @@ -762,7 +762,7 @@ NpcData N(NpcData_Lakilulu) = { .yaw = 270, .init = &N(EVS_NpcInit_Lakilulu), .settings = &N(NpcSettings_Dummy), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = { .idle = ANIM_Lakilulu_Idle, diff --git a/src/world/dead/area_flo/flo_03/npc.c b/src/world/dead/area_flo/flo_03/npc.c index 0bda4303c2..e3b748e3b2 100644 --- a/src/world/dead/area_flo/flo_03/npc.c +++ b/src/world/dead/area_flo/flo_03/npc.c @@ -235,11 +235,11 @@ EvtScript N(EVS_NpcInteract_Petunia) = { Set(LVar4, Float(90.0)) ExecWait(N(EVS_FocusCamBetween)) Call(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0057) - Call(SetEnemyFlagBits, NPC_Dayzee, ENEMY_FLAG_PASSIVE, 0) - Call(SetEnemyFlagBits, NPC_MontyMole_01, ENEMY_FLAG_PASSIVE, 0) - Call(SetEnemyFlagBits, NPC_MontyMole_02, ENEMY_FLAG_PASSIVE, 0) - Call(SetEnemyFlagBits, NPC_MontyMole_03, ENEMY_FLAG_PASSIVE, 0) - Call(SetEnemyFlagBits, NPC_MontyMole_04, ENEMY_FLAG_PASSIVE, 0) + Call(SetEnemyFlagBits, NPC_Dayzee, ENEMY_FLAG_PASSIVE, FALSE) + Call(SetEnemyFlagBits, NPC_MontyMole_01, ENEMY_FLAG_PASSIVE, FALSE) + Call(SetEnemyFlagBits, NPC_MontyMole_02, ENEMY_FLAG_PASSIVE, FALSE) + Call(SetEnemyFlagBits, NPC_MontyMole_03, ENEMY_FLAG_PASSIVE, FALSE) + Call(SetEnemyFlagBits, NPC_MontyMole_04, ENEMY_FLAG_PASSIVE, FALSE) Call(BindNpcAI, NPC_Dayzee, Ref(N(EVS_NpcAI_Dayzee))) Set(MV_PauseBurrowing, FALSE) Set(MV_NextBurrowTriggerRadius, 60) @@ -299,7 +299,7 @@ EvtScript N(EVS_NpcInit_Dayzee) = { Call(SetNpcPos, NPC_Dayzee, NPC_DISPOSE_LOCATION) CaseDefault IfEq(GF_FLO03_Defeated_Dayzee, FALSE) - Call(SetEnemyFlagBits, NPC_Dayzee, ENEMY_FLAG_PASSIVE, 0) + Call(SetEnemyFlagBits, NPC_Dayzee, ENEMY_FLAG_PASSIVE, FALSE) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcAI_Dayzee))) Else Call(SetNpcPos, NPC_Dayzee, NPC_DISPOSE_LOCATION) @@ -408,7 +408,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { Call(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) Call(ShowEmote, NPC_MontyMole_01, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) Wait(LVar1) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, TRUE) EndIf Call(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_DIG, SOUND_SPACE_DEFAULT) Call(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim11) @@ -436,7 +436,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { Call(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_SURFACE, SOUND_SPACE_DEFAULT) Call(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim10) Wait(10) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, FALSE) Call(RandInt, 30, LVar0) Add(LVar0, 60) Set(MV_NextBurrowTime_Mole_01, LVar0) @@ -487,7 +487,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { Call(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) Call(ShowEmote, NPC_MontyMole_02, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) Wait(LVar1) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, TRUE) EndIf Call(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_BURROW_DIG, SOUND_SPACE_DEFAULT) Call(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim11) @@ -515,7 +515,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { Call(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_BURROW_SURFACE, SOUND_SPACE_DEFAULT) Call(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim10) Wait(10) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, FALSE) Call(RandInt, 35, LVar0) Add(LVar0, 55) Set(MV_NextBurrowTime_Mole_02, LVar0) @@ -566,7 +566,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { Call(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) Call(ShowEmote, NPC_MontyMole_03, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) Wait(LVar1) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, TRUE) EndIf Call(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_BURROW_DIG, SOUND_SPACE_DEFAULT) Call(SetNpcAnimation, NPC_MontyMole_03, ANIM_MontyMole_Dark_Anim11) @@ -594,7 +594,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { Call(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_BURROW_SURFACE, SOUND_SPACE_DEFAULT) Call(SetNpcAnimation, NPC_MontyMole_03, ANIM_MontyMole_Dark_Anim10) Wait(10) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, FALSE) Call(RandInt, 40, LVar0) Add(LVar0, 50) Set(MV_NextBurrowTime_Mole_03, LVar0) @@ -645,7 +645,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { Call(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) Call(ShowEmote, NPC_MontyMole_04, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) Wait(LVar1) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, TRUE) EndIf Call(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_BURROW_DIG, SOUND_SPACE_DEFAULT) Call(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim11) @@ -673,7 +673,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { Call(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_BURROW_SURFACE, SOUND_SPACE_DEFAULT) Call(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim10) Wait(10) - Call(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 0) + Call(SetSelfEnemyFlagBits, ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, FALSE) Call(RandInt, 45, LVar0) Add(LVar0, 45) Set(MV_NextBurrowTime_Mole_04, LVar0) @@ -701,7 +701,7 @@ EvtScript N(EVS_NpcInit_MontyMole_01) = { IfEq(GF_FLO03_Defeated_MontyMoleA, FALSE) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_MontyMole_01))) Call(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim10) - Call(SetEnemyFlagBits, NPC_MontyMole_01, ENEMY_FLAG_PASSIVE, 0) + Call(SetEnemyFlagBits, NPC_MontyMole_01, ENEMY_FLAG_PASSIVE, FALSE) Else Call(SetNpcPos, NPC_MontyMole_01, NPC_DISPOSE_LOCATION) EndIf @@ -724,7 +724,7 @@ EvtScript N(EVS_NpcInit_MontyMole_02) = { IfEq(GF_FLO03_Defeated_MontyMoleB, FALSE) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_MontyMole_02))) Call(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim10) - Call(SetEnemyFlagBits, NPC_MontyMole_02, ENEMY_FLAG_PASSIVE, 0) + Call(SetEnemyFlagBits, NPC_MontyMole_02, ENEMY_FLAG_PASSIVE, FALSE) Else Call(SetNpcPos, NPC_MontyMole_02, NPC_DISPOSE_LOCATION) EndIf @@ -747,7 +747,7 @@ EvtScript N(EVS_NpcInit_MontyMole_03) = { IfEq(GF_FLO03_Defeated_MontyMoleC, FALSE) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_MontyMole_03))) Call(SetNpcAnimation, NPC_MontyMole_03, ANIM_MontyMole_Dark_Anim10) - Call(SetEnemyFlagBits, NPC_MontyMole_03, ENEMY_FLAG_PASSIVE, 0) + Call(SetEnemyFlagBits, NPC_MontyMole_03, ENEMY_FLAG_PASSIVE, FALSE) Else Call(SetNpcPos, NPC_MontyMole_03, NPC_DISPOSE_LOCATION) EndIf @@ -770,7 +770,7 @@ EvtScript N(EVS_NpcInit_MontyMole_04) = { IfEq(GF_FLO03_Defeated_MontyMoleD, FALSE) Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_MontyMole_04))) Call(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim10) - Call(SetEnemyFlagBits, NPC_MontyMole_04, ENEMY_FLAG_PASSIVE, 0) + Call(SetEnemyFlagBits, NPC_MontyMole_04, ENEMY_FLAG_PASSIVE, FALSE) Else Call(SetNpcPos, NPC_MontyMole_04, NPC_DISPOSE_LOCATION) EndIf @@ -787,7 +787,7 @@ NpcData N(NpcData_Petunia) = { .yaw = 270, .init = &N(EVS_NpcInit_Petunia), .settings = &N(NpcSettings_Petunia), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = { .idle = ANIM_Petunia_Idle, @@ -816,7 +816,7 @@ NpcData N(NpcData_Dayzee) = { .yaw = 90, .init = &N(EVS_NpcInit_Dayzee), .settings = &N(NpcSettings_Dayzee), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = { .idle = ANIM_Dayzee_Anim01, @@ -844,7 +844,7 @@ NpcData N(NpcData_MontyMole_01) = { .yaw = 90, .init = &N(EVS_NpcInit_MontyMole_01), .settings = &N(NpcSettings_Dayzee), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_MontyMole_Dark_Anim01, @@ -872,7 +872,7 @@ NpcData N(NpcData_MontyMole_02) = { .yaw = 90, .init = &N(EVS_NpcInit_MontyMole_02), .settings = &N(NpcSettings_Dayzee), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_MontyMole_Dark_Anim01, @@ -900,7 +900,7 @@ NpcData N(NpcData_MontyMole_03) = { .yaw = 270, .init = &N(EVS_NpcInit_MontyMole_03), .settings = &N(NpcSettings_Dayzee), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_MontyMole_Dark_Anim01, @@ -928,7 +928,7 @@ NpcData N(NpcData_MontyMole_04) = { .yaw = 270, .init = &N(EVS_NpcInit_MontyMole_04), .settings = &N(NpcSettings_Dayzee), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_MontyMole_Dark_Anim01, diff --git a/src/world/dead/area_flo/flo_07/npc.c b/src/world/dead/area_flo/flo_07/npc.c index b6ade4c5d1..9582bce3f0 100644 --- a/src/world/dead/area_flo/flo_07/npc.c +++ b/src/world/dead/area_flo/flo_07/npc.c @@ -237,7 +237,7 @@ NpcData N(NpcData_Posie) = { .yaw = 90, .init = &N(EVS_NpcInit_Posie), .settings = &N(NpcSettings_Posie), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = POSIE_ANIMS, .tattle = MSG_NpcTattle_Posie, diff --git a/src/world/dead/area_flo/flo_08/npc.c b/src/world/dead/area_flo/flo_08/npc.c index 23c431a32c..e66ddc3239 100644 --- a/src/world/dead/area_flo/flo_08/npc.c +++ b/src/world/dead/area_flo/flo_08/npc.c @@ -164,7 +164,7 @@ NpcData N(NpcData_GateFlower) = { .yaw = 270, .init = &N(EVS_NpcInit_GateFlower), .settings = &N(NpcSettings_GateFlower), - .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_NO_SHADOW_RAYCAST | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = GATE_FLOWER_YELLOW_ANIMS, .tattle = MSG_NpcTattle_YellowGateFlower, diff --git a/src/world/dead/area_flo/flo_09/npc.c b/src/world/dead/area_flo/flo_09/npc.c index 1a6afb2f3d..c7cf9b0c89 100644 --- a/src/world/dead/area_flo/flo_09/npc.c +++ b/src/world/dead/area_flo/flo_09/npc.c @@ -145,7 +145,7 @@ NpcData N(NpcData_Bzzap_02) = { }, .init = &N(EVS_NpcInit_Bzzap_02), .settings = &N(NpcSettings_Bzzap_02), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_SHADOW_RAYCAST, .drops = BZZAP_DROPS, .animations = BZZAP_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/dead/area_flo/flo_10/npc.c b/src/world/dead/area_flo/flo_10/npc.c index ab4d32d70b..337452e36d 100644 --- a/src/world/dead/area_flo/flo_10/npc.c +++ b/src/world/dead/area_flo/flo_10/npc.c @@ -36,14 +36,14 @@ EvtScript N(EVS_OnInteract_WaterStoneSocket) = { Return EndIf Call(DisablePlayerInput, TRUE) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) Call(ShowKeyChoicePopup) Set(LVar2, LVar0) Switch(LVar2) CaseEq(-1) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) Wait(10) Call(SpeakToPlayer, NPC_Lily, ANIM_Lily_TalkPlead, ANIM_Lily_IdlePlead, 0, MSG_CH6_0081) CaseDefault @@ -59,7 +59,7 @@ EvtScript N(EVS_OnInteract_WaterStoneSocket) = { Call(MakeItemEntity, ITEM_WATER_STONE, 0, -60, 6, ITEM_SPAWN_MODE_DECORATION, 0) Set(LVarA, LVar0) Call(CloseChoicePopup) - Call(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + Call(SetTimeFreezeMode, TIME_FREEZE_NONE) ExecWait(N(EVS_Scene_ReleaseFountain)) EndSwitch Call(DisablePlayerInput, FALSE) @@ -159,7 +159,7 @@ EvtScript N(EVS_NpcInteract_Lily) = { EndSwitch Wait(10) Set(GF_FLO10_LilyRequestedWaterStone, TRUE) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_400000, 0) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, FALSE) Else Call(SpeakToPlayer, NPC_SELF, ANIM_Lily_TalkPlead, ANIM_Lily_IdlePlead, 5, MSG_CH6_007F) EndIf @@ -188,7 +188,7 @@ EvtScript N(EVS_NpcInit_Lily) = { IfEq(GF_FLO10_LilyRequestedWaterStone, FALSE) Call(SetNpcAnimation, NPC_SELF, ANIM_Lily_IdlePlead) Call(InterpNpcYaw, NPC_SELF, 90, 1) - Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_400000, 1) + Call(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, TRUE) EndIf CaseEq(STORY_CH6_GOT_WATER_STONE) Call(InterpNpcYaw, NPC_SELF, 270, 1) @@ -205,7 +205,7 @@ NpcData N(NpcData_Lily) = { .yaw = 270, .init = &N(EVS_NpcInit_Lily), .settings = &N(NpcSettings_Lily), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = LILY_ANIMS, .tattle = MSG_NpcTattle_Lily, diff --git a/src/world/dead/area_flo/flo_11/main.c b/src/world/dead/area_flo/flo_11/main.c index 73df110d8c..aae206ca09 100644 --- a/src/world/dead/area_flo/flo_11/main.c +++ b/src/world/dead/area_flo/flo_11/main.c @@ -16,7 +16,7 @@ EvtScript N(EVS_ExitWalk_flo_12_0) = EVT_EXIT_WALK(60, flo_11_ENTRY_1, "flo_12", // template for GotoMap exits used with pipes in the maze #define Goto_MAP(mapName, entry) \ { \ - SetGroup(EVT_GROUP_1B) \ + SetGroup(EVT_GROUP_EXIT_MAP) \ Call(GotoMap, Ref(mapName), entry) \ Wait(100) \ Return \ diff --git a/src/world/dead/area_flo/flo_11/npc.c b/src/world/dead/area_flo/flo_11/npc.c index 8e096abb7d..7c3201309f 100644 --- a/src/world/dead/area_flo/flo_11/npc.c +++ b/src/world/dead/area_flo/flo_11/npc.c @@ -375,7 +375,7 @@ NpcData N(NpcData_Lakitus)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Lakitu_01), .settings = &N(NpcSettings_Lakitu), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, }, @@ -385,7 +385,7 @@ NpcData N(NpcData_Lakitus)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Lakitu_02), .settings = &N(NpcSettings_Lakitu), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, }, diff --git a/src/world/dead/area_flo/flo_12/npc.c b/src/world/dead/area_flo/flo_12/npc.c index 384b6c0343..2eefd651e0 100644 --- a/src/world/dead/area_flo/flo_12/npc.c +++ b/src/world/dead/area_flo/flo_12/npc.c @@ -196,7 +196,7 @@ NpcData N(NpcData_Rosie)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Rosie), .settings = &N(NpcSettings_Rosie), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = ROSIE_ANIMS, .tattle = MSG_NpcTattle_Rosie, diff --git a/src/world/dead/area_flo/flo_13/npc.c b/src/world/dead/area_flo/flo_13/npc.c index 990155394c..19fadf219e 100644 --- a/src/world/dead/area_flo/flo_13/npc.c +++ b/src/world/dead/area_flo/flo_13/npc.c @@ -600,7 +600,7 @@ NpcData N(NpcData_Lakilester) = { .yaw = 90, .init = &N(EVS_NpcInit_Lakilester), .settings = &N(NpcSettings_Lakilester), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = NO_DROPS, .animations = { .idle = ANIM_WorldLakilester_Idle, @@ -628,7 +628,7 @@ NpcData N(NpcData_Lakilulu) = { .yaw = 90, .init = &N(EVS_NpcInit_Lakilulu), .settings = &N(NpcSettings_Lakilester), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS, .drops = NO_DROPS, .animations = { .idle = ANIM_Lakilulu_Idle, @@ -657,7 +657,7 @@ NpcData N(NpcData_Lakilulu_Spiny) = { .yaw = 90, .init = &N(EVS_NpcInit_Lakilulu_Spiny), .settings = &N(NpcSettings_Lakilester), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION, .drops = NO_DROPS, .animations = { .idle = ANIM_Lakilulu_Idle, @@ -745,7 +745,7 @@ NpcData N(NpcData_Spiny_01) = { }, .init = &N(EVS_NpcInit_Spiny), .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -769,7 +769,7 @@ NpcData N(NpcData_Spiny_02) = { }, .init = &N(EVS_NpcInit_Spiny), .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -793,7 +793,7 @@ NpcData N(NpcData_Spiny_03) = { }, .init = &N(EVS_NpcInit_Spiny), .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -817,7 +817,7 @@ NpcData N(NpcData_Spiny_04) = { }, .init = &N(EVS_NpcInit_Spiny), .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -841,7 +841,7 @@ NpcData N(NpcData_Spiny_05) = { }, .init = &N(EVS_NpcInit_Spiny), .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -865,7 +865,7 @@ NpcData N(NpcData_Spiny_06) = { }, .init = &N(EVS_NpcInit_Spiny), .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_ENTITY_COLLISION, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/dead/area_flo/flo_14/bubbles.c b/src/world/dead/area_flo/flo_14/bubbles.c index 47dd8ff83e..507bf9f229 100644 --- a/src/world/dead/area_flo/flo_14/bubbles.c +++ b/src/world/dead/area_flo/flo_14/bubbles.c @@ -291,7 +291,7 @@ void N(gfx_build_bubble_flower)(void) { } EvtScript N(EVS_ManageBlownBubble) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Set(LVarF, LVar0) Label(0) IfEq(AF_FLO_PauseBlowingBubbles, TRUE) diff --git a/src/world/dead/area_flo/flo_14/npc.c b/src/world/dead/area_flo/flo_14/npc.c index 5c718ac1a0..0cd70a37ad 100644 --- a/src/world/dead/area_flo/flo_14/npc.c +++ b/src/world/dead/area_flo/flo_14/npc.c @@ -84,7 +84,7 @@ NpcData N(NpcData_BubbleFlower) = { .yaw = 270, .init = &N(EVS_NpcInit_BubbleFlower), .settings = &N(NpcSettings_BubbleFlower), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_HAS_NO_SPRITE, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_HAS_NO_SPRITE, .drops = NO_DROPS, .animations = BUBULB_PINK_ANIMS, .tattle = MSG_NpcTattle_BubblePlant, diff --git a/src/world/dead/area_flo/flo_15/npc.c b/src/world/dead/area_flo/flo_15/npc.c index 3fc66c3afe..f14ddc5f10 100644 --- a/src/world/dead/area_flo/flo_15/npc.c +++ b/src/world/dead/area_flo/flo_15/npc.c @@ -205,7 +205,7 @@ NpcData N(NpcData_Sun)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Sun_01), .settings = &N(NpcSettings_Sun), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = SUN_ANIMS, .tattle = MSG_NpcTattle_TheSun, @@ -216,7 +216,7 @@ NpcData N(NpcData_Sun)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Sun_02), .settings = &N(NpcSettings_Sun), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_8000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_USE_INSPECT_ICON, .drops = NO_DROPS, .animations = SUN_ANIMS, .tattle = MSG_NpcTattle_TheSun, diff --git a/src/world/dead/area_flo/flo_17/npc.c b/src/world/dead/area_flo/flo_17/npc.c index e900568925..956eda9315 100644 --- a/src/world/dead/area_flo/flo_17/npc.c +++ b/src/world/dead/area_flo/flo_17/npc.c @@ -69,7 +69,7 @@ NpcData N(NpcData_Spiny_01) = { } }, .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -92,7 +92,7 @@ NpcData N(NpcData_Spiny_02) = { } }, .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -115,7 +115,7 @@ NpcData N(NpcData_Spiny_03) = { } }, .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, @@ -138,7 +138,7 @@ NpcData N(NpcData_Spiny_04) = { } }, .settings = &N(NpcSettings_SpawnedSpiny), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING, .drops = SPINY_DROPS, .animations = SPINY_ANIMS, .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, diff --git a/src/world/dead/area_flo/flo_18/machine.c b/src/world/dead/area_flo/flo_18/machine.c index e3d1b97785..a00f55704e 100644 --- a/src/world/dead/area_flo/flo_18/machine.c +++ b/src/world/dead/area_flo/flo_18/machine.c @@ -22,7 +22,7 @@ API_CALLABLE(N(SetMachineLightningColor)) { } EvtScript N(EVS_AnimateMachineLightning) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Loop(0) PlayEffect(EFFECT_LIGHTNING_BOLT, 0, Float(-16.0), Float(102.0), Float(-4.1), Float(80.9), Float(102.0), Float(-4.1), Float(0.5), 6) Call(N(SetMachineLightningColor)) diff --git a/src/world/dead/area_flo/flo_18/npc.c b/src/world/dead/area_flo/flo_18/npc.c index 4e6ff06bcc..175997410a 100644 --- a/src/world/dead/area_flo/flo_18/npc.c +++ b/src/world/dead/area_flo/flo_18/npc.c @@ -605,7 +605,7 @@ NpcData N(NpcData_MachineGang)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Lakitu_01), .settings = &N(NpcSettings_Lakitu), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, @@ -616,7 +616,7 @@ NpcData N(NpcData_MachineGang)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Lakitu_02), .settings = &N(NpcSettings_Lakitu), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, @@ -627,7 +627,7 @@ NpcData N(NpcData_MachineGang)[] = { .yaw = 270, .init = &N(EVS_NpcInit_Lakitu_03), .settings = &N(NpcSettings_Lakitu), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, @@ -638,7 +638,7 @@ NpcData N(NpcData_MachineGang)[] = { .yaw = 90, .init = &N(EVS_NpcInit_Magikoopa), .settings = &N(NpcSettings_Magikoopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = MAGINO_DROPS, .animations = MAGIKOOPA_YELLOW_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, @@ -649,7 +649,7 @@ NpcData N(NpcData_MachineGang)[] = { .yaw = 270, .init = &N(EVS_NpcInit_FlyingMagikoopa), .settings = &N(NpcSettings_Magikoopa), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, + .flags = BASE_PASSIVE_FLAGS | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_NO_DELAY_AFTER_FLEE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = MAGINO_DROPS, .animations = FLYING_MAGIKOOPA_YELLOW_ANIMS, .tattle = MSG_NpcTattle_PuffPuffOperator, diff --git a/src/world/dead/area_flo/flo_19/clouds.c b/src/world/dead/area_flo/flo_19/clouds.c index 89625c016e..093208fb49 100644 --- a/src/world/dead/area_flo/flo_19/clouds.c +++ b/src/world/dead/area_flo/flo_19/clouds.c @@ -25,7 +25,7 @@ API_CALLABLE(N(CosInterpAbsMinMax)) { } EvtScript N(EVS_AnimatePlatforms) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Set(LVarF, 0) Label(0) SetF(LVar0, Float(-215.4375)) diff --git a/src/world/dead/area_flo/flo_19/main.c b/src/world/dead/area_flo/flo_19/main.c index 8ea9b7b6f4..7b85d0abe4 100644 --- a/src/world/dead/area_flo/flo_19/main.c +++ b/src/world/dead/area_flo/flo_19/main.c @@ -9,7 +9,7 @@ API_CALLABLE(N(SpawnSunEffect)) { } EvtScript N(EVS_ExitWalk_flo_21_0) = { - SetGroup(EVT_GROUP_1B) + SetGroup(EVT_GROUP_EXIT_MAP) Call(UseExitHeading, 60, flo_19_ENTRY_1) Exec(ExitWalk) Call(GotoMap, 0x80243000, flo_21_ENTRY_0) // raw pointer to missing string "flo_21" diff --git a/src/world/dead/area_kzn/kzn_11/main.c b/src/world/dead/area_kzn/kzn_11/main.c index 5ecc049ee5..35a7032219 100644 --- a/src/world/dead/area_kzn/kzn_11/main.c +++ b/src/world/dead/area_kzn/kzn_11/main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_StartTexPanners_Lava) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_yougan1_1, TEX_PANNER_2) Call(EnableTexPanning, MODEL_toro, TRUE) Call(EnableTexPanning, MODEL_poko, TRUE) diff --git a/src/world/dead/area_kzn/kzn_11/platforms.c b/src/world/dead/area_kzn/kzn_11/platforms.c index 85733123bf..45c187f86a 100644 --- a/src/world/dead/area_kzn/kzn_11/platforms.c +++ b/src/world/dead/area_kzn/kzn_11/platforms.c @@ -40,7 +40,7 @@ API_CALLABLE(N(IsPartnerLakilester)) { } EvtScript N(EVS_UpdateLeftPlatform) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(ParentColliderToModel, COLLIDER_o67, MODEL_o67) Call(ParentColliderToModel, COLLIDER_o68, MODEL_o68) Call(ParentColliderToModel, COLLIDER_o69, MODEL_o69) @@ -105,7 +105,7 @@ EvtScript N(EVS_UpdateLeftPlatform) = { }; EvtScript N(EVS_UpdateRightPlatform) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Call(ParentColliderToModel, COLLIDER_o26, MODEL_o26) Call(ParentColliderToModel, COLLIDER_o27, MODEL_o27) Call(ParentColliderToModel, COLLIDER_o28, MODEL_o28) diff --git a/src/world/dead/area_kzn/kzn_17/npc.c b/src/world/dead/area_kzn/kzn_17/npc.c index 64fd3bda82..b90a9f5ee7 100644 --- a/src/world/dead/area_kzn/kzn_17/npc.c +++ b/src/world/dead/area_kzn/kzn_17/npc.c @@ -41,7 +41,7 @@ EvtScript N(EVS_Kolorado_TrompPanic) = { }; EvtScript N(EVS_Kolorado_TrompImpact) = { - Call(SetEnemyFlagBits, NPC_Kolorado, ENEMY_FLAG_400000, 1) + Call(SetEnemyFlagBits, NPC_Kolorado, ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, TRUE) Call(SetNpcRotationPivot, NPC_Kolorado, 13) Call(SetNpcRotation, NPC_Kolorado, 0, 0, 250) Call(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_HurtStill) @@ -66,7 +66,7 @@ EvtScript N(EVS_Kolorado_TrompImpact) = { EvtScript N(EVS_Kolorado_HurtInit) = { Call(SetNpcPos, NPC_Kolorado, 447, 0, 70) Call(SetNpcYaw, NPC_Kolorado, 270) - Call(SetEnemyFlagBits, NPC_Kolorado, ENEMY_FLAG_400000, 1) + Call(SetEnemyFlagBits, NPC_Kolorado, ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, TRUE) Call(SetNpcRotationPivot, NPC_Kolorado, 13) Call(SetNpcRotation, NPC_Kolorado, 0, 0, 250) Call(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_HurtStill) @@ -139,7 +139,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, diff --git a/src/world/dead/area_kzn/kzn_17/tromp.c b/src/world/dead/area_kzn/kzn_17/tromp.c index 0073638ba2..719825023c 100644 --- a/src/world/dead/area_kzn/kzn_17/tromp.c +++ b/src/world/dead/area_kzn/kzn_17/tromp.c @@ -46,7 +46,7 @@ EvtScript N(EVS_SpinyTromp_ShakeCam) = { }; EvtScript N(EVS_SetupSpinyTromp) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) IfGe(GB_StoryProgress, STORY_CH5_HIDDEN_PASSAGE_OPEN) Call(SetGroupVisibility, MODEL_goron, MODEL_GROUP_HIDDEN) Call(EnableModel, MODEL_me, FALSE) diff --git a/src/world/dead/area_kzn/kzn_18/main.c b/src/world/dead/area_kzn/kzn_18/main.c index e5df608a28..bafc654010 100644 --- a/src/world/dead/area_kzn/kzn_18/main.c +++ b/src/world/dead/area_kzn/kzn_18/main.c @@ -18,7 +18,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_StartTexPanners_Lava) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(EnableTexPanning, MODEL_yougan1_1, TRUE) Call(EnableTexPanning, MODEL_off1, TRUE) Call(EnableTexPanning, MODEL_toro, TRUE) diff --git a/src/world/dead/area_kzn/kzn_18/npc.c b/src/world/dead/area_kzn/kzn_18/npc.c index a572f5aa3e..e937d8b193 100644 --- a/src/world/dead/area_kzn/kzn_18/npc.c +++ b/src/world/dead/area_kzn/kzn_18/npc.c @@ -149,7 +149,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -161,7 +161,7 @@ NpcData N(NpcData_Piranha) = { .yaw = 270, .init = &N(EVS_NpcInit_Piranha), .settings = &N(NpcSettings_PutridPiranhaSentinel), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_ACTIVE_WHILE_OFFSCREEN, .drops = PIRANHA_NO_DROPS, .animations = PIRANHA_SENTINEL_ANIMS, }; diff --git a/src/world/dead/area_kzn/kzn_19/main.c b/src/world/dead/area_kzn/kzn_19/main.c index 694a2b1654..13725260b0 100644 --- a/src/world/dead/area_kzn/kzn_19/main.c +++ b/src/world/dead/area_kzn/kzn_19/main.c @@ -99,7 +99,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_StartTexPanners_Lava) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_yougan1_1, TEX_PANNER_2) Call(EnableTexPanning, MODEL_toro, TRUE) Call(EnableTexPanning, MODEL_poko, TRUE) @@ -139,7 +139,7 @@ EvtScript N(EVS_StartTexPanners_Lava) = { }; EvtScript N(EVS_UpdateLavaWaves) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Loop(0) Call(MakeLerp, 0, 180, 40, EASING_COS_IN) Loop(0) diff --git a/src/world/dead/area_kzn/kzn_19/npc.c b/src/world/dead/area_kzn/kzn_19/npc.c index e1bb2be612..45d523dbac 100644 --- a/src/world/dead/area_kzn/kzn_19/npc.c +++ b/src/world/dead/area_kzn/kzn_19/npc.c @@ -896,7 +896,7 @@ EvtScript N(EVS_NpcDefeat_LavaPiranha) = { Call(GetBattleOutcome, LVar0) Switch(LVar0) CaseEq(OUTCOME_PLAYER_WON) - Call(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_2, TRUE) + Call(SetEncounterStatusFlags, ENCOUNTER_FLAG_CANT_SKIP_WIN_DELAY, TRUE) Call(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) Call(SetPlayerPos, 125, 25, -35) Call(SetNpcPos, NPC_PARTNER, 100, 25, -35) @@ -974,7 +974,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -985,7 +985,7 @@ NpcData N(NpcData_Misstar) = { .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .tattle = MSG_NpcTattle_Misstar, @@ -1009,7 +1009,7 @@ NpcData N(NpcData_LavaPiranha)[] = { .yaw = 270, .init = &N(EVS_NpcInit_LavaPiranha), .settings = &N(NpcSettings_LavaPiranhaHead), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_FLYING | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_FLYING | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = LAVA_PIRANHA_DROPS, .animations = LAVA_PIRANHA_HEAD_ANIMS, .extraAnimations = N(ExtraAnims_LavaPiranha), @@ -1021,7 +1021,7 @@ NpcData N(NpcData_LavaPiranha)[] = { .yaw = 270, .init = &N(EVS_NpcInit_LavaBud), .settings = &N(NpcSettings_LavaPiranhaHead), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = LAVA_PIRANHA_DROPS, .animations = LAVA_PIRANHA_BUD_ANIMS, .extraAnimations = N(ExtraAnims_LavaBud), @@ -1033,7 +1033,7 @@ NpcData N(NpcData_LavaPiranha)[] = { .yaw = 270, .init = &N(EVS_NpcInit_LavaBud), .settings = &N(NpcSettings_LavaPiranhaHead), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_40000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_NO_DELAY_AFTER_FLEE, .drops = LAVA_PIRANHA_DROPS, .animations = LAVA_PIRANHA_BUD_ANIMS, .extraAnimations = N(ExtraAnims_LavaBud), diff --git a/src/world/dead/area_kzn/kzn_20/main.c b/src/world/dead/area_kzn/kzn_20/main.c index c488795198..8f83f7d3e8 100644 --- a/src/world/dead/area_kzn/kzn_20/main.c +++ b/src/world/dead/area_kzn/kzn_20/main.c @@ -14,7 +14,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_UpdateTexPan_Lava) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(EnableTexPanning, MODEL_yu, TRUE) Thread TEX_PAN_PARAMS_ID(TEX_PANNER_1) @@ -77,7 +77,7 @@ EvtScript N(EVS_InterruptPartnersInLava) = { }; EvtScript N(EVS_UpdateLavaWaves) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(EnableModel, MODEL_yu, FALSE) Call(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_yu, COLLIDER_FLAGS_UPPER_MASK) Call(ParentColliderToModel, COLLIDER_yu, MODEL_yu) diff --git a/src/world/dead/area_kzn/kzn_20/npc.c b/src/world/dead/area_kzn/kzn_20/npc.c index 5fbe05be07..536014d08c 100644 --- a/src/world/dead/area_kzn/kzn_20/npc.c +++ b/src/world/dead/area_kzn/kzn_20/npc.c @@ -33,7 +33,7 @@ EVT_LETTER_PROMPT(Kolorado, NPC_Kolorado, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle EVT_LETTER_REWARD(Kolorado); EvtScript N(EVS_SpawnFallingDust) = { - SetGroup(EVT_GROUP_0B) + SetGroup(EVT_GROUP_HOSTILE_NPC) Loop(0) Call(RandInt, 100, LVar0) Sub(LVar0, 100) @@ -48,7 +48,7 @@ EvtScript N(EVS_SpawnFallingDust) = { }; EvtScript N(EVS_ShakingWorld) = { - SetGroup(EVT_GROUP_0A) + SetGroup(EVT_GROUP_PASSIVE_NPC) IfGe(GB_StoryProgress, STORY_CH5_OPENED_ESCAPE_ROUTE) Exec(N(EVS_SpawnFallingDust)) Else @@ -104,38 +104,38 @@ s32 N(Kolorado_Wander2)[] = { }; EvtScript N(EVS_Kolorado_CalmIdle) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Label(0) - Call(RandInt, 1, LVar1) - IfEq(LVar1, 0) - UseBuf(N(Kolorado_Wander1)) - Else - UseBuf(N(Kolorado_Wander2)) - EndIf - Label(10) - BufRead3(LVar1, LVar2, LVar3) - IfEq(LVar1, -1) - Goto(0) + Call(RandInt, 1, LVar1) + IfEq(LVar1, 0) + UseBuf(N(Kolorado_Wander1)) + Else + UseBuf(N(Kolorado_Wander2)) EndIf - Call(SetNpcSpeed, NPC_Kolorado, LVar1) - Call(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Walk) - Call(NpcMoveTo, NPC_Kolorado, LVar2, LVar3, 0) - BufRead1(LVar2) - Call(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Idle) - Wait(5) - Call(RandInt, 2, LVar4) - Add(LVar4, 1) - Loop(LVar4) - Call(GetNpcYaw, NPC_Kolorado, LVar5) - Add(LVar5, 180) - IfGt(LVar5, 360) - Sub(LVar5, 360) + Label(10) + BufRead3(LVar1, LVar2, LVar3) + IfEq(LVar1, -1) + Goto(0) EndIf - Call(InterpNpcYaw, NPC_Kolorado, LVar5, 1) - Wait(20) - EndLoop - Wait(LVar2) - Goto(10) + Call(SetNpcSpeed, NPC_Kolorado, LVar1) + Call(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Walk) + Call(NpcMoveTo, NPC_Kolorado, LVar2, LVar3, 0) + BufRead1(LVar2) + Call(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_Idle) + Wait(5) + Call(RandInt, 2, LVar4) + Add(LVar4, 1) + Loop(LVar4) + Call(GetNpcYaw, NPC_Kolorado, LVar5) + Add(LVar5, 180) + IfGt(LVar5, 360) + Sub(LVar5, 360) + EndIf + Call(InterpNpcYaw, NPC_Kolorado, LVar5, 1) + Wait(20) + EndLoop + Wait(LVar2) + Goto(10) Return End }; @@ -532,7 +532,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -544,7 +544,7 @@ NpcData N(NpcData_Misstar) = { .yaw = 270, .init = &N(EVS_NpcInit_Misstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_400000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .tattle = MSG_NpcTattle_Misstar, diff --git a/src/world/dead/area_kzn/kzn_22/main.c b/src/world/dead/area_kzn/kzn_22/main.c index 186ce20e99..bbcd561e2e 100644 --- a/src/world/dead/area_kzn/kzn_22/main.c +++ b/src/world/dead/area_kzn/kzn_22/main.c @@ -11,7 +11,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_UpdateTexPan_LavaRiver) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(EnableTexPanning, MODEL_yougan1_1, TRUE) Set(LVar0, 0) Set(LVar1, 0) @@ -29,7 +29,7 @@ EvtScript N(EVS_UpdateTexPan_LavaRiver) = { }; EvtScript N(EVS_UpdateTexPan_LavaFall) = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(EnableTexPanning, MODEL_yougan2_2, TRUE) Set(LVar0, 0) Set(LVar1, 0) @@ -73,7 +73,7 @@ API_CALLABLE(N(GetFloorCollider1)) { } EvtScript N(EVS_UpdateLavaLevel) = { - SetGroup(EVT_GROUP_EF) + SetGroup(EVT_GROUP_NOT_BATTLE) Call(SetTexPanner, MODEL_yu1, TEX_PANNER_2) Call(SetTexPanner, MODEL_yu, TEX_PANNER_2) Call(EnableModel, MODEL_yu, FALSE) diff --git a/src/world/dead/area_kzn/kzn_22/npc.c b/src/world/dead/area_kzn/kzn_22/npc.c index 7ff099ec39..facaadd5a9 100644 --- a/src/world/dead/area_kzn/kzn_22/npc.c +++ b/src/world/dead/area_kzn/kzn_22/npc.c @@ -269,7 +269,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -281,7 +281,7 @@ NpcData N(NpcData_Misstar) = { .yaw = 270, .init = &N(EVS_NpcInit_Misstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, .tattle = MSG_NpcTattle_Misstar, diff --git a/src/world/dead/area_kzn/kzn_23/main.c b/src/world/dead/area_kzn/kzn_23/main.c index 8482aebede..4164452424 100644 --- a/src/world/dead/area_kzn/kzn_23/main.c +++ b/src/world/dead/area_kzn/kzn_23/main.c @@ -24,7 +24,7 @@ EvtScript N(EVS_ModulateLavaLevel) = { EvtScript N(EVS_RaiseLava) = { Exec(N(EVS_ModulateLavaLevel)) - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetTexPanner, MODEL_yu, TEX_PANNER_0) Set(LVar0, 0) Set(LVar1, 0) diff --git a/src/world/dead/area_kzn/kzn_23/npc.c b/src/world/dead/area_kzn/kzn_23/npc.c index 7691d0da99..597f2f6c0f 100644 --- a/src/world/dead/area_kzn/kzn_23/npc.c +++ b/src/world/dead/area_kzn/kzn_23/npc.c @@ -282,7 +282,7 @@ NpcData N(NpcData_Kolorado) = { .yaw = 90, .init = &N(EVS_NpcInit_Kolorado), .settings = &N(NpcSettings_Kolorado), - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_IGNORE_WORLD_COLLISION | ENEMY_FLAG_IGNORE_PLAYER_COLLISION | ENEMY_FLAG_IGNORE_ENTITY_COLLISION | ENEMY_FLAG_RAYCAST_TO_INTERACT | ENEMY_FLAG_SKIP_BATTLE, .drops = NO_DROPS, .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, @@ -294,7 +294,7 @@ NpcData N(NpcData_Misstar) = { .yaw = 270, .init = &N(EVS_NpcInit_Misstar), .settings = &N(NpcSettings_StarSpirit), - .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, + .flags = ENEMY_FLAG_DO_NOT_KILL | ENEMY_FLAG_SKIP_BATTLE | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_CANT_INTERACT | ENEMY_FLAG_IGNORE_PARTNER, .drops = NO_DROPS, .animations = MISSTAR_ANIMS, }; diff --git a/src/world/menus.c b/src/world/menus.c index ddd446a985..5407ef1027 100644 --- a/src/world/menus.c +++ b/src/world/menus.c @@ -252,7 +252,7 @@ block_17: reset_outta_sight_alpha_on_menu_close(); playerStatus->flags &= ~PS_FLAG_PAUSED; gOverrideFlags &= ~GLOBAL_OVERRIDES_40; - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); } } else { numEntries = setup_partner_popup(popup); @@ -294,7 +294,7 @@ block_17: reset_outta_sight_alpha_on_menu_close(); playerStatus->flags &= ~PS_FLAG_PAUSED; gOverrideFlags &= ~GLOBAL_OVERRIDES_40; - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); } } else { WorldMenuDelay--; @@ -374,7 +374,7 @@ block_17: reset_outta_sight_alpha_on_menu_close(); playerStatus->flags &= ~PS_FLAG_PAUSED; gOverrideFlags &= ~GLOBAL_OVERRIDES_40; - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); break; case WORLD_MENU_STATE_UNPAUSE: WorldMenuDelay--; diff --git a/src/world/partner/goombario.c b/src/world/partner/goombario.c index ca6bd7261d..3d4afa04a8 100644 --- a/src/world/partner/goombario.c +++ b/src/world/partner/goombario.c @@ -446,7 +446,7 @@ API_CALLABLE(N(SelectTattleMsg)) { API_CALLABLE(N(TattleEnd)) { PartnerStatus* partnerStatus = &gPartnerStatus; - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); if (N(IsTattleActive)) { N(IsTattleActive) = FALSE; @@ -504,7 +504,7 @@ void N(pre_battle)(Npc* goombario) { PartnerStatus* partnerStatus = &gPartnerStatus; if (partnerStatus->partnerActionState != PARTNER_ACTION_NONE) { - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); enable_player_input(); cancel_current_message(); partner_clear_player_tracking(goombario); diff --git a/src/world/partner/lakilester.c b/src/world/partner/lakilester.c index 2883a764ca..2b3b42a63d 100644 --- a/src/world/partner/lakilester.c +++ b/src/world/partner/lakilester.c @@ -917,7 +917,7 @@ API_CALLABLE(N(UseAbility)) { yaw = playerStatus->spriteFacingAngle - 90.0f + gCameras[gCurrentCameraID].curYaw; - if (player_raycast_up_corners(playerStatus, &x, &y, &z, &dist, yaw) >= 0) { + if (player_raycast_up_corners(playerStatus, &x, &y, &z, &dist, yaw) > NO_COLLIDER) { N(AbilityState) = RIDE_STATE_FINISH_1; break; } @@ -925,7 +925,7 @@ API_CALLABLE(N(UseAbility)) { lakilester->jumpVel -= lakilester->jumpScale; add_vec2D_polar(&playerStatus->pos.x, &playerStatus->pos.z, lakilester->moveSpeed, lakilester->yaw); - func_800E4AD8(0); + func_800E4AD8(PLAYER_COLLISION_0); if (N(test_dismount_height)(&y) > NO_COLLIDER) { N(AbilityState) = RIDE_STATE_FINISH_1; playerStatus->pos.y = y; @@ -1045,7 +1045,7 @@ API_CALLABLE(N(PutAway)) { lakilester->jumpVel -= lakilester->jumpScale; add_vec2D_polar(&playerStatus->pos.x, &playerStatus->pos.z, lakilester->moveSpeed, lakilester->yaw); - func_800E4AD8(0); + func_800E4AD8(PLAYER_COLLISION_0); if (lakilester->jumpVel <= 0.0f) { playerStatus->flags |= PS_FLAG_FALLING; if (lakilester->jumpVel < -10.0) { diff --git a/src/world/partner/parakarry.c b/src/world/partner/parakarry.c index 94e3d8e197..8f7a71c80e 100644 --- a/src/world/partner/parakarry.c +++ b/src/world/partner/parakarry.c @@ -353,7 +353,7 @@ API_CALLABLE(N(UseAbility)) { y = playerStatus->pos.y + playerStatus->colliderHeight / 2.0f; z = playerStatus->pos.z; halfCollisionHeight = playerStatus->spriteFacingAngle - 90.0f + gCameras[gCurrentCameraID].curYaw; - if (player_raycast_up_corners(playerStatus, &x, &y, &z, &length, halfCollisionHeight) >= 0) { + if (player_raycast_up_corners(playerStatus, &x, &y, &z, &length, halfCollisionHeight) > NO_COLLIDER) { suggest_player_anim_allow_backward(ANIM_Mario1_Idle); N(AbilityState) = AIR_LIFT_DROP; break; diff --git a/src/world/partners.c b/src/world/partners.c index 6fc611b3e6..0128db624c 100644 --- a/src/world/partners.c +++ b/src/world/partners.c @@ -651,7 +651,7 @@ void _use_partner_ability(void) { wPartnerCurrentScript = start_script(wPartner->putAway, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; - wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + wPartnerCurrentScript->groupFlags = EVT_GROUP_PASSIVE_NPC; PartnerCommandState += 1; set_time_freeze_mode(TIME_FREEZE_PARTIAL); break; @@ -659,7 +659,7 @@ void _use_partner_ability(void) { if (does_script_exist(wPartnerCurrentScriptID)) { break; } - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); partner_free_npc(); playerData->curPartner = wCurrentPartnerId = NextPartnerID; create_partner_npc(); @@ -671,7 +671,7 @@ void _use_partner_ability(void) { wPartnerCurrentScript = start_script(wPartner->takeOut, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; - wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + wPartnerCurrentScript->groupFlags = EVT_GROUP_PASSIVE_NPC; PartnerCommandState += 1; set_time_freeze_mode(TIME_FREEZE_PARTIAL); break; @@ -682,10 +682,10 @@ void _use_partner_ability(void) { wPartnerCurrentScript = start_script(wPartner->update, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; - wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + wPartnerCurrentScript->groupFlags = EVT_GROUP_PASSIVE_NPC; PartnerCommand = PARTNER_CMD_INIT; enable_player_input(); - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); break; } break; @@ -716,7 +716,7 @@ void _use_partner_ability(void) { wPartnerCurrentScript = start_script(wPartner->update, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; - wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + wPartnerCurrentScript->groupFlags = EVT_GROUP_PASSIVE_NPC; PartnerCommand = PARTNER_CMD_INIT; break; } @@ -730,7 +730,7 @@ void _use_partner_ability(void) { wPartnerCurrentScript = start_script(wPartner->putAway, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; - wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + wPartnerCurrentScript->groupFlags = EVT_GROUP_PASSIVE_NPC; PartnerCommandState += 1; break; case 1: // free old partner and resume game @@ -766,7 +766,7 @@ void _use_partner_ability(void) { wPartnerCurrentScript = start_script(wPartner->takeOut, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; - wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + wPartnerCurrentScript->groupFlags = EVT_GROUP_PASSIVE_NPC; PartnerCommandState += 1; break; case 2: // resume standard partner behaviour @@ -776,7 +776,7 @@ void _use_partner_ability(void) { wPartnerCurrentScript = start_script(wPartner->update, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; - wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + wPartnerCurrentScript->groupFlags = EVT_GROUP_PASSIVE_NPC; PartnerCommand = PARTNER_CMD_INIT; enable_player_input(); break; @@ -803,7 +803,7 @@ void _use_partner_ability(void) { wPartnerCurrentScript = start_script(wPartner->update, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; - wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + wPartnerCurrentScript->groupFlags = EVT_GROUP_PASSIVE_NPC; PartnerCommand = PARTNER_CMD_INIT; wPartnerNpc->curAnim = gPartnerAnimations[wCurrentPartnerId].fly; enable_player_input(); @@ -817,7 +817,7 @@ void _use_partner_ability(void) { wPartnerCurrentScript = start_script(wPartner->useAbility, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; - wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + wPartnerCurrentScript->groupFlags = EVT_GROUP_PASSIVE_NPC; PartnerCommandState += 1; break; case 1: @@ -827,7 +827,7 @@ void _use_partner_ability(void) { wPartnerCurrentScript = start_script(wPartner->update, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; - wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + wPartnerCurrentScript->groupFlags = EVT_GROUP_PASSIVE_NPC; PartnerCommand = PARTNER_CMD_INIT; break; } @@ -851,7 +851,7 @@ void _use_partner_ability(void) { wPartnerCurrentScript = start_script(wPartner->update, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; - wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + wPartnerCurrentScript->groupFlags = EVT_GROUP_PASSIVE_NPC; } enable_player_input(); PartnerCommand = PARTNER_CMD_INIT; @@ -1063,7 +1063,7 @@ void partner_handle_after_battle(void) { wPartnerCurrentScript = start_script(wPartner->update, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; - wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; + wPartnerCurrentScript->groupFlags = EVT_GROUP_PASSIVE_NPC; NextPartnerCommand = PARTNER_CMD_INIT; @@ -1565,7 +1565,7 @@ void partner_walking_follow_player(Npc* partner) { case 15: switch (D_8010CFCE) { case 0: - angle = clamp_angle(func_800E5348() + 180.0f); + angle = clamp_angle(player_get_side_angle() + 180.0f); partner->moveToPos.x = playerStatus->pos.x; partner->moveToPos.y = playerStatus->pos.y; partner->moveToPos.z = playerStatus->pos.z; @@ -2087,7 +2087,7 @@ void partner_flying_follow_player(Npc* partner) { if (!(playerStatus->animFlags & PA_FLAG_CHANGING_MAP)) { switch (D_8010CFCE) { case 0: - temp_f0_15 = clamp_angle(func_800E5348() + 180.0f); + temp_f0_15 = clamp_angle(player_get_side_angle() + 180.0f); partner->moveToPos.x = playerStatus->pos.x; partner->moveToPos.y = playerStatus->pos.y; partner->moveToPos.z = playerStatus->pos.z; diff --git a/src/world/script_api/rooms.c b/src/world/script_api/rooms.c index 8f94667d75..d37d22cf8f 100644 --- a/src/world/script_api/rooms.c +++ b/src/world/script_api/rooms.c @@ -574,7 +574,7 @@ EvtScript EVS_Default_AnimateDropDoor = { // executed from trigger activatation with MapRoom* stored in LVar1 EvtScript EVS_EnterRoomDoor = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) // ensure valid player action state Call(GetPlayerActionState, LVar3) Set(LVar4, 0) @@ -753,7 +753,7 @@ EvtScript EVS_EnterRoomDoor = { // executed from trigger activatation with MapRoom* stored in LVar1 EvtScript EVS_ExitRoomDoor = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) // ensure valid player action state Call(GetPlayerActionState, LVar3) Set(LVar4, 0) diff --git a/src/world/world.c b/src/world/world.c index efc4661281..d65d057492 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -232,7 +232,7 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) { initialize_status_bar(); gGameStatusPtr->unk_90 = 1000; gGameStatusPtr->unk_92 = 1000; - gGameStatusPtr->mainScriptID = start_script_in_group(mapSettings->main, EVT_PRIORITY_0, 0, 0)->id; + gGameStatusPtr->mainScriptID = start_script_in_group(mapSettings->main, EVT_PRIORITY_0, 0, EVT_GROUP_NEVER_PAUSE)->id; } MapConfig* get_current_map_config(void) { diff --git a/src/world_use_item.c b/src/world_use_item.c index 862e490071..0720937e4e 100644 --- a/src/world_use_item.c +++ b/src/world_use_item.c @@ -76,7 +76,7 @@ API_CALLABLE(WorldItem_PauseTime) { } API_CALLABLE(WorldItem_UnpauseTime) { - set_time_freeze_mode(TIME_FREEZE_NORMAL); + set_time_freeze_mode(TIME_FREEZE_NONE); #if !VERSION_JP gOverrideFlags &= ~GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS; #endif @@ -110,7 +110,7 @@ API_CALLABLE(WorldItem_ConsumeItem) { } EvtScript EVS_WorldItem_ShowUsedItem = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(SetPlayerAnimation, ANIM_Mario1_UsePower) Call(GetPlayerPos, LVar0, LVar1, LVar2) Add(LVar1, 45) @@ -152,7 +152,7 @@ EvtScript EVS_WorldItem_PlayDrinkingSounds = { }; EvtScript EVS_World_UseItem = { - SetGroup(EVT_GROUP_00) + SetGroup(EVT_GROUP_NEVER_PAUSE) Call(DisablePlayerInput, TRUE) Call(GetPartnerInUse, LVar0) IfNe(LVar0, 0) diff --git a/tools/renames/3_npc_enemy_encounter_evtgroup_flags.txt b/tools/renames/3_npc_enemy_encounter_evtgroup_flags.txt new file mode 100644 index 0000000000..179fd88f65 --- /dev/null +++ b/tools/renames/3_npc_enemy_encounter_evtgroup_flags.txt @@ -0,0 +1,25 @@ +NPC_FLAG_200000 NPC_FLAG_FLIP_INSTANTLY +NPC_FLAG_10000000 NPC_FLAG_USE_INSPECT_ICON +NPC_FLAG_20000000 NPC_FLAG_RAYCAST_TO_INTERACT +TIME_FREEZE_NORMAL TIME_FREEZE_NONE +ENEMY_FLAG_2 ENEMY_FLAG_UNUSED_2 +ENEMY_FLAG_4 ENEMY_FLAG_DO_NOT_KILL +ENEMY_FLAG_8000 ENEMY_FLAG_USE_INSPECT_ICON +ENEMY_FLAG_10000 ENEMY_FLAG_RAYCAST_TO_INTERACT +ENEMY_FLAG_40000 ENEMY_FLAG_NO_DELAY_AFTER_FLEE +ENEMY_FLAG_80000 ENEMY_FLAG_DONT_SUSPEND_SCRIPTS +ENEMY_FLAG_100000 ENEMY_FLAG_SKIP_BATTLE +ENEMY_FLAG_400000 ENEMY_FLAG_DO_NOT_AUTO_FACE_PLAYER +ENCOUNTER_STATUS_FLAG_0 ENCOUNTER_FLAG_NONE +ENCOUNTER_STATUS_FLAG_1 ENCOUNTER_FLAG_THUMBS_UP +ENCOUNTER_STATUS_FLAG_2 ENCOUNTER_FLAG_CANT_SKIP_WIN_DELAY +ENCOUNTER_STATUS_FLAG_4 ENCOUNTER_FLAG_SKIP_FLEE_DROPS +EVT_GROUP_00 EVT_GROUP_NEVER_PAUSE +EVT_GROUP_0A EVT_GROUP_PASSIVE_NPC +EVT_GROUP_0B EVT_GROUP_HOSTILE_NPC +EVT_GROUP_1B EVT_GROUP_EXIT_MAP +EVT_GROUP_EF EVT_GROUP_NOT_BATTLE +EVT_GROUP_01 EVT_GROUP_FLAG_INTERACT +EVT_GROUP_02 EVT_GROUP_FLAG_MENUS +EVT_GROUP_08 EVT_GROUP_FLAG_UNUSED +EVT_GROUP_10 EVT_GROUP_FLAG_BATTLE \ No newline at end of file diff --git a/ver/jp/symbol_addrs.txt b/ver/jp/symbol_addrs.txt index ebc1261fc9..393da6c28b 100644 --- a/ver/jp/symbol_addrs.txt +++ b/ver/jp/symbol_addrs.txt @@ -192,7 +192,7 @@ D_80095938 = 0x800958C8; D_80099AA0 = 0x80099A80; main_BSS_START = 0x8009A590; D_8009A5B8 = 0x8009A598; -timeFreezeMode = 0x8009A5B8; +gTimeFreezeMode = 0x8009A5B8; nuGfxZBuffer = 0x8009A5BC; CamLengthScale = 0x8009A5CC; nuGfxCfbCounter = 0x8009A5D0; diff --git a/ver/pal/undefined_syms.txt b/ver/pal/undefined_syms.txt index fe8d3aff16..8b0cd19d0f 100644 --- a/ver/pal/undefined_syms.txt +++ b/ver/pal/undefined_syms.txt @@ -273,7 +273,7 @@ gMessageBoxFrameParts = 0x8008C280; gAreas = 0x8008F890; EVS_800936C0 = 0x8008FA60; EVS_NpcHitRecoil = 0x8008FA7C; -timeFreezeMode = 0x800969AC; +gTimeFreezeMode = 0x800969AC; nuGfxZBuffer = 0x800969B0; gCurrentModelTreeNodeInfo = 0x800969C8; gEncounterState = 0x800969D4; diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index d8d83c6f74..b2bf133865 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -2555,7 +2555,7 @@ __osBaseCounter = 0x8009A5C8; // rom:0x759C8 gBGMPlayerC = 0x8009A5CC; // rom:0x759CC gEncounterSubState = 0x8009A5D0; // rom:0x759D0 CurrentSefCmdHandler = 0x8009A5D4; // rom:0x759D4 -timeFreezeMode = 0x8009A5D8; // rom:0x759D8 +gTimeFreezeMode = 0x8009A5D8; // rom:0x759D8 nuGfxZBuffer = 0x8009A5DC; // rom:0x759DC nuContDataLockKey = 0x8009A5E0; // rom:0x759E0 __osViIntrCount = 0x8009A5E4; // rom:0x759E4 @@ -2581,7 +2581,7 @@ __osTimerCounter = 0x8009A62C; // rom:0x75A2C nuIdleFunc = 0x8009A630; // rom:0x75A30 gCurrentCamID = 0x8009A634; // rom:0x75A34 nuPiCartHandle = 0x8009A638; // rom:0x75A38 -D_8009A63C = 0x8009A63C; // rom:0x75A3C +PendingPartnerAbilityResume = 0x8009A63C; // rom:0x75A3C gSoundManager = 0x8009A640; // rom:0x75A40 D_8009A644 = 0x8009A644; // rom:0x75A44 nuGfxCfb_ptr = 0x8009A64C; // rom:0x75A4C @@ -2593,9 +2593,9 @@ __osFinalrom = 0x8009A660; // rom:0x75A60 gBGMPlayerA = 0x8009A664; // rom:0x75A64 gFirstStrikeMessagePos = 0x8009A668; // rom:0x75A68 gMainGfxPos = 0x8009A66C; // rom:0x75A6C -D_8009A670 = 0x8009A670; // rom:0x75A70 +LastBattleStartedBySpin = 0x8009A670; // rom:0x75A70 gDisplayContext = 0x8009A674; // rom:0x75A74 -D_8009A678 = 0x8009A678; // rom:0x75A78 +EncounterStateChanged = 0x8009A678; // rom:0x75A78 D_8009A67C = 0x8009A67C; // rom:0x75A7C ResetFrameBufferArray = 0x8009A680; // rom:0x75A80 D_8009A684 = 0x8009A684; // rom:0x75A84 @@ -2761,13 +2761,13 @@ gBattleNpcList = 0x800A0A90; // rom:0x7BE90 gCurrentNpcListPtr = 0x800A0B90; // rom:0x7BF90 gNpcPlayerCollisionsEnabled = 0x800A0B94; // rom:0x7BF94 D_800A0B98 = 0x800A0B98; // rom:0x7BF98 -D_800A0BA0 = 0x800A0BA0; // rom:0x7BFA0 -D_800A0BA4 = 0x800A0BA4; // rom:0x7BFA4 +WorldMerleeEffectsTime = 0x800A0BA0; // rom:0x7BFA0 +WorldMerleeBasePosY = 0x800A0BA4; // rom:0x7BFA4 WorldMerleeOrbEffect = 0x800A0BA8; // rom:0x7BFA8 WorldMerleeWaveEffect = 0x800A0BAC; // rom:0x7BFAC -D_800A0BB0 = 0x800A0BB0; // rom:0x7BFB0 -D_800A0BB4 = 0x800A0BB4; // rom:0x7BFB4 -D_800A0BB8 = 0x800A0BB8; // rom:0x7BFB8 +MerleeDropCoinsEvt = 0x800A0BB0; // rom:0x7BFB0 +MerleeDropCoinsEvtID = 0x800A0BB4; // rom:0x7BFB4 +WorldMerleeEffectsState = 0x800A0BB8; // rom:0x7BFB8 D_800A0BBC = 0x800A0BBC; // rom:0x7BFBC D_800A0BC0 = 0x800A0BC0; // rom:0x7BFC0 handle_jumping_launch = 0x800E2BB0; // type:func rom:0x7C060 @@ -2803,7 +2803,7 @@ try_player_footstep_sounds = 0x800E5098; // type:func rom:0x7E548 phys_update_interact_collider = 0x800E5150; // type:func rom:0x7E600 phys_check_interactable_collision = 0x800E5174; // type:func rom:0x7E624 phys_can_player_interact = 0x800E52F8; // type:func rom:0x7E7A8 -func_800E5348 = 0x800E5348; // type:func rom:0x7E7F8 +player_get_side_angle = 0x800E5348; // type:func rom:0x7E7F8 AlCmdListBuffers = 0x800A3510; // rom:0x7E910 D_800A3514 = 0x800A3514; // rom:0x7E914 player_get_camera_facing_angle = 0x800E546C; // type:func rom:0x7E91C @@ -6742,7 +6742,7 @@ BattleMerleeFadeStageFromBlack = 0x802615C8; // type:func rom:0x18FEA8 BattleFadeInMerlee = 0x80261648; // type:func rom:0x18FF28 BattleFadeOutMerlee = 0x802616B4; // type:func rom:0x18FF94 BattleMerleeUpdateFX = 0x802616F4; // type:func rom:0x18FFD4 -func_802619B4 = 0x802619B4; // type:func rom:0x190294 +BattleMerleeStopFX = 0x802619B4; // type:func rom:0x190294 HasMerleeCastsLeft = 0x802619C8; // type:func rom:0x1902A8 SpawnTurnEndFX = 0x802619E8; // type:func rom:0x1902C8 RemoveTurnEndFX = 0x80261B40; // type:func rom:0x190420 @@ -25133,9 +25133,9 @@ action_update_peach_land = 0x802B62CC; // type:func rom:0xE24BEC action_update_peach_step_down_land = 0x802B644C; // type:func rom:0xE24D6C action_hammer_is_swinging_away = 0x802B6000; // type:func rom:0xE24ED0 action_hammer_play_hit_fx = 0x802B6048; // type:func rom:0xE24F18 -func_802B62A4_E25174 = 0x802B62A4; // type:func rom:0xE25174 +action_hammer_test_swing_collision = 0x802B62A4; // type:func rom:0xE25174 action_update_hammer = 0x802B66A8; // type:func rom:0xE25578 -func_802B6820_E256F0 = 0x802B6820; // type:func rom:0xE256F0 +action_hammer_end_swing = 0x802B6820; // type:func rom:0xE256F0 HammerHit = 0x802B6DB0; // rom:0xE25C80 D_802B6DC0_E25C90 = 0x802B6DC0; // rom:0xE25C90 action_update_spin = 0x802B6000; // type:func rom:0xE25D60 @@ -26023,14 +26023,14 @@ LevelUpScriptID = 0x8029FB80; // CelebrateStateTime = 0x8029FB84; // LevelUpSelectTextOffsetX = 0x8029FB88; // LevelUpSelectTextVelX = 0x8029FB8C; // -D_8029FB90 = 0x8029FB90; // -D_8029FB94 = 0x8029FB94; // +BattleMerleeEffectsTime = 0x8029FB90; // +BattleMerleeBasePosY = 0x8029FB94; // BattleMerleeOrbEffect = 0x8029FB98; // BattleMerleeWaveEffect = 0x8029FB9C; // -RefundHudElem = 0x8029FBA0; // -D_8029FBA4 = 0x8029FBA4; // -D_8029FBA8 = 0x8029FBA8; // -D_8029FBAC = 0x8029FBAC; // +HID_Refund = 0x8029FBA0; // +BattleMerleeEffectsState = 0x8029FBA4; // +HID_Happy = 0x8029FBA8; // +HID_HPDrain = 0x8029FBAC; // D_8029FBB0 = 0x8029FBB0; // D_8029FBC0 = 0x8029FBC0; // D_8029FBD0 = 0x8029FBD0; //