diff --git a/include/common_structs.h b/include/common_structs.h index 5ec41c7970..7fe828cf2a 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -1637,9 +1637,9 @@ typedef struct CollisionStatus { /* 0x06 */ s16 floorBelow; /* 0x08 */ s16 currentCeiling; /* valid on touching with head */ /* 0x0A */ s16 currentInspect; /* associated with TRIGGER_WALL_PRESS_A */ - /* 0x0C */ s16 unk_0C; /* associated with TRIGGER_FLAGS_2000 */ - /* 0x0E */ s16 unk_0E; /* associated with TRIGGER_FLAGS_4000 */ - /* 0x10 */ s16 unk_10; /* associated with TRIGGER_FLAGS_8000 */ + /* 0x0C */ s16 unk_0C; /* associated with TRIGGER_FLAG_2000 */ + /* 0x0E */ s16 unk_0E; /* associated with TRIGGER_FLAG_4000 */ + /* 0x10 */ s16 unk_10; /* associated with TRIGGER_FLAG_8000 */ /* 0x12 */ s16 currentWall; /* 0x14 */ s16 lastWallHammered; /* valid when smashing */ /* 0x16 */ s16 touchingWallTrigger; /* 0/1 */ diff --git a/include/enums.h b/include/enums.h index 395042228d..0fa0a74a54 100644 --- a/include/enums.h +++ b/include/enums.h @@ -2999,47 +2999,47 @@ enum EntityTypes { // Entity enum EntityFlags { - ENTITY_FLAGS_HIDDEN = 0x00000001, - ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE1 = 0x00000002, - ENTITY_FLAGS_HAS_DYNAMIC_SHADOW = 0x00000004, - ENTITY_FLAGS_HAS_ANIMATED_MODEL = 0x00000008, - ENTITY_FLAGS_SKIP_UPDATE_TRANSFORM_MATRIX = 0x00000010, - ENTITY_FLAGS_DISABLE_COLLISION = 0x00000020, - ENTITY_FLAGS_CONTINUOUS_COLLISION = 0x00000040, - ENTITY_FLAGS_80 = 0x00000080, - ENTITY_FLAGS_HAS_SHADOW = 0x00000100, - ENTITY_FLAGS_FIXED_SHADOW_SIZE = 0x00000200, - ENTITY_FLAGS_400 = 0x00000400, - ENTITY_FLAGS_SQUARE_SHADOW = 0x00000800, - ENTITY_FLAGS_SHOWS_INSPECT_PROMPT = 0x00001000, - ENTITY_FLAGS_ALWAYS_FACE_CAMERA = 0x00002000, - ENTITY_FLAGS_4000 = 0x00004000, - ENTITY_FLAGS_8000 = 0x00008000, - ENTITY_FLAGS_DETECTED_COLLISION = 0x00010000, - ENTITY_FLAGS_PARTNER_COLLISION = 0x00020000, - ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2 = 0x00040000, - ENTITY_FLAGS_IGNORE_DISTANCE_CULLING = 0x00080000, - ENTITY_FLAGS_100000 = 0x00100000, - ENTITY_FLAGS_200000 = 0x00200000, - ENTITY_FLAGS_SHADOW_POS_DIRTY = 0x00400000, - ENTITY_FLAGS_DARK_SHADOW = 0x00800000, - ENTITY_FLAGS_BOUND_SCRIPT_DIRTY = 0x01000000, - ENTITY_FLAGS_2000000 = 0x02000000, - ENTITY_FLAGS_PENDING_FULL_DELETE = 0x04000000, - ENTITY_FLAGS_8000000 = 0x08000000, - ENTITY_FLAGS_FADING_AWAY = 0x10000000, - ENTITY_FLAGS_PENDING_INSTANCE_DELETE = 0x20000000, - ENTITY_FLAGS_SKIP_UPDATE = 0x40000000, - ENTITY_FLAGS_CREATED = 0x80000000, + ENTITY_FLAG_HIDDEN = 0x00000001, + ENTITY_FLAG_DRAW_IF_CLOSE_HIDE_MODE1 = 0x00000002, + ENTITY_FLAG_HAS_DYNAMIC_SHADOW = 0x00000004, + ENTITY_FLAG_HAS_ANIMATED_MODEL = 0x00000008, + ENTITY_FLAG_SKIP_UPDATE_TRANSFORM_MATRIX = 0x00000010, + ENTITY_FLAG_DISABLE_COLLISION = 0x00000020, + ENTITY_FLAG_CONTINUOUS_COLLISION = 0x00000040, + ENTITY_FLAG_80 = 0x00000080, + ENTITY_FLAG_HAS_SHADOW = 0x00000100, + ENTITY_FLAG_FIXED_SHADOW_SIZE = 0x00000200, + ENTITY_FLAG_400 = 0x00000400, + ENTITY_FLAG_SQUARE_SHADOW = 0x00000800, + ENTITY_FLAG_SHOWS_INSPECT_PROMPT = 0x00001000, + ENTITY_FLAG_ALWAYS_FACE_CAMERA = 0x00002000, + ENTITY_FLAG_4000 = 0x00004000, + ENTITY_FLAG_8000 = 0x00008000, + ENTITY_FLAG_DETECTED_COLLISION = 0x00010000, + ENTITY_FLAG_PARTNER_COLLISION = 0x00020000, + ENTITY_FLAG_DRAW_IF_CLOSE_HIDE_MODE2 = 0x00040000, + ENTITY_FLAG_IGNORE_DISTANCE_CULLING = 0x00080000, + ENTITY_FLAG_100000 = 0x00100000, + ENTITY_FLAG_200000 = 0x00200000, + ENTITY_FLAG_SHADOW_POS_DIRTY = 0x00400000, + ENTITY_FLAG_DARK_SHADOW = 0x00800000, + ENTITY_FLAG_BOUND_SCRIPT_DIRTY = 0x01000000, + ENTITY_FLAG_2000000 = 0x02000000, + ENTITY_FLAG_PENDING_FULL_DELETE = 0x04000000, + ENTITY_FLAG_8000000 = 0x08000000, + ENTITY_FLAG_FADING_AWAY = 0x10000000, + ENTITY_FLAG_PENDING_INSTANCE_DELETE = 0x20000000, + ENTITY_FLAG_SKIP_UPDATE = 0x40000000, + ENTITY_FLAG_CREATED = 0x80000000, }; enum EntityCollisionFlags { ENTITY_COLLISION_PLAYER_TOUCH_FLOOR = 0x00000001, - ENTITY_COLLISION_FLAGS_2 = 0x00000002, + ENTITY_COLLISION_FLAG_2 = 0x00000002, ENTITY_COLLISION_PLAYER_TOUCH_CEILING = 0x00000004, ENTITY_COLLISION_PLAYER_TOUCH_WALL = 0x00000008, ENTITY_COLLISION_PLAYER_PUSHING_AGAINST = 0x00000010, - ENTITY_COLLISION_FLAGS_20 = 0x00000020, + ENTITY_COLLISION_FLAG_20 = 0x00000020, ENTITY_COLLISION_PLAYER_HAMMER = 0x00000040, ENTITY_COLLISION_PARTNER = 0x00000080, ENTITY_COLLISION_PLAYER_LAST_FLOOR = 0x00000100 @@ -3063,9 +3063,9 @@ enum TriggerFlags { TRIGGER_WALL_TOUCH = 0x00000400, TRIGGER_FLOOR_PRESS_A = 0x00000800, TRIGGER_WALL_HAMMER = 0x00001000, - TRIGGER_FLAGS_2000 = 0x00002000, - TRIGGER_FLAGS_4000 = 0x00004000, - TRIGGER_FLAGS_8000 = 0x00008000, + TRIGGER_FLAG_2000 = 0x00002000, + TRIGGER_FLAG_4000 = 0x00004000, + TRIGGER_FLAG_8000 = 0x00008000, TRIGGER_GAME_FLAG_SET = 0x00010000, TRIGGER_AREA_FLAG_SET = 0x00020000, TRIGGER_CEILING_TOUCH = 0x00040000, @@ -3075,37 +3075,37 @@ enum TriggerFlags { }; enum ItemEntityFlags { - ITEM_ENTITY_FLAGS_CAM0 = 0x00000001, - ITEM_ENTITY_FLAGS_CAM1 = 0x00000002, - ITEM_ENTITY_FLAGS_CAM2 = 0x00000004, - ITEM_ENTITY_FLAGS_CAM3 = 0x00000008, - ITEM_ENTITY_FLAGS_10 = 0x00000010, - ITEM_ENTITY_FLAGS_HIDDEN = 0x00000040, // do not render; player cant pickup - ITEM_ENTITY_FLAGS_80 = 0x00000080, - ITEM_ENTITY_FLAGS_100 = 0x00000100, - ITEM_ENTITY_FLAGS_NEVER_VANISH = 0x00000200, - ITEM_ENTITY_FLAGS_400 = 0x00000400, - ITEM_ENTITY_FLAGS_800 = 0x00000800, - ITEM_ENTITY_FLAGS_1000 = 0x00001000, - ITEM_ENTITY_FLAGS_FIXED = 0x00002000, - ITEM_ENTITY_FLAGS_TINY = 0x00004000, - ITEM_ENTITY_FLAGS_8000 = 0x00008000, - ITEM_ENTITY_FLAGS_10000 = 0x00010000, - ITEM_ENTITY_FLAGS_20000 = 0x00020000, - ITEM_ENTITY_FLAGS_40000 = 0x00040000, - ITEM_ENTITY_FLAGS_TRANSPARENT = 0x00080000, - ITEM_ENTITY_FLAGS_100000 = 0x00100000, - ITEM_ENTITY_FLAGS_200000 = 0x00200000, - ITEM_ENTITY_FLAGS_400000 = 0x00400000, - ITEM_ENTITY_FLAGS_800000 = 0x00800000, - ITEM_ENTITY_FLAGS_1000000 = 0x01000000, - ITEM_ENTITY_FLAGS_2000000 = 0x02000000, - ITEM_ENTITY_FLAGS_4000000 = 0x04000000, - ITEM_ENTITY_FLAGS_8000000 = 0x08000000, - ITEM_ENTITY_FLAGS_10000000 = 0x10000000, - ITEM_ENTITY_FLAGS_20000000 = 0x20000000, - ITEM_ENTITY_FLAGS_40000000 = 0x40000000, - ITEM_ENTITY_FLAGS_80000000 = 0x80000000, + ITEM_ENTITY_FLAG_CAM0 = 0x00000001, + ITEM_ENTITY_FLAG_CAM1 = 0x00000002, + ITEM_ENTITY_FLAG_CAM2 = 0x00000004, + ITEM_ENTITY_FLAG_CAM3 = 0x00000008, + ITEM_ENTITY_FLAG_10 = 0x00000010, + ITEM_ENTITY_FLAG_HIDDEN = 0x00000040, // do not render; player cant pickup + ITEM_ENTITY_FLAG_80 = 0x00000080, + ITEM_ENTITY_FLAG_100 = 0x00000100, + ITEM_ENTITY_FLAG_NEVER_VANISH = 0x00000200, + ITEM_ENTITY_FLAG_400 = 0x00000400, + ITEM_ENTITY_FLAG_800 = 0x00000800, + ITEM_ENTITY_FLAG_1000 = 0x00001000, + ITEM_ENTITY_FLAG_FIXED = 0x00002000, + ITEM_ENTITY_FLAG_TINY = 0x00004000, + ITEM_ENTITY_FLAG_8000 = 0x00008000, + ITEM_ENTITY_FLAG_10000 = 0x00010000, + ITEM_ENTITY_FLAG_20000 = 0x00020000, + ITEM_ENTITY_FLAG_40000 = 0x00040000, + ITEM_ENTITY_FLAG_TRANSPARENT = 0x00080000, + ITEM_ENTITY_FLAG_100000 = 0x00100000, + ITEM_ENTITY_FLAG_200000 = 0x00200000, + ITEM_ENTITY_FLAG_400000 = 0x00400000, + ITEM_ENTITY_FLAG_800000 = 0x00800000, + ITEM_ENTITY_FLAG_1000000 = 0x01000000, + ITEM_ENTITY_FLAG_2000000 = 0x02000000, + ITEM_ENTITY_FLAG_4000000 = 0x04000000, + ITEM_ENTITY_FLAG_8000000 = 0x08000000, + ITEM_ENTITY_FLAG_10000000 = 0x10000000, + ITEM_ENTITY_FLAG_20000000 = 0x20000000, + ITEM_ENTITY_FLAG_40000000 = 0x40000000, + ITEM_ENTITY_FLAG_80000000 = 0x80000000, }; // Worker @@ -3343,105 +3343,105 @@ enum NpcFlags { }; enum PlayerStatusFlags { - PS_FLAGS_AIRBORNE = 0x0000000E, - PS_FLAGS_HAS_REFLECTION = 0x00000001, - PS_FLAGS_JUMPING = 0x00000002, - PS_FLAGS_FALLING = 0x00000004, - PS_FLAGS_FLYING = 0x00000008, - PS_FLAGS_SLIDING = 0x00000010, + PS_FLAG_AIRBORNE = 0x0000000E, + PS_FLAG_HAS_REFLECTION = 0x00000001, + PS_FLAG_JUMPING = 0x00000002, + PS_FLAG_FALLING = 0x00000004, + PS_FLAG_FLYING = 0x00000008, + PS_FLAG_SLIDING = 0x00000010, /* Paused either via the start menu, or through another menu that causes a pause (like the item menu) */ - PS_FLAGS_PAUSED = 0x00000020, - PS_FLAGS_NO_CHANGE_PARTNER = 0x00000040, - PS_FLAGS_NO_PARTNER_USAGE = 0x00000080, + PS_FLAG_PAUSED = 0x00000020, + PS_FLAG_NO_CHANGE_PARTNER = 0x00000040, + PS_FLAG_NO_PARTNER_USAGE = 0x00000080, /* Prevents opening menus that would require a game-time pause (start menu, item menu, etc) */ - PS_FLAGS_PAUSE_DISABLED = 0x00000100, + PS_FLAG_PAUSE_DISABLED = 0x00000100, /* Doing either a spin jump or a tornado jump */ - PS_FLAGS_SPECIAL_JUMP = 0x00000200, + PS_FLAG_SPECIAL_JUMP = 0x00000200, /* Landing from either a spin jump or a tornado jump */ - PS_FLAGS_SPECIAL_LAND = 0x00000400, + PS_FLAG_SPECIAL_LAND = 0x00000400, /* Burning from touching a fire hazard of some kind */ - PS_FLAGS_HIT_FIRE = 0x00000800, - PS_FLAGS_NO_STATIC_COLLISION = 0x00001000, - PS_FLAGS_INPUT_DISABLED = 0x00002000, + PS_FLAG_HIT_FIRE = 0x00000800, + PS_FLAG_NO_STATIC_COLLISION = 0x00001000, + PS_FLAG_INPUT_DISABLED = 0x00002000, /* Indicates that Mario's lateral movement is currently commandeered by a cutscene or script */ - PS_FLAGS_CUTSCENE_MOVEMENT = 0x00004000, + PS_FLAG_CUTSCENE_MOVEMENT = 0x00004000, /* Either outta sight with Bow, or temporarily damage boosted - makes Mario ignore fire bars */ - PS_FLAGS_HAZARD_INVINCIBILITY = 0x00008000, + PS_FLAG_HAZARD_INVINCIBILITY = 0x00008000, /* Spinning either through pressing Z or the tornado jump - causes a ghost trail to render */ - PS_FLAGS_SPINNING = 0x00020000, + PS_FLAG_SPINNING = 0x00020000, /* Slows Mario's physics and animations to half speed - responsible for the dramatic slowdown when starting an encounter by jumping on an enemy. Also stops Mario from successfully completing a hammer. */ - PS_FLAGS_ENTERING_BATTLE = 0x00040000, + PS_FLAG_ENTERING_BATTLE = 0x00040000, /* Occurs after hitting a heart block - temporarily prevents encounters from starting */ - PS_FLAGS_ARMS_RAISED = 0x00080000, + PS_FLAG_ARMS_RAISED = 0x00080000, /* Stops Mario's sprite yaw from being adjusted, usually so a cutscene can do it instead. */ - PS_FLAGS_ROTATION_LOCKED = 0x00100000, + PS_FLAG_ROTATION_LOCKED = 0x00100000, /* Forces Mario's sprite to either face exactly left or right, without transitioning. */ - PS_FLAGS_NO_FLIPPING = 0x00200000, + PS_FLAG_NO_FLIPPING = 0x00200000, /* Prevents Mario from moving laterally */ - PS_FLAGS_MOVEMENT_LOCKED = 0x00400000, + PS_FLAG_MOVEMENT_LOCKED = 0x00400000, /* Stops Mario from air steering or using a special jump during a scripted fall */ - PS_FLAGS_SCRIPTED_FALL = 0x00800000, + PS_FLAG_SCRIPTED_FALL = 0x00800000, /* Not fully sure about this one, but appears to mark the frame that the check for what to hammer occurs */ - PS_FLAGS_HAMMER_CHECK = 0x01000000, - PS_FLAGS_HAS_CONVERSATION_NPC = 0x02000000, - PS_FLAGS_CAMERA_DOESNT_FOLLOW = 0x04000000, + PS_FLAG_HAMMER_CHECK = 0x01000000, + PS_FLAG_HAS_CONVERSATION_NPC = 0x02000000, + PS_FLAG_CAMERA_DOESNT_FOLLOW = 0x04000000, /* Mario just interacted with something (usually cleared on the same frame) */ - PS_FLAGS_INTERACTED = 0x08000000, + PS_FLAG_INTERACTED = 0x08000000, /* Makes Mario face forwards, used when talking to NPCs, or when on Lakilester */ - PS_FLAGS_FACE_FORWARDS = 0x10000000, + PS_FLAG_FACE_FORWARDS = 0x10000000, /* Freezes physics and animations - is usually reset at the start of a frame so often does nothing */ - PS_FLAGS_TIME_STOPPED = 0x20000000, + PS_FLAG_TIME_STOPPED = 0x20000000, /* Indicates that Mario needs his sprite redrawn */ - PS_FLAGS_SPRITE_REDRAW = 0x40000000, - PS_FLAGS_ACTION_STATE_CHANGED = 0x80000000, + PS_FLAG_SPRITE_REDRAW = 0x40000000, + PS_FLAG_ACTION_STATE_CHANGED = 0x80000000, }; /// @see PlayerStatus::animFlags enum PlayerStatusAnimFlags { /* Whether Mario is in the process of using Watt (but isn't necessarily holding them yet) */ - PA_FLAGS_USING_WATT = 0x00000001, + PA_FLAG_USING_WATT = 0x00000001, /* Whether Watt is actually in Mario's hands at the moment */ - PA_FLAGS_WATT_IN_HANDS = 0x00000002, - PA_FLAGS_INTERRUPT_USE_PARTNER = 0x00000004, ///< forces actions with bow, parakarry, watt, and lakilester to end (sushie not tested) - PA_FLAGS_FORCE_USE_PARTNER = 0x00000008, ///< triggers partner use when set - PA_FLAGS_INTERACT_PROMPT_AVAILABLE = 0x00000010, ///< ! prompt - PA_FLAGS_SPEECH_PROMPT_AVAILABLE = 0x00000020, ///< (...) prompt - PA_FLAGS_40 = 0x00000040, - PA_FLAGS_USING_PULSE_STONE = 0x00000080, - PA_FLAGS_100 = 0x00000100, - PA_FLAGS_RAISED_ARMS = 0x00000200, ///< Sets action state to ACTION_STATE_RAISE_ARMS on idle - PA_FLAGS_SHIVERING = 0x00000400, - PA_FLAGS_OPENED_HIDDEN_PANEL = 0x00000800, - PA_FLAGS_USING_PEACH_PHYSICS = 0x00001000, - PA_FLAGS_INVISIBLE = 0x00002000, - PA_FLAGS_8BIT_MARIO = 0x00004000, - PA_FLAGS_NPC_COLLIDED = 0x00008000, - PA_FLAGS_SPINNING = 0x00010000, + PA_FLAG_WATT_IN_HANDS = 0x00000002, + PA_FLAG_INTERRUPT_USE_PARTNER = 0x00000004, ///< forces actions with bow, parakarry, watt, and lakilester to end (sushie not tested) + PA_FLAG_FORCE_USE_PARTNER = 0x00000008, ///< triggers partner use when set + PA_FLAG_INTERACT_PROMPT_AVAILABLE = 0x00000010, ///< ! prompt + PA_FLAG_SPEECH_PROMPT_AVAILABLE = 0x00000020, ///< (...) prompt + PA_FLAG_40 = 0x00000040, + PA_FLAG_USING_PULSE_STONE = 0x00000080, + PA_FLAG_100 = 0x00000100, + PA_FLAG_RAISED_ARMS = 0x00000200, ///< Sets action state to ACTION_STATE_RAISE_ARMS on idle + PA_FLAG_SHIVERING = 0x00000400, + PA_FLAG_OPENED_HIDDEN_PANEL = 0x00000800, + PA_FLAG_USING_PEACH_PHYSICS = 0x00001000, + PA_FLAG_INVISIBLE = 0x00002000, + PA_FLAG_8BIT_MARIO = 0x00004000, + PA_FLAG_NPC_COLLIDED = 0x00008000, + PA_FLAG_SPINNING = 0x00010000, /* Began an encounter by spinning into an enemy with the Dizzy Attack badge on */ - PA_FLAGS_DIZZY_ATTACK_ENCOUNTER = 0x00020000, - PA_FLAGS_INTERRUPT_SPIN = 0x00040000, - PA_FLAGS_80000 = 0x00080000, + PA_FLAG_DIZZY_ATTACK_ENCOUNTER = 0x00020000, + PA_FLAG_INTERRUPT_SPIN = 0x00040000, + PA_FLAG_80000 = 0x00080000, /* When Mario is in a transition to a new map, either through a loading zone or pipe */ - PA_FLAGS_CHANGING_MAP = 0x00100000, - /* Occurs after PA_FLAGS_FORCE_USE_PARTNER. Some partners - namely Bow and Lakilester, unset this immediately. + PA_FLAG_CHANGING_MAP = 0x00100000, + /* Occurs after PA_FLAG_FORCE_USE_PARTNER. Some partners - namely Bow and Lakilester, unset this immediately. Not sure why - seems like it might contribute to being unable to *stop* using your partner during a cutscene. */ - PA_FLAGS_PARTNER_USAGE_FORCED = 0x00200000, - PA_FLAGS_RIDING_PARTNER = 0x00400000, - PA_FLAGS_PUSHED_ALBINO_DINO = 0x00800000, + PA_FLAG_PARTNER_USAGE_FORCED = 0x00200000, + PA_FLAG_RIDING_PARTNER = 0x00400000, + PA_FLAG_PUSHED_ALBINO_DINO = 0x00800000, /* Changes how Mario is rendered. Seems to be intended to make Mario's depth render properly when using Bow behind a switch (two translucent objects on top of eachother), but it doesn't actually work. */ - PA_FLAGS_MAP_HAS_SWITCH = 0x01000000, - PA_FLAGS_2000000 = 0x02000000, - PA_FLAGS_4000000 = 0x04000000, - PA_FLAGS_8000000 = 0x08000000, + PA_FLAG_MAP_HAS_SWITCH = 0x01000000, + PA_FLAG_2000000 = 0x02000000, + PA_FLAG_4000000 = 0x04000000, + PA_FLAG_8000000 = 0x08000000, /* Usually, if Mario falls for too long, he eventually gets reset to his last safe position. This prevents that. Used by some scripts. */ - PA_FLAGS_NO_OOB_RESPAWN = 0x10000000, + PA_FLAG_NO_OOB_RESPAWN = 0x10000000, /* This allows dismounting from Lakilester, even if in a precarious situation (like over spikes, lava, or water). */ - PA_FLAGS_DISMOUNTING_ALLOWED = 0x20000000, + PA_FLAG_DISMOUNTING_ALLOWED = 0x20000000, /* This flag is set when partner usage was interrupted by a script, and it prevents menu sounds (like the error sound) from playing for script-initiated player actions */ - PA_FLAGS_PARTNER_USAGE_STOPPED = 0x40000000, + PA_FLAG_PARTNER_USAGE_STOPPED = 0x40000000, /* This one's really weird. Seems to have something to do with the direction Mario is facing, but I'm not sure what it's actually supposed to be achieving. */ - PA_FLAGS_80000000 = 0x80000000, + PA_FLAG_80000000 = 0x80000000, }; enum PopupType { @@ -3731,39 +3731,39 @@ enum HazardType { }; enum EffectGfxDataFlags { - FX_GRAPHICS_DISABLED = 0x00000000, - FX_GRAPHICS_ENABLED = 0x00000001, - FX_GRAPHICS_FLAGS_2 = 0x00000002, - FX_GRAPHICS_FLAGS_4 = 0x00000004, - FX_GRAPHICS_FLAGS_8 = 0x00000008, - FX_GRAPHICS_FLAGS_10 = 0x00000010, - FX_GRAPHICS_FLAGS_20 = 0x00000020, - FX_GRAPHICS_FLAGS_40 = 0x00000040, - FX_GRAPHICS_FLAGS_80 = 0x00000080, - FX_GRAPHICS_FLAGS_100 = 0x00000100, - FX_GRAPHICS_FLAGS_200 = 0x00000200, - FX_GRAPHICS_FLAGS_400 = 0x00000400, - FX_GRAPHICS_FLAGS_800 = 0x00000800, - FX_GRAPHICS_FLAGS_1000 = 0x00001000, - FX_GRAPHICS_FLAGS_2000 = 0x00002000, - FX_GRAPHICS_FLAGS_4000 = 0x00004000, - FX_GRAPHICS_FLAGS_8000 = 0x00008000, - FX_GRAPHICS_FLAGS_10000 = 0x00010000, - FX_GRAPHICS_FLAGS_20000 = 0x00020000, - FX_GRAPHICS_FLAGS_40000 = 0x00040000, - FX_GRAPHICS_FLAGS_80000 = 0x00080000, - FX_GRAPHICS_FLAGS_100000 = 0x00100000, - FX_GRAPHICS_FLAGS_200000 = 0x00200000, - FX_GRAPHICS_FLAGS_400000 = 0x00400000, - FX_GRAPHICS_FLAGS_800000 = 0x00800000, - FX_GRAPHICS_FLAGS_1000000 = 0x01000000, - FX_GRAPHICS_FLAGS_2000000 = 0x02000000, - FX_GRAPHICS_FLAGS_4000000 = 0x04000000, - FX_GRAPHICS_FLAGS_8000000 = 0x08000000, - FX_GRAPHICS_FLAGS_10000000 = 0x10000000, - FX_GRAPHICS_FLAGS_20000000 = 0x20000000, - FX_GRAPHICS_FLAGS_40000000 = 0x40000000, - FX_GRAPHICS_FLAGS_80000000 = 0x80000000, + FX_GRAPHICS_DISABLED = 0x00000000, + FX_GRAPHICS_ENABLED = 0x00000001, + FX_GRAPHICS_FLAG_2 = 0x00000002, + FX_GRAPHICS_FLAG_4 = 0x00000004, + FX_GRAPHICS_FLAG_8 = 0x00000008, + FX_GRAPHICS_FLAG_10 = 0x00000010, + FX_GRAPHICS_FLAG_20 = 0x00000020, + FX_GRAPHICS_FLAG_40 = 0x00000040, + FX_GRAPHICS_FLAG_80 = 0x00000080, + FX_GRAPHICS_FLAG_100 = 0x00000100, + FX_GRAPHICS_FLAG_200 = 0x00000200, + FX_GRAPHICS_FLAG_400 = 0x00000400, + FX_GRAPHICS_FLAG_800 = 0x00000800, + FX_GRAPHICS_FLAG_1000 = 0x00001000, + FX_GRAPHICS_FLAG_2000 = 0x00002000, + FX_GRAPHICS_FLAG_4000 = 0x00004000, + FX_GRAPHICS_FLAG_8000 = 0x00008000, + FX_GRAPHICS_FLAG_10000 = 0x00010000, + FX_GRAPHICS_FLAG_20000 = 0x00020000, + FX_GRAPHICS_FLAG_40000 = 0x00040000, + FX_GRAPHICS_FLAG_80000 = 0x00080000, + FX_GRAPHICS_FLAG_100000 = 0x00100000, + FX_GRAPHICS_FLAG_200000 = 0x00200000, + FX_GRAPHICS_FLAG_400000 = 0x00400000, + FX_GRAPHICS_FLAG_800000 = 0x00800000, + FX_GRAPHICS_FLAG_1000000 = 0x01000000, + FX_GRAPHICS_FLAG_2000000 = 0x02000000, + FX_GRAPHICS_FLAG_4000000 = 0x04000000, + FX_GRAPHICS_FLAG_8000000 = 0x08000000, + FX_GRAPHICS_FLAG_10000000 = 0x10000000, + FX_GRAPHICS_FLAG_20000000 = 0x20000000, + FX_GRAPHICS_FLAG_40000000 = 0x40000000, + FX_GRAPHICS_FLAG_80000000 = 0x80000000, }; enum MoveIDs { @@ -4666,25 +4666,25 @@ enum GlobalOverrides { GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS = 0x00200000, }; -#define MODEL_FLAGS_MASK_FFF0 (MODEL_FLAGS_USES_CUSTOM_GFX | MODEL_FLAGS_FLAG_20 | MODEL_FLAGS_FLAG_40 | MODEL_FLAGS_HAS_LOCAL_VERTEX_COPY | MODEL_FLAGS_USE_CAMERA_UNK_MATRIX | MODEL_FLAGS_FLAG_200 | MODEL_FLAGS_HAS_TRANSFORM_APPLIED | MODEL_FLAGS_HAS_TEX_PANNER | MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_FLAG_2000 | MODEL_FLAGS_FLAG_4000 | MODEL_FLAGS_FLAG_8000) +#define MODEL_FLAGS_MASK_FFF0 (MODEL_FLAG_USES_CUSTOM_GFX | MODEL_FLAG_FLAG_20 | MODEL_FLAG_FLAG_40 | MODEL_FLAG_HAS_LOCAL_VERTEX_COPY | MODEL_FLAG_USE_CAMERA_UNK_MATRIX | MODEL_FLAG_FLAG_200 | MODEL_FLAG_HAS_TRANSFORM_APPLIED | MODEL_FLAG_HAS_TEX_PANNER | MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_FLAG_2000 | MODEL_FLAG_FLAG_4000 | MODEL_FLAG_FLAG_8000) enum ModelFlags { - MODEL_FLAGS_FLAG_1 = 0x0001, - MODEL_FLAGS_ENABLED = 0x0002, - MODEL_FLAGS_FLAG_4 = 0x0004, - MODEL_FLAGS_TRANSFORM_GROUP_MEMBER = 0x0008, - MODEL_FLAGS_USES_CUSTOM_GFX = 0x0010, - MODEL_FLAGS_FLAG_20 = 0x0020, - MODEL_FLAGS_FLAG_40 = 0x0040, - MODEL_FLAGS_HAS_LOCAL_VERTEX_COPY = 0x0080, - MODEL_FLAGS_USE_CAMERA_UNK_MATRIX = 0x0100, - MODEL_FLAGS_FLAG_200 = 0x0200, - MODEL_FLAGS_HAS_TRANSFORM_APPLIED = 0x0400, - MODEL_FLAGS_HAS_TEX_PANNER = 0x0800, - MODEL_FLAGS_USES_TRANSFORM_MATRIX = 0x1000, - MODEL_FLAGS_FLAG_2000 = 0x2000, - MODEL_FLAGS_FLAG_4000 = 0x4000, - MODEL_FLAGS_FLAG_8000 = 0x8000, + MODEL_FLAG_FLAG_1 = 0x0001, + MODEL_FLAG_ENABLED = 0x0002, + MODEL_FLAG_FLAG_4 = 0x0004, + MODEL_FLAG_TRANSFORM_GROUP_MEMBER = 0x0008, + MODEL_FLAG_USES_CUSTOM_GFX = 0x0010, + MODEL_FLAG_FLAG_20 = 0x0020, + MODEL_FLAG_FLAG_40 = 0x0040, + MODEL_FLAG_HAS_LOCAL_VERTEX_COPY = 0x0080, + MODEL_FLAG_USE_CAMERA_UNK_MATRIX = 0x0100, + MODEL_FLAG_FLAG_200 = 0x0200, + MODEL_FLAG_HAS_TRANSFORM_APPLIED = 0x0400, + MODEL_FLAG_HAS_TEX_PANNER = 0x0800, + MODEL_FLAG_USES_TRANSFORM_MATRIX = 0x1000, + MODEL_FLAG_FLAG_2000 = 0x2000, + MODEL_FLAG_FLAG_4000 = 0x4000, + MODEL_FLAG_FLAG_8000 = 0x8000, }; enum TexPanner { @@ -4768,50 +4768,50 @@ enum ModelAnimUnit { }; enum EnemyFlags { - ENEMY_FLAGS_1 = 0x00000001, - ENEMY_FLAGS_2 = 0x00000002, - ENEMY_FLAGS_4 = 0x00000004, - ENEMY_FLAGS_8 = 0x00000008, - ENEMY_FLAGS_FLED = 0x00000010, - ENEMY_FLAGS_20 = 0x00000020, - ENEMY_FLAGS_40 = 0x00000040, - ENEMY_FLAGS_80 = 0x00000080, - ENEMY_FLAGS_100 = 0x00000100, - ENEMY_FLAGS_200 = 0x00000200, - ENEMY_FLAGS_400 = 0x00000400, - ENEMY_FLAGS_800 = 0x00000800, - ENEMY_FLAGS_GRAVITY = 0x00001000, - ENEMY_FLAGS_2000 = 0x00002000, - ENEMY_FLAGS_4000 = 0x00004000, - ENEMY_FLAGS_8000 = 0x00008000, - ENEMY_FLAGS_10000 = 0x00010000, - ENEMY_FLAGS_20000 = 0x00020000, - ENEMY_FLAGS_40000 = 0x00040000, - ENEMY_FLAGS_80000 = 0x00080000, - ENEMY_FLAGS_100000 = 0x00100000, - ENEMY_FLAGS_200000 = 0x00200000, - ENEMY_FLAGS_400000 = 0x00400000, - ENEMY_FLAGS_800000 = 0x00800000, - ENEMY_FLAGS_IGNORE_TOUCH = 0x01000000, - ENEMY_FLAGS_IGNORE_JUMP = 0x02000000, - ENEMY_FLAGS_IGNORE_HAMMER = 0x04000000, - ENEMY_FLAGS_8000000 = 0x08000000, - ENEMY_FLAGS_10000000 = 0x10000000, - ENEMY_FLAGS_20000000 = 0x20000000, - ENEMY_FLAGS_40000000 = 0x40000000, // spawn in AI_STATE_CHASE_INIT - ENEMY_FLAGS_80000000 = 0x80000000, + ENEMY_FLAG_1 = 0x00000001, + ENEMY_FLAG_2 = 0x00000002, + ENEMY_FLAG_4 = 0x00000004, + ENEMY_FLAG_8 = 0x00000008, + ENEMY_FLAG_FLED = 0x00000010, + ENEMY_FLAG_20 = 0x00000020, + ENEMY_FLAG_40 = 0x00000040, + ENEMY_FLAG_80 = 0x00000080, + ENEMY_FLAG_100 = 0x00000100, + ENEMY_FLAG_200 = 0x00000200, + ENEMY_FLAG_400 = 0x00000400, + ENEMY_FLAG_800 = 0x00000800, + ENEMY_FLAG_GRAVITY = 0x00001000, + ENEMY_FLAG_2000 = 0x00002000, + ENEMY_FLAG_4000 = 0x00004000, + ENEMY_FLAG_8000 = 0x00008000, + ENEMY_FLAG_10000 = 0x00010000, + ENEMY_FLAG_20000 = 0x00020000, + ENEMY_FLAG_40000 = 0x00040000, + ENEMY_FLAG_80000 = 0x00080000, + ENEMY_FLAG_100000 = 0x00100000, + ENEMY_FLAG_200000 = 0x00200000, + ENEMY_FLAG_400000 = 0x00400000, + ENEMY_FLAG_800000 = 0x00800000, + ENEMY_FLAG_IGNORE_TOUCH = 0x01000000, + ENEMY_FLAG_IGNORE_JUMP = 0x02000000, + ENEMY_FLAG_IGNORE_HAMMER = 0x04000000, + ENEMY_FLAG_8000000 = 0x08000000, + ENEMY_FLAG_10000000 = 0x10000000, + ENEMY_FLAG_20000000 = 0x20000000, + ENEMY_FLAG_40000000 = 0x40000000, // spawn in AI_STATE_CHASE_INIT + ENEMY_FLAG_80000000 = 0x80000000, }; // used with enemy->aiFlags enum EnemyAIFlags { - ENEMY_AI_FLAGS_1 = 0x00000001, - ENEMY_AI_FLAGS_2 = 0x00000002, // do not move; do not sense player - ENEMY_AI_FLAGS_4 = 0x00000004, // pause ai? reset ai? - ENEMY_AI_FLAGS_8 = 0x00000008, - ENEMY_AI_FLAGS_10 = 0x00000010, - ENEMY_AI_FLAGS_20 = 0x00000020, - ENEMY_AI_FLAGS_40 = 0x00000040, - ENEMY_AI_FLAGS_80 = 0x00000080, + ENEMY_AI_FLAG_1 = 0x00000001, + ENEMY_AI_FLAG_2 = 0x00000002, // do not move; do not sense player + ENEMY_AI_FLAG_4 = 0x00000004, // pause ai? reset ai? + ENEMY_AI_FLAG_8 = 0x00000008, + ENEMY_AI_FLAG_10 = 0x00000010, + ENEMY_AI_FLAG_20 = 0x00000020, + ENEMY_AI_FLAG_40 = 0x00000040, + ENEMY_AI_FLAG_80 = 0x00000080, }; enum EnemyAIStates { @@ -4894,12 +4894,12 @@ enum ProjectileHitboxAttackStates { }; enum MusicSettingsFlags { - MUSIC_SETTINGS_FLAGS_1 = 0x00000001, - MUSIC_SETTINGS_FLAGS_ENABLE_PROXIMITY_MIX = 0x00000002, - MUSIC_SETTINGS_FLAGS_4 = 0x00000004, - MUSIC_SETTINGS_FLAGS_8 = 0x00000008, - MUSIC_SETTINGS_FLAGS_10 = 0x00000010, - MUSIC_SETTINGS_FLAGS_20 = 0x00000020, + MUSIC_SETTINGS_FLAG_1 = 0x00000001, + MUSIC_SETTINGS_FLAG_ENABLE_PROXIMITY_MIX = 0x00000002, + MUSIC_SETTINGS_FLAG_4 = 0x00000004, + MUSIC_SETTINGS_FLAG_8 = 0x00000008, + MUSIC_SETTINGS_FLAG_10 = 0x00000010, + MUSIC_SETTINGS_FLAG_20 = 0x00000020, }; // the lower byte of Collider::flags @@ -4918,7 +4918,7 @@ enum SurfaceType { */ }; -//TODO -- enums temporarily combined for map dumper +//TODO -- temporarily combined with SurfaceType for map data dumper enum ColliderFlags { COLLIDER_FLAGS_UPPER_MASK = 0x7FFFFE00, // map data dumper needs this to be first COLLIDER_FLAGS_SURFACE_TYPE_MASK = 0x000000FF, @@ -4934,11 +4934,11 @@ enum ColliderFlags { SURFACE_TYPE_SPIKES = 2, SURFACE_TYPE_WATER = 1, - COLLIDER_FLAGS_SAFE_FLOOR = 0x00000100, - COLLIDER_FLAGS_IGNORE_SHELL = 0x00008000, - COLLIDER_FLAGS_IGNORE_PLAYER = 0x00010000, - COLLIDER_FLAGS_80000 = 0x00080000, // test version of DOCK walls? - COLLIDER_FLAGS_HAS_MODEL_PARENT = 0x80000000 + COLLIDER_FLAG_SAFE_FLOOR = 0x00000100, + COLLIDER_FLAG_IGNORE_SHELL = 0x00008000, + COLLIDER_FLAG_IGNORE_PLAYER = 0x00010000, + COLLIDER_FLAG_80000 = 0x00080000, // test version of DOCK walls? + COLLIDER_FLAG_HAS_MODEL_PARENT = 0x80000000 }; @@ -4961,79 +4961,79 @@ enum CollisionChannels { }; enum CameraInitDataFlags { - CAMERA_INIT_DATA_FLAGS_1 = 0x00000001, - CAMERA_INIT_DATA_FLAGS_2 = 0x00000002, - CAMERA_INIT_DATA_FLAGS_4 = 0x00000004, - CAMERA_INIT_DATA_FLAGS_8 = 0x00000008, - CAMERA_INIT_DATA_FLAGS_10 = 0x00000010, - CAMERA_INIT_DATA_FLAGS_20 = 0x00000020, - CAMERA_INIT_DATA_FLAGS_40 = 0x00000040, - CAMERA_INIT_DATA_FLAGS_80 = 0x00000080, - CAMERA_INIT_DATA_FLAGS_100 = 0x00000100, - CAMERA_INIT_DATA_FLAGS_200 = 0x00000200, - CAMERA_INIT_DATA_FLAGS_400 = 0x00000400, - CAMERA_INIT_DATA_FLAGS_800 = 0x00000800, - CAMERA_INIT_DATA_FLAGS_1000 = 0x00001000, - CAMERA_INIT_DATA_FLAGS_2000 = 0x00002000, - CAMERA_INIT_DATA_FLAGS_4000 = 0x00004000, - CAMERA_INIT_DATA_FLAGS_8000 = 0x00008000, - CAMERA_INIT_DATA_FLAGS_10000 = 0x00010000, - CAMERA_INIT_DATA_FLAGS_20000 = 0x00020000, - CAMERA_INIT_DATA_FLAGS_40000 = 0x00040000, - CAMERA_INIT_DATA_FLAGS_80000 = 0x00080000, - CAMERA_INIT_DATA_FLAGS_100000 = 0x00100000, - CAMERA_INIT_DATA_FLAGS_200000 = 0x00200000, - CAMERA_INIT_DATA_FLAGS_400000 = 0x00400000, - CAMERA_INIT_DATA_FLAGS_800000 = 0x00800000, - CAMERA_INIT_DATA_FLAGS_1000000 = 0x01000000, - CAMERA_INIT_DATA_FLAGS_2000000 = 0x02000000, - CAMERA_INIT_DATA_FLAGS_4000000 = 0x04000000, - CAMERA_INIT_DATA_FLAGS_8000000 = 0x08000000, - CAMERA_INIT_DATA_FLAGS_10000000 = 0x10000000, - CAMERA_INIT_DATA_FLAGS_20000000 = 0x20000000, - CAMERA_INIT_DATA_FLAGS_40000000 = 0x40000000, - CAMERA_INIT_DATA_FLAGS_80000000 = 0x80000000, + CAMERA_INIT_DATA_FLAG_1 = 0x00000001, + CAMERA_INIT_DATA_FLAG_2 = 0x00000002, + CAMERA_INIT_DATA_FLAG_4 = 0x00000004, + CAMERA_INIT_DATA_FLAG_8 = 0x00000008, + CAMERA_INIT_DATA_FLAG_10 = 0x00000010, + CAMERA_INIT_DATA_FLAG_20 = 0x00000020, + CAMERA_INIT_DATA_FLAG_40 = 0x00000040, + CAMERA_INIT_DATA_FLAG_80 = 0x00000080, + CAMERA_INIT_DATA_FLAG_100 = 0x00000100, + CAMERA_INIT_DATA_FLAG_200 = 0x00000200, + CAMERA_INIT_DATA_FLAG_400 = 0x00000400, + CAMERA_INIT_DATA_FLAG_800 = 0x00000800, + CAMERA_INIT_DATA_FLAG_1000 = 0x00001000, + CAMERA_INIT_DATA_FLAG_2000 = 0x00002000, + CAMERA_INIT_DATA_FLAG_4000 = 0x00004000, + CAMERA_INIT_DATA_FLAG_8000 = 0x00008000, + CAMERA_INIT_DATA_FLAG_10000 = 0x00010000, + CAMERA_INIT_DATA_FLAG_20000 = 0x00020000, + CAMERA_INIT_DATA_FLAG_40000 = 0x00040000, + CAMERA_INIT_DATA_FLAG_80000 = 0x00080000, + CAMERA_INIT_DATA_FLAG_100000 = 0x00100000, + CAMERA_INIT_DATA_FLAG_200000 = 0x00200000, + CAMERA_INIT_DATA_FLAG_400000 = 0x00400000, + CAMERA_INIT_DATA_FLAG_800000 = 0x00800000, + CAMERA_INIT_DATA_FLAG_1000000 = 0x01000000, + CAMERA_INIT_DATA_FLAG_2000000 = 0x02000000, + CAMERA_INIT_DATA_FLAG_4000000 = 0x04000000, + CAMERA_INIT_DATA_FLAG_8000000 = 0x08000000, + CAMERA_INIT_DATA_FLAG_10000000 = 0x10000000, + CAMERA_INIT_DATA_FLAG_20000000 = 0x20000000, + CAMERA_INIT_DATA_FLAG_40000000 = 0x40000000, + CAMERA_INIT_DATA_FLAG_80000000 = 0x80000000, }; enum CameraFlags { - CAMERA_FLAGS_1 = 0x00000001, - CAMERA_FLAGS_ENABLED = 0x00000002, - CAMERA_FLAGS_LEAD_PLAYER = 0x00000004, - CAMERA_FLAGS_SHAKING = 0x00000008, - CAMERA_FLAGS_ORTHO = 0x00000010, - CAMERA_FLAGS_20 = 0x00000020, - CAMERA_FLAGS_40 = 0x00000040, - CAMERA_FLAGS_80 = 0x00000080, - CAMERA_FLAGS_100 = 0x00000100, - CAMERA_FLAGS_RENDER_ENTITIES = 0x00000200, - CAMERA_FLAGS_RENDER_MODELS = 0x00000400, - CAMERA_FLAGS_800 = 0x00000800, - CAMERA_FLAGS_1000 = 0x00001000, - CAMERA_FLAGS_2000 = 0x00002000, - CAMERA_FLAGS_4000 = 0x00004000, - CAMERA_FLAGS_8000 = 0x00008000, - CAMERA_FLAGS_10000 = 0x00010000, - CAMERA_FLAGS_20000 = 0x00020000, - CAMERA_FLAGS_40000 = 0x00040000, - CAMERA_FLAGS_80000 = 0x00080000, - CAMERA_FLAGS_100000 = 0x00100000, - CAMERA_FLAGS_200000 = 0x00200000, - CAMERA_FLAGS_400000 = 0x00400000, - CAMERA_FLAGS_800000 = 0x00800000, - CAMERA_FLAGS_1000000 = 0x01000000, - CAMERA_FLAGS_2000000 = 0x02000000, - CAMERA_FLAGS_4000000 = 0x04000000, - CAMERA_FLAGS_8000000 = 0x08000000, - CAMERA_FLAGS_10000000 = 0x10000000, - CAMERA_FLAGS_20000000 = 0x20000000, - CAMERA_FLAGS_40000000 = 0x40000000, - CAMERA_FLAGS_80000000 = 0x80000000, + CAMERA_FLAG_1 = 0x00000001, + CAMERA_FLAG_ENABLED = 0x00000002, + CAMERA_FLAG_LEAD_PLAYER = 0x00000004, + CAMERA_FLAG_SHAKING = 0x00000008, + CAMERA_FLAG_ORTHO = 0x00000010, + CAMERA_FLAG_20 = 0x00000020, + CAMERA_FLAG_40 = 0x00000040, + CAMERA_FLAG_80 = 0x00000080, + CAMERA_FLAG_100 = 0x00000100, + CAMERA_FLAG_RENDER_ENTITIES = 0x00000200, + CAMERA_FLAG_RENDER_MODELS = 0x00000400, + CAMERA_FLAG_800 = 0x00000800, + CAMERA_FLAG_1000 = 0x00001000, + CAMERA_FLAG_2000 = 0x00002000, + CAMERA_FLAG_4000 = 0x00004000, + CAMERA_FLAG_8000 = 0x00008000, + CAMERA_FLAG_10000 = 0x00010000, + CAMERA_FLAG_20000 = 0x00020000, + CAMERA_FLAG_40000 = 0x00040000, + CAMERA_FLAG_80000 = 0x00080000, + CAMERA_FLAG_100000 = 0x00100000, + CAMERA_FLAG_200000 = 0x00200000, + CAMERA_FLAG_400000 = 0x00400000, + CAMERA_FLAG_800000 = 0x00800000, + CAMERA_FLAG_1000000 = 0x01000000, + CAMERA_FLAG_2000000 = 0x02000000, + CAMERA_FLAG_4000000 = 0x04000000, + CAMERA_FLAG_8000000 = 0x08000000, + CAMERA_FLAG_10000000 = 0x10000000, + CAMERA_FLAG_20000000 = 0x20000000, + CAMERA_FLAG_40000000 = 0x40000000, + CAMERA_FLAG_80000000 = 0x80000000, }; enum CameraMoveFlags { - CAMERA_MOVE_IGNORE_PLAYER_Y = 0x00000001, - CAMERA_MOVE_FLAGS_2 = 0x00000002, - CAMERA_MOVE_FLAGS_4 = 0x00000004 + CAMERA_MOVE_IGNORE_PLAYER_Y = 0x00000001, + CAMERA_MOVE_FLAG_2 = 0x00000002, + CAMERA_MOVE_FLAG_4 = 0x00000004 }; enum CameraSettingsType { @@ -5184,313 +5184,313 @@ enum MoveActionTips { }; enum ModelAnimatorFlags { - MODEL_ANIMATOR_FLAGS_CAM_0 = 0x00000001, - MODEL_ANIMATOR_FLAGS_CAM_1 = 0x00000002, - MODEL_ANIMATOR_FLAGS_CAM_2 = 0x00000004, - MODEL_ANIMATOR_FLAGS_CAM_3 = 0x00000008, - MODEL_ANIMATOR_FLAGS_ENABLED = 0x00000010, - MODEL_ANIMATOR_FLAGS_20 = 0x00000020, - MODEL_ANIMATOR_FLAGS_UPDATE_PENDING = 0x00000040, - MODEL_ANIMATOR_FLAGS_HIDDEN = 0x00000080, - MODEL_ANIMATOR_FLAGS_FLIP_Z = 0x00000100, - MODEL_ANIMATOR_FLAGS_FLIP_Y = 0x00000200, - MODEL_ANIMATOR_FLAGS_FLIP_X = 0x00000400, - MODEL_ANIMATOR_FLAGS_800 = 0x00000800, - MODEL_ANIMATOR_FLAGS_HAS_MODEL = 0x00001000, - MODEL_ANIMATOR_FLAGS_2000 = 0x00002000, - MODEL_ANIMATOR_FLAGS_4000 = 0x00004000, - MODEL_ANIMATOR_FLAGS_MESH = 0x00008000, - MODEL_ANIMATOR_FLAGS_CULL_BACK = 0x00010000, - MODEL_ANIMATOR_FLAGS_NO_FLIP = 0x00020000, - MODEL_ANIMATOR_FLAGS_FREEZE_ANIMATION = 0x00040000, - MODEL_ANIMATOR_FLAGS_80000 = 0x00080000, - MODEL_ANIMATOR_FLAGS_100000 = 0x00100000, - MODEL_ANIMATOR_FLAGS_200000 = 0x00200000, - MODEL_ANIMATOR_FLAGS_400000 = 0x00400000, - MODEL_ANIMATOR_FLAGS_800000 = 0x00800000, - MODEL_ANIMATOR_FLAGS_1000000 = 0x01000000, - MODEL_ANIMATOR_FLAGS_2000000 = 0x02000000, - MODEL_ANIMATOR_FLAGS_4000000 = 0x04000000, - MODEL_ANIMATOR_FLAGS_8000000 = 0x08000000, - MODEL_ANIMATOR_FLAGS_10000000 = 0x10000000, - MODEL_ANIMATOR_FLAGS_20000000 = 0x20000000, - MODEL_ANIMATOR_FLAGS_40000000 = 0x40000000, - MODEL_ANIMATOR_FLAGS_80000000 = 0x80000000, + MODEL_ANIMATOR_FLAG_CAM_0 = 0x00000001, + MODEL_ANIMATOR_FLAG_CAM_1 = 0x00000002, + MODEL_ANIMATOR_FLAG_CAM_2 = 0x00000004, + MODEL_ANIMATOR_FLAG_CAM_3 = 0x00000008, + MODEL_ANIMATOR_FLAG_ENABLED = 0x00000010, + MODEL_ANIMATOR_FLAG_20 = 0x00000020, + MODEL_ANIMATOR_FLAG_UPDATE_PENDING = 0x00000040, + MODEL_ANIMATOR_FLAG_HIDDEN = 0x00000080, + MODEL_ANIMATOR_FLAG_FLIP_Z = 0x00000100, + MODEL_ANIMATOR_FLAG_FLIP_Y = 0x00000200, + MODEL_ANIMATOR_FLAG_FLIP_X = 0x00000400, + MODEL_ANIMATOR_FLAG_800 = 0x00000800, + MODEL_ANIMATOR_FLAG_HAS_MODEL = 0x00001000, + MODEL_ANIMATOR_FLAG_2000 = 0x00002000, + MODEL_ANIMATOR_FLAG_4000 = 0x00004000, + MODEL_ANIMATOR_FLAG_MESH = 0x00008000, + MODEL_ANIMATOR_FLAG_CULL_BACK = 0x00010000, + MODEL_ANIMATOR_FLAG_NO_FLIP = 0x00020000, + MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION = 0x00040000, + MODEL_ANIMATOR_FLAG_80000 = 0x00080000, + MODEL_ANIMATOR_FLAG_100000 = 0x00100000, + MODEL_ANIMATOR_FLAG_200000 = 0x00200000, + MODEL_ANIMATOR_FLAG_400000 = 0x00400000, + MODEL_ANIMATOR_FLAG_800000 = 0x00800000, + MODEL_ANIMATOR_FLAG_1000000 = 0x01000000, + MODEL_ANIMATOR_FLAG_2000000 = 0x02000000, + MODEL_ANIMATOR_FLAG_4000000 = 0x04000000, + MODEL_ANIMATOR_FLAG_8000000 = 0x08000000, + MODEL_ANIMATOR_FLAG_10000000 = 0x10000000, + MODEL_ANIMATOR_FLAG_20000000 = 0x20000000, + MODEL_ANIMATOR_FLAG_40000000 = 0x40000000, + MODEL_ANIMATOR_FLAG_80000000 = 0x80000000, }; enum ShopFlags { - SHOP_FLAGS_0 = 0x00000000, - SHOP_FLAGS_1 = 0x00000001, - SHOP_FLAGS_2 = 0x00000002, - SHOP_FLAGS_4 = 0x00000004, - SHOP_FLAGS_8 = 0x00000008, - SHOP_FLAGS_10 = 0x00000010, - SHOP_FLAGS_20 = 0x00000020, - SHOP_FLAGS_40 = 0x00000040, - SHOP_FLAGS_80 = 0x00000080, - SHOP_FLAGS_100 = 0x00000100, - SHOP_FLAGS_200 = 0x00000200, - SHOP_FLAGS_400 = 0x00000400, - SHOP_FLAGS_800 = 0x00000800, - SHOP_FLAGS_1000 = 0x00001000, - SHOP_FLAGS_2000 = 0x00002000, - SHOP_FLAGS_4000 = 0x00004000, - SHOP_FLAGS_8000 = 0x00008000, - SHOP_FLAGS_10000 = 0x00010000, - SHOP_FLAGS_20000 = 0x00020000, - SHOP_FLAGS_40000 = 0x00040000, - SHOP_FLAGS_80000 = 0x00080000, - SHOP_FLAGS_100000 = 0x00100000, - SHOP_FLAGS_200000 = 0x00200000, - SHOP_FLAGS_400000 = 0x00400000, - SHOP_FLAGS_800000 = 0x00800000, - SHOP_FLAGS_1000000 = 0x01000000, - SHOP_FLAGS_2000000 = 0x02000000, - SHOP_FLAGS_4000000 = 0x04000000, - SHOP_FLAGS_8000000 = 0x08000000, - SHOP_FLAGS_10000000 = 0x10000000, - SHOP_FLAGS_20000000 = 0x20000000, - SHOP_FLAGS_40000000 = 0x40000000, - SHOP_FLAGS_80000000 = 0x80000000, + SHOP_FLAG_0 = 0x00000000, + SHOP_FLAG_1 = 0x00000001, + SHOP_FLAG_2 = 0x00000002, + SHOP_FLAG_4 = 0x00000004, + SHOP_FLAG_8 = 0x00000008, + SHOP_FLAG_10 = 0x00000010, + SHOP_FLAG_20 = 0x00000020, + SHOP_FLAG_40 = 0x00000040, + SHOP_FLAG_80 = 0x00000080, + SHOP_FLAG_100 = 0x00000100, + SHOP_FLAG_200 = 0x00000200, + SHOP_FLAG_400 = 0x00000400, + SHOP_FLAG_800 = 0x00000800, + SHOP_FLAG_1000 = 0x00001000, + SHOP_FLAG_2000 = 0x00002000, + SHOP_FLAG_4000 = 0x00004000, + SHOP_FLAG_8000 = 0x00008000, + SHOP_FLAG_10000 = 0x00010000, + SHOP_FLAG_20000 = 0x00020000, + SHOP_FLAG_40000 = 0x00040000, + SHOP_FLAG_80000 = 0x00080000, + SHOP_FLAG_100000 = 0x00100000, + SHOP_FLAG_200000 = 0x00200000, + SHOP_FLAG_400000 = 0x00400000, + SHOP_FLAG_800000 = 0x00800000, + SHOP_FLAG_1000000 = 0x01000000, + SHOP_FLAG_2000000 = 0x02000000, + SHOP_FLAG_4000000 = 0x04000000, + SHOP_FLAG_8000000 = 0x08000000, + SHOP_FLAG_10000000 = 0x10000000, + SHOP_FLAG_20000000 = 0x20000000, + SHOP_FLAG_40000000 = 0x40000000, + SHOP_FLAG_80000000 = 0x80000000, }; enum EncounterStatusFlags { - ENCOUNTER_STATUS_FLAGS_0 = 0x00000000, - ENCOUNTER_STATUS_FLAGS_1 = 0x00000001, - ENCOUNTER_STATUS_FLAGS_2 = 0x00000002, - ENCOUNTER_STATUS_FLAGS_4 = 0x00000004, - ENCOUNTER_STATUS_FLAGS_8 = 0x00000008, - ENCOUNTER_STATUS_FLAGS_10 = 0x00000010, - ENCOUNTER_STATUS_FLAGS_20 = 0x00000020, - ENCOUNTER_STATUS_FLAGS_40 = 0x00000040, - ENCOUNTER_STATUS_FLAGS_80 = 0x00000080, - ENCOUNTER_STATUS_FLAGS_100 = 0x00000100, - ENCOUNTER_STATUS_FLAGS_200 = 0x00000200, - ENCOUNTER_STATUS_FLAGS_400 = 0x00000400, - ENCOUNTER_STATUS_FLAGS_800 = 0x00000800, - ENCOUNTER_STATUS_FLAGS_1000 = 0x00001000, - ENCOUNTER_STATUS_FLAGS_2000 = 0x00002000, - ENCOUNTER_STATUS_FLAGS_4000 = 0x00004000, - ENCOUNTER_STATUS_FLAGS_8000 = 0x00008000, - ENCOUNTER_STATUS_FLAGS_10000 = 0x00010000, - ENCOUNTER_STATUS_FLAGS_20000 = 0x00020000, - ENCOUNTER_STATUS_FLAGS_40000 = 0x00040000, - ENCOUNTER_STATUS_FLAGS_80000 = 0x00080000, - ENCOUNTER_STATUS_FLAGS_100000 = 0x00100000, - ENCOUNTER_STATUS_FLAGS_200000 = 0x00200000, - ENCOUNTER_STATUS_FLAGS_400000 = 0x00400000, - ENCOUNTER_STATUS_FLAGS_800000 = 0x00800000, - ENCOUNTER_STATUS_FLAGS_1000000 = 0x01000000, - ENCOUNTER_STATUS_FLAGS_2000000 = 0x02000000, - ENCOUNTER_STATUS_FLAGS_4000000 = 0x04000000, - ENCOUNTER_STATUS_FLAGS_8000000 = 0x08000000, - ENCOUNTER_STATUS_FLAGS_10000000 = 0x10000000, - ENCOUNTER_STATUS_FLAGS_20000000 = 0x20000000, - ENCOUNTER_STATUS_FLAGS_40000000 = 0x40000000, - ENCOUNTER_STATUS_FLAGS_80000000 = 0x80000000, + 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 WindowFlags { - WINDOW_FLAGS_INITIALIZED = 0x00000001, - WINDOW_FLAGS_FPUPDATE_CHANGED = 0x00000002, - WINDOW_FLAGS_HIDDEN = 0x00000004, ///< Updated but not rendered - WINDOW_FLAGS_INITIAL_ANIMATION = 0x00000008, - WINDOW_FLAGS_HAS_CHILDREN = 0x00000010, - WINDOW_FLAGS_DISABLED = 0x00000020, ///< Not updated or rendered - WINDOW_FLAGS_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 { - DRAW_FLAGS_ROTSCALE = 0x00000001, - DRAW_FLAGS_ANIMATED_BACKGROUND = 0x00000002, - DRAW_FLAGS_NO_CLIP = 0x00000004, - DRAW_FLAGS_CULL_BACK = 0x00000008, + DRAW_FLAG_ROTSCALE = 0x00000001, + DRAW_FLAG_ANIMATED_BACKGROUND = 0x00000002, + DRAW_FLAG_NO_CLIP = 0x00000004, + DRAW_FLAG_CULL_BACK = 0x00000008, }; enum EntityModelFlags { - ENTITY_MODEL_FLAGS_CAM0 = 0x00000001, - ENTITY_MODEL_FLAGS_CAM1 = 0x00000002, - ENTITY_MODEL_FLAGS_CAM2 = 0x00000004, - ENTITY_MODEL_FLAGS_CAM3 = 0x00000008, - ENTITY_MODEL_FLAGS_ENABLED = 0x00000010, - ENTITY_MODEL_FLAGS_HIDDEN = 0x00000020, - ENTITY_MODEL_FLAGS_40 = 0x00000040, - ENTITY_MODEL_FLAGS_80 = 0x00000080, - ENTITY_MODEL_FLAGS_100 = 0x00000100, - ENTITY_MODEL_FLAGS_REFLECT = 0x00000200, - ENTITY_MODEL_FLAGS_USE_IMAGE = 0x00000400, - ENTITY_MODEL_FLAGS_FOG_DISABLED = 0x00000800, - ENTITY_MODEL_FLAGS_1000 = 0x00001000, - ENTITY_MODEL_FLAGS_2000 = 0x00002000, - ENTITY_MODEL_FLAGS_4000 = 0x00004000, - ENTITY_MODEL_FLAGS_8000 = 0x00008000, - ENTITY_MODEL_FLAGS_10000 = 0x00010000, - ENTITY_MODEL_FLAGS_DISABLE_SCRIPT = 0x00020000, - ENTITY_MODEL_FLAGS_40000 = 0x00040000, - ENTITY_MODEL_FLAGS_80000 = 0x00080000, - ENTITY_MODEL_FLAGS_100000 = 0x00100000, - ENTITY_MODEL_FLAGS_200000 = 0x00200000, - ENTITY_MODEL_FLAGS_400000 = 0x00400000, - ENTITY_MODEL_FLAGS_800000 = 0x00800000, - ENTITY_MODEL_FLAGS_1000000 = 0x01000000, - ENTITY_MODEL_FLAGS_2000000 = 0x02000000, - ENTITY_MODEL_FLAGS_4000000 = 0x04000000, - ENTITY_MODEL_FLAGS_8000000 = 0x08000000, - ENTITY_MODEL_FLAGS_10000000 = 0x10000000, - ENTITY_MODEL_FLAGS_20000000 = 0x20000000, - ENTITY_MODEL_FLAGS_40000000 = 0x40000000, - ENTITY_MODEL_FLAGS_80000000 = 0x80000000, + ENTITY_MODEL_FLAG_CAM0 = 0x00000001, + ENTITY_MODEL_FLAG_CAM1 = 0x00000002, + ENTITY_MODEL_FLAG_CAM2 = 0x00000004, + ENTITY_MODEL_FLAG_CAM3 = 0x00000008, + ENTITY_MODEL_FLAG_ENABLED = 0x00000010, + ENTITY_MODEL_FLAG_HIDDEN = 0x00000020, + ENTITY_MODEL_FLAG_40 = 0x00000040, + ENTITY_MODEL_FLAG_80 = 0x00000080, + ENTITY_MODEL_FLAG_100 = 0x00000100, + ENTITY_MODEL_FLAG_REFLECT = 0x00000200, + ENTITY_MODEL_FLAG_USE_IMAGE = 0x00000400, + ENTITY_MODEL_FLAG_FOG_DISABLED = 0x00000800, + ENTITY_MODEL_FLAG_1000 = 0x00001000, + ENTITY_MODEL_FLAG_2000 = 0x00002000, + ENTITY_MODEL_FLAG_4000 = 0x00004000, + ENTITY_MODEL_FLAG_8000 = 0x00008000, + ENTITY_MODEL_FLAG_10000 = 0x00010000, + ENTITY_MODEL_FLAG_DISABLE_SCRIPT = 0x00020000, + ENTITY_MODEL_FLAG_40000 = 0x00040000, + ENTITY_MODEL_FLAG_80000 = 0x00080000, + ENTITY_MODEL_FLAG_100000 = 0x00100000, + ENTITY_MODEL_FLAG_200000 = 0x00200000, + ENTITY_MODEL_FLAG_400000 = 0x00400000, + ENTITY_MODEL_FLAG_800000 = 0x00800000, + ENTITY_MODEL_FLAG_1000000 = 0x01000000, + ENTITY_MODEL_FLAG_2000000 = 0x02000000, + ENTITY_MODEL_FLAG_4000000 = 0x04000000, + ENTITY_MODEL_FLAG_8000000 = 0x08000000, + ENTITY_MODEL_FLAG_10000000 = 0x10000000, + ENTITY_MODEL_FLAG_20000000 = 0x20000000, + ENTITY_MODEL_FLAG_40000000 = 0x40000000, + ENTITY_MODEL_FLAG_80000000 = 0x80000000, }; enum TempSetZoneEnabledFlags { - TEMP_SET_ZONE_ENABLED_FLAGS_1 = 0x00000001, - TEMP_SET_ZONE_ENABLED_FLAGS_2 = 0x00000002, - TEMP_SET_ZONE_ENABLED_FLAGS_4 = 0x00000004, - TEMP_SET_ZONE_ENABLED_FLAGS_8 = 0x00000008, - TEMP_SET_ZONE_ENABLED_FLAGS_10 = 0x00000010, - TEMP_SET_ZONE_ENABLED_FLAGS_20 = 0x00000020, - TEMP_SET_ZONE_ENABLED_FLAGS_40 = 0x00000040, - TEMP_SET_ZONE_ENABLED_FLAGS_80 = 0x00000080, - TEMP_SET_ZONE_ENABLED_FLAGS_100 = 0x00000100, - TEMP_SET_ZONE_ENABLED_FLAGS_200 = 0x00000200, - TEMP_SET_ZONE_ENABLED_FLAGS_400 = 0x00000400, - TEMP_SET_ZONE_ENABLED_FLAGS_800 = 0x00000800, - TEMP_SET_ZONE_ENABLED_FLAGS_1000 = 0x00001000, - TEMP_SET_ZONE_ENABLED_FLAGS_2000 = 0x00002000, - TEMP_SET_ZONE_ENABLED_FLAGS_4000 = 0x00004000, - TEMP_SET_ZONE_ENABLED_FLAGS_8000 = 0x00008000, - TEMP_SET_ZONE_ENABLED_FLAGS_10000 = 0x00010000, - TEMP_SET_ZONE_ENABLED_FLAGS_20000 = 0x00020000, - TEMP_SET_ZONE_ENABLED_FLAGS_40000 = 0x00040000, - TEMP_SET_ZONE_ENABLED_FLAGS_80000 = 0x00080000, - TEMP_SET_ZONE_ENABLED_FLAGS_100000 = 0x00100000, - TEMP_SET_ZONE_ENABLED_FLAGS_200000 = 0x00200000, - TEMP_SET_ZONE_ENABLED_FLAGS_400000 = 0x00400000, - TEMP_SET_ZONE_ENABLED_FLAGS_800000 = 0x00800000, - TEMP_SET_ZONE_ENABLED_FLAGS_1000000 = 0x01000000, - TEMP_SET_ZONE_ENABLED_FLAGS_2000000 = 0x02000000, - TEMP_SET_ZONE_ENABLED_FLAGS_4000000 = 0x04000000, - TEMP_SET_ZONE_ENABLED_FLAGS_8000000 = 0x08000000, - TEMP_SET_ZONE_ENABLED_FLAGS_10000000 = 0x10000000, - TEMP_SET_ZONE_ENABLED_FLAGS_20000000 = 0x20000000, - TEMP_SET_ZONE_ENABLED_FLAGS_40000000 = 0x40000000, - TEMP_SET_ZONE_ENABLED_FLAGS_80000000 = 0x80000000, + TEMP_SET_ZONE_ENABLED_FLAG_1 = 0x00000001, + TEMP_SET_ZONE_ENABLED_FLAG_2 = 0x00000002, + TEMP_SET_ZONE_ENABLED_FLAG_4 = 0x00000004, + TEMP_SET_ZONE_ENABLED_FLAG_8 = 0x00000008, + TEMP_SET_ZONE_ENABLED_FLAG_10 = 0x00000010, + TEMP_SET_ZONE_ENABLED_FLAG_20 = 0x00000020, + TEMP_SET_ZONE_ENABLED_FLAG_40 = 0x00000040, + TEMP_SET_ZONE_ENABLED_FLAG_80 = 0x00000080, + TEMP_SET_ZONE_ENABLED_FLAG_100 = 0x00000100, + TEMP_SET_ZONE_ENABLED_FLAG_200 = 0x00000200, + TEMP_SET_ZONE_ENABLED_FLAG_400 = 0x00000400, + TEMP_SET_ZONE_ENABLED_FLAG_800 = 0x00000800, + TEMP_SET_ZONE_ENABLED_FLAG_1000 = 0x00001000, + TEMP_SET_ZONE_ENABLED_FLAG_2000 = 0x00002000, + TEMP_SET_ZONE_ENABLED_FLAG_4000 = 0x00004000, + TEMP_SET_ZONE_ENABLED_FLAG_8000 = 0x00008000, + TEMP_SET_ZONE_ENABLED_FLAG_10000 = 0x00010000, + TEMP_SET_ZONE_ENABLED_FLAG_20000 = 0x00020000, + TEMP_SET_ZONE_ENABLED_FLAG_40000 = 0x00040000, + TEMP_SET_ZONE_ENABLED_FLAG_80000 = 0x00080000, + TEMP_SET_ZONE_ENABLED_FLAG_100000 = 0x00100000, + TEMP_SET_ZONE_ENABLED_FLAG_200000 = 0x00200000, + TEMP_SET_ZONE_ENABLED_FLAG_400000 = 0x00400000, + TEMP_SET_ZONE_ENABLED_FLAG_800000 = 0x00800000, + TEMP_SET_ZONE_ENABLED_FLAG_1000000 = 0x01000000, + TEMP_SET_ZONE_ENABLED_FLAG_2000000 = 0x02000000, + TEMP_SET_ZONE_ENABLED_FLAG_4000000 = 0x04000000, + TEMP_SET_ZONE_ENABLED_FLAG_8000000 = 0x08000000, + TEMP_SET_ZONE_ENABLED_FLAG_10000000 = 0x10000000, + TEMP_SET_ZONE_ENABLED_FLAG_20000000 = 0x20000000, + TEMP_SET_ZONE_ENABLED_FLAG_40000000 = 0x40000000, + TEMP_SET_ZONE_ENABLED_FLAG_80000000 = 0x80000000, }; enum EffectInstanceFlags { - EFFECT_INSTANCE_FLAGS_1 = 0x00000001, - EFFECT_INSTANCE_FLAGS_2 = 0x00000002, - EFFECT_INSTANCE_FLAGS_4 = 0x00000004, - EFFECT_INSTANCE_FLAGS_8 = 0x00000008, - EFFECT_INSTANCE_FLAGS_10 = 0x00000010, // mark ready for cleanup - EFFECT_INSTANCE_FLAGS_20 = 0x00000020, - EFFECT_INSTANCE_FLAGS_40 = 0x00000040, - EFFECT_INSTANCE_FLAGS_80 = 0x00000080, - EFFECT_INSTANCE_FLAGS_100 = 0x00000100, - EFFECT_INSTANCE_FLAGS_200 = 0x00000200, - EFFECT_INSTANCE_FLAGS_400 = 0x00000400, - EFFECT_INSTANCE_FLAGS_800 = 0x00000800, - EFFECT_INSTANCE_FLAGS_1000 = 0x00001000, - EFFECT_INSTANCE_FLAGS_2000 = 0x00002000, - EFFECT_INSTANCE_FLAGS_4000 = 0x00004000, - EFFECT_INSTANCE_FLAGS_8000 = 0x00008000, - EFFECT_INSTANCE_FLAGS_10000 = 0x00010000, - EFFECT_INSTANCE_FLAGS_20000 = 0x00020000, - EFFECT_INSTANCE_FLAGS_40000 = 0x00040000, - EFFECT_INSTANCE_FLAGS_80000 = 0x00080000, - EFFECT_INSTANCE_FLAGS_100000 = 0x00100000, - EFFECT_INSTANCE_FLAGS_200000 = 0x00200000, - EFFECT_INSTANCE_FLAGS_400000 = 0x00400000, - EFFECT_INSTANCE_FLAGS_800000 = 0x00800000, - EFFECT_INSTANCE_FLAGS_1000000 = 0x01000000, - EFFECT_INSTANCE_FLAGS_2000000 = 0x02000000, - EFFECT_INSTANCE_FLAGS_4000000 = 0x04000000, - EFFECT_INSTANCE_FLAGS_8000000 = 0x08000000, - EFFECT_INSTANCE_FLAGS_10000000 = 0x10000000, - EFFECT_INSTANCE_FLAGS_20000000 = 0x20000000, - EFFECT_INSTANCE_FLAGS_40000000 = 0x40000000, - EFFECT_INSTANCE_FLAGS_80000000 = 0x80000000, + EFFECT_INSTANCE_FLAG_1 = 0x00000001, + EFFECT_INSTANCE_FLAG_2 = 0x00000002, + EFFECT_INSTANCE_FLAG_4 = 0x00000004, + EFFECT_INSTANCE_FLAG_8 = 0x00000008, + EFFECT_INSTANCE_FLAG_10 = 0x00000010, // mark ready for cleanup + EFFECT_INSTANCE_FLAG_20 = 0x00000020, + EFFECT_INSTANCE_FLAG_40 = 0x00000040, + EFFECT_INSTANCE_FLAG_80 = 0x00000080, + EFFECT_INSTANCE_FLAG_100 = 0x00000100, + EFFECT_INSTANCE_FLAG_200 = 0x00000200, + EFFECT_INSTANCE_FLAG_400 = 0x00000400, + EFFECT_INSTANCE_FLAG_800 = 0x00000800, + EFFECT_INSTANCE_FLAG_1000 = 0x00001000, + EFFECT_INSTANCE_FLAG_2000 = 0x00002000, + EFFECT_INSTANCE_FLAG_4000 = 0x00004000, + EFFECT_INSTANCE_FLAG_8000 = 0x00008000, + EFFECT_INSTANCE_FLAG_10000 = 0x00010000, + EFFECT_INSTANCE_FLAG_20000 = 0x00020000, + EFFECT_INSTANCE_FLAG_40000 = 0x00040000, + EFFECT_INSTANCE_FLAG_80000 = 0x00080000, + EFFECT_INSTANCE_FLAG_100000 = 0x00100000, + EFFECT_INSTANCE_FLAG_200000 = 0x00200000, + EFFECT_INSTANCE_FLAG_400000 = 0x00400000, + EFFECT_INSTANCE_FLAG_800000 = 0x00800000, + EFFECT_INSTANCE_FLAG_1000000 = 0x01000000, + EFFECT_INSTANCE_FLAG_2000000 = 0x02000000, + EFFECT_INSTANCE_FLAG_4000000 = 0x04000000, + EFFECT_INSTANCE_FLAG_8000000 = 0x08000000, + EFFECT_INSTANCE_FLAG_10000000 = 0x10000000, + EFFECT_INSTANCE_FLAG_20000000 = 0x20000000, + EFFECT_INSTANCE_FLAG_40000000 = 0x40000000, + EFFECT_INSTANCE_FLAG_80000000 = 0x80000000, }; enum ModelTransformGroupFlags { - MODEL_TRANSFORM_GROUP_FLAGS_1 = 0x00000001, - MODEL_TRANSFORM_GROUP_FLAGS_2 = 0x00000002, - MODEL_TRANSFORM_GROUP_FLAGS_4 = 0x00000004, - MODEL_TRANSFORM_GROUP_FLAGS_8 = 0x00000008, - MODEL_TRANSFORM_GROUP_FLAGS_10 = 0x00000010, - MODEL_TRANSFORM_GROUP_FLAGS_20 = 0x00000020, - MODEL_TRANSFORM_GROUP_FLAGS_40 = 0x00000040, - MODEL_TRANSFORM_GROUP_FLAGS_80 = 0x00000080, - MODEL_TRANSFORM_GROUP_FLAGS_100 = 0x00000100, - MODEL_TRANSFORM_GROUP_FLAGS_200 = 0x00000200, - MODEL_TRANSFORM_GROUP_FLAGS_400 = 0x00000400, - MODEL_TRANSFORM_GROUP_FLAGS_800 = 0x00000800, - MODEL_TRANSFORM_GROUP_FLAGS_1000 = 0x00001000, - MODEL_TRANSFORM_GROUP_FLAGS_2000 = 0x00002000, - MODEL_TRANSFORM_GROUP_FLAGS_4000 = 0x00004000, - MODEL_TRANSFORM_GROUP_FLAGS_8000 = 0x00008000, - MODEL_TRANSFORM_GROUP_FLAGS_10000 = 0x00010000, - MODEL_TRANSFORM_GROUP_FLAGS_20000 = 0x00020000, - MODEL_TRANSFORM_GROUP_FLAGS_40000 = 0x00040000, - MODEL_TRANSFORM_GROUP_FLAGS_80000 = 0x00080000, - MODEL_TRANSFORM_GROUP_FLAGS_100000 = 0x00100000, - MODEL_TRANSFORM_GROUP_FLAGS_200000 = 0x00200000, - MODEL_TRANSFORM_GROUP_FLAGS_400000 = 0x00400000, - MODEL_TRANSFORM_GROUP_FLAGS_800000 = 0x00800000, - MODEL_TRANSFORM_GROUP_FLAGS_1000000 = 0x01000000, - MODEL_TRANSFORM_GROUP_FLAGS_2000000 = 0x02000000, - MODEL_TRANSFORM_GROUP_FLAGS_4000000 = 0x04000000, - MODEL_TRANSFORM_GROUP_FLAGS_8000000 = 0x08000000, - MODEL_TRANSFORM_GROUP_FLAGS_10000000 = 0x10000000, - MODEL_TRANSFORM_GROUP_FLAGS_20000000 = 0x20000000, - MODEL_TRANSFORM_GROUP_FLAGS_40000000 = 0x40000000, - MODEL_TRANSFORM_GROUP_FLAGS_80000000 = 0x80000000, + MODEL_TRANSFORM_GROUP_FLAG_1 = 0x00000001, + MODEL_TRANSFORM_GROUP_FLAG_2 = 0x00000002, + MODEL_TRANSFORM_GROUP_FLAG_4 = 0x00000004, + MODEL_TRANSFORM_GROUP_FLAG_8 = 0x00000008, + MODEL_TRANSFORM_GROUP_FLAG_10 = 0x00000010, + MODEL_TRANSFORM_GROUP_FLAG_20 = 0x00000020, + MODEL_TRANSFORM_GROUP_FLAG_40 = 0x00000040, + MODEL_TRANSFORM_GROUP_FLAG_80 = 0x00000080, + MODEL_TRANSFORM_GROUP_FLAG_100 = 0x00000100, + MODEL_TRANSFORM_GROUP_FLAG_200 = 0x00000200, + MODEL_TRANSFORM_GROUP_FLAG_400 = 0x00000400, + MODEL_TRANSFORM_GROUP_FLAG_800 = 0x00000800, + MODEL_TRANSFORM_GROUP_FLAG_1000 = 0x00001000, + MODEL_TRANSFORM_GROUP_FLAG_2000 = 0x00002000, + MODEL_TRANSFORM_GROUP_FLAG_4000 = 0x00004000, + MODEL_TRANSFORM_GROUP_FLAG_8000 = 0x00008000, + MODEL_TRANSFORM_GROUP_FLAG_10000 = 0x00010000, + MODEL_TRANSFORM_GROUP_FLAG_20000 = 0x00020000, + MODEL_TRANSFORM_GROUP_FLAG_40000 = 0x00040000, + MODEL_TRANSFORM_GROUP_FLAG_80000 = 0x00080000, + MODEL_TRANSFORM_GROUP_FLAG_100000 = 0x00100000, + MODEL_TRANSFORM_GROUP_FLAG_200000 = 0x00200000, + MODEL_TRANSFORM_GROUP_FLAG_400000 = 0x00400000, + MODEL_TRANSFORM_GROUP_FLAG_800000 = 0x00800000, + MODEL_TRANSFORM_GROUP_FLAG_1000000 = 0x01000000, + MODEL_TRANSFORM_GROUP_FLAG_2000000 = 0x02000000, + MODEL_TRANSFORM_GROUP_FLAG_4000000 = 0x04000000, + MODEL_TRANSFORM_GROUP_FLAG_8000000 = 0x08000000, + MODEL_TRANSFORM_GROUP_FLAG_10000000 = 0x10000000, + MODEL_TRANSFORM_GROUP_FLAG_20000000 = 0x20000000, + MODEL_TRANSFORM_GROUP_FLAG_40000000 = 0x40000000, + MODEL_TRANSFORM_GROUP_FLAG_80000000 = 0x80000000, }; enum NpcDropFlags { - NPC_DROP_FLAGS_1 = 0x01, - NPC_DROP_FLAGS_2 = 0x02, - NPC_DROP_FLAGS_4 = 0x04, - NPC_DROP_FLAGS_8 = 0x08, - NPC_DROP_FLAGS_10 = 0x10, - NPC_DROP_FLAGS_20 = 0x20, - NPC_DROP_FLAGS_40 = 0x40, - NPC_DROP_FLAGS_80 = 0x80, + NPC_DROP_FLAG_1 = 0x01, + NPC_DROP_FLAG_2 = 0x02, + NPC_DROP_FLAG_4 = 0x04, + NPC_DROP_FLAG_8 = 0x08, + NPC_DROP_FLAG_10 = 0x10, + NPC_DROP_FLAG_20 = 0x20, + NPC_DROP_FLAG_40 = 0x40, + NPC_DROP_FLAG_80 = 0x80, }; enum ElementImmunityFlags { - ELEMENT_IMMUNITY_FLAGS_1 = 0x00000001, - ELEMENT_IMMUNITY_FLAGS_2 = 0x00000002, - ELEMENT_IMMUNITY_FLAGS_4 = 0x00000004, - ELEMENT_IMMUNITY_FLAGS_8 = 0x00000008, - ELEMENT_IMMUNITY_FLAGS_10 = 0x00000010, - ELEMENT_IMMUNITY_FLAGS_20 = 0x00000020, - ELEMENT_IMMUNITY_FLAGS_40 = 0x00000040, - ELEMENT_IMMUNITY_FLAGS_80 = 0x00000080, - ELEMENT_IMMUNITY_FLAGS_100 = 0x00000100, - ELEMENT_IMMUNITY_FLAGS_200 = 0x00000200, - ELEMENT_IMMUNITY_FLAGS_400 = 0x00000400, - ELEMENT_IMMUNITY_FLAGS_800 = 0x00000800, - ELEMENT_IMMUNITY_FLAGS_1000 = 0x00001000, - ELEMENT_IMMUNITY_FLAGS_2000 = 0x00002000, - ELEMENT_IMMUNITY_FLAGS_4000 = 0x00004000, - ELEMENT_IMMUNITY_FLAGS_8000 = 0x00008000, - ELEMENT_IMMUNITY_FLAGS_10000 = 0x00010000, - ELEMENT_IMMUNITY_FLAGS_20000 = 0x00020000, - ELEMENT_IMMUNITY_FLAGS_40000 = 0x00040000, - ELEMENT_IMMUNITY_FLAGS_80000 = 0x00080000, - ELEMENT_IMMUNITY_FLAGS_100000 = 0x00100000, - ELEMENT_IMMUNITY_FLAGS_200000 = 0x00200000, - ELEMENT_IMMUNITY_FLAGS_400000 = 0x00400000, - ELEMENT_IMMUNITY_FLAGS_800000 = 0x00800000, - ELEMENT_IMMUNITY_FLAGS_1000000 = 0x01000000, - ELEMENT_IMMUNITY_FLAGS_2000000 = 0x02000000, - ELEMENT_IMMUNITY_FLAGS_4000000 = 0x04000000, - ELEMENT_IMMUNITY_FLAGS_8000000 = 0x08000000, - ELEMENT_IMMUNITY_FLAGS_10000000 = 0x10000000, - ELEMENT_IMMUNITY_FLAGS_20000000 = 0x20000000, - ELEMENT_IMMUNITY_FLAGS_40000000 = 0x40000000, - ELEMENT_IMMUNITY_FLAGS_80000000 = 0x80000000, + ELEMENT_IMMUNITY_FLAG_1 = 0x00000001, + ELEMENT_IMMUNITY_FLAG_2 = 0x00000002, + ELEMENT_IMMUNITY_FLAG_4 = 0x00000004, + ELEMENT_IMMUNITY_FLAG_8 = 0x00000008, + ELEMENT_IMMUNITY_FLAG_10 = 0x00000010, + ELEMENT_IMMUNITY_FLAG_20 = 0x00000020, + ELEMENT_IMMUNITY_FLAG_40 = 0x00000040, + ELEMENT_IMMUNITY_FLAG_80 = 0x00000080, + ELEMENT_IMMUNITY_FLAG_100 = 0x00000100, + ELEMENT_IMMUNITY_FLAG_200 = 0x00000200, + ELEMENT_IMMUNITY_FLAG_400 = 0x00000400, + ELEMENT_IMMUNITY_FLAG_800 = 0x00000800, + ELEMENT_IMMUNITY_FLAG_1000 = 0x00001000, + ELEMENT_IMMUNITY_FLAG_2000 = 0x00002000, + ELEMENT_IMMUNITY_FLAG_4000 = 0x00004000, + ELEMENT_IMMUNITY_FLAG_8000 = 0x00008000, + ELEMENT_IMMUNITY_FLAG_10000 = 0x00010000, + ELEMENT_IMMUNITY_FLAG_20000 = 0x00020000, + ELEMENT_IMMUNITY_FLAG_40000 = 0x00040000, + ELEMENT_IMMUNITY_FLAG_80000 = 0x00080000, + ELEMENT_IMMUNITY_FLAG_100000 = 0x00100000, + ELEMENT_IMMUNITY_FLAG_200000 = 0x00200000, + ELEMENT_IMMUNITY_FLAG_400000 = 0x00400000, + ELEMENT_IMMUNITY_FLAG_800000 = 0x00800000, + ELEMENT_IMMUNITY_FLAG_1000000 = 0x01000000, + ELEMENT_IMMUNITY_FLAG_2000000 = 0x02000000, + ELEMENT_IMMUNITY_FLAG_4000000 = 0x04000000, + ELEMENT_IMMUNITY_FLAG_8000000 = 0x08000000, + ELEMENT_IMMUNITY_FLAG_10000000 = 0x10000000, + ELEMENT_IMMUNITY_FLAG_20000000 = 0x20000000, + ELEMENT_IMMUNITY_FLAG_40000000 = 0x40000000, + ELEMENT_IMMUNITY_FLAG_80000000 = 0x80000000, }; enum FoldStateFlags { diff --git a/include/npc.h b/include/npc.h index b57d95bb11..0db334ff21 100644 --- a/include/npc.h +++ b/include/npc.h @@ -15,7 +15,7 @@ // rename this to NO_DROPS and the above to NO_STAT_DROPS after all map data done #define NPC_NO_DROPS { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/111f0_len_860.c b/src/111f0_len_860.c index 358fe2b153..672087c271 100644 --- a/src/111f0_len_860.c +++ b/src/111f0_len_860.c @@ -183,7 +183,7 @@ void func_80036430(void) { gMapTransitionAlpha = 255; gMapTransitionFadeRate = 20; gMapTransitionState = 0x01; - gPlayerStatus.flags |= PS_FLAGS_NO_STATIC_COLLISION; + gPlayerStatus.flags |= PS_FLAG_NO_STATIC_COLLISION; } void func_8003646C(void) { diff --git a/src/16F740.c b/src/16F740.c index 4d55f477f1..39cb2f70ca 100644 --- a/src/16F740.c +++ b/src/16F740.c @@ -252,9 +252,9 @@ void btl_state_update_normal_start(void) { battleStatus->damageTaken = 0; battleStatus->nextMerleeSpellType = MERLEE_SPELL_0; battleStatus->actionCommandMode = ACTION_COMMAND_MODE_NOT_LEARNED; - gCameras[CAM_DEFAULT].flags |= CAMERA_FLAGS_ENABLED; - gCameras[CAM_BATTLE].flags |= CAMERA_FLAGS_ENABLED; - gCameras[CAM_TATTLE].flags |= CAMERA_FLAGS_ENABLED; + gCameras[CAM_DEFAULT].flags |= CAMERA_FLAG_ENABLED; + gCameras[CAM_BATTLE].flags |= CAMERA_FLAG_ENABLED; + gCameras[CAM_TATTLE].flags |= CAMERA_FLAG_ENABLED; if (is_ability_active(ABILITY_MYSTERY_SCROLL)) { battleStatus->actionCommandMode = ACTION_COMMAND_MODE_LEARNED; } @@ -753,7 +753,7 @@ void btl_state_update_begin_player_turn(void) { battleStatus->waterBlockTurnsLeft--; battleStatus->buffEffect->data.partnerBuff->unk_0C[FX_BUFF_DATA_WATER_BLOCK].turnsLeft = battleStatus->waterBlockTurnsLeft; if (battleStatus->waterBlockTurnsLeft <= 0) { - battleStatus->waterBlockEffect->flags |= EFFECT_INSTANCE_FLAGS_10; + battleStatus->waterBlockEffect->flags |= EFFECT_INSTANCE_FLAG_10; fx_water_block(1, player->currentPos.x, player->currentPos.y + 18.0f, player->currentPos.z + 5.0f, 1.5f, 10); fx_water_splash(0, player->currentPos.x - 10.0f, player->currentPos.y + 5.0f, player->currentPos.z + 5.0f, 1.0f, 24); fx_water_splash(0, player->currentPos.x - 15.0f, player->currentPos.y + 32.0f, player->currentPos.z + 5.0f, 1.0f, 24); @@ -2354,7 +2354,7 @@ void btl_state_update_defeat(void) { if (player->debuff != 0) { if (player->debuff == 7) { sfx_play_sound(SOUND_FROZEN_SHATTER); - player->icePillarEffect->flags |= EFFECT_INSTANCE_FLAGS_10; + player->icePillarEffect->flags |= EFFECT_INSTANCE_FLAG_10; player->icePillarEffect = NULL; } player->debuff = 0; diff --git a/src/16c8e0.c b/src/16c8e0.c index cde9d5a11e..68f261ecca 100644 --- a/src/16c8e0.c +++ b/src/16c8e0.c @@ -202,23 +202,23 @@ void initialize_battle(void) { func_80268E88(); set_windows_visible(WINDOW_GROUP_1); D_8029EFBC = hud_element_create(&HES_HPBar); - hud_element_set_flags(D_8029EFBC, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029EFBC, HUD_ELEMENT_FLAG_80); for (i = 0; i < ARRAY_COUNT(D_8029EFC0); i++) { hudElemID = D_8029EFC0[i] = hud_element_create(&HES_Item_StarPoint); - hud_element_set_flags(hudElemID, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElemID, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_depth(hudElemID, 20); } for (i = 0; i < ARRAY_COUNT(D_8029EFE8); i++) { hudElemID = D_8029EFE8[i] = hud_element_create(&HES_StatusSPShine); - hud_element_set_flags(hudElemID, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElemID, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_depth(hudElemID, 20); } for (i = 0; i < ARRAY_COUNT(D_8029F010); i++) { hudElemID = D_8029F010[i] = hud_element_create(&HES_Item_SmallStarPoint); - hud_element_set_flags(hudElemID, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElemID, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_depth(hudElemID, 20); } @@ -1029,8 +1029,8 @@ void btl_update_starpoints_display(void) { } for (; i < ARRAY_COUNT(D_8029EFC0); i++) { - hud_element_set_flags(D_8029EFC0[i], HUD_ELEMENT_FLAGS_DISABLED); - hud_element_set_flags(D_8029EFE8[i], HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(D_8029EFC0[i], HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(D_8029EFE8[i], HUD_ELEMENT_FLAG_DISABLED); } posX = D_8029DA40; @@ -1054,7 +1054,7 @@ void btl_update_starpoints_display(void) { } for (; i < ARRAY_COUNT(D_8029F010); i++) { - hud_element_set_flags(D_8029F010[i], HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(D_8029F010[i], HUD_ELEMENT_FLAG_DISABLED); } } } diff --git a/src/17D6A0.c b/src/17D6A0.c index ceb2909cba..c841d84301 100644 --- a/src/17D6A0.c +++ b/src/17D6A0.c @@ -2815,7 +2815,7 @@ void func_8024EFE0(f32 x, f32 y, f32 z, s32 numMessages, s32 arg4, s32 arg5) { sp10 = &D_80283744[numMessages]; message->unk_00 = 1; message->unk_04 = load_entity_model(*sp10); - set_entity_model_flags(message->unk_04, ENTITY_MODEL_FLAGS_HIDDEN); + set_entity_model_flags(message->unk_04, ENTITY_MODEL_FLAG_HIDDEN); bind_entity_model_setupGfx(message->unk_04, message, func_8024F768); message->pos.x = x; message->pos.y = y; @@ -2866,7 +2866,7 @@ void func_8024F394(void* data) { if (message->unk_24 != 0) { message->unk_24--; if (message->unk_24 == 0) { - clear_entity_model_flags(modelIdx, MODEL_FLAGS_FLAG_20); + clear_entity_model_flags(modelIdx, MODEL_FLAG_FLAG_20); } exec_entity_model_commandlist(modelIdx); break; @@ -3191,122 +3191,122 @@ void btl_update_message_popup(void* data) { switch (popup->messageIndex) { case BTL_MSG_32: D_8029F642 = hud_element_create(&HES_StickNeutral); - hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); break; case BTL_MSG_2F: D_8029F642 = hud_element_create(&HES_StickNeutral); - hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); D_8029F644 = hud_element_create(&HES_TimingReady); - hud_element_set_flags(D_8029F644, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F644, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F644, -100, -100); break; case BTL_MSG_33: D_8029F642 = hud_element_create(&HES_StickNeutral); - hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); D_8029F644 = hud_element_create(&HES_AimTarget); - hud_element_set_flags(D_8029F644, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F644, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F644, -100, -100); hud_element_create_transform_B(D_8029F644); break; case BTL_MSG_34: D_8029F642 = hud_element_create(&HES_CUpButton); - hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); D_8029F644 = hud_element_create(&HES_CDownButton); - hud_element_set_flags(D_8029F644, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F644, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F644, -100, -100); D_8029F646 = hud_element_create(&HES_CLeftButton); - hud_element_set_flags(D_8029F646, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F646, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F646, -100, -100); D_8029F648 = hud_element_create(&HES_CRightButton); - hud_element_set_flags(D_8029F648, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F648, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F648, -100, -100); break; case BTL_MSG_35: D_8029F642 = hud_element_create(&HES_StickNeutral); - hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); break; case BTL_MSG_36: D_8029F642 = hud_element_create(&HES_AButton); - hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); D_8029F644 = hud_element_create(&HES_BButton); - hud_element_set_flags(D_8029F644, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F644, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F644, -100, -100); D_8029F646 = hud_element_create(&HES_CDownButton); - hud_element_set_flags(D_8029F646, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F646, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F646, -100, -100); break; case BTL_MSG_37: D_8029F642 = hud_element_create(&HES_StickNeutral); - hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); break; case BTL_MSG_38: D_8029F642 = hud_element_create(&HES_TimingReady); - hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); D_8029F644 = hud_element_create(&HES_AButton); - hud_element_set_flags(D_8029F644, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F644, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F644, -100, -100); break; case BTL_MSG_39: D_8029F642 = hud_element_create(&HES_AButton); - hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); D_8029F644 = hud_element_create(&HES_BButton); - hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); break; case BTL_MSG_3A: D_8029F642 = hud_element_create(&HES_AButton); - hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); D_8029F644 = hud_element_create(&HES_BButton); - hud_element_set_flags(D_8029F644, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F644, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F644, -100, -100); break; case BTL_MSG_3D: D_8029F642 = hud_element_create(&HES_TimingReady); - hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); D_8029F644 = hud_element_create(&HES_AButtonDown); - hud_element_set_flags(D_8029F644, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F644, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F644, -100, -100); break; case BTL_MSG_3E: D_8029F642 = hud_element_create(&HES_StickNeutral); - hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); D_8029F644 = hud_element_create(&HES_AimTarget); - hud_element_set_flags(D_8029F644, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F644, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F644, -100, -100); hud_element_create_transform_B(D_8029F644); D_8029F646 = hud_element_create(&HES_AimReticle); - hud_element_set_flags(D_8029F646, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F646, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F646, -100, -100); hud_element_create_transform_B(D_8029F646); break; case BTL_MSG_40: case BTL_MSG_41: D_8029F642 = hud_element_create(&HES_AButton); - hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); // fallthrough case BTL_MSG_2E: @@ -3317,7 +3317,7 @@ void btl_update_message_popup(void* data) { case BTL_MSG_3F: case BTL_MSG_42: D_8029F642 = hud_element_create(&HES_AButton); - hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); break; } @@ -3519,37 +3519,37 @@ void btl_update_message_popup(void* data) { switch (popup->messageIndex) { case BTL_MSG_49: D_8029F642 = hud_element_create(&HES_Item_Hammer1); - hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); break; case BTL_MSG_4A: D_8029F642 = hud_element_create(&HES_Item_Hammer2); - hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); break; case BTL_MSG_4B: D_8029F642 = hud_element_create(&HES_Item_Hammer3); - hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); break; case BTL_MSG_4C: D_8029F642 = hud_element_create(&HES_Item_Boots1); - hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); break; case BTL_MSG_4D: D_8029F642 = hud_element_create(&HES_Item_Boots2); - hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); break; case BTL_MSG_4E: D_8029F642 = hud_element_create(&HES_Item_Boots3); - hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); break; case BTL_MSG_4F: D_8029F642 = hud_element_create(&HES_Item_Items); - hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_8029F642, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_8029F642, -100, -100); break; } diff --git a/src/182B30.c b/src/182B30.c index 377660dd98..da8076a43f 100644 --- a/src/182B30.c +++ b/src/182B30.c @@ -600,7 +600,7 @@ void update_actor_shadow(s32 arg0, Actor* actor) { if (actor != NULL) { shadow = get_shadow_by_index(actor->shadow.id); - shadow->flags |= ENTITY_FLAGS_HIDDEN; + shadow->flags |= ENTITY_FLAG_HIDDEN; if (!(actor->flags & ACTOR_FLAG_DISABLED)) { if (actor->flags & ACTOR_FLAG_BLUR_ENABLED) { if (arg0 == 0) { @@ -650,7 +650,7 @@ void update_actor_shadow(s32 arg0, Actor* actor) { if (!(actorPart->flags & ACTOR_PART_FLAG_4)) { shadow = get_shadow_by_index(actorPart->shadowIndex); - shadow->flags &= ~ENTITY_FLAGS_HIDDEN; + shadow->flags &= ~ENTITY_FLAG_HIDDEN; x1 = actorPart->currentPos.x; if (!(actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW)) { y1 = actorPart->currentPos.y + 12.0; @@ -663,7 +663,7 @@ void update_actor_shadow(s32 arg0, Actor* actor) { npc_raycast_down_sides(0, &x1, &y1, &z1, &dist); if (200.0f < dist) { - shadow->flags |= ENTITY_FLAGS_HIDDEN; + shadow->flags |= ENTITY_FLAG_HIDDEN; } shadow->position.x = x1; shadow->position.y = y1; @@ -681,7 +681,7 @@ void update_actor_shadow(s32 arg0, Actor* actor) { shadow = get_shadow_by_index(actor->shadow.id); if (!(actor->flags & ACTOR_FLAG_NO_SHADOW)) { - shadow->flags &= ~ENTITY_FLAGS_HIDDEN; + shadow->flags &= ~ENTITY_FLAG_HIDDEN; } x1 = actor->currentPos.x + actor->headOffset.x; @@ -696,7 +696,7 @@ void update_actor_shadow(s32 arg0, Actor* actor) { npc_raycast_down_sides(0, &x1, &y1, &z1, &dist); if (200.0f < dist) { - shadow->flags |= ENTITY_FLAGS_HIDDEN; + shadow->flags |= ENTITY_FLAG_HIDDEN; } shadow->position.x = x1; shadow->position.y = y1; @@ -788,7 +788,7 @@ void appendGfx_npc_actor(s32 isPartner, s32 actorIndex) { } else { effect = actor->icePillarEffect; if (effect != NULL) { - effect->flags |= EFFECT_INSTANCE_FLAGS_10; + effect->flags |= EFFECT_INSTANCE_FLAG_10; actor->icePillarEffect = NULL; } } @@ -1308,7 +1308,7 @@ void update_player_actor_shadow(void) { } shadow = get_shadow_by_index(player->shadow.id); - shadow->flags &= ~ENTITY_FLAGS_HIDDEN; + shadow->flags &= ~ENTITY_FLAG_HIDDEN; if (!battleStatus->outtaSightActive) { shadow->alpha = 128; @@ -1323,7 +1323,7 @@ void update_player_actor_shadow(void) { npc_raycast_down_sides(0, &x, &y, &z, &distance); if (distance > 200.0f) { - shadow->flags |= ENTITY_FLAGS_HIDDEN; + shadow->flags |= ENTITY_FLAG_HIDDEN; } shadow->position.x = x; shadow->position.y = y; @@ -3696,7 +3696,7 @@ void func_8025D830(ActorPart* part, s32 decorationIndex) { } void func_8025D8EC(ActorPart* part, s32 decorationIndex) { - part->decorationTable->effect[decorationIndex]->flags |= EFFECT_INSTANCE_FLAGS_10; + part->decorationTable->effect[decorationIndex]->flags |= EFFECT_INSTANCE_FLAG_10; } void func_8025D90C(ActorPart* part, s32 decorationIndex) { diff --git a/src/18C790.c b/src/18C790.c index ed59a8c663..6550c9bc73 100644 --- a/src/18C790.c +++ b/src/18C790.c @@ -323,16 +323,16 @@ API_CALLABLE(InitStarPointModelFlags) { model = get_entity_model(*virtual_entity_get_by_index(script->varTable[6])); model->flags &= ~MODEL_FLAGS_MASK_FFF0 ; - model->flags |= MODEL_FLAGS_TRANSFORM_GROUP_MEMBER; + model->flags |= MODEL_FLAG_TRANSFORM_GROUP_MEMBER; model = get_entity_model(*virtual_entity_get_by_index(script->varTable[7])); model->flags &= ~MODEL_FLAGS_MASK_FFF0 ; - model->flags |= MODEL_FLAGS_TRANSFORM_GROUP_MEMBER; + model->flags |= MODEL_FLAG_TRANSFORM_GROUP_MEMBER; model = get_entity_model(*virtual_entity_get_by_index(script->varTable[8])); model->flags &= ~MODEL_FLAGS_MASK_FFF0 ; - model->flags |= MODEL_FLAGS_TRANSFORM_GROUP_MEMBER; + model->flags |= MODEL_FLAG_TRANSFORM_GROUP_MEMBER; model = get_entity_model(*virtual_entity_get_by_index(script->varTable[9])); model->flags &= ~MODEL_FLAGS_MASK_FFF0 ; - model->flags |= MODEL_FLAGS_TRANSFORM_GROUP_MEMBER; + model->flags |= MODEL_FLAG_TRANSFORM_GROUP_MEMBER; return ApiStatus_DONE2; } @@ -340,7 +340,7 @@ API_CALLABLE(InitStarPointModelFlags) { API_CALLABLE(InitLevelUpModelFlags) { EntityModel* model = get_entity_model(*virtual_entity_get_by_index(script->varTable[9])); model->flags &= ~MODEL_FLAGS_MASK_FFF0; - model->flags |= MODEL_FLAGS_TRANSFORM_GROUP_MEMBER; + model->flags |= MODEL_FLAG_TRANSFORM_GROUP_MEMBER; return ApiStatus_DONE2; } @@ -652,57 +652,57 @@ void btl_state_update_celebration(void) { id = hud_element_create(&HES_level_up_heart); LevelUpStatEmblemHEIDs[0] = id; hud_element_set_render_pos(id, 310, 140); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80); id = hud_element_create(&HES_level_up_flower); LevelUpStatEmblemHEIDs[1] = id; hud_element_set_render_pos(id, 158, 340); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80); id = hud_element_create(&HES_level_up_leaves); LevelUpStatEmblemHEIDs[3] = id; hud_element_set_render_pos(id, 158, 340); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80); id = hud_element_create(&HES_level_up_badge); LevelUpStatEmblemHEIDs[2] = id; hud_element_set_render_pos(id, 6, 140); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80); id = hud_element_create(levelup_stat_scripts[0]); LevelUpStatTextHEIDs[LVL_UP_FP][LVL_UP_TITLE] = id; hud_element_set_render_pos(id, 160, 317); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80); for (i = 1; i < ARRAY_COUNT(LevelUpStatTextHEIDs[LVL_UP_FP]); i++) { id = hud_element_create(level_up_digit_scripts[LVL_UP_FP][0]); LevelUpStatTextHEIDs[LVL_UP_FP][i] = id; hud_element_set_render_pos(id, 160, 317); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); } id = hud_element_create(levelup_stat_scripts[1]); LevelUpStatTextHEIDs[LVL_UP_HP][LVL_UP_TITLE] = id; hud_element_set_render_pos(id, 312, 117); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80); for (i = 1; i < ARRAY_COUNT(LevelUpStatTextHEIDs[LVL_UP_HP]); i++) { id = hud_element_create(level_up_digit_scripts[LVL_UP_HP][0]); LevelUpStatTextHEIDs[LVL_UP_HP][i] = id; hud_element_set_render_pos(id, 312, 117); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); } id = hud_element_create(levelup_stat_scripts[2]); LevelUpStatTextHEIDs[LVL_UP_BP][LVL_UP_TITLE] = id; hud_element_set_render_pos(id, 8, 117); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80); for (i = 1; i < ARRAY_COUNT(LevelUpStatTextHEIDs[LVL_UP_BP]); i++) { id = hud_element_create(level_up_digit_scripts[LVL_UP_BP][0]); LevelUpStatTextHEIDs[LVL_UP_BP][i] = id; hud_element_set_render_pos(id, 8, 117); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); } CantLevelUpStat[MENU_HP] = FALSE; @@ -716,20 +716,20 @@ void btl_state_update_celebration(void) { id = LevelUpStatTextHEIDs[LVL_UP_FP][LVL_UP_CUR_TENS]; hud_element_set_script(id, level_up_small_digit_scripts[LVL_UP_FP][tensDigit]); if (tensDigit != 0) { - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); } hud_element_get_render_pos(id, &x, &y); hud_element_set_render_pos(id, x - 14, y + 46); id = LevelUpStatTextHEIDs[LVL_UP_FP][LVL_UP_CUR_ONES]; hud_element_set_script(id, level_up_small_digit_scripts[LVL_UP_FP][onesDigit]); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); hud_element_get_render_pos(id, &x, &y); hud_element_set_render_pos(id, x - 8, y + 46); id = LevelUpStatTextHEIDs[LVL_UP_FP][LVL_UP_ARROW]; hud_element_set_script(id, &HES_level_up_small_green_arrow); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); hud_element_get_render_pos(id, &x, &y); hud_element_set_render_pos(id, x - 3, y + 46); @@ -739,14 +739,14 @@ void btl_state_update_celebration(void) { id = LevelUpStatTextHEIDs[LVL_UP_FP][LVL_UP_NEXT_TENS]; hud_element_set_script(id, level_up_digit_scripts[LVL_UP_FP][tensDigit]); if (tensDigit != 0) { - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); } hud_element_get_render_pos(id, &x, &y); hud_element_set_render_pos(id, x + 3, y + 46); id = LevelUpStatTextHEIDs[LVL_UP_FP][LVL_UP_NEXT_ONES]; hud_element_set_script(id, level_up_digit_scripts[LVL_UP_FP][onesDigit]); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); hud_element_get_render_pos(id, &x, &y); hud_element_set_render_pos(id, x + 10, y + 46); } else { @@ -756,7 +756,7 @@ void btl_state_update_celebration(void) { onesDigit = playerData->curMaxFP % 10; hud_element_set_script(id, level_up_digit_scripts[LVL_UP_FP][tensDigit]); if (tensDigit != 0) { - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); } hud_element_get_render_pos(id, &x, &y); hud_element_set_render_pos(id, x - 6, y + 46); @@ -773,7 +773,7 @@ void btl_state_update_celebration(void) { id = LevelUpStatTextHEIDs[LVL_UP_FP][LVL_UP_BONUS]; itemHudElemID = gItemTable[ITEM_FP_PLUS_A].hudElemID; hud_element_set_script(id, gItemHudScripts[itemHudElemID].enabled); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); hud_element_set_scale(id, 0.5f); hud_element_get_render_pos(id, &x, &y); hud_element_set_render_pos(id, x + 17, y + 46); @@ -787,20 +787,20 @@ void btl_state_update_celebration(void) { id = LevelUpStatTextHEIDs[LVL_UP_HP][LVL_UP_CUR_TENS]; hud_element_set_script(id, level_up_small_digit_scripts[LVL_UP_HP][tensDigit]); if (tensDigit != 0) { - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); } hud_element_get_render_pos(id, &x, &y); hud_element_set_render_pos(id, x - 14, y + 46); id = LevelUpStatTextHEIDs[LVL_UP_HP][LVL_UP_CUR_ONES]; hud_element_set_script(id, level_up_small_digit_scripts[LVL_UP_HP][onesDigit]); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); hud_element_get_render_pos(id, &x, &y); hud_element_set_render_pos(id, x - 8, y + 46); id = LevelUpStatTextHEIDs[LVL_UP_HP][LVL_UP_ARROW]; hud_element_set_script(id, &HES_level_up_small_red_arrow); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); hud_element_get_render_pos(id, &x, &y); hud_element_set_render_pos(id, x - 3, y + 46); @@ -810,14 +810,14 @@ void btl_state_update_celebration(void) { id = LevelUpStatTextHEIDs[LVL_UP_HP][LVL_UP_NEXT_TENS]; hud_element_set_script(id, level_up_digit_scripts[LVL_UP_HP][tensDigit]); if (tensDigit != 0) { - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); } hud_element_get_render_pos(id, &x, &y); hud_element_set_render_pos(id, x + 3, y + 46); id = LevelUpStatTextHEIDs[LVL_UP_HP][LVL_UP_NEXT_ONES]; hud_element_set_script(id, level_up_digit_scripts[LVL_UP_HP][onesDigit]); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); hud_element_get_render_pos(id, &x, &y); hud_element_set_render_pos(id, x + 10, y + 46); } else { @@ -827,14 +827,14 @@ void btl_state_update_celebration(void) { id = LevelUpStatTextHEIDs[LVL_UP_HP][LVL_UP_NEXT_TENS]; hud_element_set_script(id, level_up_digit_scripts[LVL_UP_HP][tensDigit]); if (tensDigit != 0) { - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); } hud_element_get_render_pos(id, &x, &y); hud_element_set_render_pos(id, x - 6, y + 46); id = LevelUpStatTextHEIDs[LVL_UP_HP][LVL_UP_NEXT_ONES]; hud_element_set_script(id, level_up_digit_scripts[LVL_UP_HP][onesDigit]); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); hud_element_get_render_pos(id, &x, &y); hud_element_set_render_pos(id, x + 2, y + 46); CantLevelUpStat[MENU_HP] = TRUE; @@ -844,7 +844,7 @@ void btl_state_update_celebration(void) { id = LevelUpStatTextHEIDs[LVL_UP_HP][LVL_UP_BONUS]; itemHudElemID = gItemTable[ITEM_HP_PLUS_A].hudElemID; hud_element_set_script(id, gItemHudScripts[itemHudElemID].enabled); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); hud_element_set_scale(id, 0.5f); hud_element_get_render_pos(id, &x, &y); hud_element_set_render_pos(id, x + 17, y + 46); @@ -857,20 +857,20 @@ void btl_state_update_celebration(void) { id = LevelUpStatTextHEIDs[LVL_UP_BP][LVL_UP_CUR_TENS]; hud_element_set_script(id, level_up_small_digit_scripts[LVL_UP_BP][tensDigit]); if (tensDigit != 0) { - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); } hud_element_get_render_pos(id, &x, &y); hud_element_set_render_pos(id, x - 14, y + 46); id = LevelUpStatTextHEIDs[LVL_UP_BP][LVL_UP_CUR_ONES]; hud_element_set_script(id, level_up_small_digit_scripts[LVL_UP_BP][onesDigit]); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); hud_element_get_render_pos(id, &x, &y); hud_element_set_render_pos(id, x - 8, y + 46); id = LevelUpStatTextHEIDs[LVL_UP_BP][LVL_UP_ARROW]; hud_element_set_script(id, &HES_level_up_small_blue_arrow); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); hud_element_get_render_pos(id, &x, &y); hud_element_set_render_pos(id, x - 3, y + 46); @@ -880,26 +880,26 @@ void btl_state_update_celebration(void) { id = LevelUpStatTextHEIDs[LVL_UP_BP][LVL_UP_NEXT_TENS]; hud_element_set_script(id, level_up_digit_scripts[LVL_UP_BP][tensDigit]); if (tensDigit != 0) { - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); } hud_element_get_render_pos(id, &x, &y); hud_element_set_render_pos(id, x + 3, y + 46); id = LevelUpStatTextHEIDs[LVL_UP_BP][LVL_UP_NEXT_ONES]; hud_element_set_script(id, level_up_digit_scripts[LVL_UP_BP][onesDigit]); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); hud_element_get_render_pos(id, &x, &y); hud_element_set_render_pos(id, x + 10, y + 46); } else { id = LevelUpStatTextHEIDs[LVL_UP_BP][LVL_UP_NEXT_TENS]; hud_element_set_script(id, level_up_digit_scripts[LVL_UP_BP][3]); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); hud_element_get_render_pos(id, &x, &y); hud_element_set_render_pos(id, x - 6, y + 46); id = LevelUpStatTextHEIDs[LVL_UP_BP][LVL_UP_NEXT_ONES]; hud_element_set_script(id, level_up_digit_scripts[LVL_UP_BP][0]); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); hud_element_get_render_pos(id, &x, &y); hud_element_set_render_pos(id, x + 2, y + 46); CantLevelUpStat[MENU_BP] = TRUE; @@ -913,11 +913,11 @@ void btl_state_update_celebration(void) { hud_element_set_transform_rotation(id, 0.0f, 0.0f, 180.0f); hud_element_set_transform_scale(id, 1.0f, 1.5f, 1.0f); hud_element_set_alpha(id, 200); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); id = LevelUpSelectTextHEID = hud_element_create(&HES_level_up_select_one_to_upgrade); hud_element_set_render_pos(id, 0, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80); battleStatus->currentSubmenu = 1; CelebrateSubstateTime = 10; @@ -1068,27 +1068,27 @@ void btl_state_update_celebration(void) { if ((gGameStatusPtr->frameCounter % 2) != 0) { switch (battleStatus->currentSubmenu) { case 0: - hud_element_set_flags(LevelUpStatEmblemHEIDs[0], HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(LevelUpStatEmblemHEIDs[0], HUD_ELEMENT_FLAG_DISABLED); break; case 1: - hud_element_set_flags(LevelUpStatEmblemHEIDs[1], HUD_ELEMENT_FLAGS_DISABLED); - hud_element_set_flags(LevelUpStatEmblemHEIDs[3], HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(LevelUpStatEmblemHEIDs[1], HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(LevelUpStatEmblemHEIDs[3], HUD_ELEMENT_FLAG_DISABLED); break; case 2: - hud_element_set_flags(LevelUpStatEmblemHEIDs[2], HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(LevelUpStatEmblemHEIDs[2], HUD_ELEMENT_FLAG_DISABLED); break; } } else { switch (battleStatus->currentSubmenu) { case 0: - hud_element_clear_flags(LevelUpStatEmblemHEIDs[0], HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(LevelUpStatEmblemHEIDs[0], HUD_ELEMENT_FLAG_DISABLED); break; case 1: - hud_element_clear_flags(LevelUpStatEmblemHEIDs[1], HUD_ELEMENT_FLAGS_DISABLED); - hud_element_clear_flags(LevelUpStatEmblemHEIDs[3], HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(LevelUpStatEmblemHEIDs[1], HUD_ELEMENT_FLAG_DISABLED); + hud_element_clear_flags(LevelUpStatEmblemHEIDs[3], HUD_ELEMENT_FLAG_DISABLED); break; case 2: - hud_element_clear_flags(LevelUpStatEmblemHEIDs[2], HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(LevelUpStatEmblemHEIDs[2], HUD_ELEMENT_FLAG_DISABLED); break; } } diff --git a/src/190B20.c b/src/190B20.c index a8eaad3dd0..e4c419a8bd 100644 --- a/src/190B20.c +++ b/src/190B20.c @@ -1705,7 +1705,7 @@ s32 inflict_status(Actor* target, s32 statusTypeKey, s32 duration) { if (target->actorID != ACTOR_PARTNER) { effect = target->icePillarEffect; if (effect != NULL) { - effect->flags |= EFFECT_INSTANCE_FLAGS_10; + effect->flags |= EFFECT_INSTANCE_FLAG_10; } target->icePillarEffect = fx_ice_pillar(0, target->currentPos.x, target->currentPos.y, target->currentPos.z, 1.0f, 0); @@ -2633,7 +2633,7 @@ void hide_foreground_models_unchecked(void) { s32 id = *idList++; if (id >= 0) { Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(id)); - model->flags |= MODEL_FLAGS_ENABLED; + model->flags |= MODEL_FLAG_ENABLED; } } } @@ -2648,7 +2648,7 @@ void show_foreground_models_unchecked(void) { s32 id = *idList++; if (id >= 0) { Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(id)); - model->flags &= ~MODEL_FLAGS_ENABLED; + model->flags &= ~MODEL_FLAG_ENABLED; } } } @@ -2665,7 +2665,7 @@ void hide_foreground_models(void) { break; } else { Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(id)); - model->flags |= MODEL_FLAGS_ENABLED; + model->flags |= MODEL_FLAG_ENABLED; } } @@ -2683,7 +2683,7 @@ void show_foreground_models(void) { break; } else { Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(id)); - model->flags &= ~MODEL_FLAGS_ENABLED; + model->flags &= ~MODEL_FLAG_ENABLED; } } } diff --git a/src/23680.c b/src/23680.c index b5a97f3780..421c02509f 100644 --- a/src/23680.c +++ b/src/23680.c @@ -147,7 +147,7 @@ void spawn_drops(Enemy* enemy) { s32 temp = var_s1 + 1; var_s1 = temp + rand_int(2); } - if (enemy->flags & ENEMY_FLAGS_800000) { + if (enemy->flags & ENEMY_FLAG_800000) { var_s1 = 0; } if (var_s1 != 0) { @@ -204,7 +204,7 @@ void spawn_drops(Enemy* enemy) { s32 temp = var_s1 + 1; var_s1 = temp + rand_int(2); } - if (enemy->flags & ENEMY_FLAGS_800000) { + if (enemy->flags & ENEMY_FLAG_800000) { var_s1 = 0; } if (var_s1 != 0) { @@ -274,7 +274,7 @@ void spawn_drops(Enemy* enemy) { if (var_s1 > 20) { var_s1 = 20; } - if (enemy->flags & ENEMY_FLAGS_800000) { + if (enemy->flags & ENEMY_FLAG_800000) { var_s1 = 0; } if (var_s1 * 2 > sp28) { @@ -334,7 +334,7 @@ s32 get_coin_drop_amount(Enemy* enemy) { amt += currentEncounter->coinsEarned; - if (enemy->flags & (ENEMY_FLAGS_800000 | ENEMY_FLAGS_40000)) { + if (enemy->flags & (ENEMY_FLAG_800000 | ENEMY_FLAG_40000)) { amt = 0; } @@ -389,7 +389,7 @@ s32 func_80048F0C(void) { for (j = 0; j < encounter->count; j++) { Enemy* enemy = encounter->enemy[j]; - if (enemy != NULL && !(enemy->flags & ENEMY_FLAGS_20)) { + if (enemy != NULL && !(enemy->flags & ENEMY_FLAG_20)) { get_npc_unsafe(enemy->npcID); } } @@ -424,7 +424,7 @@ s32 basic_ai_check_player_dist(EnemyDetectVolume* territory, Enemy* enemy, f32 r f32 dist; s32 skipCheckForPlayer; - if (enemy->aiFlags & ENEMY_AI_FLAGS_2) { + if (enemy->aiFlags & ENEMY_AI_FLAG_2) { return FALSE; } @@ -570,8 +570,8 @@ void basic_ai_wander_init(Evt* script, MobileAISettings* npcAISettings, EnemyDet npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; } - enemy->aiFlags &= ~ENEMY_AI_FLAGS_40; - enemy->aiFlags &= ~ENEMY_AI_FLAGS_20; + enemy->aiFlags &= ~ENEMY_AI_FLAG_40; + enemy->aiFlags &= ~ENEMY_AI_FLAG_20; script->AI_TEMP_STATE = AI_STATE_WANDER; } @@ -595,8 +595,8 @@ void basic_ai_wander(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolum npc->yaw = yaw; ai_enemy_play_sound(npc, SOUND_2F4, 0x200000); fx_emote(EMOTE_EXCLAMATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &sp34); - enemy->aiFlags &= ~ENEMY_AI_FLAGS_40; - enemy->aiFlags &= ~ENEMY_AI_FLAGS_20; + enemy->aiFlags &= ~ENEMY_AI_FLAG_40; + enemy->aiFlags &= ~ENEMY_AI_FLAG_20; if (enemy->npcSettings->actionFlags & AI_ACTION_JUMP_WHEN_SEE_PLAYER) { script->AI_TEMP_STATE = AI_STATE_ALERT_INIT; @@ -619,13 +619,13 @@ void basic_ai_wander(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolum enemy->territory->wander.wanderSize.x, enemy->territory->wander.wanderSize.z) && npc->moveSpeed < dist2D(enemy->territory->wander.centerPos.x, enemy->territory->wander.centerPos.z, npc->pos.x, npc->pos.z)) { - if (!(enemy->aiFlags & ENEMY_AI_FLAGS_20)) { - enemy->aiFlags |= (ENEMY_AI_FLAGS_20 | ENEMY_AI_FLAGS_40); + if (!(enemy->aiFlags & ENEMY_AI_FLAG_20)) { + enemy->aiFlags |= (ENEMY_AI_FLAG_20 | ENEMY_AI_FLAG_40); } - if (enemy->aiFlags & ENEMY_AI_FLAGS_40) { + if (enemy->aiFlags & ENEMY_AI_FLAG_40) { npc->yaw = clamp_angle(atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.centerPos.x, enemy->territory->wander.centerPos.z)); - enemy->aiFlags &= ~ENEMY_AI_FLAGS_40; + enemy->aiFlags &= ~ENEMY_AI_FLAG_40; } x = npc->pos.x; @@ -633,14 +633,14 @@ void basic_ai_wander(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolum z = npc->pos.z; if (npc_test_move_simple_with_slipping(npc->collisionChannel, &x, &y, &z, 2.0 * npc->moveSpeed, npc->yaw, npc->collisionHeight, npc->collisionRadius)) { yaw = clamp_angle(atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.centerPos.x, enemy->territory->wander.centerPos.z)); - enemy->aiFlags &= ~ENEMY_AI_FLAGS_40; + enemy->aiFlags &= ~ENEMY_AI_FLAG_40; ai_check_fwd_collisions(npc, 5.0f, &yaw, NULL, NULL, NULL); npc->yaw = yaw; } stillWithinTerritory = TRUE; - } else if (enemy->aiFlags & ENEMY_AI_FLAGS_20) { - enemy->aiFlags &= ~ENEMY_AI_FLAGS_20; - enemy->aiFlags &= ~ENEMY_AI_FLAGS_40; + } else if (enemy->aiFlags & ENEMY_AI_FLAG_20) { + enemy->aiFlags &= ~ENEMY_AI_FLAG_20; + enemy->aiFlags &= ~ENEMY_AI_FLAG_40; } // perform the motion @@ -858,7 +858,7 @@ ApiStatus BasicAI_Main(Evt* script, s32 isInitialCall) { territory.halfHeight = 65.0f; territory.detectFlags = 0; - if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAG_4) { script->AI_TEMP_STATE = AI_STATE_WANDER_INIT; npc->duration = 0; @@ -873,15 +873,15 @@ ApiStatus BasicAI_Main(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { script->AI_TEMP_STATE = AI_STATE_SUSPEND; script->functionTemp[1] = AI_STATE_WANDER_INIT; - } else if (enemy->flags & ENEMY_FLAGS_40000000) { + } else if (enemy->flags & ENEMY_FLAG_40000000) { script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; } - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; - enemy->flags &= ~ENEMY_FLAGS_40000000; + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->flags &= ~ENEMY_FLAG_40000000; } switch (script->AI_TEMP_STATE) { diff --git a/src/39210_len_aa0.c b/src/39210_len_aa0.c index 7bdf733186..14071986f5 100644 --- a/src/39210_len_aa0.c +++ b/src/39210_len_aa0.c @@ -13,7 +13,7 @@ void get_npc_pos(s32 npcID, f32* outX, f32* outY, f32* outZ, s32* outAirborne) { *outX = playerStatus->position.x; *outY = playerStatus->position.y; *outZ = playerStatus->position.z; - if (playerStatus->flags & (PS_FLAGS_FALLING | PS_FLAGS_JUMPING)) { + if (playerStatus->flags & (PS_FLAG_FALLING | PS_FLAG_JUMPING)) { *outAirborne = TRUE; } } else { diff --git a/src/415D90.c b/src/415D90.c index 36d0137c1e..36871997c7 100644 --- a/src/415D90.c +++ b/src/415D90.c @@ -527,25 +527,25 @@ s32 func_802A11B0(void) { for (i = 0; i < main_menu_numOptions; i++) { D_802AD010[i] = id = hud_element_create(main_battle_menu_JumpHudScripts[i]); hud_element_set_render_depth(id, 5); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_FILTER_TEX); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_FILTER_TEX); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_DISABLED); hud_element_set_scale(id, 0.75f); D_802AD028[i] = id = hud_element_create(&HES_ProjectorSpot); hud_element_create_transform_B(id); hud_element_set_render_depth(id, 10); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_FILTER_TEX); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_FILTER_TEX); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_DISABLED); } D_802AD040 = id = hud_element_create(&HES_ProjectorSpot); hud_element_create_transform_B(id); hud_element_set_render_depth(id, 7); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_FILTER_TEX); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_FILTER_TEX); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_DISABLED); D_802AD044 = id = hud_element_create(&HES_ProjectorReel); hud_element_create_transform_B(id); @@ -553,8 +553,8 @@ s32 func_802A11B0(void) { hud_element_set_render_pos(id, 40, 212); hud_element_set_tint(id, 0, 91, 127); hud_element_set_transform_rotation_pivot(id, 0x10, -0x10); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_FILTER_TEX); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_FILTER_TEX); hud_element_set_alpha(id, 240); D_802AD048 = id = hud_element_create(&HES_ProjectorReel); @@ -563,8 +563,8 @@ s32 func_802A11B0(void) { hud_element_set_render_pos(id, 39, 212); hud_element_set_tint(id, 0, 91, 127); hud_element_set_transform_rotation_pivot(id, 16, -16); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_FILTER_TEX); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_FILTER_TEX); hud_element_set_alpha(id, 240); D_802AD04C = id = hud_element_create(&HES_ProjectorBeam); @@ -575,34 +575,34 @@ s32 func_802A11B0(void) { hud_element_set_transform_rotation_pivot(id, 0, 0); hud_element_set_transform_rotation(id, 0.0f, 0.0f, -45.0f); hud_element_set_alpha(id, 200); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_FILTER_TEX); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_FILTER_TEX); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_DISABLED); D_802AD05C = id = hud_element_create(&HES_SwapBackground); hud_element_set_render_depth(id, 0); hud_element_set_render_pos(id, 97, 208); hud_element_set_tint(id, 255, 255, 255); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_FILTER_TEX); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_FILTER_TEX); hud_element_set_alpha(id, 230); D_802AD050 = id = hud_element_create(&HES_SwapZ); hud_element_set_render_depth(id, 5); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_FILTER_TEX); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_FILTER_TEX); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(id, 94, 209); D_802AD054 = id = hud_element_create(&HES_SwapArrowLeft); hud_element_set_render_depth(id, 5); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_FILTER_TEX); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_FILTER_TEX); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(id, 81, 210); D_802AD058 = id = hud_element_create(&HES_SwapArrowRight); hud_element_set_render_depth(id, 5); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_FILTER_TEX); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_FILTER_TEX); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(id, 102, 210); D_802AD00A = 100; D_802AD001 = 3; @@ -616,7 +616,7 @@ s32 func_802A11B0(void) { case 1: if (D_802AD001 == 1) { id = D_802AD04C; - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); } default: D_802AD001--; @@ -634,12 +634,12 @@ s32 func_802A11B0(void) { t = D_802AD064 + y; id = D_802AD010[i]; hud_element_set_render_pos(id, l, t); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); id = D_802AD028[i]; hud_element_set_render_pos(id, l, t); hud_element_set_alpha(id, 100); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); } x = 0.0f; @@ -653,7 +653,7 @@ s32 func_802A11B0(void) { hud_element_set_render_pos(id, l, t); hud_element_set_alpha(id, 180); hud_element_set_scale(id, 0.85f); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); D_802AD000 = 2; break; } @@ -810,9 +810,9 @@ void btl_draw_menu_wheel(void) { hud_element_set_alpha(id, (opacity * 180) / 255); hud_element_set_scale(id, 1.2f); if (!cond) { - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_DISABLED); } else { - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); } func_80144238(id); } @@ -1107,33 +1107,33 @@ s32 func_802A2C84(void) { id = hud_element_create(battle_menu_moveOptionIconScripts[battle_menu_moveOptionIndexMap[i]]); battle_menu_moveOptionIconIDs[i] = id; hud_element_set_scale(id, 0.45f); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); } id = hud_element_create(&HES_AnimatedHandPointer); battle_menu_moveCursorIcon = id; - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_DROP_SHADOW | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(id, battle_menu_moveX, battle_menu_moveY); id = hud_element_create(&HES_GreenArrowUp); battle_menu_moveUpArrowIcon = id; - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_DROP_SHADOW | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(id, battle_menu_moveX + 39, battle_menu_moveY - 7); id = hud_element_create(&HES_GreenArrowDown); battle_menu_moveDownArrowIcon = id; - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_DROP_SHADOW | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(id, battle_menu_moveX + 39, battle_menu_moveY + 78); if (battle_menu_hasSpiritsMenu == 0) { id = hud_element_create(&HES_StatusFlower); battle_menu_moveTitleIcon = id; - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80); } else { id = hud_element_create(&HES_MenuStarPower); battle_menu_moveTitleIcon = id; hud_element_set_scale(id, 0.75f); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80); } hud_element_set_render_pos(id, battle_menu_moveX + 56, battle_menu_moveY); @@ -1169,7 +1169,7 @@ s32 func_802A2C84(void) { break; } } - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(id, battle_menu_moveX + 56, battle_menu_moveY); } @@ -1798,19 +1798,19 @@ s32 func_802A4A54(void) { for (i = 0; i < D_802AD66C; i++) { D_802AD628[i] = id = hud_element_create(D_802AD640[i]); hud_element_set_scale(id, 0.45f); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); } D_802AD618 = id = hud_element_create(&HES_AnimatedHandPointer); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_DROP_SHADOW | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(id, D_802AD63C, D_802AD63E); D_802AD61C = id = hud_element_create(&HES_GreenArrowUp); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_DROP_SHADOW | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(id, D_802AD63C + 39, D_802AD63E - 7); D_802AD620 = id = hud_element_create(&HES_GreenArrowDown); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_DROP_SHADOW | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(id, D_802AD63C + 39, D_802AD63E + 78); D_802AD614 = MSG_PAL_STANDARD; diff --git a/src/77480.c b/src/77480.c index 7d12e2bda9..e02e4bc76b 100644 --- a/src/77480.c +++ b/src/77480.c @@ -192,7 +192,7 @@ s32 player_raycast_down(f32* x, f32* y, f32* z, f32* length) { entity = get_entity_by_index(entityID); if (entity->alpha < 255) { entity->collisionTimer = 4; - entity->flags |= ENTITY_FLAGS_CONTINUOUS_COLLISION; + entity->flags |= ENTITY_FLAG_CONTINUOUS_COLLISION; } else { ret = entityID | COLLISION_WITH_ENTITY_BIT; } @@ -367,7 +367,7 @@ s32 player_test_lateral_overlap(s32 mode, PlayerStatus* playerStatus, f32* x, f3 radius = playerStatus->colliderDiameter * 0.5f; ret = -1; - if (!(playerStatus->flags & (PS_FLAGS_FALLING | PS_FLAGS_JUMPING))) { + if (!(playerStatus->flags & (PS_FLAG_FALLING | PS_FLAG_JUMPING))) { height = playerStatus->colliderHeight * 0.286f; } else { height = 1.0f; @@ -422,12 +422,12 @@ s32 player_raycast_general(s32 mode, f32 startX, f32 startY, f32 startZ, f32 dir entity = get_entity_by_index(entityID); if (entity->alpha < 255) { entity->collisionTimer = 0; - entity->flags |= ENTITY_FLAGS_CONTINUOUS_COLLISION; + entity->flags |= ENTITY_FLAG_CONTINUOUS_COLLISION; } else { ret = entityID | COLLISION_WITH_ENTITY_BIT; } } else if (mode == 3) { - ret = test_ray_colliders(COLLIDER_FLAGS_IGNORE_SHELL, startX, startY, startZ, dirX, dirY, dirZ, + ret = test_ray_colliders(COLLIDER_FLAG_IGNORE_SHELL, startX, startY, startZ, dirX, dirY, dirZ, hitX, hitY, hitZ, hitDepth, hitNx, hitNy, hitNz); } @@ -438,7 +438,7 @@ s32 player_raycast_general(s32 mode, f32 startX, f32 startY, f32 startZ, f32 dir if (mode == 4) { ignoreFlags = COLLISION_CHANNEL_80000; } else { - ignoreFlags = COLLIDER_FLAGS_IGNORE_PLAYER; + ignoreFlags = COLLIDER_FLAG_IGNORE_PLAYER; } colliderID = test_ray_colliders(ignoreFlags, startX, startY, startZ, dirX, dirY, dirZ, @@ -548,7 +548,7 @@ s32 player_test_move_with_slipping(PlayerStatus* playerStatus, f32* x, f32* y, f s32 ret = -1; height = 0.0f; - if (!(playerStatus->flags & (PS_FLAGS_JUMPING | PS_FLAGS_FALLING))) { + if (!(playerStatus->flags & (PS_FLAG_JUMPING | PS_FLAG_FALLING))) { height = 10.01f; } radius = playerStatus->colliderDiameter * 0.5f; @@ -596,16 +596,16 @@ void update_player(void) { update_partner_timers(); if ((playerStatus->timeInAir > 100) || (playerStatus->position.y < -2000.0f)) { - if (!(playerStatus->animFlags & PA_FLAGS_NO_OOB_RESPAWN)) { + if (!(playerStatus->animFlags & PA_FLAG_NO_OOB_RESPAWN)) { playerStatus->timeInAir = 0; playerStatus->position.x = playerStatus->lastGoodPosition.x; playerStatus->position.y = playerStatus->lastGoodPosition.y; playerStatus->position.z = playerStatus->lastGoodPosition.z; - if (playerStatus->animFlags & PA_FLAGS_RIDING_PARTNER) { + if (playerStatus->animFlags & PA_FLAG_RIDING_PARTNER) { Npc* partner; - playerStatus->animFlags |= PA_FLAGS_DISMOUNTING_ALLOWED | PA_FLAGS_INTERRUPT_USE_PARTNER; + playerStatus->animFlags |= PA_FLAG_DISMOUNTING_ALLOWED | PA_FLAG_INTERRUPT_USE_PARTNER; partner = get_npc_unsafe(NPC_PARTNER); partner->pos.x = playerStatus->lastGoodPosition.x; partner->pos.y = playerStatus->lastGoodPosition.y + playerStatus->colliderHeight; @@ -623,10 +623,10 @@ void update_player(void) { collisionStatus->floorBelow = 1; update_player_input(); - playerStatus->flags &= ~PS_FLAGS_SPECIAL_LAND; + playerStatus->flags &= ~PS_FLAG_SPECIAL_LAND; update_player_blink(); - if (playerStatus->flags & PS_FLAGS_NO_STATIC_COLLISION) { + if (playerStatus->flags & PS_FLAG_NO_STATIC_COLLISION) { phys_update_action_state(); if (!game_scripts_disabled()) { collision_main_lateral(); @@ -637,15 +637,15 @@ void update_player(void) { phys_update_lava_reset(); } - if (playerStatus->flags & PS_FLAGS_CUTSCENE_MOVEMENT) { + if (playerStatus->flags & PS_FLAG_CUTSCENE_MOVEMENT) { playerStatus->moveFrames--; if (playerStatus->moveFrames <= 0) { playerStatus->moveFrames = 0; - playerStatus->flags &= ~PS_FLAGS_CUTSCENE_MOVEMENT; + playerStatus->flags &= ~PS_FLAG_CUTSCENE_MOVEMENT; } } - if (!(playerStatus->animFlags & PA_FLAGS_USING_PEACH_PHYSICS)) { + if (!(playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS)) { handle_floor_behavior(); } @@ -658,7 +658,7 @@ void update_player(void) { gameStatus->playerYaw = playerStatus->currentYaw; check_input_open_menus(); - if (!(playerStatus->animFlags & PA_FLAGS_USING_PEACH_PHYSICS)) { + if (!(playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS)) { check_input_status_menu(); } @@ -671,8 +671,8 @@ void update_player(void) { playerStatus->pushVelocity.x = 0.0f; playerStatus->pushVelocity.y = 0.0f; playerStatus->pushVelocity.z = 0.0f; - playerStatus->flags &= ~PS_FLAGS_SLIDING; - playerStatus->animFlags &= ~PA_FLAGS_FORCE_USE_PARTNER; + playerStatus->flags &= ~PS_FLAG_SLIDING; + playerStatus->animFlags &= ~PA_FLAG_FORCE_USE_PARTNER; } void check_input_use_partner(void) { @@ -680,10 +680,10 @@ void check_input_use_partner(void) { PlayerData* playerData = &gPlayerData; u32 actionState = playerStatus->actionState; - if (!(playerStatus->animFlags & PA_FLAGS_8BIT_MARIO)) { - if (playerStatus->animFlags & PA_FLAGS_FORCE_USE_PARTNER || playerStatus->inputEnabledCounter == 0) { - if (playerStatus->pressedButtons & BUTTON_C_DOWN && !(playerStatus->flags & PS_FLAGS_NO_PARTNER_USAGE) && - !(playerStatus->pressedButtons & BUTTON_B) && !(playerStatus->animFlags & PA_FLAGS_USING_PEACH_PHYSICS) && + if (!(playerStatus->animFlags & PA_FLAG_8BIT_MARIO)) { + if (playerStatus->animFlags & PA_FLAG_FORCE_USE_PARTNER || playerStatus->inputEnabledCounter == 0) { + if (playerStatus->pressedButtons & BUTTON_C_DOWN && !(playerStatus->flags & PS_FLAG_NO_PARTNER_USAGE) && + !(playerStatus->pressedButtons & BUTTON_B) && !(playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS) && actionState <= ACTION_STATE_RUN) { if (playerData->currentPartner == PARTNER_GOOMBARIO) { @@ -702,14 +702,14 @@ void phys_update_standard(void) { check_input_use_partner(); phys_update_action_state(); - if (!(playerStatus->flags & PS_FLAGS_FLYING)) { - if (playerStatus->flags & PS_FLAGS_JUMPING) { + if (!(playerStatus->flags & PS_FLAG_FLYING)) { + if (playerStatus->flags & PS_FLAG_JUMPING) { phys_update_jump(); } } - if (playerStatus->flags & PS_FLAGS_FALLING) { - if (!(playerStatus->flags & PS_FLAGS_FLYING)) { + if (playerStatus->flags & PS_FLAG_FALLING) { + if (!(playerStatus->flags & PS_FLAG_FLYING)) { phys_update_falling(); } } @@ -721,7 +721,7 @@ void phys_update_standard(void) { collision_check_player_overlaps(); if (collision_main_above() < 0 && playerStatus->timeInAir == 0 && - playerStatus->animFlags & PA_FLAGS_USING_PEACH_PHYSICS) { + playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS) { collision_lateral_peach(); } @@ -731,11 +731,11 @@ void phys_update_standard(void) { } } - if (playerStatus->animFlags & PA_FLAGS_WATT_IN_HANDS) { + if (playerStatus->animFlags & PA_FLAG_WATT_IN_HANDS) { world_watt_sync_held_position(); } - if (!(playerStatus->flags & PS_FLAGS_CAMERA_DOESNT_FOLLOW)) { + if (!(playerStatus->flags & PS_FLAG_CAMERA_DOESNT_FOLLOW)) { gCameras[CAM_DEFAULT].targetPos.x = playerStatus->position.x; gCameras[CAM_DEFAULT].targetPos.y = playerStatus->position.y; gCameras[CAM_DEFAULT].targetPos.z = playerStatus->position.z; @@ -747,7 +747,7 @@ void phys_update_lava_reset(void) { collision_main_lateral(); collision_lava_reset_check_additional_overlaps(); - if (!(gPlayerStatusPtr->flags & PS_FLAGS_CAMERA_DOESNT_FOLLOW)) { + if (!(gPlayerStatusPtr->flags & PS_FLAG_CAMERA_DOESNT_FOLLOW)) { Camera* camera = &gCameras[CAM_DEFAULT]; camera->targetPos.x = gPlayerStatusPtr->position.x; @@ -764,7 +764,7 @@ void player_reset_data(void) { PlayerStatus* playerStatus = &gPlayerStatus; mem_clear(playerStatus, sizeof(PlayerStatus)); - playerStatus->flags = PS_FLAGS_HAS_REFLECTION; + playerStatus->flags = PS_FLAG_HAS_REFLECTION; reset_player_status(); playerStatus->shadowID = create_shadow_type(0, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z); @@ -813,17 +813,17 @@ s32 get_overriding_player_anim(s32 anim) { } if (anim == ANIM_Mario_6000C || anim == ANIM_Peach_C0010 || anim == ANIM_Mario_10002) { - if (!(playerStatus->animFlags & PA_FLAGS_USING_PEACH_PHYSICS)) { + if (!(playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS)) { if (!func_800DFCF4()) { return -1; } - } else if (!(playerStatus->animFlags & PA_FLAGS_INVISIBLE)) { + } else if (!(playerStatus->animFlags & PA_FLAG_INVISIBLE)) { anim = ANIM_Peach_C0010; } else { peach_set_disguise_anim(BasicPeachDisguiseAnims[playerStatus->peachDisguise].hold); return -1; } - } else if (playerStatus->animFlags & PA_FLAGS_USING_PEACH_PHYSICS) { + } else if (playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS) { if ((playerStatus->peachItemHeld != 0) && (anim == ANIM_Peach_C0000 || anim == ANIM_Peach_C0001 || anim == ANIM_Peach_C0002)) { anim = ANIM_Peach_D0000; @@ -844,7 +844,7 @@ void suggest_player_anim_clearUnkFlag(AnimID anim) { if (newAnim != -1) { playerStatus->anim = newAnim; playerStatus->animNotifyValue = 0; - playerStatus->flags &= ~PS_FLAGS_FACE_FORWARDS; + playerStatus->flags &= ~PS_FLAG_FACE_FORWARDS; } } @@ -853,7 +853,7 @@ void force_player_anim(AnimID anim) { playerStatus->anim = anim; playerStatus->animNotifyValue = 0; - playerStatus->flags &= ~PS_FLAGS_FACE_FORWARDS; + playerStatus->flags &= ~PS_FLAG_FACE_FORWARDS; } void suggest_player_anim_setUnkFlag(AnimID anim) { @@ -863,7 +863,7 @@ void suggest_player_anim_setUnkFlag(AnimID anim) { if (newAnim != -1) { playerStatus->anim = newAnim; playerStatus->animNotifyValue = 0; - playerStatus->flags |= PS_FLAGS_FACE_FORWARDS; + playerStatus->flags |= PS_FLAG_FACE_FORWARDS; } } @@ -894,13 +894,13 @@ void update_player_blink(void) { if (!playerStatus->blinkTimer) { if (outtaSight) { playerStatus->alpha1 = 128; - playerStatus->flags |= PS_FLAGS_HAZARD_INVINCIBILITY; + playerStatus->flags |= PS_FLAG_HAZARD_INVINCIBILITY; } else { playerStatus->alpha1 = 255; - playerStatus->flags &= ~PS_FLAGS_HAZARD_INVINCIBILITY; + playerStatus->flags &= ~PS_FLAG_HAZARD_INVINCIBILITY; } } else { - playerStatus->flags |= PS_FLAGS_HAZARD_INVINCIBILITY; + playerStatus->flags |= PS_FLAG_HAZARD_INVINCIBILITY; } } } @@ -913,17 +913,17 @@ f32 get_xz_dist_to_player(f32 x, f32 z) { } void enable_player_shadow(void) { - get_shadow_by_index(gPlayerStatus.shadowID)->flags &= ~ENTITY_FLAGS_HIDDEN; + get_shadow_by_index(gPlayerStatus.shadowID)->flags &= ~ENTITY_FLAG_HIDDEN; } void disable_player_shadow(void) { - get_shadow_by_index(gPlayerStatus.shadowID)->flags |= ENTITY_FLAGS_HIDDEN; + get_shadow_by_index(gPlayerStatus.shadowID)->flags |= ENTITY_FLAG_HIDDEN; } s32 disable_player_static_collisions(void) { PlayerStatus* playerStatus = &gPlayerStatus; - playerStatus->flags |= PS_FLAGS_NO_STATIC_COLLISION; + playerStatus->flags |= PS_FLAG_NO_STATIC_COLLISION; playerStatus->enableCollisionOverlapsCheck++; return playerStatus->enableCollisionOverlapsCheck; } @@ -933,7 +933,7 @@ s32 enable_player_static_collisions(void) { playerStatus->enableCollisionOverlapsCheck--; if (playerStatus->enableCollisionOverlapsCheck == 0) { - playerStatus->flags &= ~PS_FLAGS_NO_STATIC_COLLISION; + playerStatus->flags &= ~PS_FLAG_NO_STATIC_COLLISION; } return playerStatus->enableCollisionOverlapsCheck; } @@ -941,7 +941,7 @@ s32 enable_player_static_collisions(void) { s32 disable_player_input(void) { PlayerStatus* playerStatus = &gPlayerStatus; - playerStatus->flags |= PS_FLAGS_INPUT_DISABLED; + playerStatus->flags |= PS_FLAG_INPUT_DISABLED; playerStatus->inputEnabledCounter++; return playerStatus->inputEnabledCounter; } @@ -951,7 +951,7 @@ s32 enable_player_input(void) { playerStatus->inputEnabledCounter--; if (playerStatus->inputEnabledCounter == 0) { - playerStatus->flags &= ~PS_FLAGS_INPUT_DISABLED; + playerStatus->flags &= ~PS_FLAG_INPUT_DISABLED; } return playerStatus->inputEnabledCounter; } @@ -959,8 +959,8 @@ s32 enable_player_input(void) { void func_800E01DC(void) { PlayerStatus* playerStatus = &gPlayerStatus; - if (playerStatus->animFlags & PA_FLAGS_INTERACT_PROMPT_AVAILABLE) { - playerStatus->flags |= PS_FLAGS_INTERACTED; + if (playerStatus->animFlags & PA_FLAG_INTERACT_PROMPT_AVAILABLE) { + playerStatus->flags |= PS_FLAG_INTERACTED; } } @@ -988,7 +988,7 @@ void check_for_ispy(void) { if (D_8015A57A != 0 && ISpyNotificationCallback == NULL) { if (!(playerStatus->animFlags & - (PA_FLAGS_SPEECH_PROMPT_AVAILABLE | PA_FLAGS_INTERACT_PROMPT_AVAILABLE))) { + (PA_FLAG_SPEECH_PROMPT_AVAILABLE | PA_FLAG_INTERACT_PROMPT_AVAILABLE))) { dma_copy(E225B0_ROM_START, E225B0_ROM_END, E225B0_VRAM_DEF); ISpyNotificationCallback = func_802B72C0_E22870; } @@ -1000,14 +1000,14 @@ void check_for_ispy(void) { } void func_800E0330(void) { - if ((gPlayerStatusPtr->animFlags & PA_FLAGS_100) && (ISpyNotificationCallback != NULL)) { + if ((gPlayerStatusPtr->animFlags & PA_FLAG_100) && (ISpyNotificationCallback != NULL)) { func_802B7000_E225B0(); } } void func_800E0374(void) { ISpyNotificationCallback = NULL; - gPlayerStatusPtr->animFlags &= ~PA_FLAGS_100; + gPlayerStatusPtr->animFlags &= ~PA_FLAG_100; } void check_for_pulse_stone(void) { @@ -1015,7 +1015,7 @@ void check_for_pulse_stone(void) { s32 dx, dy; if (PulseStoneNotificationCallback == NULL) { - if (gPlayerStatus.animFlags & PA_FLAGS_100) { + if (gPlayerStatus.animFlags & PA_FLAG_100) { return; } @@ -1029,15 +1029,15 @@ void check_for_pulse_stone(void) { return; } - if (!(gPlayerStatus.animFlags & (PA_FLAGS_USING_PULSE_STONE | PA_FLAGS_40))) { + if (!(gPlayerStatus.animFlags & (PA_FLAG_USING_PULSE_STONE | PA_FLAG_40))) { return; } - if (gPlayerStatus.flags & PS_FLAGS_PAUSED || gPlayerStatus.inputEnabledCounter) { + if (gPlayerStatus.flags & PS_FLAG_PAUSED || gPlayerStatus.inputEnabledCounter) { return; } - if (!(gPlayerStatus.animFlags & (PA_FLAGS_SPEECH_PROMPT_AVAILABLE | PA_FLAGS_INTERACT_PROMPT_AVAILABLE))) { + if (!(gPlayerStatus.animFlags & (PA_FLAG_SPEECH_PROMPT_AVAILABLE | PA_FLAG_INTERACT_PROMPT_AVAILABLE))) { dma_copy(E21870_ROM_START, E21870_ROM_END, E21870_VRAM_DEF); PulseStoneNotificationCallback = func_802B7140; } @@ -1049,14 +1049,14 @@ void check_for_pulse_stone(void) { } void func_800E04D0(void) { - if ((gPlayerStatusPtr->animFlags & PA_FLAGS_40) && (PulseStoneNotificationCallback != 0)) { + if ((gPlayerStatusPtr->animFlags & PA_FLAG_40) && (PulseStoneNotificationCallback != 0)) { func_802B71D4(); } } void func_800E0514(void) { PulseStoneNotificationCallback = NULL; - gPlayerStatusPtr->animFlags &= ~PA_FLAGS_40; + gPlayerStatusPtr->animFlags &= ~PA_FLAG_40; } s32 has_valid_conversation_npc(void) { @@ -1066,20 +1066,20 @@ s32 has_valid_conversation_npc(void) { s32 cond; if (npc != NULL && !(npc->flags & NPC_FLAG_10000000)) { - cond = (playerStatus->flags & (PS_FLAGS_HAS_CONVERSATION_NPC | PS_FLAGS_INPUT_DISABLED)) - == PS_FLAGS_HAS_CONVERSATION_NPC; + cond = (playerStatus->flags & (PS_FLAG_HAS_CONVERSATION_NPC | PS_FLAG_INPUT_DISABLED)) + == PS_FLAG_HAS_CONVERSATION_NPC; ret = cond; } return ret; } void check_for_conversation_prompt(void) { - if (gPlayerStatus.animFlags & PA_FLAGS_100 || InteractNotificationCallback || PulseStoneNotificationCallback) { + if (gPlayerStatus.animFlags & PA_FLAG_100 || InteractNotificationCallback || PulseStoneNotificationCallback) { return; } if (TalkNotificationCallback == NULL) { - if (gPlayerStatus.inputEnabledCounter || gPlayerStatus.flags & PS_FLAGS_PAUSED) { + if (gPlayerStatus.inputEnabledCounter || gPlayerStatus.flags & PS_FLAG_PAUSED) { return; } @@ -1099,14 +1099,14 @@ void check_for_conversation_prompt(void) { } void func_800E0658(void) { - if ((gPlayerStatusPtr->animFlags & PA_FLAGS_SPEECH_PROMPT_AVAILABLE) && (TalkNotificationCallback != 0)) { + if ((gPlayerStatusPtr->animFlags & PA_FLAG_SPEECH_PROMPT_AVAILABLE) && (TalkNotificationCallback != 0)) { func_802B71C8(); } } void func_800E069C(void) { TalkNotificationCallback = NULL; - gPlayerStatusPtr->animFlags &= ~PA_FLAGS_SPEECH_PROMPT_AVAILABLE; + gPlayerStatusPtr->animFlags &= ~PA_FLAG_SPEECH_PROMPT_AVAILABLE; } void func_800E06C0(s32 arg0) { @@ -1125,7 +1125,7 @@ s32 func_800E06D8(void) { if (gCollisionStatus.currentWall == -1) { return FALSE; } - if (playerStatus->flags & PS_FLAGS_HAS_CONVERSATION_NPC && !(playerStatus->flags & PS_FLAGS_INPUT_DISABLED) + if (playerStatus->flags & PS_FLAG_HAS_CONVERSATION_NPC && !(playerStatus->flags & PS_FLAG_INPUT_DISABLED) && npc != NULL && npc->flags & NPC_FLAG_10000000) { playerStatus->interactingWithID = -1; return TRUE; @@ -1144,11 +1144,11 @@ s32 func_800E06D8(void) { } if (temp == wall) { - if (playerStatus->flags & PS_FLAGS_INTERACTED) { + if (playerStatus->flags & PS_FLAG_INTERACTED) { return FALSE; } } else { - playerStatus->flags &= ~PS_FLAGS_INTERACTED; + playerStatus->flags &= ~PS_FLAG_INTERACTED; } playerStatus->interactingWithID = -1; @@ -1162,7 +1162,7 @@ void check_for_interactables(void) { Npc* npc = gPlayerStatus.encounteredNPC; s32 phi_s2; - if ((playerStatus->animFlags & PA_FLAGS_100) || TalkNotificationCallback || PulseStoneNotificationCallback) { + if ((playerStatus->animFlags & PA_FLAG_100) || TalkNotificationCallback || PulseStoneNotificationCallback) { return; } @@ -1197,7 +1197,7 @@ void check_for_interactables(void) { curInteraction = -1; break; } - } else if (((playerStatus->flags & (PS_FLAGS_HAS_CONVERSATION_NPC | PS_FLAGS_INPUT_DISABLED)) == PS_FLAGS_HAS_CONVERSATION_NPC) + } else if (((playerStatus->flags & (PS_FLAG_HAS_CONVERSATION_NPC | PS_FLAG_INPUT_DISABLED)) == PS_FLAG_HAS_CONVERSATION_NPC) && (npc != NULL) && (npc->flags & NPC_FLAG_10000000)) { curInteraction = npc->npcID | COLLISION_WITH_NPC_BIT; if (playerStatus->interactingWithID == curInteraction) { @@ -1206,7 +1206,7 @@ void check_for_interactables(void) { phi_s2 = 0; } else { playerStatus->interactingWithID = -1; - playerStatus->flags &= ~PS_FLAGS_INTERACTED; + playerStatus->flags &= ~PS_FLAG_INTERACTED; return; } } else { @@ -1215,7 +1215,7 @@ void check_for_interactables(void) { if (!(curInteraction & COLLISION_WITH_NPC_BIT)) { if (!should_collider_allow_interact(curInteraction)) { playerStatus->interactingWithID = -1; - playerStatus->flags &= ~PS_FLAGS_INTERACTED; + playerStatus->flags &= ~PS_FLAG_INTERACTED; return; } } @@ -1223,30 +1223,30 @@ void check_for_interactables(void) { if (!phys_can_player_interact()) { phi_s2 = 1; playerStatus->interactingWithID = -1; - playerStatus->flags &= ~PS_FLAGS_INTERACTED; + playerStatus->flags &= ~PS_FLAG_INTERACTED; return; } phi_s2 = 1; } } if (playerStatus->interactingWithID == curInteraction) { - if ((playerStatus->flags & PS_FLAGS_INTERACTED)) { + if ((playerStatus->flags & PS_FLAG_INTERACTED)) { return; } } else { - playerStatus->flags &= ~PS_FLAGS_INTERACTED; + playerStatus->flags &= ~PS_FLAG_INTERACTED; } playerStatus->interactingWithID = curInteraction; - if ((phi_s2 == 0) || curInteraction >= 0 && get_entity_by_index(curInteraction)->flags & ENTITY_FLAGS_SHOWS_INSPECT_PROMPT) { + if ((phi_s2 == 0) || curInteraction >= 0 && get_entity_by_index(curInteraction)->flags & ENTITY_FLAG_SHOWS_INSPECT_PROMPT) { if (playerStatus->actionState == ACTION_STATE_IDLE || playerStatus->actionState == ACTION_STATE_WALK || playerStatus->actionState == ACTION_STATE_RUN) { - playerStatus->animFlags |= PA_FLAGS_INTERACT_PROMPT_AVAILABLE; + playerStatus->animFlags |= PA_FLAG_INTERACT_PROMPT_AVAILABLE; func_800EF3D4(2); } } } - if (!(playerStatus->animFlags & PA_FLAGS_INTERACT_PROMPT_AVAILABLE)) { + if (!(playerStatus->animFlags & PA_FLAG_INTERACT_PROMPT_AVAILABLE)) { func_800EF3D4(0); partner_reset_tether_distance(); return; @@ -1266,14 +1266,14 @@ void check_for_interactables(void) { void func_802B71E8_E202F8(void); void func_800E0AD0(void) { - if ((gPlayerStatusPtr->animFlags & PA_FLAGS_INTERACT_PROMPT_AVAILABLE) && (InteractNotificationCallback != 0)) { + if ((gPlayerStatusPtr->animFlags & PA_FLAG_INTERACT_PROMPT_AVAILABLE) && (InteractNotificationCallback != 0)) { func_802B71E8_E202F8(); } } void func_800E0B14(void) { InteractNotificationCallback = NULL; - gPlayerStatusPtr->animFlags &= ~PA_FLAGS_INTERACT_PROMPT_AVAILABLE; + gPlayerStatusPtr->animFlags &= ~PA_FLAG_INTERACT_PROMPT_AVAILABLE; } void update_partner_timers(void) { @@ -1338,7 +1338,7 @@ void player_sprite_behaviour(void) { } } - if (playerStatus->flags & PS_FLAGS_NO_FLIPPING) { + if (playerStatus->flags & PS_FLAG_NO_FLIPPING) { angle = 0.0f; } @@ -1351,15 +1351,15 @@ void player_sprite_behaviour(void) { } trueAnim = playerStatus->anim; - if (playerStatus->flags & PS_FLAGS_SPINNING) { + if (playerStatus->flags & PS_FLAG_SPINNING) { playerStatus->trueAnimation = trueAnim; } else { sprIndex = (trueAnim >> 0x10) & 0xFF; - if (playerStatus->actionState != ACTION_STATE_TORNADO_JUMP && !(playerStatus->flags & PS_FLAGS_ROTATION_LOCKED)) { + if (playerStatus->actionState != ACTION_STATE_TORNADO_JUMP && !(playerStatus->flags & PS_FLAG_ROTATION_LOCKED)) { playerStatus->spriteFacingAngle = angle + D_800F7B48; trueAnim = playerStatus->anim; - if (!(playerStatus->flags & PS_FLAGS_FACE_FORWARDS) && + if (!(playerStatus->flags & PS_FLAG_FACE_FORWARDS) && (sprIndex == SPR_Mario_1 || sprIndex == SPR_Mario_6 || sprIndex == SPR_Peach_A) && fabsf(get_clamped_angle_diff(cameraYaw, playerStatus->currentYaw)) < 60.0f) { @@ -1369,7 +1369,7 @@ void player_sprite_behaviour(void) { playerStatus->currentYaw = playerStatus->targetYaw; } else { trueAnim = playerStatus->anim; - if (!(playerStatus->flags & PS_FLAGS_FACE_FORWARDS) && + if (!(playerStatus->flags & PS_FLAG_FACE_FORWARDS) && (sprIndex == SPR_Mario_1 || sprIndex == SPR_Mario_6 || sprIndex == SPR_Peach_A) && playerStatus->spriteFacingAngle < 350.0f && playerStatus->spriteFacingAngle > 190.0f) { @@ -1380,14 +1380,14 @@ void player_sprite_behaviour(void) { } timescale = 1.0f; - if (playerStatus->flags & PS_FLAGS_ENTERING_BATTLE) { + if (playerStatus->flags & PS_FLAG_ENTERING_BATTLE) { timescale = 0.5f; } - if (playerStatus->flags & PS_FLAGS_TIME_STOPPED) { + if (playerStatus->flags & PS_FLAG_TIME_STOPPED) { timescale = 0.0f; } playerStatus->animNotifyValue = spr_update_player_sprite(0, playerStatus->trueAnimation, timescale); - playerStatus->flags |= PS_FLAGS_SPRITE_REDRAW; + playerStatus->flags |= PS_FLAG_SPRITE_REDRAW; } s32 get_player_back_anim(s32 anim) { @@ -1451,14 +1451,14 @@ void render_player_model(void) { s8 renderModeTemp; void (*appendGfx)(void*); - if (playerStatus->flags & PS_FLAGS_SPRITE_REDRAW) { - playerStatus->flags &= ~PS_FLAGS_SPRITE_REDRAW; + if (playerStatus->flags & PS_FLAG_SPRITE_REDRAW) { + playerStatus->flags &= ~PS_FLAG_SPRITE_REDRAW; get_screen_coords(gCurrentCamID, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z, &x, &y, &z); - if (!(playerStatus->flags & PS_FLAGS_SPINNING)) { + if (!(playerStatus->flags & PS_FLAG_SPINNING)) { if (playerStatus->alpha1 != playerStatus->alpha2) { if (playerStatus->alpha1 < 254) { - if (!(playerStatus->animFlags & PA_FLAGS_MAP_HAS_SWITCH)) { + if (!(playerStatus->animFlags & PA_FLAG_MAP_HAS_SWITCH)) { renderModeTemp = RENDER_MODE_SURFACE_XLU_LAYER1; } else { renderModeTemp = RENDER_MODE_SURFACE_XLU_LAYER2; @@ -1480,13 +1480,13 @@ void render_player_model(void) { playerStatus->alpha2 = 0; } - if (!(playerStatus->animFlags & PA_FLAGS_INVISIBLE)) { + if (!(playerStatus->animFlags & PA_FLAG_INVISIBLE)) { rtPtr->appendGfxArg = playerStatus; rtPtr->distance = -z; rtPtr->renderMode = playerStatus->renderMode; - if (!(playerStatus->flags & PS_FLAGS_SPINNING)) { + if (!(playerStatus->flags & PS_FLAG_SPINNING)) { appendGfx = appendGfx_player; } else { appendGfx = appendGfx_player_spin; @@ -1532,8 +1532,8 @@ void appendGfx_player(void* data) { guTranslateF(sp60, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z); guMtxCatF(sp20, sp60, sp20); - if (playerStatus->animFlags & PA_FLAGS_SHIVERING) { - playerStatus->animFlags = playerStatus->animFlags & ~PA_FLAGS_SHIVERING; + if (playerStatus->animFlags & PA_FLAG_SHIVERING) { + playerStatus->animFlags = playerStatus->animFlags & ~PA_FLAG_SHIVERING; playerStatus->shiverTime = 22; func_802DDEE4(0, -1, 0, 0, 0, 0, 0, 0); func_802DDFF8(playerStatus->anim, 5, 1, 1, 1, 0, 0); diff --git a/src/7B440.c b/src/7B440.c index 8f6ffb7a7b..ae44959bbe 100644 --- a/src/7B440.c +++ b/src/7B440.c @@ -22,7 +22,7 @@ void update_player_input(void) { playerStatus->heldButtonsBuffer[inputBufPos] = playerStatus->heldButtons; playerStatus->inputBufPos = inputBufPos; - if (playerStatus->flags & (PS_FLAGS_INPUT_DISABLED | PS_FLAGS_NO_STATIC_COLLISION)) { + if (playerStatus->flags & (PS_FLAG_INPUT_DISABLED | PS_FLAG_NO_STATIC_COLLISION)) { playerStatus->stickAxis[0] = 0; playerStatus->stickAxis[1] = 0; playerStatus->currentButtons = 0; @@ -30,8 +30,8 @@ void update_player_input(void) { playerStatus->heldButtons = 0; } - if (playerStatus->animFlags & PA_FLAGS_FORCE_USE_PARTNER) { - playerStatus->animFlags |= PA_FLAGS_PARTNER_USAGE_FORCED; + if (playerStatus->animFlags & PA_FLAG_FORCE_USE_PARTNER) { + playerStatus->animFlags |= PA_FLAG_PARTNER_USAGE_FORCED; playerStatus->pressedButtons |= 4; } } @@ -67,7 +67,7 @@ void reset_player_status(void) { if (gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_IS_PEACH) { playerStatus->colliderHeight = 55; playerStatus->colliderDiameter = 38; - playerStatus->animFlags |= PA_FLAGS_USING_PEACH_PHYSICS; + playerStatus->animFlags |= PA_FLAG_USING_PEACH_PHYSICS; if (gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_DISGUISED) { D_8010C92C = 2; diff --git a/src/7E9D0.c b/src/7E9D0.c index 7f1b9aa321..225cec2a20 100644 --- a/src/7E9D0.c +++ b/src/7E9D0.c @@ -154,9 +154,9 @@ s32 phys_adjust_cam_on_landing(void) { gCameras[0].moveFlags &= ~CAMERA_MOVE_IGNORE_PLAYER_Y; } } else if (partnerActionStatus->partnerActionState != PARTNER_ACTION_NONE && partnerActionStatus->actingPartner == PARTNER_PARAKARRY) { - gCameras[0].moveFlags |= CAMERA_MOVE_FLAGS_2; + gCameras[0].moveFlags |= CAMERA_MOVE_FLAG_2; } else { - gCameras[0].moveFlags &= ~CAMERA_MOVE_FLAGS_2; + gCameras[0].moveFlags &= ~CAMERA_MOVE_FLAG_2; } return ret; @@ -212,11 +212,11 @@ void phys_update_action_state(void) { PlayerStatus* playerStatus = &gPlayerStatus; PlayerSpinState* playerSpinState = &gPlayerSpinState; - if (!(playerStatus->flags & PS_FLAGS_ENTERING_BATTLE)) { - playerStatus->flags &= ~PS_FLAGS_TIME_STOPPED; + if (!(playerStatus->flags & PS_FLAG_ENTERING_BATTLE)) { + playerStatus->flags &= ~PS_FLAG_TIME_STOPPED; } - if (playerStatus->animFlags & PA_FLAGS_USING_PEACH_PHYSICS) { + if (playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS) { phys_peach_update(); return; } @@ -224,7 +224,7 @@ void phys_update_action_state(void) { if (playerStatus->camResetDelay != 0) { playerStatus->camResetDelay--; if (playerStatus->camResetDelay == 0) { - gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_FLAGS_4; + gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_FLAG_4; } } @@ -240,7 +240,7 @@ void phys_update_action_state(void) { if (playerSpinState->stopSoundTimer != 0) { playerSpinState->stopSoundTimer--; if (playerSpinState->stopSoundTimer == 0) { - playerStatus->animFlags &= ~PA_FLAGS_SPINNING; + playerStatus->animFlags &= ~PA_FLAG_SPINNING; if (playerSpinState->spinSoundID != 0) { sfx_stop_sound(playerSpinState->spinSoundID); } @@ -253,19 +253,19 @@ void phys_update_action_state(void) { if (actionState == ACTION_STATE_IDLE || actionState == ACTION_STATE_WALK || actionState == ACTION_STATE_RUN) { s32 cond; - if (!(playerStatus->flags & PS_FLAGS_INPUT_DISABLED)) { + if (!(playerStatus->flags & PS_FLAG_INPUT_DISABLED)) { cond = check_conversation_trigger(); } else { cond = FALSE; } - if ((partnerActionStatus->partnerActionState == PARTNER_ACTION_NONE) && !(playerStatus->flags & PS_FLAGS_PAUSED) && cond) { + if ((partnerActionStatus->partnerActionState == PARTNER_ACTION_NONE) && !(playerStatus->flags & PS_FLAG_PAUSED) && cond) { set_action_state(ACTION_STATE_TALK); } check_input_spin(); } - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { void* dmaStart = PlayerActionsTable[playerStatus->actionState].dmaStart; if (dmaStart != NULL && dmaStart != D_8010C924) { @@ -274,7 +274,7 @@ void phys_update_action_state(void) { } } PlayerActionsTable[playerStatus->actionState].update(); - } while (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED); + } while (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED); } void phys_peach_update(void) { @@ -283,11 +283,11 @@ void phys_peach_update(void) { func_800E24F8(); do { - if (!(playerStatus->flags & PS_FLAGS_PAUSED) && check_conversation_trigger()) { + if (!(playerStatus->flags & PS_FLAG_PAUSED) && check_conversation_trigger()) { set_action_state(ACTION_STATE_TALK); } - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { Action* action = &PlayerActionsTable[playerStatus->actionState]; if (action->flag) { @@ -307,10 +307,10 @@ void phys_peach_update(void) { PlayerActionsTable[playerStatus->actionState].update(); } } - } while (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED); + } while (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED); peach_check_for_parasol_input(); - if (playerStatus->animFlags & PA_FLAGS_INVISIBLE) { + if (playerStatus->animFlags & PA_FLAG_INVISIBLE) { peach_sync_disguise_npc(); } } @@ -320,12 +320,12 @@ void set_action_state(s32 actionState) { PlayerData* playerData = &gPlayerData; PlayerSpinState* spinState = &gPlayerSpinState; - if (playerStatus->flags & PS_FLAGS_SPECIAL_JUMP) { - playerStatus->flags &= ~PS_FLAGS_SPECIAL_JUMP; + if (playerStatus->flags & PS_FLAG_SPECIAL_JUMP) { + playerStatus->flags &= ~PS_FLAG_SPECIAL_JUMP; enable_player_input(); } - if (playerStatus->animFlags & PA_FLAGS_8BIT_MARIO) { + if (playerStatus->animFlags & PA_FLAG_8BIT_MARIO) { // TODO figure this out #ifdef NON_EQUIVALENT if ( @@ -342,7 +342,7 @@ void set_action_state(s32 actionState) { #endif playerStatus->prevActionState = playerStatus->actionState; playerStatus->actionState = actionState; - playerStatus->flags |= PS_FLAGS_ACTION_STATE_CHANGED; + playerStatus->flags |= PS_FLAG_ACTION_STATE_CHANGED; } return; } @@ -359,17 +359,17 @@ void set_action_state(s32 actionState) { if (partner == PARTNER_SUSHIE || partner == PARTNER_LAKILESTER || partner == PARTNER_PARAKARRY) { if (gPartnerActionStatus.partnerActionState != PARTNER_ACTION_NONE) { - playerStatus->animFlags |= PA_FLAGS_INTERRUPT_USE_PARTNER; - playerStatus->flags |= PS_FLAGS_HIT_FIRE; + playerStatus->animFlags |= PA_FLAG_INTERRUPT_USE_PARTNER; + playerStatus->flags |= PS_FLAG_HIT_FIRE; return; } } } if (actionState == ACTION_STATE_SLIDING) { - playerStatus->flags |= PS_FLAGS_SLIDING; + playerStatus->flags |= PS_FLAG_SLIDING; playerStatus->moveFrames = 0; - playerStatus->flags &= ~PS_FLAGS_CUTSCENE_MOVEMENT; + playerStatus->flags &= ~PS_FLAG_CUTSCENE_MOVEMENT; } playerStatus->prevActionState = playerStatus->actionState; @@ -378,17 +378,17 @@ void set_action_state(s32 actionState) { } if (actionState == ACTION_STATE_ENEMY_FIRST_STRIKE) { - playerStatus->animFlags |= PA_FLAGS_INTERRUPT_USE_PARTNER; + playerStatus->animFlags |= PA_FLAG_INTERRUPT_USE_PARTNER; } playerStatus->actionState = actionState; - playerStatus->flags |= PS_FLAGS_ACTION_STATE_CHANGED; + playerStatus->flags |= PS_FLAG_ACTION_STATE_CHANGED; if (playerStatus->actionState == ACTION_STATE_SPIN) { return; } - playerStatus->flags &= ~PS_FLAGS_SPINNING; - playerStatus->animFlags &= ~PA_FLAGS_SPINNING; + playerStatus->flags &= ~PS_FLAG_SPINNING; + playerStatus->animFlags &= ~PA_FLAG_SPINNING; if (spinState->spinSoundID != 0) { sfx_stop_sound(spinState->spinSoundID); @@ -437,7 +437,7 @@ void start_bounce_b(void) { playerStatus->gravityIntegrator[1] = -1.0f; playerStatus->gravityIntegrator[2] = 0; playerStatus->gravityIntegrator[3] = 0; - playerStatus->flags |= PS_FLAGS_SCRIPTED_FALL; + playerStatus->flags |= PS_FLAG_SCRIPTED_FALL; } s32 check_input_hammer(void) { @@ -445,7 +445,7 @@ s32 check_input_hammer(void) { PlayerData* playerData = &gPlayerData; if (playerStatus->pressedButtons & BUTTON_B) { - if (playerStatus->flags & PS_FLAGS_FALLING) { + if (playerStatus->flags & PS_FLAG_FALLING) { return FALSE; } @@ -472,15 +472,15 @@ s32 check_input_jump(void) { return FALSE; } - // @bug? collider flags not properly masked with COLLIDER_FLAGS_SURFACE_TYPE + // @bug? collider flags not properly masked with COLLIDER_FLAG_SURFACE_TYPE surfaceType = get_collider_flags((u16)gCollisionStatus.currentFloor); if ((surfaceType == SURFACE_TYPE_SLIDE) && phys_should_player_be_sliding()) { return FALSE; } if (collisionStatus->touchingWallTrigger != 0 || - (playerStatus->animFlags & (PA_FLAGS_SPEECH_PROMPT_AVAILABLE | - PA_FLAGS_INTERACT_PROMPT_AVAILABLE))) + (playerStatus->animFlags & (PA_FLAG_SPEECH_PROMPT_AVAILABLE | + PA_FLAG_INTERACT_PROMPT_AVAILABLE))) { return FALSE; } @@ -488,8 +488,8 @@ s32 check_input_jump(void) { if ((collisionStatus->currentInspect != -1) && (collisionStatus->currentInspect & COLLISION_WITH_ENTITY_BIT)) { Entity* entity = get_entity_by_index(collisionStatus->currentInspect); - if (entity->flags & ENTITY_FLAGS_SHOWS_INSPECT_PROMPT) { - if ((entity->boundScriptBytecode == 0) || (entity->flags & ENTITY_FLAGS_4000)) { + if (entity->flags & ENTITY_FLAG_SHOWS_INSPECT_PROMPT) { + if ((entity->boundScriptBytecode == 0) || (entity->flags & ENTITY_FLAG_4000)) { if (entity->type == ENTITY_TYPE_PINK_FLOWER || entity->type == ENTITY_TYPE_BELLBELL_PLANT || entity->type == ENTITY_TYPE_TRUMPET_PLANT) @@ -511,8 +511,8 @@ void check_input_spin(void) { PlayerSpinState* spinState = &gPlayerSpinState; PlayerSpinState* temp2 = spinState; - if (!((playerStatus->flags & (PS_FLAGS_NO_STATIC_COLLISION | PS_FLAGS_CUTSCENE_MOVEMENT)) || - (playerStatus->animFlags & PA_FLAGS_USING_WATT) || + if (!((playerStatus->flags & (PS_FLAG_NO_STATIC_COLLISION | PS_FLAG_CUTSCENE_MOVEMENT)) || + (playerStatus->animFlags & PA_FLAG_USING_WATT) || (playerStatus->currentButtons & BUTTON_C_DOWN) || is_ability_active(ABILITY_SLOW_GO))) { @@ -523,7 +523,7 @@ void check_input_spin(void) { if (actionState != ACTION_STATE_RIDE) { if (actionState < ACTION_STATE_STEP_UP) { if (actionState < ACTION_STATE_JUMP) { - if (actionState >= 0 && !(playerStatus->animFlags & PA_FLAGS_SPINNING)) { + if (actionState >= 0 && !(playerStatus->animFlags & PA_FLAG_SPINNING)) { if (btnPressed || spinState->hasBufferedSpin) { set_action_state(ACTION_STATE_SPIN); if (spinState->hasBufferedSpin != FALSE) { @@ -555,7 +555,7 @@ void peach_force_disguise_action(s32 useParasol) { if (useParasol) { set_action_state(ACTION_STATE_USE_SNEAKY_PARASOL); } else { - playerStatus->animFlags &= ~PA_FLAGS_INVISIBLE; + playerStatus->animFlags &= ~PA_FLAG_INVISIBLE; gGameStatusPtr->peachFlags &= ~PEACH_STATUS_FLAG_DISGUISED; playerStatus->peachDisguise = 0; free_npc_by_index(PeachDisguiseNpcIndex); @@ -575,7 +575,7 @@ void peach_check_for_parasol_input(void) { D_8010C92C--; if (D_8010C92C == 0) { if (gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_DISGUISED) { - playerStatus->animFlags |= PA_FLAGS_INVISIBLE; + playerStatus->animFlags |= PA_FLAG_INVISIBLE; gGameStatusPtr->peachFlags |= PEACH_STATUS_FLAG_DISGUISED; disguiseNpc = peach_make_disguise_npc(gGameStatusPtr->peachDisguise); diff --git a/src/7bb60_len_41b0.c b/src/7bb60_len_41b0.c index fa9dd0e33c..c8cdff8be2 100644 --- a/src/7bb60_len_41b0.c +++ b/src/7bb60_len_41b0.c @@ -34,7 +34,7 @@ s32 can_trigger_loading_zone(void) { if (partnerActionStatus->partnerActionState != PARTNER_ACTION_NONE) { return TRUE; } else { - gPlayerStatusPtr->animFlags |= PA_FLAGS_INTERRUPT_USE_PARTNER; + gPlayerStatusPtr->animFlags |= PA_FLAG_INTERRUPT_USE_PARTNER; return FALSE; } } else { @@ -42,7 +42,7 @@ s32 can_trigger_loading_zone(void) { return partnerActionStatus->partnerActionState != PARTNER_ACTION_NONE; } if (partnerActionStatus->actingPartner == PARTNER_PARAKARRY) { - gPlayerStatusPtr->animFlags |= PA_FLAGS_INTERRUPT_USE_PARTNER; + gPlayerStatusPtr->animFlags |= PA_FLAG_INTERRUPT_USE_PARTNER; return FALSE; } } @@ -51,12 +51,12 @@ s32 can_trigger_loading_zone(void) { } void move_player(s32 duration, f32 heading, f32 speed) { - gPlayerStatus.flags |= PS_FLAGS_CUTSCENE_MOVEMENT; + gPlayerStatus.flags |= PS_FLAG_CUTSCENE_MOVEMENT; gPlayerStatus.heading = heading; gPlayerStatus.moveFrames = duration; gPlayerStatus.currentSpeed = speed; - if (!(gPlayerStatus.animFlags & PA_FLAGS_RIDING_PARTNER)) { + if (!(gPlayerStatus.animFlags & PA_FLAG_RIDING_PARTNER)) { set_action_state(speed > gPlayerStatus.walkSpeed ? ACTION_STATE_RUN : ACTION_STATE_WALK); } } @@ -123,8 +123,8 @@ void handle_switch_hit(void) { f32 groundPosY; AnimID anim; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~PS_FLAGS_ACTION_STATE_CHANGED; + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; playerStatus->actionSubstate = LANDING_ON_SWITCH_SUBSTATE_0; } @@ -151,7 +151,7 @@ void handle_switch_hit(void) { player_handle_floor_collider_type(colliderID); playerStatus->position.y = groundPosY; if (colliderID >= 0) { - if (!(playerStatus->animFlags & PA_FLAGS_USING_WATT)) { + if (!(playerStatus->animFlags & PA_FLAG_USING_WATT)) { anim = ANIM_Mario_10009; } else { anim = ANIM_Mario_6000B; @@ -242,7 +242,7 @@ void phys_update_jump(void) { record_jump_apex(); set_action_state(ACTION_STATE_HOP); integrate_gravity(); - if (playerStatus->flags & PS_FLAGS_ENTERING_BATTLE) { + if (playerStatus->flags & PS_FLAG_ENTERING_BATTLE) { playerStatus->gravityIntegrator[1] *= 0.5f; playerStatus->gravityIntegrator[2] *= 0.5f; playerStatus->gravityIntegrator[3] *= 0.5f; @@ -285,7 +285,7 @@ void phys_init_integrator_for_current_state(void) { case ACTION_STATE_HIT_FIRE: case ACTION_STATE_HIT_LAVA: params = GravityParamsStartJump; - if (!(playerStatus->flags & PS_FLAGS_ENTERING_BATTLE)) { + if (!(playerStatus->flags & PS_FLAG_ENTERING_BATTLE)) { playerStatus->gravityIntegrator[0] = *params++; playerStatus->gravityIntegrator[1] = *params++; playerStatus->gravityIntegrator[2] = *params++; @@ -309,7 +309,7 @@ void gravity_use_fall_parms(void) { do {} while (0); playerStatus = &gPlayerStatus; - if (playerStatus->flags & PS_FLAGS_ENTERING_BATTLE) { + if (playerStatus->flags & PS_FLAG_ENTERING_BATTLE) { playerStatus->gravityIntegrator[0] = *params++ / 12.0f; playerStatus->gravityIntegrator[1] = *params++ / 12.0f; playerStatus->gravityIntegrator[2] = *params++ / 12.0f; @@ -383,10 +383,10 @@ void phys_player_land(void) { playerStatus->timeInAir = 0; playerStatus->peakJumpTime = 0; - playerStatus->flags &= ~PS_FLAGS_SCRIPTED_FALL; + playerStatus->flags &= ~PS_FLAG_SCRIPTED_FALL; playerStatus->landPos.x = playerStatus->position.x; playerStatus->landPos.z = playerStatus->position.z; - playerStatus->flags &= ~PS_FLAGS_AIRBORNE; + playerStatus->flags &= ~PS_FLAG_AIRBORNE; sfx_play_sound_at_player(SOUND_SOFT_LAND, 0); if (!(collisionStatus->currentFloor & COLLISION_WITH_ENTITY_BIT)) { phys_adjust_cam_on_landing(); @@ -416,7 +416,7 @@ void phys_player_land(void) { } } - if (playerStatus->flags & PS_FLAGS_CUTSCENE_MOVEMENT) { + if (playerStatus->flags & PS_FLAG_CUTSCENE_MOVEMENT) { set_action_state(ACTION_STATE_RUN); return; } @@ -445,7 +445,7 @@ void phys_player_land(void) { f32 integrate_gravity(void) { PlayerStatus* playerStatus = &gPlayerStatus; - if (playerStatus->flags & PS_FLAGS_ENTERING_BATTLE) { + if (playerStatus->flags & PS_FLAG_ENTERING_BATTLE) { playerStatus->gravityIntegrator[2] += playerStatus->gravityIntegrator[3] / 1.7f; playerStatus->gravityIntegrator[1] += playerStatus->gravityIntegrator[2] / 1.7f; playerStatus->gravityIntegrator[0] += playerStatus->gravityIntegrator[1] / 1.7f; @@ -508,9 +508,9 @@ void collision_main_lateral(void) { f32 zBump; gCollisionStatus.pushingAgainstWall = -1; - if (playerStatus->flags & PS_FLAGS_CUTSCENE_MOVEMENT) { + if (playerStatus->flags & PS_FLAG_CUTSCENE_MOVEMENT) { speed = playerStatus->currentSpeed; - if (playerStatus->flags & PS_FLAGS_ENTERING_BATTLE) { + if (playerStatus->flags & PS_FLAG_ENTERING_BATTLE) { speed *= 0.5f; } add_vec2D_polar(&playerStatus->position.x, &playerStatus->position.z, speed, playerStatus->heading); @@ -597,21 +597,21 @@ void collision_main_lateral(void) { } break; default: - if (!(playerStatus->flags & PS_FLAGS_FLYING)) { + if (!(playerStatus->flags & PS_FLAG_FLYING)) { f32 new_var; speed = 0.0f; - if (!(playerStatus->flags & (PS_FLAGS_SCRIPTED_FALL | PS_FLAGS_INPUT_DISABLED))) { + if (!(playerStatus->flags & (PS_FLAG_SCRIPTED_FALL | PS_FLAG_INPUT_DISABLED))) { player_input_to_move_vector(&yaw, &speed); - if (!(playerStatus->animFlags & PA_FLAGS_SPINNING)) { + if (!(playerStatus->animFlags & PA_FLAG_SPINNING)) { speed *= 0.03125f; - if (!(playerStatus->flags & (PS_FLAGS_FALLING | PS_FLAGS_JUMPING))) { + if (!(playerStatus->flags & (PS_FLAG_FALLING | PS_FLAG_JUMPING))) { speed *= 0.25; } if (playerStatus->actionState == ACTION_STATE_LAUNCH) { speed *= 1.5; } - if (playerStatus->flags & PS_FLAGS_ENTERING_BATTLE) { + if (playerStatus->flags & PS_FLAG_ENTERING_BATTLE) { speed *= 0.5f; } } @@ -625,7 +625,7 @@ void collision_main_lateral(void) { xBump = 0.0f; zBump = -speed * cosTheta; } - } else if (!(playerStatus->animFlags & PA_FLAGS_SPINNING)) { + } else if (!(playerStatus->animFlags & PA_FLAG_SPINNING)) { xBump = speed * sinTheta; zBump = -speed * cosTheta; } else { @@ -635,14 +635,14 @@ void collision_main_lateral(void) { sin_cos_rad(DEG_TO_RAD(playerStatus->targetYaw), &sinTheta, &cosTheta); speed = playerStatus->currentSpeed; - if (playerStatus->flags & PS_FLAGS_ENTERING_BATTLE) { + if (playerStatus->flags & PS_FLAG_ENTERING_BATTLE) { speed *= 0.5f; } playerX = xBump + (speed * sinTheta); playerZ = zBump - (speed * cosTheta); yaw = atan2(0.0f, 0.0f, playerX, playerZ); speed = sqrtf(SQ(playerX) + SQ(playerZ)); - if (playerStatus->flags & (PS_FLAGS_FALLING | PS_FLAGS_JUMPING)) { + if (playerStatus->flags & (PS_FLAG_FALLING | PS_FLAG_JUMPING)) { if (speed > playerStatus->runSpeed) { speed = playerStatus->runSpeed; } @@ -680,7 +680,7 @@ void collision_main_lateral(void) { playerStatus->colliderDiameter, yaw2); } collisionStatus->currentWall = result; - if (!(playerStatus->flags & PS_FLAGS_MOVEMENT_LOCKED) && playerStatus->actionState != ACTION_STATE_HAMMER) { + if (!(playerStatus->flags & PS_FLAG_MOVEMENT_LOCKED) && playerStatus->actionState != ACTION_STATE_HAMMER) { if (speed == 0.0f) { collision_check_player_intersecting_world(0, 0, @@ -729,7 +729,7 @@ void collision_main_lateral(void) { } if (playerStatus->enableCollisionOverlapsCheck == 0) { - if (playerStatus->animFlags & PA_FLAGS_SPINNING) { + if (playerStatus->animFlags & PA_FLAG_SPINNING) { yaw2 = playerStatus->targetYaw; } else { yaw2 = playerStatus->spriteFacingAngle - 90.0f + gCameras[gCurrentCameraID].currentYaw; @@ -903,7 +903,7 @@ void phys_main_collision_below(void) { return; } - if (playerStatus->flags & PS_FLAGS_AIRBORNE) { + if (playerStatus->flags & PS_FLAG_AIRBORNE) { return; } @@ -911,7 +911,7 @@ void phys_main_collision_below(void) { return; } - if ((!(playerStatus->flags & PS_FLAGS_SLIDING) || + if ((!(playerStatus->flags & PS_FLAG_SLIDING) || (phys_adjust_cam_on_landing(), !phys_should_player_be_sliding()) || (set_action_state(ACTION_STATE_SLIDING), (playerStatus->actionState != ACTION_STATE_SLIDING)))) { @@ -949,7 +949,7 @@ void phys_main_collision_below(void) { } if (playerStatus->actionState != ACTION_STATE_STEP_UP && !cond) { - if (!(playerStatus->animFlags & PA_FLAGS_USING_PEACH_PHYSICS)) { + if (!(playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS)) { if (playerY - playerStatus->position.y < 6.0f) { playerStatus->position.y = playerY; } else { @@ -964,7 +964,7 @@ void phys_main_collision_below(void) { } break; } - } else if (!(playerStatus->flags & PS_FLAGS_FLYING) && + } else if (!(playerStatus->flags & PS_FLAG_FLYING) && playerStatus->actionState != ACTION_STATE_USE_SPINNING_FLOWER) { if (outLength <= collHeightHalf + temp_f24 && hitDirX == 0.0f && hitDirZ == 0.0f) { @@ -994,7 +994,7 @@ void collision_lava_reset_check_additional_overlaps(void) { f32 x, y, z; f32 temp_f0; - if (playerStatus->animFlags & PA_FLAGS_USING_PEACH_PHYSICS) { + if (playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS) { collision_lateral_peach(); return; } @@ -1079,8 +1079,8 @@ void collision_lateral_peach(void) { } void check_input_midair_jump(void) { - if (!(gPlayerStatus.flags & (PS_FLAGS_SCRIPTED_FALL | PS_FLAGS_SLIDING | PS_FLAGS_FLYING)) && - !(gPlayerStatus.animFlags & (PA_FLAGS_8BIT_MARIO | PA_FLAGS_USING_WATT)) && + if (!(gPlayerStatus.flags & (PS_FLAG_SCRIPTED_FALL | PS_FLAG_SLIDING | PS_FLAG_FLYING)) && + !(gPlayerStatus.animFlags & (PA_FLAG_8BIT_MARIO | PA_FLAG_USING_WATT)) && gPlayerStatus.peakJumpTime >= 6 && gPlayerStatus.timeInAir < 18 && gPlayerStatus.pressedButtons & BUTTON_A) { @@ -1090,11 +1090,11 @@ void check_input_midair_jump(void) { break; case 1: set_action_state(ACTION_STATE_SPIN_JUMP); - gPlayerStatus.flags |= PS_FLAGS_FLYING; + gPlayerStatus.flags |= PS_FLAG_FLYING; break; case 2: set_action_state(ACTION_STATE_TORNADO_JUMP); - gPlayerStatus.flags |= PS_FLAGS_FLYING; + gPlayerStatus.flags |= PS_FLAG_FLYING; break; } } @@ -1135,7 +1135,7 @@ s32 phys_check_interactable_collision(void) { f32 x, y, z, yaw; s32 ret = -1; - if (playerStatus->flags & PS_FLAGS_INPUT_DISABLED) { + if (playerStatus->flags & PS_FLAG_INPUT_DISABLED) { return ret; } diff --git a/src/7fd10_len_b40.c b/src/7fd10_len_b40.c index dc319026cd..31a51b663a 100644 --- a/src/7fd10_len_b40.c +++ b/src/7fd10_len_b40.c @@ -41,12 +41,12 @@ s32 func_800E6904(void) { PlayerStatus* playerStatus = &gPlayerStatus; s32 actionState = playerStatus->actionState; - if (playerStatus->animFlags & PA_FLAGS_CHANGING_MAP) { + if (playerStatus->animFlags & PA_FLAG_CHANGING_MAP) { return FALSE; } if (partnerActionStatus->partnerActionState == PARTNER_ACTION_NONE) { - if (!(playerStatus->flags & PS_FLAGS_NO_STATIC_COLLISION) && + if (!(playerStatus->flags & PS_FLAG_NO_STATIC_COLLISION) && (actionState == ACTION_STATE_IDLE || actionState == ACTION_STATE_WALK || actionState == ACTION_STATE_RUN)) { return TRUE; @@ -72,17 +72,17 @@ s32 can_pause(s32 currentButtons, s32 pressedButtons) { PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus; s32 actionState = gPlayerStatus.actionState; - if (!(gPlayerStatus.animFlags & PA_FLAGS_CHANGING_MAP) && - !(gPlayerStatus.flags & PS_FLAGS_PAUSE_DISABLED) && + if (!(gPlayerStatus.animFlags & PA_FLAG_CHANGING_MAP) && + !(gPlayerStatus.flags & PS_FLAG_PAUSE_DISABLED) && !(currentButtons & (BUTTON_Z | BUTTON_R)) && (pressedButtons & (BUTTON_START | BUTTON_C_LEFT | BUTTON_C_RIGHT)) && ((gGameStatusPtr->mapShop == NULL) || !(gGameStatusPtr->mapShop->flags & 1)) && !(gOverrideFlags & GLOBAL_OVERRIDES_DISABLE_MENUS) && !is_picking_up_item()) { - if (!(gPlayerStatus.animFlags & PA_FLAGS_8BIT_MARIO)) { + if (!(gPlayerStatus.animFlags & PA_FLAG_8BIT_MARIO)) { if (partnerActionStatus->partnerActionState == PARTNER_ACTION_NONE) { - if (!(gPlayerStatus.flags & PS_FLAGS_NO_STATIC_COLLISION)) { + if (!(gPlayerStatus.flags & PS_FLAG_NO_STATIC_COLLISION)) { if (actionState == ACTION_STATE_IDLE || actionState == ACTION_STATE_WALK || actionState == ACTION_STATE_RUN) @@ -235,11 +235,11 @@ void check_input_open_menus(void) { block_17: switch (D_8010CCF8) { case 0: - if (playerStatus->flags & PS_FLAGS_NO_CHANGE_PARTNER) { + if (playerStatus->flags & PS_FLAG_NO_CHANGE_PARTNER) { sfx_play_sound(SOUND_MENU_ERROR); if (D_8010C9C0) { func_800E6860(); - playerStatus->flags &= ~PS_FLAGS_PAUSED; + playerStatus->flags &= ~PS_FLAG_PAUSED; gOverrideFlags &= ~GLOBAL_OVERRIDES_40; set_time_freeze_mode(TIME_FREEZE_NORMAL); } @@ -264,7 +264,7 @@ block_17: popup->initialPos = 0; break; } - playerStatus->flags |= PS_FLAGS_PAUSED; + playerStatus->flags |= PS_FLAG_PAUSED; disable_player_input(); partner_disable_input(); D_8010CCFA = 3; @@ -273,7 +273,7 @@ block_17: } break; case 1: - flags = ~PS_FLAGS_PAUSED; + flags = ~PS_FLAG_PAUSED; if ((func_800E6904() == 0) || is_picking_up_item() || D_8010CCFE < playerStatus->inputEnabledCounter) { playerStatus->flags &= flags; enable_player_input(); @@ -281,7 +281,7 @@ block_17: D_8010CD00 = 0; if (D_8010C9C0) { func_800E6860(); - playerStatus->flags &= ~PS_FLAGS_PAUSED; + playerStatus->flags &= ~PS_FLAG_PAUSED; gOverrideFlags &= ~GLOBAL_OVERRIDES_40; set_time_freeze_mode(TIME_FREEZE_NORMAL); } @@ -356,7 +356,7 @@ block_17: } } func_800E6860(); - playerStatus->flags &= ~PS_FLAGS_PAUSED; + playerStatus->flags &= ~PS_FLAG_PAUSED; gOverrideFlags &= ~GLOBAL_OVERRIDES_40; set_time_freeze_mode(TIME_FREEZE_NORMAL); } @@ -366,7 +366,7 @@ block_17: if (D_8010CCFA == 0) { func_800E6860(); D_8010CD00 = 0; - playerStatus->flags &= ~PS_FLAGS_PAUSED; + playerStatus->flags &= ~PS_FLAG_PAUSED; gOverrideFlags &= ~GLOBAL_OVERRIDES_40; enable_player_input(); partner_enable_input(); diff --git a/src/80850_len_3060.c b/src/80850_len_3060.c index 769c21ac90..e2179e4eee 100644 --- a/src/80850_len_3060.c +++ b/src/80850_len_3060.c @@ -345,69 +345,69 @@ void initialize_status_menu(void) { iconIndex = hud_element_create(&HES_StatusHP); uiStatus->hpIconIndices[0] = iconIndex; - hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80); - hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); iconIndex = hud_element_create(&HES_StatusHeart); uiStatus->hpIconIndices[1] = iconIndex; - hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80); - hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); iconIndex = hud_element_create(&HES_StatusFP); uiStatus->fpIconIndices[0] = iconIndex; - hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80); - hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); iconIndex = hud_element_create(&HES_StatusFlower); uiStatus->fpIconIndices[1] = iconIndex; - hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80); - hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); iconIndex = hud_element_create(&HES_StatusCoin); uiStatus->coinIconIndex = iconIndex; - hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80); - hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); iconIndex = hud_element_create(&HES_Item_CoinSparkleRandom); uiStatus->coinSparkleIconIndex = iconIndex; - hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80); - hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); iconIndex = hud_element_create(&HES_StatusStarPoint); uiStatus->starpointsIconIndex = iconIndex; - hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80); - hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); iconIndex = hud_element_create(&HES_StatusSPShine); uiStatus->starpointsShineIconIndex = iconIndex; - hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80); - hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); newVar = hud_element_create(&HES_StatusTimes); iconIndex = newVar; uiStatus->iconIndex8 = iconIndex; - hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); iconIndex = hud_element_create(&HES_StatusTimes); uiStatus->iconIndex9 = iconIndex; - hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); iconIndex = hud_element_create(&HES_StatusTimes); uiStatus->iconIndexA = iconIndex; - hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); iconIndex = hud_element_create(&HES_StatusTimes); uiStatus->iconIndexB = iconIndex; - hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); iconIndex = hud_element_create(&HES_StatusStar1); uiStatus->starIconIndex = iconIndex; - hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAGS_80); - hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAGS_FILTER_TEX); + hud_element_set_flags(iconIndex, HUD_ELEMENT_FLAG_80); + hud_element_clear_flags(iconIndex, HUD_ELEMENT_FLAG_FILTER_TEX); func_800F0D5C(); } @@ -423,7 +423,7 @@ void status_menu_draw_number(s32 iconID, s32 x, s32 y, s32 value, s32 numDigits) x2 = x + 8; y2 = y + 8; hud_element_set_render_pos(iconID, x2, y2 - 1); - hud_element_clear_flags(iconID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(iconID, HUD_ELEMENT_FLAG_DISABLED); hud_element_draw_next(iconID); // Write each digit of the input number into the digits array @@ -444,7 +444,7 @@ void status_menu_draw_number(s32 iconID, s32 x, s32 y, s32 value, s32 numDigits) keepDrawing = TRUE; hud_element_set_script(iconID, DigitHudScripts[digit]); hud_element_set_render_pos(iconID, x2, y2); - hud_element_clear_flags(iconID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(iconID, HUD_ELEMENT_FLAG_DISABLED); hud_element_draw_next(iconID); } } @@ -463,7 +463,7 @@ void status_menu_draw_stat(s32 id, s32 x, s32 y, s32 currentValue, s32 maxValue) hud_element_set_script(id, SlashHudScript); hud_element_set_render_pos(id, baseX + 14, baseY + 1); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); hud_element_draw_next(id); for (i = 0; i < numDigits; i++) { @@ -481,7 +481,7 @@ void status_menu_draw_stat(s32 id, s32 x, s32 y, s32 currentValue, s32 maxValue) cond = TRUE; hud_element_set_script(id, DigitHudScripts[digit]); hud_element_set_render_pos(id, localX, localY); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); hud_element_draw_next(id); } } @@ -500,7 +500,7 @@ void status_menu_draw_stat(s32 id, s32 x, s32 y, s32 currentValue, s32 maxValue) cond = TRUE; hud_element_set_script(id, DigitHudScripts[digit]); hud_element_set_render_pos(id, localX, localY); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); hud_element_draw_next(id); } } @@ -675,7 +675,7 @@ s32 new_var2; if (!uiStatus->ignoreChanges) { if (playerStatus->actionState != ACTION_STATE_IDLE) { uiStatus->showTimer = 0; - } else if (playerStatus->flags & (PS_FLAGS_NO_STATIC_COLLISION | PS_FLAGS_INPUT_DISABLED)) { + } else if (playerStatus->flags & (PS_FLAG_NO_STATIC_COLLISION | PS_FLAG_INPUT_DISABLED)) { uiStatus->showTimer = 0; } else { uiStatus->showTimer++; @@ -1144,11 +1144,11 @@ void show_coin_counter(void) { set_window_update(WINDOW_ID_20, (s32)basic_window_update); index = hud_element_create(&HES_MenuTimes); uiStatus->iconIndex10 = index; - hud_element_set_flags(index, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(index, HUD_ELEMENT_FLAG_80); hud_element_set_tint(index, 255, 255, 255); index = hud_element_create(&HES_StatusCoin); uiStatus->iconIndex11 = index; - hud_element_set_flags(index, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(index, HUD_ELEMENT_FLAG_80); hud_element_set_tint(index, 255, 255, 255); uiStatus->unk_6C[0] = 0; diff --git a/src/8800.c b/src/8800.c index 33a05e1551..63be0ae59c 100644 --- a/src/8800.c +++ b/src/8800.c @@ -16,7 +16,7 @@ void update_cameras(void) { for (i = 0; i < ARRAY_COUNT(gCameras); i++) { Camera* cam = &gCameras[i]; - if (cam->flags != 0 && !(cam->flags & CAMERA_FLAGS_ENABLED)) { + if (cam->flags != 0 && !(cam->flags & CAMERA_FLAG_ENABLED)) { s32 sx; s32 sy; s32 sz; @@ -50,18 +50,18 @@ void update_cameras(void) { guLookAtReflectF(cam->viewMtxPlayer, &gDisplayContext->lookAt, cam->lookAt_eye.x, cam->lookAt_eye.y, cam->lookAt_eye.z, cam->lookAt_obj.x, cam->lookAt_obj.y, cam->lookAt_obj.z, 0, 1.0f, 0); - if (!(cam->flags & CAMERA_FLAGS_ORTHO)) { - if (cam->flags & CAMERA_FLAGS_LEAD_PLAYER) { + if (!(cam->flags & CAMERA_FLAG_ORTHO)) { + if (cam->flags & CAMERA_FLAG_LEAD_PLAYER) { create_camera_leadplayer_matrix(cam); } guPerspectiveF(cam->perspectiveMatrix, &cam->perspNorm, cam->vfov, (f32) cam->viewportW / (f32) cam->viewportH, (f32) cam->nearClip, (f32) cam->farClip, 1.0f); - if (cam->flags & CAMERA_FLAGS_SHAKING) { + if (cam->flags & CAMERA_FLAG_SHAKING) { guMtxCatF(cam->viewMtxShaking, cam->perspectiveMatrix, cam->perspectiveMatrix); } - if (cam->flags & CAMERA_FLAGS_LEAD_PLAYER) { + if (cam->flags & CAMERA_FLAG_LEAD_PLAYER) { guMtxCatF(cam->viewMtxLeading, cam->perspectiveMatrix, cam->perspectiveMatrix); } @@ -102,7 +102,7 @@ void render_frame(s32 flag) { for (; camID < ARRAY_COUNT(gCameras) - flag; camID++) { Camera* camera = &gCameras[camID]; - if (camera->flags != 0 && !(camera->flags & (CAMERA_FLAGS_80 | CAMERA_FLAGS_ENABLED))) { + if (camera->flags != 0 && !(camera->flags & (CAMERA_FLAG_80 | CAMERA_FLAG_ENABLED))) { u16 matrixListPos; gCurrentCamID = camID; @@ -170,7 +170,7 @@ void render_frame(s32 flag) { osVirtualToPhysical(nuGfxCfb_ptr)); gDPPipeSync(gMasterGfxPos++); - if (!(camera->flags & CAMERA_FLAGS_ORTHO)) { + if (!(camera->flags & CAMERA_FLAG_ORTHO)) { gSPPerspNormalize(gMasterGfxPos++, camera->perspNorm); } @@ -185,12 +185,12 @@ void render_frame(s32 flag) { camera->vpAlt.vp.vtrans[0] = camera->vp.vp.vtrans[0] + gGameStatusPtr->unk_82; camera->vpAlt.vp.vtrans[1] = camera->vp.vp.vtrans[1] + gGameStatusPtr->unk_83; - if (!(camera->flags & CAMERA_FLAGS_ORTHO)) { + if (!(camera->flags & CAMERA_FLAG_ORTHO)) { if (gCurrentCamID != CAM_3) { - if (!(camera->flags & CAMERA_FLAGS_RENDER_ENTITIES)) { + if (!(camera->flags & CAMERA_FLAG_RENDER_ENTITIES)) { render_entities(); } - if (!(camera->flags & CAMERA_FLAGS_RENDER_MODELS)) { + if (!(camera->flags & CAMERA_FLAG_RENDER_MODELS)) { render_models(); } render_player(); @@ -236,7 +236,7 @@ void create_cameras_a(void) { gCameras[i].flags = 0; } - camDataPtr->flags = CAMERA_FLAGS_ENABLED; + camDataPtr->flags = CAMERA_FLAG_ENABLED; camDataPtr->type = 0; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; @@ -247,7 +247,7 @@ void create_cameras_a(void) { camDataPtr->vfov = 50; initialize_next_camera(camDataPtr); - camDataPtr->flags = CAMERA_FLAGS_ENABLED; + camDataPtr->flags = CAMERA_FLAG_ENABLED; camDataPtr->type = 0; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; @@ -258,7 +258,7 @@ void create_cameras_a(void) { camDataPtr->vfov = 50; initialize_next_camera(camDataPtr); - camDataPtr->flags = CAMERA_FLAGS_ENABLED; + camDataPtr->flags = CAMERA_FLAG_ENABLED; camDataPtr->type = 0; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; @@ -269,7 +269,7 @@ void create_cameras_a(void) { camDataPtr->vfov = 50; initialize_next_camera(camDataPtr); - camDataPtr->flags = CAMERA_FLAGS_ENABLED; + camDataPtr->flags = CAMERA_FLAG_ENABLED; camDataPtr->type = 0; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; @@ -290,7 +290,7 @@ void create_cameras_b(void) { gCameras[i].flags = 0; } - camDataPtr->flags = CAMERA_FLAGS_ENABLED; + camDataPtr->flags = CAMERA_FLAG_ENABLED; camDataPtr->type = 0; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; @@ -301,7 +301,7 @@ void create_cameras_b(void) { camDataPtr->vfov = 50; initialize_next_camera(camDataPtr); - camDataPtr->flags = CAMERA_FLAGS_ENABLED; + camDataPtr->flags = CAMERA_FLAG_ENABLED; camDataPtr->type = 0; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; @@ -312,7 +312,7 @@ void create_cameras_b(void) { camDataPtr->vfov = 50; initialize_next_camera(camDataPtr); - camDataPtr->flags = CAMERA_FLAGS_ENABLED; + camDataPtr->flags = CAMERA_FLAG_ENABLED; camDataPtr->type = 0; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; @@ -323,7 +323,7 @@ void create_cameras_b(void) { camDataPtr->vfov = 50; initialize_next_camera(camDataPtr); - camDataPtr->flags = CAMERA_FLAGS_ENABLED; + camDataPtr->flags = CAMERA_FLAG_ENABLED; camDataPtr->type = 0; camDataPtr->viewWidth = 160; camDataPtr->viewHeight = 120; @@ -349,7 +349,7 @@ Camera* initialize_next_camera(CameraInitData* initData) { ASSERT(camID < ARRAY_COUNT(gCameras)); - camera->flags = initData->flags | (CAMERA_FLAGS_1 | CAMERA_FLAGS_LEAD_PLAYER); + camera->flags = initData->flags | (CAMERA_FLAG_1 | CAMERA_FLAG_LEAD_PLAYER); camera->moveFlags = 0; camera->lookAt_eye.x = 0; camera->lookAt_eye.y = 0; diff --git a/src/891b0_len_fb0.c b/src/891b0_len_fb0.c index 0b5fee77f7..87d05a8933 100644 --- a/src/891b0_len_fb0.c +++ b/src/891b0_len_fb0.c @@ -47,7 +47,7 @@ void handle_floor_behavior(void) { colliderType = D_80109480; } - if (playerStatus->actionState == ACTION_STATE_LAND && playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { + if (playerStatus->actionState == ACTION_STATE_LAND && playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { D_8010CFF4 = D_8010CFF0; } @@ -87,7 +87,7 @@ void surface_standard_behavior(void) { } if (playerStatus->actionState == ACTION_STATE_LAND && - (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) && + (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) && D_8010CFF4 >= 10) { x = playerStatus->position.x; @@ -100,7 +100,7 @@ void surface_standard_behavior(void) { } } else if ( - (playerStatus->actionState == ACTION_STATE_SPIN_POUND || playerStatus->actionState == ACTION_STATE_TORNADO_POUND) && (playerStatus->flags & PS_FLAGS_SPECIAL_LAND)) + (playerStatus->actionState == ACTION_STATE_SPIN_POUND || playerStatus->actionState == ACTION_STATE_TORNADO_POUND) && (playerStatus->flags & PS_FLAG_SPECIAL_LAND)) { x = playerStatus->position.x; y = playerStatus->position.y + 0.0f; @@ -220,8 +220,8 @@ void surface_cloud_behavior(void) { D_801094A0 += 0.1f; - if (((playerStatus->actionState == ACTION_STATE_LAND && (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED)) || - ((playerStatus->actionState == ACTION_STATE_SPIN_POUND || playerStatus->actionState == ACTION_STATE_TORNADO_POUND) && (playerStatus->flags & PS_FLAGS_SPECIAL_LAND))) && + if (((playerStatus->actionState == ACTION_STATE_LAND && (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED)) || + ((playerStatus->actionState == ACTION_STATE_SPIN_POUND || playerStatus->actionState == ACTION_STATE_TORNADO_POUND) && (playerStatus->flags & PS_FLAG_SPECIAL_LAND))) && D_8010CFF4 >= 10) { fx_cloud_puff( @@ -273,7 +273,7 @@ void surface_snow_behavior(void) { playerStatus->actionState == ACTION_STATE_RUN || (playerStatus->actionState == ACTION_STATE_SPIN && playerStatus->actionSubstate == 0) || ((playerStatus->actionState == ACTION_STATE_LAND || playerStatus->actionState == ACTION_STATE_IDLE) - && playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED)) + && playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED)) ) { D_801094A4 = 4; return; @@ -301,7 +301,7 @@ void surface_hedges_behavior(void) { playerStatus->actionState == ACTION_STATE_RUN || (playerStatus->actionState == ACTION_STATE_SPIN && playerStatus->actionSubstate == 0) || ((playerStatus->actionState == ACTION_STATE_LAND || playerStatus->actionState == ACTION_STATE_IDLE) - && playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED)) + && playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED)) ) { D_801094AC = 4; return; @@ -327,7 +327,7 @@ void surface_water_behavior(void) { playerStatus->actionState == ACTION_STATE_RUN || (playerStatus->actionState == ACTION_STATE_SPIN && playerStatus->actionSubstate == 0) || ((playerStatus->actionState == ACTION_STATE_LAND || playerStatus->actionState == ACTION_STATE_IDLE) - && playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED)) + && playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED)) ) { D_801094AE = 4; return; diff --git a/src/8a860_len_3f30.c b/src/8a860_len_3f30.c index a2b48c8f71..87a1a99bd8 100644 --- a/src/8a860_len_3f30.c +++ b/src/8a860_len_3f30.c @@ -315,58 +315,58 @@ s32 popup_menu_update(void) { D_8010D68C = 0; elementID = hud_element_create(&HES_EmptyBar); D_8010D65C = elementID; - hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_80); hud_element_set_tint(elementID, 255, 255, 255); if (gPopupMenu->popupType != POPUP_MENU_THROW_AWAY_ITEM) { - hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_DISABLED); } one = 1; // required to match (why is 1 loaded so early?) elementID = hud_element_create(gPopupMenu->ptrIcon[0]); D_8010D678 = elementID; hud_element_set_scale(elementID, 0.45f); - hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); elementID = hud_element_create(&HES_AnimatedHandPointer); D_8010D66C = elementID; - hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_DROP_SHADOW | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_80); elementID = hud_element_create(&HES_GreenArrowUp); D_8010D670 = elementID; - hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_DROP_SHADOW | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_80); elementID = hud_element_create(&HES_GreenArrowDown); D_8010D674 = elementID; - hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_DROP_SHADOW | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_80); if (gPopupMenu->popupType == POPUP_MENU_TRADE_FOR_BADGE) { D_8010D660 = hud_element_create(&HES_StatusStarPiece); elementID = D_8010D660; - hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_80); hud_element_set_tint(elementID, 255, 255, 255); } if (gPopupMenu->popupType == POPUP_MENU_UPGRADE_PARTNER) { D_8010D660 = hud_element_create(&HES_StatusStarPiece); elementID = D_8010D660; - hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_FILTER_TEX | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_FILTER_TEX | HUD_ELEMENT_FLAG_80); hud_element_set_tint(elementID, 255, 255, 255); } if (gPopupMenu->popupType == POPUP_MENU_SELL_ITEM) { D_8010D660 = hud_element_create(&HES_StatusCoin); elementID = D_8010D660; - hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_80); hud_element_set_tint(elementID, 255, 255, 255); } if (gPopupMenu->popupType == POPUP_MENU_TRADE_FOR_BADGE || gPopupMenu->popupType == POPUP_MENU_UPGRADE_PARTNER) { D_8010D664 = hud_element_create(&HES_MenuTimes); elementID = D_8010D664; - hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_80); hud_element_set_tint(elementID, 255, 255, 255); } if (gPopupMenu->popupType == one || gPopupMenu->popupType == POPUP_MENU_UPGRADE_PARTNER) { D_8010D668 = hud_element_create(D_80109890[0]); elementID = D_8010D668; - hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_80); hud_element_set_tint(elementID, 255, 255, 255); } diff --git a/src/B0E0.c b/src/B0E0.c index ccc92311ae..e52dfd264a 100644 --- a/src/B0E0.c +++ b/src/B0E0.c @@ -40,7 +40,7 @@ void update_camera_mode_unused(Camera* camera) { camera->lookAt_obj.z = camera->lookAt_obj_target.z; } - if (!(playerStatus->flags & (PS_FLAGS_FALLING | PS_FLAGS_JUMPING))) { + if (!(playerStatus->flags & (PS_FLAG_FALLING | PS_FLAG_JUMPING))) { camera->lookAt_obj_target.y = playerStatus->position.y + 60.0f; } @@ -784,14 +784,14 @@ void update_camera_zone_interp(Camera* camera) { camera->unk_498 = 1.0f; } - if (camera->moveFlags & CAMERA_MOVE_FLAGS_4) { + if (camera->moveFlags & CAMERA_MOVE_FLAG_4) { camera->unk_498 += 0.3; if (camera->unk_498 >= 1.0) { camera->unk_498 = 1.0f; } } - if (!(camera->moveFlags & CAMERA_MOVE_FLAGS_2)) { + if (!(camera->moveFlags & CAMERA_MOVE_FLAG_2)) { camera->savedTargetY += (camera->unk_494 - camera->savedTargetY) * camera->unk_498; } @@ -1024,7 +1024,7 @@ void update_camera_zone_interp(Camera* camera) { cosViewPitch = cos_deg(blendedCamSettings.boomPitch + D_800A08DC); sinViewPitch = sin_deg(blendedCamSettings.boomPitch + D_800A08DC); - if (!(camera->moveFlags & CAMERA_MOVE_FLAGS_2)) { + if (!(camera->moveFlags & CAMERA_MOVE_FLAG_2)) { camera->lookAt_eye.y = blendedCamSettings.pos.y + (blendedCamSettings.boomLength * sinViewPitch); } @@ -1040,7 +1040,7 @@ void update_camera_zone_interp(Camera* camera) { } temp_f8_2 = blendedCamSettings.pos.y - camera->lookAt_eye.y; - if (!(camera->moveFlags & CAMERA_MOVE_FLAGS_2)) { + if (!(camera->moveFlags & CAMERA_MOVE_FLAG_2)) { camera->lookAt_obj.y = camera->lookAt_eye.y + ((dist * sinViewPitch) + (temp_f8_2 * cosViewPitch)); } temp_f4_4 = (dist * cosViewPitch) - (temp_f8_2 * sinViewPitch); diff --git a/src/B4580.c b/src/B4580.c index 8a73c145fb..15583021a9 100644 --- a/src/B4580.c +++ b/src/B4580.c @@ -288,7 +288,7 @@ s32 create_model_animator(s16* animPos) { ASSERT(animator != NULL); - animator->flags = MODEL_ANIMATOR_FLAGS_UPDATE_PENDING | MODEL_ANIMATOR_FLAGS_ENABLED | MODEL_ANIMATOR_FLAGS_CAM_2 | MODEL_ANIMATOR_FLAGS_CAM_1 | MODEL_ANIMATOR_FLAGS_CAM_0; + animator->flags = MODEL_ANIMATOR_FLAG_UPDATE_PENDING | MODEL_ANIMATOR_FLAG_ENABLED | MODEL_ANIMATOR_FLAG_CAM_2 | MODEL_ANIMATOR_FLAG_CAM_1 | MODEL_ANIMATOR_FLAG_CAM_0; animator->renderMode = RENDER_MODE_ALPHATEST; animator->nextUpdateTime = 1.0f; animator->timeScale = 1.0f; @@ -332,7 +332,7 @@ s32 create_mesh_animator(s16* animPos, s16* animBuffer) { ASSERT(animator != NULL); - animator->flags = MODEL_ANIMATOR_FLAGS_UPDATE_PENDING | MODEL_ANIMATOR_FLAGS_ENABLED | MODEL_ANIMATOR_FLAGS_CAM_2 | MODEL_ANIMATOR_FLAGS_CAM_1 | MODEL_ANIMATOR_FLAGS_CAM_0; + animator->flags = MODEL_ANIMATOR_FLAG_UPDATE_PENDING | MODEL_ANIMATOR_FLAG_ENABLED | MODEL_ANIMATOR_FLAG_CAM_2 | MODEL_ANIMATOR_FLAG_CAM_1 | MODEL_ANIMATOR_FLAG_CAM_0; animator->renderMode = RENDER_MODE_ALPHATEST; animator->baseAddr = NULL; animator->fpRenderCallback = NULL; @@ -365,7 +365,7 @@ AnimatorNode* add_anim_node(ModelAnimator* animator, s32 parentNodeID, AnimatorN ret = heap_malloc(sizeof(*ret)); ASSERT(ret != NULL); - ret->flags = MODEL_ANIMATOR_FLAGS_ENABLED; + ret->flags = MODEL_ANIMATOR_FLAG_ENABLED; ret->displayList = nodeBP->displayList; ret->basePos.x = nodeBP->basePos.x; ret->basePos.y = nodeBP->basePos.y; @@ -437,11 +437,11 @@ void update_model_animator(s32 animatorID) { if (animator != NULL && animator->flags != 0) { s32 temp = 0; - if (!(animator->flags & MODEL_ANIMATOR_FLAGS_FREEZE_ANIMATION)) { - animator->flags &= ~MODEL_ANIMATOR_FLAGS_UPDATE_PENDING; + if (!(animator->flags & MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION)) { + animator->flags &= ~MODEL_ANIMATOR_FLAG_UPDATE_PENDING; animator->nextUpdateTime -= animator->timeScale; if (animator->nextUpdateTime <= 0.0f) { - if (!(animator->flags & MODEL_ANIMATOR_FLAGS_MESH)) { + if (!(animator->flags & MODEL_ANIMATOR_FLAG_MESH)) { do { temp = step_model_animator(animator); } while (temp > 0); @@ -494,11 +494,11 @@ void update_model_animator_with_transform(s32 animatorID, Mtx* mtx) { if (animator != NULL && animator->flags != 0) { s32 temp = 0; - if (!(animator->flags & MODEL_ANIMATOR_FLAGS_FREEZE_ANIMATION)) { - animator->flags &= ~MODEL_ANIMATOR_FLAGS_UPDATE_PENDING; + if (!(animator->flags & MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION)) { + animator->flags &= ~MODEL_ANIMATOR_FLAG_UPDATE_PENDING; animator->nextUpdateTime -= animator->timeScale; if (animator->nextUpdateTime <= 0.0f) { - if (!(animator->flags & MODEL_ANIMATOR_FLAGS_MESH)) { + if (!(animator->flags & MODEL_ANIMATOR_FLAG_MESH)) { do { temp = step_model_animator(animator); } while (temp > 0); @@ -583,7 +583,7 @@ s32 step_model_animator(ModelAnimator* animator) { animator->animReadPos = args; return 1; case AS_OP_19: - animator->flags |= MODEL_ANIMATOR_FLAGS_NO_FLIP; + animator->flags |= MODEL_ANIMATOR_FLAG_NO_FLIP; animator->animReadPos = args; return 1; case AS_SET_ROTATION: @@ -645,14 +645,14 @@ void animator_update_model_transforms(ModelAnimator* animator, Mtx* rootTransfor Matrix4f flipMtx; if (animator->rootNode != NULL) { - switch (animator->flags & (MODEL_ANIMATOR_FLAGS_FLIP_Z | MODEL_ANIMATOR_FLAGS_FLIP_Y | MODEL_ANIMATOR_FLAGS_FLIP_X)) { - case MODEL_ANIMATOR_FLAGS_FLIP_Z: + switch (animator->flags & (MODEL_ANIMATOR_FLAG_FLIP_Z | MODEL_ANIMATOR_FLAG_FLIP_Y | MODEL_ANIMATOR_FLAG_FLIP_X)) { + case MODEL_ANIMATOR_FLAG_FLIP_Z: animator_make_mirrorZ(flipMtx); break; - case MODEL_ANIMATOR_FLAGS_FLIP_Y: + case MODEL_ANIMATOR_FLAG_FLIP_Y: animator_make_mirrorY(flipMtx); break; - case MODEL_ANIMATOR_FLAGS_FLIP_X: + case MODEL_ANIMATOR_FLAG_FLIP_X: animator_make_mirrorX(flipMtx); break; default: @@ -674,19 +674,19 @@ void animator_node_update_model_transform(ModelAnimator* animator, f32 (*flipMtx guMtxCatF(gAnimScaleMtx, gAnimRotMtx, gAnimRotScaleMtx); guMtxCatF(gAnimRotScaleMtx, gAnimTranslateMtx, sp10); - if (!(animator->flags & MODEL_ANIMATOR_FLAGS_NO_FLIP)) { + if (!(animator->flags & MODEL_ANIMATOR_FLAG_NO_FLIP)) { guMtxCatF(sp10, flipMtx, sp10); } copy_matrix(sp10, node->mtx); - if (node->flags & MODEL_ANIMATOR_FLAGS_HAS_MODEL) { + if (node->flags & MODEL_ANIMATOR_FLAG_HAS_MODEL) { Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(node->fcData.modelID)); copy_matrix(sp10, model->transformMatrix); guMtxL2F(sp10, rootTransform); guMtxCatF(model->transformMatrix, sp10, model->transformMatrix); - model->flags |= MODEL_FLAGS_USES_TRANSFORM_MATRIX; + model->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX; } for (i = 0; i < ARRAY_COUNT(node->children); i++) { @@ -705,8 +705,8 @@ void render_animated_model(s32 animatorID, Mtx* rootTransform) { animatorID &= ~0x800; animator = (*gCurrentAnimMeshListPtr)[animatorID]; - if (animator != NULL && animator->flags != 0 && !(animator->flags & MODEL_ANIMATOR_FLAGS_UPDATE_PENDING) && - animator->flags & (1 << gCurrentCamID) && !(animator->flags & MODEL_ANIMATOR_FLAGS_HIDDEN)) + if (animator != NULL && animator->flags != 0 && !(animator->flags & MODEL_ANIMATOR_FLAG_UPDATE_PENDING) && + animator->flags & (1 << gCurrentCamID) && !(animator->flags & MODEL_ANIMATOR_FLAG_HIDDEN)) { animator->mtx = *rootTransform; animator->baseAddr = NULL; @@ -728,8 +728,8 @@ void render_animated_model_with_vertices(s32 animatorID, Mtx* rootTransform, s32 animatorID &= ~0x800; animator = (*gCurrentAnimMeshListPtr)[animatorID]; - if (animator != NULL && animator->flags != 0 && !(animator->flags & MODEL_ANIMATOR_FLAGS_UPDATE_PENDING) && - animator->flags & (1 << gCurrentCamID) && !(animator->flags & MODEL_ANIMATOR_FLAGS_HIDDEN)) + if (animator != NULL && animator->flags != 0 && !(animator->flags & MODEL_ANIMATOR_FLAG_UPDATE_PENDING) && + animator->flags & (1 << gCurrentCamID) && !(animator->flags & MODEL_ANIMATOR_FLAG_HIDDEN)) { animator->mtx = *rootTransform; gAnimVtxSegment = segment; @@ -825,7 +825,7 @@ void appendGfx_animator_node(ModelAnimator* animator, AnimatorNode* node, Matrix s32 totalVtxCount; s32 cmd; - if (node->flags & MODEL_ANIMATOR_FLAGS_HIDDEN) { + if (node->flags & MODEL_ANIMATOR_FLAG_HIDDEN) { for (i = 0; i < ARRAY_COUNT(node->children); i++) { if (node->children[i] != NULL) { guMtxCatF(node->mtx, mtx, node->mtx); @@ -844,7 +844,7 @@ void appendGfx_animator_node(ModelAnimator* animator, AnimatorNode* node, Matrix gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); gSPClearGeometryMode(gMasterGfxPos++, G_LIGHTING); - if (animator->flags & MODEL_ANIMATOR_FLAGS_CULL_BACK) { + if (animator->flags & MODEL_ANIMATOR_FLAG_CULL_BACK) { gSPSetGeometryMode(gMasterGfxPos++, G_CULL_BACK); } if (!gAnimModelFogEnabled) { @@ -1059,7 +1059,7 @@ void load_model_animator_node(StaticAnimatorNode* node, ModelAnimator* animator, if (node->modelID != 0) { newNode->fcData.modelID = node->modelID - 1; - newNode->flags |= MODEL_ANIMATOR_FLAGS_HAS_MODEL; + newNode->flags |= MODEL_ANIMATOR_FLAG_HAS_MODEL; } i = 0; @@ -1126,7 +1126,7 @@ void load_mesh_animator_tree(s32 index, StaticAnimatorNode** tree) { } load_mesh_animator_node(*gAnimTreeRoot, animator, 0, nodeIDs); - animator->flags |= MODEL_ANIMATOR_FLAGS_MESH; + animator->flags |= MODEL_ANIMATOR_FLAG_MESH; } } @@ -1228,7 +1228,7 @@ s32 step_mesh_animator(ModelAnimator* animator) { animator->animReadPos = args; return 1; case AS_OP_19: - animator->flags |= MODEL_ANIMATOR_FLAGS_NO_FLIP; + animator->flags |= MODEL_ANIMATOR_FLAG_NO_FLIP; animator->animReadPos = args; return 1; case AS_SET_ROTATION: diff --git a/src/C50A0.c b/src/C50A0.c index be574e4e6d..5ddd0b99b6 100644 --- a/src/C50A0.c +++ b/src/C50A0.c @@ -703,20 +703,20 @@ ItemEntity* get_item_entity(s32 itemEntityIndex) { void hide_item_entity(ItemEntity* itemEntity) { Shadow* shadow; - itemEntity->flags |= ITEM_ENTITY_FLAGS_HIDDEN; + itemEntity->flags |= ITEM_ENTITY_FLAG_HIDDEN; if (itemEntity->shadowIndex >= 0) { shadow = get_shadow_by_index(itemEntity->shadowIndex); - shadow->flags |= ENTITY_FLAGS_HIDDEN; + shadow->flags |= ENTITY_FLAG_HIDDEN; } } void reveal_item_entity(ItemEntity* itemEntity) { Shadow* shadow; - itemEntity->flags &= ~ITEM_ENTITY_FLAGS_HIDDEN; + itemEntity->flags &= ~ITEM_ENTITY_FLAG_HIDDEN; if (itemEntity->shadowIndex >= 0) { shadow = get_shadow_by_index(itemEntity->shadowIndex); - shadow->flags &= ~ENTITY_FLAGS_HIDDEN; + shadow->flags &= ~ENTITY_FLAG_HIDDEN; } } @@ -827,7 +827,7 @@ s32 make_item_entity(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pic itemID &= 0xFFFF; - itemEntity->flags = ITEM_ENTITY_FLAGS_80 | ITEM_ENTITY_FLAGS_10 | ITEM_ENTITY_FLAGS_CAM2 | ITEM_ENTITY_FLAGS_CAM1 | ITEM_ENTITY_FLAGS_CAM0; + itemEntity->flags = ITEM_ENTITY_FLAG_80 | ITEM_ENTITY_FLAG_10 | ITEM_ENTITY_FLAG_CAM2 | ITEM_ENTITY_FLAG_CAM1 | ITEM_ENTITY_FLAG_CAM0; itemEntity->pickupMsgFlags = 0; itemEntity->boundVar = pickupFlagIndex; itemEntity->itemID = itemID; @@ -842,140 +842,140 @@ s32 make_item_entity(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pic itemEntity->unk_34.z = -9999; D_801565A6 = 30; - itemEntity->flags |= ITEM_ENTITY_FLAGS_TINY; + itemEntity->flags |= ITEM_ENTITY_FLAG_TINY; if (gItemTable[itemID].typeFlags & ITEM_TYPE_FLAG_ENTITY_FULLSIZE) { - itemEntity->flags |= ITEM_ENTITY_FLAGS_40000; - itemEntity->flags &= ~ITEM_ENTITY_FLAGS_TINY; + itemEntity->flags |= ITEM_ENTITY_FLAG_40000; + itemEntity->flags &= ~ITEM_ENTITY_FLAG_TINY; } if (ItemEntityAlternatingSpawn != 0) { - itemEntity->flags |= ITEM_ENTITY_FLAGS_20000; + itemEntity->flags |= ITEM_ENTITY_FLAG_20000; } ItemEntityAlternatingSpawn = 1 - ItemEntityAlternatingSpawn; switch (itemEntity->spawnType) { case ITEM_SPAWN_MODE_KEY: - itemEntity->flags |= ITEM_ENTITY_FLAGS_80000000; + itemEntity->flags |= ITEM_ENTITY_FLAG_80000000; break; case ITEM_SPAWN_MODE_DECORATION: case ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS: - itemEntity->flags |= ITEM_ENTITY_FLAGS_800000; + itemEntity->flags |= ITEM_ENTITY_FLAG_800000; break; case ITEM_SPAWN_MODE_INVISIBLE: - itemEntity->flags |= ITEM_ENTITY_FLAGS_100000; + itemEntity->flags |= ITEM_ENTITY_FLAG_100000; break; case ITEM_SPAWN_MODE_BATTLE_REWARD: - itemEntity->flags |= ITEM_ENTITY_FLAGS_800000; - itemEntity->flags |= ITEM_ENTITY_FLAGS_10000; + itemEntity->flags |= ITEM_ENTITY_FLAG_800000; + itemEntity->flags |= ITEM_ENTITY_FLAG_10000; itemEntity->spawnType = ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS; break; case ITEM_SPAWN_MODE_TOSS_NEVER_VANISH: - itemEntity->flags |= ITEM_ENTITY_FLAGS_800000 | ITEM_ENTITY_FLAGS_400 | ITEM_ENTITY_FLAGS_NEVER_VANISH; + itemEntity->flags |= ITEM_ENTITY_FLAG_800000 | ITEM_ENTITY_FLAG_400 | ITEM_ENTITY_FLAG_NEVER_VANISH; itemEntity->spawnType = ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS; break; case ITEM_SPAWN_MODE_TOSS: - itemEntity->flags |= ITEM_ENTITY_FLAGS_800000 | ITEM_ENTITY_FLAGS_400; + itemEntity->flags |= ITEM_ENTITY_FLAG_800000 | ITEM_ENTITY_FLAG_400; itemEntity->spawnType = ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS; break; case ITEM_SPAWN_MODE_TOSS_SPAWN_ONCE: - itemEntity->flags |= ITEM_ENTITY_FLAGS_800000 | ITEM_ENTITY_FLAGS_800; + itemEntity->flags |= ITEM_ENTITY_FLAG_800000 | ITEM_ENTITY_FLAG_800; itemEntity->spawnType = ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS; break; case ITEM_SPAWN_MODE_TOSS_SPAWN_ONCE_NEVER_VANISH: - itemEntity->flags |= ITEM_ENTITY_FLAGS_800000 | ITEM_ENTITY_FLAGS_800 | ITEM_ENTITY_FLAGS_NEVER_VANISH; + itemEntity->flags |= ITEM_ENTITY_FLAG_800000 | ITEM_ENTITY_FLAG_800 | ITEM_ENTITY_FLAG_NEVER_VANISH; itemEntity->spawnType = ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS; break; case ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS_NEVER_VANISH: - itemEntity->flags |= ITEM_ENTITY_FLAGS_800000 | ITEM_ENTITY_FLAGS_NEVER_VANISH; + itemEntity->flags |= ITEM_ENTITY_FLAG_800000 | ITEM_ENTITY_FLAG_NEVER_VANISH; itemEntity->spawnType = ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS; break; case ITEM_SPAWN_MODE_ITEM_BLOCK_ITEM: - itemEntity->flags |= ITEM_ENTITY_FLAGS_800000 | ITEM_ENTITY_FLAGS_400; - itemEntity->flags |= ITEM_ENTITY_FLAGS_40000000; + itemEntity->flags |= ITEM_ENTITY_FLAG_800000 | ITEM_ENTITY_FLAG_400; + itemEntity->flags |= ITEM_ENTITY_FLAG_40000000; itemEntity->spawnType = ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS; break; case ITEM_SPAWN_MODE_ITEM_BLOCK_BADGE: - itemEntity->flags |= ITEM_ENTITY_FLAGS_800000 | ITEM_ENTITY_FLAGS_400; - itemEntity->flags |= ITEM_ENTITY_FLAGS_40000000 | ITEM_ENTITY_FLAGS_NEVER_VANISH; + itemEntity->flags |= ITEM_ENTITY_FLAG_800000 | ITEM_ENTITY_FLAG_400; + itemEntity->flags |= ITEM_ENTITY_FLAG_40000000 | ITEM_ENTITY_FLAG_NEVER_VANISH; itemEntity->spawnType = ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS; break; case ITEM_SPAWN_MODE_FALL_SPAWN_ALWAYS: - itemEntity->flags |= ITEM_ENTITY_FLAGS_800000; + itemEntity->flags |= ITEM_ENTITY_FLAG_800000; break; case ITEM_SPAWN_MODE_FALL_NEVER_VANISH: - itemEntity->flags |= ITEM_ENTITY_FLAGS_800000 | ITEM_ENTITY_FLAGS_400 | ITEM_ENTITY_FLAGS_NEVER_VANISH; + itemEntity->flags |= ITEM_ENTITY_FLAG_800000 | ITEM_ENTITY_FLAG_400 | ITEM_ENTITY_FLAG_NEVER_VANISH; itemEntity->spawnType = ITEM_SPAWN_MODE_FALL_SPAWN_ALWAYS; break; case ITEM_SPAWN_MODE_FALL: - itemEntity->flags |= ITEM_ENTITY_FLAGS_800000 | ITEM_ENTITY_FLAGS_400; + itemEntity->flags |= ITEM_ENTITY_FLAG_800000 | ITEM_ENTITY_FLAG_400; itemEntity->spawnType = ITEM_SPAWN_MODE_FALL_SPAWN_ALWAYS; break; case ITEM_SPAWN_MODE_FALL_SPAWN_ONCE: - itemEntity->flags |= ITEM_ENTITY_FLAGS_800000 | ITEM_ENTITY_FLAGS_800; + itemEntity->flags |= ITEM_ENTITY_FLAG_800000 | ITEM_ENTITY_FLAG_800; itemEntity->spawnType = ITEM_SPAWN_MODE_FALL_SPAWN_ALWAYS; break; case ITEM_SPAWN_MODE_FIXED_SPAWN_ALWAYS: - itemEntity->flags |= ITEM_ENTITY_FLAGS_800000 | ITEM_ENTITY_FLAGS_FIXED; - itemEntity->flags |= ITEM_ENTITY_FLAGS_10000000; + itemEntity->flags |= ITEM_ENTITY_FLAG_800000 | ITEM_ENTITY_FLAG_FIXED; + itemEntity->flags |= ITEM_ENTITY_FLAG_10000000; break; case ITEM_SPAWN_MODE_FIXED_NEVER_VANISH: - itemEntity->flags |= ITEM_ENTITY_FLAGS_800000 | ITEM_ENTITY_FLAGS_FIXED | ITEM_ENTITY_FLAGS_400 | ITEM_ENTITY_FLAGS_NEVER_VANISH; - itemEntity->flags |= ITEM_ENTITY_FLAGS_10000000; + itemEntity->flags |= ITEM_ENTITY_FLAG_800000 | ITEM_ENTITY_FLAG_FIXED | ITEM_ENTITY_FLAG_400 | ITEM_ENTITY_FLAG_NEVER_VANISH; + itemEntity->flags |= ITEM_ENTITY_FLAG_10000000; itemEntity->spawnType = ITEM_SPAWN_MODE_FIXED_SPAWN_ALWAYS; break; case ITEM_SPAWN_MODE_FIXED: - itemEntity->flags |= ITEM_ENTITY_FLAGS_800000 | ITEM_ENTITY_FLAGS_FIXED | ITEM_ENTITY_FLAGS_400; - itemEntity->flags |= ITEM_ENTITY_FLAGS_10000000; + itemEntity->flags |= ITEM_ENTITY_FLAG_800000 | ITEM_ENTITY_FLAG_FIXED | ITEM_ENTITY_FLAG_400; + itemEntity->flags |= ITEM_ENTITY_FLAG_10000000; itemEntity->spawnType = ITEM_SPAWN_MODE_FIXED_SPAWN_ALWAYS; break; case ITEM_SPAWN_MODE_FIXED_SPAWN_ALWAYS_NEVER_VANISH: - itemEntity->flags |= ITEM_ENTITY_FLAGS_800000 | ITEM_ENTITY_FLAGS_FIXED | ITEM_ENTITY_FLAGS_NEVER_VANISH; - itemEntity->flags |= ITEM_ENTITY_FLAGS_10000000; + itemEntity->flags |= ITEM_ENTITY_FLAG_800000 | ITEM_ENTITY_FLAG_FIXED | ITEM_ENTITY_FLAG_NEVER_VANISH; + itemEntity->flags |= ITEM_ENTITY_FLAG_10000000; itemEntity->spawnType = ITEM_SPAWN_MODE_FIXED_SPAWN_ALWAYS; break; case ITEM_SPAWN_MODE_TOSS_FADE1: - itemEntity->flags |= ITEM_ENTITY_FLAGS_800000 | ITEM_ENTITY_FLAGS_1000; + itemEntity->flags |= ITEM_ENTITY_FLAG_800000 | ITEM_ENTITY_FLAG_1000; itemEntity->scale = 0.8f; - itemEntity->flags |= ITEM_ENTITY_FLAGS_TINY; + itemEntity->flags |= ITEM_ENTITY_FLAG_TINY; break; case ITEM_SPAWN_MODE_TOSS_FADE2: - itemEntity->flags |= ITEM_ENTITY_FLAGS_800000 | ITEM_ENTITY_FLAGS_1000; - itemEntity->flags |= ITEM_ENTITY_FLAGS_10000; + itemEntity->flags |= ITEM_ENTITY_FLAG_800000 | ITEM_ENTITY_FLAG_1000; + itemEntity->flags |= ITEM_ENTITY_FLAG_10000; itemEntity->spawnType = ITEM_SPAWN_MODE_TOSS_FADE1; itemEntity->scale = 0.8f; - itemEntity->flags |= ITEM_ENTITY_FLAGS_TINY; + itemEntity->flags |= ITEM_ENTITY_FLAG_TINY; break; case ITEM_SPAWN_MODE_TOSS_FADE3: - itemEntity->flags |= ITEM_ENTITY_FLAGS_800000 | ITEM_ENTITY_FLAGS_1000; - itemEntity->flags |= ITEM_ENTITY_FLAGS_400000; + itemEntity->flags |= ITEM_ENTITY_FLAG_800000 | ITEM_ENTITY_FLAG_1000; + itemEntity->flags |= ITEM_ENTITY_FLAG_400000; itemEntity->spawnType = ITEM_SPAWN_MODE_TOSS_FADE1; itemEntity->scale = 0.8f; - itemEntity->flags |= ITEM_ENTITY_FLAGS_TINY; + itemEntity->flags |= ITEM_ENTITY_FLAG_TINY; break; case ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS_SMALL: - itemEntity->flags |= ITEM_ENTITY_FLAGS_800000; + itemEntity->flags |= ITEM_ENTITY_FLAG_800000; itemEntity->spawnType = ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS; itemEntity->scale = 0.8f; - itemEntity->flags |= ITEM_ENTITY_FLAGS_TINY; + itemEntity->flags |= ITEM_ENTITY_FLAG_TINY; break; case ITEM_SPAWN_MODE_UNKNOWN_1B: - itemEntity->flags |= ITEM_ENTITY_FLAGS_800000 | ITEM_ENTITY_FLAGS_8000; + itemEntity->flags |= ITEM_ENTITY_FLAG_800000 | ITEM_ENTITY_FLAG_8000; itemEntity->spawnType = ITEM_SPAWN_MODE_ITEM_BLOCK_SPAWN_ALWAYS; itemEntity->scale = 0.8f; - itemEntity->flags |= ITEM_ENTITY_FLAGS_TINY; + itemEntity->flags |= ITEM_ENTITY_FLAG_TINY; break; case ITEM_SPAWN_MODE_ITEM_BLOCK_SPAWN_ALWAYS: - itemEntity->flags |= ITEM_ENTITY_FLAGS_800000 | ITEM_ENTITY_FLAGS_8000 | ITEM_ENTITY_FLAGS_NEVER_VANISH; + itemEntity->flags |= ITEM_ENTITY_FLAG_800000 | ITEM_ENTITY_FLAG_8000 | ITEM_ENTITY_FLAG_NEVER_VANISH; break; case ITEM_SPAWN_MODE_ITEM_BLOCK_COIN: itemEntity->spawnType = ITEM_SPAWN_MODE_ITEM_BLOCK_SPAWN_ALWAYS; - itemEntity->flags |= ITEM_ENTITY_FLAGS_800000 | ITEM_ENTITY_FLAGS_8000 | ITEM_ENTITY_FLAGS_400 | ITEM_ENTITY_FLAGS_NEVER_VANISH; + itemEntity->flags |= ITEM_ENTITY_FLAG_800000 | ITEM_ENTITY_FLAG_8000 | ITEM_ENTITY_FLAG_400 | ITEM_ENTITY_FLAG_NEVER_VANISH; break; case ITEM_SPAWN_MODE_TOSS_HIGHER_NEVER_VANISH: itemEntity->spawnType = ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS; - itemEntity->flags |= ITEM_ENTITY_FLAGS_800000 | ITEM_ENTITY_FLAGS_400 | ITEM_ENTITY_FLAGS_NEVER_VANISH; - itemEntity->flags |= ITEM_ENTITY_FLAGS_1000000; + itemEntity->flags |= ITEM_ENTITY_FLAG_800000 | ITEM_ENTITY_FLAG_400 | ITEM_ENTITY_FLAG_NEVER_VANISH; + itemEntity->flags |= ITEM_ENTITY_FLAG_1000000; break; } @@ -989,7 +989,7 @@ s32 make_item_entity(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pic shadow = get_shadow_by_index(itemEntity->shadowIndex); if (itemEntity->spawnType == ITEM_SPAWN_MODE_ITEM_BLOCK_SPAWN_ALWAYS) { - shadow->flags |= ENTITY_FLAGS_HIDDEN; + shadow->flags |= ENTITY_FLAG_HIDDEN; } x = itemEntity->position.x; @@ -1019,7 +1019,7 @@ s32 make_item_entity(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pic } if (itemEntity->itemID == ITEM_STAR_PIECE) { - itemEntity->flags &= ~ITEM_ENTITY_FLAGS_80; + itemEntity->flags &= ~ITEM_ENTITY_FLAG_80; } return id; @@ -1058,9 +1058,9 @@ s32 make_item_entity_at_player(s32 itemID, s32 category, s32 pickupMsgFlags) { itemID &= 0xFFFF; item->renderGroup = -1; - item->flags = (ITEM_ENTITY_FLAGS_CAM0 | ITEM_ENTITY_FLAGS_CAM1 | ITEM_ENTITY_FLAGS_CAM2 | ITEM_ENTITY_FLAGS_10 | ITEM_ENTITY_FLAGS_2000000); + item->flags = (ITEM_ENTITY_FLAG_CAM0 | ITEM_ENTITY_FLAG_CAM1 | ITEM_ENTITY_FLAG_CAM2 | ITEM_ENTITY_FLAG_10 | ITEM_ENTITY_FLAG_2000000); if (category != ITEM_TYPE_CONSUMABLE) { - item->flags |= ITEM_ENTITY_FLAGS_4000000; + item->flags |= ITEM_ENTITY_FLAG_4000000; } item->pickupMsgFlags = pickupMsgFlags; item->spawnType = ITEM_SPAWN_AT_PLAYER; @@ -1080,19 +1080,19 @@ s32 make_item_entity_at_player(s32 itemID, s32 category, s32 pickupMsgFlags) { item->physicsData = NULL; item->pickupDelay = 0; item->wsFaceAngle = 0; - item->flags |= ITEM_ENTITY_FLAGS_TINY; + item->flags |= ITEM_ENTITY_FLAG_TINY; if (gItemTable[itemID].typeFlags & ITEM_TYPE_FLAG_ENTITY_FULLSIZE) { - item->flags = (item->flags | ITEM_ENTITY_FLAGS_40000) & ~ITEM_ENTITY_FLAGS_TINY; + item->flags = (item->flags | ITEM_ENTITY_FLAG_40000) & ~ITEM_ENTITY_FLAG_TINY; } if (ItemEntityAlternatingSpawn != 0) { - item->flags |= ITEM_ENTITY_FLAGS_20000; + item->flags |= ITEM_ENTITY_FLAG_20000; } ItemEntityAlternatingSpawn = 1 - ItemEntityAlternatingSpawn; item->shadowIndex = create_shadow_type(0, item->position.x, item->position.y, item->position.z); shadow = get_shadow_by_index(item->shadowIndex); - shadow->flags |= ENTITY_FLAGS_HIDDEN; + shadow->flags |= ENTITY_FLAG_HIDDEN; posX = item->position.x; posY = item->position.y + 12.0f; @@ -1260,12 +1260,12 @@ void appendGfx_item_entity(void* data) { s32 yOffset; f32 rot; - if (itemEntity->flags & (ITEM_ENTITY_FLAGS_8000000 | ITEM_ENTITY_FLAGS_TRANSPARENT)) { - if (itemEntity->flags & ITEM_ENTITY_FLAGS_TRANSPARENT) { + if (itemEntity->flags & (ITEM_ENTITY_FLAG_8000000 | ITEM_ENTITY_FLAG_TRANSPARENT)) { + if (itemEntity->flags & ITEM_ENTITY_FLAG_TRANSPARENT) { alpha = 255; alpha = (itemEntity->alpha * alpha) / 255; } - if (itemEntity->flags & ITEM_ENTITY_FLAGS_8000000) { + if (itemEntity->flags & ITEM_ENTITY_FLAG_8000000) { u8 r, g, b, a; get_background_color_blend(&r, &g, &b, &a); @@ -1273,7 +1273,7 @@ void appendGfx_item_entity(void* data) { } } - if (!(itemEntity->flags & ITEM_ENTITY_FLAGS_40000)) { + if (!(itemEntity->flags & ITEM_ENTITY_FLAG_40000)) { yOffset = -2; } else { yOffset = -3; @@ -1286,7 +1286,7 @@ void appendGfx_item_entity(void* data) { rot = clamp_angle(180.0f - gCameras[gCurrentCamID].currentYaw); guTranslateF(mtxTranslate, itemEntity->position.x, itemEntity->position.y + yOffset, itemEntity->position.z); guRotateF(mtxRotY, rot, 0.0f, 1.0f, 0.0f); - if (itemEntity->flags & ITEM_ENTITY_FLAGS_TINY) { + if (itemEntity->flags & ITEM_ENTITY_FLAG_TINY) { guScaleF(mtxScale, itemEntity->scale, itemEntity->scale, itemEntity->scale); guMtxCatF(mtxRotY, mtxScale, mtxRotY); } @@ -1306,7 +1306,7 @@ void appendGfx_item_entity(void* data) { gSPClearGeometryMode(gMasterGfxPos++, G_CULL_BOTH | G_LIGHTING); gSPDisplayList(gMasterGfxPos++, D_8014C620); - if (itemEntity->flags & (ITEM_ENTITY_FLAGS_8000000 | ITEM_ENTITY_FLAGS_TRANSPARENT)) { + if (itemEntity->flags & (ITEM_ENTITY_FLAG_8000000 | ITEM_ENTITY_FLAG_TRANSPARENT)) { if (D_80151328->flags != 0) { gDPSetRenderMode(gMasterGfxPos++, AA_EN | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | @@ -1322,7 +1322,7 @@ void appendGfx_item_entity(void* data) { } } - if (!(itemEntity->flags & ITEM_ENTITY_FLAGS_40000)) { + if (!(itemEntity->flags & ITEM_ENTITY_FLAG_40000)) { gDPLoadTLUT_pal16(gMasterGfxPos++, 0, gHudElementCacheTablePalette[itemEntity->lookupPaletteIndex].data); if (D_80151328->flags != 0) { gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 12, gHudElementCacheTableRaster[itemEntity->lookupRasterIndex].data); @@ -1340,7 +1340,7 @@ void appendGfx_item_entity(void* data) { G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); gDPSetTileSize(gMasterGfxPos++, 2, 0, 0, 0x00FC, 0); - if (itemEntity->flags & (ITEM_ENTITY_FLAGS_8000000 | ITEM_ENTITY_FLAGS_TRANSPARENT)) { + if (itemEntity->flags & (ITEM_ENTITY_FLAG_8000000 | ITEM_ENTITY_FLAG_TRANSPARENT)) { func_801491E4(mtxTranslate, 0, 0, 0x18, 0x18, alpha); } else { func_801491E4(mtxTranslate, 0, 0, 0x18, 0x18, 255); @@ -1374,7 +1374,7 @@ void appendGfx_item_entity(void* data) { gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0x0100, 2, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); gDPSetTileSize(gMasterGfxPos++, 2, 0, 0, 0x00FC, 0); - if (itemEntity->flags & (ITEM_ENTITY_FLAGS_8000000 | ITEM_ENTITY_FLAGS_TRANSPARENT)) { + if (itemEntity->flags & (ITEM_ENTITY_FLAG_8000000 | ITEM_ENTITY_FLAG_TRANSPARENT)) { func_801491E4(mtxTranslate, 0, 0, 0x20, 0x20, alpha); } else { func_801491E4(mtxTranslate, 0, 0, 0x20, 0x20, 255); @@ -1411,12 +1411,12 @@ void draw_item_entities(void) { if (itemEntity != NULL && itemEntity->flags != 0 - && !(itemEntity->flags & ITEM_ENTITY_FLAGS_HIDDEN) + && !(itemEntity->flags & ITEM_ENTITY_FLAG_HIDDEN) && (itemEntity->flags & (1 << gCurrentCamID)) - && !(itemEntity->flags & ITEM_ENTITY_FLAGS_100000) + && !(itemEntity->flags & ITEM_ENTITY_FLAG_100000) && (itemEntity->renderGroup == -1 || ItemEntityRenderGroup == itemEntity->renderGroup)) { - if (!(itemEntity->flags & ITEM_ENTITY_FLAGS_TRANSPARENT)) { + if (!(itemEntity->flags & ITEM_ENTITY_FLAG_TRANSPARENT)) { rtPtr->renderMode = RENDER_MODE_ALPHATEST; } else { rtPtr->renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; @@ -1481,9 +1481,9 @@ void render_item_entities(void) { ItemEntity* item = gCurrentItemEntities[i]; if (item != NULL) { if ((item->flags != 0)) { - if (!(item->flags & ITEM_ENTITY_FLAGS_HIDDEN)) { - if ((item->flags & ITEM_ENTITY_FLAGS_100000)) { - if (!(item->flags & ITEM_ENTITY_FLAGS_40000)) { + if (!(item->flags & ITEM_ENTITY_FLAG_HIDDEN)) { + if ((item->flags & ITEM_ENTITY_FLAG_100000)) { + if (!(item->flags & ITEM_ENTITY_FLAG_40000)) { offsetY = -4; } else { offsetY = 0; @@ -1497,7 +1497,7 @@ void render_item_entities(void) { rotX = clamp_angle(180.0f - gCameras[gCurrentCamID].currentYaw); guTranslateF(sp58, item->position.x, -item->position.y - offsetY, item->position.z); guRotateF(sp98, rotX, 0.0f, 1.0f, 0.0f); - if (item->flags & ITEM_ENTITY_FLAGS_TINY) { + if (item->flags & ITEM_ENTITY_FLAG_TINY) { guScaleF(spD8, item->scale, item->scale, item->scale); guMtxCatF(sp98, spD8, sp98); } @@ -1515,15 +1515,15 @@ void render_item_entities(void) { gSPDisplayList(gMasterGfxPos++, D_8014C620); alpha = 255; - if (item->flags & (ITEM_ENTITY_FLAGS_TRANSPARENT | ITEM_ENTITY_FLAGS_8000000)) { - if (item->flags & ITEM_ENTITY_FLAGS_TRANSPARENT) { + if (item->flags & (ITEM_ENTITY_FLAG_TRANSPARENT | ITEM_ENTITY_FLAG_8000000)) { + if (item->flags & ITEM_ENTITY_FLAG_TRANSPARENT) { alpha = item->alpha * alpha / 255; } - if (item->flags & ITEM_ENTITY_FLAGS_8000000) { + if (item->flags & ITEM_ENTITY_FLAG_8000000) { get_background_color_blend(&r1, &g1, &b1, &a1); alpha = alpha * (255 - a1) / 255; } - if (item->flags & (ITEM_ENTITY_FLAGS_TRANSPARENT | ITEM_ENTITY_FLAGS_8000000)) { + if (item->flags & (ITEM_ENTITY_FLAG_TRANSPARENT | ITEM_ENTITY_FLAG_8000000)) { if (D_80151328->flags) { gDPSetRenderMode(gMasterGfxPos++, AA_EN | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | G_RM_PASS, AA_EN | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); @@ -1536,7 +1536,7 @@ void render_item_entities(void) { } } - if (!(item->flags & ITEM_ENTITY_FLAGS_40000)) { + if (!(item->flags & ITEM_ENTITY_FLAG_40000)) { gDPLoadTLUT_pal16(gMasterGfxPos++, 0, gHudElementCacheTablePalette[item->lookupPaletteIndex].data); if (D_80151328->flags) { gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_8b, 12, gHudElementCacheTableRaster[item->lookupRasterIndex].data); @@ -1549,7 +1549,7 @@ void render_item_entities(void) { gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, G_TX_RENDERTILE, 1, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0x0100, 2, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); gDPSetTileSize(gMasterGfxPos++, 2, 0, 0, 0x00FC, 0); - if (item->flags & (ITEM_ENTITY_FLAGS_TRANSPARENT | ITEM_ENTITY_FLAGS_8000000)) { + if (item->flags & (ITEM_ENTITY_FLAG_TRANSPARENT | ITEM_ENTITY_FLAG_8000000)) { func_801491E4(sp58, 0, 0, 24, 24, alpha); } else { func_801491E4(sp58, 0, 0, 24, 24, 255); @@ -1577,7 +1577,7 @@ void render_item_entities(void) { gDPSetTile(gMasterGfxPos++, G_IM_FMT_CI, G_IM_SIZ_4b, 2, 0x0000, G_TX_RENDERTILE, 1, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 8, G_TX_NOLOD); gDPSetTile(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0x0100, 2, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); gDPSetTileSize(gMasterGfxPos++, 2, 0, 0, 0x00FC, 0); - if (item->flags & (ITEM_ENTITY_FLAGS_TRANSPARENT | ITEM_ENTITY_FLAGS_8000000)) { + if (item->flags & (ITEM_ENTITY_FLAG_TRANSPARENT | ITEM_ENTITY_FLAG_8000000)) { func_801491E4(sp58, 0, 0, 32, 32, alpha); } else { func_801491E4(sp58, 0, 0, 32, 32, 255); @@ -1658,12 +1658,12 @@ void func_80133A94(s32 idx, s32 itemID) { item->itemID = itemID; - item->flags |= ITEM_ENTITY_FLAGS_TINY; - item->flags &= ~ITEM_ENTITY_FLAGS_40000; + item->flags |= ITEM_ENTITY_FLAG_TINY; + item->flags &= ~ITEM_ENTITY_FLAG_40000; if (gItemTable[itemID].typeFlags & ITEM_TYPE_FLAG_ENTITY_FULLSIZE) { - item->flags |= ITEM_ENTITY_FLAGS_40000; - item->flags &= ~ITEM_ENTITY_FLAGS_TINY; + item->flags |= ITEM_ENTITY_FLAG_40000; + item->flags &= ~ITEM_ENTITY_FLAG_TINY; } item_entity_load(item); @@ -1700,8 +1700,8 @@ s32 test_item_player_collision(ItemEntity* item) { actionState = playerStatus->actionState; - if (item->flags & ITEM_ENTITY_FLAGS_100) { - item->flags &= ~ITEM_ENTITY_FLAGS_100; + if (item->flags & ITEM_ENTITY_FLAG_100) { + item->flags &= ~ITEM_ENTITY_FLAG_100; return TRUE; } @@ -1713,7 +1713,7 @@ s32 test_item_player_collision(ItemEntity* item) { return FALSE; } - if (item->flags & ITEM_ENTITY_FLAGS_200000) { + if (item->flags & ITEM_ENTITY_FLAG_200000) { return FALSE; } @@ -1721,7 +1721,7 @@ s32 test_item_player_collision(ItemEntity* item) { return FALSE; } - if (item->flags & ITEM_ENTITY_FLAGS_HIDDEN) { + if (item->flags & ITEM_ENTITY_FLAG_HIDDEN) { return FALSE; } @@ -1795,19 +1795,19 @@ s32 test_item_player_collision(ItemEntity* item) { } if (cond) { - if (item->flags & ITEM_ENTITY_FLAGS_80) { + if (item->flags & ITEM_ENTITY_FLAG_80) { if (D_801565A6 != 0) { D_801565A6--; return FALSE; } else { - item->flags &= ~ITEM_ENTITY_FLAGS_80; + item->flags &= ~ITEM_ENTITY_FLAG_80; } } return TRUE; } - if (item->flags & ITEM_ENTITY_FLAGS_80) { - item->flags &= ~ITEM_ENTITY_FLAGS_80; + if (item->flags & ITEM_ENTITY_FLAG_80) { + item->flags &= ~ITEM_ENTITY_FLAG_80; } return FALSE; } @@ -1845,11 +1845,11 @@ s32 test_item_entity_position(f32 x, f32 y, f32 z, f32 dist) { continue; } - if (item->flags & ITEM_ENTITY_FLAGS_HIDDEN) { + if (item->flags & ITEM_ENTITY_FLAG_HIDDEN) { continue; } - if (item->flags & ITEM_ENTITY_FLAGS_200000) { + if (item->flags & ITEM_ENTITY_FLAG_200000) { continue; } @@ -1867,7 +1867,7 @@ void set_item_entity_flags(s32 index, s32 flags) { ItemEntity* itemEntity = gCurrentItemEntities[index]; itemEntity->flags |= flags; - if (itemEntity->flags & ITEM_ENTITY_FLAGS_200000) { + if (itemEntity->flags & ITEM_ENTITY_FLAG_200000) { D_801565A8 = 1; } } @@ -1881,7 +1881,7 @@ void clear_item_entity_flags(s32 index, s32 flags) { void func_801341B0(s32 index) { ItemEntity* itemEntity = gCurrentItemEntities[index]; gOverrideFlags |= GLOBAL_OVERRIDES_40; - itemEntity->flags |= ITEM_ENTITY_FLAGS_100; + itemEntity->flags |= ITEM_ENTITY_FLAG_100; } /// @returns TRUE when "you got X" popup is on-screen @@ -1939,10 +1939,10 @@ void update_item_entity_collectable(ItemEntity* item) { item->physicsData = physData; ASSERT(physData != NULL); - if (item->flags & ITEM_ENTITY_FLAGS_1000000) { + if (item->flags & ITEM_ENTITY_FLAG_1000000) { physData->verticalVelocity = 16.0f; physData->gravity = 2.0f; - } else if (!(item->flags & ITEM_ENTITY_FLAGS_10000)) { + } else if (!(item->flags & ITEM_ENTITY_FLAG_10000)) { physData->verticalVelocity = 12.0f; physData->gravity = 2.0f; } else { @@ -2012,7 +2012,7 @@ void update_item_entity_collectable(ItemEntity* item) { } } - if (!(item->flags & ITEM_ENTITY_FLAGS_1000000)) { + if (!(item->flags & ITEM_ENTITY_FLAG_1000000)) { temp = rand_int(2000); temp = (temp / 1000.0f) + 1.5; theta = DEG_TO_RAD(physData->moveAngle); @@ -2031,7 +2031,7 @@ void update_item_entity_collectable(ItemEntity* item) { } } else { physData->moveAngle = clamp_angle(item->wsFaceAngle); - if (!(item->flags & ITEM_ENTITY_FLAGS_40000000)) { + if (!(item->flags & ITEM_ENTITY_FLAG_40000000)) { temp = ((item->wsFaceAngle / 360) * 0.6) + 1.5; } else { temp = 2.1f; @@ -2047,7 +2047,7 @@ void update_item_entity_collectable(ItemEntity* item) { physData->unk_1C = 180; physData->unk_20 = 0; } else { - if (!(item->flags & ITEM_ENTITY_FLAGS_400000)) { + if (!(item->flags & ITEM_ENTITY_FLAG_400000)) { physData->unk_1C = 0x11; } else { physData->unk_1C = 0x14; @@ -2078,7 +2078,7 @@ void update_item_entity_collectable(ItemEntity* item) { physData->unk_20 = 1; } - if (item->flags & ITEM_ENTITY_FLAGS_800) { + if (item->flags & ITEM_ENTITY_FLAG_800) { set_global_flag(item->boundVar); } item->state = 1; @@ -2094,9 +2094,9 @@ void update_item_entity_collectable(ItemEntity* item) { break; } - if (!(item->flags & ITEM_ENTITY_FLAGS_NEVER_VANISH)) { + if (!(item->flags & ITEM_ENTITY_FLAG_NEVER_VANISH)) { if (!(gOverrideFlags & (GLOBAL_OVERRIDES_200 | GLOBAL_OVERRIDES_DISABLE_BATTLES))) { - if (!(item->flags & ITEM_ENTITY_FLAGS_200000)) { + if (!(item->flags & ITEM_ENTITY_FLAG_200000)) { physData->unk_1C--; if (physData->unk_1C < 0) { item->state = 2; @@ -2106,8 +2106,8 @@ void update_item_entity_collectable(ItemEntity* item) { } } - if (!(item->flags & ITEM_ENTITY_FLAGS_FIXED)) { - if (!(item->flags & ITEM_ENTITY_FLAGS_200000)) { + if (!(item->flags & ITEM_ENTITY_FLAG_FIXED)) { + if (!(item->flags & ITEM_ENTITY_FLAG_200000)) { physData->verticalVelocity -= physData->gravity; if (physData->verticalVelocity < -16.0) { physData->verticalVelocity = -16.0f; @@ -2125,7 +2125,7 @@ void update_item_entity_collectable(ItemEntity* item) { break; } - if (!(item->flags & (ITEM_ENTITY_FLAGS_20000000 | ITEM_ENTITY_FLAGS_10000000)) && + if (!(item->flags & (ITEM_ENTITY_FLAG_20000000 | ITEM_ENTITY_FLAG_10000000)) && item->spawnType != ITEM_SPAWN_MODE_ITEM_BLOCK_SPAWN_ALWAYS && item->spawnType != ITEM_SPAWN_MODE_TOSS_FADE1 && physData->verticalVelocity > 0.0f) @@ -2148,7 +2148,7 @@ void update_item_entity_collectable(ItemEntity* item) { } } - if (!(item->flags & (ITEM_ENTITY_FLAGS_20000000 | ITEM_ENTITY_FLAGS_10000000)) && + if (!(item->flags & (ITEM_ENTITY_FLAG_20000000 | ITEM_ENTITY_FLAG_10000000)) && item->spawnType != ITEM_SPAWN_MODE_ITEM_BLOCK_SPAWN_ALWAYS && item->spawnType != ITEM_SPAWN_MODE_TOSS_FADE1 && (physData->velx != 0.0f || physData->velz != 0.0f)) @@ -2176,7 +2176,7 @@ void update_item_entity_collectable(ItemEntity* item) { } } - if (!(item->flags & ITEM_ENTITY_FLAGS_10000000) && + if (!(item->flags & ITEM_ENTITY_FLAG_10000000) && item->spawnType != ITEM_SPAWN_MODE_ITEM_BLOCK_SPAWN_ALWAYS && physData->verticalVelocity <= 0.0) { @@ -2211,7 +2211,7 @@ void update_item_entity_collectable(ItemEntity* item) { physData->verticalVelocity = 0.0f; physData->velx = 0.0f; physData->velz = 0.0f; - item->flags |= ITEM_ENTITY_FLAGS_20000000; + item->flags |= ITEM_ENTITY_FLAG_20000000; } else { if (IS_BADGE(item->itemID)) { sfx_play_sound_at_position(SOUND_21B, 0, item->position.x, item->position.y, item->position.z); @@ -2260,7 +2260,7 @@ void update_item_entity_collectable(ItemEntity* item) { } if (item->state == 3) { - if (item->flags & ITEM_ENTITY_FLAGS_400) { + if (item->flags & ITEM_ENTITY_FLAG_400) { set_global_flag(item->boundVar); } @@ -2358,21 +2358,21 @@ void update_item_entity_collectable(ItemEntity* item) { void func_8013559C(ItemEntity* itemEntity) { if (itemEntity->state == 1) { ItemEntityPhysicsData* physicsData = itemEntity->physicsData; - s32 flag = (itemEntity->flags & ITEM_ENTITY_FLAGS_20000) > 0; + s32 flag = (itemEntity->flags & ITEM_ENTITY_FLAG_20000) > 0; if (itemEntity->spawnType != ITEM_SPAWN_MODE_ITEM_BLOCK_SPAWN_ALWAYS) { if (itemEntity->spawnType != ITEM_SPAWN_MODE_TOSS_FADE1) { if (physicsData->unk_1C < 60) { - if ((itemEntity->flags & ITEM_ENTITY_FLAGS_200000) || ((gGameStatusPtr->frameCounter + flag) & 1)) { - itemEntity->flags &= ~ITEM_ENTITY_FLAGS_HIDDEN; + if ((itemEntity->flags & ITEM_ENTITY_FLAG_200000) || ((gGameStatusPtr->frameCounter + flag) & 1)) { + itemEntity->flags &= ~ITEM_ENTITY_FLAG_HIDDEN; } else { - itemEntity->flags |= ITEM_ENTITY_FLAGS_HIDDEN; + itemEntity->flags |= ITEM_ENTITY_FLAG_HIDDEN; } } } else { if (physicsData->unk_1C < 10) { itemEntity->alpha = physicsData->unk_1C * 28; - itemEntity->flags |= ITEM_ENTITY_FLAGS_TRANSPARENT; + itemEntity->flags |= ITEM_ENTITY_FLAG_TRANSPARENT; } } } @@ -2409,7 +2409,7 @@ void update_item_entity_temp(ItemEntity* itemEntity) { if (itemEntity->state == 0) { isPickingUpItem = TRUE; - if (!(itemEntity->flags & ITEM_ENTITY_FLAGS_2000000)) { + if (!(itemEntity->flags & ITEM_ENTITY_FLAG_2000000)) { disable_player_input(); partner_disable_input(); gOverrideFlags |= GLOBAL_OVERRIDES_40; @@ -2421,10 +2421,10 @@ void update_item_entity_temp(ItemEntity* itemEntity) { switch (itemEntity->state) { case 1: - if (!(itemEntity->flags & ITEM_ENTITY_FLAGS_2000000)) { + if (!(itemEntity->flags & ITEM_ENTITY_FLAG_2000000)) { s32 actionState = playerStatus->actionState; - if (!(playerStatus->animFlags & PA_FLAGS_NO_OOB_RESPAWN) && + if (!(playerStatus->animFlags & PA_FLAG_NO_OOB_RESPAWN) && ((playerStatus->timeInAir == 0 && actionState != ACTION_STATE_JUMP && actionState != ACTION_STATE_FALLING) || @@ -2453,11 +2453,11 @@ void update_item_entity_temp(ItemEntity* itemEntity) { } } D_801568E0 = hud_element_create(gItemHudScripts[gItemTable[itemEntity->itemID].hudElemID].enabled); - hud_element_set_flags(D_801568E0, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(D_801568E0, HUD_ELEMENT_FLAG_80); hud_element_set_render_pos(D_801568E0, -100, -100); itemEntity->state = 2; - if (!(itemEntity->flags & ITEM_ENTITY_FLAGS_2000000)) { + if (!(itemEntity->flags & ITEM_ENTITY_FLAG_2000000)) { if (gItemTable[itemEntity->itemID].typeFlags & ITEM_TYPE_FLAG_CONSUMABLE) { for (i = 0; i < ARRAY_COUNT(playerData->invItems); i++) { if (playerData->invItems[i] == ITEM_NONE) { @@ -2530,7 +2530,7 @@ void update_item_entity_temp(ItemEntity* itemEntity) { } block_47: // TODO required to match - if (itemEntity->flags & ITEM_ENTITY_FLAGS_80000000) { + if (itemEntity->flags & ITEM_ENTITY_FLAG_80000000) { set_global_flag(itemEntity->boundVar); } if (itemEntity->state == 0xA) { @@ -2548,7 +2548,7 @@ block_47: // TODO required to match (gItemTable[itemEntity->itemID].typeFlags & ITEM_TYPE_FLAG_KEY) || (itemEntity->itemID == ITEM_STAR_PIECE) || (gItemTable[itemEntity->itemID].typeFlags & ITEM_TYPE_FLAG_GEAR) || - (itemEntity->flags & ITEM_ENTITY_FLAGS_4000000) || + (itemEntity->flags & ITEM_ENTITY_FLAG_4000000) || (itemEntity->pickupMsgFlags & 2)) { itemEntity->position.x = playerStatus->position.x; @@ -2574,7 +2574,7 @@ block_47: // TODO required to match (gItemTable[itemEntity->itemID].typeFlags & ITEM_TYPE_FLAG_KEY) || (itemEntity->itemID == ITEM_STAR_PIECE) || (gItemTable[itemEntity->itemID].typeFlags & ITEM_TYPE_FLAG_GEAR) || - (itemEntity->flags & ITEM_ENTITY_FLAGS_4000000) || + (itemEntity->flags & ITEM_ENTITY_FLAG_4000000) || (itemEntity->pickupMsgFlags & 2)) { suggest_player_anim_setUnkFlag(ANIM_Mario_6000C); @@ -2586,10 +2586,10 @@ block_47: // TODO required to match (gItemTable[itemEntity->itemID].typeFlags & ITEM_TYPE_FLAG_KEY) || itemEntity->itemID == ITEM_STAR_PIECE || (gItemTable[itemEntity->itemID].typeFlags & ITEM_TYPE_FLAG_GEAR) || - (itemEntity->flags & ITEM_ENTITY_FLAGS_4000000) || + (itemEntity->flags & ITEM_ENTITY_FLAG_4000000) || (itemEntity->pickupMsgFlags & 2)) { - itemEntity->flags &= ~ITEM_ENTITY_FLAGS_HIDDEN; + itemEntity->flags &= ~ITEM_ENTITY_FLAG_HIDDEN; } } @@ -2612,7 +2612,7 @@ block_47: // TODO required to match hide_item_entity(itemEntity); if (func_800DFCF4() && playerStatus->actionState != ACTION_STATE_USE_SPINNING_FLOWER && - !(playerStatus->animFlags & PA_FLAGS_NO_OOB_RESPAWN)) + !(playerStatus->animFlags & PA_FLAG_NO_OOB_RESPAWN)) { set_action_state(ACTION_STATE_IDLE); } @@ -2626,8 +2626,8 @@ block_47: // TODO required to match } break; case 3: - if (!(gWindows[12].flags & WINDOW_FLAGS_INITIAL_ANIMATION) && - !(gWindows[19].flags & WINDOW_FLAGS_INITIAL_ANIMATION)) + if (!(gWindows[12].flags & WINDOW_FLAG_INITIAL_ANIMATION) && + !(gWindows[19].flags & WINDOW_FLAG_INITIAL_ANIMATION)) { itemEntity->state = 4; } @@ -2667,7 +2667,7 @@ block_47: // TODO required to match break; } case 9: - if (!(itemEntity->flags & ITEM_ENTITY_FLAGS_2000000)) { + if (!(itemEntity->flags & ITEM_ENTITY_FLAG_2000000)) { set_time_freeze_mode(TIME_FREEZE_NORMAL); enable_player_input(); partner_enable_input(); @@ -2711,9 +2711,9 @@ block_47: // TODO required to match } break; case 11: - if (!(gWindows[12].flags & WINDOW_FLAGS_INITIAL_ANIMATION) && - !(gWindows[17].flags & WINDOW_FLAGS_INITIAL_ANIMATION) && - !(gWindows[19].flags & WINDOW_FLAGS_INITIAL_ANIMATION)) + if (!(gWindows[12].flags & WINDOW_FLAG_INITIAL_ANIMATION) && + !(gWindows[17].flags & WINDOW_FLAG_INITIAL_ANIMATION) && + !(gWindows[19].flags & WINDOW_FLAG_INITIAL_ANIMATION)) { itemEntity->state = 0xC; } @@ -2763,9 +2763,9 @@ block_47: // TODO required to match } break; case 14: - if (!(gWindows[12].flags & WINDOW_FLAGS_INITIAL_ANIMATION) && - !(gWindows[17].flags & WINDOW_FLAGS_INITIAL_ANIMATION) && - !(gWindows[19].flags & WINDOW_FLAGS_INITIAL_ANIMATION)) + if (!(gWindows[12].flags & WINDOW_FLAG_INITIAL_ANIMATION) && + !(gWindows[17].flags & WINDOW_FLAG_INITIAL_ANIMATION) && + !(gWindows[19].flags & WINDOW_FLAG_INITIAL_ANIMATION)) { itemEntity->state = 15; } @@ -2799,7 +2799,7 @@ void func_801363A0(ItemEntity* itemEntity) { case 2: case 10: if (!(itemData->typeFlags & ITEM_TYPE_FLAG_BADGE)) { - if (!(itemEntity->flags & ITEM_ENTITY_FLAGS_4000000) || (itemEntity->pickupMsgFlags & 0x4)) { + if (!(itemEntity->flags & ITEM_ENTITY_FLAG_4000000) || (itemEntity->pickupMsgFlags & 0x4)) { itemMsg = MSG_Menus_0058; } else { itemMsg = MSG_Menus_005A; @@ -2828,7 +2828,7 @@ void func_801363A0(ItemEntity* itemEntity) { s1 = 160 - offsetY / 2; s3 = 76; } else { - if (!(itemEntity->flags & ITEM_ENTITY_FLAGS_4000000) || (itemEntity->pickupMsgFlags & 0x4)) { + if (!(itemEntity->flags & ITEM_ENTITY_FLAG_4000000) || (itemEntity->pickupMsgFlags & 0x4)) { itemMsg = MSG_Menus_0059; } else { itemMsg = MSG_Menus_005B; @@ -2897,7 +2897,7 @@ void func_8013673C(ItemEntity* itemEntity, s32 posX, s32 posY) { case 10: case 11: if (!(itemData->typeFlags & ITEM_TYPE_FLAG_BADGE)) { - if (!(itemEntity->flags & ITEM_ENTITY_FLAGS_4000000) || (itemEntity->pickupMsgFlags & 0x4)) { + if (!(itemEntity->flags & ITEM_ENTITY_FLAG_4000000) || (itemEntity->pickupMsgFlags & 0x4)) { itemMsg = MSG_Menus_0058; } else { itemMsg = MSG_Menus_005A; @@ -2914,7 +2914,7 @@ void func_8013673C(ItemEntity* itemEntity, s32 posX, s32 posY) { itemMsg = MSG_Menus_005C; } } else { - if (!(itemEntity->flags & ITEM_ENTITY_FLAGS_4000000) || (itemEntity->pickupMsgFlags & 0x4)) { + if (!(itemEntity->flags & ITEM_ENTITY_FLAG_4000000) || (itemEntity->pickupMsgFlags & 0x4)) { itemMsg = MSG_Menus_0059; } else { itemMsg = MSG_Menus_005B; diff --git a/src/E20110.c b/src/E20110.c index e91f9a9a99..e02cb83c46 100644 --- a/src/E20110.c +++ b/src/E20110.c @@ -55,7 +55,7 @@ void func_802B71E8_E202F8(void) { FoldImageRecPart sp20; Matrix4f sp38, sp78; - if (gPlayerStatus.animFlags & PA_FLAGS_INTERACT_PROMPT_AVAILABLE) { + if (gPlayerStatus.animFlags & PA_FLAG_INTERACT_PROMPT_AVAILABLE) { guScaleF(sp38, D_802B7CB8_E20DC8->scale, D_802B7CB8_E20DC8->scale, D_802B7CB8_E20DC8->scale); guRotateF(sp78, D_802B7CB8_E20DC8->unk_0C - gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); guMtxCatF(sp38, sp78, sp38); @@ -106,7 +106,7 @@ s32 func_802B7450_E20560(void) { curInteraction = -1; break; } - } else if (((playerStatus->flags & (PS_FLAGS_HAS_CONVERSATION_NPC | PS_FLAGS_INPUT_DISABLED)) == PS_FLAGS_HAS_CONVERSATION_NPC) + } else if (((playerStatus->flags & (PS_FLAG_HAS_CONVERSATION_NPC | PS_FLAG_INPUT_DISABLED)) == PS_FLAG_HAS_CONVERSATION_NPC) && (npc != NULL) && (npc->flags & NPC_FLAG_10000000)) { curInteraction = npc->npcID | COLLISION_WITH_NPC_BIT; if (playerStatus->interactingWithID == curInteraction) { @@ -114,7 +114,7 @@ s32 func_802B7450_E20560(void) { } } else { playerStatus->interactingWithID = -1; - playerStatus->flags &= ~PS_FLAGS_INTERACTED; + playerStatus->flags &= ~PS_FLAG_INTERACTED; return FALSE; } } else { @@ -122,24 +122,24 @@ s32 func_802B7450_E20560(void) { if (!(curInteraction & COLLISION_WITH_NPC_BIT)) { if (!should_collider_allow_interact(curInteraction)) { playerStatus->interactingWithID = -1; - playerStatus->flags &= ~PS_FLAGS_INTERACTED; + playerStatus->flags &= ~PS_FLAG_INTERACTED; return FALSE; } } } else { if (!phys_can_player_interact()) { playerStatus->interactingWithID = -1; - playerStatus->flags &= ~PS_FLAGS_INTERACTED; + playerStatus->flags &= ~PS_FLAG_INTERACTED; return FALSE; } } } if (playerStatus->interactingWithID == curInteraction) { - if ((playerStatus->flags & PS_FLAGS_INTERACTED)) { + if ((playerStatus->flags & PS_FLAG_INTERACTED)) { return FALSE; } } else { - playerStatus->flags &= ~PS_FLAGS_INTERACTED; + playerStatus->flags &= ~PS_FLAG_INTERACTED; } playerStatus->interactingWithID = curInteraction; @@ -172,7 +172,7 @@ void func_802B75E8_E206F8(void) { yTemp = playerStatus->position.y + playerStatus->colliderHeight; unk_21 = D_802B7CB8_E20DC8->unk_21; y = D_802B7CB8_E20DC8->pos.y; - if (!(playerStatus->animFlags & PA_FLAGS_USING_PEACH_PHYSICS)) { + if (!(playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS)) { delta = (yTemp + 8.0f + unk_21 - y) * 0.25f; } else { delta = (yTemp + 2.0f + unk_21 - y) * 0.25f; @@ -236,7 +236,7 @@ void func_802B7728_E20838(void) { actionState = playerStatus->actionState; if (!func_802B7450_E20560() || (playerStatus->inputEnabledCounter != 0) || - (playerStatus->flags & PS_FLAGS_PAUSED) || + (playerStatus->flags & PS_FLAG_PAUSED) || !(actionState == ACTION_STATE_IDLE || actionState == ACTION_STATE_WALK || actionState == ACTION_STATE_RUN)) { D_802B7CB8_E20DC8->unk_23 = 3; @@ -244,7 +244,7 @@ void func_802B7728_E20838(void) { if ((playerStatus->interactingWithID >= 0) && (playerStatus->interactingWithID & 0x4000) && - !(get_entity_by_index(playerStatus->interactingWithID)->flags & ENTITY_FLAGS_SHOWS_INSPECT_PROMPT)) + !(get_entity_by_index(playerStatus->interactingWithID)->flags & ENTITY_FLAG_SHOWS_INSPECT_PROMPT)) { D_802B7CB8_E20DC8->unk_23 = 3; } @@ -255,7 +255,7 @@ void func_802B79C8_E20AD8(void) { gPlayerStatusPtr->interactingWithID = -1; InteractNotificationCallback = NULL; gPlayerStatusPtr->encounteredNPC = NULL; - gPlayerStatusPtr->animFlags &= ~PA_FLAGS_INTERACT_PROMPT_AVAILABLE; + gPlayerStatusPtr->animFlags &= ~PA_FLAG_INTERACT_PROMPT_AVAILABLE; func_800EF3D4(0); partner_reset_tether_distance(); } diff --git a/src/E21870.c b/src/E21870.c index cbf3fc0e8a..e4a7dd59e1 100644 --- a/src/E21870.c +++ b/src/E21870.c @@ -41,8 +41,8 @@ s32 func_802B704C(void) { PlayerStatus* playerStatus = &gPlayerStatus; if (!is_starting_conversation()) { - if (!(playerStatus->flags & PS_FLAGS_PAUSED)) { - if (playerStatus->animFlags & PA_FLAGS_USING_PULSE_STONE) { + if (!(playerStatus->flags & PS_FLAG_PAUSED)) { + if (playerStatus->animFlags & PA_FLAG_USING_PULSE_STONE) { if (!has_valid_conversation_npc()) { if (!func_800E06D8()) { s32 dx = abs((gGameStatusPtr->mapID % 7) - 2); @@ -70,7 +70,7 @@ void func_802B7140(void) { D_802B7D18_E22588->pos.x = playerStatus->position.x; D_802B7D18_E22588->pos.y = playerStatus->position.y + playerStatus->colliderHeight + 8.0f; D_802B7D18_E22588->pos.z = playerStatus->position.z; - playerStatus->animFlags |= PA_FLAGS_40; + playerStatus->animFlags |= PA_FLAG_40; PulseStoneNotificationCallback = func_802B74F0; } @@ -81,7 +81,7 @@ void func_802B71D4(void) { s32 var_v1; s32 dx, dy; - if (playerStatus->animFlags & PA_FLAGS_40) { + if (playerStatus->animFlags & PA_FLAG_40) { guScaleF(sp18, D_802B7D18_E22588->scale, D_802B7D18_E22588->scale, D_802B7D18_E22588->scale); guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); guMtxCatF(sp18, sp58, sp18); @@ -156,7 +156,7 @@ void func_802B74F0(void) { if (!func_802B704C()) { PulseStoneNotificationCallback = NULL; - playerStatus->animFlags &= ~PA_FLAGS_40; + playerStatus->animFlags &= ~PA_FLAG_40; return; } diff --git a/src/E225B0.c b/src/E225B0.c index b57b16cd67..1c03915e41 100644 --- a/src/E225B0.c +++ b/src/E225B0.c @@ -33,7 +33,7 @@ void func_802B7000_E225B0(void) { FoldImageRecPart foldImage; s32 temp; - if (gPlayerStatus.animFlags & PA_FLAGS_100) { + if (gPlayerStatus.animFlags & PA_FLAG_100) { guScaleF(matrix1, D_802B7C78_E23228->scale, D_802B7C78_E23228->scale, D_802B7C78_E23228->scale); guRotateF(matrix2, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); guMtxCatF(matrix1, matrix2, matrix1); @@ -94,7 +94,7 @@ void func_802B72C0_E22870(void) { D_802B7C78_E23228->unk_28 = 0xFF; - gPlayerStatus.animFlags |= PA_FLAGS_100; + gPlayerStatus.animFlags |= PA_FLAG_100; ISpyNotificationCallback = &func_802B735C_E2290C; } @@ -115,7 +115,7 @@ void func_802B735C_E2290C(void) { { cond = gGameStatusPtr->keepUsingPartnerOnMapChange; } else { - cond = playerStatus->flags & (PS_FLAGS_INPUT_DISABLED | PS_FLAGS_NO_STATIC_COLLISION); + cond = playerStatus->flags & (PS_FLAG_INPUT_DISABLED | PS_FLAG_NO_STATIC_COLLISION); } if (!cond) { @@ -123,7 +123,7 @@ void func_802B735C_E2290C(void) { } break; case 1: - if (playerStatus->flags & PS_FLAGS_PAUSED) { + if (playerStatus->flags & PS_FLAG_PAUSED) { D_802B7C78_E23228->unk_24 = 3; return; } @@ -140,7 +140,7 @@ void func_802B735C_E2290C(void) { break; case 3: D_802B7C78_E23228->scale = 0.53f; - if (D_802B7C78_E23228->unk_18 >= 47 || playerStatus->flags & PS_FLAGS_PAUSED) { + if (D_802B7C78_E23228->unk_18 >= 47 || playerStatus->flags & PS_FLAG_PAUSED) { D_802B7C78_E23228->unk_28 -= 64; if (D_802B7C78_E23228->unk_28 < 0) { D_802B7C78_E23228->unk_28 = 0; @@ -151,7 +151,7 @@ void func_802B735C_E2290C(void) { if (D_802B7C78_E23228->unk_18++ > 50) { gCurrentHiddenPanels.activateISpy = FALSE; ISpyNotificationCallback = NULL; - playerStatus->animFlags &= ~PA_FLAGS_100; + playerStatus->animFlags &= ~PA_FLAG_100; } break; } diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c index 23102bb610..5e52d768e8 100644 --- a/src/a5dd0_len_114e0.c +++ b/src/a5dd0_len_114e0.c @@ -1134,33 +1134,33 @@ void update_entities(void) { if (entity != NULL) { entity_numEntities++; - if (!(entity->flags & ENTITY_FLAGS_SKIP_UPDATE)) { - if (entity->flags & ENTITY_FLAGS_BOUND_SCRIPT_DIRTY) { - entity->flags &= ~ENTITY_FLAGS_BOUND_SCRIPT_DIRTY; - if (!(entity->flags & ENTITY_FLAGS_8000)) { - entity->flags |= ENTITY_FLAGS_2000000; + if (!(entity->flags & ENTITY_FLAG_SKIP_UPDATE)) { + if (entity->flags & ENTITY_FLAG_BOUND_SCRIPT_DIRTY) { + entity->flags &= ~ENTITY_FLAG_BOUND_SCRIPT_DIRTY; + if (!(entity->flags & ENTITY_FLAG_8000)) { + entity->flags |= ENTITY_FLAG_2000000; } entity->boundScript = start_script(entity->boundScriptBytecode, EVT_PRIORITY_A, EVT_FLAG_RUN_IMMEDIATELY); } - if (entity->flags & ENTITY_FLAGS_2000000) { + if (entity->flags & ENTITY_FLAG_2000000) { if (does_script_exist(entity->boundScript->id)) { - if (entity->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) { + if (entity->flags & ENTITY_FLAG_HAS_ANIMATED_MODEL) { update_model_animator(entity->virtualModelIndex); } else { exec_entity_model_commandlist(entity->virtualModelIndex); } - if (entity->flags & ENTITY_FLAGS_ALWAYS_FACE_CAMERA) { + if (entity->flags & ENTITY_FLAG_ALWAYS_FACE_CAMERA) { entity->rotation.y = -gCameras[gCurrentCameraID].currentYaw; } - if (!(entity->flags & ENTITY_FLAGS_SKIP_UPDATE_TRANSFORM_MATRIX)) { + if (!(entity->flags & ENTITY_FLAG_SKIP_UPDATE_TRANSFORM_MATRIX)) { update_entity_transform_matrix(entity); } continue; } else { - entity->flags &= ~ENTITY_FLAGS_2000000; + entity->flags &= ~ENTITY_FLAG_2000000; } } @@ -1172,25 +1172,25 @@ void update_entities(void) { if (handleCollision != NULL && handleCollision(entity) != 0) { entity->collisionTimer = 10; - entity->flags |= ENTITY_FLAGS_DETECTED_COLLISION; + entity->flags |= ENTITY_FLAG_DETECTED_COLLISION; } } } else { entity->collisionTimer--; - if (entity->flags & ENTITY_FLAGS_CONTINUOUS_COLLISION) { + if (entity->flags & ENTITY_FLAG_CONTINUOUS_COLLISION) { if (entity->collisionTimer == 0) { - entity->flags &= ~(ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_CONTINUOUS_COLLISION); + entity->flags &= ~(ENTITY_FLAG_DISABLE_COLLISION | ENTITY_FLAG_CONTINUOUS_COLLISION); } else { - entity->flags |= ENTITY_FLAGS_DISABLE_COLLISION; + entity->flags |= ENTITY_FLAG_DISABLE_COLLISION; } } else if (entity->collisionTimer == 0) { - entity->flags &= ~ENTITY_FLAGS_DETECTED_COLLISION; - entity->flags &= ~ENTITY_FLAGS_PARTNER_COLLISION; + entity->flags &= ~ENTITY_FLAG_DETECTED_COLLISION; + entity->flags &= ~ENTITY_FLAG_PARTNER_COLLISION; entity->collisionFlags = 0; } } - if (entity->flags & ENTITY_FLAGS_ALWAYS_FACE_CAMERA) { + if (entity->flags & ENTITY_FLAG_ALWAYS_FACE_CAMERA) { entity->rotation.y = -gCameras[gCurrentCameraID].currentYaw; } @@ -1209,15 +1209,15 @@ void update_entities(void) { } } - if (!(entity->flags & ENTITY_FLAGS_SKIP_UPDATE_TRANSFORM_MATRIX)) { + if (!(entity->flags & ENTITY_FLAG_SKIP_UPDATE_TRANSFORM_MATRIX)) { update_entity_transform_matrix(entity); } - if (!(entity->flags & ENTITY_FLAGS_DISABLE_COLLISION)) { + if (!(entity->flags & ENTITY_FLAG_DISABLE_COLLISION)) { update_entity_inverse_rotation_matrix(entity); } - if (entity->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) { + if (entity->flags & ENTITY_FLAG_HAS_ANIMATED_MODEL) { update_model_animator(entity->virtualModelIndex); } else { exec_entity_model_commandlist(entity->virtualModelIndex); @@ -1227,11 +1227,11 @@ void update_entities(void) { update_entity_shadow_position(entity); } - if (entity->flags & ENTITY_FLAGS_PENDING_INSTANCE_DELETE) { + if (entity->flags & ENTITY_FLAG_PENDING_INSTANCE_DELETE) { delete_entity(entity->listIndex); } - if (entity->flags & ENTITY_FLAGS_PENDING_FULL_DELETE) { + if (entity->flags & ENTITY_FLAG_PENDING_FULL_DELETE) { delete_entity_and_unload_data(entity->listIndex); } } @@ -1253,20 +1253,20 @@ void update_shadows(void) { if (shadow != NULL) { entity_numShadows++; - if (!(shadow->flags & ENTITY_FLAGS_SKIP_UPDATE)) { - if (shadow->flags & ENTITY_FLAGS_ALWAYS_FACE_CAMERA) { + if (!(shadow->flags & ENTITY_FLAG_SKIP_UPDATE)) { + if (shadow->flags & ENTITY_FLAG_ALWAYS_FACE_CAMERA) { shadow->rotation.y = -gCameras[gCurrentCameraID].currentYaw; } update_shadow_transform_matrix(shadow); - if (shadow->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) { + if (shadow->flags & ENTITY_FLAG_HAS_ANIMATED_MODEL) { update_model_animator(shadow->entityModelID); } else { exec_entity_model_commandlist(shadow->entityModelID); } - if (shadow->flags & ENTITY_FLAGS_PENDING_INSTANCE_DELETE) { + if (shadow->flags & ENTITY_FLAG_PENDING_INSTANCE_DELETE) { _delete_shadow(shadow->listIndex); } } @@ -1323,7 +1323,7 @@ s32 step_entity_commandlist(Entity* entity) { break; case ENTITY_SCRIPT_OP_RestartBoundScript: if (entity->boundScriptBytecode != NULL) { - entity->flags |= ENTITY_FLAGS_BOUND_SCRIPT_DIRTY; + entity->flags |= ENTITY_FLAG_BOUND_SCRIPT_DIRTY; } entity->scriptReadPos = args++; ret = TRUE; @@ -1386,7 +1386,7 @@ void render_entities(void) { if (entity != NULL) { if (!gGameStatusPtr->isBattle) { if (gEntityHideMode != 0 && - !(entity->flags & ENTITY_FLAGS_IGNORE_DISTANCE_CULLING) && + !(entity->flags & ENTITY_FLAG_IGNORE_DISTANCE_CULLING) && dist2D(gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z, entity->position.x, @@ -1396,18 +1396,18 @@ void render_entities(void) { } if (gEntityHideMode == 1) { - if (!(entity->flags & ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE1)) { + if (!(entity->flags & ENTITY_FLAG_DRAW_IF_CLOSE_HIDE_MODE1)) { continue; } } else if (gEntityHideMode == 2) { - if (!(entity->flags & ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2)) { + if (!(entity->flags & ENTITY_FLAG_DRAW_IF_CLOSE_HIDE_MODE2)) { continue; } } } - if (!(entity->flags & ENTITY_FLAGS_HIDDEN)) { - if (entity->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) { + if (!(entity->flags & ENTITY_FLAG_HIDDEN)) { + if (entity->flags & ENTITY_FLAG_HAS_ANIMATED_MODEL) { if (D_8014AFB0 == 0xFF) { if (entity->renderSetupFunc != NULL) { set_animator_render_callback( @@ -1470,14 +1470,14 @@ void render_shadows(void) { Shadow* shadow = get_shadow_by_index(i); if (shadow != NULL) { - if (shadow->flags & ENTITY_FLAGS_HIDDEN) { - if (shadow->flags & ENTITY_FLAGS_FADING_AWAY) { + if (shadow->flags & ENTITY_FLAG_HIDDEN) { + if (shadow->flags & ENTITY_FLAG_FADING_AWAY) { shadow->alpha -= 20; if (shadow->alpha <= 20) { - shadow->flags |= ENTITY_FLAGS_PENDING_INSTANCE_DELETE; + shadow->flags |= ENTITY_FLAG_PENDING_INSTANCE_DELETE; } } - } else if (shadow->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) { + } else if (shadow->flags & ENTITY_FLAG_HAS_ANIMATED_MODEL) { if (shadow->vertexArray == NULL) { render_animated_model(shadow->entityModelID, &shadow->transformMatrix); } else { @@ -1487,10 +1487,10 @@ void render_shadows(void) { shadow->vertexArray); } } else { - if (shadow->flags & ENTITY_FLAGS_FADING_AWAY) { + if (shadow->flags & ENTITY_FLAG_FADING_AWAY) { shadow->alpha -= 20; if (shadow->alpha <= 20) { - shadow->flags |= ENTITY_FLAGS_PENDING_INSTANCE_DELETE; + shadow->flags |= ENTITY_FLAG_PENDING_INSTANCE_DELETE; } } @@ -1601,7 +1601,7 @@ ShadowList* get_shadow_list(void) { s32 entity_start_script(Entity* entity) { if (entity->boundScriptBytecode != NULL) { - entity->flags |= ENTITY_FLAGS_BOUND_SCRIPT_DIRTY; + entity->flags |= ENTITY_FLAG_BOUND_SCRIPT_DIRTY; return 1; } return 0; @@ -1624,7 +1624,7 @@ void delete_entity(s32 entityIndex) { heap_free(entity->dataBuf.any); } - if (!(entity->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL)) { + if (!(entity->flags & ENTITY_FLAG_HAS_ANIMATED_MODEL)) { free_entity_model_by_index(entity->virtualModelIndex); } else { delete_model_animator(get_animator_by_index(entity->virtualModelIndex)); @@ -1633,7 +1633,7 @@ void delete_entity(s32 entityIndex) { if (entity->shadowIndex >= 0) { Shadow* shadow = get_shadow_by_index(entity->shadowIndex); - shadow->flags |= ENTITY_FLAGS_FADING_AWAY; + shadow->flags |= ENTITY_FLAG_FADING_AWAY; } heap_free((*gCurrentEntityListPtr)[entityIndex]); @@ -1647,7 +1647,7 @@ void delete_entity_and_unload_data(s32 entityIndex) { heap_free(entity->dataBuf.any); } - if (!(entity->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL)) { + if (!(entity->flags & ENTITY_FLAG_HAS_ANIMATED_MODEL)) { free_entity_model_by_index(entity->virtualModelIndex); } else { delete_model_animator(get_animator_by_index(entity->virtualModelIndex)); @@ -1658,7 +1658,7 @@ void delete_entity_and_unload_data(s32 entityIndex) { if (entity->shadowIndex >= 0) { Shadow* shadow = get_shadow_by_index(entity->shadowIndex); - shadow->flags |= ENTITY_FLAGS_FADING_AWAY; + shadow->flags |= ENTITY_FLAG_FADING_AWAY; } heap_free((*gCurrentEntityListPtr)[entityIndex]); @@ -1678,9 +1678,9 @@ s32 entity_get_collision_flags(Entity* entity) { s32 entityFlags = 0; u32 flag; - if (entity->flags & ENTITY_FLAGS_PARTNER_COLLISION) { + if (entity->flags & ENTITY_FLAG_PARTNER_COLLISION) { entityFlags = ENTITY_COLLISION_PARTNER; - entity->flags &= ~ENTITY_FLAGS_PARTNER_COLLISION; + entity->flags &= ~ENTITY_FLAG_PARTNER_COLLISION; } flag = gCollisionStatus.currentFloor; @@ -1742,7 +1742,7 @@ s32 entity_interacts_with_current_partner(s32 entityIdx) { case ENTITY_TYPE_SUPER_BLOCK: case ENTITY_TYPE_BOMBABLE_ROCK: entity = get_entity_by_index(entityIdx); - entity->flags |= ENTITY_FLAGS_PARTNER_COLLISION; + entity->flags |= ENTITY_FLAG_PARTNER_COLLISION; ret = TRUE; } break; @@ -1765,7 +1765,7 @@ s32 entity_interacts_with_current_partner(s32 entityIdx) { case ENTITY_TYPE_SAVE_POINT: case ENTITY_TYPE_SUPER_BLOCK: entity = get_entity_by_index(entityIdx); - entity->flags |= ENTITY_FLAGS_PARTNER_COLLISION; + entity->flags |= ENTITY_FLAG_PARTNER_COLLISION; ret = TRUE; } break; @@ -1801,14 +1801,14 @@ s32 is_player_action_state(s8 actionState) { } void entity_set_render_script(Entity* entity, EntityModelScript* cmdList) { - if (!(entity->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL)) { + if (!(entity->flags & ENTITY_FLAG_HAS_ANIMATED_MODEL)) { set_entity_model_render_command_list(entity->virtualModelIndex, cmdList); } } void entity_reset_collision(Entity* entity) { entity->collisionTimer = 0; - entity->flags &= ~ENTITY_FLAGS_DETECTED_COLLISION; + entity->flags &= ~ENTITY_FLAG_DETECTED_COLLISION; } void load_area_specific_entity_data(void) { @@ -1912,7 +1912,7 @@ void reload_world_entity_data(void) { break; } - if (!(bp->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL)) { + if (!(bp->flags & ENTITY_FLAG_HAS_ANIMATED_MODEL)) { void* gfxData; dataLength = ((bp->dma.end - bp->dma.start) >> 2); @@ -2008,7 +2008,7 @@ s32 is_entity_data_loaded(Entity* entity, EntityBlueprint* blueprint, s32* loade blueprints[0] = blueprint; blueprints[1] = NULL; ret = TRUE; - if (blueprint->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) { + if (blueprint->flags & ENTITY_FLAG_HAS_ANIMATED_MODEL) { s32 size; entDmaList = blueprint->dmaList; size = (entDmaList[0].end - entDmaList[0].start) >> 2; @@ -2020,19 +2020,19 @@ s32 is_entity_data_loaded(Entity* entity, EntityBlueprint* blueprint, s32* loade do {} while (0); // TODO find better match entDmaList = blueprint->dmaList; if (bpDmaList == entDmaList) { - if (blueprint->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) { + if (blueprint->flags & ENTITY_FLAG_HAS_ANIMATED_MODEL) { s32 size = (bpDmaList[0].end - bpDmaList[0].start) >> 2; *loadedEnd = *loadedStart + size; } break; } else if (bp == blueprint) { - if (bp->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) { + if (bp->flags & ENTITY_FLAG_HAS_ANIMATED_MODEL) { s32 size = (entDmaList[0].end - entDmaList[0].start) >> 2; *loadedEnd = *loadedStart + size; } break; } else { - if (bp->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) { + if (bp->flags & ENTITY_FLAG_HAS_ANIMATED_MODEL) { s32 size = (bpDmaList[0].end - bpDmaList[0].start) >> 2; *loadedEnd = *loadedStart = *loadedStart + size; size = (bpDmaList[1].end - bpDmaList[1].start) >> 2;; @@ -2096,7 +2096,7 @@ void load_split_entity_data(Entity* entity, EntityBlueprint* entityData, s32 lis s32 dma2size_2; s32 totalLoaded; - if (entityData->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) { + if (entityData->flags & ENTITY_FLAG_HAS_ANIMATED_MODEL) { DmaEntry* dmaList = entityData->dmaList; entity->vertexSegment = 0xA; @@ -2182,7 +2182,7 @@ void load_split_entity_data(Entity* entity, EntityBlueprint* entityData, s32 lis entity->virtualModelIndex = create_mesh_animator(animationScript, animBaseAddr); load_mesh_animator_tree(entity->virtualModelIndex, animationNodes); update_model_animator(entity->virtualModelIndex); - entity->flags |= ENTITY_FLAGS_HAS_ANIMATED_MODEL; + entity->flags |= ENTITY_FLAG_HAS_ANIMATED_MODEL; } s32 func_80111790(EntityBlueprint* data) { @@ -2215,7 +2215,7 @@ void entity_free_static_data(EntityBlueprint* data) { if (freeSlot < MAX_ENTITIES) { bp = wEntityBlueprint[freeSlot - 1]; if (bp == data) { - if (bp->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) { + if (bp->flags & ENTITY_FLAG_HAS_ANIMATED_MODEL) { DmaEntry* dmaList = bp->dmaList; size = ((dmaList[0].end - dmaList[0].start) >> 2); size += ((dmaList[1].end - dmaList[1].start) >> 2); @@ -2298,7 +2298,7 @@ s32 create_entity(EntityBlueprint* bp, ...) { entity->scriptDelay = entity->scriptReadPos != NULL ? 1 : 0; entity->savedReadPos[0] = bp->updateEntityScript; entity->updateScriptCallback = NULL; - entity->flags = bp->flags | ENTITY_FLAGS_CREATED; + entity->flags = bp->flags | ENTITY_FLAG_CREATED; entity->collisionFlags = 0; entity->collisionTimer = 0; entity->renderSetupFunc = NULL; @@ -2321,7 +2321,7 @@ s32 create_entity(EntityBlueprint* bp, ...) { entity->shadowIndex = -1; entity->gfxBaseAddr = NULL; - if (!(bp->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL)) { + if (!(bp->flags & ENTITY_FLAG_HAS_ANIMATED_MODEL)) { if (bp->dma.start != 0) { load_simple_entity_data(entity, bp, listIndex); } @@ -2333,7 +2333,7 @@ s32 create_entity(EntityBlueprint* bp, ...) { load_split_entity_data(entity, bp, listIndex); } - if (bp->entityType != ENTITY_TYPE_SHADOW && (entity->flags & (ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_HAS_SHADOW))) { + if (bp->entityType != ENTITY_TYPE_SHADOW && (entity->flags & (ENTITY_FLAG_FIXED_SHADOW_SIZE | ENTITY_FLAG_HAS_SHADOW))) { create_entity_shadow(entity, x, y, z); } @@ -2343,7 +2343,7 @@ s32 create_entity(EntityBlueprint* bp, ...) { case ENTITY_TYPE_SIMPLE_SPRING: case ENTITY_TYPE_SCRIPT_SPRING: case ENTITY_TYPE_STAR_BOX_LAUCHER: - entity->flags |= ENTITY_FLAGS_4000; + entity->flags |= ENTITY_FLAG_4000; break; } @@ -2371,7 +2371,7 @@ s32 create_shadow_from_data(ShadowBlueprint* bp, f32 x, f32 y, f32 z) { (*gCurrentShadowListPtr)[i] = shadow; mem_clear(shadow, sizeof(*shadow)); shadow->listIndex = i; - shadow->flags = bp->flags | ENTITY_FLAGS_CREATED; + shadow->flags = bp->flags | ENTITY_FLAG_CREATED; shadow->alpha = 128; shadow->unk_06 = 0x80; shadow->position.x = x; @@ -2382,7 +2382,7 @@ s32 create_shadow_from_data(ShadowBlueprint* bp, f32 x, f32 y, f32 z) { shadow->scale.z = 1.0f; if (bp->animModelNode != NULL) { - shadow->flags |= ENTITY_FLAGS_HAS_ANIMATED_MODEL; + shadow->flags |= ENTITY_FLAG_HAS_ANIMATED_MODEL; shadow->entityModelID = create_model_animator(bp->renderCommandList); load_model_animator_tree(shadow->entityModelID, bp->animModelNode); } else { @@ -2442,14 +2442,14 @@ ApiStatus SetEntityCullMode(Evt* script, s32 isInitialCall) { s32 mode = evt_get_variable(script, *args++); if (mode == 0) { - entity->flags |= ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE1; + entity->flags |= ENTITY_FLAG_DRAW_IF_CLOSE_HIDE_MODE1; } else if (mode == 1) { - entity->flags |= ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2; + entity->flags |= ENTITY_FLAG_DRAW_IF_CLOSE_HIDE_MODE2; } else if (mode == 2) { - entity->flags |= ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2 | ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE1; + entity->flags |= ENTITY_FLAG_DRAW_IF_CLOSE_HIDE_MODE2 | ENTITY_FLAG_DRAW_IF_CLOSE_HIDE_MODE1; } else { - entity->flags |= ENTITY_FLAGS_IGNORE_DISTANCE_CULLING | ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2 | - ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE1; + entity->flags |= ENTITY_FLAG_IGNORE_DISTANCE_CULLING | ENTITY_FLAG_DRAW_IF_CLOSE_HIDE_MODE2 | + ENTITY_FLAG_DRAW_IF_CLOSE_HIDE_MODE1; } return ApiStatus_DONE2; } @@ -2461,11 +2461,11 @@ ApiStatus UseDynamicShadow(Evt* script, s32 isInitialCall) { if (evt_get_variable(script, *args++)) { Shadow* shadow; - entity->flags |= ENTITY_FLAGS_HAS_DYNAMIC_SHADOW; + entity->flags |= ENTITY_FLAG_HAS_DYNAMIC_SHADOW; shadow = get_shadow_by_index(entity->shadowIndex); - shadow->flags |= ENTITY_FLAGS_SHADOW_POS_DIRTY; + shadow->flags |= ENTITY_FLAG_SHADOW_POS_DIRTY; } else { - entity->flags &= ~ENTITY_FLAGS_HAS_DYNAMIC_SHADOW; + entity->flags &= ~ENTITY_FLAG_HAS_DYNAMIC_SHADOW; } return ApiStatus_DONE2; @@ -2494,7 +2494,7 @@ ApiStatus AssignSwitchFlag(Evt* script, s32 isInitialCall) { data->areaFlagIndex = areaFlag; if (get_area_flag(areaFlag) != 0) { - entity->flags |= ENTITY_FLAGS_PENDING_INSTANCE_DELETE; + entity->flags |= ENTITY_FLAG_PENDING_INSTANCE_DELETE; } return ApiStatus_DONE2; } @@ -2561,8 +2561,8 @@ s32 create_entity_shadow(Entity* entity, f32 x, f32 y, f32 z) { s32 type; s16 shadowIndex; - if (staticFlags & ENTITY_FLAGS_FIXED_SHADOW_SIZE) { - if (staticFlags & ENTITY_FLAGS_SQUARE_SHADOW) { + if (staticFlags & ENTITY_FLAG_FIXED_SHADOW_SIZE) { + if (staticFlags & ENTITY_FLAG_SQUARE_SHADOW) { type = 2; } else { type = 3; @@ -2574,7 +2574,7 @@ s32 create_entity_shadow(Entity* entity, f32 x, f32 y, f32 z) { shadowIndex = create_shadow_type(type, x, y, z); entity->shadowIndex = shadowIndex; - get_shadow_by_index(shadowIndex)->flags |= ENTITY_FLAGS_DARK_SHADOW | ENTITY_FLAGS_SHADOW_POS_DIRTY; + get_shadow_by_index(shadowIndex)->flags |= ENTITY_FLAG_DARK_SHADOW | ENTITY_FLAG_SHADOW_POS_DIRTY; return entity->shadowIndex; } @@ -2605,7 +2605,7 @@ s32 create_shadow_type(s32 type, f32 x, f32 y, f32 z) { shadowIndex = create_shadow_from_data(bp, x, y, z); if (isFixedSize) { - get_shadow_by_index(shadowIndex)->flags |= ENTITY_FLAGS_FIXED_SHADOW_SIZE; + get_shadow_by_index(shadowIndex)->flags |= ENTITY_FLAG_FIXED_SHADOW_SIZE; } return shadowIndex; @@ -2632,7 +2632,7 @@ void update_entity_shadow_position(Entity* entity) { } else { u8 alphaTemp; - if (shadow->flags & ENTITY_FLAGS_DARK_SHADOW) { + if (shadow->flags & ENTITY_FLAG_DARK_SHADOW) { alphaTemp = 160; } else { alphaTemp = 128; @@ -2640,9 +2640,9 @@ void update_entity_shadow_position(Entity* entity) { shadow->alpha = alphaTemp; } - if (!(entity->flags & ENTITY_FLAGS_HAS_DYNAMIC_SHADOW)) { - if (shadow->flags & ENTITY_FLAGS_SHADOW_POS_DIRTY) { - shadow->flags &= ~ENTITY_FLAGS_SHADOW_POS_DIRTY; + if (!(entity->flags & ENTITY_FLAG_HAS_DYNAMIC_SHADOW)) { + if (shadow->flags & ENTITY_FLAG_SHADOW_POS_DIRTY) { + shadow->flags &= ~ENTITY_FLAG_SHADOW_POS_DIRTY; } else { return; } @@ -2658,7 +2658,7 @@ void update_entity_shadow_position(Entity* entity) { origHitLength = hitLength; - if (shadow->flags & ENTITY_FLAGS_FIXED_SHADOW_SIZE) { + if (shadow->flags & ENTITY_FLAG_FIXED_SHADOW_SIZE) { hitLength = 212.5f; shadow->scale.x = entity->aabb.x / hitLength; shadow->scale.z = entity->aabb.z / hitLength; @@ -2677,15 +2677,15 @@ void update_entity_shadow_position(Entity* entity) { shadow->rotation.y = entity->rotation.y; if (entity->position.y < rayY) { - shadow->flags |= ENTITY_FLAGS_SKIP_UPDATE; + shadow->flags |= ENTITY_FLAG_SKIP_UPDATE; entity->position.y = rayY + 10.0f; } else { - shadow->flags &= ~ENTITY_FLAGS_SKIP_UPDATE; + shadow->flags &= ~ENTITY_FLAG_SKIP_UPDATE; } - shadow->flags = (shadow->flags & ~ENTITY_FLAGS_HIDDEN) | ((u16)entity->flags & ENTITY_FLAGS_HIDDEN); - if (!(entity->flags & ENTITY_FLAGS_400) && origHitLength == 0.0f) { - shadow->flags |= ENTITY_FLAGS_HIDDEN; + shadow->flags = (shadow->flags & ~ENTITY_FLAG_HIDDEN) | ((u16)entity->flags & ENTITY_FLAG_HIDDEN); + if (!(entity->flags & ENTITY_FLAG_400) && origHitLength == 0.0f) { + shadow->flags |= ENTITY_FLAG_HIDDEN; } } else { entity->shadowPosY = 0.0f; @@ -3202,7 +3202,7 @@ void calculate_model_sizes(void) { bb->halfSizeX = (bb->maxX - bb->minX) * 0.5; bb->halfSizeY = (bb->maxY - bb->minY) * 0.5; bb->halfSizeZ = (bb->maxZ - bb->minZ) * 0.5; - model->flags |= MODEL_FLAGS_USES_TRANSFORM_MATRIX; + model->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX; } } } @@ -3281,7 +3281,7 @@ void mdl_create_model(ModelBlueprint* bp, s32 arg1) { } else { model->currentMatrix = NULL; guMtxIdent(&model->specialMatrix); - model->flags |= MODEL_FLAGS_FLAG_2000; + model->flags |= MODEL_FLAG_FLAG_2000; } guMtxIdentF(model->transformMatrix); @@ -3348,7 +3348,7 @@ void func_80116698(void) { for (i = 0; i < ARRAY_COUNT(*gCurrentModels); i++) { model = (*gCurrentModels)[i]; if (model != NULL && (model->flags != 0) && !(model->flags & 4)) { - if (!(model->flags & MODEL_FLAGS_USES_TRANSFORM_MATRIX)) { + if (!(model->flags & MODEL_FLAG_USES_TRANSFORM_MATRIX)) { if (model->matrixMode != 0) { model->matrixMode--; if (model->matrixMode <= 0) { @@ -3361,7 +3361,7 @@ void func_80116698(void) { model->currentSpecialMatrix = &model->specialMatrix; } } else { - model->flags &= ~MODEL_FLAGS_USES_TRANSFORM_MATRIX; + model->flags &= ~MODEL_FLAG_USES_TRANSFORM_MATRIX; model->matrixMode = 2; mtx = &gDisplayContext->matrixStack[gMatrixListPos++]; if (model->currentMatrix == NULL || (model->flags & 8)) { @@ -3371,7 +3371,7 @@ void func_80116698(void) { guMtxCatF(model->transformMatrix, sp20, sp20); guMtxF2L(sp20, mtx); } - model->flags &= ~MODEL_FLAGS_FLAG_2000; + model->flags &= ~MODEL_FLAG_FLAG_2000; bb = (ModelBoundingBox*) get_model_property(model->modelNode, MODEL_PROP_KEY_BOUNDING_BOX); mX = (bb->minX + bb->maxX) * 0.5f; mY = (bb->minY + bb->maxY) * 0.5f; @@ -3381,15 +3381,15 @@ void func_80116698(void) { model->center.x = mX; model->center.y = mY; model->center.z = mZ; - model->flags &= ~MODEL_FLAGS_FLAG_200; + model->flags &= ~MODEL_FLAG_FLAG_200; } } } for (i = 0; i < ARRAY_COUNT((*gCurrentTransformGroups)); i++) { mtg = (*gCurrentTransformGroups)[i]; - if (mtg != NULL && mtg->flags != 0 && !(mtg->flags & MODEL_TRANSFORM_GROUP_FLAGS_4)) { - if (!(mtg->flags & MODEL_TRANSFORM_GROUP_FLAGS_1000)) { + if (mtg != NULL && mtg->flags != 0 && !(mtg->flags & MODEL_TRANSFORM_GROUP_FLAG_4)) { + if (!(mtg->flags & MODEL_TRANSFORM_GROUP_FLAG_1000)) { if (mtg->matrixMode != 0) { mtg->matrixMode--; if (!(mtg->matrixMode & 0xFF)) { @@ -3402,7 +3402,7 @@ void func_80116698(void) { mtg->transformMtx = &mtg->matrixA; } } else { - mtg->flags &= ~MODEL_TRANSFORM_GROUP_FLAGS_1000; + mtg->flags &= ~MODEL_TRANSFORM_GROUP_FLAG_1000; mtg->matrixMode = 2; mtx = &gDisplayContext->matrixStack[gMatrixListPos++]; if (mtg->matrixRDP_N == NULL) { @@ -3412,7 +3412,7 @@ void func_80116698(void) { guMtxCatF(mtg->matrixB, sp60, sp60); guMtxF2L(sp60, mtx); } - mtg->flags &= ~MODEL_TRANSFORM_GROUP_FLAGS_2000; + mtg->flags &= ~MODEL_TRANSFORM_GROUP_FLAG_2000; bb = (ModelBoundingBox*) get_model_property(mtg->modelNode, MODEL_PROP_KEY_BOUNDING_BOX); mtgX = (bb->minX + bb->maxX) * 0.5f; mtgY = (bb->minY + bb->maxY) * 0.5f; @@ -3705,7 +3705,7 @@ void render_transform_group_node(ModelNode* node) { if (groupTypeProp != NULL && groupTypeProp->data.s != 0) { model = get_model_from_list_index(mdl_currentTransformGroupChildIndex); - if (!(model->flags & MODEL_FLAGS_ENABLED)) { + if (!(model->flags & MODEL_FLAG_ENABLED)) { appendGfx_model_group(model); } mdl_currentTransformGroupChildIndex++; @@ -3737,7 +3737,7 @@ void render_transform_group_node(ModelNode* node) { } model = get_model_from_list_index(mdl_currentTransformGroupChildIndex); - if (!(model->flags & MODEL_FLAGS_ENABLED)) { + if (!(model->flags & MODEL_FLAG_ENABLED)) { appendGfx_model(model); } mdl_currentTransformGroupChildIndex++; @@ -3750,14 +3750,14 @@ void render_transform_group(void* data) { ModelTransformGroup* group = data; Gfx** gfx = &gMasterGfxPos; - if (!(group->flags & MODEL_TRANSFORM_GROUP_FLAGS_4)) { + if (!(group->flags & MODEL_TRANSFORM_GROUP_FLAG_4)) { mdl_currentTransformGroupChildIndex = group->minChildModelIndex; - if (!(group->flags & MODEL_TRANSFORM_GROUP_FLAGS_2000)) { + if (!(group->flags & MODEL_TRANSFORM_GROUP_FLAG_2000)) { gSPMatrix((*gfx)++, group->transformMtx, (G_MTX_PUSH | G_MTX_LOAD) | G_MTX_MODELVIEW); } render_transform_group_node(group->modelNode); - if (!(group->flags & MODEL_TRANSFORM_GROUP_FLAGS_2000)) { + if (!(group->flags & MODEL_TRANSFORM_GROUP_FLAG_2000)) { gSPPopMatrix((*gfx)++, G_MTX_MODELVIEW); } gDPPipeSync((*gfx)++); @@ -4235,7 +4235,7 @@ void make_transform_group(u16 modelID) { } (*gCurrentTransformGroups)[i] = newMtg = heap_malloc(sizeof(*newMtg)); - newMtg->flags = MODEL_TRANSFORM_GROUP_FLAGS_1; + newMtg->flags = MODEL_TRANSFORM_GROUP_FLAG_1; newMtg->groupModelID = modelID; newMtg->minChildModelIndex = get_model_list_index_from_tree_index(D_80153374); newMtg->maxChildModelIndex = get_model_list_index_from_tree_index(D_80153376); @@ -4293,10 +4293,10 @@ void enable_transform_group(u16 modelID) { for (i = group->minChildModelIndex; i <= group->maxChildModelIndex; i++) { Model* model = get_model_from_list_index(i); - model->flags |= MODEL_FLAGS_TRANSFORM_GROUP_MEMBER; + model->flags |= MODEL_FLAG_TRANSFORM_GROUP_MEMBER; if (model->currentMatrix != NULL) { - model->flags |= MODEL_FLAGS_USES_TRANSFORM_MATRIX; + model->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX; } } } @@ -4305,15 +4305,15 @@ void disable_transform_group(u16 modelID) { ModelTransformGroup* group = get_transform_group(get_transform_group_index(modelID)); s32 i; - group->flags |= MODEL_TRANSFORM_GROUP_FLAGS_4; + group->flags |= MODEL_TRANSFORM_GROUP_FLAG_4; for (i = group->minChildModelIndex; i <= group->maxChildModelIndex; i++) { Model* model = get_model_from_list_index(i); - model->flags &= ~MODEL_FLAGS_TRANSFORM_GROUP_MEMBER; + model->flags &= ~MODEL_FLAG_TRANSFORM_GROUP_MEMBER; if (model->currentMatrix != NULL) { - model->flags |= MODEL_FLAGS_USES_TRANSFORM_MATRIX; + model->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX; } } } @@ -4460,7 +4460,7 @@ void func_8011BAE8(void) { Model* model = (*gCurrentModels)[i]; if (model != NULL) { - model->flags &= ~MODEL_FLAGS_HAS_TRANSFORM_APPLIED; + model->flags &= ~MODEL_FLAG_HAS_TRANSFORM_APPLIED; } } @@ -4468,7 +4468,7 @@ void func_8011BAE8(void) { ModelTransformGroup* transformGroup = (*gCurrentTransformGroups)[i]; if (transformGroup != NULL) { - transformGroup->flags &= ~MODEL_TRANSFORM_GROUP_FLAGS_400; + transformGroup->flags &= ~MODEL_TRANSFORM_GROUP_FLAG_400; } } } @@ -4767,13 +4767,13 @@ void mdl_make_local_vertex_copy(s32 copyIndex, u16 modelID, s32 isMakingCopy) { mdl_local_gfx_update_vtx_pointers(nodeDlist, baseVtx, copy->gfxCopy[i], copy->vtxCopy[i]); mdl_local_gfx_copy_vertices(baseVtx, numVertices, copy->vtxCopy[i]); } - model->flags |= MODEL_FLAGS_HAS_LOCAL_VERTEX_COPY; + model->flags |= MODEL_FLAG_HAS_LOCAL_VERTEX_COPY; } else { for (i = 0; i < ARRAY_COUNT(copy->gfxCopy); i++) { copy->gfxCopy[i] = NULL; copy->vtxCopy[i] = NULL; } - model->flags |= MODEL_FLAGS_ENABLED; + model->flags |= MODEL_FLAG_ENABLED; } copy->selector = 0; @@ -4982,7 +4982,7 @@ void mdl_draw_hidden_panel_surface(Gfx** arg0, u16 treeIndex) { oldGfxPos = gMasterGfxPos; gMasterGfxPos = *arg0; - copied.flags = MODEL_FLAGS_HAS_LOCAL_VERTEX_COPY | MODEL_FLAGS_FLAG_1; + copied.flags = MODEL_FLAG_HAS_LOCAL_VERTEX_COPY | MODEL_FLAG_FLAG_1; appendGfx_model(&copied); *arg0 = gMasterGfxPos; diff --git a/src/audio.h b/src/audio.h index 10430abb10..47b47f8ca0 100644 --- a/src/audio.h +++ b/src/audio.h @@ -69,17 +69,17 @@ typedef enum AuPriority { } AuPriority; enum AuVoiceFlags3D { - AU_VOICE_3D_FLAGS_1 = 0x01, - AU_VOICE_3D_FLAGS_HANDLED_VOL_CHANGE = 0x02, - AU_VOICE_3D_FLAGS_10 = 0x10, - AU_VOICE_3D_FLAGS_VOL_CHANGED = 0x20, + AU_VOICE_3D_FLAG_1 = 0x01, + AU_VOICE_3D_FLAG_HANDLED_VOL_CHANGE = 0x02, + AU_VOICE_3D_FLAG_10 = 0x10, + AU_VOICE_3D_FLAG_VOL_CHANGED = 0x20, }; enum AuVoiceFlags43 { - AU_VOICE_SYNC_FLAGS_ALL = 0x02, - AU_VOICE_SYNC_FLAGS_4 = 0x04, - AU_VOICE_SYNC_FLAGS_PITCH = 0x08, - AU_VOICE_SYNC_FLAGS_10 = 0x10, + AU_VOICE_SYNC_FLAG_ALL = 0x02, + AU_VOICE_SYNC_FLAG_4 = 0x04, + AU_VOICE_SYNC_FLAG_PITCH = 0x08, + AU_VOICE_SYNC_FLAG_10 = 0x10, }; typedef enum AuEffectType { diff --git a/src/audio/28910_len_5090.c b/src/audio/28910_len_5090.c index 71ec9373b7..380505239e 100644 --- a/src/audio/28910_len_5090.c +++ b/src/audio/28910_len_5090.c @@ -1308,7 +1308,7 @@ void au_bgm_player_update_playing(BGMPlayer *player) { note->tremoloTime = track->trackTremoloTime; note->unk_13 = 0; note->tremoloAmount = track->trackTremoloAmount; - voice->unk_flags_43 = AU_VOICE_SYNC_FLAGS_ALL; + voice->unk_flags_43 = AU_VOICE_SYNC_FLAG_ALL; voice->priority = player->priority; voice->priorityCopy = voice->priority; } @@ -1355,7 +1355,7 @@ void au_bgm_player_update_playing(BGMPlayer *player) { if (note->noteLength > 0) { note->noteLength--; if (note->noteLength == 0) { - voice->unk_flags_3D |= AU_VOICE_3D_FLAGS_10; + voice->unk_flags_3D |= AU_VOICE_3D_FLAG_10; } } if (track->isDrumTrack) { @@ -1363,7 +1363,7 @@ void au_bgm_player_update_playing(BGMPlayer *player) { note->pitchRatio = au_compute_pitch_ratio(((note->adjustedPitch + note->unk_14) + track->segTrackTune) + player->detune) * note->ins->pitchRatio; if (voice->pitchRatio != note->pitchRatio) { voice->pitchRatio = note->pitchRatio; - voice->unk_flags_43 |= AU_VOICE_SYNC_FLAGS_PITCH; + voice->unk_flags_43 |= AU_VOICE_SYNC_FLAG_PITCH; } } if (track->changed.volume) { @@ -1372,7 +1372,7 @@ void au_bgm_player_update_playing(BGMPlayer *player) { * (track->subTrackVolume >> 0x15)) * (track->unkVolume >> 0x15)) >> 0x14) * (track->segTrackVolume * note->volume)) >> 0x10; - voice->unk_flags_3D |= AU_VOICE_3D_FLAGS_VOL_CHANGED; + voice->unk_flags_3D |= AU_VOICE_3D_FLAG_VOL_CHANGED; } } else { if (note->tremoloTime != 0) { @@ -1401,7 +1401,7 @@ void au_bgm_player_update_playing(BGMPlayer *player) { note->pitchRatio = au_compute_pitch_ratio(var_a1_5 + ((note->adjustedPitch + track->segTrackTune) + player->detune)) * note->ins->pitchRatio; if (voice->pitchRatio != note->pitchRatio) { voice->pitchRatio = note->pitchRatio; - voice->unk_flags_43 |= AU_VOICE_SYNC_FLAGS_PITCH; + voice->unk_flags_43 |= AU_VOICE_SYNC_FLAG_PITCH; } } } else if (track->changed.tune || (player->detune != 0)) { @@ -1409,20 +1409,20 @@ void au_bgm_player_update_playing(BGMPlayer *player) { note->pitchRatio = au_compute_pitch_ratio((note->adjustedPitch + track->segTrackTune) + player->detune) * note->ins->pitchRatio; if (voice->pitchRatio != note->pitchRatio) { voice->pitchRatio = note->pitchRatio; - voice->unk_flags_43 |= AU_VOICE_SYNC_FLAGS_PITCH; + voice->unk_flags_43 |= AU_VOICE_SYNC_FLAG_PITCH; } } if (track->changed.volume) { s32 tempVolume = ((player->masterVolume >> 0x15) * (track->subTrackVolume >> 0x15) * (track->unkVolume >> 0x15)) >> 0x14; note->volume = (tempVolume * (track->segTrackVolume * note->noteVelocity)) >> 9; voice->adjustedVolume = note->volume; - voice->unk_flags_3D |= AU_VOICE_3D_FLAGS_VOL_CHANGED; + voice->unk_flags_3D |= AU_VOICE_3D_FLAG_VOL_CHANGED; voice->pan = track->subTrackPan; voice->reverbAmt = track->subTrackReverb; } else if (track->changed.pan || track->changed.reverb) { voice->pan = track->subTrackPan; voice->reverbAmt = track->subTrackReverb; - voice->unk_flags_43 |= AU_VOICE_SYNC_FLAGS_10; + voice->unk_flags_43 |= AU_VOICE_SYNC_FLAG_10; } } } @@ -2026,7 +2026,7 @@ AuResult func_80050970(SongUpdateEvent* update) { voice = &player->globals->voices[j]; if (voice->priority == player->priority) { voice->unk_14.unk_04 = &D_80078554; - voice->unk_flags_3D |= AU_VOICE_3D_FLAGS_10; + voice->unk_flags_3D |= AU_VOICE_3D_FLAG_10; } } oldVolume = track->subTrackVolume >> 24; @@ -2044,7 +2044,7 @@ AuResult func_80050970(SongUpdateEvent* update) { voice = &player->globals->voices[j]; if (voice->priority == player->priority) { voice->unk_14.unk_04 = &D_80078554; - voice->unk_flags_3D |= AU_VOICE_3D_FLAGS_10; + voice->unk_flags_3D |= AU_VOICE_3D_FLAG_10; } } oldVolume = parentTrack->subTrackVolume >> 24; diff --git a/src/audio/2BF90.c b/src/audio/2BF90.c index ec885aed41..f702433c62 100644 --- a/src/audio/2BF90.c +++ b/src/audio/2BF90.c @@ -406,7 +406,7 @@ void func_8005232C(AuAmbienceManager* manager, AuAmbPlayer* lambda) { voice->reverbType = manager->defaultReverbType; voice->unk_14.unk_00 = xi->unk_04.unk_00; voice->unk_14.unk_04 = xi->unk_04.unk_04; - voice->unk_flags_43 = AU_VOICE_SYNC_FLAGS_ALL; + voice->unk_flags_43 = AU_VOICE_SYNC_FLAG_ALL; voice->priority = manager->priority; voice->priorityCopy = voice->priority; } diff --git a/src/audio/2d9a0_len_890.c b/src/audio/2d9a0_len_890.c index 57442ae7a4..d09a04a240 100644 --- a/src/audio/2d9a0_len_890.c +++ b/src/audio/2d9a0_len_890.c @@ -45,13 +45,13 @@ void func_80052660(AuGlobals* globals) { if (voice->unk_1C == NULL) { continue; } - if (voice->unk_flags_3D & AU_VOICE_3D_FLAGS_HANDLED_VOL_CHANGE) { + if (voice->unk_flags_3D & AU_VOICE_3D_FLAG_HANDLED_VOL_CHANGE) { func_80052B44(voice); continue; } - if (voice->unk_flags_3D & AU_VOICE_3D_FLAGS_10) { - voice->unk_flags_3D &= ~AU_VOICE_3D_FLAGS_10; - voice->unk_flags_3D |= AU_VOICE_3D_FLAGS_1; + if (voice->unk_flags_3D & AU_VOICE_3D_FLAG_10) { + voice->unk_flags_3D &= ~AU_VOICE_3D_FLAG_10; + voice->unk_flags_3D |= AU_VOICE_3D_FLAG_1; voice->unk_1C = (u8*)voice->unk_14.unk_04; if (voice->unk_28 > AU_5750) { voice->unk_39 = voice->unk_39 + (s32) (voice->unk_2C * (f32) (voice->unk_24 - voice->unk_28)); @@ -70,11 +70,11 @@ void func_80052660(AuGlobals* globals) { voice->unk_28 = D_800785A0[voice->unk_3B]; voice->unk_24 = voice->unk_28; - if (voice->unk_flags_3D & AU_VOICE_3D_FLAGS_VOL_CHANGED) { - voice->unk_flags_3D &= ~AU_VOICE_3D_FLAGS_VOL_CHANGED; + if (voice->unk_flags_3D & AU_VOICE_3D_FLAG_VOL_CHANGED) { + voice->unk_flags_3D &= ~AU_VOICE_3D_FLAG_VOL_CHANGED; if (voice->unk_28 > AU_5750) { voice->unk_28 -= AU_5750; - voice->unk_flags_3D |= AU_VOICE_3D_FLAGS_HANDLED_VOL_CHANGE; + voice->unk_flags_3D |= AU_VOICE_3D_FLAG_HANDLED_VOL_CHANGE; unkTemp = voice->unk_39 + (s32) (voice->unk_2C * (voice->unk_24 - voice->unk_28)); } else { unkTemp = voice->unk_3A; @@ -85,19 +85,19 @@ void func_80052660(AuGlobals* globals) { unkTemp = voice->unk_3A; } voice->volume = (((unkTemp * voice->adjustedVolume * voice->unk_3F) >> 0xE) * voice->unk_30) >> 7; - voice->unk_flags_43 |= AU_VOICE_SYNC_FLAGS_4; + voice->unk_flags_43 |= AU_VOICE_SYNC_FLAG_4; } else { if (voice->unk_28 == -1) { - if (voice->unk_flags_3D & AU_VOICE_3D_FLAGS_VOL_CHANGED) { - voice->unk_flags_3D &= ~AU_VOICE_3D_FLAGS_VOL_CHANGED; + if (voice->unk_flags_3D & AU_VOICE_3D_FLAG_VOL_CHANGED) { + voice->unk_flags_3D &= ~AU_VOICE_3D_FLAG_VOL_CHANGED; voice->volume = (((voice->unk_39 * voice->adjustedVolume * voice->unk_3F) >> 0xE) * voice->unk_30) >> 7; - voice->unk_flags_43 |= AU_VOICE_SYNC_FLAGS_4; + voice->unk_flags_43 |= AU_VOICE_SYNC_FLAG_4; } } else { voice->unk_28 -= AU_5750; if (voice->unk_28 <= 0) { if (*voice->unk_1C == 0xFF) { - if (voice->unk_flags_3D & AU_VOICE_3D_FLAGS_1) { + if (voice->unk_flags_3D & AU_VOICE_3D_FLAG_1) { voice->unk_flags_3D = 0; voice->unk_1C = NULL; voice->unk_42 = 1; @@ -120,11 +120,11 @@ void func_80052660(AuGlobals* globals) { } else { voice->unk_2C = 0.0f; } - if (voice->unk_flags_3D & AU_VOICE_3D_FLAGS_VOL_CHANGED) { - voice->unk_flags_3D &= ~AU_VOICE_3D_FLAGS_VOL_CHANGED; + if (voice->unk_flags_3D & AU_VOICE_3D_FLAG_VOL_CHANGED) { + voice->unk_flags_3D &= ~AU_VOICE_3D_FLAG_VOL_CHANGED; if (voice->unk_28 > AU_5750) { voice->unk_28 -= AU_5750; - voice->unk_flags_3D |= AU_VOICE_3D_FLAGS_HANDLED_VOL_CHANGE; + voice->unk_flags_3D |= AU_VOICE_3D_FLAG_HANDLED_VOL_CHANGE; unkTemp = voice->unk_39 + (s32) (voice->unk_2C * (voice->unk_24 - voice->unk_28)); } else { unkTemp = voice->unk_3A; @@ -135,21 +135,21 @@ void func_80052660(AuGlobals* globals) { unkTemp = voice->unk_3A; } voice->volume = (((unkTemp * voice->adjustedVolume * voice->unk_3F) >> 0xE) * voice->unk_30) >> 7; - voice->unk_flags_43 |= AU_VOICE_SYNC_FLAGS_4; + voice->unk_flags_43 |= AU_VOICE_SYNC_FLAG_4; } } else { - if (voice->unk_flags_3D & AU_VOICE_3D_FLAGS_VOL_CHANGED) { - voice->unk_flags_3D &= ~AU_VOICE_3D_FLAGS_VOL_CHANGED; + if (voice->unk_flags_3D & AU_VOICE_3D_FLAG_VOL_CHANGED) { + voice->unk_flags_3D &= ~AU_VOICE_3D_FLAG_VOL_CHANGED; if (voice->unk_28 > AU_5750) { voice->unk_28 -= AU_5750; - voice->unk_flags_3D |= AU_VOICE_3D_FLAGS_HANDLED_VOL_CHANGE; + voice->unk_flags_3D |= AU_VOICE_3D_FLAG_HANDLED_VOL_CHANGE; unkTemp = voice->unk_39 + (s32) (voice->unk_2C * (voice->unk_24 - voice->unk_28)); } else { unkTemp = voice->unk_3A; } voice->unk_08 = AUDIO_SAMPLES; voice->volume = (((unkTemp * voice->adjustedVolume * voice->unk_3F) >> 0xE) * voice->unk_30) >> 7; - voice->unk_flags_43 |= AU_VOICE_SYNC_FLAGS_4; + voice->unk_flags_43 |= AU_VOICE_SYNC_FLAG_4; } } } @@ -160,8 +160,8 @@ void func_80052660(AuGlobals* globals) { void func_80052B44(AlUnkVoice* arg0) { arg0->volume = (((arg0->unk_3A * arg0->adjustedVolume * arg0->unk_3F) >> 14) * arg0->unk_30) >> 7; arg0->unk_08 = func_80052BC0(arg0->unk_28); - arg0->unk_flags_3D &= ~AU_VOICE_3D_FLAGS_HANDLED_VOL_CHANGE; - arg0->unk_flags_43 |= AU_VOICE_SYNC_FLAGS_4; + arg0->unk_flags_3D &= ~AU_VOICE_3D_FLAG_HANDLED_VOL_CHANGE; + arg0->unk_flags_43 |= AU_VOICE_SYNC_FLAG_4; } s32 func_80052BC0(s32 arg0) { @@ -199,5 +199,5 @@ void func_80052BF8(AlUnkVoice* voice, AlUnkInstrumentData* arg1) { INCLUDE_ASM(u8, "audio/2d9a0_len_890", func_80052CFC, AlUnkVoice* arg0); void func_80052E18(AlUnkVoice* arg0) { - arg0->unk_flags_3D |= AU_VOICE_3D_FLAGS_VOL_CHANGED; + arg0->unk_flags_3D |= AU_VOICE_3D_FLAG_VOL_CHANGED; } diff --git a/src/audio/2e230_len_2190.c b/src/audio/2e230_len_2190.c index 029ec9bb99..6887d05c9e 100644 --- a/src/audio/2e230_len_2190.c +++ b/src/audio/2e230_len_2190.c @@ -326,18 +326,18 @@ void func_80053654(AuGlobals* globals) { voice->priority = AU_PRIORITY_FREE; } - if (voiceUpdateFlags & AU_VOICE_SYNC_FLAGS_ALL) { + if (voiceUpdateFlags & AU_VOICE_SYNC_FLAG_ALL) { func_80052BF8(voice, &voice->unk_14); au_pvoice_set_filter(i, voice->reverbType, voice->instrument, voice->pitchRatio, voice->volume, voice->pan, voice->reverbAmt, voice->unk_08); voice->priority = voice->priorityCopy; } else { - if (voiceUpdateFlags & AU_VOICE_SYNC_FLAGS_PITCH) { + if (voiceUpdateFlags & AU_VOICE_SYNC_FLAG_PITCH) { au_pvoice_set_pitch_ratio(i, voice->pitchRatio); } - if (voiceUpdateFlags & AU_VOICE_SYNC_FLAGS_4) { + if (voiceUpdateFlags & AU_VOICE_SYNC_FLAG_4) { func_8005736C(i, voice->volume, voice->unk_08, voice->pan, voice->reverbAmt); - } else if (voiceUpdateFlags & AU_VOICE_SYNC_FLAGS_10) { + } else if (voiceUpdateFlags & AU_VOICE_SYNC_FLAG_10) { func_80057548(i, voice->pan, voice->reverbAmt); } } diff --git a/src/audio/e0b30_len_b80.c b/src/audio/e0b30_len_b80.c index 60c6b2c87a..2994f2e75c 100644 --- a/src/audio/e0b30_len_b80.c +++ b/src/audio/e0b30_len_b80.c @@ -82,7 +82,7 @@ void bgm_update_music_settings(void) { MusicSettings* music = gMusicSettings; s32 i = 0; s16 state2 = 2; - s16 flag4 = MUSIC_SETTINGS_FLAGS_4; + s16 flag4 = MUSIC_SETTINGS_FLAG_4; s32 flags; for (i; i < 2; i++, music++) { @@ -90,9 +90,9 @@ void bgm_update_music_settings(void) { case 0: break; case 1: - if (music->flags & MUSIC_SETTINGS_FLAGS_1) { + if (music->flags & MUSIC_SETTINGS_FLAG_1) { if (music->fadeOutTime < 250) { - if (!(music->flags & MUSIC_SETTINGS_FLAGS_4)) { + if (!(music->flags & MUSIC_SETTINGS_FLAG_4)) { if (au_song_stop(music->songName) == AU_RESULT_OK) { music->state = state2; } @@ -101,7 +101,7 @@ void bgm_update_music_settings(void) { music->state = state2; } } - } else if (!(music->flags & MUSIC_SETTINGS_FLAGS_4)) { + } else if (!(music->flags & MUSIC_SETTINGS_FLAG_4)) { if (snd_set_song_variation_fade_time(music->songName, music->fadeOutTime, 0) == 0) { music->state = state2; } @@ -111,8 +111,8 @@ void bgm_update_music_settings(void) { } } } else { - if (music->flags & MUSIC_SETTINGS_FLAGS_4) { - music->flags |= MUSIC_SETTINGS_FLAGS_10; + if (music->flags & MUSIC_SETTINGS_FLAG_4) { + music->flags |= MUSIC_SETTINGS_FLAG_10; } music->flags &= ~flag4; music->state = 5; @@ -123,7 +123,7 @@ void bgm_update_music_settings(void) { music->flags &= ~flag4; if (flags & 1) { if (au_song_is_playing(music->songName) == AU_RESULT_OK) { - music->flags &= ~MUSIC_SETTINGS_FLAGS_1; + music->flags &= ~MUSIC_SETTINGS_FLAG_1; music->state = 3; } } else { @@ -137,36 +137,36 @@ void bgm_update_music_settings(void) { music->state = 5; break; case 5: - if (!(music->flags & MUSIC_SETTINGS_FLAGS_8)) { + if (!(music->flags & MUSIC_SETTINGS_FLAG_8)) { if (music->songID < 0) { music->state = 0; } else { music->songName = au_song_load(music->songID, i); if (music->songName > 0xFFFFU) { - if ((music->flags & MUSIC_SETTINGS_FLAGS_20)) { + if ((music->flags & MUSIC_SETTINGS_FLAG_20)) { snd_set_song_variation_fade(music->songName, music->variation, music->fadeInTime, music->fadeStartVolume, music->fadeEndVolume); - music->flags &= ~MUSIC_SETTINGS_FLAGS_20; + music->flags &= ~MUSIC_SETTINGS_FLAG_20; } else { bgm_set_target_volume(MusicDefaultVolume); } if (au_song_start_variation(music->songName, music->variation) == 0) { - music->flags |= MUSIC_SETTINGS_FLAGS_1; + music->flags |= MUSIC_SETTINGS_FLAG_1; music->state = 0; } } } } else { - if (music->flags & MUSIC_SETTINGS_FLAGS_10) { + if (music->flags & MUSIC_SETTINGS_FLAG_10) { music->state = 0; - music->flags &= ~(MUSIC_SETTINGS_FLAGS_10 | MUSIC_SETTINGS_FLAGS_8); + music->flags &= ~(MUSIC_SETTINGS_FLAG_10 | MUSIC_SETTINGS_FLAG_8); } else if (func_80055B28(music->savedSongName) == 0) { music->songID = music->savedSongID; music->variation = music->savedVariation; music->songName = music->savedSongName; music->state = 0; - music->flags |= MUSIC_SETTINGS_FLAGS_1; - music->flags &= ~MUSIC_SETTINGS_FLAGS_8; + music->flags |= MUSIC_SETTINGS_FLAG_1; + music->flags &= ~MUSIC_SETTINGS_FLAG_8; } } break; @@ -187,7 +187,7 @@ s32 _bgm_set_song(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s if (!gGameStatusPtr->musicEnabled) { au_song_stop(musicSetting->songName); - musicSetting->flags &= ~MUSIC_SETTINGS_FLAGS_1; + musicSetting->flags &= ~MUSIC_SETTINGS_FLAG_1; return 1; } @@ -200,9 +200,9 @@ s32 _bgm_set_song(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s if (musicSetting->songID == songID && musicSetting->variation == variation) { bgm_set_target_volume(volume); - if (musicSetting->flags & MUSIC_SETTINGS_FLAGS_4) { + if (musicSetting->flags & MUSIC_SETTINGS_FLAG_4) { func_80055B80(musicSetting->songName); - musicSetting->flags &= ~MUSIC_SETTINGS_FLAGS_4; + musicSetting->flags &= ~MUSIC_SETTINGS_FLAG_4; } return 2; @@ -213,13 +213,13 @@ s32 _bgm_set_song(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s musicSetting->variation = variation; musicSetting->fadeOutTime = fadeOutTime; musicSetting->state = 1; - musicSetting->flags &= ~MUSIC_SETTINGS_FLAGS_ENABLE_PROXIMITY_MIX; + musicSetting->flags &= ~MUSIC_SETTINGS_FLAG_ENABLE_PROXIMITY_MIX; return 1; } s32 bgm_set_song(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s16 volume) { - gMusicSettings[playerIndex].flags &= ~MUSIC_SETTINGS_FLAGS_8; + gMusicSettings[playerIndex].flags &= ~MUSIC_SETTINGS_FLAG_8; return _bgm_set_song(playerIndex, songID, variation, fadeOutTime, volume); } @@ -236,7 +236,7 @@ s32 func_8014A964(s32 playerIndex, s32 songID, s32 variation, s32 fadeInTime, s1 if (!gGameStatusPtr->musicEnabled) { au_song_stop(musicSetting->songName); - musicSetting->flags &= ~MUSIC_SETTINGS_FLAGS_1; + musicSetting->flags &= ~MUSIC_SETTINGS_FLAG_1; return 1; } @@ -250,9 +250,9 @@ s32 func_8014A964(s32 playerIndex, s32 songID, s32 variation, s32 fadeInTime, s1 musicSetting->fadeEndVolume = fadeEndVolume; musicSetting->songID = songID; musicSetting->variation = variation; - musicSetting->flags |= MUSIC_SETTINGS_FLAGS_20; + musicSetting->flags |= MUSIC_SETTINGS_FLAG_20; musicSetting->state = 1; - musicSetting->flags &= ~MUSIC_SETTINGS_FLAGS_ENABLE_PROXIMITY_MIX; + musicSetting->flags &= ~MUSIC_SETTINGS_FLAG_ENABLE_PROXIMITY_MIX; return 1; } @@ -260,11 +260,11 @@ s32 func_8014A964(s32 playerIndex, s32 songID, s32 variation, s32 fadeInTime, s1 s32 bgm_adjust_proximity(s32 playerIndex, s32 mix, s16 state) { MusicSettings* musicSetting = &gMusicSettings[playerIndex]; - if (!(musicSetting->flags & MUSIC_SETTINGS_FLAGS_1)) { + if (!(musicSetting->flags & MUSIC_SETTINGS_FLAG_1)) { return FALSE; } - if (!(musicSetting->flags & MUSIC_SETTINGS_FLAGS_ENABLE_PROXIMITY_MIX)) { + if (!(musicSetting->flags & MUSIC_SETTINGS_FLAG_ENABLE_PROXIMITY_MIX)) { return FALSE; } @@ -285,7 +285,7 @@ s32 bgm_adjust_proximity(s32 playerIndex, s32 mix, s16 state) { AuResult bgm_set_track_volumes(s32 playerIndex, s16 trackVolSet) { MusicSettings* musicSetting = &gMusicSettings[playerIndex]; - if (!(musicSetting->flags & MUSIC_SETTINGS_FLAGS_1)) { + if (!(musicSetting->flags & MUSIC_SETTINGS_FLAG_1)) { return AU_RESULT_OK; } @@ -295,7 +295,7 @@ AuResult bgm_set_track_volumes(s32 playerIndex, s16 trackVolSet) { AuResult bgm_clear_track_volumes(s32 playerIndex, s16 trackVolSet) { MusicSettings* musicSetting = &gMusicSettings[playerIndex]; - if (!(musicSetting->flags & MUSIC_SETTINGS_FLAGS_1)) { + if (!(musicSetting->flags & MUSIC_SETTINGS_FLAG_1)) { return AU_RESULT_OK; } @@ -305,7 +305,7 @@ AuResult bgm_clear_track_volumes(s32 playerIndex, s16 trackVolSet) { AuResult bgm_set_variation(s32 playerIndex, s16 arg1) { MusicSettings* musicSetting = &gMusicSettings[playerIndex]; - if (!(musicSetting->flags & MUSIC_SETTINGS_FLAGS_1)) { + if (!(musicSetting->flags & MUSIC_SETTINGS_FLAG_1)) { return AU_RESULT_OK; } @@ -360,7 +360,7 @@ s32 func_8014AD40(void) { s32 i; for (i = 0; i < 2; i++, settings++) { - if (!(settings->flags & MUSIC_SETTINGS_FLAGS_1)) { + if (!(settings->flags & MUSIC_SETTINGS_FLAG_1)) { continue; } @@ -375,7 +375,7 @@ void bgm_pop_song(void) { MusicSettings* musicSetting = gMusicSettings; if (gGameStatusPtr->demoState == 0) { - musicSetting->flags |= MUSIC_SETTINGS_FLAGS_8; + musicSetting->flags |= MUSIC_SETTINGS_FLAG_8; _bgm_set_song(0, musicSetting->savedSongID, musicSetting->savedVariation, 0, 8); } } @@ -387,7 +387,7 @@ void bgm_push_song(s32 songID, s32 variation) { musicSetting->savedSongID = musicSetting->songID; musicSetting->savedVariation = musicSetting->variation; musicSetting->savedSongName = musicSetting->songName; - musicSetting->flags |= MUSIC_SETTINGS_FLAGS_4; + musicSetting->flags |= MUSIC_SETTINGS_FLAG_4; bgm_set_song(0, songID, variation, 500, 8); } } @@ -399,7 +399,7 @@ void bgm_pop_battle_song(void) { if (gOverrideFlags & GLOBAL_OVERRIDES_20000) { gOverrideFlags &= ~GLOBAL_OVERRIDES_20000; } else { - musicSetting->flags |= MUSIC_SETTINGS_FLAGS_8; + musicSetting->flags |= MUSIC_SETTINGS_FLAG_8; _bgm_set_song(0, musicSetting->savedSongID, musicSetting->savedVariation, 0, 8); snd_ambient_80055590(0, 250); } @@ -414,7 +414,7 @@ void bgm_push_battle_song(void) { musicSetting->savedSongID = musicSetting->songID; musicSetting->savedVariation = musicSetting->variation; musicSetting->savedSongName = musicSetting->songName; - musicSetting->flags |= MUSIC_SETTINGS_FLAGS_4; + musicSetting->flags |= MUSIC_SETTINGS_FLAG_4; bgm_set_song(0, musicSetting->battleSongID, musicSetting->battleVariation, 500, 8); } } diff --git a/src/audio/sfx_player.c b/src/audio/sfx_player.c index f93b8bd888..1a1df1b838 100644 --- a/src/audio/sfx_player.c +++ b/src/audio/sfx_player.c @@ -46,7 +46,7 @@ enum SoundEffectParamFlags { SFX_PARAM_MODE_0 = 0x00000000, SFX_PARAM_MODE_1 = 0x00000001, SFX_PARAM_MODE_2 = 0x00000002, - SFX_PARAM_FLAGS_MODE = 0x00000003, + SFX_PARAM_FLAG_MODE = 0x00000003, SFX_PARAM_FLAG_VOLUME = 0x00000004, SFX_PARAM_FLAG_PAN = 0x00000008, SFX_PARAM_FLAG_PITCH = 0x00000010, @@ -679,7 +679,7 @@ static void func_8004C0E4(SoundManager* manager, SoundPlayer* player, s8* readPo player->unk_84 = 0; player->soundC00 = 0; player->sfxParamsFlags = *player->sefDataReadPos++; - switch (player->sfxParamsFlags & SFX_PARAM_FLAGS_MODE) { + switch (player->sfxParamsFlags & SFX_PARAM_FLAG_MODE) { case SFX_PARAM_MODE_0: player->unk_A9 = 1; break; @@ -687,7 +687,7 @@ static void func_8004C0E4(SoundManager* manager, SoundPlayer* player, s8* readPo player->unk_A9 = 1; break; case SFX_PARAM_MODE_2: - player->sfxParamsFlags &= ~SFX_PARAM_FLAGS_MODE; + player->sfxParamsFlags &= ~SFX_PARAM_FLAG_MODE; player->unk_A9 = 1; player->locatorB = player->sefDataReadPos[0]; player->locatorC = player->sefDataReadPos[1]; @@ -797,7 +797,7 @@ s16 au_sfx_manager_update(SoundManager* manager) { manager->currentVoice = voice; if (voice->priority <= manager->priority) { manager->unk_BF = i; - switch (sndPlayer->sfxParamsFlags & SFX_PARAM_FLAGS_MODE) { + switch (sndPlayer->sfxParamsFlags & SFX_PARAM_FLAG_MODE) { case SFX_PARAM_MODE_0: au_sfx_update_mode_0(manager, sndPlayer, voice, i); break; @@ -835,7 +835,7 @@ static void au_sfx_update_mode_0(SoundManager* manager, SoundPlayer* player, AlU player->pitchRatio = au_compute_pitch_ratio( ((player->tuneLerp.current >> 0x10) - player->sfxInstrumentRef->keyBase) + player->masterPitchShift) * player->sfxInstrumentRef->pitchRatio; if (voice->pitchRatio != player->pitchRatio) { - voice->unk_flags_43 |= AU_VOICE_SYNC_FLAGS_PITCH; + voice->unk_flags_43 |= AU_VOICE_SYNC_FLAG_PITCH; voice->pitchRatio = player->pitchRatio; } } @@ -847,13 +847,13 @@ static void au_sfx_update_mode_0(SoundManager* manager, SoundPlayer* player, AlU } if (voice->pan != pan) { voice->pan = pan; - voice->unk_flags_43 |= AU_VOICE_SYNC_FLAGS_10; + voice->unk_flags_43 |= AU_VOICE_SYNC_FLAG_10; } volume = au_sfx_get_scaled_volume(manager, player); if (voice->adjustedVolume != volume) { voice->adjustedVolume = volume; - voice->unk_flags_3D |= AU_VOICE_3D_FLAGS_VOL_CHANGED; + voice->unk_flags_3D |= AU_VOICE_3D_FLAG_VOL_CHANGED; } } break; @@ -891,7 +891,7 @@ static void au_sfx_update_mode_0(SoundManager* manager, SoundPlayer* player, AlU voice->unk_14.unk_04 = player->unk_10.unk_04; voice->instrument = player->sfxInstrumentRef; voice->pitchRatio = player->pitchRatio; - voice->unk_flags_43 = AU_VOICE_SYNC_FLAGS_ALL; + voice->unk_flags_43 = AU_VOICE_SYNC_FLAG_ALL; voice->priority = manager->priority; voice->priorityCopy = voice->priority; voice->reverbType = manager->defaultReverbType; @@ -1013,7 +1013,7 @@ static void au_sfx_update_mode_1(SoundManager* manager, SoundPlayer* player, AlU voice->reverbType = manager->defaultReverbType; voice->priority = manager->priority; - voice->unk_flags_43 = AU_VOICE_SYNC_FLAGS_ALL; + voice->unk_flags_43 = AU_VOICE_SYNC_FLAG_ALL; var_s3 = TRUE; voice->priorityCopy = manager->priority; player->changed.tune = 1; @@ -1039,7 +1039,7 @@ static void au_sfx_update_mode_1(SoundManager* manager, SoundPlayer* player, AlU if (player->playLength != 0) { player->playLength--; if ((player->playLength == 0) && (voice->priority == manager->priority)) { - voice->unk_flags_3D |= AU_VOICE_3D_FLAGS_10; + voice->unk_flags_3D |= AU_VOICE_3D_FLAG_10; } } if (player->tuneLerp.time != 0) { @@ -1057,13 +1057,13 @@ static void au_sfx_update_mode_1(SoundManager* manager, SoundPlayer* player, AlU } else { voice->pan = player->masterPan; } - voice->unk_flags_43 |= AU_VOICE_SYNC_FLAGS_10; + voice->unk_flags_43 |= AU_VOICE_SYNC_FLAG_10; voice->reverbAmt = player->reverb; } } if (player->changed.volume && (voice->priority == manager->priority)) { snd_set_voice_volume(voice, manager, player); - voice->unk_flags_3D |= AU_VOICE_3D_FLAGS_VOL_CHANGED; + voice->unk_flags_3D |= AU_VOICE_3D_FLAG_VOL_CHANGED; } if (player->changed.tune) { f32 adjustedSampleRate; @@ -1077,7 +1077,7 @@ static void au_sfx_update_mode_1(SoundManager* manager, SoundPlayer* player, AlU player->pitchRatio = adjustedSampleRate; } if ((voice->priority == manager->priority) && (voice->pitchRatio != adjustedSampleRate)) { - voice->unk_flags_43 |= AU_VOICE_SYNC_FLAGS_PITCH; + voice->unk_flags_43 |= AU_VOICE_SYNC_FLAG_PITCH; voice->pitchRatio = player->pitchRatio; } } diff --git a/src/battle/action_cmd/07.c b/src/battle/action_cmd/07.c index 73c7327c77..9ddc2fffdd 100644 --- a/src/battle/action_cmd/07.c +++ b/src/battle/action_cmd/07.c @@ -31,7 +31,7 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { hudElement = hud_element_create(&HES_AButton); actionCommandStatus->hudElements[0] = hudElement; - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(hudElement, 0); @@ -43,14 +43,14 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hudElement = hud_element_create(&HES_RunAwayOK); actionCommandStatus->hudElements[2] = hudElement; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); battleStatus->flags1 &= ~BS_FLAGS1_8000; diff --git a/src/battle/action_cmd/0A.c b/src/battle/action_cmd/0A.c index 2ce7af5766..791048396b 100644 --- a/src/battle/action_cmd/0A.c +++ b/src/battle/action_cmd/0A.c @@ -36,19 +36,19 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElements[0] = hudElement; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hudElement = hud_element_create(&HES_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hudElement = hud_element_create(&HES_100pct); actionCommandStatus->hudElements[2] = hudElement; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/air_lift.c b/src/battle/action_cmd/air_lift.c index 7df3fc1aca..bea37c11d4 100644 --- a/src/battle/action_cmd/air_lift.c +++ b/src/battle/action_cmd/air_lift.c @@ -39,19 +39,19 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElements[0] = hudElement; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hudElement = hud_element_create(&HES_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hudElement = hud_element_create(&HES_100pct); actionCommandStatus->hudElements[2] = hudElement; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/air_raid.c b/src/battle/action_cmd/air_raid.c index 5f8c5ca32e..4f19b434ae 100644 --- a/src/battle/action_cmd/air_raid.c +++ b/src/battle/action_cmd/air_raid.c @@ -43,19 +43,19 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElements[0] = hudElement; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hudElement = hud_element_create(&HES_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hudElement = hud_element_create(&HES_100pct); actionCommandStatus->hudElements[2] = hudElement; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/body_slam.c b/src/battle/action_cmd/body_slam.c index a39412837b..96fbd79cff 100644 --- a/src/battle/action_cmd/body_slam.c +++ b/src/battle/action_cmd/body_slam.c @@ -34,25 +34,25 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElements[0] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); id = hud_element_create(&HES_BlueMeter); actionCommandStatus->hudElements[1] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); id = hud_element_create(&HES_FillGaugeResult); actionCommandStatus->hudElements[3] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); id = hud_element_create(&HES_TimingWait); actionCommandStatus->hudElements[2] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX + 41, actionCommandStatus->hudPosY + 22); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/bomb.c b/src/battle/action_cmd/bomb.c index 206cfc7c6d..3a5d49d06e 100644 --- a/src/battle/action_cmd/bomb.c +++ b/src/battle/action_cmd/bomb.c @@ -38,19 +38,19 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElements[0] = hudElement; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hudElement = hud_element_create(&HES_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hudElement = hud_element_create(&HES_100pct); actionCommandStatus->hudElements[2] = hudElement; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } @@ -69,13 +69,13 @@ void N(update)(void) { hudElement = actionCommandStatus->hudElements[0]; hud_element_set_alpha(hudElement, 255); if (actionCommandStatus->showHud) { - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); } hudElement = actionCommandStatus->hudElements[1]; hud_element_set_alpha(hudElement, 255); if (actionCommandStatus->showHud) { - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); } actionCommandStatus->state = 1; @@ -144,7 +144,7 @@ void N(update)(void) { actionCommandStatus->isBarFilled = TRUE; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX + 50, actionCommandStatus->hudPosY + 28); - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); } battleStatus->actionResult = actionCommandStatus->barFillLevel / 100; diff --git a/src/battle/action_cmd/break_free.c b/src/battle/action_cmd/break_free.c index 4f015c2826..7901d1e9e6 100644 --- a/src/battle/action_cmd/break_free.c +++ b/src/battle/action_cmd/break_free.c @@ -35,25 +35,25 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElements[0] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); id = hud_element_create(&HES_BlueMeter); actionCommandStatus->hudElements[1] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); id = hud_element_create(&HES_RunningAway); actionCommandStatus->hudElements[2] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); id = hud_element_create(&HES_RunAwayOK); actionCommandStatus->hudElements[3] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/dizzy_shell.c b/src/battle/action_cmd/dizzy_shell.c index 8872f3f321..bfce5eef1b 100644 --- a/src/battle/action_cmd/dizzy_shell.c +++ b/src/battle/action_cmd/dizzy_shell.c @@ -38,19 +38,19 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElements[0] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); id = hud_element_create(&HES_BlueMeter); actionCommandStatus->hudElements[1] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); id = hud_element_create(&HES_100pct); actionCommandStatus->hudElements[2] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/fire_shell.c b/src/battle/action_cmd/fire_shell.c index 9aef05b8cb..50f038594d 100644 --- a/src/battle/action_cmd/fire_shell.c +++ b/src/battle/action_cmd/fire_shell.c @@ -42,19 +42,19 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElements[0] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); id = hud_element_create(&HES_BlueMeter); actionCommandStatus->hudElements[1] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); id = hud_element_create(&HES_100pct); actionCommandStatus->hudElements[2] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/flee.c b/src/battle/action_cmd/flee.c index c2a5135703..f3bafd2e12 100644 --- a/src/battle/action_cmd/flee.c +++ b/src/battle/action_cmd/flee.c @@ -37,25 +37,25 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElements[0] = hudElement; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hudElement = hud_element_create(&HES_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hudElement = hud_element_create(&HES_RunningAway); actionCommandStatus->hudElements[2] = hudElement; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hudElement = hud_element_create(&HES_RunAwayOK); actionCommandStatus->hudElements[3] = hudElement; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); xOffset = 29 - ((100 - actionCommandStatus->thresholdLevel) * 60) / 100; hud_element_set_render_pos(actionCommandStatus->hudElements[3], actionCommandStatus->hudPosX - xOffset, actionCommandStatus->hudPosY + 17); @@ -65,7 +65,7 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElements[4] = hudElement; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } @@ -100,25 +100,25 @@ void N(update)(void) { hudElement = actionCommandStatus->hudElements[0]; hud_element_set_alpha(hudElement, 0xFF); if (actionCommandStatus->showHud) { - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); } hudElement = actionCommandStatus->hudElements[1]; hud_element_set_alpha(hudElement, 0xFF); if (actionCommandStatus->showHud) { - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); } hudElement = actionCommandStatus->hudElements[2]; hud_element_set_alpha(hudElement, 0xFF); if (actionCommandStatus->showHud) { - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); } hudElement = actionCommandStatus->hudElements[3]; hud_element_set_alpha(hudElement, 0xFF); if (actionCommandStatus->showHud) { - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); } actionCommandStatus->state = 1; @@ -150,7 +150,7 @@ void N(update)(void) { actionCommandStatus->barFillLevel = 10000; actionCommandStatus->isBarFilled = TRUE; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX + 50, actionCommandStatus->hudPosY + 28); - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); } battleStatus->actionSuccess = actionCommandStatus->barFillLevel / 100; diff --git a/src/battle/action_cmd/hammer.c b/src/battle/action_cmd/hammer.c index 39f22e6d09..f502e6e935 100644 --- a/src/battle/action_cmd/hammer.c +++ b/src/battle/action_cmd/hammer.c @@ -29,43 +29,43 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { id = hud_element_create(&HES_TimingBar1Chance); actionCommandStatus->hudElements[0] = id; - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(id, 10); id = hud_element_create(&HES_TimingWait); actionCommandStatus->hudElements[1] = id; - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(id, 0); id = hud_element_create(&HES_TimingCharge4a); actionCommandStatus->hudElements[2] = id; - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(id, 0); id = hud_element_create(&HES_TimingCharge4b); actionCommandStatus->hudElements[3] = id; - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(id, 0); id = hud_element_create(&HES_TimingCharge4c); actionCommandStatus->hudElements[4] = id; - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(id, 0); id = hud_element_create(&HES_StickHoldLeft); actionCommandStatus->hudElements[5] = id; - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(id, 0); id = hud_element_create(&HES_RightOn); actionCommandStatus->hudElements[6] = id; - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(id, 0); hud_element_set_alpha(id, 0xFF); diff --git a/src/battle/action_cmd/hurricane.c b/src/battle/action_cmd/hurricane.c index 0e5c442f58..3465e805ba 100644 --- a/src/battle/action_cmd/hurricane.c +++ b/src/battle/action_cmd/hurricane.c @@ -33,13 +33,13 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { id = hud_element_create(&HES_AButton); actionCommandStatus->hudElements[0] = id; - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(id, 0); id = hud_element_create(&HES_BButton); actionCommandStatus->hudElements[2] = id; - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(id, 0); @@ -47,13 +47,13 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElements[1] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); id = hud_element_create(&HES_100pct); actionCommandStatus->hudElements[4] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } @@ -109,20 +109,20 @@ void N(update)(void) { hudElement = actionCommandStatus->hudElements[0]; if (actionCommandStatus->showHud) { - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); } hud_element_set_alpha(hudElement, 255); hudElement = actionCommandStatus->hudElements[2]; if (actionCommandStatus->showHud) { - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); } hud_element_set_alpha(hudElement, 255); hudElement = actionCommandStatus->hudElements[1]; hud_element_set_alpha(hudElement, 255); if (actionCommandStatus->showHud) { - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); } actionCommandStatus->state = 1; @@ -246,7 +246,7 @@ void N(update)(void) { actionCommandStatus->isBarFilled = TRUE; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX + 50, actionCommandStatus->hudPosY + 28); - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); } adjustedFillLevel = actionCommandStatus->barFillLevel / 100; diff --git a/src/battle/action_cmd/jump.c b/src/battle/action_cmd/jump.c index 71cebef785..a5b1ca89b1 100644 --- a/src/battle/action_cmd/jump.c +++ b/src/battle/action_cmd/jump.c @@ -27,14 +27,14 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { hudElement = hud_element_create(&HES_AButton); actionCommandStatus->hudElements[0] = hudElement; - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(hudElement, 0); hud_element_set_alpha(hudElement, 255); hudElement = hud_element_create(&HES_RightOn); actionCommandStatus->hudElements[1] = hudElement; - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(hudElement, 0); hud_element_set_alpha(hudElement, 255); @@ -66,7 +66,7 @@ ApiStatus N(start)(Evt* script, s32 isInitialCall) { battleStatus->flags1 &= ~BS_FLAGS1_2000; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); if (actionCommandStatus->showHud) { - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); } actionCommandStatus->state = 10; @@ -102,14 +102,14 @@ void N(update)(void) { hudElement = actionCommandStatus->hudElements[0]; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); if (actionCommandStatus->showHud) { - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); } if (actionCommandStatus->autoSucceed) { hudElement = actionCommandStatus->hudElements[1]; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX + 50, actionCommandStatus->hudPosY); if (actionCommandStatus->showHud) { - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); break; } } @@ -147,7 +147,7 @@ void N(update)(void) { if (battleStatus->actionSuccess >= 0) { hudElement = actionCommandStatus->hudElements[0]; if (actionCommandStatus->showHud) { - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); } } } diff --git a/src/battle/action_cmd/mega_shock.c b/src/battle/action_cmd/mega_shock.c index 17226d779d..2401e2b533 100644 --- a/src/battle/action_cmd/mega_shock.c +++ b/src/battle/action_cmd/mega_shock.c @@ -33,13 +33,13 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { elementID = hud_element_create(&HES_AButton); actionCommandStatus->hudElements[0] = elementID; - hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(elementID, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(elementID, 0); elementID = hud_element_create(&HES_BButton); actionCommandStatus->hudElements[2] = elementID; - hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(elementID, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(elementID, 0); @@ -47,13 +47,13 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElements[1] = elementID; hud_element_set_render_pos(elementID, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 0x1C); hud_element_set_render_depth(elementID, 0); - hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); elementID = hud_element_create(&HES_100pct); actionCommandStatus->hudElements[4] = elementID; hud_element_set_render_pos(elementID, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 0x1C); hud_element_set_render_depth(elementID, 0); - hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } @@ -114,20 +114,20 @@ void N(update)(void) { hudElement = actionCommandStatus->hudElements[0]; if (actionCommandStatus->showHud) { - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); } hud_element_set_alpha(hudElement, 255); hudElement = actionCommandStatus->hudElements[2]; if (actionCommandStatus->showHud) { - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); } hud_element_set_alpha(hudElement, 255); hudElement = actionCommandStatus->hudElements[1]; hud_element_set_alpha(hudElement, 255); if (actionCommandStatus->showHud) { - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); } actionCommandStatus->state = 1; @@ -251,7 +251,7 @@ void N(update)(void) { actionCommandStatus->isBarFilled = TRUE; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX + 50, actionCommandStatus->hudPosY + 28); - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); } adjustedFillLevel = actionCommandStatus->barFillLevel / 100; diff --git a/src/battle/action_cmd/power_shock.c b/src/battle/action_cmd/power_shock.c index 2f94b4fde9..ecc43d93a3 100644 --- a/src/battle/action_cmd/power_shock.c +++ b/src/battle/action_cmd/power_shock.c @@ -39,7 +39,7 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { id = hud_element_create(&HES_AButton); actionCommandStatus->hudElements[0] = id; - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(id, 0); @@ -47,19 +47,19 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElements[1] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); id = hud_element_create(&HES_100pct); actionCommandStatus->hudElements[3] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); id = hud_element_create(&HES_RunAwayOK); actionCommandStatus->hudElements[4] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); temp_v1 = (100 - actionCommandStatus->thresholdLevel) * 60; temp_v1 /= 100; @@ -108,18 +108,18 @@ void N(update)(void) { btl_set_popup_duration(99); id = actionCommandStatus->hudElements[0]; if (actionCommandStatus->showHud) { - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); } hud_element_set_alpha(id, 255); id = actionCommandStatus->hudElements[1]; hud_element_set_alpha(id, 255); if (actionCommandStatus->showHud) { - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); } id = actionCommandStatus->hudElements[4]; hud_element_set_alpha(id, 255); if (actionCommandStatus->showHud) { - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); } actionCommandStatus->state = 1; break; @@ -204,7 +204,7 @@ void N(update)(void) { id, actionCommandStatus->hudPosX + 50, actionCommandStatus->hudPosY + 28); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); } battleStatus->actionResult = actionCommandStatus->barFillLevel / 100; diff --git a/src/battle/action_cmd/smack.c b/src/battle/action_cmd/smack.c index 5b0fa38364..632cafee49 100644 --- a/src/battle/action_cmd/smack.c +++ b/src/battle/action_cmd/smack.c @@ -65,19 +65,19 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElements[0] = hudElement; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hudElement = hud_element_create(&HES_BlueMeter); actionCommandStatus->hudElements[1] = hudElement; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hudElement = hud_element_create(&HES_100pct); actionCommandStatus->hudElements[2] = hudElement; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } @@ -98,12 +98,12 @@ void N(update)(void) { hudElement = actionCommandStatus->hudElements[0]; hud_element_set_alpha(hudElement, 255); if (actionCommandStatus->showHud) { - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); } hudElement = actionCommandStatus->hudElements[1]; hud_element_set_alpha(hudElement, 255); if (actionCommandStatus->showHud) { - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); } actionCommandStatus->state = 1; break; @@ -182,7 +182,7 @@ void N(update)(void) { actionCommandStatus->isBarFilled = TRUE; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX + 50, actionCommandStatus->hudPosY + 28); - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); } battleStatus->actionResult = actionCommandStatus->barFillLevel / 100; diff --git a/src/battle/action_cmd/spiny_surge.c b/src/battle/action_cmd/spiny_surge.c index eed78f1ef4..ba4945e694 100644 --- a/src/battle/action_cmd/spiny_surge.c +++ b/src/battle/action_cmd/spiny_surge.c @@ -40,19 +40,19 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElements[0] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); id = hud_element_create(&HES_BlueMeter); actionCommandStatus->hudElements[1] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); id = hud_element_create(&HES_100pct); actionCommandStatus->hudElements[2] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } @@ -99,13 +99,13 @@ void N(update)(void) { id = actionCommandStatus->hudElements[0]; hud_element_set_alpha(id, 255); if (actionCommandStatus->showHud) { - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); } id = actionCommandStatus->hudElements[1]; hud_element_set_alpha(id, 255); if (actionCommandStatus->showHud) { - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); } actionCommandStatus->state = 1; diff --git a/src/battle/action_cmd/spook.c b/src/battle/action_cmd/spook.c index 0e6be2dec2..c9596a0688 100644 --- a/src/battle/action_cmd/spook.c +++ b/src/battle/action_cmd/spook.c @@ -38,19 +38,19 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElements[0] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); id = hud_element_create(&HES_BlueMeter); actionCommandStatus->hudElements[1] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); id = hud_element_create(&HES_100pct); actionCommandStatus->hudElements[2] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/squirt.c b/src/battle/action_cmd/squirt.c index 4e3c92af0a..6e404bb256 100644 --- a/src/battle/action_cmd/squirt.c +++ b/src/battle/action_cmd/squirt.c @@ -33,7 +33,7 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { id = hud_element_create(&HES_AButton); actionCommandStatus->hudElements[0] = id; - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(id, 0); @@ -41,7 +41,7 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElements[1] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } @@ -86,14 +86,14 @@ void N(update)(void) { id = actionCommandStatus->hudElements[0]; if (actionCommandStatus->showHud) { - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); } hud_element_set_alpha(id, 255); id = actionCommandStatus->hudElements[1]; hud_element_set_alpha(id, 255); if (actionCommandStatus->showHud) { - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); } actionCommandStatus->state = 1; diff --git a/src/battle/action_cmd/stop_leech.c b/src/battle/action_cmd/stop_leech.c index 9da1611b7f..8936046899 100644 --- a/src/battle/action_cmd/stop_leech.c +++ b/src/battle/action_cmd/stop_leech.c @@ -28,7 +28,7 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { hudElement = hud_element_create(&HES_AButton); actionCommandStatus->hudElements[0] = hudElement; - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(hudElement, 0); @@ -36,7 +36,7 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElements[1] = hudElement; hud_element_set_render_pos(hudElement, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } @@ -77,13 +77,13 @@ void N(update)(void) { btl_set_popup_duration(99); hudElement = actionCommandStatus->hudElements[0]; if (actionCommandStatus->showHud) { - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); } hud_element_set_alpha(hudElement, 0xFF); hudElement = actionCommandStatus->hudElements[1]; hud_element_set_alpha(hudElement, 0xFF); if (actionCommandStatus->showHud) { - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); } actionCommandStatus->state = 1; break; diff --git a/src/battle/action_cmd/tidal_wave.c b/src/battle/action_cmd/tidal_wave.c index 9a7ccf5388..62b7293c9c 100644 --- a/src/battle/action_cmd/tidal_wave.c +++ b/src/battle/action_cmd/tidal_wave.c @@ -35,14 +35,14 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElements[0] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); for (i = 1; i < 15; i++) { id = hud_element_create(&HES_AButton); actionCommandStatus->hudElements[i] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); } return ApiStatus_DONE2; @@ -93,7 +93,7 @@ void N(update)(void) { btl_set_popup_duration(99); id = actionCommandStatus->hudElements[0]; if (actionCommandStatus->showHud) { - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); } hud_element_set_alpha(id, 255); actionCommandStatus->state = 1; @@ -138,7 +138,7 @@ void N(update)(void) { id, actionCommandStatus->hudPosX + ((actionCommandStatus->unk_5D - 1) * 20) + 16, actionCommandStatus->hudPosY); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); sfx_play_sound(SOUND_233); actionCommandStatus->lookBackCounter = 1; actionCommandStatus->state = 12; diff --git a/src/battle/action_cmd/water_block.c b/src/battle/action_cmd/water_block.c index 3f8e3de2c3..3003401be8 100644 --- a/src/battle/action_cmd/water_block.c +++ b/src/battle/action_cmd/water_block.c @@ -137,7 +137,7 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { id = hud_element_create(&HES_AButton); actionCommandStatus->hudElements[0] = id; - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(id, 0); @@ -145,43 +145,43 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElements[1] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); id = hud_element_create(&HES_TimingWait); actionCommandStatus->hudElements[2] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); id = hud_element_create(&HES_TimingWait); actionCommandStatus->hudElements[3] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); id = hud_element_create(&HES_TimingWait); actionCommandStatus->hudElements[4] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); id = hud_element_create(&HES_TimingOK); actionCommandStatus->hudElements[6] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); id = hud_element_create(&HES_TimingOK); actionCommandStatus->hudElements[7] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); id = hud_element_create(&HES_TimingOK); actionCommandStatus->hudElements[8] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); actionCommandStatus->hudElements[10] = hud_element_create(D_802AB184_42C674[0]); hud_element_set_render_pos(actionCommandStatus->hudElements[10], diff --git a/src/battle/action_cmd/whirlwind.c b/src/battle/action_cmd/whirlwind.c index 13297ccd94..0f3762a2ac 100644 --- a/src/battle/action_cmd/whirlwind.c +++ b/src/battle/action_cmd/whirlwind.c @@ -92,7 +92,7 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { id = hud_element_create(&HES_AButton); actionCommandStatus->hudElements[0] = id; - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY); hud_element_set_render_depth(id, 0); @@ -100,19 +100,19 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElements[1] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); id = hud_element_create(&HES_Whirlwind7); actionCommandStatus->hudElements[2] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX + 54, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); id = hud_element_create(&HES_WhirlwindBubble); actionCommandStatus->hudElements[3] = id; hud_element_set_render_pos(id, actionCommandStatus->hudPosX + 60, actionCommandStatus->hudPosY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/battle/area_kkj/actor/kammy_koopa.c b/src/battle/area_kkj/actor/kammy_koopa.c index cccbd590f9..f525604b8c 100644 --- a/src/battle/area_kkj/actor/kammy_koopa.c +++ b/src/battle/area_kkj/actor/kammy_koopa.c @@ -243,12 +243,12 @@ ApiStatus N(DropBlock)(Evt* script, s32 isInitialCall) { entity->collisionTimer = 0; collisionStatus->lastWallHammered = entityIndex | COLLISION_WITH_ENTITY_BIT; - playerStatus->flags |= PS_FLAGS_HAMMER_CHECK; + playerStatus->flags |= PS_FLAG_HAMMER_CHECK; entity->collisionFlags = ENTITY_COLLISION_PLAYER_HAMMER; playerStatus->actionState = ACTION_STATE_HAMMER; entity->blueprint->fpHandleCollision(entity); entity->collisionTimer = 10; - entity->flags |= ENTITY_FLAGS_DETECTED_COLLISION; + entity->flags |= ENTITY_FLAG_DETECTED_COLLISION; collisionStatus->lastWallHammered = -1; return ApiStatus_DONE2; diff --git a/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c b/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c index c3c8e918bc..f89541ac54 100644 --- a/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c +++ b/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c @@ -549,7 +549,7 @@ ApiStatus func_802189DC_447E1C(Evt* script, s32 isInitialCall) { hud_element_set_render_pos(icon, posX, posY); hud_element_set_scale(icon, 1.5f); - hud_element_clear_flags(icon, HUD_ELEMENT_FLAGS_200000 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon, HUD_ELEMENT_FLAG_200000 | HUD_ELEMENT_FLAG_DISABLED); evt_set_variable(script, *args++, icon); load_tattle_flags(0x8B); return ApiStatus_DONE2; diff --git a/src/battle/area_kzn/actor/lava_bubble.c b/src/battle/area_kzn/actor/lava_bubble.c index cd5d7aba9b..1041ef71cc 100644 --- a/src/battle/area_kzn/actor/lava_bubble.c +++ b/src/battle/area_kzn/actor/lava_bubble.c @@ -56,7 +56,7 @@ ActorPartBlueprint N(partsTable_80218EE8)[] = { .idleAnimations = N(idleAnimations_80218FC4), .defenseTable = N(defenseTable_80218E10), .eventFlags = ACTOR_EVENT_FLAG_FIREY, - .elementImmunityFlags = ELEMENT_IMMUNITY_FLAGS_2, + .elementImmunityFlags = ELEMENT_IMMUNITY_FLAG_2, .unk_1C = 0xFD, .unk_1D = 0xF6, }, diff --git a/src/battle/area_kzn2/actor/lava_bud.c b/src/battle/area_kzn2/actor/lava_bud.c index b6546d3028..d0952f0716 100644 --- a/src/battle/area_kzn2/actor/lava_bud.c +++ b/src/battle/area_kzn2/actor/lava_bud.c @@ -253,7 +253,7 @@ EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) - EVT_CALL(SetAnimatorFlags, LVar0, MODEL_ANIMATOR_FLAGS_FREEZE_ANIMATION, 0) + EVT_CALL(SetAnimatorFlags, LVar0, MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION, 0) EVT_CALL(GetLastElement, LVarE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -295,7 +295,7 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_END_FIRST_STRIKE) EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) - EVT_CALL(SetAnimatorFlags, LVar0, MODEL_ANIMATOR_FLAGS_FREEZE_ANIMATION, 0) + EVT_CALL(SetAnimatorFlags, LVar0, MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION, 0) EVT_CASE_EQ(EVENT_30) EVT_SET_CONST(LVar0, 1) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar1) @@ -306,7 +306,7 @@ EvtScript N(handleEvent) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_STOP) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) - EVT_CALL(SetAnimatorFlags, LVar0, MODEL_ANIMATOR_FLAGS_FREEZE_ANIMATION, 1) + EVT_CALL(SetAnimatorFlags, LVar0, MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION, 1) EVT_END_IF EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) diff --git a/src/battle/area_kzn2/actor/lava_piranha.c b/src/battle/area_kzn2/actor/lava_piranha.c index 900c079738..098263eaf1 100644 --- a/src/battle/area_kzn2/actor/lava_piranha.c +++ b/src/battle/area_kzn2/actor/lava_piranha.c @@ -552,25 +552,25 @@ EvtScript N(init) = { EVT_CALL(LoadBattleDmaData, 0) EVT_CALL(PlayModelAnimation, VINE_0, VINE_0_BASE) EVT_CALL(SetAnimatedModelRootPosition, VINE_0, 0, 0, 0) - EVT_CALL(SetAnimatorFlags, VINE_0, MODEL_ANIMATOR_FLAGS_HIDDEN, 1) + EVT_CALL(SetAnimatorFlags, VINE_0, MODEL_ANIMATOR_FLAG_HIDDEN, 1) EVT_CALL(LoadAnimatedModel, VINE_1, EVT_PTR(N(AnimModel_SideHeadVine))) EVT_CALL(OverrideBattleDmaDest, VINE_1_BASE) EVT_CALL(LoadBattleDmaData, 31) EVT_CALL(PlayModelAnimation, VINE_1, VINE_1_BASE) EVT_CALL(SetAnimatedModelRootPosition, VINE_1, 0, 0, 0) - EVT_CALL(SetAnimatorFlags, VINE_1, MODEL_ANIMATOR_FLAGS_HIDDEN, 1) + EVT_CALL(SetAnimatorFlags, VINE_1, MODEL_ANIMATOR_FLAG_HIDDEN, 1) EVT_CALL(LoadAnimatedModel, VINE_2, EVT_PTR(N(AnimModel_SideHeadVine))) EVT_CALL(OverrideBattleDmaDest, VINE_2_BASE) EVT_CALL(LoadBattleDmaData, 31) EVT_CALL(PlayModelAnimation, VINE_2, VINE_2_BASE) EVT_CALL(SetAnimatedModelRootPosition, VINE_2, 50, 14, 20) - EVT_CALL(SetAnimatorFlags, VINE_2, MODEL_ANIMATOR_FLAGS_HIDDEN, 1) + EVT_CALL(SetAnimatorFlags, VINE_2, MODEL_ANIMATOR_FLAG_HIDDEN, 1) EVT_CALL(LoadAnimatedModel, VINE_3, EVT_PTR(N(AnimModel_ExtraVine))) EVT_CALL(OverrideBattleDmaDest, VINE_3_BASE) EVT_CALL(LoadBattleDmaData, 34) EVT_CALL(PlayModelAnimation, VINE_3, VINE_3_BASE) EVT_CALL(SetAnimatedModelRootPosition, VINE_3, 0, 0, 3) - EVT_CALL(SetAnimatorFlags, VINE_3, MODEL_ANIMATOR_FLAGS_HIDDEN, 1) + EVT_CALL(SetAnimatorFlags, VINE_3, MODEL_ANIMATOR_FLAG_HIDDEN, 1) EVT_CALL(SummonEnemy, EVT_PTR(N(formation_lava_bud_1)), 0) EVT_CALL(SummonEnemy, EVT_PTR(N(formation_lava_bud_2)), 0) EVT_WAIT(2) @@ -939,7 +939,7 @@ EvtScript N(initVines) = { EvtScript N(handleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) - EVT_CALL(SetAnimatorFlags, VINE_0, MODEL_ANIMATOR_FLAGS_FREEZE_ANIMATION, 0) + EVT_CALL(SetAnimatorFlags, VINE_0, MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION, 0) EVT_CALL(GetLastElement, LVarE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -990,7 +990,7 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_SPIKE_TAUNT) EVT_CASE_EQ(EVENT_END_FIRST_STRIKE) EVT_CASE_EQ(EVENT_RECOVER_STATUS) - EVT_CALL(SetAnimatorFlags, VINE_0, MODEL_ANIMATOR_FLAGS_FREEZE_ANIMATION, 0) + EVT_CALL(SetAnimatorFlags, VINE_0, MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION, 0) EVT_CASE_EQ(EVENT_30) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_LavaPiranha_Anim09) @@ -1011,7 +1011,7 @@ EvtScript N(handleEvent) = { EVT_END_IF EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_STOP) - EVT_CALL(SetAnimatorFlags, VINE_0, MODEL_ANIMATOR_FLAGS_FREEZE_ANIMATION, 1) + EVT_CALL(SetAnimatorFlags, VINE_0, MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION, 1) EVT_END_IF EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -1346,11 +1346,11 @@ EvtScript N(onDeath) = { EVT_CALL(ClearStatusEffects, ACTOR_SELF) EVT_CALL(ClearStatusEffects, ACTOR_ENEMY1) EVT_CALL(ClearStatusEffects, ACTOR_ENEMY2) - EVT_CALL(SetAnimatorFlags, VINE_0, MODEL_ANIMATOR_FLAGS_FREEZE_ANIMATION, 0) + EVT_CALL(SetAnimatorFlags, VINE_0, MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION, 0) EVT_CALL(GetActorVar, ACTOR_ENEMY1, 0, LVar0) - EVT_CALL(SetAnimatorFlags, LVar0, MODEL_ANIMATOR_FLAGS_FREEZE_ANIMATION, 0) + EVT_CALL(SetAnimatorFlags, LVar0, MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION, 0) EVT_CALL(GetActorVar, ACTOR_ENEMY2, 0, LVar0) - EVT_CALL(SetAnimatorFlags, LVar0, MODEL_ANIMATOR_FLAGS_FREEZE_ANIMATION, 0) + EVT_CALL(SetAnimatorFlags, LVar0, MODEL_ANIMATOR_FLAG_FREEZE_ANIMATION, 0) EVT_CALL(CancelEnemyTurn, 1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(SetBattleCamTarget, 90, 90, 0) diff --git a/src/battle/area_mac/actor/lee.c b/src/battle/area_mac/actor/lee.c index 671da50d24..cf439981cd 100644 --- a/src/battle/area_mac/actor/lee.c +++ b/src/battle/area_mac/actor/lee.c @@ -988,7 +988,7 @@ ApiStatus func_80218E2C_4652BC(Evt* script, s32 isInitialCall) { EffectInstance* tattleEffect = (EffectInstance*) evt_get_variable(script, *script->ptrReadPos); tattleEffect->data.tattleWindow->pos.y = 144.0f; - tattleEffect->flags |= EFFECT_INSTANCE_FLAGS_10; + tattleEffect->flags |= EFFECT_INSTANCE_FLAG_10; return ApiStatus_DONE2; } @@ -2914,7 +2914,7 @@ ApiStatus func_80219188_465618(Evt* script, s32 isInitialCall) { } if (wattEffectData->effect2 != NULL) { - wattEffectData->effect2->flags |= EFFECT_INSTANCE_FLAGS_10; + wattEffectData->effect2->flags |= EFFECT_INSTANCE_FLAG_10; wattEffectData->effect2 = NULL; } wattEffectData->effect1->data.staticStatus->unk_04 = x; @@ -2923,7 +2923,7 @@ ApiStatus func_80219188_465618(Evt* script, s32 isInitialCall) { break; case 1: if (wattEffectData->effect1 != NULL) { - wattEffectData->effect1->flags |= EFFECT_INSTANCE_FLAGS_10; + wattEffectData->effect1->flags |= EFFECT_INSTANCE_FLAG_10; wattEffectData->effect1 = NULL; } if (wattEffectData->effect2 == NULL) { @@ -2937,21 +2937,21 @@ ApiStatus func_80219188_465618(Evt* script, s32 isInitialCall) { } } else { if (wattEffectData->effect1 != NULL) { - wattEffectData->effect1->flags |= EFFECT_INSTANCE_FLAGS_10; + wattEffectData->effect1->flags |= EFFECT_INSTANCE_FLAG_10; wattEffectData->effect1 = NULL; } if (wattEffectData->effect2 != NULL) { - wattEffectData->effect2->flags |= EFFECT_INSTANCE_FLAGS_10; + wattEffectData->effect2->flags |= EFFECT_INSTANCE_FLAG_10; wattEffectData->effect2 = NULL; } } if (wattEffectData->debuff != actor->debuff && wattEffectData->unk_0C) { if (wattEffectData->effect1 != NULL) { - wattEffectData->effect1->flags |= EFFECT_INSTANCE_FLAGS_10; + wattEffectData->effect1->flags |= EFFECT_INSTANCE_FLAG_10; wattEffectData->effect1 = NULL; } if (wattEffectData->effect2 != NULL) { - wattEffectData->effect2->flags |= EFFECT_INSTANCE_FLAGS_10; + wattEffectData->effect2->flags |= EFFECT_INSTANCE_FLAG_10; wattEffectData->effect2 = NULL; } } @@ -2967,11 +2967,11 @@ ApiStatus func_80219604_465A94(Evt* script, s32 isInitialCall) { wattEffectData->flags = 0; if (wattEffectData->effect1 != NULL) { - wattEffectData->effect1->flags |= EFFECT_INSTANCE_FLAGS_10; + wattEffectData->effect1->flags |= EFFECT_INSTANCE_FLAG_10; } if (wattEffectData->effect2 != NULL) { - wattEffectData->effect2->flags |= EFFECT_INSTANCE_FLAGS_10; + wattEffectData->effect2->flags |= EFFECT_INSTANCE_FLAG_10; } return ApiStatus_DONE2; diff --git a/src/battle/area_omo/stage/omo_01.c b/src/battle/area_omo/stage/omo_01.c index 9021d37576..bef73c707c 100644 --- a/src/battle/area_omo/stage/omo_01.c +++ b/src/battle/area_omo/stage/omo_01.c @@ -51,7 +51,7 @@ ApiStatus N(update_model_uma)(Evt* script, s32 isInitialCall) { offsetY = SQ(rotZ) / 90.0f; model = get_model_from_list_index(get_model_list_index_from_tree_index(ptr->modelID)); - model->flags |= MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED; + model->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED; guTranslateF(mtx1, -ptr->offsetX, 0.0f, -ptr->offsetZ); guRotateF(mtx2, rotZ, 0.0f, 0.0f, 1.0f); guMtxCatF(mtx1, mtx2, model->transformMatrix); diff --git a/src/battle/area_omo3/stage/omo_01.c b/src/battle/area_omo3/stage/omo_01.c index b92d52943f..d2e52bfefc 100644 --- a/src/battle/area_omo3/stage/omo_01.c +++ b/src/battle/area_omo3/stage/omo_01.c @@ -51,7 +51,7 @@ ApiStatus N(update_model_uma)(Evt* script, s32 isInitialCall) { offsetY = SQ(rotZ) / 90.0f; model = get_model_from_list_index(get_model_list_index_from_tree_index(ptr->modelID)); - model->flags |= MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED; + model->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED; guTranslateF(mtx1, -ptr->offsetX, 0.0f, -ptr->offsetZ); guRotateF(mtx2, rotZ, 0.0f, 0.0f, 1.0f); guMtxCatF(mtx1, mtx2, model->transformMatrix); diff --git a/src/battle/common/actor/ghost_goombario.inc.c b/src/battle/common/actor/ghost_goombario.inc.c index 616afbdeb8..c4098c312b 100644 --- a/src/battle/common/actor/ghost_goombario.inc.c +++ b/src/battle/common/actor/ghost_goombario.inc.c @@ -23,7 +23,7 @@ ApiStatus N(UnkTattleEffectFunc2)(Evt* script, s32 isInitialCall) { EffectInstance* effect = (EffectInstance*)evt_get_variable(script, *args++); effect->data.tattleWindow->pos.y = 144.0f; - effect->flags |= EFFECT_INSTANCE_FLAGS_10; + effect->flags |= EFFECT_INSTANCE_FLAG_10; return ApiStatus_DONE2; } diff --git a/src/battle/common/actor/ghost_watt.inc.c b/src/battle/common/actor/ghost_watt.inc.c index 9d900ac364..f8d9b9b0a3 100644 --- a/src/battle/common/actor/ghost_watt.inc.c +++ b/src/battle/common/actor/ghost_watt.inc.c @@ -42,7 +42,7 @@ ApiStatus N(UnkWattEffectFunc1)(Evt* script, s32 isInitialCall) { } if (wattEffectData->effect2 != NULL) { - wattEffectData->effect2->flags |= EFFECT_INSTANCE_FLAGS_10; + wattEffectData->effect2->flags |= EFFECT_INSTANCE_FLAG_10; wattEffectData->effect2 = NULL; } wattEffectData->effect1->data.staticStatus->unk_04 = x; @@ -51,7 +51,7 @@ ApiStatus N(UnkWattEffectFunc1)(Evt* script, s32 isInitialCall) { break; case 1: if (wattEffectData->effect1 != NULL) { - wattEffectData->effect1->flags |= EFFECT_INSTANCE_FLAGS_10; + wattEffectData->effect1->flags |= EFFECT_INSTANCE_FLAG_10; wattEffectData->effect1 = NULL; } if (wattEffectData->effect2 == NULL) { @@ -65,21 +65,21 @@ ApiStatus N(UnkWattEffectFunc1)(Evt* script, s32 isInitialCall) { } } else { if (wattEffectData->effect1 != NULL) { - wattEffectData->effect1->flags |= EFFECT_INSTANCE_FLAGS_10; + wattEffectData->effect1->flags |= EFFECT_INSTANCE_FLAG_10; wattEffectData->effect1 = NULL; } if (wattEffectData->effect2 != NULL) { - wattEffectData->effect2->flags |= EFFECT_INSTANCE_FLAGS_10; + wattEffectData->effect2->flags |= EFFECT_INSTANCE_FLAG_10; wattEffectData->effect2 = NULL; } } if (wattEffectData->debuff != actor->debuff && wattEffectData->unk_0C) { if (wattEffectData->effect1 != NULL) { - wattEffectData->effect1->flags |= EFFECT_INSTANCE_FLAGS_10; + wattEffectData->effect1->flags |= EFFECT_INSTANCE_FLAG_10; wattEffectData->effect1 = NULL; } if (wattEffectData->effect2 != NULL) { - wattEffectData->effect2->flags |= EFFECT_INSTANCE_FLAGS_10; + wattEffectData->effect2->flags |= EFFECT_INSTANCE_FLAG_10; wattEffectData->effect2 = NULL; } } @@ -97,11 +97,11 @@ ApiStatus N(UnkWattEffectFunc2)(Evt* script, s32 isInitialCall) { wattEffectData->flags = FALSE; if (wattEffectData->effect1 != NULL) { - wattEffectData->effect1->flags |= EFFECT_INSTANCE_FLAGS_10; + wattEffectData->effect1->flags |= EFFECT_INSTANCE_FLAG_10; } if (wattEffectData->effect2 != NULL) { - wattEffectData->effect2->flags |= EFFECT_INSTANCE_FLAGS_10; + wattEffectData->effect2->flags |= EFFECT_INSTANCE_FLAG_10; } return ApiStatus_DONE2; diff --git a/src/battle/common/actor/magikoopa.inc.c b/src/battle/common/actor/magikoopa.inc.c index 29d6c39a08..5662d2b7dd 100644 --- a/src/battle/common/actor/magikoopa.inc.c +++ b/src/battle/common/actor/magikoopa.inc.c @@ -6,7 +6,7 @@ #include "effects.h" enum N(ActorVars) { - N(VAR_FLAGS_HIT_COMBO) = 0, + N(VAR_FLAG_HIT_COMBO) = 0, N(VAR_HAS_CLONE) = 1, N(VAR_CAN_FALL) = 2, N(VAR_HEAL_ALL_COUNTER) = 3, @@ -412,9 +412,9 @@ EvtScript N(flee) = { }; EvtScript N(nextTurn) = { - EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_FLAGS_HIT_COMBO), LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_FLAG_HIT_COMBO), LVar0) EVT_BITWISE_AND_CONST(LVar0, ~0x1) - EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLAGS_HIT_COMBO), LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLAG_HIT_COMBO), LVar0) EVT_RETURN EVT_END }; @@ -428,7 +428,7 @@ EvtScript N(init) = { EVT_IF_EQ(LVar0, 0) EVT_CALL(SetBattleVar, 2, -1) EVT_END_IF - EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLAGS_HIT_COMBO), 0) + EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLAG_HIT_COMBO), 0) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_HAS_CLONE), 0) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_CAN_FALL), 0) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_HEAL_ALL_COUNTER), 0) @@ -452,7 +452,7 @@ EvtScript N(init_flying) = { EVT_IF_EQ(LVar0, 0) EVT_CALL(SetBattleVar, 2, -1) EVT_END_IF - EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLAGS_HIT_COMBO), 0) + EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLAG_HIT_COMBO), 0) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_HAS_CLONE), 0) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_CAN_FALL), 0) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_HEAL_ALL_COUNTER), 0) @@ -516,9 +516,9 @@ EvtScript N(handleEvent) = { EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) - EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_FLAGS_HIT_COMBO), LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_FLAG_HIT_COMBO), LVar0) EVT_BITWISE_OR_CONST(LVar0, 0x1) - EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLAGS_HIT_COMBO), LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLAG_HIT_COMBO), LVar0) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim04) EVT_EXEC_WAIT(DoNormalHit) @@ -567,7 +567,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim01) EVT_EXEC_WAIT(DoImmune) - EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_FLAGS_HIT_COMBO), LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_FLAG_HIT_COMBO), LVar0) EVT_IF_FLAG(LVar0, 1) EVT_EXEC_WAIT(N(removeClone)) EVT_RETURN @@ -643,9 +643,9 @@ EvtScript N(handleEvent_flying) = { EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(EVENT_HIT_COMBO) - EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_FLAGS_HIT_COMBO), LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_FLAG_HIT_COMBO), LVar0) EVT_BITWISE_OR_CONST(LVar0, 1) - EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLAGS_HIT_COMBO), LVar0) + EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLAG_HIT_COMBO), LVar0) EVT_EXEC_WAIT(N(canBeKnockedOff)) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim04) @@ -706,7 +706,7 @@ EvtScript N(handleEvent_flying) = { EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim01) EVT_EXEC_WAIT(DoImmune) - EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_FLAGS_HIT_COMBO), LVar0) + EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_FLAG_HIT_COMBO), LVar0) EVT_IF_FLAG(LVar0, 1) EVT_EXEC_WAIT(N(removeClone)) EVT_RETURN diff --git a/src/battle/item/dizzy_dial.c b/src/battle/item/dizzy_dial.c index 34c08c5e04..3be2c404a4 100644 --- a/src/battle/item/dizzy_dial.c +++ b/src/battle/item/dizzy_dial.c @@ -26,7 +26,7 @@ ApiStatus N(func_802A1270_727B80)(Evt* script, s32 isInitialCall) { D_802A1CD0 = create_worker_frontUI(NULL, func_802A123C_727B4C); script->functionTemp[0] = 1; case 1: - camera->flags |= CAMERA_FLAGS_SHAKING; + camera->flags |= CAMERA_FLAG_SHAKING; a = script->functionTemp[1]; guRotateF(camera->viewMtxShaking, a, 0.0f, 0.0f, 1.0f); script->functionTemp[1] = 2.0 * ((1.0 - sin_rad(DEG_TO_RAD(script->functionTemp[2] + 90))) * 360.0); @@ -35,7 +35,7 @@ ApiStatus N(func_802A1270_727B80)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } camera->auxPitch = 0; - camera->flags &= ~CAMERA_FLAGS_SHAKING; + camera->flags &= ~CAMERA_FLAG_SHAKING; free_worker(D_802A1CD0); return ApiStatus_DONE2; } diff --git a/src/battle/item/mystery.c b/src/battle/item/mystery.c index 778f64bdab..c5931cd619 100644 --- a/src/battle/item/mystery.c +++ b/src/battle/item/mystery.c @@ -73,7 +73,7 @@ s32 N(func_802A13E4_72C994)(Evt* script, s32 isInitialCall) { for (i = 0; i < ARRAY_COUNT(D_802A25C8); i++) { id = hud_element_create(gItemHudScripts[gItemTable[D_802A25FC[i]].hudElemID].enabled); D_802A25C8[i] = id; - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80); } D_802A25E4 = 1; return ApiStatus_BLOCK; diff --git a/src/battle/item/pow_block.c b/src/battle/item/pow_block.c index 3bf1624211..01544a8e1a 100644 --- a/src/battle/item/pow_block.c +++ b/src/battle/item/pow_block.c @@ -12,10 +12,10 @@ ApiStatus N(func_802A123C_718A8C)(Evt* script, s32 isInitialCall) { s32 var = script->varTable[10]; get_entity_by_index(var); collisionStatus->currentCeiling = var | COLLISION_WITH_ENTITY_BIT; - playerStatus->flags |= PS_FLAGS_JUMPING; + playerStatus->flags |= PS_FLAG_JUMPING; update_entities(); collisionStatus->currentCeiling = -1; - playerStatus->flags &= ~PS_FLAGS_JUMPING; + playerStatus->flags &= ~PS_FLAG_JUMPING; return ApiStatus_DONE2; } @@ -25,7 +25,7 @@ ApiStatus N(func_802A123C_718A8C)(Evt* script, s32 isInitialCall) { ApiStatus N(func_802A12E4_718B34)(Evt* script, s32 isInitialCall) { Entity* entity = get_entity_by_index(script->varTable[10]); - entity->flags |= ENTITY_FLAGS_PENDING_INSTANCE_DELETE; + entity->flags |= ENTITY_FLAG_PENDING_INSTANCE_DELETE; return ApiStatus_DONE2; } diff --git a/src/battle/item/strange_cake.c b/src/battle/item/strange_cake.c index 159c807005..4bdb114c40 100644 --- a/src/battle/item/strange_cake.c +++ b/src/battle/item/strange_cake.c @@ -63,7 +63,7 @@ s32 N(func_802A13E4_7316E4)(Evt* script, s32 isInitialCall) { for (i = 0; i < ARRAY_COUNT(D_802A2DD8); i++) { id = hud_element_create(N(D_802A2848_732B48)[N(D_802A2858_732B58)[i]]); D_802A2DD8[i] = id; - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80); } D_802A2DEC = 1; diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c index f65d0c313f..81f714f755 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -347,7 +347,7 @@ ApiStatus N(CloseTattleWindow)(Evt* script, s32 isInitialCall) { EffectInstance* effect = N(tattleEffect); effect->data.tattleWindow->pos.y = 144.0f; - effect->flags |= EFFECT_INSTANCE_FLAGS_10; + effect->flags |= EFFECT_INSTANCE_FLAG_10; return ApiStatus_DONE2; } diff --git a/src/battle/partner/watt.c b/src/battle/partner/watt.c index 391b744762..fdb6bb4bbc 100644 --- a/src/battle/partner/watt.c +++ b/src/battle/partner/watt.c @@ -77,7 +77,7 @@ ApiStatus N(WattFXUpdate)(Evt* script, s32 isInitialCall) { sWattEffectData_effect1 = fx_static_status(0, x, y, z, 1.0f, 5, 0); } if (sWattEffectData_effect2 != NULL) { - sWattEffectData_effect2->flags |= EFFECT_INSTANCE_FLAGS_10; + sWattEffectData_effect2->flags |= EFFECT_INSTANCE_FLAG_10; sWattEffectData_effect2 = NULL; } sWattEffectData_effect1->data.staticStatus->unk_04 = x; @@ -86,7 +86,7 @@ ApiStatus N(WattFXUpdate)(Evt* script, s32 isInitialCall) { break; case 1: if (sWattEffectData_effect1 != NULL) { - sWattEffectData_effect1->flags |= EFFECT_INSTANCE_FLAGS_10; + sWattEffectData_effect1->flags |= EFFECT_INSTANCE_FLAG_10; sWattEffectData_effect1 = NULL; } if (sWattEffectData_effect2 == NULL) { @@ -99,11 +99,11 @@ ApiStatus N(WattFXUpdate)(Evt* script, s32 isInitialCall) { } } else { if (sWattEffectData_effect1 != NULL) { - sWattEffectData_effect1->flags |= EFFECT_INSTANCE_FLAGS_10; + sWattEffectData_effect1->flags |= EFFECT_INSTANCE_FLAG_10; sWattEffectData_effect1 = NULL; } if (sWattEffectData_effect2 != NULL) { - sWattEffectData_effect2->flags |= EFFECT_INSTANCE_FLAGS_10; + sWattEffectData_effect2->flags |= EFFECT_INSTANCE_FLAG_10; sWattEffectData_effect2 = NULL; } } @@ -167,7 +167,7 @@ ApiStatus N(ElectroDashFXDisable)(Evt* script, s32 isInitialCall) { EffectInstance* effect = N(radialShimmer); if (effect != NULL) { - effect->flags |= EFFECT_INSTANCE_FLAGS_10; + effect->flags |= EFFECT_INSTANCE_FLAG_10; } N(radialShimmer) = NULL; @@ -392,7 +392,7 @@ ApiStatus N(MegaShockFX)(Evt* script, s32 isInitialCall) { script->functionTemp[3]--; } if (script->functionTemp[2] == 0) { - N(thunderboltRing)->flags |= EFFECT_INSTANCE_FLAGS_10; + N(thunderboltRing)->flags |= EFFECT_INSTANCE_FLAG_10; return ApiStatus_DONE2; } script->functionTemp[2]--; diff --git a/src/battle/star/common/peach_star_beam.inc.c b/src/battle/star/common/peach_star_beam.inc.c index f7c73c1bb4..32ee63c2b0 100644 --- a/src/battle/star/common/peach_star_beam.inc.c +++ b/src/battle/star/common/peach_star_beam.inc.c @@ -668,7 +668,7 @@ ApiStatus N(ProcessPeachStarBeam)(Evt* script, s32 isInitialCall) { if (!cond) { N(starBeamStage) = 2; - N(effect)->flags |= EFFECT_INSTANCE_FLAGS_10; + N(effect)->flags |= EFFECT_INSTANCE_FLAG_10; return ApiStatus_DONE2; } break; @@ -738,7 +738,7 @@ ApiStatus N(ProcessPeachStarBeam)(Evt* script, s32 isInitialCall) { if (!cond) { N(starBeamStage) = 2; - N(effect)->flags |= EFFECT_INSTANCE_FLAGS_10; + N(effect)->flags |= EFFECT_INSTANCE_FLAG_10; return ApiStatus_DONE2; } break; diff --git a/src/battle_ui_gfx.c b/src/battle_ui_gfx.c index c92e223771..cca0cadb48 100644 --- a/src/battle_ui_gfx.c +++ b/src/battle_ui_gfx.c @@ -848,9 +848,9 @@ HudScript HES_AimBlinkA = { hs_SetVisible hs_SetTileSize(HUD_ELEMENT_SIZE_16x16) hs_Loop - hs_ClearFlags(HUD_ELEMENT_FLAGS_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_200000) hs_SetCI(3, ui_battle_cmd_aim_marker_0) - hs_SetFlags(HUD_ELEMENT_FLAGS_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_200000) hs_SetCI(3, ui_battle_cmd_aim_marker_0) hs_SetCI(3, ui_battle_cmd_aim_marker_0) hs_Restart @@ -861,11 +861,11 @@ HudScript HES_AimBlinkB = { hs_SetVisible hs_SetTileSize(HUD_ELEMENT_SIZE_16x16) hs_Loop - hs_SetFlags(HUD_ELEMENT_FLAGS_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_200000) hs_SetCI(3, ui_battle_cmd_aim_marker_0) - hs_ClearFlags(HUD_ELEMENT_FLAGS_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_200000) hs_SetCI(3, ui_battle_cmd_aim_marker_0) - hs_SetFlags(HUD_ELEMENT_FLAGS_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_200000) hs_SetCI(3, ui_battle_cmd_aim_marker_0) hs_Restart hs_End @@ -875,10 +875,10 @@ HudScript HES_AimBlinkC = { hs_SetVisible hs_SetTileSize(HUD_ELEMENT_SIZE_16x16) hs_Loop - hs_SetFlags(HUD_ELEMENT_FLAGS_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_200000) hs_SetCI(3, ui_battle_cmd_aim_marker_0) hs_SetCI(3, ui_battle_cmd_aim_marker_0) - hs_ClearFlags(HUD_ELEMENT_FLAGS_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_200000) hs_SetCI(3, ui_battle_cmd_aim_marker_0) hs_Restart hs_End diff --git a/src/camera.c b/src/camera.c index f037e3cf68..e409b8f300 100644 --- a/src/camera.c +++ b/src/camera.c @@ -63,7 +63,7 @@ s32 func_800328A4(CameraControlSettings* camSettings, f32 x, f32 z) { void func_80032970(Camera* camera, f32 arg1) { f32 stickX; f32 deltaLeadAmount; - s32 flags = camera->flags & CAMERA_FLAGS_1000; + s32 flags = camera->flags & CAMERA_FLAG_1000; s32 a2 = flags != 0; if (camera->currentController != NULL && camera->currentController->type == CAMERA_SETTINGS_TYPE_4) { @@ -76,7 +76,7 @@ void func_80032970(Camera* camera, f32 arg1) { camera->unk_514 = 1.0f; camera->unk_510 = 0.0f; } else { - if (gPlayerStatusPtr->animFlags & PA_FLAGS_RIDING_PARTNER) { + if (gPlayerStatusPtr->animFlags & PA_FLAG_RIDING_PARTNER) { stickX = gPartnerActionStatus.stickX; } else { stickX = gPlayerStatusPtr->stickAxis[0]; diff --git a/src/collision.c b/src/collision.c index c377de4267..5cb9294cd5 100644 --- a/src/collision.c +++ b/src/collision.c @@ -133,7 +133,7 @@ void restore_map_collision_data(void) { collider->flags = backupEntry->flags; collider->parentModelIndex = backupEntry->parentModelIndex; - if (collider->flags != -1 && collider->flags & COLLIDER_FLAGS_HAS_MODEL_PARENT) { + if (collider->flags != -1 && collider->flags & COLLIDER_FLAG_HAS_MODEL_PARENT) { parent_collider_to_model(i, collider->parentModelIndex); update_collider_transform(i); } @@ -316,7 +316,7 @@ void parent_collider_to_model(s16 colliderID, s16 modelIndex) { collider = &gCollisionData.colliderList[colliderID]; collider->parentModelIndex = modelIndex; - collider->flags |= COLLIDER_FLAGS_HAS_MODEL_PARENT; + collider->flags |= COLLIDER_FLAG_HAS_MODEL_PARENT; vertexBuffer = collision_heap_malloc(collider->numTriangles * sizeof(Vec3f)); vertexBufferSize = 0; @@ -871,7 +871,7 @@ s32 test_ray_zones(f32 startX, f32 startY, f32 startZ, f32 dirX, f32 dirY, f32 d for (i = 0; i < collisionData->numColliders; i++) { collider = &collisionData->colliderList[i]; - if (collider->flags & COLLIDER_FLAGS_IGNORE_PLAYER) + if (collider->flags & COLLIDER_FLAG_IGNORE_PLAYER) continue; if (collider->numTriangles == 0 || collider->aabb == NULL) @@ -971,7 +971,7 @@ s32 test_ray_entities(f32 startX, f32 startY, f32 startZ, f32 dirX, f32 dirY, f3 for (i = 0; i < MAX_ENTITIES; i++) { entity = get_entity_by_index(i); - if (entity == NULL || (entity->flags & (ENTITY_FLAGS_SKIP_UPDATE | ENTITY_FLAGS_DISABLE_COLLISION))) { + if (entity == NULL || (entity->flags & (ENTITY_FLAG_SKIP_UPDATE | ENTITY_FLAG_DISABLE_COLLISION))) { continue; } diff --git a/src/common/FoliageTransform.inc.c b/src/common/FoliageTransform.inc.c index 52946bc275..d1b08821b9 100644 --- a/src/common/FoliageTransform.inc.c +++ b/src/common/FoliageTransform.inc.c @@ -60,13 +60,13 @@ ApiStatus N(TransformFoliage)(Evt* script, s32 isInitialCall) { Model* model = get_model_from_list_index(modelListIndex); Matrix4f mtx; - if (!(model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) { + if (!(model->flags & MODEL_FLAG_HAS_TRANSFORM_APPLIED)) { guTranslateF(model->transformMatrix, 0.0f, dy, 0.0f); N(foliage_setup_shear_mtx)(mtx, scale, dx, dz); guMtxCatF(mtx, model->transformMatrix, model->transformMatrix); guTranslateF(mtx, 0.0f, -dy, 0.0f); guMtxCatF(mtx, model->transformMatrix, model->transformMatrix); - model->flags |= (MODEL_FLAGS_HAS_TRANSFORM_APPLIED | MODEL_FLAGS_USES_TRANSFORM_MATRIX); + model->flags |= (MODEL_FLAG_HAS_TRANSFORM_APPLIED | MODEL_FLAG_USES_TRANSFORM_MATRIX); } else { guTranslateF(mtx, 0.0f, dy, 0.0f); guMtxCatF(mtx, model->transformMatrix, model->transformMatrix); diff --git a/src/draw_box.c b/src/draw_box.c index 2ee7dcc00a..ccd7d7eb5f 100644 --- a/src/draw_box.c +++ b/src/draw_box.c @@ -430,7 +430,7 @@ s32 draw_box(s32 flags, WindowStyle windowStyle, s32 posX, s32 posY, s32 posZ, s return TRUE; } - if (flags & DRAW_FLAGS_ROTSCALE) { + if (flags & DRAW_FLAG_ROTSCALE) { quads = gBoxQuadBuffer[gBoxQuadIndex++]; if (gBoxQuadIndex > 20) { gBoxQuadIndex = 0; @@ -442,7 +442,7 @@ s32 draw_box(s32 flags, WindowStyle windowStyle, s32 posX, s32 posY, s32 posZ, s gDPSetBlendColor(gMasterGfxPos++, 0, 0, 0, 0); gDPSetFogColor(gMasterGfxPos++, 0, 0, 0, darkening); gDPSetRenderMode(gMasterGfxPos++, GBL_c1(G_BL_CLR_BL, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA), G_RM_XLU_SURF2); - if (!(flags & DRAW_FLAGS_NO_CLIP)) { + if (!(flags & DRAW_FLAG_NO_CLIP)) { gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); } @@ -487,7 +487,7 @@ s32 draw_box(s32 flags, WindowStyle windowStyle, s32 posX, s32 posY, s32 posZ, s guTranslateF(mtx2, -160.0f, -120.0f, -320.0f); guMtxCatF(mtx1, mtx2, mtx1); gSPClearGeometryMode(gMasterGfxPos++, G_CULL_BOTH | G_LIGHTING); - if (flags & DRAW_FLAGS_CULL_BACK) { + if (flags & DRAW_FLAG_CULL_BACK) { gSPSetGeometryMode(gMasterGfxPos++, G_CULL_BACK); } guMtxF2L(mtx1, &gDisplayContext->matrixStack[gMatrixListPos]); @@ -520,7 +520,7 @@ s32 draw_box(s32 flags, WindowStyle windowStyle, s32 posX, s32 posY, s32 posZ, s break; } - if (flags & DRAW_FLAGS_ANIMATED_BACKGROUND) { + if (flags & DRAW_FLAG_ANIMATED_BACKGROUND) { bgScrollOffsetY = (gGameStatusPtr->frameCounter * 4) & 0x1FF; bgScrollOffsetX = 511 - bgScrollOffsetY; gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, diff --git a/src/e20eb0.c b/src/e20eb0.c index 313d9bfb00..87bb31fa71 100644 --- a/src/e20eb0.c +++ b/src/e20eb0.c @@ -45,7 +45,7 @@ void func_802B70B4(void) { D_802B79A8_E21858->unk_2A = 0; D_802B79A8_E21858->scale = 0.1f; TalkNotificationCallback = func_802B742C; - playerStatus->animFlags |= PA_FLAGS_SPEECH_PROMPT_AVAILABLE; + playerStatus->animFlags |= PA_FLAG_SPEECH_PROMPT_AVAILABLE; temp = D_802B79A8_E21858; temp->unk_2A = 0; temp->scale = 0.4f; @@ -57,7 +57,7 @@ void func_802B71C8(void) { FoldImageRecPart sp20; Matrix4f sp38, sp78; - if (gPlayerStatus.animFlags & PA_FLAGS_SPEECH_PROMPT_AVAILABLE) { + if (gPlayerStatus.animFlags & PA_FLAG_SPEECH_PROMPT_AVAILABLE) { guScaleF(sp38, D_802B79A8_E21858->scale, D_802B79A8_E21858->scale, D_802B79A8_E21858->scale); guRotateF(sp78, D_802B79A8_E21858->unk_10 - gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); guMtxCatF(sp38, sp78, sp38); @@ -91,12 +91,12 @@ void func_802B742C(void) { f32 unk10; Npc* npc; - if (((playerStatus->flags & (PS_FLAGS_HAS_CONVERSATION_NPC | PS_FLAGS_ENTERING_BATTLE | PS_FLAGS_PAUSED)) - != PS_FLAGS_HAS_CONVERSATION_NPC) || + if (((playerStatus->flags & (PS_FLAG_HAS_CONVERSATION_NPC | PS_FLAG_ENTERING_BATTLE | PS_FLAG_PAUSED)) + != PS_FLAG_HAS_CONVERSATION_NPC) || (gEncounterState == ENCOUNTER_STATE_CONVERSATION) || - (playerStatus->animFlags & PA_FLAGS_USING_WATT) || + (playerStatus->animFlags & PA_FLAG_USING_WATT) || (playerStatus->inputEnabledCounter != 0) || - (playerStatus->animFlags & PA_FLAGS_SPINNING)) + (playerStatus->animFlags & PA_FLAG_SPINNING)) { D_802B79A8_E21858->unk_2A = 3; } @@ -137,7 +137,7 @@ void func_802B742C(void) { if ((unk10 >= 70.0f && unk10 <= 110.0f) || (unk10 >= 250.0f && unk10 <= 290.0f)) { TalkNotificationCallback = NULL; playerStatus->encounteredNPC = NULL; - playerStatus->animFlags &= ~PA_FLAGS_SPEECH_PROMPT_AVAILABLE; + playerStatus->animFlags &= ~PA_FLAG_SPEECH_PROMPT_AVAILABLE; return; } var_a2 = e20eb0_UnkAngleFunc1(unk10); diff --git a/src/effects.c b/src/effects.c index e2f26ae184..ec33c60c57 100644 --- a/src/effects.c +++ b/src/effects.c @@ -211,8 +211,8 @@ void update_effects(void) { for (i = 0, effectGraphics = gEffectGraphicsData; i < ARRAY_COUNT(gEffectGraphicsData); i++, effectGraphics++) { if (effectGraphics->flags & FX_GRAPHICS_ENABLED) { - if (!(effectGraphics->flags & FX_GRAPHICS_FLAGS_2)) { - effectGraphics->flags |= FX_GRAPHICS_FLAGS_2; + if (!(effectGraphics->flags & FX_GRAPHICS_FLAG_2)) { + effectGraphics->flags |= FX_GRAPHICS_FLAG_2; effectGraphics->freeDelay = 3; } } @@ -221,18 +221,18 @@ void update_effects(void) { for (i = 0; i < ARRAY_COUNT(gEffectInstances); i++) { EffectInstance* effectInstance = gEffectInstances[i]; - if (effectInstance != NULL && (effectInstance->flags & EFFECT_INSTANCE_FLAGS_1)) { - effectInstance->graphics->flags &= ~FX_GRAPHICS_FLAGS_2; + if (effectInstance != NULL && (effectInstance->flags & EFFECT_INSTANCE_FLAG_1)) { + effectInstance->graphics->flags &= ~FX_GRAPHICS_FLAG_2; if (gGameStatusPtr->isBattle) { - if (effectInstance->flags & EFFECT_INSTANCE_FLAGS_4) { + if (effectInstance->flags & EFFECT_INSTANCE_FLAG_4) { effectInstance->graphics->update(effectInstance); - effectInstance->flags |= EFFECT_INSTANCE_FLAGS_8; + effectInstance->flags |= EFFECT_INSTANCE_FLAG_8; } } else { - if (!(effectInstance->flags & EFFECT_INSTANCE_FLAGS_4)) { + if (!(effectInstance->flags & EFFECT_INSTANCE_FLAG_4)) { effectInstance->graphics->update(effectInstance); - effectInstance->flags |= EFFECT_INSTANCE_FLAGS_8; + effectInstance->flags |= EFFECT_INSTANCE_FLAG_8; } } } @@ -240,7 +240,7 @@ void update_effects(void) { for (i = 0, effectGraphics = gEffectGraphicsData; i < ARRAY_COUNT(gEffectGraphicsData); i++, effectGraphics++) { if (effectGraphics->flags & FX_GRAPHICS_ENABLED) { - if (effectGraphics->flags & FX_GRAPHICS_FLAGS_2) { + if (effectGraphics->flags & FX_GRAPHICS_FLAG_2) { if (effectGraphics->freeDelay != 0) { effectGraphics->freeDelay--; } else { @@ -283,15 +283,15 @@ void render_effects_UI(void) { EffectInstance* effectInstance = gEffectInstances[i]; if (effectInstance != NULL) { - if (effectInstance->flags & EFFECT_INSTANCE_FLAGS_1) { - if (effectInstance->flags & EFFECT_INSTANCE_FLAGS_8) { + if (effectInstance->flags & EFFECT_INSTANCE_FLAG_1) { + if (effectInstance->flags & EFFECT_INSTANCE_FLAG_8) { void (*renderUI)(EffectInstance* effect); - if (gGameStatusPtr->isBattle && !(effectInstance->flags & EFFECT_INSTANCE_FLAGS_4)) { + if (gGameStatusPtr->isBattle && !(effectInstance->flags & EFFECT_INSTANCE_FLAG_4)) { continue; } - if (!gGameStatusPtr->isBattle && effectInstance->flags & EFFECT_INSTANCE_FLAGS_4) { + if (!gGameStatusPtr->isBattle && effectInstance->flags & EFFECT_INSTANCE_FLAG_4) { continue; } @@ -314,7 +314,7 @@ void render_effects_UI(void) { gSPClipRatio(gMasterGfxPos++, FRUSTRATIO_2); cond = FALSE; - if (!(camera->flags & CAMERA_FLAGS_ORTHO)) { + if (!(camera->flags & CAMERA_FLAG_ORTHO)) { gSPPerspNormalize(gMasterGfxPos++, camera->perspNorm); gSPMatrix(gMasterGfxPos++, &gDisplayContext->camPerspMatrix[gCurrentCameraID], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); diff --git a/src/effects/chapter_change.c b/src/effects/chapter_change.c index 45b8f5f123..dc7ca2eb1b 100644 --- a/src/effects/chapter_change.c +++ b/src/effects/chapter_change.c @@ -182,8 +182,8 @@ void chapter_change_init(EffectInstance* effect) { void chapter_change_update(EffectInstance* effect) { ChapterChangeFXData* data = effect->data.chapterChange; - if (effect->flags & EFFECT_INSTANCE_FLAGS_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAGS_10; + if (effect->flags & EFFECT_INSTANCE_FLAG_10) { + effect->flags &= ~EFFECT_INSTANCE_FLAG_10; data->timeLeft = 16; } diff --git a/src/effects/energy_orb_wave.c b/src/effects/energy_orb_wave.c index 7c476701ec..e9e042e7ae 100644 --- a/src/effects/energy_orb_wave.c +++ b/src/effects/energy_orb_wave.c @@ -88,8 +88,8 @@ void energy_orb_wave_update(EffectInstance* effect) { u16 var_4; s32 var_3; - if (effect->flags & EFFECT_INSTANCE_FLAGS_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAGS_10; + if (effect->flags & EFFECT_INSTANCE_FLAG_10) { + effect->flags &= ~EFFECT_INSTANCE_FLAG_10; data->unk_10 = 30; } diff --git a/src/effects/firework_rocket.c b/src/effects/firework_rocket.c index f4fcbf1b59..abb274e620 100644 --- a/src/effects/firework_rocket.c +++ b/src/effects/firework_rocket.c @@ -147,8 +147,8 @@ void firework_rocket_update(EffectInstance* effect) { s32 lifeTime; s32 i; - if (effect->flags & EFFECT_INSTANCE_FLAGS_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAGS_10; + if (effect->flags & EFFECT_INSTANCE_FLAG_10) { + effect->flags &= ~EFFECT_INSTANCE_FLAG_10; data->timeLeft = 16; } diff --git a/src/effects/ice_shard.c b/src/effects/ice_shard.c index adaf2d21b9..46abb41d52 100644 --- a/src/effects/ice_shard.c +++ b/src/effects/ice_shard.c @@ -76,8 +76,8 @@ void ice_shard_update(EffectInstance* effect) { IceShardFXData* data = effect->data.iceShard; s32 unk_00 = data->unk_00; - if (effect->flags & EFFECT_INSTANCE_FLAGS_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAGS_10; + if (effect->flags & EFFECT_INSTANCE_FLAG_10) { + effect->flags &= ~EFFECT_INSTANCE_FLAG_10; data->unk_10 = 16; } diff --git a/src/effects/lightning_bolt.c b/src/effects/lightning_bolt.c index d424a2b9df..954a8167a2 100644 --- a/src/effects/lightning_bolt.c +++ b/src/effects/lightning_bolt.c @@ -120,8 +120,8 @@ void lightning_bolt_update(EffectInstance* effect) { LightningBoltFXData* data = effect->data.lightningBolt; s32 type = data->type; - if (effect->flags & EFFECT_INSTANCE_FLAGS_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAGS_10; + if (effect->flags & EFFECT_INSTANCE_FLAG_10) { + effect->flags &= ~EFFECT_INSTANCE_FLAG_10; data->timeLeft = 16; } diff --git a/src/effects/misc_particles.c b/src/effects/misc_particles.c index 26cae70977..f3b4f8f1cc 100644 --- a/src/effects/misc_particles.c +++ b/src/effects/misc_particles.c @@ -160,8 +160,8 @@ void misc_particles_update(EffectInstance* effect) { f32 temp_cos; s32 i; - if (effect->flags & EFFECT_INSTANCE_FLAGS_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAGS_10; + if (effect->flags & EFFECT_INSTANCE_FLAG_10) { + effect->flags &= ~EFFECT_INSTANCE_FLAG_10; particle->timeLeft = 16; } diff --git a/src/effects/partner_buff.c b/src/effects/partner_buff.c index bfa7357f25..76261678c1 100644 --- a/src/effects/partner_buff.c +++ b/src/effects/partner_buff.c @@ -87,8 +87,8 @@ void partner_buff_update(EffectInstance* effect) { s32 time; s32 i; - if (effect->flags & EFFECT_INSTANCE_FLAGS_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAGS_10; + if (effect->flags & EFFECT_INSTANCE_FLAG_10) { + effect->flags &= ~EFFECT_INSTANCE_FLAG_10; data->timeLeft = 16; } if (data->timeLeft < 1000) { diff --git a/src/effects/quizmo_assistant.c b/src/effects/quizmo_assistant.c index d8830ce1b0..beae5ccd66 100644 --- a/src/effects/quizmo_assistant.c +++ b/src/effects/quizmo_assistant.c @@ -63,8 +63,8 @@ void quizmo_assistant_init(EffectInstance* effect) { void quizmo_assistant_update(EffectInstance* effect) { QuizmoAssistantFXData* data = effect->data.quizmoAssistant; - if (effect->flags & EFFECT_INSTANCE_FLAGS_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAGS_10; + if (effect->flags & EFFECT_INSTANCE_FLAG_10) { + effect->flags &= ~EFFECT_INSTANCE_FLAG_10; data->vanishTimer = 16; } diff --git a/src/effects/shimmer_burst.c b/src/effects/shimmer_burst.c index b147a49f6e..4b55f63cf0 100644 --- a/src/effects/shimmer_burst.c +++ b/src/effects/shimmer_burst.c @@ -106,8 +106,8 @@ void shimmer_burst_update(EffectInstance* effect) { f32 unk_14; s32 i; - if (effect->flags & EFFECT_INSTANCE_FLAGS_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAGS_10; + if (effect->flags & EFFECT_INSTANCE_FLAG_10) { + effect->flags &= ~EFFECT_INSTANCE_FLAG_10; part->unk_38 = 16; } diff --git a/src/effects/shimmer_wave.c b/src/effects/shimmer_wave.c index 4de90eae4b..8358806d14 100644 --- a/src/effects/shimmer_wave.c +++ b/src/effects/shimmer_wave.c @@ -107,8 +107,8 @@ void shimmer_wave_update(EffectInstance* effect) { f32 unk_14; s32 i; - if (effect->flags & EFFECT_INSTANCE_FLAGS_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAGS_10; + if (effect->flags & EFFECT_INSTANCE_FLAG_10) { + effect->flags &= ~EFFECT_INSTANCE_FLAG_10; part->unk_38 = 16; } diff --git a/src/effects/snowman_doll.c b/src/effects/snowman_doll.c index 7f7b1f7fd0..1ddacabb88 100644 --- a/src/effects/snowman_doll.c +++ b/src/effects/snowman_doll.c @@ -125,8 +125,8 @@ void snowman_doll_update(EffectInstance* effect) { s32 unk_14; s32 unk_58; - if (effect->flags & EFFECT_INSTANCE_FLAGS_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAGS_10; + if (effect->flags & EFFECT_INSTANCE_FLAG_10) { + effect->flags &= ~EFFECT_INSTANCE_FLAG_10; data->unk_10 = 16; } diff --git a/src/effects/star_spirits_energy.c b/src/effects/star_spirits_energy.c index 62fdc589ef..c3dea84471 100644 --- a/src/effects/star_spirits_energy.c +++ b/src/effects/star_spirits_energy.c @@ -168,8 +168,8 @@ void star_spirits_energy_update(EffectInstance* effect) { u8 var_int_2; u8 var_int_3; - if (effect->flags & EFFECT_INSTANCE_FLAGS_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAGS_10; + if (effect->flags & EFFECT_INSTANCE_FLAG_10) { + effect->flags &= ~EFFECT_INSTANCE_FLAG_10; data->unk_14 = 16; } diff --git a/src/effects/sun.c b/src/effects/sun.c index fa4c33fb65..8911043ed3 100644 --- a/src/effects/sun.c +++ b/src/effects/sun.c @@ -76,8 +76,8 @@ void sun_update(EffectInstance* effect) { s32 time; s32 i; - if (effect->flags & EFFECT_INSTANCE_FLAGS_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAGS_10; + if (effect->flags & EFFECT_INSTANCE_FLAG_10) { + effect->flags &= ~EFFECT_INSTANCE_FLAG_10; data->timeLeft = 16; } if (data->timeLeft < 1000) { diff --git a/src/effects/throw_spiny.c b/src/effects/throw_spiny.c index b611832376..ed31c9fa91 100644 --- a/src/effects/throw_spiny.c +++ b/src/effects/throw_spiny.c @@ -91,8 +91,8 @@ void throw_spiny_update(EffectInstance* effectInstance) { f32 gravity; s32 lifeDuration; - if (effectInstance->flags & EFFECT_INSTANCE_FLAGS_10) { - effectInstance->flags &= ~EFFECT_INSTANCE_FLAGS_10; + if (effectInstance->flags & EFFECT_INSTANCE_FLAG_10) { + effectInstance->flags &= ~EFFECT_INSTANCE_FLAG_10; spinyObject->life = 16; } diff --git a/src/effects/underwater.c b/src/effects/underwater.c index 7151cd4ebe..e32f1423d4 100644 --- a/src/effects/underwater.c +++ b/src/effects/underwater.c @@ -68,8 +68,8 @@ void underwater_update(EffectInstance* effect) { s32 i; s32 j; - if (effect->flags & EFFECT_INSTANCE_FLAGS_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAGS_10; + if (effect->flags & EFFECT_INSTANCE_FLAG_10) { + effect->flags &= ~EFFECT_INSTANCE_FLAG_10; data->unk_10 = 32; } diff --git a/src/effects/waterfall.c b/src/effects/waterfall.c index 9e47ee0204..f385813104 100644 --- a/src/effects/waterfall.c +++ b/src/effects/waterfall.c @@ -66,8 +66,8 @@ void waterfall_update(EffectInstance* effect) { s32 unk_14; s32 i; - if (effect->flags & EFFECT_INSTANCE_FLAGS_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAGS_10; + if (effect->flags & EFFECT_INSTANCE_FLAG_10) { + effect->flags &= ~EFFECT_INSTANCE_FLAG_10; data->unk_10 = 16; } diff --git a/src/encounter.c b/src/encounter.c index da7f4f6537..79c3a7fedc 100644 --- a/src/encounter.c +++ b/src/encounter.c @@ -78,7 +78,7 @@ EvtScript D_80077E9C = { }; EnemyDrops D_80077EB8 = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 10, .itemDrops = { { @@ -161,7 +161,7 @@ EvtScript EnemyNpcDefeat = { EVT_CASE_EQ(OUTCOME_PLAYER_FLED) EVT_CALL(OnPlayerFled, 0) EVT_CASE_EQ(OUTCOME_ENEMY_FLED) - EVT_CALL(SetEnemyFlagBits, -1, ENEMY_FLAGS_FLED, 1) + EVT_CALL(SetEnemyFlagBits, -1, ENEMY_FLAG_FLED, 1) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_SWITCH EVT_RETURN @@ -332,8 +332,8 @@ ApiStatus MerleeUpdateFX(Evt* script, s32 isInitialCall) { if (D_800A0BB8 == 2) { WorldMerleeOrbEffect->data.energyOrbWave->scale = 0.00001f; WorldMerleeWaveEffect->data.energyOrbWave->scale = 0.00001f; - WorldMerleeOrbEffect->flags |= EFFECT_INSTANCE_FLAGS_10; - WorldMerleeWaveEffect->flags |= EFFECT_INSTANCE_FLAGS_10; + WorldMerleeOrbEffect->flags |= EFFECT_INSTANCE_FLAG_10; + WorldMerleeWaveEffect->flags |= EFFECT_INSTANCE_FLAG_10; return ApiStatus_DONE1; } @@ -509,9 +509,9 @@ void update_encounters_neutral(void) { currentEncounter->hitType = 0; currentEncounter->allowFleeing = FALSE; currentEncounter->dropWhackaBump = FALSE; - currentEncounter->flags &= ~ENCOUNTER_STATUS_FLAGS_1; - currentEncounter->flags &= ~ENCOUNTER_STATUS_FLAGS_2; - currentEncounter->flags &= ~ENCOUNTER_STATUS_FLAGS_4; + currentEncounter->flags &= ~ENCOUNTER_STATUS_FLAG_1; + currentEncounter->flags &= ~ENCOUNTER_STATUS_FLAG_2; + currentEncounter->flags &= ~ENCOUNTER_STATUS_FLAG_4; playerX = playerStatus->position.x; playerY = playerStatus->position.y; @@ -529,7 +529,7 @@ void update_encounters_neutral(void) { currentEncounter->battleTriggerCooldown--; } if (playerStatus->blinkTimer != 0) { - if (!(playerStatus->flags & PS_FLAGS_INPUT_DISABLED)) { + if (!(playerStatus->flags & PS_FLAG_INPUT_DISABLED)) { playerStatus->blinkTimer = currentEncounter->battleTriggerCooldown; } else { playerStatus->blinkTimer = 1; @@ -544,7 +544,7 @@ void update_encounters_neutral(void) { } for (i = 0; i < encounter->count; i++) { enemy = encounter->enemy[i]; - if (enemy == NULL || (enemy->flags & ENEMY_FLAGS_20)) { + if (enemy == NULL || (enemy->flags & ENEMY_FLAG_20)) { continue; } npc = get_npc_unsafe(enemy->npcID); @@ -558,10 +558,10 @@ void update_encounters_neutral(void) { if (aiPaused & 1) { npc->flags |= NPC_FLAG_80000000; - enemy->flags |= ENEMY_FLAGS_80000000; + enemy->flags |= ENEMY_FLAG_80000000; } else { npc->flags &= ~NPC_FLAG_80000000; - enemy->flags &= ~ENEMY_FLAGS_80000000; + enemy->flags &= ~ENEMY_FLAG_80000000; } script = get_script_by_id(enemy->auxScriptID); if (script != NULL) { @@ -571,7 +571,7 @@ void update_encounters_neutral(void) { if (script != NULL) { set_script_flags(script, EVT_FLAG_SUSPENDED); } - if (enemy->flags & ENEMY_FLAGS_80000) { + if (enemy->flags & ENEMY_FLAG_80000) { script = get_script_by_id(enemy->auxScriptID); if (script != NULL) { clear_script_flags(script, EVT_FLAG_SUSPENDED); @@ -581,11 +581,11 @@ void update_encounters_neutral(void) { clear_script_flags(script, EVT_FLAG_SUSPENDED); } } - } else if (!(enemy->flags & ENEMY_FLAGS_200000)) { + } else if (!(enemy->flags & ENEMY_FLAG_200000)) { get_screen_coords(gCurrentCameraID, npc->pos.x, npc->pos.y, npc->pos.z, &screenX, &screenY, &screenZ); - if ((screenX < -160 || screenX > 480 || screenY < -120 || screenY > 360 || screenZ < 0) && !(enemy->flags & ENEMY_FLAGS_1)) { + if ((screenX < -160 || screenX > 480 || screenY < -120 || screenY > 360 || screenZ < 0) && !(enemy->flags & ENEMY_FLAG_1)) { npc->flags |= NPC_FLAG_80000000; - enemy->flags |= ENEMY_FLAGS_80000000; + enemy->flags |= ENEMY_FLAG_80000000; script = get_script_by_id(enemy->auxScriptID); if (script != NULL) { set_script_flags(script, EVT_FLAG_SUSPENDED); @@ -596,7 +596,7 @@ void update_encounters_neutral(void) { } } else { npc->flags &= ~NPC_FLAG_80000000; - enemy->flags &= ~ENEMY_FLAGS_80000000; + enemy->flags &= ~ENEMY_FLAG_80000000; script = get_script_by_id(enemy->auxScriptID); if (script != NULL) { clear_script_flags(script, EVT_FLAG_SUSPENDED); @@ -608,7 +608,7 @@ void update_encounters_neutral(void) { } } else { npc->flags &= ~NPC_FLAG_80000000; - enemy->flags &= ~ENEMY_FLAGS_80000000; + enemy->flags &= ~ENEMY_FLAG_80000000; script = get_script_by_id(enemy->auxScriptID); if (script != NULL) { clear_script_flags(script, EVT_FLAG_SUSPENDED); @@ -619,11 +619,11 @@ void update_encounters_neutral(void) { } } - if (enemy->flags & ENEMY_FLAGS_80000000) { + if (enemy->flags & ENEMY_FLAG_80000000) { continue; } - if (enemy->flags & ENEMY_FLAGS_1) { - if (!(enemy->flags & ENEMY_FLAGS_400000)) { + if (enemy->flags & ENEMY_FLAG_1) { + if (!(enemy->flags & ENEMY_FLAG_400000)) { if (npc == playerStatus->encounteredNPC) { enemy->unk_E0 = npc->yaw; npc->yaw = atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z); @@ -651,16 +651,16 @@ void update_encounters_neutral(void) { if (currentEncounter->battleTriggerCooldown != 0 || gGameStatusPtr->debugEnemyContact == DEBUG_CONTACT_CANT_TOUCH || - (playerStatus->flags & PS_FLAGS_ARMS_RAISED) || + (playerStatus->flags & PS_FLAG_ARMS_RAISED) || (gOverrideFlags & GLOBAL_OVERRIDES_40) || gPartnerActionStatus.actingPartner == PARTNER_BOW || - (enemy->flags & ENEMY_FLAGS_1) || + (enemy->flags & ENEMY_FLAG_1) || (gOverrideFlags & (GLOBAL_OVERRIDES_DISABLE_BATTLES | GLOBAL_OVERRIDES_200 | GLOBAL_OVERRIDES_400 | GLOBAL_OVERRIDES_800)) || is_picking_up_item()) { continue; } do { - if (!(enemy->flags & ENEMY_FLAGS_10000000) && partner_test_enemy_collision(npc) != 0) { + if (!(enemy->flags & ENEMY_FLAG_10000000) && partner_test_enemy_collision(npc) != 0) { currentEncounter->hitType = ENCOUNTER_TRIGGER_PARTNER; enemy->encountered = ENCOUNTER_TRIGGER_PARTNER; currentEncounter->currentEncounter = encounter; @@ -712,10 +712,10 @@ void update_encounters_neutral(void) { dx = npcX - x; dz = npcZ - z; distance = sqrtf(SQ(dx) + SQ(dz)); - if (enemy->flags & ENEMY_FLAGS_IGNORE_HAMMER) { + if (enemy->flags & ENEMY_FLAG_IGNORE_HAMMER) { break; } - if (!(playerStatus->flags & PS_FLAGS_HAMMER_CHECK)) { + if (!(playerStatus->flags & PS_FLAG_HAMMER_CHECK)) { break; } if (distance >= playerColRadius + colRadius || y > npcY + colHeight || npcY > y + playerColHeight) { @@ -778,7 +778,7 @@ void update_encounters_neutral(void) { case ACTION_STATE_TORNADO_POUND: x = playerX; z = playerZ; - if (!(enemy->flags & ENEMY_FLAGS_IGNORE_JUMP)) { + if (!(enemy->flags & ENEMY_FLAG_IGNORE_JUMP)) { if (distance >= playerColRadius + colRadius) { continue; } @@ -853,7 +853,7 @@ void update_encounters_neutral(void) { break; } - if (enemy->flags & ENEMY_FLAGS_IGNORE_TOUCH) { + if (enemy->flags & ENEMY_FLAG_IGNORE_TOUCH) { continue; } @@ -889,21 +889,21 @@ void update_encounters_neutral(void) { if (is_ability_active(ABILITY_DIZZY_ATTACK)) { cond = TRUE; } - if ((playerStatus->animFlags & PA_FLAGS_SPINNING) && !(enemy->flags & ENEMY_FLAGS_20000000) && cond) { + if ((playerStatus->animFlags & PA_FLAG_SPINNING) && !(enemy->flags & ENEMY_FLAG_20000000) && cond) { sfx_play_sound_at_position(SOUND_HIT_PLAYER_NORMAL, 0, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z); testX = playerStatus->position.x + ((npc->pos.x - playerStatus->position.x) * 0.5f); testY = playerStatus->position.y + (((npc->pos.y + npc->collisionHeight) - (playerStatus->position.y + playerStatus->colliderHeight)) * 0.5f); testZ = playerStatus->position.z + ((npc->pos.z - playerStatus->position.z) * 0.5f); fx_damage_stars(3, testX, testY, testZ, 0.0f, -1.0f, 0.0f, 3); currentEncounter->hitType = ENCOUNTER_TRIGGER_SPIN; - playerStatus->animFlags |= PA_FLAGS_DIZZY_ATTACK_ENCOUNTER; + playerStatus->animFlags |= PA_FLAG_DIZZY_ATTACK_ENCOUNTER; enemy->encountered = ENCOUNTER_TRIGGER_SPIN; currentEncounter->currentEncounter = encounter; currentEncounter->currentEnemy = enemy; currentEncounter->firstStrikeType = FIRST_STRIKE_NONE; } else { currentEncounter->hitType = ENCOUNTER_TRIGGER_NONE; - playerStatus->animFlags &= ~PA_FLAGS_DIZZY_ATTACK_ENCOUNTER; + playerStatus->animFlags &= ~PA_FLAG_DIZZY_ATTACK_ENCOUNTER; enemy->encountered = ENCOUNTER_TRIGGER_NONE; currentEncounter->currentEncounter = encounter; currentEncounter->currentEnemy = enemy; @@ -919,7 +919,7 @@ void update_encounters_neutral(void) { firstStrikeType = FIRST_STRIKE_ENEMY; } } - if (!is_ability_active(ABILITY_BUMP_ATTACK) || gPlayerData.level < enemy->npcSettings->level || (enemy->flags & ENEMY_FLAGS_40)) { + if (!is_ability_active(ABILITY_BUMP_ATTACK) || gPlayerData.level < enemy->npcSettings->level || (enemy->flags & ENEMY_FLAG_40)) { currentEncounter->firstStrikeType = firstStrikeType; } else { if (!currentEncounter->scriptedBattle) { @@ -950,13 +950,13 @@ START_BATTLE: if (enemy == NULL) { continue; } - if ((enemy->flags & ENEMY_FLAGS_8) && enemy != currentEncounter->currentEnemy) { + if ((enemy->flags & ENEMY_FLAG_8) && enemy != currentEncounter->currentEnemy) { continue; } - if (enemy->flags & ENEMY_FLAGS_20) { + if (enemy->flags & ENEMY_FLAG_20) { continue; } - if ((currentEnemy->flags & ENEMY_FLAGS_40) && enemy != currentEncounter->currentEnemy) { + if ((currentEnemy->flags & ENEMY_FLAG_40) && enemy != currentEncounter->currentEnemy) { continue; } @@ -976,7 +976,7 @@ START_BATTLE: playerStatus->actionState != ACTION_STATE_TORNADO_POUND && playerStatus->actionState != ACTION_STATE_SPIN_JUMP && playerStatus->actionState != ACTION_STATE_SPIN_POUND) { - playerStatus->flags |= PS_FLAGS_ENTERING_BATTLE; + playerStatus->flags |= PS_FLAG_ENTERING_BATTLE; } if (!is_ability_active(ABILITY_CHILL_OUT) && currentEncounter->firstStrikeType == FIRST_STRIKE_ENEMY) { set_action_state(ACTION_STATE_ENEMY_FIRST_STRIKE); @@ -1004,13 +1004,13 @@ START_BATTLE: if (enemy == NULL) { continue; } - if ((enemy->flags & ENEMY_FLAGS_8) && enemy != currentEncounter->currentEnemy) { + if ((enemy->flags & ENEMY_FLAG_8) && enemy != currentEncounter->currentEnemy) { continue; } - if (enemy->flags & ENEMY_FLAGS_20) { + if (enemy->flags & ENEMY_FLAG_20) { continue; } - if ((currentEnemy->flags & ENEMY_FLAGS_40) && enemy != currentEncounter->currentEnemy) { + if ((currentEnemy->flags & ENEMY_FLAG_40) && enemy != currentEncounter->currentEnemy) { continue; } @@ -1032,7 +1032,7 @@ START_BATTLE: currentEncounter->unk_94 = 0; D_8009A678 = 1; gEncounterSubState = ENCOUNTER_SUBSTATE_PRE_BATTLE_INIT; - playerStatus->flags |= PS_FLAGS_ENTERING_BATTLE; + playerStatus->flags |= PS_FLAG_ENTERING_BATTLE; break; case ENCOUNTER_TRIGGER_JUMP: currentEnemy = enemy = currentEncounter->currentEnemy; @@ -1051,13 +1051,13 @@ START_BATTLE: if (enemy == NULL) { continue; } - if ((enemy->flags & ENEMY_FLAGS_8) && enemy != currentEncounter->currentEnemy) { + if ((enemy->flags & ENEMY_FLAG_8) && enemy != currentEncounter->currentEnemy) { continue; } - if (enemy->flags & ENEMY_FLAGS_20) { + if (enemy->flags & ENEMY_FLAG_20) { continue; } - if ((currentEnemy->flags & ENEMY_FLAGS_40) && enemy != currentEncounter->currentEnemy) { + if ((currentEnemy->flags & ENEMY_FLAG_40) && enemy != currentEncounter->currentEnemy) { continue; } if (enemy->hitBytecode != NULL) { @@ -1074,7 +1074,7 @@ START_BATTLE: testY = playerStatus->position.y + (((npc->pos.y + npc->collisionHeight) - (playerStatus->position.y + playerStatus->colliderHeight)) * 0.5f); testZ = playerStatus->position.z + ((npc->pos.z - playerStatus->position.z) * 0.5f); fx_damage_stars(3, testX, testY, testZ, 0.0f, -1.0f, 0.0f, 3); - } else if (!(enemy->flags & ENEMY_FLAGS_1)) { + } else if (!(enemy->flags & ENEMY_FLAG_1)) { npc = get_npc_unsafe(enemy->npcID); cond2 = TRUE; testX = playerStatus->position.x + ((npc->pos.x - playerStatus->position.x) * 0.5f); @@ -1085,7 +1085,7 @@ START_BATTLE: } disable_player_input(); partner_disable_input(); - playerStatus->flags |= PS_FLAGS_ENTERING_BATTLE; + playerStatus->flags |= PS_FLAG_ENTERING_BATTLE; if (cond2) { start_bounce_a(); } @@ -1111,13 +1111,13 @@ START_BATTLE: if (enemy == NULL) { continue; } - if ((enemy->flags & ENEMY_FLAGS_8) && enemy != currentEncounter->currentEnemy) { + if ((enemy->flags & ENEMY_FLAG_8) && enemy != currentEncounter->currentEnemy) { continue; } - if (enemy->flags & ENEMY_FLAGS_20) { + if (enemy->flags & ENEMY_FLAG_20) { continue; } - if ((currentEnemy->flags & ENEMY_FLAGS_40) && enemy != currentEncounter->currentEnemy) { + if ((currentEnemy->flags & ENEMY_FLAG_40) && enemy != currentEncounter->currentEnemy) { continue; } if (enemy->hitBytecode != NULL) { @@ -1133,7 +1133,7 @@ START_BATTLE: testY = playerStatus->position.y + (((npc->pos.y + npc->collisionHeight) - (playerStatus->position.y + playerStatus->colliderHeight)) * 0.5f); testZ = playerStatus->position.z + ((npc->pos.z - playerStatus->position.z) * 0.5f); fx_damage_stars(3, testX, testY, testZ, 0.0f, -1.0f, 0.0f, 3); - } else if (!(enemy->flags & ENEMY_FLAGS_1)) { + } else if (!(enemy->flags & ENEMY_FLAG_1)) { npc = get_npc_unsafe(enemy->npcID); testX = playerStatus->position.x + ((npc->pos.x - playerStatus->position.x) * 0.5f); testY = playerStatus->position.y + (((npc->pos.y + npc->collisionHeight) - (playerStatus->position.y + playerStatus->colliderHeight)) * 0.5f); @@ -1146,7 +1146,7 @@ START_BATTLE: currentEncounter->fadeOutAmount = 0; currentEncounter->unk_94 = 0; currentEncounter->scriptedBattle = FALSE; - playerStatus->flags |= PS_FLAGS_ENTERING_BATTLE; + playerStatus->flags |= PS_FLAG_ENTERING_BATTLE; sfx_play_sound(0); gEncounterState = ENCOUNTER_STATE_PRE_BATTLE; D_8009A678 = 1; @@ -1193,13 +1193,13 @@ START_BATTLE: if (enemy == NULL) { continue; } - if ((enemy->flags & ENEMY_FLAGS_8) && enemy != currentEncounter->currentEnemy) { + if ((enemy->flags & ENEMY_FLAG_8) && enemy != currentEncounter->currentEnemy) { continue; } - if (enemy->flags & ENEMY_FLAGS_20) { + if (enemy->flags & ENEMY_FLAG_20) { continue; } - if ((currentEnemy->flags & ENEMY_FLAGS_40) && enemy != currentEncounter->currentEnemy) { + if ((currentEnemy->flags & ENEMY_FLAG_40) && enemy != currentEncounter->currentEnemy) { continue; } if (enemy->hitBytecode != NULL) { @@ -1215,7 +1215,7 @@ START_BATTLE: testY = npc->pos.y + npc->collisionHeight; testZ = npc->pos.z; fx_damage_stars(3, testX, testY, testZ, 0.0f, -1.0f, 0.0f, 3); - } else if (!(enemy->flags & ENEMY_FLAGS_1)) { + } else if (!(enemy->flags & ENEMY_FLAG_1)) { npc = get_npc_unsafe(enemy->npcID); testX = npc->pos.x; testY = npc->pos.y + npc->collisionHeight; @@ -1228,7 +1228,7 @@ START_BATTLE: currentEncounter->fadeOutAmount = 0; currentEncounter->unk_94 = 0; currentEncounter->scriptedBattle = FALSE; - playerStatus->flags |= PS_FLAGS_ENTERING_BATTLE; + playerStatus->flags |= PS_FLAG_ENTERING_BATTLE; sfx_play_sound(0); gEncounterState = ENCOUNTER_STATE_PRE_BATTLE; D_8009A678 = 1; @@ -1264,7 +1264,7 @@ void update_encounters_pre_battle(void) { if (encounter != NULL) { for (j = 0; j < encounter->count; j++) { enemy = encounter->enemy[j]; - if (enemy != NULL && !(enemy->flags & ENEMY_FLAGS_20)) { + if (enemy != NULL && !(enemy->flags & ENEMY_FLAG_20)) { if (enemy->aiScript != NULL) { suspend_all_script(enemy->aiScriptID); } @@ -1277,7 +1277,7 @@ void update_encounters_pre_battle(void) { } enemy = currentEncounter->currentEnemy; - if ((enemy->flags & ENEMY_FLAGS_100000) && !currentEncounter->scriptedBattle) { + if ((enemy->flags & ENEMY_FLAG_100000) && !currentEncounter->scriptedBattle) { currentEncounter->unk_94 = 0; currentEncounter->battleStartCountdown = 0; partner_handle_before_battle(); @@ -1298,7 +1298,7 @@ void update_encounters_pre_battle(void) { currentEncounter->hitType != ENCOUNTER_TRIGGER_SPIN && is_ability_active(ABILITY_FIRST_ATTACK) && (playerData->level >= enemy->npcSettings->level) && - !(enemy->flags & ENEMY_FLAGS_40) && + !(enemy->flags & ENEMY_FLAG_40) && !currentEncounter->scriptedBattle) { currentEncounter->unk_94 = 0; @@ -1312,14 +1312,14 @@ void update_encounters_pre_battle(void) { if (( (is_ability_active(ABILITY_BUMP_ATTACK)) && (playerData->level >= enemy->npcSettings->level) && - (!(enemy->flags & ENEMY_FLAGS_40) && + (!(enemy->flags & ENEMY_FLAG_40) && !(currentEncounter->scriptedBattle)) ) || ( (enemy = currentEncounter->currentEnemy, (currentEncounter->hitType == ENCOUNTER_TRIGGER_SPIN)) && (is_ability_active(ABILITY_SPIN_ATTACK)) && playerData->level >= enemy->npcSettings->level && - !(enemy->flags & ENEMY_FLAGS_40) && + !(enemy->flags & ENEMY_FLAG_40) && !currentEncounter->scriptedBattle )) { @@ -1360,8 +1360,8 @@ void update_encounters_pre_battle(void) { for (i = 0; i < encounter->count; i++) { enemy = encounter->enemy[i]; if (enemy != NULL && - ((!(enemy->flags & ENEMY_FLAGS_8) || enemy == currentEncounter->currentEnemy)) && - !(enemy->flags & ENEMY_FLAGS_20) && + ((!(enemy->flags & ENEMY_FLAG_8) || enemy == currentEncounter->currentEnemy)) && + !(enemy->flags & ENEMY_FLAG_20) && enemy->hitScript != NULL) { kill_script_by_ID(enemy->hitScriptID); @@ -1411,8 +1411,8 @@ void update_encounters_pre_battle(void) { for (i = 0; i < encounter->count; i++) { enemy = encounter->enemy[i]; if (enemy != NULL && - (!(enemy->flags & ENEMY_FLAGS_8) || enemy == currentEncounter->currentEnemy) && - !(enemy->flags & ENEMY_FLAGS_20) && + (!(enemy->flags & ENEMY_FLAG_8) || enemy == currentEncounter->currentEnemy) && + !(enemy->flags & ENEMY_FLAG_20) && (enemy->hitScript != 0)) { kill_script_by_ID(enemy->hitScriptID); @@ -1592,7 +1592,7 @@ void update_encounters_post_battle(void) { currentEncounter->fadeOutAccel = 1; currentEncounter->battleStartCountdown = 0; D_8009A670 = FALSE; - gPlayerStatus.flags &= ~PS_FLAGS_ENTERING_BATTLE; + gPlayerStatus.flags &= ~PS_FLAG_ENTERING_BATTLE; if (currentEncounter->hitType == ENCOUNTER_TRIGGER_SPIN) { D_8009A670 = TRUE; } @@ -1604,7 +1604,7 @@ void update_encounters_post_battle(void) { if (partnerActionStatus->partnerAction_unk_1) { D_8009A63C = TRUE; } else if (D_8009A670 == 0 && - !(gPlayerStatus.flags & (PS_FLAGS_JUMPING | PS_FLAGS_FALLING)) && + !(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); @@ -1657,10 +1657,10 @@ void update_encounters_post_battle(void) { if (enemy == NULL) { continue; } - if ((enemy->flags & ENEMY_FLAGS_8) && enemy != currentEncounter->currentEnemy) { + if ((enemy->flags & ENEMY_FLAG_8) && enemy != currentEncounter->currentEnemy) { continue; } - if (enemy->flags & ENEMY_FLAGS_20) { + if (enemy->flags & ENEMY_FLAG_20) { continue; } if (enemy->defeatBytecode != NULL) { @@ -1680,7 +1680,7 @@ void update_encounters_post_battle(void) { script->groupFlags = 0; } } - if (!(currentEncounter->flags & ENCOUNTER_STATUS_FLAGS_1) && !D_8009A63C && currentEncounter->battleStartCountdown == 0 && D_8009A670 == 0) { + if (!(currentEncounter->flags & ENCOUNTER_STATUS_FLAG_1) && !D_8009A63C && currentEncounter->battleStartCountdown == 0 && D_8009A670 == 0) { suggest_player_anim_clearUnkFlag(0x10032); } gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_WON_WAIT; @@ -1704,10 +1704,10 @@ void update_encounters_post_battle(void) { if (enemy == NULL) { continue; } - if ((enemy->flags & ENEMY_FLAGS_8) && enemy != currentEncounter->currentEnemy) { + if ((enemy->flags & ENEMY_FLAG_8) && enemy != currentEncounter->currentEnemy) { continue; } - if (enemy->flags & ENEMY_FLAGS_20) { + if (enemy->flags & ENEMY_FLAG_20) { continue; } if (does_script_exist(enemy->defeatScriptID)) { @@ -1717,7 +1717,7 @@ void update_encounters_post_battle(void) { } } if (!cond) { - if (!(currentEncounter->flags & ENCOUNTER_STATUS_FLAGS_1) && !D_8009A63C && currentEncounter->battleStartCountdown == 1) { + if (!(currentEncounter->flags & ENCOUNTER_STATUS_FLAG_1) && !D_8009A63C && currentEncounter->battleStartCountdown == 1) { suggest_player_anim_clearUnkFlag(ANIM_Mario_ThumbsUp); } encounter = currentEncounter->currentEncounter; @@ -1727,14 +1727,14 @@ void update_encounters_post_battle(void) { if (enemy == NULL) { continue; } - if (enemy->flags & ENEMY_FLAGS_4) { + if (enemy->flags & ENEMY_FLAG_4) { continue; } - if ((enemy->flags & ENEMY_FLAGS_8) && enemy != currentEncounter->currentEnemy) { + if ((enemy->flags & ENEMY_FLAG_8) && enemy != currentEncounter->currentEnemy) { continue; } - if (!(enemy->flags & ENEMY_FLAGS_1)) { - if (!(enemy->flags & ENEMY_FLAGS_FLED)) { + if (!(enemy->flags & ENEMY_FLAG_1)) { + if (!(enemy->flags & ENEMY_FLAG_FLED)) { set_defeated(currentEncounter->mapID, encounter->encounterID + i); } } @@ -1742,14 +1742,14 @@ void update_encounters_post_battle(void) { } currentEncounter->unk_94 = 0; - if (!(currentEncounter->flags & ENCOUNTER_STATUS_FLAGS_1) && !D_8009A63C && currentEncounter->battleStartCountdown == 1) { + if (!(currentEncounter->flags & ENCOUNTER_STATUS_FLAG_1) && !D_8009A63C && currentEncounter->battleStartCountdown == 1) { currentEncounter->unk_94 = 30; } gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_WON_TO_NEUTRAL; } break; case ENCOUNTER_SUBSTATE_POST_BATTLE_WON_TO_NEUTRAL: - if (!(currentEncounter->flags & ENCOUNTER_STATUS_FLAGS_2) && (gGameStatusPtr->stickX[0] != 0 || gGameStatusPtr->stickY[0] != 0)) { + if (!(currentEncounter->flags & ENCOUNTER_STATUS_FLAG_2) && (gGameStatusPtr->stickX[0] != 0 || gGameStatusPtr->stickY[0] != 0)) { currentEncounter->unk_94 = 0; } if (currentEncounter->unk_94 != 0) { @@ -1764,7 +1764,7 @@ void update_encounters_post_battle(void) { } for (j = 0; j < encounter->count; j++) { enemy = encounter->enemy[j]; - if (enemy == NULL || (enemy->flags & ENEMY_FLAGS_20)) { + if (enemy == NULL || (enemy->flags & ENEMY_FLAG_20)) { continue; } if (enemy->aiScript != NULL) { @@ -1795,11 +1795,11 @@ void update_encounters_post_battle(void) { if (enemy == NULL) { continue; } - if ((enemy->flags & ENEMY_FLAGS_8) && enemy != currentEncounter->currentEnemy) { + if ((enemy->flags & ENEMY_FLAG_8) && enemy != currentEncounter->currentEnemy) { continue; } - if (enemy->flags & ENEMY_FLAGS_20) { + if (enemy->flags & ENEMY_FLAG_20) { continue; } @@ -1834,7 +1834,7 @@ void update_encounters_post_battle(void) { if (enemy == NULL) { continue; } - if (!(enemy->flags & ENEMY_FLAGS_20)) { + if (!(enemy->flags & ENEMY_FLAG_20)) { if (does_script_exist(enemy->defeatScriptID)) { cond = TRUE; } else { @@ -1850,7 +1850,7 @@ void update_encounters_post_battle(void) { } for (j = 0; j < encounter->count; j++) { enemy = encounter->enemy[j]; - if (enemy == NULL || (enemy->flags & ENEMY_FLAGS_20)) { + if (enemy == NULL || (enemy->flags & ENEMY_FLAG_20)) { continue; } if (enemy->aiScript != NULL) { @@ -1864,7 +1864,7 @@ void update_encounters_post_battle(void) { enemy = currentEncounter->currentEnemy; encounter = currentEncounter->currentEncounter;; - if (!(enemy->flags & ENEMY_FLAGS_40000)) { + if (!(enemy->flags & ENEMY_FLAG_40000)) { enemy->aiPaused = 45; playerStatus->blinkTimer = 45; for (j = 0; j < encounter->count; j++) { @@ -1872,10 +1872,10 @@ void update_encounters_post_battle(void) { if (enemy == NULL) { continue; } - if (enemy->flags & ENEMY_FLAGS_20) { + if (enemy->flags & ENEMY_FLAG_20) { continue; } - if (enemy->flags & ENEMY_FLAGS_8) { + if (enemy->flags & ENEMY_FLAG_8) { continue; } enemy->aiPaused = 45; @@ -1884,7 +1884,7 @@ void update_encounters_post_battle(void) { } enemy = currentEncounter->currentEnemy; - if (!(currentEncounter->flags & ENCOUNTER_STATUS_FLAGS_4)) { + if (!(currentEncounter->flags & ENCOUNTER_STATUS_FLAG_4)) { script = start_script(&D_80077E9C, EVT_PRIORITY_A, 0); enemy->defeatScript = script; enemy->defeatScriptID = script->id; @@ -1929,11 +1929,11 @@ void update_encounters_post_battle(void) { if (enemy == NULL) { continue; } - if ((enemy->flags & ENEMY_FLAGS_8) && enemy != currentEncounter->currentEnemy) { + if ((enemy->flags & ENEMY_FLAG_8) && enemy != currentEncounter->currentEnemy) { continue; } - if (enemy->flags & ENEMY_FLAGS_20) { + if (enemy->flags & ENEMY_FLAG_20) { continue; } @@ -1967,7 +1967,7 @@ void update_encounters_post_battle(void) { if (enemy == NULL) { continue; } - if (!(enemy->flags & ENEMY_FLAGS_20)) { + if (!(enemy->flags & ENEMY_FLAG_20)) { if (does_script_exist(enemy->defeatScriptID)) { cond = TRUE; } else { @@ -1983,7 +1983,7 @@ void update_encounters_post_battle(void) { } for (j = 0; j < encounter->count; j++) { enemy = encounter->enemy[j]; - if (enemy == NULL || (enemy->flags & ENEMY_FLAGS_20)) { + if (enemy == NULL || (enemy->flags & ENEMY_FLAG_20)) { continue; } if (enemy->aiScript != NULL) { @@ -2021,7 +2021,7 @@ void update_encounters_post_battle(void) { } for (j = 0; j < encounter->count; j++) { enemy = encounter->enemy[j]; - if (enemy == NULL || (enemy->flags & ENEMY_FLAGS_20)) { + if (enemy == NULL || (enemy->flags & ENEMY_FLAG_20)) { continue; } if (enemy->aiScript != NULL) { @@ -2047,11 +2047,11 @@ void update_encounters_post_battle(void) { if (enemy == NULL) { continue; } - if ((enemy->flags & ENEMY_FLAGS_8) && enemy != currentEncounter->currentEnemy) { + if ((enemy->flags & ENEMY_FLAG_8) && enemy != currentEncounter->currentEnemy) { continue; } - if (enemy->flags & ENEMY_FLAGS_20) { + if (enemy->flags & ENEMY_FLAG_20) { continue; } @@ -2085,7 +2085,7 @@ void update_encounters_post_battle(void) { if (enemy == NULL) { continue; } - if (!(enemy->flags & ENEMY_FLAGS_20)) { + if (!(enemy->flags & ENEMY_FLAG_20)) { if (does_script_exist(enemy->defeatScriptID)) { cond = TRUE; } else { @@ -2101,7 +2101,7 @@ void update_encounters_post_battle(void) { } for (j = 0; j < encounter->count; j++) { enemy = encounter->enemy[j]; - if (enemy == NULL || (enemy->flags & ENEMY_FLAGS_20)) { + if (enemy == NULL || (enemy->flags & ENEMY_FLAG_20)) { continue; } if (enemy->aiScript != NULL) { @@ -2114,7 +2114,7 @@ void update_encounters_post_battle(void) { } enemy = currentEncounter->currentEnemy; - if (!(enemy->flags & ENEMY_FLAGS_4)) { + if (!(enemy->flags & ENEMY_FLAG_4)) { encounter = currentEncounter->currentEncounter; enemy->aiPaused = 45; playerStatus->blinkTimer = 45; @@ -2123,10 +2123,10 @@ void update_encounters_post_battle(void) { if (enemy == NULL) { continue; } - if (enemy->flags & ENEMY_FLAGS_20) { + if (enemy->flags & ENEMY_FLAG_20) { continue; } - if (enemy->flags & ENEMY_FLAGS_8) { + if (enemy->flags & ENEMY_FLAG_8) { continue; } enemy->aiPaused = 45; @@ -2153,7 +2153,7 @@ void update_encounters_post_battle(void) { } for (j = 0; j < encounter->count; j++) { enemy = encounter->enemy[j]; - if (enemy == NULL || (enemy->flags & ENEMY_FLAGS_20)) { + if (enemy == NULL || (enemy->flags & ENEMY_FLAG_20)) { continue; } @@ -2161,10 +2161,10 @@ void update_encounters_post_battle(void) { if (enemy->aiPaused != 0) { if (enemy->aiPaused & 1) { npc->flags |= NPC_FLAG_80000000; - enemy->flags |= ENEMY_FLAGS_80000000; + enemy->flags |= ENEMY_FLAG_80000000; } else { npc->flags &= ~NPC_FLAG_80000000; - enemy->flags &= ~ENEMY_FLAGS_80000000; + enemy->flags &= ~ENEMY_FLAG_80000000; } } } @@ -2264,7 +2264,7 @@ s32 check_conversation_trigger(void) { s32 i, j; playerStatus->encounteredNPC = NULL; - playerStatus->flags &= ~PS_FLAGS_HAS_CONVERSATION_NPC; + playerStatus->flags &= ~PS_FLAG_HAS_CONVERSATION_NPC; playerColliderHeight = playerStatus->colliderHeight; playerColliderRadius = playerStatus->colliderDiameter / 2; playerX = playerStatus->position.x; @@ -2294,15 +2294,15 @@ s32 check_conversation_trigger(void) { continue; } - if (encounterEnemy->flags & (ENEMY_FLAGS_80000000 | ENEMY_FLAGS_20)) { + if (encounterEnemy->flags & (ENEMY_FLAG_80000000 | ENEMY_FLAG_20)) { continue; } - if (!(encounterEnemy->flags & ENEMY_FLAGS_1)) { + if (!(encounterEnemy->flags & ENEMY_FLAG_1)) { continue; } - if ((encounterEnemy->flags & ENEMY_FLAGS_8000000) || encounterEnemy->interactBytecode == NULL) { + if ((encounterEnemy->flags & ENEMY_FLAG_8000000) || encounterEnemy->interactBytecode == NULL) { continue; } @@ -2339,7 +2339,7 @@ s32 check_conversation_trigger(void) { continue; } - if (!(encounterEnemy->flags & ENEMY_FLAGS_10000) && encounterNpc->flags & NPC_FLAG_20000000) { + if (!(encounterEnemy->flags & ENEMY_FLAG_10000) && encounterNpc->flags & NPC_FLAG_20000000) { xTemp = npcX; yTemp = npcY; zTemp = npcZ; @@ -2361,9 +2361,9 @@ s32 check_conversation_trigger(void) { } } - if (!(playerStatus->animFlags & PA_FLAGS_8BIT_MARIO) && npc != NULL && !is_picking_up_item()) { + if (!(playerStatus->animFlags & PA_FLAG_8BIT_MARIO) && npc != NULL && !is_picking_up_item()) { playerStatus->encounteredNPC = npc; - playerStatus->flags |= PS_FLAGS_HAS_CONVERSATION_NPC; + playerStatus->flags |= PS_FLAG_HAS_CONVERSATION_NPC; if (playerStatus->pressedButtons & BUTTON_A) { close_status_menu(); gCurrentEncounter.hitType = ENCOUNTER_TRIGGER_CONVERSATION; @@ -2525,7 +2525,7 @@ void create_encounters(void) { } bp->onUpdate = NULL; bp->onRender = NULL; - if (!(enemy->flags & ENEMY_FLAGS_20000)) { + if (!(enemy->flags & ENEMY_FLAG_20000)) { newNpcIndex = _create_npc_standard(bp, (AnimID*) npcData->extraAnimations); } else { newNpcIndex = _create_npc_partner(bp); @@ -2550,41 +2550,41 @@ void create_encounters(void) { } else { newNpc->shadowScale = 1.0f; } - if (enemy->flags & ENEMY_FLAGS_100) { + if (enemy->flags & ENEMY_FLAG_100) { newNpc->flags |= NPC_FLAG_40; } - if (enemy->flags & ENEMY_FLAGS_200) { + if (enemy->flags & ENEMY_FLAG_200) { newNpc->flags |= NPC_FLAG_100; } - if (enemy->flags & ENEMY_FLAGS_400) { + if (enemy->flags & ENEMY_FLAG_400) { newNpc->flags |= NPC_FLAG_8000; } - if (enemy->flags & ENEMY_FLAGS_800) { + if (enemy->flags & ENEMY_FLAG_800) { newNpc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->flags & ENEMY_FLAGS_GRAVITY) { + if (enemy->flags & ENEMY_FLAG_GRAVITY) { newNpc->flags |= NPC_FLAG_GRAVITY; } - if (!(enemy->flags & ENEMY_FLAGS_1)) { + if (!(enemy->flags & ENEMY_FLAG_1)) { newNpc->flags |= NPC_FLAG_100; } - if (enemy->flags & ENEMY_FLAGS_4000) { + if (enemy->flags & ENEMY_FLAG_4000) { newNpc->flags |= NPC_FLAG_1000000; } - if (enemy->flags & ENEMY_FLAGS_2000) { + if (enemy->flags & ENEMY_FLAG_2000) { newNpc->flags |= NPC_FLAG_NO_AI; } - if (enemy->flags & ENEMY_FLAGS_8000) { + if (enemy->flags & ENEMY_FLAG_8000) { newNpc->flags |= NPC_FLAG_10000000; } - if (enemy->flags & ENEMY_FLAGS_10000) { + if (enemy->flags & ENEMY_FLAG_10000) { newNpc->flags |= NPC_FLAG_20000000; } - if (enemy->flags & ENEMY_FLAGS_80) { + if (enemy->flags & ENEMY_FLAG_80) { newNpc->flags |= NPC_FLAG_LOCK_ANIMS; } enemy->scriptGroup = EVT_GROUP_08 | EVT_GROUP_02 | EVT_GROUP_01; - if (enemy->flags & ENEMY_FLAGS_1) { + if (enemy->flags & ENEMY_FLAG_1) { enemy->scriptGroup = EVT_GROUP_08 | EVT_GROUP_02; } if (npcSettings->otherAI != NULL) { @@ -2687,7 +2687,7 @@ void create_encounters(void) { if (enemy == NULL) { continue; } - if (!(enemy->flags & ENEMY_FLAGS_20)) { + if (!(enemy->flags & ENEMY_FLAG_20)) { if (enemy->aiBytecode != NULL) { script = start_script(enemy->aiBytecode, EVT_PRIORITY_A, 0); enemy->aiScript = script; @@ -2711,7 +2711,7 @@ void create_encounters(void) { if (enemy == NULL) { continue; } - if (!(enemy->flags & ENEMY_FLAGS_20)) { + if (!(enemy->flags & ENEMY_FLAG_20)) { if (enemy->auxBytecode != NULL) { script = start_script(enemy->auxBytecode, EVT_PRIORITY_A, 0); enemy->auxScript = script; diff --git a/src/encounter_api.c b/src/encounter_api.c index 2e7c20e53a..cacfef434c 100644 --- a/src/encounter_api.c +++ b/src/encounter_api.c @@ -212,7 +212,7 @@ void start_battle(Evt* script, s32 songID) { for (i = 0; i < encounter->count; i++) { enemy = encounter->enemy[i]; if ((enemy != NULL && ( - !(enemy->flags & ENEMY_FLAGS_8) || enemy == currentEncounter->currentEnemy) + !(enemy->flags & ENEMY_FLAG_8) || enemy == currentEncounter->currentEnemy) ) && enemy->hitBytecode != NULL) { Evt* hitEvtInstance; enemy->encountered = TRUE; @@ -280,7 +280,7 @@ ApiStatus StartBossBattle(Evt* script, s32 isInitialCall) { for (i = 0; i < encounter->count; i++) { enemy = encounter->enemy[i]; if ((enemy != NULL && ( - !(enemy->flags & ENEMY_FLAGS_8) || enemy == currentEncounter->currentEnemy) + !(enemy->flags & ENEMY_FLAG_8) || enemy == currentEncounter->currentEnemy) ) && enemy->hitBytecode != NULL) { enemy->encountered = TRUE; @@ -344,7 +344,7 @@ ApiStatus BindNpcAI(Evt* script, s32 isInitialCall) { enemy = get_enemy(id); } - if (enemy->flags & ENEMY_FLAGS_1) { + if (enemy->flags & ENEMY_FLAG_1) { groupFlags = EVT_GROUP_08 | EVT_GROUP_02; } else { groupFlags = EVT_GROUP_08 | EVT_GROUP_02 | EVT_GROUP_01; @@ -394,7 +394,7 @@ ApiStatus RestartNpcAI(Evt* script, s32 isInitialCall) { enemy = get_enemy(npcID); - if (enemy->flags & ENEMY_FLAGS_1) { + if (enemy->flags & ENEMY_FLAG_1) { groupFlags = EVT_GROUP_08 | EVT_GROUP_02; } else { groupFlags = EVT_GROUP_08 | EVT_GROUP_02 | EVT_GROUP_01; @@ -512,7 +512,7 @@ ApiStatus RestartNpcAux(Evt* script, s32 isInitialCall) { enemy = get_enemy(npcID); - if (enemy->flags & ENEMY_FLAGS_1) { + if (enemy->flags & ENEMY_FLAG_1) { groupFlags = EVT_GROUP_08 | EVT_GROUP_02; } else { groupFlags = EVT_GROUP_08 | EVT_GROUP_02 | EVT_GROUP_01; @@ -806,16 +806,16 @@ ApiStatus OnPlayerFled(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); s32 skipReaction = evt_get_variable(script, *script->ptrReadPos); - enemy->aiFlags |= ENEMY_AI_FLAGS_4; + enemy->aiFlags |= ENEMY_AI_FLAG_4; if (!skipReaction) { s32 unk; - if (!(enemy->aiFlags & ENEMY_AI_FLAGS_10)) { + if (!(enemy->aiFlags & ENEMY_AI_FLAG_10)) { npc->currentAnim = *enemy->animList; } - if (!(enemy->aiFlags & ENEMY_AI_FLAGS_8)) { + if (!(enemy->aiFlags & ENEMY_AI_FLAG_8)) { fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 0.0f, -20.0f, 40, &unk); } diff --git a/src/entity/Block.c b/src/entity/Block.c index 04ee85f320..7906f652d9 100644 --- a/src/entity/Block.c +++ b/src/entity/Block.c @@ -89,7 +89,7 @@ void entity_base_block_update_slow_sinking(Entity* entity) { f32 deltaY; if (entity->alpha < 255) { - entity->flags &= ~ENTITY_FLAGS_200000; + entity->flags &= ~ENTITY_FLAG_200000; return; } @@ -117,11 +117,11 @@ void entity_base_block_update_slow_sinking(Entity* entity) { if (data->initialY < entity->position.y) { entity->position.y = data->initialY; data->sinkingTimer = -1; - entity->flags &= ~ENTITY_FLAGS_200000; + entity->flags &= ~ENTITY_FLAG_200000; } } else { if (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_CEILING) { - if (!(playerStatus->flags & PS_FLAGS_JUMPING)) { + if (!(playerStatus->flags & PS_FLAG_JUMPING)) { Shadow* shadow = get_shadow_by_index(entity->shadowIndex); if (shadow != NULL) { f32 temp2 = entity->position.y - shadow->position.y; @@ -178,7 +178,7 @@ s32 entity_base_block_idle(Entity* entity) { s32 ret = 0; if (is_block_on_ground(entity) != 0) { - if (entity->flags & ENTITY_FLAGS_200000) { + if (entity->flags & ENTITY_FLAG_200000) { ret = 1; entity_base_block_update_slow_sinking(entity); if (data->item != -1) { @@ -197,7 +197,7 @@ void entity_base_block_init(Entity* entity) { data->item = -1; data->initialY = entity->position.y; data->sinkingTimer = -1; - entity->flags &= ~ENTITY_FLAGS_200000; + entity->flags &= ~ENTITY_FLAG_200000; } void entity_inactive_block_hit_init(Entity* entity) { @@ -266,7 +266,7 @@ void entity_MulticoinBlock_spawn_coin(Entity* entity) { data->empty = TRUE; set_entity_commandlist(get_entity_by_index(create_entity(&Entity_InertYellowBlock, (s32)entity->position.x, (s32)entity->position.y, (s32)entity->position.z, (s32)entity->rotation.y, MAKE_ENTITY_END)), Entity_CreatedInertBlock_Script); - entity->flags |= (ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_PENDING_INSTANCE_DELETE); + entity->flags |= (ENTITY_FLAG_DISABLE_COLLISION | ENTITY_FLAG_PENDING_INSTANCE_DELETE); } } @@ -295,7 +295,7 @@ void entity_MulticoinBlock_idle(Entity* entity) { entity_base_block_idle(entity); if (data->empty) { create_entity(&Entity_InertYellowBlock, (s32)entity->position.x, (s32)entity->position.y, (s32)entity->position.z, (s32)entity->rotation.y, MAKE_ENTITY_END); - entity->flags |= (ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_PENDING_INSTANCE_DELETE); + entity->flags |= (ENTITY_FLAG_DISABLE_COLLISION | ENTITY_FLAG_PENDING_INSTANCE_DELETE); } } @@ -305,7 +305,7 @@ void entity_MulticoinBlock_check_if_inactive(Entity* entity) { if (data->gameFlagIndex != 0xFFFF) { if (get_global_flag(data->gameFlagIndex) != 0) { create_entity(&Entity_InertYellowBlock, (s32)entity->position.x, (s32)entity->position.y, (s32)entity->position.z, (s32)entity->rotation.y, MAKE_ENTITY_END); - entity->flags |= (ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_PENDING_INSTANCE_DELETE); + entity->flags |= (ENTITY_FLAG_DISABLE_COLLISION | ENTITY_FLAG_PENDING_INSTANCE_DELETE); } } } @@ -331,7 +331,7 @@ s32 entity_block_handle_collision(Entity* entity) { return FALSE; } - if (playerStatus->flags & PS_FLAGS_JUMPING) { + if (playerStatus->flags & PS_FLAG_JUMPING) { exec_entity_commandlist(entity); } return TRUE; @@ -356,7 +356,7 @@ s32 entity_block_handle_collision(Entity* entity) { if (!(entity->collisionFlags & ENTITY_COLLISION_PLAYER_HAMMER)) { return TRUE; } - if (!(playerStatus->flags & PS_FLAGS_HAMMER_CHECK)) { + if (!(playerStatus->flags & PS_FLAG_HAMMER_CHECK)) { return TRUE; } } @@ -441,7 +441,7 @@ void entity_init_HammerBlock_small(Entity* entity) { data->item = -1; data->initialY = entity->position.y; data->sinkingTimer = -1; - entity->flags &= ~ENTITY_FLAGS_200000; + entity->flags &= ~ENTITY_FLAG_200000; entity->scale.x = 0.5f; entity->scale.y = 0.5f; entity->scale.z = 0.5f; @@ -487,22 +487,22 @@ EntityScript Entity_CreatedInertBlock_Script = { }; EntityScript Entity_BreakingBlock_Script = { es_RestartBoundScript - es_SetFlags(ENTITY_FLAGS_HIDDEN) - es_SetFlags(ENTITY_FLAGS_DISABLE_COLLISION) + es_SetFlags(ENTITY_FLAG_HIDDEN) + es_SetFlags(ENTITY_FLAG_DISABLE_COLLISION) es_Call(entity_breakable_block_create_shattering_entity) es_SetCallback(NULL, 1) - es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_SetFlags(ENTITY_FLAG_PENDING_INSTANCE_DELETE) es_End }; EntityScript Entity_BrickBlock_Script = { es_SetCallback(entity_BrickBlock_idle, 0) es_Call(entity_start_script) - es_SetFlags(ENTITY_FLAGS_HIDDEN) - es_SetFlags(ENTITY_FLAGS_DISABLE_COLLISION) + es_SetFlags(ENTITY_FLAG_HIDDEN) + es_SetFlags(ENTITY_FLAG_DISABLE_COLLISION) es_Call(entity_breakable_block_create_shattering_entity) es_PlaySound(SOUND_HIT_BLOCK) es_SetCallback(NULL, 2) - es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_SetFlags(ENTITY_FLAG_PENDING_INSTANCE_DELETE) es_End }; EntityScript Entity_Hammer1Block_Script = { @@ -544,7 +544,7 @@ EntityModelScript Entity_BrickBlock_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT( EntityModelScript Entity_PowBlock_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_PowBlock_Render, RENDER_MODE_SURFACE_OPA); EntityBlueprint Entity_InertYellowBlock = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_InertYellowBlock_RenderScript, .modelAnimationNodes = 0, @@ -557,7 +557,7 @@ EntityBlueprint Entity_InertYellowBlock = { }; EntityBlueprint Entity_InertRedBlock = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_InertRedBlock_RenderScript, .modelAnimationNodes = 0, @@ -570,7 +570,7 @@ EntityBlueprint Entity_InertRedBlock = { }; EntityBlueprint Entity_BrickBlock = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE | ENTITY_FLAG_80, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_BrickBlock_RenderScript, .modelAnimationNodes = 0, @@ -583,7 +583,7 @@ EntityBlueprint Entity_BrickBlock = { }; EntityBlueprint Entity_MulticoinBlock = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_MulticoinBrick_RenderScript, .modelAnimationNodes = 0, @@ -596,7 +596,7 @@ EntityBlueprint Entity_MulticoinBlock = { }; EntityBlueprint Entity_Hammer1Block = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE | ENTITY_FLAG_80, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_Hammer1Block_RenderScript, .modelAnimationNodes = 0, @@ -609,7 +609,7 @@ EntityBlueprint Entity_Hammer1Block = { }; EntityBlueprint Entity_Hammer1Block_WideX = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE | ENTITY_FLAG_80, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_Hammer1Block_RenderScript, .modelAnimationNodes = 0, @@ -622,7 +622,7 @@ EntityBlueprint Entity_Hammer1Block_WideX = { }; EntityBlueprint Entity_Hammer1Block_WideZ = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE | ENTITY_FLAG_80, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_Hammer1Block_RenderScript, .modelAnimationNodes = 0, @@ -635,7 +635,7 @@ EntityBlueprint Entity_Hammer1Block_WideZ = { }; EntityBlueprint Entity_Hammer1BlockTiny = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE | ENTITY_FLAG_80, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_Hammer1Block_RenderScript, .modelAnimationNodes = 0, @@ -648,7 +648,7 @@ EntityBlueprint Entity_Hammer1BlockTiny = { }; EntityBlueprint Entity_Hammer2Block = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE | ENTITY_FLAG_80, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_Hammer2Block_RenderScript, .modelAnimationNodes = 0, @@ -661,7 +661,7 @@ EntityBlueprint Entity_Hammer2Block = { }; EntityBlueprint Entity_Hammer2Block_WideX = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE | ENTITY_FLAG_80, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_Hammer2Block_RenderScript, .modelAnimationNodes = 0, @@ -674,7 +674,7 @@ EntityBlueprint Entity_Hammer2Block_WideX = { }; EntityBlueprint Entity_Hammer2Block_WideZ = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE | ENTITY_FLAG_80, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_Hammer2Block_RenderScript, .modelAnimationNodes = 0, @@ -687,7 +687,7 @@ EntityBlueprint Entity_Hammer2Block_WideZ = { }; EntityBlueprint Entity_Hammer2BlockTiny = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE | ENTITY_FLAG_80, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_Hammer2Block_RenderScript, .modelAnimationNodes = 0, @@ -700,7 +700,7 @@ EntityBlueprint Entity_Hammer2BlockTiny = { }; EntityBlueprint Entity_Hammer3Block = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE | ENTITY_FLAG_80, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_Hammer3Block_RenderScript, .modelAnimationNodes = 0, @@ -713,7 +713,7 @@ EntityBlueprint Entity_Hammer3Block = { }; EntityBlueprint Entity_Hammer3Block_WideX = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE | ENTITY_FLAG_80, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_Hammer3Block_RenderScript, .modelAnimationNodes = 0, @@ -726,7 +726,7 @@ EntityBlueprint Entity_Hammer3Block_WideX = { }; EntityBlueprint Entity_Hammer3Block_WideZ = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE | ENTITY_FLAG_80, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_Hammer3Block_RenderScript, .modelAnimationNodes = 0, @@ -739,7 +739,7 @@ EntityBlueprint Entity_Hammer3Block_WideZ = { }; EntityBlueprint Entity_Hammer3BlockTiny = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_80, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE | ENTITY_FLAG_80, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_Hammer3Block_RenderScript, .modelAnimationNodes = 0, @@ -752,7 +752,7 @@ EntityBlueprint Entity_Hammer3BlockTiny = { }; EntityBlueprint Entity_PushBlock = { - .flags = ENTITY_FLAGS_4000, + .flags = ENTITY_FLAG_4000, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_PushBlock_RenderScript, .modelAnimationNodes = 0, @@ -765,7 +765,7 @@ EntityBlueprint Entity_PushBlock = { }; EntityBlueprint Entity_PowBlock = { - .flags = ENTITY_FLAGS_4000, + .flags = ENTITY_FLAG_4000, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_PowBlock_RenderScript, .modelAnimationNodes = 0, diff --git a/src/entity/BlueWarpPipe.c b/src/entity/BlueWarpPipe.c index 9ea778b326..fd0bd3fd7f 100644 --- a/src/entity/BlueWarpPipe.c +++ b/src/entity/BlueWarpPipe.c @@ -61,7 +61,7 @@ void entity_BlueWarpPipe_idle(Entity* entity) { if ((entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) != 0) { gOverrideFlags |= GLOBAL_OVERRIDES_40; - if (!(playerStatus->flags & (PS_FLAGS_NO_STATIC_COLLISION | PS_FLAGS_INPUT_DISABLED))) { + if (!(playerStatus->flags & (PS_FLAG_NO_STATIC_COLLISION | PS_FLAG_INPUT_DISABLED))) { s32 stickAxisX = abs(playerStatus->stickAxis[0]); s32 stickAxisZ = playerStatus->stickAxis[1]; diff --git a/src/entity/Chest.c b/src/entity/Chest.c index a3ea7e58f1..3ed2fa8948 100644 --- a/src/entity/Chest.c +++ b/src/entity/Chest.c @@ -110,7 +110,7 @@ void entity_Chest_setupGfx(s32 entityIndex) { void entity_Chest_check_opened(Entity* entity) { ChestData* data = entity->dataBuf.chest; if ((data->gameFlagIndex != 0xFFFF) && (get_global_flag(data->gameFlagIndex) != 0)) { - entity->flags |= ENTITY_FLAGS_4000; + entity->flags |= ENTITY_FLAG_4000; data->itemID = -1; data->lidAngle = -28.7f; set_entity_commandlist(entity, Entity_Chest_ScriptOpened); @@ -125,22 +125,22 @@ void entity_Chest_idle(Entity* entity) { rotation = clamp_angle(180.0f - entity->rotation.y); angle = fabsf(rotation - clamp_angle(atan2(entity->position.x, entity->position.z, playerStatus->position.x, playerStatus->position.z))); - if ((!(playerStatus->animFlags & PA_FLAGS_USING_WATT)) && + if ((!(playerStatus->animFlags & PA_FLAG_USING_WATT)) && (!(entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR)) && ((angle <= 40.0f) || (angle >= 320.0f))) { - entity->flags |= ENTITY_FLAGS_SHOWS_INSPECT_PROMPT; - if ((playerStatus->animFlags & PA_FLAGS_INTERACT_PROMPT_AVAILABLE) && (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_WALL)) { + entity->flags |= ENTITY_FLAG_SHOWS_INSPECT_PROMPT; + if ((playerStatus->animFlags & PA_FLAG_INTERACT_PROMPT_AVAILABLE) && (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_WALL)) { exec_entity_commandlist(entity); data = entity->dataBuf.chest; data->state = 0; - entity->flags &= ~ENTITY_FLAGS_SHOWS_INSPECT_PROMPT; + entity->flags &= ~ENTITY_FLAG_SHOWS_INSPECT_PROMPT; if (data->itemID != 0) { disable_player_input(); } func_800EF3E4(); } } else { - entity->flags &= ~ENTITY_FLAGS_SHOWS_INSPECT_PROMPT; + entity->flags &= ~ENTITY_FLAG_SHOWS_INSPECT_PROMPT; } } @@ -242,7 +242,7 @@ void entity_Chest_close(Entity* entity) { data->postLidAnimDelay--; if (data->postLidAnimDelay == 0) { data->state++; - entity->flags |= ENTITY_FLAGS_4000; + entity->flags |= ENTITY_FLAG_4000; } break; case 4: @@ -484,7 +484,7 @@ EntityScript Entity_Chest_Script = { EntityModelScript Entity_Chest_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_Chest_RenderBox, RENDER_MODE_SURFACE_OPA); EntityBlueprint Entity_GiantChest = { - .flags = ENTITY_FLAGS_4000, + .flags = ENTITY_FLAG_4000, .typeDataSize = sizeof(ChestData), .renderCommandList = Entity_Chest_RenderScript, .modelAnimationNodes = 0, @@ -496,7 +496,7 @@ EntityBlueprint Entity_GiantChest = { .aabbSize = { 50, 45, 46 } }; EntityBlueprint Entity_Chest = { - .flags = ENTITY_FLAGS_8000 | ENTITY_FLAGS_4000, + .flags = ENTITY_FLAG_8000 | ENTITY_FLAG_4000, .typeDataSize = sizeof(ChestData), .renderCommandList = Entity_Chest_RenderScript, .modelAnimationNodes = 0, diff --git a/src/entity/HeartBlock.c b/src/entity/HeartBlock.c index 280c27ef80..98c9c25f49 100644 --- a/src/entity/HeartBlock.c +++ b/src/entity/HeartBlock.c @@ -93,7 +93,7 @@ void entity_HeartBlockContent__reset(Entity* entity) { entity->renderSetupFunc = entity_HeartBlockContent_setupGfx; entity->alpha = 255; data = entity->dataBuf.heartBlockContent; - entity->flags |= ENTITY_FLAGS_ALWAYS_FACE_CAMERA; + entity->flags |= ENTITY_FLAG_ALWAYS_FACE_CAMERA; blockEntity = get_entity_by_index(data->parentEntityIndex); if (data->unk_09 == 0) { @@ -158,7 +158,7 @@ void entity_HeartBlockContent_anim_idle(Entity* entity, s32 arg1) { exec_entity_commandlist(entity); disable_player_input(); gPlayerStatus.currentSpeed = 0; - gPlayerStatus.animFlags |= PA_FLAGS_RAISED_ARMS; + gPlayerStatus.animFlags |= PA_FLAG_RAISED_ARMS; set_time_freeze_mode(TIME_FREEZE_PARTIAL); gOverrideFlags |= GLOBAL_OVERRIDES_40; } @@ -191,7 +191,7 @@ void entity_HeartBlockContent__anim_heal(Entity* entity, s32 arg1) { data->riseVelocity -= 1.0f; if (data->riseVelocity <= 2.0f) { data->state++; - entity->flags &= ~ENTITY_FLAGS_ALWAYS_FACE_CAMERA; + entity->flags &= ~ENTITY_FLAG_ALWAYS_FACE_CAMERA; data->rotationRate = -10.0f; entity_set_render_script(entity, &Entity_HeartBlockContent_RenderScriptHit); entity->renderSetupFunc = entity_HeartBlockContent_setupGfx; @@ -276,7 +276,7 @@ void entity_HeartBlockContent__anim_heal(Entity* entity, s32 arg1) { } break; case 5: - playerStatus->animFlags &= ~PA_FLAGS_RAISED_ARMS; + playerStatus->animFlags &= ~PA_FLAG_RAISED_ARMS; enable_player_input(); set_time_freeze_mode(TIME_FREEZE_NORMAL); gOverrideFlags &= ~GLOBAL_OVERRIDES_40; @@ -430,7 +430,7 @@ EntityModelScript Entity_HeartBlockContent_RenderScriptAfterHit = STANDARD_ENTIT EntityModelScript Entity_HeartBlock_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_HeartBlock_Render, RENDER_MODE_SURFACE_XLU_LAYER3); EntityBlueprint Entity_HeartBlockFrame = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_HeartBlock_RenderScript, .modelAnimationNodes = 0, @@ -443,7 +443,7 @@ EntityBlueprint Entity_HeartBlockFrame = { }; EntityBlueprint Entity_HeartBlockContent = { - .flags = ENTITY_FLAGS_DISABLE_COLLISION, + .flags = ENTITY_FLAG_DISABLE_COLLISION, .typeDataSize = sizeof(HeartBlockContentData), .renderCommandList = Entity_HeartBlockContent_RenderScriptIdle, .modelAnimationNodes = 0, @@ -456,7 +456,7 @@ EntityBlueprint Entity_HeartBlockContent = { }; EntityBlueprint Entity_HeartBlock = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_HeartBlock_RenderScript, .modelAnimationNodes = 0, diff --git a/src/entity/HiddenPanel.c b/src/entity/HiddenPanel.c index b660662640..751c9d5147 100644 --- a/src/entity/HiddenPanel.c +++ b/src/entity/HiddenPanel.c @@ -44,8 +44,8 @@ void entity_HiddenPanel_set_ispy_notification(Entity* entity) { } void entity_HiddenPanel_hide(Entity* entity) { - entity->flags &= ~ENTITY_FLAGS_DISABLE_COLLISION; - entity->flags |= ENTITY_FLAGS_HIDDEN; + entity->flags &= ~ENTITY_FLAG_DISABLE_COLLISION; + entity->flags |= ENTITY_FLAG_HIDDEN; } void entity_HiddenPanel_idle(Entity* entity) { @@ -86,7 +86,7 @@ void entity_HiddenPanel_idle(Entity* entity) { data->riseVelocity = 0.5f; exec_entity_commandlist(entity); } else { - entity->flags |= ENTITY_FLAGS_DISABLE_COLLISION; + entity->flags |= ENTITY_FLAG_DISABLE_COLLISION; if (distToPlayer > 60) { data->riseVelocity = 0.5f; exec_entity_commandlist(entity); @@ -125,12 +125,12 @@ void entity_HiddenPanel_flip_over(Entity* entity) { data->rotationSpeed = 65.0f; set_time_freeze_mode(TIME_FREEZE_PARTIAL); disable_player_static_collisions(); - gPlayerStatusPtr->animFlags |= PA_FLAGS_OPENED_HIDDEN_PANEL; + gPlayerStatusPtr->animFlags |= PA_FLAG_OPENED_HIDDEN_PANEL; if (data->needSpawnItem) { data->needSpawnItem = FALSE; data->spawnedItemIndex = make_item_entity_nodelay(data->itemID, entity->position.x, entity->position.y + 2.0, entity->position.z, ITEM_SPAWN_MODE_TOSS_NEVER_VANISH, data->pickupVar); } - entity->flags &= ~ENTITY_FLAGS_HIDDEN; + entity->flags &= ~ENTITY_FLAG_HIDDEN; break; case 1: entity->position.y += data->riseVelocity * sin_rad(DEG_TO_RAD(data->riseInterpPhase)); @@ -208,7 +208,7 @@ void entity_HiddenPanel_flip_over(Entity* entity) { entity->position.y += 2.0f; break; case 10: - entity->flags &= ~ENTITY_FLAGS_HIDDEN; + entity->flags &= ~ENTITY_FLAG_HIDDEN; data->unk_02 = FALSE; data->state++; entity->position.y += 6.0f; @@ -219,7 +219,7 @@ void entity_HiddenPanel_flip_over(Entity* entity) { entity->position.y = data->initialY; data->timer = 1; data->state++; - entity->flags |= ENTITY_FLAGS_HIDDEN | ENTITY_FLAGS_DISABLE_COLLISION; + entity->flags |= ENTITY_FLAG_HIDDEN | ENTITY_FLAG_DISABLE_COLLISION; if (data->unk_02) { enable_player_static_collisions(); } @@ -232,9 +232,9 @@ void entity_HiddenPanel_flip_over(Entity* entity) { exec_entity_commandlist(entity); if (data->unk_02) { set_time_freeze_mode(TIME_FREEZE_NORMAL); - gPlayerStatusPtr->animFlags &= ~PA_FLAGS_OPENED_HIDDEN_PANEL; + gPlayerStatusPtr->animFlags &= ~PA_FLAG_OPENED_HIDDEN_PANEL; } - entity->flags &= ~ENTITY_FLAGS_DISABLE_COLLISION; + entity->flags &= ~ENTITY_FLAG_DISABLE_COLLISION; if (data->standingNpcIndex >= 0) { Npc* npc = get_npc_by_index(data->standingNpcIndex); npc->flags &= ~(NPC_FLAG_GRAVITY | NPC_FLAG_ENABLE_HIT_SCRIPT); @@ -253,7 +253,7 @@ void entity_HiddenPanel_flip_over(Entity* entity) { if (data->spawnedItemIndex >= 0) { ItemEntity* itemEntity = get_item_entity(data->spawnedItemIndex); if (itemEntity != NULL) { - if (itemEntity->flags & ITEM_ENTITY_FLAGS_10) { + if (itemEntity->flags & ITEM_ENTITY_FLAG_10) { data->spawnedItemPos.x = itemEntity->position.x; data->spawnedItemPos.y = itemEntity->position.y; data->spawnedItemPos.z = itemEntity->position.z; @@ -274,7 +274,7 @@ s32 entity_HiddenPanel_is_item_on_top(Entity* entity) { if (data->spawnedItemIndex >= 0) { ItemEntity* itemEntity = get_item_entity(data->spawnedItemIndex); if (itemEntity != NULL) { - if (itemEntity->flags & ITEM_ENTITY_FLAGS_10) { + if (itemEntity->flags & ITEM_ENTITY_FLAG_10) { if (fabs(entity->position.x - data->spawnedItemPos.x) <= 34.0) { if (fabs(entity->position.z - data->spawnedItemPos.z) <= 34.0) { return TRUE; @@ -341,7 +341,7 @@ EntityScript Entity_HiddenPanel_Script = { EntityModelScript ERS_HiddenPanel = { ems_SetRenderMode(RENDER_MODE_SURFACE_OPA) - ems_SetFlags(ENTITY_MODEL_FLAGS_10000) + ems_SetFlags(ENTITY_MODEL_FLAG_10000) ems_Draw(Gfx_HiddenPanel_Render, 60) ems_Restart ems_End @@ -349,14 +349,14 @@ EntityModelScript ERS_HiddenPanel = { EntityModelScript ERS_AltHiddenPanel = { ems_SetRenderMode(RENDER_MODE_SURFACE_OPA) - ems_SetFlags(ENTITY_MODEL_FLAGS_10000) + ems_SetFlags(ENTITY_MODEL_FLAG_10000) ems_Draw(Gfx_HiddenPanel_Render2, 60) ems_Restart ems_End }; EntityBlueprint Entity_HiddenPanel = { - .flags = ENTITY_FLAGS_HIDDEN, + .flags = ENTITY_FLAG_HIDDEN, .typeDataSize = sizeof(HiddenPanelData), .renderCommandList = ERS_HiddenPanel, .modelAnimationNodes = 0, diff --git a/src/entity/ItemBlock.c b/src/entity/ItemBlock.c index 027b8005bf..fefc5276fd 100644 --- a/src/entity/ItemBlock.c +++ b/src/entity/ItemBlock.c @@ -33,7 +33,7 @@ void entity_ItemBlock_idle(Entity* entity) { void entity_HiddenItemBlock_idle(Entity* entity) { s32 alpha = entity->alpha; - if (gPlayerStatus.animFlags & PA_FLAGS_USING_WATT) { + if (gPlayerStatus.animFlags & PA_FLAG_USING_WATT) { alpha += 32; if (alpha > 192) { alpha = 192; @@ -58,12 +58,12 @@ void entity_ItemBlock_spawn_item(Entity* entity) { BlockData* data = entity->dataBuf.block; s32 facingAngle; - if (data->item == 0 || (entity->flags & ENTITY_FLAGS_100000)) { + if (data->item == 0 || (entity->flags & ENTITY_FLAG_100000)) { return; } facingAngle = player_get_camera_facing_angle(); - entity->flags |= ENTITY_FLAGS_100000; + entity->flags |= ENTITY_FLAG_100000; if (data->item == ITEM_COIN) { make_item_entity(ITEM_COIN, entity->position.x, entity->position.y + 28.0, entity->position.z, @@ -101,9 +101,9 @@ void entity_HitItemBlock_show_inactive(Entity* entity) { BlockData* data = entity->dataBuf.block; inertEntity = get_entity_by_index(data->childEntityIndex); - inertEntity->flags &= ~ENTITY_FLAGS_HIDDEN; + inertEntity->flags &= ~ENTITY_FLAG_HIDDEN; inertShadow = get_shadow_by_index(inertEntity->shadowIndex); - inertShadow->flags &= ~ENTITY_FLAGS_HIDDEN; + inertShadow->flags &= ~ENTITY_FLAG_HIDDEN; } void entity_ItemBlock_check_if_inactive(Entity* entity) { @@ -146,18 +146,18 @@ void entity_ItemBlock_replace_with_inactive(Entity* entity) { // this child entity is the inert block childEntityIndex = create_entity(bp, (s32)entity->position.x, (s32)entity->position.y, (s32)entity->position.z, (s32)entity->rotation.y, MAKE_ENTITY_END); childEntity = get_entity_by_index(childEntityIndex); - childEntity->flags |= ENTITY_FLAGS_HIDDEN; + childEntity->flags |= ENTITY_FLAG_HIDDEN; - if (entity->flags & ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2) { - childEntity->flags |= ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2; + if (entity->flags & ENTITY_FLAG_DRAW_IF_CLOSE_HIDE_MODE2) { + childEntity->flags |= ENTITY_FLAG_DRAW_IF_CLOSE_HIDE_MODE2; } - if (entity->flags & ENTITY_FLAGS_HAS_DYNAMIC_SHADOW) { - childEntity->flags |= ENTITY_FLAGS_HAS_DYNAMIC_SHADOW; + if (entity->flags & ENTITY_FLAG_HAS_DYNAMIC_SHADOW) { + childEntity->flags |= ENTITY_FLAG_HAS_DYNAMIC_SHADOW; } shadow = get_shadow_by_index(childEntity->shadowIndex); - shadow->flags |= (ENTITY_FLAGS_SHADOW_POS_DIRTY | ENTITY_FLAGS_HIDDEN); + shadow->flags |= (ENTITY_FLAG_SHADOW_POS_DIRTY | ENTITY_FLAG_HIDDEN); isBlockOnGround = is_block_on_ground(entity); parentEntityType = get_entity_type(entity->listIndex); @@ -172,37 +172,37 @@ void entity_ItemBlock_replace_with_inactive(Entity* entity) { // child entity is now the animated block which appears before it turns inert childEntity = get_entity_by_index(create_entity(bp, (s32)entity->position.x, (s32)entity->position.y, (s32)entity->position.z, (s32)entity->rotation.y, MAKE_ENTITY_END)); childEntity->alpha = entity->alpha; - if ((entity->flags & ENTITY_FLAGS_HIDDEN) || (entity->alpha < 255)) { + if ((entity->flags & ENTITY_FLAG_HIDDEN) || (entity->alpha < 255)) { childEntity->alpha = 32; } - if (entity->flags & ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2) { - childEntity->flags |= ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2; + if (entity->flags & ENTITY_FLAG_DRAW_IF_CLOSE_HIDE_MODE2) { + childEntity->flags |= ENTITY_FLAG_DRAW_IF_CLOSE_HIDE_MODE2; } childData = childEntity->dataBuf.block; childData->childEntityIndex = childEntityIndex; - if (entity->flags & ENTITY_FLAGS_HAS_DYNAMIC_SHADOW) { - childEntity->flags |= ENTITY_FLAGS_HAS_DYNAMIC_SHADOW; + if (entity->flags & ENTITY_FLAG_HAS_DYNAMIC_SHADOW) { + childEntity->flags |= ENTITY_FLAG_HAS_DYNAMIC_SHADOW; } - entity->flags &= ~ENTITY_FLAGS_HAS_SHADOW; + entity->flags &= ~ENTITY_FLAG_HAS_SHADOW; shadow = get_shadow_by_index(entity->shadowIndex); - shadow->flags |= (ENTITY_FLAGS_FADING_AWAY | ENTITY_FLAGS_HIDDEN); + shadow->flags |= (ENTITY_FLAG_FADING_AWAY | ENTITY_FLAG_HIDDEN); shadow = get_shadow_by_index(childEntity->shadowIndex); - shadow->flags |= ENTITY_FLAGS_SHADOW_POS_DIRTY; + shadow->flags |= ENTITY_FLAG_SHADOW_POS_DIRTY; } void entity_HitItemBlock_hide(Entity* entity) { - entity->flags |= ENTITY_FLAGS_HIDDEN; - entity->flags &= ~ENTITY_FLAGS_HAS_SHADOW; - get_shadow_by_index(entity->shadowIndex)->flags |= (ENTITY_FLAGS_HIDDEN | ENTITY_FLAGS_FADING_AWAY); + entity->flags |= ENTITY_FLAG_HIDDEN; + entity->flags &= ~ENTITY_FLAG_HAS_SHADOW; + get_shadow_by_index(entity->shadowIndex)->flags |= (ENTITY_FLAG_HIDDEN | ENTITY_FLAG_FADING_AWAY); } s32 entity_TriggerBlock_start_bound_script(Entity* entity) { if (entity->boundScriptBytecode != NULL) { - entity->flags |= ENTITY_FLAGS_BOUND_SCRIPT_DIRTY; + entity->flags |= ENTITY_FLAG_BOUND_SCRIPT_DIRTY; return TRUE; } return FALSE; @@ -211,7 +211,7 @@ s32 entity_TriggerBlock_start_bound_script(Entity* entity) { void entity_TriggerBlock_disable_player_input(void) { disable_player_input(); gPlayerStatus.currentSpeed = 0.0f; - gPlayerStatus.flags |= PS_FLAGS_SCRIPTED_FALL; + gPlayerStatus.flags |= PS_FLAG_SCRIPTED_FALL; set_action_state(ACTION_STATE_FALLING); gravity_use_fall_parms(); } @@ -265,7 +265,7 @@ void entity_ItemlessBlock_init(Entity* entity) { EntityScript D_802EA310 = { es_SetCallback(NULL, 2) - es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_SetFlags(ENTITY_FLAG_PENDING_INSTANCE_DELETE) es_End }; @@ -277,9 +277,9 @@ EntityScript Entity_ItemBlock_Script = { es_Call(entity_ItemBlock_spawn_item) es_Call(entity_ItemBlock_replace_with_inactive) es_SetCallback(NULL, 1) - es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetFlags(ENTITY_FLAG_HIDDEN) es_SetCallback(NULL, 2) - es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_SetFlags(ENTITY_FLAG_PENDING_INSTANCE_DELETE) es_End }; EntityScript Entity_HiddenItemBlock_Script = { @@ -290,9 +290,9 @@ EntityScript Entity_HiddenItemBlock_Script = { es_Call(entity_ItemBlock_spawn_item) es_Call(entity_ItemBlock_replace_with_inactive) es_SetCallback(NULL, 1) - es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetFlags(ENTITY_FLAG_HIDDEN) es_SetCallback(NULL, 2) - es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_SetFlags(ENTITY_FLAG_PENDING_INSTANCE_DELETE) es_End }; EntityScript Entity_HitBlock_Script = { @@ -302,8 +302,8 @@ EntityScript Entity_HitBlock_Script = { es_Call(entity_HitItemBlock_hide) es_Call(entity_HitItemBlock_show_inactive) es_SetCallback(NULL, 1) - es_SetFlags(ENTITY_FLAGS_HIDDEN) - es_SetFlags(ENTITY_FLAGS_PENDING_FULL_DELETE) + es_SetFlags(ENTITY_FLAG_HIDDEN) + es_SetFlags(ENTITY_FLAG_PENDING_FULL_DELETE) es_End }; EntityScript Entity_TriggerBlock_Script = { @@ -316,11 +316,11 @@ EntityScript Entity_TriggerBlock_Script = { es_SetCallback(entity_inactive_block_recoil_anim, 0) es_Call(entity_TriggerBlock_start_bound_script) es_Call(entity_TriggerBlock_enable_player_input) - es_SetFlags(ENTITY_FLAGS_HIDDEN) - es_SetFlags(ENTITY_FLAGS_DISABLE_COLLISION) + es_SetFlags(ENTITY_FLAG_HIDDEN) + es_SetFlags(ENTITY_FLAG_DISABLE_COLLISION) es_Call(entity_TriggerBlock_start_bound_script_2) es_SetCallback(NULL, 2) - es_SetFlags(ENTITY_FLAGS_PENDING_FULL_DELETE) + es_SetFlags(ENTITY_FLAG_PENDING_FULL_DELETE) es_End }; @@ -334,7 +334,7 @@ EntityModelScript Entity_RedBlock_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(En EntityModelScript Entity_HiddenRedBlock_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_RedBlock_Render, RENDER_MODE_SURFACE_XLU_LAYER2); EntityBlueprint Entity_YellowBlock = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_YellowBlock_RenderScript, .modelAnimationNodes = 0, @@ -347,7 +347,7 @@ EntityBlueprint Entity_YellowBlock = { }; EntityBlueprint Entity_HiddenYellowBlock = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_HiddenYellowBlock_RenderScript, .modelAnimationNodes = 0, @@ -360,7 +360,7 @@ EntityBlueprint Entity_HiddenYellowBlock = { }; EntityBlueprint Entity_RedBlock = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_RedBlock_RenderScript, .modelAnimationNodes = 0, @@ -373,7 +373,7 @@ EntityBlueprint Entity_RedBlock = { }; EntityBlueprint Entity_HiddenRedBlock = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_HiddenRedBlock_RenderScript, .modelAnimationNodes = 0, @@ -386,7 +386,7 @@ EntityBlueprint Entity_HiddenRedBlock = { }; EntityBlueprint Entity_TriggerBlock = { - .flags = ENTITY_FLAGS_8000 | ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .flags = ENTITY_FLAG_8000 | ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE | ENTITY_FLAG_HAS_ANIMATED_MODEL, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_HitYellowBlock_AnimationIdle, .modelAnimationNodes = Entity_HitYellowBlock_Mesh, @@ -399,7 +399,7 @@ EntityBlueprint Entity_TriggerBlock = { }; EntityBlueprint Entity_HitGroundedYellowBlock = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE | ENTITY_FLAG_HAS_ANIMATED_MODEL, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_HitYellowBlock_AnimationIdle, .modelAnimationNodes = Entity_HitYellowBlock_Mesh, @@ -412,7 +412,7 @@ EntityBlueprint Entity_HitGroundedYellowBlock = { }; EntityBlueprint Entity_HitFloatingYellowBlock = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE | ENTITY_FLAG_HAS_ANIMATED_MODEL, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_HitFloatingYellowBlock_AnimationIdle, .modelAnimationNodes = Entity_HitFloatingYellowBlock_Mesh, @@ -425,7 +425,7 @@ EntityBlueprint Entity_HitFloatingYellowBlock = { }; EntityBlueprint Entity_HitRedBlock = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE | ENTITY_FLAG_HAS_ANIMATED_MODEL, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_HitRedBlock_AnimationHit, .modelAnimationNodes = Entity_HitRedBlock_Mesh, diff --git a/src/entity/SaveBlock.c b/src/entity/SaveBlock.c index fe6b95808a..f64ccabce1 100644 --- a/src/entity/SaveBlock.c +++ b/src/entity/SaveBlock.c @@ -165,7 +165,7 @@ EntityScript Entity_SaveBlock_ScriptResume = { EntityModelScript Entity_SaveBlock_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_SaveBlock_RenderNone, RENDER_MODE_SURFACE_XLU_LAYER3); EntityBlueprint Entity_SavePoint = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE, .typeDataSize = sizeof(SaveBlockData), .renderCommandList = Entity_SaveBlock_RenderScript, .modelAnimationNodes = 0, diff --git a/src/entity/Shadow.c b/src/entity/Shadow.c index a454f04bf4..b0067f84b7 100644 --- a/src/entity/Shadow.c +++ b/src/entity/Shadow.c @@ -9,7 +9,7 @@ void entity_Shadow_init(Shadow* shadow) { s32 entity_can_collide_with_jumping_player(Entity* entity) { if ((entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_CEILING) && - (gPlayerStatus.flags & PS_FLAGS_JUMPING)) { + (gPlayerStatus.flags & PS_FLAG_JUMPING)) { return TRUE; } return FALSE; @@ -78,7 +78,7 @@ EntityModelScript Entity_RenderNone_Script = { s32 D_802E9844_padding[] = { 0, 0, 0}; EntityModelScript Entity_CircularShadowA_Render = { - ems_SetFlags(ENTITY_MODEL_FLAGS_FOG_DISABLED) + ems_SetFlags(ENTITY_MODEL_FLAG_FOG_DISABLED) ems_SetRenderMode(RENDER_MODE_SHADOW) ems_Draw(Entity_RenderCircularShadow, 60) ems_Restart @@ -86,7 +86,7 @@ EntityModelScript Entity_CircularShadowA_Render = { }; EntityModelScript Entity_CircularShadowB_Render = { - ems_SetFlags(ENTITY_MODEL_FLAGS_FOG_DISABLED) + ems_SetFlags(ENTITY_MODEL_FLAG_FOG_DISABLED) ems_SetRenderMode(RENDER_MODE_SHADOW) ems_Draw(Entity_RenderCircularShadow, 60) ems_Restart @@ -94,7 +94,7 @@ EntityModelScript Entity_CircularShadowB_Render = { }; EntityModelScript Entity_SquareShadow_Render = { - ems_SetFlags(ENTITY_MODEL_FLAGS_FOG_DISABLED) + ems_SetFlags(ENTITY_MODEL_FLAG_FOG_DISABLED) ems_SetRenderMode(RENDER_MODE_SHADOW) ems_Draw(Entity_RenderSquareShadow, 60) ems_Restart @@ -102,7 +102,7 @@ EntityModelScript Entity_SquareShadow_Render = { }; ShadowBlueprint CircularShadowA = { - .flags = ENTITY_FLAGS_DISABLE_COLLISION, + .flags = ENTITY_FLAG_DISABLE_COLLISION, .renderCommandList = Entity_CircularShadowA_Render, .animModelNode = NULL, .onCreateCallback = entity_Shadow_init, @@ -111,7 +111,7 @@ ShadowBlueprint CircularShadowA = { }; ShadowBlueprint CircularShadowB = { - .flags = ENTITY_FLAGS_DISABLE_COLLISION, + .flags = ENTITY_FLAG_DISABLE_COLLISION, .renderCommandList = Entity_CircularShadowB_Render, .animModelNode = NULL, .onCreateCallback = entity_Shadow_init, @@ -120,7 +120,7 @@ ShadowBlueprint CircularShadowB = { }; ShadowBlueprint SquareShadow = { - .flags = ENTITY_FLAGS_DISABLE_COLLISION, + .flags = ENTITY_FLAG_DISABLE_COLLISION, .renderCommandList = Entity_SquareShadow_Render, .animModelNode = NULL, .onCreateCallback = entity_Shadow_init, diff --git a/src/entity/ShatteringBlock_common.c b/src/entity/ShatteringBlock_common.c index b66356af55..8a388b2690 100644 --- a/src/entity/ShatteringBlock_common.c +++ b/src/entity/ShatteringBlock_common.c @@ -198,9 +198,9 @@ void entity_shattering_setupGfx(s32 entityIndex) { } EntityScript Entity_ShatteringBlock_Script = { - es_SetFlags(ENTITY_FLAGS_DISABLE_COLLISION) + es_SetFlags(ENTITY_FLAG_DISABLE_COLLISION) es_SetCallback(entity_shattering_idle, 0) - es_SetFlags(ENTITY_FLAGS_HIDDEN) - es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_SetFlags(ENTITY_FLAG_HIDDEN) + es_SetFlags(ENTITY_FLAG_PENDING_INSTANCE_DELETE) es_End }; diff --git a/src/entity/Signpost.c b/src/entity/Signpost.c index a75762a615..649f13429a 100644 --- a/src/entity/Signpost.c +++ b/src/entity/Signpost.c @@ -9,13 +9,13 @@ void entity_Signpost_idle(Entity* entity) { f32 val = fabsf(clamp_angle(180.0f - entity->rotation.y) - clamp_angle(atan2(entity->position.x, entity->position.z, playerStatus->position.x, playerStatus->position.z))); - if (!(playerStatus->animFlags & PA_FLAGS_USING_WATT) && !(entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) && (val <= 40.0f || val >= 320.0f)) { - entity->flags |= ENTITY_FLAGS_SHOWS_INSPECT_PROMPT; - if ((playerStatus->animFlags & PA_FLAGS_INTERACT_PROMPT_AVAILABLE) && (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_WALL)) { + if (!(playerStatus->animFlags & PA_FLAG_USING_WATT) && !(entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) && (val <= 40.0f || val >= 320.0f)) { + entity->flags |= ENTITY_FLAG_SHOWS_INSPECT_PROMPT; + if ((playerStatus->animFlags & PA_FLAG_INTERACT_PROMPT_AVAILABLE) && (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_WALL)) { entity_start_script(entity); } } else { - entity->flags &= ~ENTITY_FLAGS_SHOWS_INSPECT_PROMPT; + entity->flags &= ~ENTITY_FLAG_SHOWS_INSPECT_PROMPT; playerStatus->interactingWithID = -1; } } @@ -28,7 +28,7 @@ EntityScript Entity_Signpost_Script = { EntityModelScript Entity_Signpost_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_Signpost_Render, RENDER_MODE_SURFACE_OPA); EntityBlueprint Entity_Signpost = { - .flags = ENTITY_FLAGS_SQUARE_SHADOW | ENTITY_FLAGS_400 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .flags = ENTITY_FLAG_SQUARE_SHADOW | ENTITY_FLAG_400 | ENTITY_FLAG_FIXED_SHADOW_SIZE, .typeDataSize = sizeof(SignpostData), .renderCommandList = Entity_Signpost_RenderScript, .modelAnimationNodes = 0x00000000, diff --git a/src/entity/SimpleSpring.c b/src/entity/SimpleSpring.c index ac00dbdada..83e3687828 100644 --- a/src/entity/SimpleSpring.c +++ b/src/entity/SimpleSpring.c @@ -15,8 +15,8 @@ void entity_ScriptSpring_idle(Entity* entity) { if (playerStatus->actionState != ACTION_STATE_RIDE && (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR)) { playerStatus->camResetDelay = 5; - playerStatus->flags &= ~PS_FLAGS_FALLING; - playerStatus->flags |= PS_FLAGS_SCRIPTED_FALL; + playerStatus->flags &= ~PS_FLAG_FALLING; + playerStatus->flags |= PS_FLAG_SCRIPTED_FALL; play_model_animation(entity->virtualModelIndex, Entity_ScriptSpring_AnimLaunch); if (entity_start_script(entity)) { set_action_state(ACTION_STATE_USE_SPRING); @@ -87,7 +87,7 @@ DmaEntry Entity_ScriptSpring_dma[] = { ENTITY_ROM(ScriptSpring_gfx), ENTITY_ROM( DmaEntry Entity_SimpleSpring_dma[] = { ENTITY_ROM(SimpleSpring_gfx), ENTITY_ROM(SimpleSpring_anim) }; EntityBlueprint Entity_ScriptSpring = { - .flags = ENTITY_FLAGS_ALWAYS_FACE_CAMERA | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .flags = ENTITY_FLAG_ALWAYS_FACE_CAMERA | ENTITY_FLAG_HAS_ANIMATED_MODEL, .typeDataSize = 0, .renderCommandList = Entity_ScriptSpring_AnimIdle, .modelAnimationNodes = Entity_ScriptSpring_Mesh, @@ -100,7 +100,7 @@ EntityBlueprint Entity_ScriptSpring = { }; EntityBlueprint Entity_SimpleSpring = { - .flags = ENTITY_FLAGS_ALWAYS_FACE_CAMERA | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .flags = ENTITY_FLAG_ALWAYS_FACE_CAMERA | ENTITY_FLAG_HAS_ANIMATED_MODEL, .typeDataSize = sizeof(SimpleSpringData), .renderCommandList = Entity_SimpleSpring_AnimIdle, .modelAnimationNodes = Entity_SimpleSpring_Mesh, diff --git a/src/entity/SuperBlock.c b/src/entity/SuperBlock.c index 5ad767e297..86ff640fea 100644 --- a/src/entity/SuperBlock.c +++ b/src/entity/SuperBlock.c @@ -239,7 +239,7 @@ EntityModelScript Entity_UltraBlock_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT( EntityModelScript Entity_UltraBlockContent_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_RenderNone, RENDER_MODE_SURFACE_XLU_LAYER2); EntityBlueprint Entity_SuperBlock = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_SuperBlock_RenderScript, .modelAnimationNodes = 0, @@ -252,7 +252,7 @@ EntityBlueprint Entity_SuperBlock = { }; EntityBlueprint Entity_SuperBlockContent = { - .flags = ENTITY_FLAGS_DISABLE_COLLISION, + .flags = ENTITY_FLAG_DISABLE_COLLISION, .typeDataSize = sizeof(SuperBlockContentData), .renderCommandList = Entity_SuperBlockContent_RenderScript, .modelAnimationNodes = 0, @@ -265,7 +265,7 @@ EntityBlueprint Entity_SuperBlockContent = { }; EntityBlueprint Entity_UltraBlock = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE, .typeDataSize = sizeof(BlockData), .renderCommandList = Entity_UltraBlock_RenderScript, .modelAnimationNodes = 0, @@ -278,7 +278,7 @@ EntityBlueprint Entity_UltraBlock = { }; EntityBlueprint Entity_UltraBlockContent = { - .flags = ENTITY_FLAGS_DISABLE_COLLISION, + .flags = ENTITY_FLAG_DISABLE_COLLISION, .typeDataSize = sizeof(SuperBlockContentData), .renderCommandList = Entity_UltraBlockContent_RenderScript, .modelAnimationNodes = 0, diff --git a/src/entity/Switch.c b/src/entity/Switch.c index dca906e06d..68adc018a1 100644 --- a/src/entity/Switch.c +++ b/src/entity/Switch.c @@ -438,7 +438,7 @@ void entity_base_switch_init(Entity* entity) { PlayerStatus* playerStatus = &gPlayerStatus; SwitchData* data = entity->dataBuf.swtch; - playerStatus->animFlags |= PA_FLAGS_MAP_HAS_SWITCH; + playerStatus->animFlags |= PA_FLAG_MAP_HAS_SWITCH; data->baseScale.x = 1.0f; data->baseScale.y = 1.0f; data->baseScale.z = 1.0f; @@ -456,7 +456,7 @@ void entity_BlueSwitch_init(Entity* entity) { if (CreateEntityVarArgBuffer[0] == REFLECTED_SWITCH_HIDDEN) { if (SwitchToLink != NULL) { data->linkedSwitch = SwitchToLink; - entity->flags |= ENTITY_FLAGS_HIDDEN; + entity->flags |= ENTITY_FLAG_HIDDEN; return; } } else { @@ -494,7 +494,7 @@ EntityScript Entity_HugeBlueSwitch_Script = { es_Call(entity_base_switch_start_bound_script) es_Call(entity_base_switch_anim_init) es_SetCallback(entity_base_switch_animate_scale, 0) - es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_SetFlags(ENTITY_FLAG_PENDING_INSTANCE_DELETE) es_End }; @@ -504,7 +504,7 @@ EntityScript Entity_BlueSwitch_Script = { es_Call(entity_base_switch_start_bound_script) es_Call(entity_base_switch_anim_init) es_SetCallback(entity_base_switch_animate_scale, 0) - es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_SetFlags(ENTITY_FLAG_PENDING_INSTANCE_DELETE) es_End }; @@ -526,7 +526,7 @@ EntityModelScript Entity_RedSwitch_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(E EntityModelScript Entity_GreenStompSwitch_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_GreenStompSwitch_Render, RENDER_MODE_SURFACE_OPA); EntityBlueprint Entity_RedSwitch = { - .flags = ENTITY_FLAGS_8000 | ENTITY_FLAGS_ALWAYS_FACE_CAMERA, + .flags = ENTITY_FLAG_8000 | ENTITY_FLAG_ALWAYS_FACE_CAMERA, .typeDataSize = sizeof(SwitchData), .renderCommandList = Entity_RedSwitch_RenderScript, .modelAnimationNodes = 0, @@ -539,7 +539,7 @@ EntityBlueprint Entity_RedSwitch = { }; EntityBlueprint Entity_BlueSwitch = { - .flags = ENTITY_FLAGS_8000 | ENTITY_FLAGS_ALWAYS_FACE_CAMERA | ENTITY_FLAGS_SQUARE_SHADOW | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_HAS_DYNAMIC_SHADOW, + .flags = ENTITY_FLAG_8000 | ENTITY_FLAG_ALWAYS_FACE_CAMERA | ENTITY_FLAG_SQUARE_SHADOW | ENTITY_FLAG_FIXED_SHADOW_SIZE | ENTITY_FLAG_HAS_DYNAMIC_SHADOW, .typeDataSize = sizeof(SwitchData), .renderCommandList = Entity_BlueSwitch_RenderScript, .modelAnimationNodes = 0, @@ -552,7 +552,7 @@ EntityBlueprint Entity_BlueSwitch = { }; EntityBlueprint Entity_HugeBlueSwitch = { - .flags = ENTITY_FLAGS_8000 | ENTITY_FLAGS_ALWAYS_FACE_CAMERA | ENTITY_FLAGS_SQUARE_SHADOW | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_HAS_DYNAMIC_SHADOW, + .flags = ENTITY_FLAG_8000 | ENTITY_FLAG_ALWAYS_FACE_CAMERA | ENTITY_FLAG_SQUARE_SHADOW | ENTITY_FLAG_FIXED_SHADOW_SIZE | ENTITY_FLAG_HAS_DYNAMIC_SHADOW, .typeDataSize = sizeof(SwitchData), .renderCommandList = Entity_HugeBlueSwitch_RenderScript, .modelAnimationNodes = 0, @@ -565,7 +565,7 @@ EntityBlueprint Entity_HugeBlueSwitch = { }; EntityBlueprint Entity_GreenStompSwitch = { - .flags = ENTITY_FLAGS_8000 | ENTITY_FLAGS_4000, + .flags = ENTITY_FLAG_8000 | ENTITY_FLAG_4000, .typeDataSize = sizeof(SwitchData), .renderCommandList = Entity_GreenStompSwitch_RenderScript, .modelAnimationNodes = 0, diff --git a/src/entity/WoodenCrate.c b/src/entity/WoodenCrate.c index 6e5a3355cc..5cf892d657 100644 --- a/src/entity/WoodenCrate.c +++ b/src/entity/WoodenCrate.c @@ -262,16 +262,16 @@ EntityModelScript Entity_WoodenCrate_RenderShatteredScript = STANDARD_ENTITY_MOD EntityScript Entity_WoodenCrate_Script = { es_SetCallback(entity_WoodenCrate_idle, 0) - es_SetFlags(ENTITY_FLAGS_DISABLE_COLLISION) + es_SetFlags(ENTITY_FLAG_DISABLE_COLLISION) es_Call(entity_WoodenCrate_shatter) es_SetCallback(entity_WoodenCrate_update_fragments, 0) - es_SetFlags(ENTITY_FLAGS_HIDDEN) - es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_SetFlags(ENTITY_FLAG_HIDDEN) + es_SetFlags(ENTITY_FLAG_PENDING_INSTANCE_DELETE) es_End }; EntityBlueprint Entity_WoodenCrate = { - .flags = ENTITY_FLAGS_4000 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .flags = ENTITY_FLAG_4000 | ENTITY_FLAG_FIXED_SHADOW_SIZE, .typeDataSize = sizeof(WoodenCrateData), .renderCommandList = Entity_WoodenCrate_RenderScript, .modelAnimationNodes = 0, diff --git a/src/entity/default/BoardedFloor.c b/src/entity/default/BoardedFloor.c index 17d8166134..3c91cdae9c 100644 --- a/src/entity/default/BoardedFloor.c +++ b/src/entity/default/BoardedFloor.c @@ -230,14 +230,14 @@ void Entity_BoardedFloor_shatter(Entity* entity) { } EntityScript Entity_BoardedFloor_Script = { - es_ClearFlags(ENTITY_FLAGS_DISABLE_COLLISION) + es_ClearFlags(ENTITY_FLAG_DISABLE_COLLISION) es_SetCallback(Entity_BoardedFloor_idle, 0) es_PlaySound(SOUND_2092) - es_SetFlags(ENTITY_FLAGS_DISABLE_COLLISION) + es_SetFlags(ENTITY_FLAG_DISABLE_COLLISION) es_Call(Entity_BoardedFloor_shatter) es_SetCallback(Entity_BoardedFloor_update_fragments, 0) - es_SetFlags(ENTITY_FLAGS_HIDDEN) - es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_SetFlags(ENTITY_FLAG_HIDDEN) + es_SetFlags(ENTITY_FLAG_PENDING_INSTANCE_DELETE) es_End }; diff --git a/src/entity/default/BombableRock.c b/src/entity/default/BombableRock.c index b490decf54..f4e9c62dfb 100644 --- a/src/entity/default/BombableRock.c +++ b/src/entity/default/BombableRock.c @@ -240,10 +240,10 @@ EntityModelScript Entity_BombableRock_RenderScript = STANDARD_ENTITY_MODEL_SCRIP EntityScript Entity_BombableRock_Script = { es_SetCallback(entity_BombableRock_idle, 0) - es_SetFlags(ENTITY_FLAGS_DISABLE_COLLISION) + es_SetFlags(ENTITY_FLAG_DISABLE_COLLISION) es_SetCallback(entity_BombableRock_update_fragments, 0) - es_SetFlags(ENTITY_FLAGS_HIDDEN) - es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_SetFlags(ENTITY_FLAG_HIDDEN) + es_SetFlags(ENTITY_FLAG_PENDING_INSTANCE_DELETE) es_End }; diff --git a/src/entity/default/Padlock.c b/src/entity/default/Padlock.c index da0d4811b0..881891e8c1 100644 --- a/src/entity/default/Padlock.c +++ b/src/entity/default/Padlock.c @@ -53,9 +53,9 @@ void entity_Padlock_push_player(Entity* entity) { f32 deltaX, deltaZ; if (playerStatus->colliderHeight < fabs(playerStatus->position.y - entity->position.y)) { - entity->flags |= ENTITY_FLAGS_DISABLE_COLLISION; + entity->flags |= ENTITY_FLAG_DISABLE_COLLISION; } else { - entity->flags &= ~ENTITY_FLAGS_DISABLE_COLLISION; + entity->flags &= ~ENTITY_FLAG_DISABLE_COLLISION; } if (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) { @@ -85,7 +85,7 @@ void entity_Padlock_idle(Entity* entity) { switch (data->state) { case 0: entity_Padlock_push_player(entity); - if (entity->flags & ENTITY_FLAGS_100000) { + if (entity->flags & ENTITY_FLAG_100000) { data->state++; sfx_play_sound(SOUND_269); } @@ -113,7 +113,7 @@ void entity_Padlock_idle(Entity* entity) { data->rotationSpeed = 3.0f; data->state++; fx_sparkles(FX_SPARKLES_0, entity->position.x, entity->position.y + 25.0f, entity->position.z, 10.0f); - entity->flags |= ENTITY_FLAGS_DISABLE_COLLISION; + entity->flags |= ENTITY_FLAG_DISABLE_COLLISION; } break; case 3: @@ -173,7 +173,7 @@ void entity_Padlock_idle(Entity* entity) { case 8: if (--data->timer <= 0) { data->state++; - entity->flags |= ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_HIDDEN; + entity->flags |= ENTITY_FLAG_DISABLE_COLLISION | ENTITY_FLAG_HIDDEN; exec_entity_commandlist(entity); } break; @@ -182,9 +182,9 @@ void entity_Padlock_idle(Entity* entity) { if (data->state == 2 || data->state == 3 || data->state == 4 || data->state == 5 || data->state == 6 || data->state == 7 || data->state == 8) { data->blinkCounter++; if (data->blinkCounter & 1) { - entity->flags |= ENTITY_FLAGS_HIDDEN; + entity->flags |= ENTITY_FLAG_HIDDEN; } else { - entity->flags &= ~ENTITY_FLAGS_HIDDEN; + entity->flags &= ~ENTITY_FLAG_HIDDEN; } } } @@ -227,7 +227,7 @@ void entity_PadlockBlueFace_init(Entity* entity) { EntityScript Entity_Padlock_Script = { es_SetCallback(entity_Padlock_idle, 0) - es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_SetFlags(ENTITY_FLAG_PENDING_INSTANCE_DELETE) es_End }; @@ -237,7 +237,7 @@ EntityModelScript Entity_PadlockRedFace_RenderScript = STANDARD_ENTITY_MODEL_SCR EntityModelScript Entity_PadlockBlueFace_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_PadlockBlueFace_Render, RENDER_MODE_SURFACE_OPA); EntityBlueprint Entity_Padlock = { - .flags = ENTITY_FLAGS_SHOWS_INSPECT_PROMPT | ENTITY_FLAGS_400 | ENTITY_FLAGS_HAS_SHADOW, + .flags = ENTITY_FLAG_SHOWS_INSPECT_PROMPT | ENTITY_FLAG_400 | ENTITY_FLAG_HAS_SHADOW, .typeDataSize = sizeof(PadlockData), .renderCommandList = Entity_Padlock_RenderScript, .modelAnimationNodes = 0, @@ -250,7 +250,7 @@ EntityBlueprint Entity_Padlock = { }; EntityBlueprint Entity_PadlockRedFrame = { - .flags = ENTITY_FLAGS_SHOWS_INSPECT_PROMPT | ENTITY_FLAGS_400 | ENTITY_FLAGS_HAS_SHADOW, + .flags = ENTITY_FLAG_SHOWS_INSPECT_PROMPT | ENTITY_FLAG_400 | ENTITY_FLAG_HAS_SHADOW, .typeDataSize = sizeof(PadlockData), .renderCommandList = Entity_PadlockRedFrame_RenderScript, .modelAnimationNodes = 0, @@ -263,7 +263,7 @@ EntityBlueprint Entity_PadlockRedFrame = { }; EntityBlueprint Entity_PadlockRedFace = { - .flags = ENTITY_FLAGS_SHOWS_INSPECT_PROMPT | ENTITY_FLAGS_400 | ENTITY_FLAGS_HAS_SHADOW, + .flags = ENTITY_FLAG_SHOWS_INSPECT_PROMPT | ENTITY_FLAG_400 | ENTITY_FLAG_HAS_SHADOW, .typeDataSize = sizeof(PadlockData), .renderCommandList = Entity_PadlockRedFace_RenderScript, .modelAnimationNodes = 0, @@ -276,7 +276,7 @@ EntityBlueprint Entity_PadlockRedFace = { }; EntityBlueprint Entity_PadlockBlueFace = { - .flags = ENTITY_FLAGS_SHOWS_INSPECT_PROMPT | ENTITY_FLAGS_400 | ENTITY_FLAGS_HAS_SHADOW, + .flags = ENTITY_FLAG_SHOWS_INSPECT_PROMPT | ENTITY_FLAG_400 | ENTITY_FLAG_HAS_SHADOW, .typeDataSize = sizeof(PadlockData), .renderCommandList = Entity_PadlockBlueFace_RenderScript, .modelAnimationNodes = 0, diff --git a/src/entity/jan_iwa/ArrowSign.c b/src/entity/jan_iwa/ArrowSign.c index 3739762b04..0aa8fab7f0 100644 --- a/src/entity/jan_iwa/ArrowSign.c +++ b/src/entity/jan_iwa/ArrowSign.c @@ -39,7 +39,7 @@ void entity_ArrowSign_init(Entity* entity) { } s32 entity_ArrowSign_handle_collision(Entity* entity) { - if (!(gPlayerStatus.animFlags & PA_FLAGS_USING_WATT) && + if (!(gPlayerStatus.animFlags & PA_FLAG_USING_WATT) && (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_WALL)) { entity_start_script(entity); } @@ -53,7 +53,7 @@ EntityScript Entity_ArrowSign_Script = { EntityModelScript Entity_ArrowSign_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_ArrowSign_Render, RENDER_MODE_SURFACE_OPA); EntityBlueprint Entity_ArrowSign = { - .flags = ENTITY_FLAGS_SQUARE_SHADOW | ENTITY_FLAGS_400 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .flags = ENTITY_FLAG_SQUARE_SHADOW | ENTITY_FLAG_400 | ENTITY_FLAG_FIXED_SHADOW_SIZE, .typeDataSize = sizeof(ArrowSignData), .renderCommandList = Entity_ArrowSign_RenderScript, .modelAnimationNodes = 0, diff --git a/src/entity/jan_iwa/Plants1.c b/src/entity/jan_iwa/Plants1.c index b1623f3b99..9d7ac44a3d 100644 --- a/src/entity/jan_iwa/Plants1.c +++ b/src/entity/jan_iwa/Plants1.c @@ -56,7 +56,7 @@ void func_802BB000_E2D930(Entity* entity) { if ((entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) && !is_picking_up_item()) { if (playerStatus->actionState == ACTION_STATE_RIDE) { - playerStatus->animFlags |= PA_FLAGS_INTERRUPT_USE_PARTNER; + playerStatus->animFlags |= PA_FLAG_INTERRUPT_USE_PARTNER; } else if (playerStatus->actionState != ACTION_STATE_USE_SPINNING_FLOWER) { D_802BCE34 = data->unk_28; D_802BCE30 = data->unk_2A; @@ -99,7 +99,7 @@ void func_802BB0A0_E2D9D0(Entity* entity) { data->rotation.y = clamp_angle(data->rotation.y + data->spinSpeed); if (!(entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) && - (playerStatus->animFlags & PA_FLAGS_SPINNING) && + (playerStatus->animFlags & PA_FLAG_SPINNING) && fabs(dist2D(entity->position.x, entity->position.z, playerStatus->position.x, playerStatus->position.z)) < 60.0) { exec_entity_commandlist(entity); @@ -180,10 +180,10 @@ void entity_PinkFlowerLight_setupGfx(s32 entityIndex) { void entity_PinkFlower_idle(Entity* entity) { PinkFlowerData* data = entity->dataBuf.pinkFlower; - if (gPlayerStatus.animFlags & PA_FLAGS_INTERACT_PROMPT_AVAILABLE + if (gPlayerStatus.animFlags & PA_FLAG_INTERACT_PROMPT_AVAILABLE && entity->collisionFlags & (ENTITY_COLLISION_PLAYER_TOUCH_WALL | ENTITY_COLLISION_PLAYER_HAMMER)) { - if (entity->flags & ENTITY_FLAGS_SHOWS_INSPECT_PROMPT) { - entity->flags &= ~ENTITY_FLAGS_SHOWS_INSPECT_PROMPT; + if (entity->flags & ENTITY_FLAG_SHOWS_INSPECT_PROMPT) { + entity->flags &= ~ENTITY_FLAG_SHOWS_INSPECT_PROMPT; data = get_entity_by_index(data->linkedEntityIndex)->dataBuf.pinkFlower; if (data->state == 0) { data->state = 1; @@ -276,10 +276,10 @@ void entity_CymbalPlant_idle(Entity* entity) { case 0: if (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) { if (partnerActionStatus->actingPartner != 0) { - playerStatus->animFlags |= PA_FLAGS_INTERRUPT_USE_PARTNER; + playerStatus->animFlags |= PA_FLAG_INTERRUPT_USE_PARTNER; } func_800EF300(); - playerStatus->animFlags |= PA_FLAGS_INTERRUPT_SPIN; + playerStatus->animFlags |= PA_FLAG_INTERRUPT_SPIN; data->timer = 4; data->unk_01++; data->state++; @@ -293,14 +293,14 @@ void entity_CymbalPlant_idle(Entity* entity) { } break; case 1: - playerStatus->animFlags |= PA_FLAGS_INTERRUPT_SPIN; + playerStatus->animFlags |= PA_FLAG_INTERRUPT_SPIN; if (--data->timer == 0) { start_rumble(128, 10); data->timer = 30; data->state++; yaw = playerStatus->spriteFacingAngle; playerStatus->spriteFacingAngle = 80.0f; - playerStatus->flags |= PS_FLAGS_ROTATION_LOCKED; + playerStatus->flags |= PS_FLAG_ROTATION_LOCKED; D_802BCE20 = yaw; } func_802BB98C_E2E2BC(entity); @@ -330,7 +330,7 @@ void entity_CymbalPlant_idle(Entity* entity) { data->state++; func_802DDEE4(0, -1, 0, 0, 0, 0, 0, 0); enable_player_input(); - playerStatus->flags &= ~PS_FLAGS_ROTATION_LOCKED; + playerStatus->flags &= ~PS_FLAG_ROTATION_LOCKED; } break; case 6: @@ -356,7 +356,7 @@ EntityScript Entity_PinkFlower_Script = { es_SetCallback(entity_PinkFlower_idle, 0) es_PlaySound(SOUND_F4) es_SetCallback(NULL, 50) - es_SetFlags(ENTITY_FLAGS_SHOWS_INSPECT_PROMPT) + es_SetFlags(ENTITY_FLAG_SHOWS_INSPECT_PROMPT) es_Restart es_End }; @@ -379,7 +379,7 @@ DmaEntry Entity_CymbalPlant_dma[] = { ENTITY_ROM(CymbalPlant_gfx), ENTITY_ROM(Cy DmaEntry Entity_PinkFlower_dma[] = { ENTITY_ROM(PinkFlower_gfx), ENTITY_ROM(PinkFlower_anim) }; EntityBlueprint Entity_CymbalPlant = { - .flags = ENTITY_FLAGS_SQUARE_SHADOW | ENTITY_FLAGS_400 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .flags = ENTITY_FLAG_SQUARE_SHADOW | ENTITY_FLAG_400 | ENTITY_FLAG_FIXED_SHADOW_SIZE | ENTITY_FLAG_HAS_ANIMATED_MODEL, .typeDataSize = sizeof(CymbalPlantData), .renderCommandList = Entity_CymbalPlant_AnimationIdle, .modelAnimationNodes = Entity_CymbalPlant_Mesh, @@ -392,7 +392,7 @@ EntityBlueprint Entity_CymbalPlant = { }; EntityBlueprint Entity_PinkFlower = { - .flags = ENTITY_FLAGS_SHOWS_INSPECT_PROMPT | ENTITY_FLAGS_SQUARE_SHADOW | ENTITY_FLAGS_400 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .flags = ENTITY_FLAG_SHOWS_INSPECT_PROMPT | ENTITY_FLAG_SQUARE_SHADOW | ENTITY_FLAG_400 | ENTITY_FLAG_FIXED_SHADOW_SIZE | ENTITY_FLAG_HAS_ANIMATED_MODEL, .typeDataSize = sizeof(PinkFlowerData), .renderCommandList = Entity_PinkFlower_AnimationIdle, .modelAnimationNodes = Entity_PinkFlower_Mesh, @@ -405,7 +405,7 @@ EntityBlueprint Entity_PinkFlower = { }; EntityBlueprint Entity_PinkFlowerLight = { - .flags = ENTITY_FLAGS_SHOWS_INSPECT_PROMPT | ENTITY_FLAGS_DISABLE_COLLISION, + .flags = ENTITY_FLAG_SHOWS_INSPECT_PROMPT | ENTITY_FLAG_DISABLE_COLLISION, .typeDataSize = sizeof(PinkFlowerData), .renderCommandList = Entity_PinkFlowerLight_RenderScript, .modelAnimationNodes = 0, diff --git a/src/entity/jan_iwa/Plants2.c b/src/entity/jan_iwa/Plants2.c index 9f5c9ea6e2..a493baef06 100644 --- a/src/entity/jan_iwa/Plants2.c +++ b/src/entity/jan_iwa/Plants2.c @@ -38,7 +38,7 @@ extern AnimScript Entity_MunchlesiaReset1_Animation; extern StaticAnimatorNode* Entity_MunchlesiaReset1_Mesh[]; void entity_BellbellPlant_idle(Entity* entity) { - if ((gPlayerStatus.animFlags & PA_FLAGS_INTERACT_PROMPT_AVAILABLE) && + if ((gPlayerStatus.animFlags & PA_FLAG_INTERACT_PROMPT_AVAILABLE) && (entity->collisionFlags & (ENTITY_COLLISION_PLAYER_HAMMER | ENTITY_COLLISION_PLAYER_TOUCH_WALL))) { exec_entity_commandlist(entity); play_model_animation(entity->virtualModelIndex, Entity_BellbellPlant_AnimationUse); @@ -46,7 +46,7 @@ void entity_BellbellPlant_idle(Entity* entity) { } void entity_TrumpetPlant_idle(Entity* entity) { - if ((gPlayerStatus.animFlags & PA_FLAGS_INTERACT_PROMPT_AVAILABLE) && + if ((gPlayerStatus.animFlags & PA_FLAG_INTERACT_PROMPT_AVAILABLE) && (entity->collisionFlags & (ENTITY_COLLISION_PLAYER_HAMMER | ENTITY_COLLISION_PLAYER_TOUCH_WALL))) { exec_entity_commandlist(entity); play_model_animation(entity->virtualModelIndex, Entity_TrumpetPlant_AnimationUse); @@ -95,7 +95,7 @@ void func_802BC050_E2E980(Entity* entity) { if (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) { Entity* resetMunchlesia; - gPlayerStatus.animFlags |= PA_FLAGS_INTERRUPT_USE_PARTNER; + gPlayerStatus.animFlags |= PA_FLAG_INTERRUPT_USE_PARTNER; func_800EF300(); resetMunchlesia = get_entity_by_index(entity->dataBuf.munchlesia->unk_00); exec_entity_commandlist(entity); @@ -147,7 +147,7 @@ void func_802BC2B4_E2EBE4(Entity* entity) { entity_Munchlesia_create_child(entity, &Entity_MunchlesiaBeginChew); gPlayerStatus.prevActionState = 0; gPlayerStatus.actionState = 0; - gPlayerStatus.flags &= ~PS_FLAGS_ACTION_STATE_CHANGED; + gPlayerStatus.flags &= ~PS_FLAG_ACTION_STATE_CHANGED; suggest_player_anim_setUnkFlag(ANIM_Mario_8001F); } @@ -195,17 +195,17 @@ void func_802BC3E4_E2ED14(Entity* entity) { EntityScript Entity_BellbellPlant_Script = { es_SetCallback(entity_BellbellPlant_idle, 0) - es_ClearFlags(ENTITY_FLAGS_SHOWS_INSPECT_PROMPT) + es_ClearFlags(ENTITY_FLAG_SHOWS_INSPECT_PROMPT) es_PlaySound(SOUND_F1) es_SetCallback(NULL, 60) - es_SetFlags(ENTITY_FLAGS_SHOWS_INSPECT_PROMPT) + es_SetFlags(ENTITY_FLAG_SHOWS_INSPECT_PROMPT) es_Restart es_End }; EntityScript Entity_TrumpetPlant_Script = { es_SetCallback(entity_TrumpetPlant_idle, 0) - es_ClearFlags(ENTITY_FLAGS_SHOWS_INSPECT_PROMPT) + es_ClearFlags(ENTITY_FLAG_SHOWS_INSPECT_PROMPT) es_PlaySound(SOUND_F3) es_SetCallback(NULL, 15) es_Call(entity_TrumpetPlant_create_effect) @@ -220,7 +220,7 @@ EntityScript Entity_TrumpetPlant_Script = { es_SetCallback(NULL, 3) es_Call(entity_TrumpetPlant_create_effect) es_SetCallback(NULL, 32) - es_SetFlags(ENTITY_FLAGS_SHOWS_INSPECT_PROMPT) + es_SetFlags(ENTITY_FLAG_SHOWS_INSPECT_PROMPT) es_Restart es_End }; @@ -240,9 +240,9 @@ EntityScript Entity_MunchlesiaReset_Script = { es_SetCallback(NULL, 7) es_Call(func_802BC250_E2EB80) es_PlaySound(SOUND_209B) - es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetFlags(ENTITY_FLAG_HIDDEN) es_SetCallback(NULL, 3) - es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_SetFlags(ENTITY_FLAG_PENDING_INSTANCE_DELETE) es_End }; @@ -251,27 +251,27 @@ EntityScript Entity_MunchlesiaGrab_Script = { es_Call(func_802BC0F0_E2EA20) es_SetCallback(func_802BC17C_E2EAAC, 4) es_Call(func_802BC274_E2EBA4) - es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetFlags(ENTITY_FLAG_HIDDEN) es_SetCallback(NULL, 3) - es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_SetFlags(ENTITY_FLAG_PENDING_INSTANCE_DELETE) es_End }; EntityScript Entity_MunchlesiaEnvelop_Script = { es_SetCallback(NULL, 7) es_Call(func_802BC2B4_E2EBE4) - es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetFlags(ENTITY_FLAG_HIDDEN) es_SetCallback(NULL, 3) - es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_SetFlags(ENTITY_FLAG_PENDING_INSTANCE_DELETE) es_End }; EntityScript Entity_MunchlesiaBeginChew_Script = { es_SetCallback(NULL, 8) es_Call(func_802BC308_E2EC38) - es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetFlags(ENTITY_FLAG_HIDDEN) es_SetCallback(NULL, 3) - es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_SetFlags(ENTITY_FLAG_PENDING_INSTANCE_DELETE) es_End }; @@ -280,9 +280,9 @@ EntityScript Entity_MunchlesiaChewing_Script = { es_SetCallback(func_802BC3E4_E2ED14, 44) es_SetCallback(NULL, 13) es_Call(func_802BC32C_E2EC5C) - es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetFlags(ENTITY_FLAG_HIDDEN) es_SetCallback(NULL, 3) - es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_SetFlags(ENTITY_FLAG_PENDING_INSTANCE_DELETE) es_End }; @@ -292,27 +292,27 @@ EntityScript Entity_MunchlesiaSpitOut_Script = { es_PlaySound(SOUND_393) es_SetCallback(NULL, 4) es_Call(entity_Munchlesia_create_child_reset1) - es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetFlags(ENTITY_FLAG_HIDDEN) es_SetCallback(NULL, 3) - es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_SetFlags(ENTITY_FLAG_PENDING_INSTANCE_DELETE) es_End }; EntityScript Entity_MunchlesiaReset1_Script = { es_SetCallback(NULL, 8) es_Call(entity_Munchlesia_create_child_reset2) - es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetFlags(ENTITY_FLAG_HIDDEN) es_SetCallback(NULL, 3) - es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_SetFlags(ENTITY_FLAG_PENDING_INSTANCE_DELETE) es_End }; EntityScript Entity_MunchlesiaReset2_Script = { es_SetCallback(NULL, 9) es_Call(func_802BC220_E2EB50) - es_SetFlags(ENTITY_FLAGS_HIDDEN) + es_SetFlags(ENTITY_FLAG_HIDDEN) es_SetCallback(NULL, 10) - es_SetFlags(ENTITY_FLAGS_PENDING_INSTANCE_DELETE) + es_SetFlags(ENTITY_FLAG_PENDING_INSTANCE_DELETE) es_End }; @@ -327,7 +327,7 @@ DmaEntry Entity_BellbellPlant_dma[] = { ENTITY_ROM(BellbellPlant_gfx), ENTITY_RO DmaEntry Entity_TrumpetPlant_dma[] = { ENTITY_ROM(TrumpetPlant_gfx), ENTITY_ROM(TrumpetPlant_anim) }; EntityBlueprint Entity_BellbellPlant = { - .flags = ENTITY_FLAGS_SHOWS_INSPECT_PROMPT | ENTITY_FLAGS_SQUARE_SHADOW | ENTITY_FLAGS_400 | ENTITY_FLAGS_FIXED_SHADOW_SIZE | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .flags = ENTITY_FLAG_SHOWS_INSPECT_PROMPT | ENTITY_FLAG_SQUARE_SHADOW | ENTITY_FLAG_400 | ENTITY_FLAG_FIXED_SHADOW_SIZE | ENTITY_FLAG_HAS_ANIMATED_MODEL, .typeDataSize = 0, .renderCommandList = Entity_BellbellPlant_AnimationIdle, .modelAnimationNodes = Entity_BellbellPlant_Mesh, @@ -340,7 +340,7 @@ EntityBlueprint Entity_BellbellPlant = { }; EntityBlueprint Entity_TrumpetPlant = { - .flags = ENTITY_FLAGS_SHOWS_INSPECT_PROMPT | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .flags = ENTITY_FLAG_SHOWS_INSPECT_PROMPT | ENTITY_FLAG_HAS_ANIMATED_MODEL, .typeDataSize = sizeof(TrumpetPlantData), .renderCommandList = Entity_TrumpetPlant_AnimationIdle, .modelAnimationNodes = Entity_TrumpetPlant_Mesh, @@ -353,7 +353,7 @@ EntityBlueprint Entity_TrumpetPlant = { }; EntityBlueprint Entity_Munchlesia = { - .flags = ENTITY_FLAGS_SQUARE_SHADOW | ENTITY_FLAGS_400 | ENTITY_FLAGS_FIXED_SHADOW_SIZE, + .flags = ENTITY_FLAG_SQUARE_SHADOW | ENTITY_FLAG_400 | ENTITY_FLAG_FIXED_SHADOW_SIZE, .typeDataSize = sizeof(MunchlesiaData), .renderCommandList = Entity_RenderNone_Script, .modelAnimationNodes = 0, @@ -366,7 +366,7 @@ EntityBlueprint Entity_Munchlesia = { }; EntityBlueprint Entity_MunchlesiaReset = { - .flags = ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .flags = ENTITY_FLAG_DISABLE_COLLISION | ENTITY_FLAG_HAS_ANIMATED_MODEL, .typeDataSize = sizeof(MunchlesiaData), .renderCommandList = Entity_MunchlesiaReset_AnimationIdle, .modelAnimationNodes = Entity_MunchlesiaReset_Mesh, @@ -379,7 +379,7 @@ EntityBlueprint Entity_MunchlesiaReset = { }; EntityBlueprint Entity_MunchlesiaGrab = { - .flags = ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .flags = ENTITY_FLAG_DISABLE_COLLISION | ENTITY_FLAG_HAS_ANIMATED_MODEL, .typeDataSize = sizeof(MunchlesiaData), .renderCommandList = Entity_MunchlesiaGrab_Animation, .modelAnimationNodes = Entity_MunchlesiaGrab_Mesh, @@ -392,7 +392,7 @@ EntityBlueprint Entity_MunchlesiaGrab = { }; EntityBlueprint Entity_MunchlesiaEnvelop = { - .flags = ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .flags = ENTITY_FLAG_DISABLE_COLLISION | ENTITY_FLAG_HAS_ANIMATED_MODEL, .typeDataSize = sizeof(MunchlesiaData), .renderCommandList = Entity_MunchlesiaEnvelop_Animation, .modelAnimationNodes = Entity_MunchlesiaEnvelop_Mesh, @@ -405,7 +405,7 @@ EntityBlueprint Entity_MunchlesiaEnvelop = { }; EntityBlueprint Entity_MunchlesiaBeginChew = { - .flags = ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .flags = ENTITY_FLAG_DISABLE_COLLISION | ENTITY_FLAG_HAS_ANIMATED_MODEL, .typeDataSize = sizeof(MunchlesiaData), .renderCommandList = Entity_MunchlesiaBeginChew_Animation, .modelAnimationNodes = Entity_MunchlesiaBeginChew_Mesh, @@ -418,7 +418,7 @@ EntityBlueprint Entity_MunchlesiaBeginChew = { }; EntityBlueprint Entity_MunchlesiaChewing = { - .flags = ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .flags = ENTITY_FLAG_DISABLE_COLLISION | ENTITY_FLAG_HAS_ANIMATED_MODEL, .typeDataSize = sizeof(MunchlesiaData), .renderCommandList = Entity_MunchlesiaChewing_Animation, .modelAnimationNodes = Entity_MunchlesiaChewing_Mesh, @@ -431,7 +431,7 @@ EntityBlueprint Entity_MunchlesiaChewing = { }; EntityBlueprint Entity_MunchlesiaSpitOut = { - .flags = ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .flags = ENTITY_FLAG_DISABLE_COLLISION | ENTITY_FLAG_HAS_ANIMATED_MODEL, .typeDataSize = sizeof(MunchlesiaData), .renderCommandList = Entity_MunchlesiaSpitOut_Animation, .modelAnimationNodes = Entity_MunchlesiaSpitOut_Mesh, @@ -444,7 +444,7 @@ EntityBlueprint Entity_MunchlesiaSpitOut = { }; EntityBlueprint Entity_MunchlesiaReset1 = { - .flags = ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .flags = ENTITY_FLAG_DISABLE_COLLISION | ENTITY_FLAG_HAS_ANIMATED_MODEL, .typeDataSize = sizeof(MunchlesiaData), .renderCommandList = Entity_MunchlesiaReset1_Animation, .modelAnimationNodes = Entity_MunchlesiaReset1_Mesh, @@ -457,7 +457,7 @@ EntityBlueprint Entity_MunchlesiaReset1 = { }; EntityBlueprint Entity_MunchlesiaReset2 = { - .flags = ENTITY_FLAGS_DISABLE_COLLISION | ENTITY_FLAGS_HAS_ANIMATED_MODEL, + .flags = ENTITY_FLAG_DISABLE_COLLISION | ENTITY_FLAG_HAS_ANIMATED_MODEL, .typeDataSize = sizeof(MunchlesiaData), .renderCommandList = Entity_MunchlesiaReset_AnimationIdle, .modelAnimationNodes = Entity_MunchlesiaReset_Mesh, diff --git a/src/entity/sbk_omo/StarBoxLauncher.c b/src/entity/sbk_omo/StarBoxLauncher.c index 5e81c11fc1..a905b2c7a5 100644 --- a/src/entity/sbk_omo/StarBoxLauncher.c +++ b/src/entity/sbk_omo/StarBoxLauncher.c @@ -225,7 +225,7 @@ void entity_StarBoxLauncher_launch(Entity* entity) { } void func_802BC99C_E312EC(Entity* entity) { - if (!(entity->flags & ENTITY_FLAGS_2000000)) { + if (!(entity->flags & ENTITY_FLAG_2000000)) { exec_entity_commandlist(entity); } } @@ -261,7 +261,7 @@ EntityScript Entity_StarBoxLauncher_Script = { EntityModelScript Entity_StarBoxLauncher_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_StarBoxLauncher_RenderTop, RENDER_MODE_SURFACE_OPA); EntityBlueprint Entity_StarBoxLauncher = { - .flags = ENTITY_FLAGS_8000, + .flags = ENTITY_FLAG_8000, .typeDataSize = sizeof(StarBoxLauncherData), .renderCommandList = Entity_StarBoxLauncher_RenderScript, .modelAnimationNodes = 0, diff --git a/src/entity/sbk_omo/Tweester.c b/src/entity/sbk_omo/Tweester.c index 99aa044c17..165e974cb4 100644 --- a/src/entity/sbk_omo/Tweester.c +++ b/src/entity/sbk_omo/Tweester.c @@ -209,7 +209,7 @@ void entity_Tweester_idle(Entity* entity) { if (get_time_freeze_mode() == TIME_FREEZE_NORMAL && !is_picking_up_item() && - !(playerStatus->flags & PS_FLAGS_PAUSED) && + !(playerStatus->flags & PS_FLAG_PAUSED) && (playerData->currentPartner != PARTNER_GOOMBARIO || playerStatus->inputEnabledCounter == 0 || playerStatus->actionState == ACTION_STATE_USE_TWEESTER @@ -274,13 +274,13 @@ void entity_Tweester_idle(Entity* entity) { } if (!is_picking_up_item() && - !(playerStatus->flags & PS_FLAGS_PAUSED) && + !(playerStatus->flags & PS_FLAG_PAUSED) && playerStatus->actionState != ACTION_STATE_USE_TWEESTER && playerStatus->blinkTimer == 0 && fabs(dist2D(entity->position.x, entity->position.z, playerStatus->position.x, playerStatus->position.z)) <= 50.0 ) { TweesterTouchingPlayer = entity; - playerStatus->animFlags |= PA_FLAGS_INTERRUPT_USE_PARTNER; + playerStatus->animFlags |= PA_FLAG_INTERRUPT_USE_PARTNER; set_action_state(ACTION_STATE_USE_TWEESTER); } } @@ -315,7 +315,7 @@ EntityScript Entity_Tweester_Script ={ EntityModelScript Entity_Tweester_RenderScript = STANDARD_ENTITY_MODEL_SCRIPT(Entity_Tweester_Render, RENDER_MODE_SURFACE_XLU_LAYER1); EntityBlueprint Entity_Tweester = { - .flags = ENTITY_FLAGS_DISABLE_COLLISION, + .flags = ENTITY_FLAG_DISABLE_COLLISION, .typeDataSize = sizeof(TweesterData), .renderCommandList = Entity_Tweester_RenderScript, .modelAnimationNodes = 0, diff --git a/src/entity_model.c b/src/entity_model.c index a888f55208..a5bb31c70d 100644 --- a/src/entity_model.c +++ b/src/entity_model.c @@ -105,7 +105,7 @@ s32 load_entity_model(EntityModelScript* cmdList) { } ASSERT(newEntityModel != NULL); - newEntityModel->flags = (ENTITY_MODEL_FLAGS_CAM0 | ENTITY_MODEL_FLAGS_CAM1 | ENTITY_MODEL_FLAGS_CAM2 | ENTITY_MODEL_FLAGS_ENABLED); + newEntityModel->flags = (ENTITY_MODEL_FLAG_CAM0 | ENTITY_MODEL_FLAG_CAM1 | ENTITY_MODEL_FLAG_CAM2 | ENTITY_MODEL_FLAG_ENABLED); newEntityModel->renderMode = 1; newEntityModel->gfx.displayList = NULL; newEntityModel->cmdListReadPos = cmdList; @@ -148,7 +148,7 @@ s32 ALT_load_entity_model(EntityModelScript* cmdList) { newEntityModel->gfx.imageData = imageData = heap_malloc(sizeof(*imageData)); ASSERT(imageData != NULL); - newEntityModel->flags = (ENTITY_MODEL_FLAGS_CAM0 | ENTITY_MODEL_FLAGS_CAM1 | ENTITY_MODEL_FLAGS_CAM2 | ENTITY_MODEL_FLAGS_ENABLED | ENTITY_MODEL_FLAGS_USE_IMAGE); + newEntityModel->flags = (ENTITY_MODEL_FLAG_CAM0 | ENTITY_MODEL_FLAG_CAM1 | ENTITY_MODEL_FLAG_CAM2 | ENTITY_MODEL_FLAG_ENABLED | ENTITY_MODEL_FLAG_USE_IMAGE); newEntityModel->renderMode = 1; newEntityModel->cmdListReadPos = cmdList; newEntityModel->nextFrameTime = 1.0f; @@ -174,9 +174,9 @@ void exec_entity_model_commandlist(s32 idx) { idx &= ~BATTLE_ENTITY_ID_MASK; entityModel = (*gCurrentEntityModelList)[idx]; if (entityModel != NULL && (entityModel->flags)) { - if (!(entityModel->flags & ENTITY_MODEL_FLAGS_HIDDEN)) { - if (!(entityModel->flags & ENTITY_MODEL_FLAGS_DISABLE_SCRIPT)) { - entityModel->flags &= ~ENTITY_MODEL_FLAGS_100; + if (!(entityModel->flags & ENTITY_MODEL_FLAG_HIDDEN)) { + if (!(entityModel->flags & ENTITY_MODEL_FLAG_DISABLE_SCRIPT)) { + entityModel->flags &= ~ENTITY_MODEL_FLAG_100; entityModel->nextFrameTime -= entityModel->timeScale; if (entityModel->nextFrameTime <= 0.0f) { while (step_entity_model_commandlist(entityModel)); @@ -247,8 +247,8 @@ void appendGfx_entity_model(EntityModel* model) { gDisplayContext->matrixStack[gMatrixListPos] = model->transform; gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - if (!(model->flags & ENTITY_MODEL_FLAGS_USE_IMAGE)) { - if (!(model->flags & ENTITY_MODEL_FLAGS_10000)) { + if (!(model->flags & ENTITY_MODEL_FLAG_USE_IMAGE)) { + if (!(model->flags & ENTITY_MODEL_FLAG_10000)) { s32 cond; gDPPipeSync(gMasterGfxPos++); @@ -259,7 +259,7 @@ void appendGfx_entity_model(EntityModel* model) { gSPSetOtherMode(gMasterGfxPos++, G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 18, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_POINT | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE); cond = FALSE; - if (entity_fog_enabled && !(model->flags & ENTITY_MODEL_FLAGS_FOG_DISABLED)) { + if (entity_fog_enabled && !(model->flags & ENTITY_MODEL_FLAG_FOG_DISABLED)) { cond = TRUE; } switch (cond) { @@ -348,7 +348,7 @@ void appendGfx_entity_model(EntityModel* model) { break; } gSPClearGeometryMode(gMasterGfxPos++, G_LIGHTING); - if (!entity_fog_enabled || (model->flags & ENTITY_MODEL_FLAGS_FOG_DISABLED)) { + if (!entity_fog_enabled || (model->flags & ENTITY_MODEL_FLAG_FOG_DISABLED)) { gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); } else { gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, 0, TEXEL0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED); @@ -368,7 +368,7 @@ void appendGfx_entity_model(EntityModel* model) { gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); gDPPipeSync(gMasterGfxPos++); - if (!(model->flags & ENTITY_MODEL_FLAGS_REFLECT)) { + if (!(model->flags & ENTITY_MODEL_FLAG_REFLECT)) { return; } @@ -422,9 +422,9 @@ void draw_entity_model_A(s32 modelIdx, Mtx* transformMtx) { if (model != NULL) { if (model->flags != 0) { - if (!(model->flags & ENTITY_MODEL_FLAGS_100)) { - if (!(model->flags & ENTITY_MODEL_FLAGS_HIDDEN)) { - if (!(model->flags & ENTITY_MODEL_FLAGS_40) && (model->flags & (1 << gCurrentCamID))) { + if (!(model->flags & ENTITY_MODEL_FLAG_100)) { + if (!(model->flags & ENTITY_MODEL_FLAG_HIDDEN)) { + if (!(model->flags & ENTITY_MODEL_FLAG_40) && (model->flags & (1 << gCurrentCamID))) { model->transform = *transformMtx; model->vertexArray = NULL; guMtxL2F(mtx, transformMtx); @@ -460,8 +460,8 @@ void draw_entity_model_B(s32 modelIdx, Mtx* transformMtx, s32 vertexSegment, Vec if (model != NULL) { if (model->flags != 0) { - if (!(model->flags & ENTITY_MODEL_FLAGS_100)) { - if (!(model->flags & ENTITY_MODEL_FLAGS_HIDDEN)) { + if (!(model->flags & ENTITY_MODEL_FLAG_100)) { + if (!(model->flags & ENTITY_MODEL_FLAG_HIDDEN)) { if (model->flags & (1 << gCurrentCamID)) { model->transform = *transformMtx; D_80154374 = vertexSegment; @@ -495,10 +495,10 @@ void draw_entity_model_C(s32 modelIdx, Mtx* transformMtx) { if (model != NULL) { if (model->flags != 0) { - if (!(model->flags & ENTITY_MODEL_FLAGS_100)) { - if (!(model->flags & ENTITY_MODEL_FLAGS_HIDDEN)) { - if (!(model->flags & ENTITY_MODEL_FLAGS_40) && (model->flags & (1 << gCurrentCamID))) { - model->flags |= ENTITY_MODEL_FLAGS_REFLECT; + if (!(model->flags & ENTITY_MODEL_FLAG_100)) { + if (!(model->flags & ENTITY_MODEL_FLAG_HIDDEN)) { + if (!(model->flags & ENTITY_MODEL_FLAG_40) && (model->flags & (1 << gCurrentCamID))) { + model->flags |= ENTITY_MODEL_FLAG_REFLECT; model->transform = *transformMtx; model->vertexArray = NULL; rtPtr->renderMode = model->renderMode; @@ -525,10 +525,10 @@ void draw_entity_model_D(s32 modelIdx, Mtx* transformMtx, s32 arg2, Vec3s* verte if (model != NULL) { if (model->flags != 0) { - if (!(model->flags & ENTITY_MODEL_FLAGS_100)) { - if (!(model->flags & ENTITY_MODEL_FLAGS_HIDDEN)) { + if (!(model->flags & ENTITY_MODEL_FLAG_100)) { + if (!(model->flags & ENTITY_MODEL_FLAG_HIDDEN)) { if (model->flags & (1 << gCurrentCamID)) { - model->flags |= ENTITY_MODEL_FLAGS_REFLECT; + model->flags |= ENTITY_MODEL_FLAG_REFLECT; model->transform = *transformMtx; D_80154374 = arg2; model->vertexArray = vertexArray; @@ -558,16 +558,16 @@ void draw_entity_model_E(s32 modelIdx, Mtx* transformMtx) { if (model->flags == 0) { return; } - if (model->flags & ENTITY_MODEL_FLAGS_100) { + if (model->flags & ENTITY_MODEL_FLAG_100) { return; } - if (model->flags & ENTITY_MODEL_FLAGS_HIDDEN) { + if (model->flags & ENTITY_MODEL_FLAG_HIDDEN) { return; } - if (model->flags & ENTITY_MODEL_FLAGS_40) { + if (model->flags & ENTITY_MODEL_FLAG_40) { return; } - if (!(model->flags & ENTITY_MODEL_FLAGS_CAM3)) { + if (!(model->flags & ENTITY_MODEL_FLAG_CAM3)) { return; } @@ -575,9 +575,9 @@ void draw_entity_model_E(s32 modelIdx, Mtx* transformMtx) { model->vertexArray = NULL; gDisplayContext->matrixStack[gMatrixListPos] = model->transform; gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - if (!(model->flags & ENTITY_MODEL_FLAGS_USE_IMAGE)) { + if (!(model->flags & ENTITY_MODEL_FLAG_USE_IMAGE)) { s32 cond = FALSE; - if (entity_fog_enabled && !(model->flags & ENTITY_MODEL_FLAGS_FOG_DISABLED)) { + if (entity_fog_enabled && !(model->flags & ENTITY_MODEL_FLAG_FOG_DISABLED)) { cond = TRUE; } switch (cond) { @@ -666,7 +666,7 @@ void draw_entity_model_E(s32 modelIdx, Mtx* transformMtx) { break; } gSPClearGeometryMode(gMasterGfxPos++, G_LIGHTING); - if (!entity_fog_enabled || (model->flags & ENTITY_MODEL_FLAGS_FOG_DISABLED)) { + if (!entity_fog_enabled || (model->flags & ENTITY_MODEL_FLAG_FOG_DISABLED)) { gDPSetCombineMode(gMasterGfxPos++, G_CC_MODULATEIA, G_CC_MODULATEIA); } else { gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, 0, TEXEL0, COMBINED, 0, SHADE, 0, 0, 0, 0, COMBINED); @@ -677,7 +677,7 @@ void draw_entity_model_E(s32 modelIdx, Mtx* transformMtx) { gSPDisplayList(gMasterGfxPos++, model->gfx.displayList); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); gDPPipeSync(gMasterGfxPos++); - if (!(model->flags & ENTITY_MODEL_FLAGS_REFLECT)) { + if (!(model->flags & ENTITY_MODEL_FLAG_REFLECT)) { return; } @@ -738,7 +738,7 @@ void free_entity_model_by_index(s32 idx) { EntityModel* entityModel = (*gCurrentEntityModelList)[index]; if (entityModel != NULL && entityModel->flags) { - if (entityModel->flags & ENTITY_MODEL_FLAGS_USE_IMAGE) { + if (entityModel->flags & ENTITY_MODEL_FLAG_USE_IMAGE) { heap_free(entityModel->gfx.imageData); } { @@ -796,7 +796,7 @@ void func_80122F8C(s32 idx, s32 newFlags) { void func_80122FB8(s32 idx, s32 newFlags) { EntityModel* entityModel = (*gCurrentEntityModelList)[idx & ~BATTLE_ENTITY_ID_MASK]; - entityModel->flags = (entityModel->flags & ~(ENTITY_MODEL_FLAGS_CAM0 | ENTITY_MODEL_FLAGS_CAM1 | ENTITY_MODEL_FLAGS_CAM2 | ENTITY_MODEL_FLAGS_CAM3)) | newFlags; + entityModel->flags = (entityModel->flags & ~(ENTITY_MODEL_FLAG_CAM0 | ENTITY_MODEL_FLAG_CAM1 | ENTITY_MODEL_FLAG_CAM2 | ENTITY_MODEL_FLAG_CAM3)) | newFlags; } void enable_entity_fog(void) { diff --git a/src/evt/cam_api.c b/src/evt/cam_api.c index 5a83102b8a..1ce8f25e0f 100644 --- a/src/evt/cam_api.c +++ b/src/evt/cam_api.c @@ -21,9 +21,9 @@ ApiStatus SetCamEnabled(Evt* script, s32 isInitialCall) { s32 enabled = evt_get_variable(script, *args++); if (!enabled) { - gCameras[id].flags |= CAMERA_FLAGS_ENABLED; + gCameras[id].flags |= CAMERA_FLAG_ENABLED; } else { - gCameras[id].flags &= ~CAMERA_FLAGS_ENABLED; + gCameras[id].flags &= ~CAMERA_FLAG_ENABLED; } return ApiStatus_DONE2; } @@ -34,9 +34,9 @@ ApiStatus SetCamFlag80(Evt* script, s32 isInitialCall) { s32 enabled = evt_get_variable(script, *args++); if (!enabled) { - gCameras[id].flags |= CAMERA_FLAGS_80; + gCameras[id].flags |= CAMERA_FLAG_80; } else { - gCameras[id].flags &= ~CAMERA_FLAGS_80; + gCameras[id].flags &= ~CAMERA_FLAG_80; } return ApiStatus_DONE2; } @@ -296,7 +296,7 @@ ApiStatus ShakeCam(Evt* script, s32 isInitialCall) { } } - camera->flags |= CAMERA_FLAGS_SHAKING; + camera->flags |= CAMERA_FLAG_SHAKING; scale = script->functionTempF[3]; switch (shakeMode) { case CAM_SHAKE_CONSTANT_VERTICAL: @@ -318,7 +318,7 @@ ApiStatus ShakeCam(Evt* script, s32 isInitialCall) { } if (script->functionTemp[1] == 0) { - camera->flags &= ~CAMERA_FLAGS_SHAKING; + camera->flags &= ~CAMERA_FLAG_SHAKING; return ApiStatus_DONE2; } script->functionTemp[1]--; @@ -351,9 +351,9 @@ ApiStatus SetCamLeadPlayer(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[id]; if (enabled) { - camera->flags |= CAMERA_FLAGS_LEAD_PLAYER; + camera->flags |= CAMERA_FLAG_LEAD_PLAYER; } else { - camera->flags &= ~CAMERA_FLAGS_LEAD_PLAYER; + camera->flags &= ~CAMERA_FLAG_LEAD_PLAYER; } return ApiStatus_DONE2; } diff --git a/src/evt/fa4c0_len_3bf0.c b/src/evt/fa4c0_len_3bf0.c index 6364df24ab..c102ce30c7 100644 --- a/src/evt/fa4c0_len_3bf0.c +++ b/src/evt/fa4c0_len_3bf0.c @@ -119,7 +119,7 @@ ApiStatus EnableMusicProximityMix(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 playerIndex = evt_get_variable(script, *args++); - gMusicSettings[playerIndex].flags |= MUSIC_SETTINGS_FLAGS_ENABLE_PROXIMITY_MIX; + gMusicSettings[playerIndex].flags |= MUSIC_SETTINGS_FLAG_ENABLE_PROXIMITY_MIX; return ApiStatus_DONE2; } @@ -656,7 +656,7 @@ ApiStatus DropTinyItemEntity(Evt* script, s32 isInitialCall) { s32 pickupVar = evt_get_variable_index(script, *args++); script->varTable[0] = make_item_entity_nodelay(itemID, x, y, z, itemSpawnMode, pickupVar); - set_item_entity_flags(script->varTable[0], ITEM_ENTITY_FLAGS_TINY); + set_item_entity_flags(script->varTable[0], ITEM_ENTITY_FLAG_TINY); return ApiStatus_DONE2; } diff --git a/src/evt/fx_api.c b/src/evt/fx_api.c index 2de18d7e2f..31b8d2298a 100644 --- a/src/evt/fx_api.c +++ b/src/evt/fx_api.c @@ -127,7 +127,7 @@ ApiStatus func_802D7B10(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EffectInstance* effect = (EffectInstance*)evt_get_variable(script, *args++); - effect->flags |= EFFECT_INSTANCE_FLAGS_10; + effect->flags |= EFFECT_INSTANCE_FLAG_10; return ApiStatus_DONE2; } diff --git a/src/evt/map_api.c b/src/evt/map_api.c index 5ddd513b9c..7a5f43dfff 100644 --- a/src/evt/map_api.c +++ b/src/evt/map_api.c @@ -19,9 +19,9 @@ ApiStatus TranslateModel(Evt* script, s32 isInitialCall) { z = evt_get_float_variable(script, *args++); model = get_model_from_list_index(modelIndex); - if (!(model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) { + if (!(model->flags & MODEL_FLAG_HAS_TRANSFORM_APPLIED)) { guTranslateF(model->transformMatrix, x, y, z); - model->flags |= (MODEL_FLAGS_HAS_TRANSFORM_APPLIED | MODEL_FLAGS_USES_TRANSFORM_MATRIX); + model->flags |= (MODEL_FLAG_HAS_TRANSFORM_APPLIED | MODEL_FLAG_USES_TRANSFORM_MATRIX); } else { Matrix4f mtx; @@ -42,9 +42,9 @@ ApiStatus RotateModel(Evt* script, s32 isInitialCall) { f32 z = evt_get_float_variable(script, *args++); Model* model = get_model_from_list_index(modelListIndex); - if (!(model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) { + if (!(model->flags & MODEL_FLAG_HAS_TRANSFORM_APPLIED)) { guRotateF(model->transformMatrix, a, x, y, z); - model->flags |= (MODEL_FLAGS_HAS_TRANSFORM_APPLIED | MODEL_FLAGS_USES_TRANSFORM_MATRIX); + model->flags |= (MODEL_FLAG_HAS_TRANSFORM_APPLIED | MODEL_FLAG_USES_TRANSFORM_MATRIX); } else { Matrix4f mtx; @@ -69,9 +69,9 @@ ApiStatus ScaleModel(Evt* script, s32 isInitialCall) { z = evt_get_float_variable(script, *args++); model = get_model_from_list_index(modelIndex); - if (!(model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) { + if (!(model->flags & MODEL_FLAG_HAS_TRANSFORM_APPLIED)) { guScaleF(model->transformMatrix, x, y, z); - model->flags |= (MODEL_FLAGS_HAS_TRANSFORM_APPLIED | MODEL_FLAGS_USES_TRANSFORM_MATRIX); + model->flags |= (MODEL_FLAG_HAS_TRANSFORM_APPLIED | MODEL_FLAG_USES_TRANSFORM_MATRIX); } else { Matrix4f mtx; @@ -96,7 +96,7 @@ ApiStatus InvalidateModelTransform(Evt* script, s32 isInitialCall) { Bytecode modelID = evt_get_variable(script, *args++); Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(modelID)); - model->flags &= ~MODEL_FLAGS_HAS_TRANSFORM_APPLIED; + model->flags &= ~MODEL_FLAG_HAS_TRANSFORM_APPLIED; return ApiStatus_DONE2; } @@ -133,7 +133,7 @@ ApiStatus SetTexPanner(Evt* script, s32 isInitialCall) { Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex)); set_tex_panner(model, var2); - model->flags |= MODEL_FLAGS_HAS_TEX_PANNER; + model->flags |= MODEL_FLAG_HAS_TEX_PANNER; return ApiStatus_DONE2; } @@ -144,9 +144,9 @@ ApiStatus SetCustomGfxEnabled(Evt* script, s32 isInitialCall) { Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex)); if (enable) { - model->flags |= MODEL_FLAGS_USES_CUSTOM_GFX; + model->flags |= MODEL_FLAG_USES_CUSTOM_GFX; } else { - model->flags &= ~MODEL_FLAGS_USES_CUSTOM_GFX; + model->flags &= ~MODEL_FLAG_USES_CUSTOM_GFX; } return ApiStatus_DONE2; } @@ -163,7 +163,7 @@ ApiStatus SetModelCustomGfx(Evt* script, s32 isInitialCall) { set_mdl_custom_gfx_set(model, customGfxUnit, var3); if (customGfxUnit != -1) { - model->flags |= MODEL_FLAGS_USES_CUSTOM_GFX; + model->flags |= MODEL_FLAG_USES_CUSTOM_GFX; } return ApiStatus_DONE2; } @@ -184,9 +184,9 @@ ApiStatus EnableTexPanning(Evt* script, s32 isInitialCall) { Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex)); if (flag) { - model->flags |= MODEL_FLAGS_HAS_TEX_PANNER; + model->flags |= MODEL_FLAG_HAS_TEX_PANNER; } else { - model->flags &= ~MODEL_FLAGS_HAS_TEX_PANNER; + model->flags &= ~MODEL_FLAG_HAS_TEX_PANNER; } return ApiStatus_DONE2; } @@ -198,9 +198,9 @@ ApiStatus EnableModel(Evt* script, s32 isInitialCall) { Model* model = get_model_from_list_index(listIndex); if (flag != 0) { - model->flags &= ~MODEL_FLAGS_ENABLED; + model->flags &= ~MODEL_FLAG_ENABLED; } else { - model->flags |= MODEL_FLAGS_ENABLED; + model->flags |= MODEL_FLAG_ENABLED; } return ApiStatus_DONE2; } @@ -373,10 +373,10 @@ ApiStatus TranslateGroup(Evt* script, s32 isInitialCall) { transformGroup = get_transform_group(index); - index = transformGroup->flags & MODEL_TRANSFORM_GROUP_FLAGS_400; // TODO fix weird match + index = transformGroup->flags & MODEL_TRANSFORM_GROUP_FLAG_400; // TODO fix weird match if (!index) { guTranslateF(transformGroup->matrixB, x, y, z); - transformGroup->flags |= (MODEL_TRANSFORM_GROUP_FLAGS_400 | MODEL_TRANSFORM_GROUP_FLAGS_1000); + transformGroup->flags |= (MODEL_TRANSFORM_GROUP_FLAG_400 | MODEL_TRANSFORM_GROUP_FLAG_1000); } else { guTranslateF(mtx, x, y, z); guMtxCatF(mtx, transformGroup->matrixB, transformGroup->matrixB); @@ -405,9 +405,9 @@ ApiStatus RotateGroup(Evt* script, s32 isInitialCall) { transformGroup = get_transform_group(index); - if (!(transformGroup->flags & MODEL_TRANSFORM_GROUP_FLAGS_400)) { + if (!(transformGroup->flags & MODEL_TRANSFORM_GROUP_FLAG_400)) { guRotateF(transformGroup->matrixB, a, x, y, z); - transformGroup->flags |= (MODEL_TRANSFORM_GROUP_FLAGS_400 | MODEL_TRANSFORM_GROUP_FLAGS_1000); + transformGroup->flags |= (MODEL_TRANSFORM_GROUP_FLAG_400 | MODEL_TRANSFORM_GROUP_FLAG_1000); } else { Matrix4f mtx; @@ -438,10 +438,10 @@ ApiStatus ScaleGroup(Evt* script, s32 isInitialCall) { transformGroup = get_transform_group(transformIndex); - transformIndex = transformGroup->flags & MODEL_TRANSFORM_GROUP_FLAGS_400; // TODO fix weird match + transformIndex = transformGroup->flags & MODEL_TRANSFORM_GROUP_FLAG_400; // TODO fix weird match if (!(transformIndex)) { guScaleF(transformGroup->matrixB, x, y, z); - transformGroup->flags |= (MODEL_TRANSFORM_GROUP_FLAGS_400 | MODEL_TRANSFORM_GROUP_FLAGS_1000); + transformGroup->flags |= (MODEL_TRANSFORM_GROUP_FLAG_400 | MODEL_TRANSFORM_GROUP_FLAG_1000); } else { Matrix4f mtx; @@ -480,9 +480,9 @@ ApiStatus EnableGroup(Evt* script, s32 isInitialCall) { for (index = transformGroup->minChildModelIndex; index <= transformGroup->maxChildModelIndex; index++) { Model* model = get_model_from_list_index(index); if (flagUnset) { - model->flags &= ~MODEL_FLAGS_ENABLED; + model->flags &= ~MODEL_FLAG_ENABLED; } else { - model->flags |= MODEL_FLAGS_ENABLED; + model->flags |= MODEL_FLAG_ENABLED; } } @@ -574,9 +574,9 @@ ApiStatus ResetFromLava(Evt* script, s32 isInitialCall) { } collider = &gCollisionData.colliderList[lavaReset->colliderID]; if (collider->firstChild >= 0) { - modify_collider_family_flags(collider->firstChild, COLLIDER_FLAGS_SAFE_FLOOR, 0); + modify_collider_family_flags(collider->firstChild, COLLIDER_FLAG_SAFE_FLOOR, 0); } - collider->flags |= COLLIDER_FLAGS_SAFE_FLOOR; + collider->flags |= COLLIDER_FLAG_SAFE_FLOOR; lavaReset++; } @@ -585,7 +585,7 @@ ApiStatus ResetFromLava(Evt* script, s32 isInitialCall) { if (!(collisionStatus->currentFloor & COLLISION_WITH_ENTITY_BIT)) { collider = &gCollisionData.colliderList[collisionStatus->currentFloor]; - if (collider->flags & COLLIDER_FLAGS_SAFE_FLOOR) { + if (collider->flags & COLLIDER_FLAG_SAFE_FLOOR) { LastSafeFloor = collisionStatus->currentFloor; return ApiStatus_BLOCK; } @@ -662,10 +662,10 @@ void set_zone_enabled(s32 zoneID, s32 enabled) { switch (enabled) { case 0: - zone->flags |= TEMP_SET_ZONE_ENABLED_FLAGS_10000; + zone->flags |= TEMP_SET_ZONE_ENABLED_FLAG_10000; break; case 1: - zone->flags &= ~TEMP_SET_ZONE_ENABLED_FLAGS_10000; + zone->flags &= ~TEMP_SET_ZONE_ENABLED_FLAG_10000; break; } } @@ -682,10 +682,10 @@ ApiStatus SetZoneEnabled(Evt* script, s32 isInitialCall) { switch (enabled) { case FALSE: - zone->flags |= TEMP_SET_ZONE_ENABLED_FLAGS_10000; + zone->flags |= TEMP_SET_ZONE_ENABLED_FLAG_10000; break; case TRUE: - zone->flags &= ~TEMP_SET_ZONE_ENABLED_FLAGS_10000; + zone->flags &= ~TEMP_SET_ZONE_ENABLED_FLAG_10000; break; } diff --git a/src/evt/player_api.c b/src/evt/player_api.c index 35517d849e..a1b056cc0f 100644 --- a/src/evt/player_api.c +++ b/src/evt/player_api.c @@ -44,7 +44,7 @@ ApiStatus DisablePlayerInput(Evt* script, s32 isInitialCall) { close_status_menu(); func_800E984C(); if (playerStatus->actionState == ACTION_STATE_SPIN) { - playerStatus->animFlags |= PA_FLAGS_INTERRUPT_SPIN; + playerStatus->animFlags |= PA_FLAG_INTERRUPT_SPIN; } gOverrideFlags |= GLOBAL_OVERRIDES_40; } else { @@ -252,12 +252,12 @@ s32 player_jump(Evt* script, s32 isInitialCall, s32 mode) { } playerNpc->jumpVelocity = (playerNpc->jumpScale * (playerNpc->duration - 1) / 2) + (yTemp / playerNpc->duration); - playerStatus->flags |= PS_FLAGS_FLYING; - playerStatus->animFlags |= PA_FLAGS_NO_OOB_RESPAWN; + playerStatus->flags |= PS_FLAG_FLYING; + playerStatus->animFlags |= PA_FLAG_NO_OOB_RESPAWN; if (mode == 0) { - if (!(playerStatus->animFlags & PA_FLAGS_8BIT_MARIO)) { - if (!(playerStatus->animFlags & PA_FLAGS_USING_WATT)) { + if (!(playerStatus->animFlags & PA_FLAG_8BIT_MARIO)) { + if (!(playerStatus->animFlags & PA_FLAG_USING_WATT)) { anim = ANIM_Mario_AnimMidairStill; } else { anim = ANIM_Mario_60009; @@ -277,8 +277,8 @@ s32 player_jump(Evt* script, s32 isInitialCall, s32 mode) { playerNpc->jumpVelocity -= playerNpc->jumpScale; if (mode == 0 && jumpVelocity > 0.0f && playerNpc->jumpVelocity <= 0.0f) { - if (!(playerStatus->animFlags & PA_FLAGS_8BIT_MARIO)) { - if (!(playerStatus->animFlags & PA_FLAGS_USING_WATT)) { + if (!(playerStatus->animFlags & PA_FLAG_8BIT_MARIO)) { + if (!(playerStatus->animFlags & PA_FLAG_USING_WATT)) { anim = ANIM_Mario_AnimMidair; } else { anim = ANIM_Mario_6000A; @@ -299,12 +299,12 @@ s32 player_jump(Evt* script, s32 isInitialCall, s32 mode) { playerNpc->duration--; if (playerNpc->duration == 0) { - playerStatus->flags &= ~PS_FLAGS_FLYING; - playerStatus->animFlags &= ~PA_FLAGS_NO_OOB_RESPAWN; + playerStatus->flags &= ~PS_FLAG_FLYING; + playerStatus->animFlags &= ~PA_FLAG_NO_OOB_RESPAWN; if (mode == 0) { - if (!(playerStatus->animFlags & PA_FLAGS_8BIT_MARIO)) { - if (!(playerStatus->animFlags & PA_FLAGS_USING_WATT)) { + if (!(playerStatus->animFlags & PA_FLAG_8BIT_MARIO)) { + if (!(playerStatus->animFlags & PA_FLAG_USING_WATT)) { anim = ANIM_Mario_10009; } else { anim = ANIM_Mario_6000B; @@ -527,13 +527,13 @@ ApiStatus UseEntryHeading(Evt *script, s32 isInitialCall) { gPlayerStatus.position.z = (entryZ - (var1 * cosTheta)) - (exitTangentFrac * sinTheta); script->varTableF[5] = dist2D(gPlayerStatus.position.x, gPlayerStatus.position.z, entryX, entryZ) / var2; - gPlayerStatus.flags |= PS_FLAGS_CAMERA_DOESNT_FOLLOW; + gPlayerStatus.flags |= PS_FLAG_CAMERA_DOESNT_FOLLOW; return ApiStatus_DONE2; } ApiStatus func_802D2148(Evt* script, s32 isInitialCall) { - gPlayerStatus.flags &= ~PS_FLAGS_CAMERA_DOESNT_FOLLOW; + gPlayerStatus.flags &= ~PS_FLAG_CAMERA_DOESNT_FOLLOW; return ApiStatus_DONE2; } @@ -568,8 +568,8 @@ ApiStatus UseExitHeading(Evt* script, s32 isInitialCall) { script->varTable[3] = (playerStatus->position.z - (var1 * cosTheta)) - (exitTangentFrac * sinTheta); script->varTable[2] = (*mapSettings->entryList)[entryID].y; *varTableVar5 = var1 / 15; - playerStatus->animFlags |= PA_FLAGS_CHANGING_MAP; - playerStatus->flags |= PS_FLAGS_CAMERA_DOESNT_FOLLOW; + playerStatus->animFlags |= PA_FLAG_CHANGING_MAP; + playerStatus->flags |= PS_FLAG_CAMERA_DOESNT_FOLLOW; return ApiStatus_DONE2; } @@ -623,7 +623,7 @@ ApiStatus WaitForPlayerMoveToComplete(Evt* script, s32 isInitialCall) { } ApiStatus WaitForPlayerInputEnabled(Evt* script, s32 isInitialCall) { - if (gPlayerStatus.flags & PS_FLAGS_INPUT_DISABLED) { + if (gPlayerStatus.flags & PS_FLAG_INPUT_DISABLED) { return ApiStatus_BLOCK; } else { return ApiStatus_DONE2; @@ -753,9 +753,9 @@ ApiStatus DisablePulseStone(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; if (evt_get_variable(script, *script->ptrReadPos)) { - playerStatus->animFlags &= ~PA_FLAGS_USING_PULSE_STONE; + playerStatus->animFlags &= ~PA_FLAG_USING_PULSE_STONE; } else { - playerStatus->animFlags |= PA_FLAGS_USING_PULSE_STONE; + playerStatus->animFlags |= PA_FLAG_USING_PULSE_STONE; } return ApiStatus_DONE2; @@ -779,14 +779,14 @@ ApiStatus GetPartnerInUse(Evt* script, s32 isInitialCall) { ApiStatus ForceUsePartner(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; - playerStatus->animFlags |= PA_FLAGS_FORCE_USE_PARTNER; + playerStatus->animFlags |= PA_FLAG_FORCE_USE_PARTNER; return ApiStatus_DONE2; } ApiStatus InterruptUsePartner(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; - playerStatus->animFlags |= PA_FLAGS_INTERRUPT_USE_PARTNER; + playerStatus->animFlags |= PA_FLAG_INTERRUPT_USE_PARTNER; return ApiStatus_DONE2; } @@ -797,13 +797,13 @@ ApiStatus Disable8bitMario(Evt* script, s32 isInitialCall) { if (evt_get_variable(script, *args)) { playerStatus->colliderHeight = 37; playerStatus->colliderDiameter = 26; - playerStatus->animFlags &= ~PA_FLAGS_8BIT_MARIO; + playerStatus->animFlags &= ~PA_FLAG_8BIT_MARIO; } else { playerStatus->colliderHeight = 19; playerStatus->colliderDiameter = 26; - playerStatus->animFlags |= PA_FLAGS_8BIT_MARIO - | PA_FLAGS_INTERRUPT_SPIN - | PA_FLAGS_INTERRUPT_USE_PARTNER; + playerStatus->animFlags |= PA_FLAG_8BIT_MARIO + | PA_FLAG_INTERRUPT_SPIN + | PA_FLAG_INTERRUPT_USE_PARTNER; } return ApiStatus_DONE2; diff --git a/src/evt/virtual_entity.c b/src/evt/virtual_entity.c index e5194ae00f..0577d06a3f 100644 --- a/src/evt/virtual_entity.c +++ b/src/evt/virtual_entity.c @@ -68,7 +68,7 @@ void virtual_entity_list_render_world(void) { for (i = 0; i < ARRAY_COUNT(*gCurrentVirtualEntityListPtr); i++) { virtualEntity = (*gCurrentVirtualEntityListPtr)[i]; if (virtualEntity != NULL) { - if (!(virtualEntity->entityModelIndex < 0 || get_entity_model(virtualEntity->entityModelIndex)->flags & ENTITY_MODEL_FLAGS_CAM3)) { + if (!(virtualEntity->entityModelIndex < 0 || get_entity_model(virtualEntity->entityModelIndex)->flags & ENTITY_MODEL_FLAG_CAM3)) { guTranslateF(translation, virtualEntity->pos.x, virtualEntity->pos.y, virtualEntity->pos.z); guRotateF(xRot, virtualEntity->rot.x, 1.0f, 0.0f, 0.0f); guRotateF(yRot, virtualEntity->rot.y, 0.0f, 1.0f, 0.0f); @@ -101,7 +101,7 @@ void virtual_entity_list_render_UI(void) { for (i = 0; i < ARRAY_COUNT(*gCurrentVirtualEntityListPtr); i++) { virtualEntity = (*gCurrentVirtualEntityListPtr)[i]; if (virtualEntity != NULL) { - if (!(virtualEntity->entityModelIndex < 0 || !(get_entity_model(virtualEntity->entityModelIndex)->flags & ENTITY_MODEL_FLAGS_CAM3))) { + if (!(virtualEntity->entityModelIndex < 0 || !(get_entity_model(virtualEntity->entityModelIndex)->flags & ENTITY_MODEL_FLAG_CAM3))) { guTranslateF(translation, virtualEntity->pos.x, virtualEntity->pos.y, virtualEntity->pos.z); guRotateF(xRot, virtualEntity->rot.x, 1.0f, 0.0f, 0.0f); guRotateF(yRot, virtualEntity->rot.y, 0.0f, 1.0f, 0.0f); diff --git a/src/filemenu/filemenu_common.c b/src/filemenu/filemenu_common.c index 1dfe7c4c54..450386f1b2 100644 --- a/src/filemenu/filemenu_common.c +++ b/src/filemenu/filemenu_common.c @@ -62,7 +62,7 @@ MenuWindowBP filemenu_common_windowBPs[3] = { .tab = NULL, .parentID = -1, .fpUpdate = { WINDOW_UPDATE_SHOW }, - .extraFlags = WINDOW_FLAGS_40, + .extraFlags = WINDOW_FLAG_40, .style = { .customStyle = &filemenu_windowStyles[0] }, }, { @@ -152,7 +152,7 @@ void filemenu_set_cursor_goal_pos(s32 windowID, s32 posX, s32 posY) { Window* window = &gWindows[i]; s8 parent = window->parent; - if ((parent == -1 || parent == WINDOW_ID_FILEMENU_MAIN) && (window->flags & WINDOW_FLAGS_INITIAL_ANIMATION)) { + if ((parent == -1 || parent == WINDOW_ID_FILEMENU_MAIN) && (window->flags & WINDOW_FLAG_INITIAL_ANIMATION)) { break; } } @@ -164,8 +164,8 @@ void filemenu_set_cursor_goal_pos(s32 windowID, s32 posX, s32 posY) { filemenu_cursor_posX = posX; filemenu_cursor_targetY = posY; filemenu_cursor_posY = posY; - } else if (!(window->flags & WINDOW_FLAGS_INITIAL_ANIMATION) && - (window->parent == -1 || !(gWindows[window->parent].flags & WINDOW_FLAGS_INITIAL_ANIMATION))) { + } else if (!(window->flags & WINDOW_FLAG_INITIAL_ANIMATION) && + (window->parent == -1 || !(gWindows[window->parent].flags & WINDOW_FLAG_INITIAL_ANIMATION))) { filemenu_cursor_targetX = posX; filemenu_cursor_targetY = posY; } @@ -207,7 +207,7 @@ void filemenu_update_cursor(void) { Window* window = &gWindows[i]; s8 parent = window->parent; - if ((parent == -1 || parent == WINDOW_ID_FILEMENU_MAIN) && (window->flags & WINDOW_FLAGS_INITIAL_ANIMATION)) { + if ((parent == -1 || parent == WINDOW_ID_FILEMENU_MAIN) && (window->flags & WINDOW_FLAG_INITIAL_ANIMATION)) { break; } } @@ -245,7 +245,7 @@ void filemenu_update(void) { for (i = WINDOW_ID_FILEMENU_MAIN; i < ARRAY_COUNT(gWindows); i++) { if ((gWindows[i].parent == -1 || gWindows[i].parent == WINDOW_ID_FILEMENU_MAIN) && - (gWindows[i].flags & WINDOW_FLAGS_INITIAL_ANIMATION)) + (gWindows[i].flags & WINDOW_FLAG_INITIAL_ANIMATION)) { break; } @@ -295,14 +295,14 @@ void func_8024330C( s32 updateCounter = window->updateCounter; if (updateCounter == 0) { - window->flags &= ~WINDOW_FLAGS_HIDDEN; + window->flags &= ~WINDOW_FLAG_HIDDEN; } if (updateCounter < ARRAY_COUNT(D_80249BBC)) { *posX -= D_80249BBC[updateCounter]; } else { *posX -= D_80249BBC[ARRAY_COUNT(D_80249BBC) - 1]; - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; } } @@ -319,14 +319,14 @@ void filemenu_update_show_name_input( s32 updateCounter = window->updateCounter; if (updateCounter == 0) { - window->flags &= ~WINDOW_FLAGS_HIDDEN; + window->flags &= ~WINDOW_FLAG_HIDDEN; } if (updateCounter < ARRAY_COUNT(D_80249BDC)) { *posX += D_80249BDC[updateCounter]; } else { *posX += D_80249BDC[ARRAY_COUNT(D_80249BDC) - 1]; - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; } } @@ -343,14 +343,14 @@ void filemenu_update_show_options_left( s32 updateCounter = window->updateCounter; if (updateCounter == 0) { - window->flags &= ~WINDOW_FLAGS_HIDDEN; + window->flags &= ~WINDOW_FLAG_HIDDEN; } if (updateCounter < ARRAY_COUNT(D_80249BFC)) { *posX -= D_80249BFC[updateCounter]; } else { *posX -= D_80249BFC[ARRAY_COUNT(D_80249BFC) - 1]; - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; } } @@ -367,14 +367,14 @@ void filemenu_update_show_options_right( s32 updateCounter = window->updateCounter; if (updateCounter == 0) { - window->flags &= ~WINDOW_FLAGS_HIDDEN; + window->flags &= ~WINDOW_FLAG_HIDDEN; } if (updateCounter < ARRAY_COUNT(D_80249C1C)) { *posX += D_80249C1C[updateCounter]; } else { *posX += D_80249C1C[ARRAY_COUNT(D_80249C1C) - 1]; - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; } } @@ -391,14 +391,14 @@ void filemenu_update_show_options_bottom( s32 updateCounter = window->updateCounter; if (updateCounter == 0) { - window->flags &= ~WINDOW_FLAGS_HIDDEN; + window->flags &= ~WINDOW_FLAG_HIDDEN; } if (updateCounter < ARRAY_COUNT(D_80249C3C)) { *posY += D_80249C3C[updateCounter]; } else { *posY += D_80249C3C[ARRAY_COUNT(D_80249C3C) - 1]; - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; } } @@ -415,14 +415,14 @@ void filemenu_update_show_title( s32 updateCounter = window->updateCounter; if (updateCounter == 0) { - window->flags &= ~WINDOW_FLAGS_HIDDEN; + window->flags &= ~WINDOW_FLAG_HIDDEN; } if (updateCounter < ARRAY_COUNT(D_80249C5C)) { *posY -= D_80249C5C[updateCounter]; } else { *posY -= D_80249C5C[ARRAY_COUNT(D_80249C5C) - 1]; - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; } } @@ -442,8 +442,8 @@ void func_802435C4( *posX += D_80249C7C[updateCounter]; } else { *posX += D_80249C7C[ARRAY_COUNT(D_80249C7C) - 1]; - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; - window->flags |= WINDOW_FLAGS_HIDDEN; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; + window->flags |= WINDOW_FLAG_HIDDEN; } } @@ -463,8 +463,8 @@ void filemenu_update_hidden_name_input( *posX -= D_80249C90[updateCounter]; } else { *posX -= D_80249C90[ARRAY_COUNT(D_80249C90) - 1]; - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; - window->flags |= WINDOW_FLAGS_HIDDEN; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; + window->flags |= WINDOW_FLAG_HIDDEN; } } @@ -484,8 +484,8 @@ void filemenu_update_hidden_options_left( *posX += D_80249CA4[updateCounter]; } else { *posX += D_80249CA4[ARRAY_COUNT(D_80249CA4) - 1]; - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; - window->flags |= WINDOW_FLAGS_HIDDEN; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; + window->flags |= WINDOW_FLAG_HIDDEN; } } @@ -505,8 +505,8 @@ void filemenu_update_hidden_options_right( *posX -= D_80249CB8[updateCounter]; } else { *posX -= D_80249CB8[ARRAY_COUNT(D_80249CB8) - 1]; - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; - window->flags |= WINDOW_FLAGS_HIDDEN; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; + window->flags |= WINDOW_FLAG_HIDDEN; } } @@ -526,8 +526,8 @@ void filemenu_update_hidden_title( *posY += D_80249CCC[updateCounter]; } else { *posY += D_80249CCC[ARRAY_COUNT(D_80249CCC) - 1]; - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; - window->flags |= WINDOW_FLAGS_HIDDEN; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; + window->flags |= WINDOW_FLAG_HIDDEN; } } @@ -547,8 +547,8 @@ void filemenu_update_hidden_options_bottom( *posY -= D_80249CE0[updateCounter]; } else { *posY -= D_80249CE0[ARRAY_COUNT(D_80249CE0) - 1]; - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; - window->flags |= WINDOW_FLAGS_HIDDEN; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; + window->flags |= WINDOW_FLAG_HIDDEN; } } @@ -565,15 +565,15 @@ void filemenu_update_show_with_rotation( s32 updateCounter = window->updateCounter; if (updateCounter == 0) { - window->flags &= ~WINDOW_FLAGS_HIDDEN; + window->flags &= ~WINDOW_FLAG_HIDDEN; } if (updateCounter < ARRAY_COUNT(D_80249CF4)) { *rotY += D_80249CF4[updateCounter]; - *flags = DRAW_FLAGS_CULL_BACK | DRAW_FLAGS_ROTSCALE; + *flags = DRAW_FLAG_CULL_BACK | DRAW_FLAG_ROTSCALE; } else { *flags = 0; - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; } } @@ -591,11 +591,11 @@ void filemenu_update_hidden_with_rotation( if (updateCounter < 10) { // TODO: array count? *rotY += -D_80249D14[updateCounter]; - *flags = DRAW_FLAGS_CULL_BACK | DRAW_FLAGS_ROTSCALE; + *flags = DRAW_FLAG_CULL_BACK | DRAW_FLAG_ROTSCALE; } else { *flags = 0; - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; - window->flags |= WINDOW_FLAGS_HIDDEN; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; + window->flags |= WINDOW_FLAG_HIDDEN; } } @@ -621,7 +621,7 @@ void filemenu_update_select_file( } else { *posX += -window->pos.x + ((f32) (widthDelta - window->pos.x) + window->pos.x); *posY += -window->pos.y + ((f32) (heightDelta - window->pos.y) + window->pos.y); - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; } } @@ -644,7 +644,7 @@ void filemenu_update_deselect_file( } else { *posX += -window->pos.x + ((80 - window->pos.x) * 0.0f + window->pos.x); *posY += -window->pos.y + ((36 - window->pos.y) * 0.0f + window->pos.y); - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; } } @@ -680,11 +680,11 @@ void filemenu_update_show_name_confirm( counter = updateCounter - 10; if (counter < 10) { - window->flags &= ~WINDOW_FLAGS_HIDDEN; + window->flags &= ~WINDOW_FLAG_HIDDEN; *posY -= D_80249D34[counter]; } if (updateCounter >= 20) { - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; } } @@ -709,8 +709,8 @@ void filemenu_update_hidden_name_confirm( filemenu_draw_rect(0, 0, 1280, 960, 0, 0, 0, 0, 0); *posY -= D_80249D48[updateCounter]; } else { - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; - window->flags |= WINDOW_FLAGS_HIDDEN; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; + window->flags |= WINDOW_FLAG_HIDDEN; } } @@ -852,7 +852,7 @@ void filemenu_init(s32 arg0) { dma_copy(ui_images_ROM_START, ui_images_ROM_END, ui_images_VRAM); for (i = 0; i < ARRAY_COUNT(filemenu_cursorHudElemID); i++) { filemenu_cursorHudElemID[i] = hud_element_create(filemenu_cursor_hudElemScripts[i]); - hud_element_set_flags(filemenu_cursorHudElemID[i], HUD_ELEMENT_FLAGS_DROP_SHADOW | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(filemenu_cursorHudElemID[i], HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_80); } filemenu_cursorHudElem = filemenu_cursorHudElemID[0]; diff --git a/src/filemenu/filemenu_createfile.c b/src/filemenu/filemenu_createfile.c index 7e8f850a00..caa8bda956 100644 --- a/src/filemenu/filemenu_createfile.c +++ b/src/filemenu/filemenu_createfile.c @@ -71,7 +71,7 @@ void filemenu_update_change_layout( Window* window = &gWindows[windowIdx]; if (window->updateCounter == 8) { - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; set_window_update(windowIdx, WINDOW_UPDATE_SHOW); } } @@ -130,7 +130,7 @@ void filemenu_draw_contents_choose_name( s32 color; Window* window = &gWindows[WINDOW_ID_FILEMENU_KEYBOARD]; - if ((window->flags & WINDOW_FLAGS_INITIAL_ANIMATION) && window->fpUpdate.func == filemenu_update_change_layout) { + if ((window->flags & WINDOW_FLAG_INITIAL_ANIMATION) && window->fpUpdate.func == filemenu_update_change_layout) { changeLayoutOffset = window->updateCounter * 2; currentPage = menu->page; previousPage = menu->page != 1; @@ -249,7 +249,7 @@ void filemenu_choose_name_init(MenuPanel* menu) { for (i = 0; i < ARRAY_COUNT(filemenu_createfile_hudElemScripts); i++) { filemenu_createfile_hudElems[i] = hud_element_create(filemenu_createfile_hudElemScripts[i]); - hud_element_set_flags(filemenu_createfile_hudElems[i], HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(filemenu_createfile_hudElems[i], HUD_ELEMENT_FLAG_80); } for (i = 0; i < ARRAY_COUNT(filemenu_createfile_windowBPs); i++) { diff --git a/src/filemenu/filemenu_main.c b/src/filemenu/filemenu_main.c index 68050a6ef9..614f52854d 100644 --- a/src/filemenu/filemenu_main.c +++ b/src/filemenu/filemenu_main.c @@ -557,7 +557,7 @@ void filemenu_main_init(MenuPanel* menu) { for (i = 0; i < ARRAY_COUNT(filemenu_hudElemIDs); i++) { filemenu_hudElemIDs[i] = hud_element_create(filemenu_main_hudElemScripts[i]); - hud_element_set_flags(filemenu_hudElemIDs[i], HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(filemenu_hudElemIDs[i], HUD_ELEMENT_FLAG_80); } for (i = 0; i < ARRAY_COUNT(filemenu_main_windowBPs); i++) { diff --git a/src/global_hud_scripts.c b/src/global_hud_scripts.c index 2966f83d49..aa1c0a0402 100644 --- a/src/global_hud_scripts.c +++ b/src/global_hud_scripts.c @@ -1697,9 +1697,9 @@ HudScript HES_GreenArrowDown = { hs_SetVisible hs_SetCustomSize(16, 8) hs_Loop - hs_ClearFlags(HUD_ELEMENT_FLAGS_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_200000) hs_SetCI(9, ui_green_arrow_down) - hs_SetFlags(HUD_ELEMENT_FLAGS_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_200000) hs_SetCI(6, ui_green_arrow_down) hs_Restart hs_End @@ -1709,9 +1709,9 @@ HudScript HES_GreenArrowUp = { hs_SetVisible hs_SetCustomSize(16, 8) hs_Loop - hs_ClearFlags(HUD_ELEMENT_FLAGS_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_200000) hs_SetCI(9, ui_green_arrow_up) - hs_SetFlags(HUD_ELEMENT_FLAGS_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_200000) hs_SetCI(6, ui_green_arrow_up) hs_Restart hs_End @@ -1975,9 +1975,9 @@ HudScript HES_Peril = { hs_SetTileSize(HUD_ELEMENT_SIZE_40x16) hs_Loop hs_PlaySound(SOUND_PERIL) - hs_ClearFlags(HUD_ELEMENT_FLAGS_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_200000) hs_SetCI(15, ui_battle_status_peril) - hs_SetFlags(HUD_ELEMENT_FLAGS_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_200000) hs_SetCI(10, ui_battle_status_peril) hs_Restart hs_End @@ -1988,9 +1988,9 @@ HudScript HES_Danger = { hs_SetTileSize(HUD_ELEMENT_SIZE_40x16) hs_Loop hs_PlaySound(SOUND_DANGER) - hs_ClearFlags(HUD_ELEMENT_FLAGS_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_200000) hs_SetCI(15, ui_battle_status_danger) - hs_SetFlags(HUD_ELEMENT_FLAGS_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_200000) hs_SetCI(10, ui_battle_status_danger) hs_Restart hs_End @@ -2000,9 +2000,9 @@ HudScript HES_Refund = { hs_SetVisible hs_SetTileSize(HUD_ELEMENT_SIZE_40x24) hs_Loop - hs_ClearFlags(HUD_ELEMENT_FLAGS_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_200000) hs_SetCI(8, ui_battle_status_refund) - hs_SetFlags(HUD_ELEMENT_FLAGS_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_200000) hs_SetCI(4, ui_battle_status_refund) hs_Restart hs_End diff --git a/src/hud_element.c b/src/hud_element.c index 39a33daf77..c875434ffe 100644 --- a/src/hud_element.c +++ b/src/hud_element.c @@ -156,7 +156,7 @@ void hud_element_load_script(HudElement* hudElement, HudScript* anim) { case HUD_ELEMENT_OP_SetCustomSize: hudElement->customDrawSize.x = hudElement->customImageSize.x = *pos++; hudElement->customDrawSize.y = hudElement->customImageSize.y = *pos++; - hudElement->flags |= HUD_ELEMENT_FLAGS_CUSTOM_SIZE; + hudElement->flags |= HUD_ELEMENT_FLAG_CUSTOM_SIZE; break; case HUD_ELEMENT_OP_AddTexelOffsetX: case HUD_ELEMENT_OP_AddTexelOffsetY: @@ -305,13 +305,13 @@ void hud_element_draw_rect(HudElement* hudElement, s16 texSizeX, s16 texSizeY, s baseY = tempY + 2; } - flags1 = (hudElement->flags & HUD_ELEMENT_FLAGS_FMT_CI4); + flags1 = (hudElement->flags & HUD_ELEMENT_FLAG_FMT_CI4); isFmtCI4 = flags1 != 0; - flags1 = (hudElement->flags & HUD_ELEMENT_FLAGS_FMT_IA8); + flags1 = (hudElement->flags & HUD_ELEMENT_FLAG_FMT_IA8); isFmtIA8 = flags1 != 0; - flags1 = (hudElement->flags & HUD_ELEMENT_FLAGS_FLIPX); + flags1 = (hudElement->flags & HUD_ELEMENT_FLAG_FLIPX); flipX = flags1 != 0; - flags2 = (hudElement->flags & HUD_ELEMENT_FLAGS_FLIPY); + flags2 = (hudElement->flags & HUD_ELEMENT_FLAG_FLIPY); flipY = flags2 != 0; fmt = 0; @@ -330,7 +330,7 @@ void hud_element_draw_rect(HudElement* hudElement, s16 texSizeX, s16 texSizeY, s masks = 6; maskt = 5; - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_SCALED)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_SCALED)) { switch (drawSizeX) { case 8: masks = 3; @@ -362,14 +362,14 @@ void hud_element_draw_rect(HudElement* hudElement, s16 texSizeX, s16 texSizeY, s gDPSetTextureLUT(gMasterGfxPos++, G_TT_NONE); break; case 1: - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_TRANSPARENT)) { - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_ANTIALIASING)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_TRANSPARENT)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_ANTIALIASING)) { gDPSetRenderMode(gMasterGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); } else { gDPSetRenderMode(gMasterGfxPos++, G_RM_AA_TEX_EDGE, G_RM_AA_TEX_EDGE2); } } else { - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_ANTIALIASING)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_ANTIALIASING)) { gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); } else { gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF | AA_EN, G_RM_CLD_SURF2 | AA_EN); @@ -384,7 +384,7 @@ void hud_element_draw_rect(HudElement* hudElement, s16 texSizeX, s16 texSizeY, s break; } - if (hudElement->flags & HUD_ELEMENT_FLAGS_FILTER_TEX) { + if (hudElement->flags & HUD_ELEMENT_FLAG_FILTER_TEX) { gDPSetTextureFilter(gMasterGfxPos++, G_TF_AVERAGE); } else { gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); @@ -478,13 +478,13 @@ void hud_element_draw_rect(HudElement* hudElement, s16 texSizeX, s16 texSizeY, s switch (fmt) { case 0: gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_TRANSPARENT)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_TRANSPARENT)) { gDPSetCombineMode(gMasterGfxPos++, G_CC_DECALRGBA, G_CC_DECALRGBA); } else { gDPSetCombineLERP(gMasterGfxPos++, 0, 0, 0, TEXEL0, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0); } - if (hudElement->flags & HUD_ELEMENT_FLAGS_TRANSPARENT) { + if (hudElement->flags & HUD_ELEMENT_FLAG_TRANSPARENT) { gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, hudElement->opacity); } @@ -498,13 +498,13 @@ void hud_element_draw_rect(HudElement* hudElement, s16 texSizeX, s16 texSizeY, s break; case 1: if (!dropShadow) { - if (hudElement->flags & HUD_ELEMENT_FLAGS_TRANSPARENT) { + if (hudElement->flags & HUD_ELEMENT_FLAG_TRANSPARENT) { gDPSetCombineLERP(gMasterGfxPos++, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, PRIMITIVE, 0); } else { gDPSetCombineLERP(gMasterGfxPos++, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, PRIMITIVE, 0); } - if (hudElement->flags & HUD_ELEMENT_FLAGS_TRANSPARENT) { + if (hudElement->flags & HUD_ELEMENT_FLAG_TRANSPARENT) { gDPSetPrimColor(gMasterGfxPos++, 0, 0, hudElement->tint.r, hudElement->tint.g, hudElement->tint.b, hudElement->opacity); } else { gDPSetPrimColor(gMasterGfxPos++, 0, 0, hudElement->tint.r, hudElement->tint.g, hudElement->tint.b, 255); @@ -579,7 +579,7 @@ void hud_element_draw_rect(HudElement* hudElement, s16 texSizeX, s16 texSizeY, s break; } - if (hudElement->flags & HUD_ELEMENT_FLAGS_FILTER_TEX) { + if (hudElement->flags & HUD_ELEMENT_FLAG_FILTER_TEX) { gSPScisTextureRectangle(gMasterGfxPos++, ulx * 4, uly * 4, lrx * 4, lry * 4, 0, texStartX * 32 + 16, texStartY * 32 + 16, widthScale, heightScale); } else { gSPScisTextureRectangle(gMasterGfxPos++, ulx * 4, uly * 4, lrx * 4, lry * 4, 0, texStartX * 32, texStartY * 32, widthScale, heightScale); @@ -717,7 +717,7 @@ s32 hud_element_create(HudScript* anim) { ASSERT(hudElement != NULL); - hudElement->flags = HUD_ELEMENT_FLAGS_INITIALIZED; + hudElement->flags = HUD_ELEMENT_FLAG_INITIALIZED; hudElement->readPos = anim; if (anim == NULL) { hudElement->readPos = &HES_Empty; @@ -743,7 +743,7 @@ s32 hud_element_create(HudScript* anim) { hudElement->tint.b = 255; if (gGameStatusPtr->isBattle) { - hudElement->flags |= HUD_ELEMENT_FLAGS_BATTLE; + hudElement->flags |= HUD_ELEMENT_FLAG_BATTLE; id |= HUD_ELEMENT_BATTLE_ID_MASK; } @@ -760,8 +760,8 @@ void update_hud_elements(void) { for (i = 0; i < ARRAY_COUNT(*gHudElements);) { HudElement* elem = (*gHudElements)[i]; - if (elem != NULL && elem->flags && !(elem->flags & HUD_ELEMENT_FLAGS_DISABLED)) { - if (elem->flags & HUD_ELEMENT_FLAGS_DELETE) { + if (elem != NULL && elem->flags && !(elem->flags & HUD_ELEMENT_FLAG_DISABLED)) { + if (elem->flags & HUD_ELEMENT_FLAG_DELETE) { hud_element_free(i); i++; } else if (elem->readPos != NULL) { @@ -769,7 +769,7 @@ void update_hud_elements(void) { if (elem->updateTimer == 0) { while (hud_element_update(elem) != 0); } - if (elem->flags & HUD_ELEMENT_FLAGS_FIXEDSCALE) { + if (elem->flags & HUD_ELEMENT_FLAG_FIXEDSCALE) { elem->unkImgScale[0] += elem->deltaSizeX; elem->unkImgScale[1] += elem->deltaSizeY; } @@ -807,23 +807,23 @@ s32 hud_element_update(HudElement* hudElement) { case HUD_ELEMENT_OP_End: hudElement->updateTimer = 60; flags = hudElement->flags; - hudElement->flags = flags | HUD_ELEMENT_FLAGS_ANIMATION_FINISHED; + hudElement->flags = flags | HUD_ELEMENT_FLAG_ANIMATION_FINISHED; break; case HUD_ELEMENT_OP_Delete: hudElement->updateTimer = 60; - hudElement->flags |= HUD_ELEMENT_FLAGS_DELETE; + hudElement->flags |= HUD_ELEMENT_FLAG_DELETE; break; case HUD_ELEMENT_OP_UseIA8: hudElement->readPos = (HudScript*)nextPos; - hudElement->flags |= HUD_ELEMENT_FLAGS_FMT_IA8; + hudElement->flags |= HUD_ELEMENT_FLAG_FMT_IA8; return TRUE; case HUD_ELEMENT_OP_SetVisible: hudElement->readPos = (HudScript*)nextPos; - hudElement->flags |= HUD_ELEMENT_FLAGS_FMT_CI4; + hudElement->flags |= HUD_ELEMENT_FLAG_FMT_CI4; return TRUE; case HUD_ELEMENT_OP_SetHidden: hudElement->readPos = (HudScript*)nextPos; - hudElement->flags &= ~HUD_ELEMENT_FLAGS_FMT_CI4; + hudElement->flags &= ~HUD_ELEMENT_FLAG_FMT_CI4; return TRUE; case HUD_ELEMENT_OP_SetFlags: s1 = *nextPos++; @@ -840,12 +840,12 @@ s32 hud_element_update(HudElement* hudElement) { hudElement->imageAddr = (u8*)*nextPos++; hudElement->readPos = (HudScript*)nextPos; - if (hudElement->flags & HUD_ELEMENT_FLAGS_MEMOFFSET) { + if (hudElement->flags & HUD_ELEMENT_FLAG_MEMOFFSET) { hudElement->imageAddr += hudElement->memOffset; } - if (hudElement->flags & HUD_ELEMENT_FLAGS_FIXEDSCALE) { - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_CUSTOM_SIZE)) { + if (hudElement->flags & HUD_ELEMENT_FLAG_FIXEDSCALE) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { tileSizePreset = hudElement->tileSizePreset; drawSizePreset = hudElement->drawSizePreset; imageWidth = gHudElementSizes[tileSizePreset].width; @@ -859,14 +859,14 @@ s32 hud_element_update(HudElement* hudElement) { drawHeight = hudElement->customDrawSize.y; } - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_200)) { - hudElement->flags |= HUD_ELEMENT_FLAGS_200; + if (!(hudElement->flags & HUD_ELEMENT_FLAG_200)) { + hudElement->flags |= HUD_ELEMENT_FLAG_200; hudElement->unkImgScale[0] = imageWidth; hudElement->unkImgScale[1] = imageHeight; hudElement->deltaSizeX = ((f32)drawWidth - (f32)imageWidth) / (f32)hudElement->updateTimer; hudElement->deltaSizeY = ((f32)drawHeight - (f32)imageHeight) / (f32)hudElement->updateTimer; } else { - hudElement->flags &= ~HUD_ELEMENT_FLAGS_200; + hudElement->flags &= ~HUD_ELEMENT_FLAG_200; hudElement->unkImgScale[0] = drawWidth; hudElement->unkImgScale[1] = drawHeight; hudElement->deltaSizeX = ((f32)imageWidth - (f32)drawWidth) / (f32)hudElement->updateTimer; @@ -880,13 +880,13 @@ s32 hud_element_update(HudElement* hudElement) { hudElement->paletteAddr = (u8*)*nextPos++; hudElement->readPos = (HudScript*)nextPos; - if (hudElement->flags & HUD_ELEMENT_FLAGS_MEMOFFSET) { + if (hudElement->flags & HUD_ELEMENT_FLAG_MEMOFFSET) { hudElement->imageAddr += hudElement->memOffset; hudElement->paletteAddr += hudElement->memOffset; } - if (hudElement->flags & HUD_ELEMENT_FLAGS_FIXEDSCALE) { - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_CUSTOM_SIZE)) { + if (hudElement->flags & HUD_ELEMENT_FLAG_FIXEDSCALE) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { tileSizePreset = hudElement->tileSizePreset; drawSizePreset = hudElement->drawSizePreset; imageWidth = gHudElementSizes[tileSizePreset].width; @@ -900,14 +900,14 @@ s32 hud_element_update(HudElement* hudElement) { drawHeight = hudElement->customDrawSize.y; } - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_200)) { - hudElement->flags |= HUD_ELEMENT_FLAGS_200; + if (!(hudElement->flags & HUD_ELEMENT_FLAG_200)) { + hudElement->flags |= HUD_ELEMENT_FLAG_200; hudElement->unkImgScale[0] = imageWidth; hudElement->unkImgScale[1] = imageHeight; hudElement->deltaSizeX = ((f32)drawWidth - (f32)imageWidth) / (f32)hudElement->updateTimer; hudElement->deltaSizeY = ((f32)drawHeight - (f32)imageHeight) / (f32)hudElement->updateTimer; } else { - hudElement->flags &= ~HUD_ELEMENT_FLAGS_200; + hudElement->flags &= ~HUD_ELEMENT_FLAG_200; hudElement->unkImgScale[0] = drawWidth; hudElement->unkImgScale[1] = drawHeight; hudElement->deltaSizeX = ((f32)imageWidth - (f32)drawWidth) / (f32)hudElement->updateTimer; @@ -918,7 +918,7 @@ s32 hud_element_update(HudElement* hudElement) { case HUD_ELEMENT_OP_SetImage: hudElement->updateTimer = *nextPos++; - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_BATTLE)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_BATTLE)) { entryRaster = gHudElementCacheTableRasterWorld; entryPalette = gHudElementCacheTablePaletteWorld; } else { @@ -948,8 +948,8 @@ s32 hud_element_update(HudElement* hudElement) { nextPos += 3; hudElement->readPos = (HudScript*)nextPos; - if (hudElement->flags & HUD_ELEMENT_FLAGS_FIXEDSCALE) { - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_CUSTOM_SIZE)) { + if (hudElement->flags & HUD_ELEMENT_FLAG_FIXEDSCALE) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { tileSizePreset = hudElement->tileSizePreset; drawSizePreset = hudElement->drawSizePreset; imageWidth = gHudElementSizes[tileSizePreset].width; @@ -963,14 +963,14 @@ s32 hud_element_update(HudElement* hudElement) { drawHeight = hudElement->customDrawSize.y; } - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_200)) { - hudElement->flags |= HUD_ELEMENT_FLAGS_200; + if (!(hudElement->flags & HUD_ELEMENT_FLAG_200)) { + hudElement->flags |= HUD_ELEMENT_FLAG_200; hudElement->unkImgScale[0] = imageWidth; hudElement->unkImgScale[1] = imageHeight; hudElement->deltaSizeX = ((f32)drawWidth - (f32)imageWidth) / (f32)hudElement->updateTimer; hudElement->deltaSizeY = ((f32)drawHeight - (f32)imageHeight) / (f32)hudElement->updateTimer; } else { - hudElement->flags &= ~HUD_ELEMENT_FLAGS_200; + hudElement->flags &= ~HUD_ELEMENT_FLAG_200; hudElement->unkImgScale[0] = drawWidth; hudElement->unkImgScale[1] = drawHeight; hudElement->deltaSizeX = ((f32)imageWidth - (f32)drawWidth) / (f32)hudElement->updateTimer; @@ -1001,8 +1001,8 @@ s32 hud_element_update(HudElement* hudElement) { hudElement->readPos = (HudScript*)nextPos; hudElement->drawSizePreset = sizePreset; hudElement->tileSizePreset = sizePreset; - hudElement->flags &= ~HUD_ELEMENT_FLAGS_FIXEDSCALE; - hudElement->flags &= ~HUD_ELEMENT_FLAGS_REPEATED; + hudElement->flags &= ~HUD_ELEMENT_FLAG_FIXEDSCALE; + hudElement->flags &= ~HUD_ELEMENT_FLAG_REPEATED; return TRUE; case HUD_ELEMENT_OP_SetSizesAutoScale: tileSizePreset = *nextPos++; @@ -1026,8 +1026,8 @@ s32 hud_element_update(HudElement* hudElement) { hudElement->widthScale = X10(xScaled); hudElement->heightScale = X10(yScaled); - hudElement->flags &= ~HUD_ELEMENT_FLAGS_FIXEDSCALE; - hudElement->flags |= HUD_ELEMENT_FLAGS_REPEATED; + hudElement->flags &= ~HUD_ELEMENT_FLAG_FIXEDSCALE; + hudElement->flags |= HUD_ELEMENT_FLAG_REPEATED; return TRUE; case HUD_ELEMENT_OP_SetSizesFixedScale: tileSizePreset = *nextPos++; @@ -1038,9 +1038,9 @@ s32 hud_element_update(HudElement* hudElement) { hudElement->readPos = (HudScript*)nextPos; hudElement->tileSizePreset = tileSizePreset; hudElement->drawSizePreset = drawSizePreset; - hudElement->flags |= HUD_ELEMENT_FLAGS_FIXEDSCALE; - hudElement->flags &= ~HUD_ELEMENT_FLAGS_REPEATED; - hudElement->flags &= ~HUD_ELEMENT_FLAGS_200; + hudElement->flags |= HUD_ELEMENT_FLAG_FIXEDSCALE; + hudElement->flags &= ~HUD_ELEMENT_FLAG_REPEATED; + hudElement->flags &= ~HUD_ELEMENT_FLAG_200; return TRUE; case HUD_ELEMENT_OP_AddTexelOffsetX: s1 = *nextPos++; @@ -1049,7 +1049,7 @@ s32 hud_element_update(HudElement* hudElement) { return TRUE; case HUD_ELEMENT_OP_AddTexelOffsetY: s2 = *nextPos++; - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_FLIPY)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_FLIPY)) { hudElement->screenPosOffset.y += s2; } else { hudElement->screenPosOffset.y -= s2; @@ -1060,7 +1060,7 @@ s32 hud_element_update(HudElement* hudElement) { s1 = *nextPos++; s2 = *nextPos++; hudElement->screenPosOffset.x = s1; - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_FLIPY)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_FLIPY)) { hudElement->screenPosOffset.y = s2; } else { hudElement->screenPosOffset.y = -s2; @@ -1071,7 +1071,7 @@ s32 hud_element_update(HudElement* hudElement) { uniformScale = (f32)*nextPos++; uniformScale /= 65536; hudElement->uniformScale = uniformScale; - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_CUSTOM_SIZE)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { imageWidth = gHudElementSizes[hudElement->tileSizePreset].width; imageHeight = gHudElementSizes[hudElement->tileSizePreset].height; drawWidth = gHudElementSizes[hudElement->drawSizePreset].width; @@ -1096,15 +1096,15 @@ s32 hud_element_update(HudElement* hudElement) { hudElement->heightScale = X10(yScaled); hudElement->readPos = (HudScript*)nextPos; - hudElement->flags &= ~HUD_ELEMENT_FLAGS_FIXEDSCALE; - hudElement->flags |= HUD_ELEMENT_FLAGS_REPEATED | HUD_ELEMENT_FLAGS_SCALED; + hudElement->flags &= ~HUD_ELEMENT_FLAG_FIXEDSCALE; + hudElement->flags |= HUD_ELEMENT_FLAG_REPEATED | HUD_ELEMENT_FLAG_SCALED; return TRUE; case HUD_ELEMENT_OP_SetAlpha: s1 = *nextPos++; hudElement->opacity = s1; - hudElement->flags |= HUD_ELEMENT_FLAGS_TRANSPARENT; + hudElement->flags |= HUD_ELEMENT_FLAG_TRANSPARENT; if (hudElement->opacity == 255) { - hudElement->flags &= ~HUD_ELEMENT_FLAGS_TRANSPARENT; + hudElement->flags &= ~HUD_ELEMENT_FLAG_TRANSPARENT; } hudElement->readPos = (HudScript*)nextPos; return TRUE; @@ -1122,14 +1122,14 @@ s32 hud_element_update(HudElement* hudElement) { hudElement->heightScale = X10(1); hudElement->drawSizePreset = 0; hudElement->tileSizePreset = 0; - hudElement->flags &= ~HUD_ELEMENT_FLAGS_FIXEDSCALE; - hudElement->flags &= ~HUD_ELEMENT_FLAGS_REPEATED; - hudElement->flags |= HUD_ELEMENT_FLAGS_CUSTOM_SIZE; + hudElement->flags &= ~HUD_ELEMENT_FLAG_FIXEDSCALE; + hudElement->flags &= ~HUD_ELEMENT_FLAG_REPEATED; + hudElement->flags |= HUD_ELEMENT_FLAG_CUSTOM_SIZE; return TRUE; case HUD_ELEMENT_OP_op_15: s1 = *nextPos++; hudElement->readPos = (HudScript*)nextPos; - hudElement->flags &= ~(HUD_ELEMENT_FLAGS_1000000 | HUD_ELEMENT_FLAGS_2000000 | HUD_ELEMENT_FLAGS_4000000 | HUD_ELEMENT_FLAGS_8000000); + hudElement->flags &= ~(HUD_ELEMENT_FLAG_1000000 | HUD_ELEMENT_FLAG_2000000 | HUD_ELEMENT_FLAG_4000000 | HUD_ELEMENT_FLAG_8000000); hudElement->flags |= s1 << 24; return TRUE; case HUD_ELEMENT_OP_RandomBranch: @@ -1147,7 +1147,7 @@ s32 hud_element_update(HudElement* hudElement) { arg1 = *nextPos++; arg2 = *nextPos++; hudElement->readPos = (HudScript*)nextPos; - if (hudElement->flags & HUD_ELEMENT_FLAGS_TRANSFORM) { + if (hudElement->flags & HUD_ELEMENT_FLAG_TRANSFORM) { hudTransform->pivot.x = arg1; // TODO find better match do { @@ -1181,9 +1181,9 @@ void render_hud_elements_backUI(void) { hudElement = (*gHudElements)[i]; if (hudElement != NULL) { s32 flags = hudElement->flags; - if (flags && !(flags & HUD_ELEMENT_FLAGS_DISABLED)) { - if (!(flags & (HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_TRANSFORM | HUD_ELEMENT_FLAGS_200000 | HUD_ELEMENT_FLAGS_10000000 | HUD_ELEMENT_FLAGS_40000000))) { - if (!(flags & HUD_ELEMENT_FLAGS_FRONTUI) && hudElement->drawSizePreset >= 0) { + if (flags && !(flags & HUD_ELEMENT_FLAG_DISABLED)) { + if (!(flags & (HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_TRANSFORM | HUD_ELEMENT_FLAG_200000 | HUD_ELEMENT_FLAG_10000000 | HUD_ELEMENT_FLAG_40000000))) { + if (!(flags & HUD_ELEMENT_FLAG_FRONTUI) && hudElement->drawSizePreset >= 0) { sortedElements[count++] = i; } } @@ -1209,8 +1209,8 @@ void render_hud_elements_backUI(void) { break; } - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_FIXEDSCALE)) { - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_CUSTOM_SIZE)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_FIXEDSCALE)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { texSizeX = gHudElementSizes[hudElement->tileSizePreset].width; texSizeY = gHudElementSizes[hudElement->tileSizePreset].height; } else { @@ -1218,8 +1218,8 @@ void render_hud_elements_backUI(void) { texSizeY = hudElement->customImageSize.y; } - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_SCALED)) { - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_CUSTOM_SIZE)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_SCALED)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { drawSizeX = gHudElementSizes[hudElement->drawSizePreset].width; drawSizeY = gHudElementSizes[hudElement->drawSizePreset].height; offsetX = -drawSizeX / 2; @@ -1241,13 +1241,13 @@ void render_hud_elements_backUI(void) { offsetY = -drawSizeY / 2; } - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_REPEATED)) { - if (hudElement->flags & HUD_ELEMENT_FLAGS_DROP_SHADOW) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_REPEATED)) { + if (hudElement->flags & HUD_ELEMENT_FLAG_DROP_SHADOW) { hud_element_draw_rect(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, TRUE, TRUE); } hud_element_draw_rect(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, TRUE, FALSE); } else { - if (hudElement->flags & HUD_ELEMENT_FLAGS_DROP_SHADOW) { + if (hudElement->flags & HUD_ELEMENT_FLAG_DROP_SHADOW) { hud_element_draw_rect(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, TRUE); } hud_element_draw_rect(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, FALSE); @@ -1255,7 +1255,7 @@ void render_hud_elements_backUI(void) { } else { f32 xScaled, yScaled; - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_CUSTOM_SIZE)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { texSizeX = gHudElementSizes[hudElement->tileSizePreset].width; texSizeY = gHudElementSizes[hudElement->tileSizePreset].height; } else { @@ -1278,7 +1278,7 @@ void render_hud_elements_backUI(void) { hudElement->widthScale = X10(xScaled); hudElement->heightScale = X10(yScaled); - if (hudElement->flags & HUD_ELEMENT_FLAGS_DROP_SHADOW) { + if (hudElement->flags & HUD_ELEMENT_FLAG_DROP_SHADOW) { hud_element_draw_rect(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, TRUE); } hud_element_draw_rect(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, FALSE); @@ -1301,9 +1301,9 @@ void render_hud_elements_frontUI(void) { hudElement = (*gHudElements)[i]; if (hudElement != NULL) { s32 flags = hudElement->flags; - if (flags && !(flags & HUD_ELEMENT_FLAGS_DISABLED)) { - if (!(flags & (HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_TRANSFORM | HUD_ELEMENT_FLAGS_200000 | HUD_ELEMENT_FLAGS_10000000))) { - if ((flags & HUD_ELEMENT_FLAGS_FRONTUI) && hudElement->drawSizePreset >= 0) { + if (flags && !(flags & HUD_ELEMENT_FLAG_DISABLED)) { + if (!(flags & (HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_TRANSFORM | HUD_ELEMENT_FLAG_200000 | HUD_ELEMENT_FLAG_10000000))) { + if ((flags & HUD_ELEMENT_FLAG_FRONTUI) && hudElement->drawSizePreset >= 0) { sortedElements[count++] = i; } } @@ -1324,8 +1324,8 @@ void render_hud_elements_frontUI(void) { for (i = 0; i < count; i++) { hudElement = (*gHudElements)[sortedElements[i]]; - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_FIXEDSCALE)) { - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_CUSTOM_SIZE)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_FIXEDSCALE)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { texSizeX = gHudElementSizes[hudElement->tileSizePreset].width; texSizeY = gHudElementSizes[hudElement->tileSizePreset].height; } else { @@ -1333,8 +1333,8 @@ void render_hud_elements_frontUI(void) { texSizeY = hudElement->customImageSize.y; } - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_SCALED)) { - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_CUSTOM_SIZE)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_SCALED)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { drawSizeX = gHudElementSizes[hudElement->drawSizePreset].width; drawSizeY = gHudElementSizes[hudElement->drawSizePreset].height; offsetX = -drawSizeX / 2; @@ -1356,13 +1356,13 @@ void render_hud_elements_frontUI(void) { offsetY = -drawSizeY / 2; } - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_REPEATED)) { - if (hudElement->flags & HUD_ELEMENT_FLAGS_DROP_SHADOW) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_REPEATED)) { + if (hudElement->flags & HUD_ELEMENT_FLAG_DROP_SHADOW) { hud_element_draw_rect(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, TRUE, TRUE); } hud_element_draw_rect(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, TRUE, FALSE); } else { - if (hudElement->flags & HUD_ELEMENT_FLAGS_DROP_SHADOW) { + if (hudElement->flags & HUD_ELEMENT_FLAG_DROP_SHADOW) { hud_element_draw_rect(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, TRUE); } hud_element_draw_rect(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, FALSE); @@ -1370,7 +1370,7 @@ void render_hud_elements_frontUI(void) { } else { f32 xScaled, yScaled; - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_CUSTOM_SIZE)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { texSizeX = gHudElementSizes[hudElement->drawSizePreset].width; texSizeY = gHudElementSizes[hudElement->drawSizePreset].height; } else { @@ -1393,7 +1393,7 @@ void render_hud_elements_frontUI(void) { hudElement->widthScale = X10(xScaled); hudElement->heightScale = X10(yScaled); - if (hudElement->flags & HUD_ELEMENT_FLAGS_DROP_SHADOW) { + if (hudElement->flags & HUD_ELEMENT_FLAG_DROP_SHADOW) { hud_element_draw_rect(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, TRUE); } hud_element_draw_rect(hudElement, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, FALSE); @@ -1428,17 +1428,17 @@ void render_hud_element(HudElement* hudElement) { s32 ulx, uly, lrx, lry; Vtx* vtx; - if (hudElement->flags & HUD_ELEMENT_FLAGS_FILTER_TEX) { + if (hudElement->flags & HUD_ELEMENT_FLAG_FILTER_TEX) { gDPSetTextureFilter(gMasterGfxPos++, G_TF_AVERAGE); } else { gDPSetTextureFilter(gMasterGfxPos++, G_TF_POINT); } - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_FIXEDSCALE)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_FIXEDSCALE)) { phi_f24 = 1.0f; phi_f20 = 1.0f; } else { - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_CUSTOM_SIZE)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { phi_f24 = gHudElementSizes[hudElement->tileSizePreset].width; phi_f20 = gHudElementSizes[hudElement->tileSizePreset].height; } else { @@ -1451,7 +1451,7 @@ void render_hud_element(HudElement* hudElement) { phi_f20 = 1.0f / phi_f20; } - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_CUSTOM_SIZE)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { width = gHudElementSizes[hudElement->tileSizePreset].width; height = gHudElementSizes[hudElement->tileSizePreset].height; } else { @@ -1471,7 +1471,7 @@ void render_hud_element(HudElement* hudElement) { transform->scale.z); guRotateF(sp120, transform->rotation.y, 0.0f, 1.0f, 0.0f); guRotateF(sp160, transform->rotation.z, 0.0f, 0.0f, 1.0f); - nv = HUD_ELEMENT_FLAGS_FMT_CI4; + nv = HUD_ELEMENT_FLAG_FMT_CI4; guRotateF(spE0, transform->rotation.x, 1.0f, 0.0f, 0.0f); guMtxCatF(sp160, spE0, sp20); guMtxCatF(sp20, sp120, spA0); @@ -1485,7 +1485,7 @@ void render_hud_element(HudElement* hudElement) { mode = 0; a0 = mode; a0 = (hudElement->flags & nv) > a0; - v1 = mode < (hudElement->flags & HUD_ELEMENT_FLAGS_FMT_IA8); + v1 = mode < (hudElement->flags & HUD_ELEMENT_FLAG_FMT_IA8); if (a0 == TRUE) { mode = (v1 < 1); @@ -1504,14 +1504,14 @@ void render_hud_element(HudElement* hudElement) { switch (mode) { case 1: - if (hudElement->flags & HUD_ELEMENT_FLAGS_NO_FOLD) { - if (hudElement->flags & HUD_ELEMENT_FLAGS_TRANSPARENT) { + if (hudElement->flags & HUD_ELEMENT_FLAG_NO_FOLD) { + if (hudElement->flags & HUD_ELEMENT_FLAG_TRANSPARENT) { fold_update(0, FOLD_TYPE_7, 255, 255, 255, hudElement->opacity, 0); } else { fold_update(0, FOLD_TYPE_NONE, 0, 0, 0, 0, 0); } } else { - if (hudElement->flags & HUD_ELEMENT_FLAGS_TRANSPARENT) { + if (hudElement->flags & HUD_ELEMENT_FLAG_TRANSPARENT) { fold_update(transform->unk_00, 7, 255, 255, 255, hudElement->opacity, 0); } else { fold_update(transform->unk_00, 0, 0, 0, 0, 0, 0); @@ -1527,8 +1527,8 @@ void render_hud_element(HudElement* hudElement) { sp2A0.height = height; sp2A0.palette = palette; - if (hudElement->flags & HUD_ELEMENT_FLAGS_NO_FOLD) { - if (hudElement->flags & HUD_ELEMENT_FLAGS_ANTIALIASING) { + if (hudElement->flags & HUD_ELEMENT_FLAG_NO_FOLD) { + if (hudElement->flags & HUD_ELEMENT_FLAG_ANTIALIASING) { fold_appendGfx_component(0, &sp2A0, 0x40, sp60); } else { fold_appendGfx_component(0, &sp2A0, 0x40, sp60); @@ -1572,14 +1572,14 @@ void render_hud_element(HudElement* hudElement) { gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, 0, TEXEL0, 0, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, 0, TEXEL0, 0); gDPSetPrimColor(gMasterGfxPos++, 0, 0, hudElement->tint.r, hudElement->tint.g, hudElement->tint.b, hudElement->opacity); - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_TRANSPARENT)) { - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_ANTIALIASING)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_TRANSPARENT)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_ANTIALIASING)) { gDPSetRenderMode(gMasterGfxPos++, G_RM_TEX_EDGE, G_RM_TEX_EDGE2); } else { gDPSetRenderMode(gMasterGfxPos++, G_RM_AA_TEX_EDGE, G_RM_AA_TEX_EDGE2); } } else { - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_ANTIALIASING)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_ANTIALIASING)) { gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2); } else { gDPSetRenderMode(gMasterGfxPos++, AA_EN | G_RM_CLD_SURF, AA_EN | G_RM_CLD_SURF2); @@ -1619,11 +1619,11 @@ void render_hud_elements_world(void) { hudElement = (*gHudElements)[i]; if (hudElement != NULL) { s32 flags = hudElement->flags; - if (flags && !(flags & HUD_ELEMENT_FLAGS_DISABLED)) { - if (!(flags & (HUD_ELEMENT_FLAGS_200000 | HUD_ELEMENT_FLAGS_10000000))) { - if (flags & HUD_ELEMENT_FLAGS_TRANSFORM) { - if (!(flags & HUD_ELEMENT_FLAGS_40000000)) { - if (!(flags & HUD_ELEMENT_FLAGS_FRONTUI) && hudElement->drawSizePreset >= 0 && !(flags & HUD_ELEMENT_FLAGS_80)) { + if (flags && !(flags & HUD_ELEMENT_FLAG_DISABLED)) { + if (!(flags & (HUD_ELEMENT_FLAG_200000 | HUD_ELEMENT_FLAG_10000000))) { + if (flags & HUD_ELEMENT_FLAG_TRANSFORM) { + if (!(flags & HUD_ELEMENT_FLAG_40000000)) { + if (!(flags & HUD_ELEMENT_FLAG_FRONTUI) && hudElement->drawSizePreset >= 0 && !(flags & HUD_ELEMENT_FLAG_80)) { sortedElements[count++] = i; } } @@ -1667,11 +1667,11 @@ void render_hud_elements_world(void) { hudElement = (*gHudElements)[i]; if (hudElement != NULL) { s32 flags = hudElement->flags; - if (flags && !(flags & HUD_ELEMENT_FLAGS_DISABLED)) { - if (!(flags & (HUD_ELEMENT_FLAGS_200000 | HUD_ELEMENT_FLAGS_10000000))) { - if (flags & HUD_ELEMENT_FLAGS_TRANSFORM) { - if (flags & HUD_ELEMENT_FLAGS_40000000) { - if (!(flags & HUD_ELEMENT_FLAGS_FRONTUI) && hudElement->drawSizePreset >= 0 && !(flags & HUD_ELEMENT_FLAGS_80)) { + if (flags && !(flags & HUD_ELEMENT_FLAG_DISABLED)) { + if (!(flags & (HUD_ELEMENT_FLAG_200000 | HUD_ELEMENT_FLAG_10000000))) { + if (flags & HUD_ELEMENT_FLAG_TRANSFORM) { + if (flags & HUD_ELEMENT_FLAG_40000000) { + if (!(flags & HUD_ELEMENT_FLAG_FRONTUI) && hudElement->drawSizePreset >= 0 && !(flags & HUD_ELEMENT_FLAG_80)) { sortedElements[count++] = i; } } @@ -1717,7 +1717,7 @@ void func_80143C48(s32 elemID, s32 arg1, s32 camID) { Camera* camera = &gCameras[camID]; if (arg1 > 0) { - if (!camera->flags || (camera->flags & CAMERA_FLAGS_ENABLED)) { + if (!camera->flags || (camera->flags & CAMERA_FLAG_ENABLED)) { return; } @@ -1775,10 +1775,10 @@ void func_80143C48(s32 elemID, s32 arg1, s32 camID) { elem = (*gHudElements)[elemID]; if (elem != NULL) { - if (elem->flags && !(elem->flags & HUD_ELEMENT_FLAGS_DISABLED)) { - if (!(elem->flags & (HUD_ELEMENT_FLAGS_200000 | HUD_ELEMENT_FLAGS_10000000))) { - if (elem->flags & HUD_ELEMENT_FLAGS_TRANSFORM) { - if (!(elem->flags & HUD_ELEMENT_FLAGS_FRONTUI) && (elem->drawSizePreset >= 0) && (elem->flags & HUD_ELEMENT_FLAGS_80)) { + if (elem->flags && !(elem->flags & HUD_ELEMENT_FLAG_DISABLED)) { + if (!(elem->flags & (HUD_ELEMENT_FLAG_200000 | HUD_ELEMENT_FLAG_10000000))) { + if (elem->flags & HUD_ELEMENT_FLAG_TRANSFORM) { + if (!(elem->flags & HUD_ELEMENT_FLAG_FRONTUI) && (elem->drawSizePreset >= 0) && (elem->flags & HUD_ELEMENT_FLAG_80)) { render_hud_element(elem); } } @@ -1811,8 +1811,8 @@ void draw_hud_element_internal(s32 id, s32 clipMode) { s32 offsetX, offsetY; s32 preset; - if (elem->flags && !(elem->flags & HUD_ELEMENT_FLAGS_DISABLED)) { - if (!(elem->flags & (HUD_ELEMENT_FLAGS_200000 | HUD_ELEMENT_FLAGS_10000000)) && (elem->drawSizePreset >= 0)) { + if (elem->flags && !(elem->flags & HUD_ELEMENT_FLAG_DISABLED)) { + if (!(elem->flags & (HUD_ELEMENT_FLAG_200000 | HUD_ELEMENT_FLAG_10000000)) && (elem->drawSizePreset >= 0)) { if (clipMode != HUD_ELEMENT_DRAW_NEXT) { if (clipMode == HUD_ELEMENT_DRAW_FIRST_WITH_CLIPPING) { gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 12, 20, SCREEN_WIDTH - 12, SCREEN_HEIGHT - 20); @@ -1831,8 +1831,8 @@ void draw_hud_element_internal(s32 id, s32 clipMode) { gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); } - if (!(elem->flags & HUD_ELEMENT_FLAGS_FIXEDSCALE)) { - if (!(elem->flags & HUD_ELEMENT_FLAGS_CUSTOM_SIZE)) { + if (!(elem->flags & HUD_ELEMENT_FLAG_FIXEDSCALE)) { + if (!(elem->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { preset = elem->tileSizePreset; texSizeX = gHudElementSizes[preset].width; texSizeY = gHudElementSizes[preset].height; @@ -1841,8 +1841,8 @@ void draw_hud_element_internal(s32 id, s32 clipMode) { texSizeY = elem->customImageSize.y; } - if (!(elem->flags & HUD_ELEMENT_FLAGS_SCALED)) { - if (!(elem->flags & HUD_ELEMENT_FLAGS_CUSTOM_SIZE)) { + if (!(elem->flags & HUD_ELEMENT_FLAG_SCALED)) { + if (!(elem->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { drawSizeX = gHudElementSizes[elem->drawSizePreset].width; drawSizeY = gHudElementSizes[elem->drawSizePreset].height; } else { @@ -1859,13 +1859,13 @@ void draw_hud_element_internal(s32 id, s32 clipMode) { offsetY = -drawSizeY / 2; } while (0); // required to match - if (!(elem->flags & HUD_ELEMENT_FLAGS_REPEATED)) { - if (elem->flags & HUD_ELEMENT_FLAGS_DROP_SHADOW) { + if (!(elem->flags & HUD_ELEMENT_FLAG_REPEATED)) { + if (elem->flags & HUD_ELEMENT_FLAG_DROP_SHADOW) { hud_element_draw_rect(elem, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, TRUE, TRUE); } hud_element_draw_rect(elem, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, TRUE, FALSE); } else { - if (elem->flags & HUD_ELEMENT_FLAGS_DROP_SHADOW) { + if (elem->flags & HUD_ELEMENT_FLAG_DROP_SHADOW) { hud_element_draw_rect(elem, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, TRUE); } hud_element_draw_rect(elem, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, FALSE); @@ -1873,7 +1873,7 @@ void draw_hud_element_internal(s32 id, s32 clipMode) { } else { f32 xScaled, yScaled; - if (!(elem->flags & HUD_ELEMENT_FLAGS_CUSTOM_SIZE)) { + if (!(elem->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { preset = elem->tileSizePreset; texSizeX = gHudElementSizes[preset].width; texSizeY = gHudElementSizes[preset].height; @@ -1897,7 +1897,7 @@ void draw_hud_element_internal(s32 id, s32 clipMode) { elem->widthScale = X10(xScaled); elem->heightScale = X10(yScaled); - if (elem->flags & HUD_ELEMENT_FLAGS_DROP_SHADOW) { + if (elem->flags & HUD_ELEMENT_FLAG_DROP_SHADOW) { hud_element_draw_rect(elem, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, TRUE); } hud_element_draw_rect(elem, texSizeX, texSizeY, drawSizeX, drawSizeY, offsetX, offsetY, FALSE, FALSE); @@ -1935,9 +1935,9 @@ void hud_element_set_script(s32 id, HudScript* anim) { hudElement->screenPosOffset.y = 0; hudElement->worldPosOffset.x = 0; hudElement->worldPosOffset.y = 0; - hudElement->flags &= ~HUD_ELEMENT_FLAGS_ANIMATION_FINISHED; + hudElement->flags &= ~HUD_ELEMENT_FLAG_ANIMATION_FINISHED; hudElement->uniformScale = 1.0f; - hudElement->flags &= ~(HUD_ELEMENT_FLAGS_SCALED | HUD_ELEMENT_FLAGS_TRANSPARENT | HUD_ELEMENT_FLAGS_FIXEDSCALE | HUD_ELEMENT_FLAGS_REPEATED); + hudElement->flags &= ~(HUD_ELEMENT_FLAG_SCALED | HUD_ELEMENT_FLAG_TRANSPARENT | HUD_ELEMENT_FLAG_FIXEDSCALE | HUD_ELEMENT_FLAG_REPEATED); hud_element_load_script(hudElement, anim); while (hud_element_update(hudElement) != 0) {} @@ -1952,7 +1952,7 @@ HudElement* get_hud_element(s32 id) { } void hud_element_free(s32 id) { - if ((*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]->flags & HUD_ELEMENT_FLAGS_TRANSFORM) { + if ((*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]->flags & HUD_ELEMENT_FLAG_TRANSFORM) { hud_element_free_transform(id & ~HUD_ELEMENT_BATTLE_ID_MASK); } @@ -2036,7 +2036,7 @@ void hud_element_set_scale(s32 index, f32 scale) { f32 xScaled, yScaled; elem->uniformScale = scale; - if (!(elem->flags & HUD_ELEMENT_FLAGS_CUSTOM_SIZE)) { + if (!(elem->flags & HUD_ELEMENT_FLAG_CUSTOM_SIZE)) { imgSizeX = gHudElementSizes[elem->tileSizePreset].width; imgSizeY = gHudElementSizes[elem->tileSizePreset].height; drawSizeX = gHudElementSizes[elem->drawSizePreset].width; @@ -2049,8 +2049,8 @@ void hud_element_set_scale(s32 index, f32 scale) { } elem->sizeX = drawSizeX * scale; elem->sizeY = drawSizeY * scale; - elem->flags &= ~HUD_ELEMENT_FLAGS_FIXEDSCALE; - elem->flags |= HUD_ELEMENT_FLAGS_REPEATED | HUD_ELEMENT_FLAGS_SCALED; + elem->flags &= ~HUD_ELEMENT_FLAG_FIXEDSCALE; + elem->flags |= HUD_ELEMENT_FLAG_REPEATED | HUD_ELEMENT_FLAG_SCALED; xScaled = ((f32) drawSizeX / (f32) imgSizeX) * scale; yScaled = ((f32) drawSizeY / (f32) imgSizeY) * scale; @@ -2070,8 +2070,8 @@ void hud_element_use_preset_size(s32 id, s8 sizePreset) { hudElement->tileSizePreset = sizePreset; hudElement->drawSizePreset = sizePreset; hudElement->uniformScale = 1.0f; - hudElement->flags &= ~HUD_ELEMENT_FLAGS_FIXEDSCALE; - hudElement->flags &= ~(HUD_ELEMENT_FLAGS_SCALED | HUD_ELEMENT_FLAGS_REPEATED); + hudElement->flags &= ~HUD_ELEMENT_FLAG_FIXEDSCALE; + hudElement->flags &= ~(HUD_ELEMENT_FLAG_SCALED | HUD_ELEMENT_FLAG_REPEATED); } s32 func_80144E4C(s32 id) { @@ -2081,18 +2081,18 @@ s32 func_80144E4C(s32 id) { void func_80144E74(s32 id, s32 arg1) { HudElement* hudElement = (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; - hudElement->flags &= ~(HUD_ELEMENT_FLAGS_1000000 | HUD_ELEMENT_FLAGS_2000000 | HUD_ELEMENT_FLAGS_4000000 | HUD_ELEMENT_FLAGS_8000000); + hudElement->flags &= ~(HUD_ELEMENT_FLAG_1000000 | HUD_ELEMENT_FLAG_2000000 | HUD_ELEMENT_FLAG_4000000 | HUD_ELEMENT_FLAG_8000000); hudElement->flags |= arg1 << 24; } void hud_element_set_alpha(s32 id, s32 opacity) { HudElement* hudElement = (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; - hudElement->flags |= HUD_ELEMENT_FLAGS_TRANSPARENT; + hudElement->flags |= HUD_ELEMENT_FLAG_TRANSPARENT; hudElement->opacity = opacity; if (opacity == 255) { - hudElement->flags &= ~HUD_ELEMENT_FLAGS_TRANSPARENT; + hudElement->flags &= ~HUD_ELEMENT_FLAG_TRANSPARENT; } } @@ -2110,7 +2110,7 @@ void hud_element_create_transform_A(s32 id) { element->hudTransform = transform; ASSERT(transform != NULL); - element->flags |= HUD_ELEMENT_FLAGS_TRANSFORM; + element->flags |= HUD_ELEMENT_FLAG_TRANSFORM; transform->foldIdx = func_8013A704(1); transform->position.x = 0.0f; transform->position.y = 0.0f; @@ -2132,7 +2132,7 @@ void hud_element_create_transform_B(s32 id) { element->hudTransform = transform; ASSERT(transform != NULL); - element->flags |= HUD_ELEMENT_FLAGS_TRANSFORM | HUD_ELEMENT_FLAGS_NO_FOLD; + element->flags |= HUD_ELEMENT_FLAG_TRANSFORM | HUD_ELEMENT_FLAG_NO_FOLD; transform->foldIdx = 0; transform->position.x = 0.0f; transform->position.y = 0.0f; @@ -2152,7 +2152,7 @@ void hud_element_create_transform_C(s32 id) { element->hudTransform = transform; ASSERT(transform != NULL); - element->flags |= HUD_ELEMENT_FLAGS_40000000 | HUD_ELEMENT_FLAGS_NO_FOLD | HUD_ELEMENT_FLAGS_TRANSFORM; + element->flags |= HUD_ELEMENT_FLAG_40000000 | HUD_ELEMENT_FLAG_NO_FOLD | HUD_ELEMENT_FLAG_TRANSFORM; transform->foldIdx = 0; transform->position.x = 0.0f; transform->position.y = 0.0f; @@ -2170,20 +2170,20 @@ void hud_element_free_transform(s32 id) { HudElement* hudElement = (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; HudTransform* hudTransform = hudElement->hudTransform; - if (!(hudElement->flags & HUD_ELEMENT_FLAGS_NO_FOLD)) { + if (!(hudElement->flags & HUD_ELEMENT_FLAG_NO_FOLD)) { func_8013A854(hudTransform->foldIdx); } heap_free(hudElement->hudTransform); hudElement->hudTransform = NULL; - hudElement->flags &= ~(HUD_ELEMENT_FLAGS_40000000 | HUD_ELEMENT_FLAGS_NO_FOLD | HUD_ELEMENT_FLAGS_TRANSFORM); + hudElement->flags &= ~(HUD_ELEMENT_FLAG_40000000 | HUD_ELEMENT_FLAG_NO_FOLD | HUD_ELEMENT_FLAG_TRANSFORM); } void hud_element_set_transform_pos(s32 id, f32 x, f32 y, f32 z) { HudElement* element = (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; HudTransform* transform = element->hudTransform; - if (element->flags & HUD_ELEMENT_FLAGS_TRANSFORM) { + if (element->flags & HUD_ELEMENT_FLAG_TRANSFORM) { transform->position.x = x; transform->position.y = y; transform->position.z = z; @@ -2194,7 +2194,7 @@ void hud_element_set_transform_scale(s32 id, f32 x, f32 y, f32 z) { HudElement* element = (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; HudTransform* transform = element->hudTransform; - if (element->flags & HUD_ELEMENT_FLAGS_TRANSFORM) { + if (element->flags & HUD_ELEMENT_FLAG_TRANSFORM) { transform->scale.x = x; transform->scale.y = y; transform->scale.z = z; @@ -2205,7 +2205,7 @@ void hud_element_set_transform_rotation(s32 id, f32 x, f32 y, f32 z) { HudElement* element = (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; HudTransform* transform = element->hudTransform; - if (element->flags & HUD_ELEMENT_FLAGS_TRANSFORM) { + if (element->flags & HUD_ELEMENT_FLAG_TRANSFORM) { transform->rotation.x = x; transform->rotation.y = y; transform->rotation.z = z; @@ -2216,7 +2216,7 @@ void hud_element_set_transform_rotation_pivot(s32 id, s32 dx, s32 dy) { HudElement* element = (*gHudElements)[id & ~HUD_ELEMENT_BATTLE_ID_MASK]; HudTransform* transform = element->hudTransform; - if (element->flags & HUD_ELEMENT_FLAGS_TRANSFORM) { + if (element->flags & HUD_ELEMENT_FLAG_TRANSFORM) { transform->pivot.x = dx; transform->pivot.y = dy; } diff --git a/src/hud_element.h b/src/hud_element.h index cd7b7ce9bd..74fe05ea29 100644 --- a/src/hud_element.h +++ b/src/hud_element.h @@ -68,38 +68,38 @@ enum { }; enum HudElementFlags { - HUD_ELEMENT_FLAGS_INITIALIZED = 0x00000001, - HUD_ELEMENT_FLAGS_DISABLED = 0x00000002, - HUD_ELEMENT_FLAGS_ANIMATION_FINISHED = 0x00000004, - HUD_ELEMENT_FLAGS_8 = 0x00000008, - HUD_ELEMENT_FLAGS_SCALED = 0x00000010, - HUD_ELEMENT_FLAGS_TRANSPARENT = 0x00000020, - HUD_ELEMENT_FLAGS_FRONTUI = 0x00000040, - HUD_ELEMENT_FLAGS_80 = 0x00000080, - HUD_ELEMENT_FLAGS_FIXEDSCALE = 0x00000100, - HUD_ELEMENT_FLAGS_200 = 0x00000200, - HUD_ELEMENT_FLAGS_BATTLE = 0x00000400, - HUD_ELEMENT_FLAGS_REPEATED = 0x00000800, - HUD_ELEMENT_FLAGS_FLIPX = 0x00001000, - HUD_ELEMENT_FLAGS_FLIPY = 0x00002000, - HUD_ELEMENT_FLAGS_FMT_CI4 = 0x00004000, - HUD_ELEMENT_FLAGS_FILTER_TEX = 0x00008000, - HUD_ELEMENT_FLAGS_TRANSFORM = 0x00010000, - HUD_ELEMENT_FLAGS_NO_FOLD = 0x00020000, - HUD_ELEMENT_FLAGS_DELETE = 0x00040000, - HUD_ELEMENT_FLAGS_FMT_IA8 = 0x00080000, - HUD_ELEMENT_FLAGS_CUSTOM_SIZE = 0x00100000, - HUD_ELEMENT_FLAGS_200000 = 0x00200000, - HUD_ELEMENT_FLAGS_MEMOFFSET = 0x00400000, - HUD_ELEMENT_FLAGS_ANTIALIASING = 0x00800000, - HUD_ELEMENT_FLAGS_1000000 = 0x01000000, - HUD_ELEMENT_FLAGS_2000000 = 0x02000000, - HUD_ELEMENT_FLAGS_4000000 = 0x04000000, - HUD_ELEMENT_FLAGS_8000000 = 0x08000000, - HUD_ELEMENT_FLAGS_10000000 = 0x10000000, - HUD_ELEMENT_FLAGS_DROP_SHADOW = 0x20000000, - HUD_ELEMENT_FLAGS_40000000 = 0x40000000, - HUD_ELEMENT_FLAGS_80000000 = 0x80000000, + HUD_ELEMENT_FLAG_INITIALIZED = 0x00000001, + HUD_ELEMENT_FLAG_DISABLED = 0x00000002, + HUD_ELEMENT_FLAG_ANIMATION_FINISHED = 0x00000004, + HUD_ELEMENT_FLAG_8 = 0x00000008, + HUD_ELEMENT_FLAG_SCALED = 0x00000010, + HUD_ELEMENT_FLAG_TRANSPARENT = 0x00000020, + HUD_ELEMENT_FLAG_FRONTUI = 0x00000040, + HUD_ELEMENT_FLAG_80 = 0x00000080, + HUD_ELEMENT_FLAG_FIXEDSCALE = 0x00000100, + HUD_ELEMENT_FLAG_200 = 0x00000200, + HUD_ELEMENT_FLAG_BATTLE = 0x00000400, + HUD_ELEMENT_FLAG_REPEATED = 0x00000800, + HUD_ELEMENT_FLAG_FLIPX = 0x00001000, + HUD_ELEMENT_FLAG_FLIPY = 0x00002000, + HUD_ELEMENT_FLAG_FMT_CI4 = 0x00004000, + HUD_ELEMENT_FLAG_FILTER_TEX = 0x00008000, + HUD_ELEMENT_FLAG_TRANSFORM = 0x00010000, + HUD_ELEMENT_FLAG_NO_FOLD = 0x00020000, + HUD_ELEMENT_FLAG_DELETE = 0x00040000, + HUD_ELEMENT_FLAG_FMT_IA8 = 0x00080000, + HUD_ELEMENT_FLAG_CUSTOM_SIZE = 0x00100000, + HUD_ELEMENT_FLAG_200000 = 0x00200000, + HUD_ELEMENT_FLAG_MEMOFFSET = 0x00400000, + HUD_ELEMENT_FLAG_ANTIALIASING = 0x00800000, + HUD_ELEMENT_FLAG_1000000 = 0x01000000, + HUD_ELEMENT_FLAG_2000000 = 0x02000000, + HUD_ELEMENT_FLAG_4000000 = 0x04000000, + HUD_ELEMENT_FLAG_8000000 = 0x08000000, + HUD_ELEMENT_FLAG_10000000 = 0x10000000, + HUD_ELEMENT_FLAG_DROP_SHADOW = 0x20000000, + HUD_ELEMENT_FLAG_40000000 = 0x40000000, + HUD_ELEMENT_FLAG_80000000 = 0x80000000, }; enum { diff --git a/src/menu_hud_scripts.c b/src/menu_hud_scripts.c index 2e30922efe..0feea44ef3 100644 --- a/src/menu_hud_scripts.c +++ b/src/menu_hud_scripts.c @@ -46,9 +46,9 @@ HudScript HES_FilenameCaret = { hs_SetVisible hs_SetCustomSize(16, 16) hs_Loop - hs_ClearFlags(HUD_ELEMENT_FLAGS_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_200000) hs_SetCI(9, ui_files_filename_caret) - hs_SetFlags(HUD_ELEMENT_FLAGS_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_200000) hs_SetCI(6, ui_files_filename_caret) hs_Restart hs_End @@ -160,9 +160,9 @@ HudScript HES_DescMsgPrev = { hs_SetVisible hs_SetCustomSize(16, 16) hs_Loop - hs_ClearFlags(HUD_ELEMENT_FLAGS_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_200000) hs_SetCI(9, ui_pause_desc_msg_prev) - hs_SetFlags(HUD_ELEMENT_FLAGS_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_200000) hs_SetCI(6, ui_pause_desc_msg_prev) hs_Restart hs_End @@ -172,9 +172,9 @@ HudScript HES_DescMsgNext = { hs_SetVisible hs_SetCustomSize(16, 16) hs_Loop - hs_ClearFlags(HUD_ELEMENT_FLAGS_200000) + hs_ClearFlags(HUD_ELEMENT_FLAG_200000) hs_SetCI(9, ui_pause_desc_msg_next) - hs_SetFlags(HUD_ELEMENT_FLAGS_200000) + hs_SetFlags(HUD_ELEMENT_FLAG_200000) hs_SetCI(6, ui_pause_desc_msg_next) hs_Restart hs_End diff --git a/src/msg.c b/src/msg.c index 9685f9aa4c..cb3abe437c 100644 --- a/src/msg.c +++ b/src/msg.c @@ -2260,7 +2260,7 @@ void draw_message_window(MessagePrintState* printer) { case MSG_WINDOW_STATE_E: printer->windowBasePos.x = 160 - (printer->windowSize.x / 2); printer->windowBasePos.y = 56; - draw_box(DRAW_FLAGS_ROTSCALE, WINDOW_STYLE_0, printer->windowBasePos.x, 56, 0, printer->windowSize.x, printer->windowSize.y, 255, 0, + draw_box(DRAW_FLAG_ROTSCALE, WINDOW_STYLE_0, printer->windowBasePos.x, 56, 0, printer->windowSize.x, printer->windowSize.y, 255, 0, scale, scale, 0.0f, 0.0f, rotZ, drawbox_message_delegate, printer, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL); break; diff --git a/src/npc.c b/src/npc.c index 53a0248d4e..735c043276 100644 --- a/src/npc.c +++ b/src/npc.c @@ -531,7 +531,7 @@ void update_npcs(void) { f32 x, y, z; f32 hitYaw, hitPitch, hitLength; - playerStatus->animFlags &= ~PA_FLAGS_NPC_COLLIDED; + playerStatus->animFlags &= ~PA_FLAG_NPC_COLLIDED; if (!(gOverrideFlags & (GLOBAL_OVERRIDES_800 | GLOBAL_OVERRIDES_400))) { s32 i; @@ -590,9 +590,9 @@ void update_npcs(void) { Shadow* shadow = get_shadow_by_index(npc->shadowIndex); EntityModel* entityModel = get_entity_model(shadow->entityModelID); - entityModel->flags &= ~ENTITY_MODEL_FLAGS_REFLECT; + entityModel->flags &= ~ENTITY_MODEL_FLAG_REFLECT; if (npc->flags & NPC_FLAG_REFLECT_WALL) { - entityModel->flags |= ENTITY_MODEL_FLAGS_REFLECT; + entityModel->flags |= ENTITY_MODEL_FLAG_REFLECT; } x = npc->pos.x; @@ -944,7 +944,7 @@ void enable_npc_shadow(Npc* npc) { if (!(npc->flags & NPC_FLAG_HAS_SHADOW)) { shadow = get_shadow_by_index(npc->shadowIndex); - shadow->flags &= ~ENTITY_FLAGS_HIDDEN; + shadow->flags &= ~ENTITY_FLAG_HIDDEN; npc->flags = npc->flags | (NPC_FLAG_DIRTY_SHADOW | NPC_FLAG_HAS_SHADOW); } } @@ -954,7 +954,7 @@ void disable_npc_shadow(Npc* npc) { if (npc->flags & NPC_FLAG_HAS_SHADOW) { shadow = get_shadow_by_index(npc->shadowIndex); - shadow->flags |= ENTITY_FLAGS_HIDDEN; + shadow->flags |= ENTITY_FLAG_HIDDEN; npc->flags &= ~NPC_FLAG_HAS_SHADOW; npc->flags &= ~NPC_FLAG_DIRTY_SHADOW; } @@ -2310,7 +2310,7 @@ void init_encounter_status(void) { currentEncounter->encounterList[i] = 0; } - currentEncounter->flags = ENCOUNTER_STATUS_FLAGS_0; + currentEncounter->flags = ENCOUNTER_STATUS_FLAG_0; currentEncounter->numEncounters = 0; currentEncounter->firstStrikeType = FIRST_STRIKE_NONE; currentEncounter->hitType = 0; @@ -2535,10 +2535,10 @@ void kill_enemy(Enemy* enemy) { } do { - if (!(enemy->flags & ENEMY_FLAGS_4)) { - if (!(enemy->flags & ENEMY_FLAGS_8) || (enemy == encounterStatus->currentEnemy)) { - if (!(enemy->flags & ENEMY_FLAGS_1)) { - if (!(enemy->flags & ENEMY_FLAGS_FLED)) { + if (!(enemy->flags & ENEMY_FLAG_4)) { + if (!(enemy->flags & ENEMY_FLAG_8) || (enemy == encounterStatus->currentEnemy)) { + if (!(enemy->flags & ENEMY_FLAG_1)) { + if (!(enemy->flags & ENEMY_FLAG_FLED)) { COPY_set_defeated(encounterStatus->mapID, encounter->encounterID + i); } } diff --git a/src/pause/pause_badges.c b/src/pause/pause_badges.c index 65e2b9cf1d..a51791cc2a 100644 --- a/src/pause/pause_badges.c +++ b/src/pause/pause_badges.c @@ -309,7 +309,7 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width currentBadgeColumn = gPauseBadgesSelectedIndex / currentPage->numCols; currentBadgeRow = gPauseBadgesSelectedIndex % currentPage->numCols; - draw_box(DRAW_FLAGS_NO_CLIP, &gPauseWS_15, baseX + 84, baseY, 0, width - 84, height, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0); + draw_box(DRAW_FLAG_NO_CLIP, &gPauseWS_15, baseX + 84, baseY, 0, width - 84, height, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0); hud_element_set_render_pos(gPauseBadgesIconIDs[20], baseX + 241, baseY + 11); palette = MSG_PAL_STANDARD; hud_element_draw_without_clipping(gPauseBadgesIconIDs[20]); @@ -406,7 +406,7 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width } if (isEquipped) { - draw_box(DRAW_FLAGS_NO_CLIP, &gPauseWS_14, badgeListX + pause_badges_scroll_offset_x(posX) - 20, + draw_box(DRAW_FLAG_NO_CLIP, &gPauseWS_14, badgeListX + pause_badges_scroll_offset_x(posX) - 20, baseY + pause_badges_scroll_offset_y(posY) + 17, 0, 200, 13, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0); } else if (cannotBeEquipped) { @@ -436,13 +436,13 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width if (i == 1) { badgeIconElement = iconIDs[badgeIndex]; - hud_element_clear_flags(badgeIconElement, HUD_ELEMENT_FLAGS_DROP_SHADOW); - hud_element_set_flags(badgeIconElement, HUD_ELEMENT_FLAGS_FILTER_TEX); + hud_element_clear_flags(badgeIconElement, HUD_ELEMENT_FLAG_DROP_SHADOW); + hud_element_set_flags(badgeIconElement, HUD_ELEMENT_FLAG_FILTER_TEX); if (isNone) { badgeIconElement = gPauseBadgesIconIDs[21]; } else { if (isSelected) { - hud_element_set_flags(badgeIconElement, HUD_ELEMENT_FLAGS_DROP_SHADOW); + hud_element_set_flags(badgeIconElement, HUD_ELEMENT_FLAG_DROP_SHADOW); gPauseCurrentDescIconScript = gItemHudScripts[gItemTable[badgeID].hudElemID].enabled; } @@ -610,7 +610,7 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width gDPPipeSync(gMasterGfxPos++); } - draw_box(DRAW_FLAGS_NO_CLIP, &gPauseWS_13, gPauseBadgesCurrentTab == 0 ? baseX + 9 : baseX, baseY + 7, 0, + draw_box(DRAW_FLAG_NO_CLIP, &gPauseWS_13, gPauseBadgesCurrentTab == 0 ? baseX + 9 : baseX, baseY + 7, 0, 91, 34, 255, gPauseBadgesCurrentTab == 1 ? 128 : 0, 0, 0, 0, 0, 0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0); @@ -626,7 +626,7 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width } draw_msg(msg, msgX, msgY, msgOpacity, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); - draw_box(DRAW_FLAGS_NO_CLIP, &gPauseWS_13, gPauseBadgesCurrentTab == 1 ? baseX + 9 : baseX, baseY + 37, 0, 91, 34, 255, + draw_box(DRAW_FLAG_NO_CLIP, &gPauseWS_13, gPauseBadgesCurrentTab == 1 ? baseX + 9 : baseX, baseY + 37, 0, 91, 34, 255, gPauseBadgesCurrentTab == 0 ? 128 : 0, 0, 0, 0, 0, 0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0); msg = pause_get_menu_msg(0x48); @@ -678,10 +678,10 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width if (gPauseBadgesShowNotEnoughBP != 0) { pause_set_cursor_opacity(0); if (gPauseBadgesShowNotEnoughBP == 1) { - draw_box(DRAW_FLAGS_NO_CLIP, &gPauseWS_13, baseX + 67, baseY + 60, 0, 137, 26, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0); + draw_box(DRAW_FLAG_NO_CLIP, &gPauseWS_13, baseX + 67, baseY + 60, 0, 137, 26, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0); draw_msg(pause_get_menu_msg(0x4A), baseX + 86, baseY + 66, 255, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); } else { - draw_box(DRAW_FLAGS_NO_CLIP, &gPauseWS_13, baseX + 67, baseY + 60, 0, 173, 26, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0); + draw_box(DRAW_FLAG_NO_CLIP, &gPauseWS_13, baseX + 67, baseY + 60, 0, 173, 26, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0); draw_msg(pause_get_menu_msg(0x4B), baseX + 90, baseY + 66, 255, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); } } @@ -791,7 +791,7 @@ void pause_badges_init(MenuPanel* panel) { s32 iconID = hud_element_create(gPauseBadgesElements[i]); gPauseBadgesIconIDs[i] = iconID; - hud_element_set_flags(iconID, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(iconID, HUD_ELEMENT_FLAG_80); } for (i = 0; i < ARRAY_COUNT(gPauseBadgesWindowBPs); i++) { diff --git a/src/pause/pause_items.c b/src/pause/pause_items.c index 8f35c4b4a8..a3c71300dd 100644 --- a/src/pause/pause_items.c +++ b/src/pause/pause_items.c @@ -129,7 +129,7 @@ void pause_items_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, palette = MSG_PAL_STANDARD; currentItemColumn = gPauseItemsSelectedIndex / gPauseItemsPages[gPauseItemsCurrentPage].numCols; currentItemRow = gPauseItemsSelectedIndex % gPauseItemsPages[gPauseItemsCurrentPage].numCols; - draw_box(DRAW_FLAGS_NO_CLIP, &gPauseWS_18, baseX + 68, baseY, 0, width - 68, height, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0); + draw_box(DRAW_FLAG_NO_CLIP, &gPauseWS_18, baseX + 68, baseY, 0, width - 68, height, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0); x1 = baseX + 1; y1 = baseY + 7; @@ -226,13 +226,13 @@ void pause_items_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, if (i == 1) { itemIcon = iconIDs[totalItemIndex]; - hud_element_clear_flags(itemIcon, HUD_ELEMENT_FLAGS_DROP_SHADOW); - hud_element_set_flags(itemIcon, HUD_ELEMENT_FLAGS_FILTER_TEX); + hud_element_clear_flags(itemIcon, HUD_ELEMENT_FLAG_DROP_SHADOW); + hud_element_set_flags(itemIcon, HUD_ELEMENT_FLAG_FILTER_TEX); if (isNone) { itemIcon = gPauseItemsIconIDs[19]; } else { if (isSelected) { - hud_element_set_flags(itemIcon, HUD_ELEMENT_FLAGS_DROP_SHADOW); + hud_element_set_flags(itemIcon, HUD_ELEMENT_FLAG_DROP_SHADOW); gPauseCurrentDescIconScript = gItemHudScripts[gItemTable[itemID].hudElemID].enabled; } @@ -292,7 +292,7 @@ void pause_items_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, } } - draw_box(DRAW_FLAGS_NO_CLIP, &gPauseWS_17, gPauseItemsCurrentTab == 0 ? baseX + 9 : baseX, baseY + 7, 0, + draw_box(DRAW_FLAG_NO_CLIP, &gPauseWS_17, gPauseItemsCurrentTab == 0 ? baseX + 9 : baseX, baseY + 7, 0, 91, 34, 255, gPauseItemsCurrentTab == 1 ? 128 : 0, 0, 0, 0, 0, 0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0); @@ -308,7 +308,7 @@ void pause_items_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, } draw_msg(msg, msgX, msgY, opacity1, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); - draw_box(DRAW_FLAGS_NO_CLIP, &gPauseWS_17, gPauseItemsCurrentTab == 1 ? baseX + 9 : baseX, baseY + 39, 0, + draw_box(DRAW_FLAG_NO_CLIP, &gPauseWS_17, gPauseItemsCurrentTab == 1 ? baseX + 9 : baseX, baseY + 39, 0, 91, 34, 255, gPauseItemsCurrentTab == 0 ? 128 : 0, 0, 0, 0, 0, 0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0); @@ -431,7 +431,7 @@ void pause_items_init(MenuPanel* panel) { for (i = 0; i < ARRAY_COUNT(gPauseItemsIconIDs); i++) { gPauseItemsIconIDs[i] = hud_element_create(gPauseItemsElements[i]); - hud_element_set_flags(gPauseItemsIconIDs[i], HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(gPauseItemsIconIDs[i], HUD_ELEMENT_FLAG_80); } for (i = 0; i < ARRAY_COUNT(gPauseItemsWindowBPs); i++) { diff --git a/src/pause/pause_main.c b/src/pause/pause_main.c index c8cc094581..bb297dbd5c 100644 --- a/src/pause/pause_main.c +++ b/src/pause/pause_main.c @@ -52,10 +52,10 @@ s32 gPauseCursorTargetPosY = -120; s32 gPauseCursorTargetOpacity = 0; u32 D_8024EFB4 = 1; s16 D_8024EFB8[] = { -10, -25, -42, -60, -80 }; //unused -u8 gPauseWindowFlipUpFlags[] = { DRAW_FLAGS_ROTSCALE, DRAW_FLAGS_ROTSCALE, DRAW_FLAGS_ROTSCALE, DRAW_FLAGS_ROTSCALE, DRAW_FLAGS_ROTSCALE, 0, 0}; +u8 gPauseWindowFlipUpFlags[] = { DRAW_FLAG_ROTSCALE, DRAW_FLAG_ROTSCALE, DRAW_FLAG_ROTSCALE, DRAW_FLAG_ROTSCALE, DRAW_FLAG_ROTSCALE, 0, 0}; s16 gPauseWindowFlipUpAngles[] = { -80, -65, -38, -30, -10, 0 }; s16 gPauseWindowFlipUpAngles_2[] = { 80, 65, 38, 30, 10, 0 }; -u8 gPauseWindowFlipDownFlags[] = { DRAW_FLAGS_ROTSCALE, DRAW_FLAGS_ROTSCALE, DRAW_FLAGS_ROTSCALE, DRAW_FLAGS_ROTSCALE, DRAW_FLAGS_ROTSCALE, DRAW_FLAGS_ROTSCALE, 0, 0 }; +u8 gPauseWindowFlipDownFlags[] = { DRAW_FLAG_ROTSCALE, DRAW_FLAG_ROTSCALE, DRAW_FLAG_ROTSCALE, DRAW_FLAG_ROTSCALE, DRAW_FLAG_ROTSCALE, DRAW_FLAG_ROTSCALE, 0, 0 }; u8 D_8024EFEC[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x11, 0x00, 0x25, 0x00, 0x3C, 0x00, 0x55, 0x00, 0x6E }; //unused s16 gPauseWindowFlipDownAngles[] = { -10, -25, -42, -60, -80}; @@ -108,7 +108,7 @@ MenuWindowBP gPauseCommonWindowsBPs[] = { .tab = NULL, .parentID = WINDOW_ID_NONE, .fpUpdate = { WINDOW_UPDATE_SHOW }, - .extraFlags = WINDOW_FLAGS_40, + .extraFlags = WINDOW_FLAG_40, .style = { .customStyle = &gPauseWS_0 } }, { @@ -172,7 +172,7 @@ void pause_set_cursor_pos_immediate(s32 windowID, s32 posX, s32 posY) { Window* window = &gWindows[i]; s8 parent = window->parent; - if ((parent == WINDOW_ID_NONE || parent == WINDOW_ID_PAUSE_MAIN) && (window->flags & WINDOW_FLAGS_INITIAL_ANIMATION)) { + if ((parent == WINDOW_ID_NONE || parent == WINDOW_ID_PAUSE_MAIN) && (window->flags & WINDOW_FLAG_INITIAL_ANIMATION)) { break; } } @@ -185,7 +185,7 @@ void pause_set_cursor_pos_immediate(s32 windowID, s32 posX, s32 posY) { gPauseCursorTargetPosY = posY; gPauseCursorPosY = posY; - } else if ((window->flags & WINDOW_FLAGS_INITIAL_ANIMATION) == 0 && (window->parent == -1 || !(gWindows[window->parent].flags & WINDOW_FLAGS_INITIAL_ANIMATION))) { + } else if ((window->flags & WINDOW_FLAG_INITIAL_ANIMATION) == 0 && (window->parent == -1 || !(gWindows[window->parent].flags & WINDOW_FLAG_INITIAL_ANIMATION))) { gPauseCursorTargetPosX = posX; gPauseCursorPosX = posX; gPauseCursorTargetPosY = posY; @@ -206,7 +206,7 @@ void pause_set_cursor_pos(s32 windowID, s32 posX, s32 posY) { Window* window = &gWindows[i]; s8 parent = window->parent; - if ((parent == -1 || parent == WINDOW_ID_PAUSE_MAIN) && (window->flags & WINDOW_FLAGS_INITIAL_ANIMATION)) { + if ((parent == -1 || parent == WINDOW_ID_PAUSE_MAIN) && (window->flags & WINDOW_FLAG_INITIAL_ANIMATION)) { break; } } @@ -218,7 +218,7 @@ void pause_set_cursor_pos(s32 windowID, s32 posX, s32 posY) { gPauseCursorPosX = posX; gPauseCursorTargetPosY = posY; gPauseCursorPosY = posY; - } else if ((window->flags & WINDOW_FLAGS_INITIAL_ANIMATION) == 0 && (window->parent == -1 || !(gWindows[window->parent].flags & WINDOW_FLAGS_INITIAL_ANIMATION))) { + } else if ((window->flags & WINDOW_FLAG_INITIAL_ANIMATION) == 0 && (window->parent == -1 || !(gWindows[window->parent].flags & WINDOW_FLAG_INITIAL_ANIMATION))) { gPauseCursorTargetPosX = posX; gPauseCursorTargetPosY = posY; } @@ -261,7 +261,7 @@ void pause_update_tab_default(s32 windowIndex, s32* flags, s32* posX, s32* posY, Window* window = &gWindows[windowIndex]; *darkening = 160; - window->flags &= ~(WINDOW_FLAGS_HIDDEN | WINDOW_FLAGS_INITIAL_ANIMATION); + window->flags &= ~(WINDOW_FLAG_HIDDEN | WINDOW_FLAG_INITIAL_ANIMATION); } void func_80242FBC(s32 windowIndex, s32* flags, s32* posX, s32* posY, s32* posZ, f32* scaleX, f32* scaleY, @@ -270,7 +270,7 @@ void func_80242FBC(s32 windowIndex, s32* flags, s32* posX, s32* posY, s32* posZ, *darkening = 160; *opacity = 80; - window->flags &= ~(WINDOW_FLAGS_HIDDEN | WINDOW_FLAGS_INITIAL_ANIMATION); + window->flags &= ~(WINDOW_FLAG_HIDDEN | WINDOW_FLAG_INITIAL_ANIMATION); } void pause_update_tab_inactive(s32 windowIndex, s32* flags, s32* posX, s32* posY, s32* posZ, f32* scaleX, f32* scaleY, @@ -279,7 +279,7 @@ void pause_update_tab_inactive(s32 windowIndex, s32* flags, s32* posX, s32* posY s32 updateCounter = window->updateCounter; if (updateCounter == 0) { - window->flags &= ~WINDOW_FLAGS_HIDDEN; + window->flags &= ~WINDOW_FLAG_HIDDEN; } if (updateCounter == 5) { @@ -290,7 +290,7 @@ void pause_update_tab_inactive(s32 windowIndex, s32* flags, s32* posX, s32* posY *darkening = (updateCounter + 1) * 16; } else { *darkening = 160; - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; } } @@ -301,7 +301,7 @@ void pause_update_tab_active(s32 windowIndex, s32* flags, s32* posX, s32* posY, if (window->updateCounter == 0) { update_window_hierarchy(windowIndex, window->originalPriority); *darkening = 0; - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; } } @@ -311,14 +311,14 @@ void func_802430E4(s32 windowIndex, s32* flags, s32* posX, s32* posY, s32* posZ, s32 updateCounter = window->updateCounter; if (updateCounter == 0) { - window->flags &= ~WINDOW_FLAGS_HIDDEN; + window->flags &= ~WINDOW_FLAG_HIDDEN; } if (updateCounter < 16) { *opacity = updateCounter * 16; } else { *opacity = 255; - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; } } @@ -331,8 +331,8 @@ void func_8024313C(s32 windowIndex, s32* flags, s32* posX, s32* posY, s32* posZ, *opacity = 255 - (updateCounter * 16); } else { *opacity = 0; - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; - window->flags |= WINDOW_FLAGS_HIDDEN; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; + window->flags |= WINDOW_FLAG_HIDDEN; } } @@ -342,7 +342,7 @@ void pause_update_page_active_2(s32 windowIndex, s32* flags, s32* posX, s32* pos s32 updateCounter = window->updateCounter; if (updateCounter == 0) { - window->flags &= ~WINDOW_FLAGS_HIDDEN; + window->flags &= ~WINDOW_FLAG_HIDDEN; } if (updateCounter < 7) { *flags = gPauseWindowFlipUpFlags[updateCounter]; @@ -350,7 +350,7 @@ void pause_update_page_active_2(s32 windowIndex, s32* flags, s32* posX, s32* pos } else { *flags = gPauseWindowFlipUpFlags[5]; *rotX += gPauseWindowFlipUpAngles[6]; - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; } } @@ -360,7 +360,7 @@ void pause_update_page_active_1(s32 windowIndex, s32* flags, s32* posX, s32* pos s32 updateCounter = window->updateCounter; if (updateCounter == 0) { - window->flags &= ~WINDOW_FLAGS_HIDDEN; + window->flags &= ~WINDOW_FLAG_HIDDEN; } if (updateCounter < 7) { *flags = gPauseWindowFlipUpFlags[updateCounter]; @@ -368,7 +368,7 @@ void pause_update_page_active_1(s32 windowIndex, s32* flags, s32* posX, s32* pos } else { *flags = gPauseWindowFlipUpFlags[5]; *rotX += gPauseWindowFlipUpAngles_2[6]; - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; } } @@ -383,8 +383,8 @@ void pause_update_page_inactive_1(s32 windowIndex, s32* flags, s32* posX, s32* p } else { *flags = gPauseWindowFlipDownFlags[4]; *rotX += gPauseWindowFlipDownAngles[4]; - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; - window->flags |= WINDOW_FLAGS_HIDDEN; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; + window->flags |= WINDOW_FLAG_HIDDEN; } } @@ -399,8 +399,8 @@ void pause_update_page_inactive_2(s32 windowIndex, s32* flags, s32* posX, s32* p } else { *flags = gPauseWindowFlipDownFlags[4]; *rotX = gPauseWindowFlipDownAngles_2[4]; - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; - window->flags |= WINDOW_FLAGS_HIDDEN; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; + window->flags |= WINDOW_FLAG_HIDDEN; } } @@ -476,8 +476,8 @@ void pause_textbox_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 widt gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); hud_element_set_render_pos(gPauseCommonIconIDs[3], baseX - 4, baseY + 16); hud_element_set_script(gPauseCommonIconIDs[3], gPauseShownDescIconScript); - hud_element_set_flags(gPauseCommonIconIDs[3], HUD_ELEMENT_FLAGS_DROP_SHADOW); - hud_element_clear_flags(gPauseCommonIconIDs[3], HUD_ELEMENT_FLAGS_FILTER_TEX); + hud_element_set_flags(gPauseCommonIconIDs[3], HUD_ELEMENT_FLAG_DROP_SHADOW); + hud_element_clear_flags(gPauseCommonIconIDs[3], HUD_ELEMENT_FLAG_FILTER_TEX); hud_element_set_scale(gPauseCommonIconIDs[3], 1.0f); hud_element_draw_without_clipping(gPauseCommonIconIDs[3]); } @@ -559,7 +559,7 @@ void pause_tutorial_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 wid margin2 = (s32)(width - msgWidth2) >> 1; draw_msg(pause_get_menu_msg(gPauseTutorialDescMessages[state]), baseX + margin2, baseY + 13 + state * 140 - gPauseTutorialScrollPos, 255, MSG_PAL_STANDARD, DRAW_MSG_STYLE_MENU); hud_element_set_render_pos(gPauseCommonIconIDs[gPauseTutorialIconIDs[gPauseTutorialState]], baseX + width / 2 - 2, baseY + 52); - hud_element_set_flags(gPauseCommonIconIDs[gPauseTutorialIconIDs[gPauseTutorialState]], HUD_ELEMENT_FLAGS_FILTER_TEX); + hud_element_set_flags(gPauseCommonIconIDs[gPauseTutorialIconIDs[gPauseTutorialState]], HUD_ELEMENT_FLAG_FILTER_TEX); hud_element_set_scale(gPauseCommonIconIDs[gPauseTutorialIconIDs[gPauseTutorialState]], 0.5f); hud_element_draw_without_clipping(gPauseCommonIconIDs[gPauseTutorialIconIDs[gPauseTutorialState]]); @@ -583,9 +583,9 @@ void pause_init(void) { for (i = 0; i < ARRAY_COUNT(gPauseIconScripts); i++) { gPauseCommonIconIDs[i] = hud_element_create(gPauseIconScripts[i]); if (gPauseIconScripts[i] == &HES_AnimatedCursorHand) { - hud_element_set_flags(gPauseCommonIconIDs[i], HUD_ELEMENT_FLAGS_DROP_SHADOW | HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(gPauseCommonIconIDs[i], HUD_ELEMENT_FLAG_DROP_SHADOW | HUD_ELEMENT_FLAG_80); } else { - hud_element_set_flags(gPauseCommonIconIDs[i], HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(gPauseCommonIconIDs[i], HUD_ELEMENT_FLAG_80); } } diff --git a/src/pause/pause_map.c b/src/pause/pause_map.c index bf10eb32de..031e349934 100644 --- a/src/pause/pause_map.c +++ b/src/pause/pause_map.c @@ -386,7 +386,7 @@ void pause_map_init(MenuPanel* tab) { for (i = 0; i < ARRAY_COUNT(gPauseMapIconScripts); i++) { gPauseMapIconIDs[i] = hud_element_create(gPauseMapIconScripts[i]); - hud_element_set_flags(gPauseMapIconIDs[i], HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(gPauseMapIconIDs[i], HUD_ELEMENT_FLAG_80); } for (i = 0; i < ARRAY_COUNT(gPauseMapWindowBPs); i++) { diff --git a/src/pause/pause_partners.c b/src/pause/pause_partners.c index 6e2548f226..05ad370518 100644 --- a/src/pause/pause_partners.c +++ b/src/pause/pause_partners.c @@ -520,7 +520,7 @@ void pause_partners_init(MenuPanel* panel) { for (i = 0; i < ARRAY_COUNT(gPausePartnersIconScripts); i++) { gPausePartnersIconIDs[i] = hud_element_create(gPausePartnersIconScripts[i]); - hud_element_set_flags(gPausePartnersIconIDs[i], HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(gPausePartnersIconIDs[i], HUD_ELEMENT_FLAG_80); } for (i = 0; i < ARRAY_COUNT(gPausePartnersWindowBPs); i++) { diff --git a/src/pause/pause_stats.c b/src/pause/pause_stats.c index 3229c56eb7..49ce16bb98 100644 --- a/src/pause/pause_stats.c +++ b/src/pause/pause_stats.c @@ -492,7 +492,7 @@ void pause_stats_init(MenuPanel* panel) { s32 iconID = hud_element_create(gStatsMenuElements[i]); gPauseStatsIconIDs[i] = iconID; - hud_element_set_flags(iconID, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(iconID, HUD_ELEMENT_FLAG_80); } for (i = 0; i < ARRAY_COUNT(gStatsMenuWindowBPs); i++) { diff --git a/src/pause/pause_tabs.c b/src/pause/pause_tabs.c index c58dd922ee..107127d4a1 100644 --- a/src/pause/pause_tabs.c +++ b/src/pause/pause_tabs.c @@ -148,10 +148,10 @@ void pause_tabs_draw_invis(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 void pause_tabs_draw_stats(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening) { if (darkening != 0) { - hud_element_set_flags(gPauseTabsIconIDs[0], HUD_ELEMENT_FLAGS_TRANSPARENT); + hud_element_set_flags(gPauseTabsIconIDs[0], HUD_ELEMENT_FLAG_TRANSPARENT); hud_element_set_alpha(gPauseTabsIconIDs[0], 255.0 - darkening * 0.5); } else { - hud_element_clear_flags(gPauseTabsIconIDs[0], HUD_ELEMENT_FLAGS_TRANSPARENT); + hud_element_clear_flags(gPauseTabsIconIDs[0], HUD_ELEMENT_FLAG_TRANSPARENT); hud_element_set_alpha(gPauseTabsIconIDs[0], 255); } @@ -166,10 +166,10 @@ void pause_tabs_draw_stats(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 void pause_tabs_draw_badges(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening) { if (darkening != 0) { - hud_element_set_flags(gPauseTabsIconIDs[1], HUD_ELEMENT_FLAGS_TRANSPARENT); + hud_element_set_flags(gPauseTabsIconIDs[1], HUD_ELEMENT_FLAG_TRANSPARENT); hud_element_set_alpha(gPauseTabsIconIDs[1], 255.0 - darkening * 0.5); } else { - hud_element_clear_flags(gPauseTabsIconIDs[1], HUD_ELEMENT_FLAGS_TRANSPARENT); + hud_element_clear_flags(gPauseTabsIconIDs[1], HUD_ELEMENT_FLAG_TRANSPARENT); hud_element_set_alpha(gPauseTabsIconIDs[1], 255); } @@ -184,10 +184,10 @@ void pause_tabs_draw_badges(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s3 void pause_tabs_draw_items(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening) { if (darkening != 0) { - hud_element_set_flags(gPauseTabsIconIDs[2], HUD_ELEMENT_FLAGS_TRANSPARENT); + hud_element_set_flags(gPauseTabsIconIDs[2], HUD_ELEMENT_FLAG_TRANSPARENT); hud_element_set_alpha(gPauseTabsIconIDs[2], 255.0 - darkening * 0.5); } else { - hud_element_clear_flags(gPauseTabsIconIDs[2], HUD_ELEMENT_FLAGS_TRANSPARENT); + hud_element_clear_flags(gPauseTabsIconIDs[2], HUD_ELEMENT_FLAG_TRANSPARENT); hud_element_set_alpha(gPauseTabsIconIDs[2], 255); } @@ -202,10 +202,10 @@ void pause_tabs_draw_items(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 void pause_tabs_draw_party(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening) { if (darkening != 0) { - hud_element_set_flags(gPauseTabsIconIDs[3], HUD_ELEMENT_FLAGS_TRANSPARENT); + hud_element_set_flags(gPauseTabsIconIDs[3], HUD_ELEMENT_FLAG_TRANSPARENT); hud_element_set_alpha(gPauseTabsIconIDs[3], 255.0 - darkening * 0.5); } else { - hud_element_clear_flags(gPauseTabsIconIDs[3], HUD_ELEMENT_FLAGS_TRANSPARENT); + hud_element_clear_flags(gPauseTabsIconIDs[3], HUD_ELEMENT_FLAG_TRANSPARENT); hud_element_set_alpha(gPauseTabsIconIDs[3], 255); } @@ -220,10 +220,10 @@ void pause_tabs_draw_party(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 void pause_tabs_draw_spirits(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening) { if (darkening != 0) { - hud_element_set_flags(gPauseTabsIconIDs[4], HUD_ELEMENT_FLAGS_TRANSPARENT); + hud_element_set_flags(gPauseTabsIconIDs[4], HUD_ELEMENT_FLAG_TRANSPARENT); hud_element_set_alpha(gPauseTabsIconIDs[4], 255.0 - darkening * 0.5); } else { - hud_element_clear_flags(gPauseTabsIconIDs[4], HUD_ELEMENT_FLAGS_TRANSPARENT); + hud_element_clear_flags(gPauseTabsIconIDs[4], HUD_ELEMENT_FLAG_TRANSPARENT); hud_element_set_alpha(gPauseTabsIconIDs[4], 255); } @@ -238,10 +238,10 @@ void pause_tabs_draw_spirits(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s void pause_tabs_draw_map(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening) { if (darkening != 0) { - hud_element_set_flags(gPauseTabsIconIDs[5], HUD_ELEMENT_FLAGS_TRANSPARENT); + hud_element_set_flags(gPauseTabsIconIDs[5], HUD_ELEMENT_FLAG_TRANSPARENT); hud_element_set_alpha(gPauseTabsIconIDs[5], 255.0 - darkening * 0.5); } else { - hud_element_clear_flags(gPauseTabsIconIDs[5], HUD_ELEMENT_FLAGS_TRANSPARENT); + hud_element_clear_flags(gPauseTabsIconIDs[5], HUD_ELEMENT_FLAG_TRANSPARENT); hud_element_set_alpha(gPauseTabsIconIDs[5], 255); } @@ -259,7 +259,7 @@ void pause_tabs_init(MenuPanel* tab) { for (i = 0; i < ARRAY_COUNT(gPauseTabsHudScripts); i++) { gPauseTabsIconIDs[i] = hud_element_create(gPauseTabsHudScripts[i]); - hud_element_set_flags(gPauseTabsIconIDs[i], HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(gPauseTabsIconIDs[i], HUD_ELEMENT_FLAG_80); } for (i = 0; i < ARRAY_COUNT(gPauseTabsWindowBPs); i++) { diff --git a/src/state_battle.c b/src/state_battle.c index 5844e77827..fa8132c190 100644 --- a/src/state_battle.c +++ b/src/state_battle.c @@ -81,7 +81,7 @@ void state_step_battle(void) { btl_save_world_cameras(); load_battle_section(); D_800A0904 = gPlayerStatusPtr->animFlags; - gPlayerStatusPtr->animFlags &= ~PA_FLAGS_40; + gPlayerStatusPtr->animFlags &= ~PA_FLAG_40; D_800A0908 = get_time_freeze_mode(); set_time_freeze_mode(TIME_FREEZE_NORMAL); gOverrideFlags &= ~GLOBAL_OVERRIDES_8; diff --git a/src/state_file_select.c b/src/state_file_select.c index 895c4692f7..452c5a03ee 100644 --- a/src/state_file_select.c +++ b/src/state_file_select.c @@ -45,11 +45,11 @@ void state_init_file_select(void) { gCameras[CAM_DEFAULT].unk_06 = 1; gCameras[CAM_DEFAULT].nearClip = 16; gCameras[CAM_DEFAULT].farClip = 4096; - gCameras[CAM_DEFAULT].flags |= CAMERA_FLAGS_ENABLED; + gCameras[CAM_DEFAULT].flags |= CAMERA_FLAG_ENABLED; gCurrentCameraID = CAM_DEFAULT; - gCameras[CAM_BATTLE].flags |= CAMERA_FLAGS_ENABLED; - gCameras[CAM_TATTLE].flags |= CAMERA_FLAGS_ENABLED; - gCameras[CAM_3].flags |= CAMERA_FLAGS_ENABLED; + gCameras[CAM_BATTLE].flags |= CAMERA_FLAG_ENABLED; + gCameras[CAM_TATTLE].flags |= CAMERA_FLAG_ENABLED; + gCameras[CAM_3].flags |= CAMERA_FLAG_ENABLED; gCameras[CAM_DEFAULT].vfov = 25.0f; set_cam_viewport(0, 12, 28, 296, 184); gCameras[CAM_DEFAULT].auxBoomLength = 40; @@ -367,7 +367,7 @@ void state_step_exit_file_select(void) { Window* window = &gWindows[i]; if (window->parent == 44 || window->parent == -1) { - flagSum += window->flags & WINDOW_FLAGS_INITIAL_ANIMATION; + flagSum += window->flags & WINDOW_FLAG_INITIAL_ANIMATION; } } diff --git a/src/state_logos.c b/src/state_logos.c index 432d89e4ee..bf6aee2ba3 100644 --- a/src/state_logos.c +++ b/src/state_logos.c @@ -65,10 +65,10 @@ void state_init_logos(void) { gCameras[CAM_DEFAULT].farClip = 4096; gCurrentCameraID = CAM_DEFAULT; gCameras[CAM_DEFAULT].vfov = 25.0f; - gCameras[CAM_DEFAULT].flags |= CAMERA_FLAGS_ENABLED; - gCameras[CAM_BATTLE].flags |= CAMERA_FLAGS_ENABLED; - gCameras[CAM_TATTLE].flags |= CAMERA_FLAGS_ENABLED; - gCameras[CAM_3].flags |= CAMERA_FLAGS_ENABLED; + gCameras[CAM_DEFAULT].flags |= CAMERA_FLAG_ENABLED; + gCameras[CAM_BATTLE].flags |= CAMERA_FLAG_ENABLED; + gCameras[CAM_TATTLE].flags |= CAMERA_FLAG_ENABLED; + gCameras[CAM_3].flags |= CAMERA_FLAG_ENABLED; set_cam_viewport(0, 12, 28, 296, 184); gCameras[CAM_DEFAULT].auxBoomLength = 40; gCameras[CAM_DEFAULT].bgColor[0] = 0; diff --git a/src/state_title_screen.c b/src/state_title_screen.c index 8701c10eb6..52f7be0254 100644 --- a/src/state_title_screen.c +++ b/src/state_title_screen.c @@ -102,10 +102,10 @@ void state_init_title_screen(void) { gCameras[CAM_DEFAULT].farClip = CAM_FAR_CLIP; gCurrentCameraID = CAM_DEFAULT; gCameras[CAM_DEFAULT].vfov = 25.0f; - gCameras[CAM_DEFAULT].flags |= CAMERA_FLAGS_ENABLED; - gCameras[CAM_BATTLE].flags |= CAMERA_FLAGS_ENABLED; - gCameras[CAM_TATTLE].flags |= CAMERA_FLAGS_ENABLED; - gCameras[CAM_3].flags |= CAMERA_FLAGS_ENABLED; + gCameras[CAM_DEFAULT].flags |= CAMERA_FLAG_ENABLED; + gCameras[CAM_BATTLE].flags |= CAMERA_FLAG_ENABLED; + gCameras[CAM_TATTLE].flags |= CAMERA_FLAG_ENABLED; + gCameras[CAM_3].flags |= CAMERA_FLAG_ENABLED; set_cam_viewport(0, 12, 28, 296, 184); gCameras[CAM_DEFAULT].auxBoomLength = 40; gCameras[CAM_DEFAULT].bgColor[0] = 0; diff --git a/src/status_icons.c b/src/status_icons.c index 64fbee5b4a..7725a3721b 100644 --- a/src/status_icons.c +++ b/src/status_icons.c @@ -343,8 +343,8 @@ void update_all_status_icons(void* data) { elementID = icon->status1.activeElementID = hud_element_create(&HES_Item_Present); break; } - hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_DISABLED); - hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_80); icon->status1.activeTask = STATUS_ICON_TASK_DRAW; } @@ -407,8 +407,8 @@ void update_all_status_icons(void* data) { break; } - hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_DISABLED); - hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_80); icon->status2.activeTask = STATUS_ICON_TASK_DRAW; } @@ -449,8 +449,8 @@ void update_all_status_icons(void* data) { break; } - hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_DISABLED); - hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_80); icon->status3.activeTask = STATUS_ICON_TASK_DRAW; } @@ -483,8 +483,8 @@ void update_all_status_icons(void* data) { if (icon->status4.activeTask == STATUS_ICON_TASK_LOAD) { elementID = icon->status4.activeElementID = hud_element_create(&HES_WeakenedBegin); - hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_DISABLED); - hud_element_set_flags(elementID, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(elementID, HUD_ELEMENT_FLAG_80); icon->status4.activeTask = STATUS_ICON_TASK_DRAW; } @@ -511,7 +511,7 @@ void update_all_status_icons(void* data) { if (icon->boostJump.removing == 1) { s32 index = icon->prevIndexBoostJump; - if (get_hud_element(index)->flags & HUD_ELEMENT_FLAGS_ANIMATION_FINISHED) { + if (get_hud_element(index)->flags & HUD_ELEMENT_FLAG_ANIMATION_FINISHED) { hud_element_free(index); icon->boostJump.removing = 0; } @@ -522,7 +522,7 @@ void update_all_status_icons(void* data) { if (icon->boostHammer.removing == 1) { s32 index = icon->prevIndexBoostHammer; - if (get_hud_element(index)->flags & HUD_ELEMENT_FLAGS_ANIMATION_FINISHED) { + if (get_hud_element(index)->flags & HUD_ELEMENT_FLAG_ANIMATION_FINISHED) { hud_element_free(index); icon->boostHammer.removing = 0; } @@ -565,9 +565,9 @@ void draw_all_status_icons(void* data) { isActiveDrawn = 0; if (icon->status1.activeTask == STATUS_ICON_TASK_DRAW) { if (icon->flags & STATUS_ICON_FLAG_DEBUFF) { - hud_element_set_flags(icon->status1.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(icon->status1.activeElementID, HUD_ELEMENT_FLAG_DISABLED); } else if (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1) { - hud_element_clear_flags(icon->status1.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->status1.activeElementID, HUD_ELEMENT_FLAG_DISABLED); x = icon->worldPos.x; y = icon->worldPos.y + icon->status1OffsetY; @@ -584,7 +584,7 @@ void draw_all_status_icons(void* data) { } if (icon->status1.removingTask == STATUS_ICON_TASK_DRAW && (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1)) { - hud_element_clear_flags(icon->status1.removingElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->status1.removingElementID, HUD_ELEMENT_FLAG_DISABLED); if (isActiveDrawn == 0) { iconCounter++; @@ -604,9 +604,9 @@ void draw_all_status_icons(void* data) { isActiveDrawn = 0; if (icon->status2.activeTask == STATUS_ICON_TASK_DRAW) { if (icon->flags & STATUS_ICON_FLAG_STATIC) { - hud_element_set_flags(icon->status2.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(icon->status2.activeElementID, HUD_ELEMENT_FLAG_DISABLED); } else if (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1) { - hud_element_clear_flags(icon->status2.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->status2.activeElementID, HUD_ELEMENT_FLAG_DISABLED); offsetY = 0; if (iconCounter == 0) { @@ -629,7 +629,7 @@ void draw_all_status_icons(void* data) { } if (icon->status2.removingTask == STATUS_ICON_TASK_DRAW && (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1)) { - hud_element_clear_flags(icon->status2.removingElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->status2.removingElementID, HUD_ELEMENT_FLAG_DISABLED); offsetY = 0; if (iconCounter == 0) { @@ -653,9 +653,9 @@ void draw_all_status_icons(void* data) { isActiveDrawn = 0; if (icon->status3.activeTask == STATUS_ICON_TASK_DRAW) { if (icon->flags & STATUS_ICON_FLAG_TRANSPARENT) { - hud_element_set_flags(icon->status3.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(icon->status3.activeElementID, HUD_ELEMENT_FLAG_DISABLED); } else if (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1) { - hud_element_clear_flags(icon->status3.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->status3.activeElementID, HUD_ELEMENT_FLAG_DISABLED); offsetY = 0; if (iconCounter == 1) { @@ -679,7 +679,7 @@ void draw_all_status_icons(void* data) { } if (icon->status3.removingTask == STATUS_ICON_TASK_DRAW && (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1)) { - hud_element_clear_flags(icon->status3.removingElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->status3.removingElementID, HUD_ELEMENT_FLAG_DISABLED); offsetY = 0; if (iconCounter == 1) { @@ -706,9 +706,9 @@ void draw_all_status_icons(void* data) { isActiveDrawn = 0; if (icon->status4.activeTask == STATUS_ICON_TASK_DRAW) { if (icon->flags & STATUS_ICON_FLAG_STATUS_CHILL_OUT) { - hud_element_set_flags(icon->status4.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(icon->status4.activeElementID, HUD_ELEMENT_FLAG_DISABLED); } else if (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1) { - hud_element_clear_flags(icon->status4.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->status4.activeElementID, HUD_ELEMENT_FLAG_DISABLED); offsetY = 0; if (iconCounter == 2) { @@ -736,7 +736,7 @@ void draw_all_status_icons(void* data) { } if (icon->status4.removingTask == STATUS_ICON_TASK_DRAW && (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1)) { - hud_element_clear_flags(icon->status4.removingElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->status4.removingElementID, HUD_ELEMENT_FLAG_DISABLED); offsetY = 0; if (iconCounter == 2) { @@ -766,9 +766,9 @@ void draw_all_status_icons(void* data) { do { if (icon->boostJump.active) { if (icon->flags & STATUS_ICON_FLAG_BOOST_JUMP) { - hud_element_set_flags(icon->boostJump.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(icon->boostJump.activeElementID, HUD_ELEMENT_FLAG_DISABLED); } else if (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1) { - hud_element_clear_flags(icon->boostJump.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->boostJump.activeElementID, HUD_ELEMENT_FLAG_DISABLED); x = icon->worldPos.x; z = icon->worldPos.z; @@ -782,7 +782,7 @@ void draw_all_status_icons(void* data) { } while (0); if (icon->boostJump.removing) { - hud_element_clear_flags(icon->prevIndexBoostJump, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->prevIndexBoostJump, HUD_ELEMENT_FLAG_DISABLED); x = icon->worldPos.x; z = icon->worldPos.z; @@ -796,9 +796,9 @@ void draw_all_status_icons(void* data) { do { if (icon->boostHammer.active) { if (icon->flags & STATUS_ICON_FLAG_BOOST_HAMMER) { - hud_element_set_flags(icon->boostHammer.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(icon->boostHammer.activeElementID, HUD_ELEMENT_FLAG_DISABLED); } else if (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1) { - hud_element_clear_flags(icon->boostHammer.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->boostHammer.activeElementID, HUD_ELEMENT_FLAG_DISABLED); x = icon->worldPos.x; z = icon->worldPos.z; @@ -812,7 +812,7 @@ void draw_all_status_icons(void* data) { } while (0); if (icon->boostHammer.removing) { - hud_element_clear_flags(icon->prevIndexBoostHammer, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->prevIndexBoostHammer, HUD_ELEMENT_FLAG_DISABLED); x = icon->worldPos.x; z = icon->worldPos.z; @@ -826,9 +826,9 @@ void draw_all_status_icons(void* data) { do { if (icon->boostPartner.active) { if (icon->flags & STATUS_ICON_FLAG_BOOST_PARTNER) { - hud_element_set_flags(icon->boostPartner.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(icon->boostPartner.activeElementID, HUD_ELEMENT_FLAG_DISABLED); } else if (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1) { - hud_element_clear_flags(icon->boostPartner.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->boostPartner.activeElementID, HUD_ELEMENT_FLAG_DISABLED); x = icon->worldPos.x; z = icon->worldPos.z; @@ -844,9 +844,9 @@ void draw_all_status_icons(void* data) { do { if (icon->surprise.active) { if (icon->flags & STATUS_ICON_FLAG_SURPRISE) { - hud_element_set_flags(icon->surprise.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(icon->surprise.activeElementID, HUD_ELEMENT_FLAG_DISABLED); } else if (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1) { - hud_element_clear_flags(icon->surprise.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->surprise.activeElementID, HUD_ELEMENT_FLAG_DISABLED); x = icon->worldPos.x; z = icon->worldPos.z; @@ -862,9 +862,9 @@ void draw_all_status_icons(void* data) { do { if (icon->peril.active) { if (icon->flags & STATUS_ICON_FLAG_PERIL) { - hud_element_set_flags(icon->peril.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(icon->peril.activeElementID, HUD_ELEMENT_FLAG_DISABLED); } else if (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1) { - hud_element_clear_flags(icon->peril.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->peril.activeElementID, HUD_ELEMENT_FLAG_DISABLED); x = icon->worldPos.x; z = icon->worldPos.z; @@ -880,9 +880,9 @@ void draw_all_status_icons(void* data) { do { if (icon->danger.active) { if (icon->flags & STATUS_ICON_FLAG_DANGER) { - hud_element_set_flags(icon->danger.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(icon->danger.activeElementID, HUD_ELEMENT_FLAG_DISABLED); } else if (icon->flags & STATUS_ICON_FLAG_BATTLE || gGameStatusPtr->isBattle != 1) { - hud_element_clear_flags(icon->danger.activeElementID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(icon->danger.activeElementID, HUD_ELEMENT_FLAG_DISABLED); x = icon->worldPos.x; z = icon->worldPos.z; @@ -1120,8 +1120,8 @@ void create_status_icon_boost_jump(s32 iconID) { if (!statusIcon->boostJump.active) { statusIcon->boostJump.active = TRUE; hudElement = hud_element_create(&HES_BoostJumpBegin); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80); statusIcon->boostJump.activeElementID = hudElement; } } @@ -1152,8 +1152,8 @@ void create_status_icon_boost_hammer(s32 iconID) { if (!statusIcon->boostHammer.active) { statusIcon->boostHammer.active = TRUE; hudElement = hud_element_create(&HES_BoostHammerBegin); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80); statusIcon->boostHammer.activeElementID = hudElement; } } @@ -1184,8 +1184,8 @@ void create_status_icon_boost_partner(s32 iconID) { if (!statusIcon->boostPartner.active) { statusIcon->boostPartner.active = TRUE; hudElement = hud_element_create(&HES_BoostPartner); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80); statusIcon->boostPartner.activeElementID = hudElement; } } @@ -1213,8 +1213,8 @@ void create_status_icon_surprise(s32 iconID) { if (!statusIcon->surprise.active) { statusIcon->surprise.active = TRUE; hudElement = hud_element_create(&HES_Surprise); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80); statusIcon->surprise.activeElementID = hudElement; } } @@ -1242,8 +1242,8 @@ void create_status_icon_peril(s32 iconID) { if (!statusIcon->peril.active) { statusIcon->peril.active = TRUE; hudElement = hud_element_create(&HES_Peril); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80); statusIcon->peril.activeElementID = hudElement; } } @@ -1271,8 +1271,8 @@ void create_status_icon_danger(s32 iconID) { if (!statusIcon->danger.active) { statusIcon->danger.active = TRUE; hudElement = hud_element_create(&HES_Danger); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_DISABLED); + hud_element_set_flags(hudElement, HUD_ELEMENT_FLAG_80); statusIcon->danger.activeElementID = hudElement; } } diff --git a/src/trigger.c b/src/trigger.c index da6ae8e16a..90c0b05405 100644 --- a/src/trigger.c +++ b/src/trigger.c @@ -149,7 +149,7 @@ void update_triggers(void) { if (listTrigger->flags.flags & TRIGGER_FLOOR_PRESS_A) { if ((listTrigger->location.colliderID != collisionStatus->currentFloor) || - !(gGameStatusPtr->pressedButtons[0] & BUTTON_A) || (gPlayerStatus.flags & PS_FLAGS_INPUT_DISABLED)) { + !(gGameStatusPtr->pressedButtons[0] & BUTTON_A) || (gPlayerStatus.flags & PS_FLAG_INPUT_DISABLED)) { continue; } } @@ -166,19 +166,19 @@ void update_triggers(void) { } } - if (listTrigger->flags.flags & TRIGGER_FLAGS_2000) { + if (listTrigger->flags.flags & TRIGGER_FLAG_2000) { if (listTrigger->location.colliderID != collisionStatus->unk_0C) { continue; } } - if (listTrigger->flags.flags & TRIGGER_FLAGS_4000) { + if (listTrigger->flags.flags & TRIGGER_FLAG_4000) { if (listTrigger->location.colliderID != collisionStatus->unk_0E) { continue; } } - if (listTrigger->flags.flags & TRIGGER_FLAGS_8000) { + if (listTrigger->flags.flags & TRIGGER_FLAG_8000) { if (listTrigger->location.colliderID != collisionStatus->unk_10) { continue; } diff --git a/src/windows.c b/src/windows.c index d5101ca746..90c20ff042 100644 --- a/src/windows.c +++ b/src/windows.c @@ -43,70 +43,70 @@ SimpleWindowUpdateData gSimpleWindowUpdates[] = { { .flags = 0, .windowFlagsSet = 0, - .windowFlagsUnset = WINDOW_FLAGS_INITIAL_ANIMATION, + .windowFlagsUnset = WINDOW_FLAG_INITIAL_ANIMATION, .darkening = 0, .opacity = 0 }, { .flags = 0, .windowFlagsSet = 0, - .windowFlagsUnset = WINDOW_FLAGS_HIDDEN | WINDOW_FLAGS_INITIAL_ANIMATION, + .windowFlagsUnset = WINDOW_FLAG_HIDDEN | WINDOW_FLAG_INITIAL_ANIMATION, .darkening = 0, .opacity = 0 }, { .flags = 0, - .windowFlagsSet = WINDOW_FLAGS_HIDDEN, - .windowFlagsUnset = WINDOW_FLAGS_INITIAL_ANIMATION, + .windowFlagsSet = WINDOW_FLAG_HIDDEN, + .windowFlagsUnset = WINDOW_FLAG_INITIAL_ANIMATION, .darkening = 0, .opacity = 0 }, { .flags = SIMPLE_WINDOW_UPDATE_1, .windowFlagsSet = 0, - .windowFlagsUnset = WINDOW_FLAGS_INITIAL_ANIMATION, + .windowFlagsUnset = WINDOW_FLAG_INITIAL_ANIMATION, .darkening = 0, .opacity = 0 }, { .flags = SIMPLE_WINDOW_UPDATE_DARKENING, .windowFlagsSet = 0, - .windowFlagsUnset = WINDOW_FLAGS_INITIAL_ANIMATION, + .windowFlagsUnset = WINDOW_FLAG_INITIAL_ANIMATION, .darkening = 100, .opacity = 0 }, { .flags = SIMPLE_WINDOW_UPDATE_DARKENING, .windowFlagsSet = 0, - .windowFlagsUnset = WINDOW_FLAGS_INITIAL_ANIMATION, + .windowFlagsUnset = WINDOW_FLAG_INITIAL_ANIMATION, .darkening = 0, .opacity = 0 }, { .flags = SIMPLE_WINDOW_UPDATE_OPACITY, .windowFlagsSet = 0, - .windowFlagsUnset = WINDOW_FLAGS_INITIAL_ANIMATION, + .windowFlagsUnset = WINDOW_FLAG_INITIAL_ANIMATION, .darkening = 0, .opacity = 184 }, { .flags = SIMPLE_WINDOW_UPDATE_OPACITY, .windowFlagsSet = 0, - .windowFlagsUnset = WINDOW_FLAGS_INITIAL_ANIMATION, + .windowFlagsUnset = WINDOW_FLAG_INITIAL_ANIMATION, .darkening = 0, .opacity = 255 }, { .flags = SIMPLE_WINDOW_UPDATE_OPACITY, .windowFlagsSet = 0, - .windowFlagsUnset = WINDOW_FLAGS_HIDDEN | WINDOW_FLAGS_INITIAL_ANIMATION, + .windowFlagsUnset = WINDOW_FLAG_HIDDEN | WINDOW_FLAG_INITIAL_ANIMATION, .darkening = 0, .opacity = 184 }, { .flags = SIMPLE_WINDOW_UPDATE_DARKENING, .windowFlagsSet = 0, - .windowFlagsUnset = WINDOW_FLAGS_HIDDEN | WINDOW_FLAGS_INITIAL_ANIMATION, + .windowFlagsUnset = WINDOW_FLAG_HIDDEN | WINDOW_FLAG_INITIAL_ANIMATION, .darkening = 100, .opacity = 0 }, @@ -117,11 +117,11 @@ SimpleWindowUpdateData gSimpleWindowUpdates[] = { }; u8 gWindowAppearScales[] = { 50, 80, 100, 105, 100 }; -u8 gWindowAppearFlags[] = { DRAW_FLAGS_ROTSCALE, DRAW_FLAGS_ROTSCALE, DRAW_FLAGS_ROTSCALE, DRAW_FLAGS_ROTSCALE, 0}; +u8 gWindowAppearFlags[] = { DRAW_FLAG_ROTSCALE, DRAW_FLAG_ROTSCALE, DRAW_FLAG_ROTSCALE, DRAW_FLAG_ROTSCALE, 0}; u8 gWindowDisappearScales[] = { 105, 100, 77, 57, 40, 27, 16, 8, 3, 0 }; -u8 gWindowDisappearFlags[] = { DRAW_FLAGS_ROTSCALE, DRAW_FLAGS_ROTSCALE, DRAW_FLAGS_ROTSCALE, DRAW_FLAGS_ROTSCALE, - DRAW_FLAGS_ROTSCALE, DRAW_FLAGS_ROTSCALE, DRAW_FLAGS_ROTSCALE, - DRAW_FLAGS_ROTSCALE, DRAW_FLAGS_ROTSCALE, 0 }; +u8 gWindowDisappearFlags[] = { DRAW_FLAG_ROTSCALE, DRAW_FLAG_ROTSCALE, DRAW_FLAG_ROTSCALE, DRAW_FLAG_ROTSCALE, + DRAW_FLAG_ROTSCALE, DRAW_FLAG_ROTSCALE, DRAW_FLAG_ROTSCALE, + DRAW_FLAG_ROTSCALE, DRAW_FLAG_ROTSCALE, 0 }; WindowGroup gWindowGroups[] = { { WINDOW_ID_0, WINDOW_ID_FILEMENU_FILE3_TITLE }, // all windows @@ -147,12 +147,12 @@ void update_windows(void) { for (i = 0, window = gWindows; i < ARRAY_COUNT(gWindows); i++, window++) { flags = window->flags; - if (!flags || (flags & WINDOW_FLAGS_DISABLED)) { + if (!flags || (flags & WINDOW_FLAG_DISABLED)) { continue; } - if (flags & WINDOW_FLAGS_FPUPDATE_CHANGED) { - window->flags = flags & ~WINDOW_FLAGS_FPUPDATE_CHANGED; + if (flags & WINDOW_FLAG_FPUPDATE_CHANGED) { + window->flags = flags & ~WINDOW_FLAG_FPUPDATE_CHANGED; window->fpUpdate = window->fpPending; window->updateCounter = 0; } @@ -165,7 +165,7 @@ void basic_window_update(s32 windowID, s32* flags, s32* posX, s32* posY, s32* po s32 counter = window->updateCounter; if (counter == 0) { - window->flags &= ~WINDOW_FLAGS_HIDDEN; + window->flags &= ~WINDOW_FLAG_HIDDEN; } if (counter < 5) { @@ -178,7 +178,7 @@ void basic_window_update(s32 windowID, s32* flags, s32* posX, s32* posY, s32* po *scaleX = 1.0f; *scaleY = 1.0f; *rotZ = 0.0f; - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; } } @@ -197,8 +197,8 @@ void basic_hidden_window_update(s32 windowID, s32* flags, s32* posX, s32* posY, *scaleX = 0.0f; *scaleY = 0.0f; *rotZ = 0.0f; - window->flags &= ~WINDOW_FLAGS_INITIAL_ANIMATION; - window->flags |= WINDOW_FLAGS_HIDDEN; + window->flags &= ~WINDOW_FLAG_INITIAL_ANIMATION; + window->flags |= WINDOW_FLAG_HIDDEN; } } @@ -211,7 +211,7 @@ void main_menu_window_update(s32 windowID, s32* flags, s32* posX, s32* posY, s32 *darkening = (counter + 1) * 16; } else { *darkening = 160; - window->flags &= ~(WINDOW_FLAGS_INITIAL_ANIMATION | WINDOW_FLAGS_HIDDEN); + window->flags &= ~(WINDOW_FLAG_INITIAL_ANIMATION | WINDOW_FLAG_HIDDEN); } } @@ -249,7 +249,7 @@ void render_windows(s32* windowsArray, s32 parent, s32 flags, s32 baseX, s32 bas } childWindow = &gWindows[childWindowID]; - if (childWindow->flags == 0 || (childWindow->flags & WINDOW_FLAGS_DISABLED)) { + if (childWindow->flags == 0 || (childWindow->flags & WINDOW_FLAG_DISABLED)) { continue; } @@ -297,7 +297,7 @@ void render_windows(s32* windowsArray, s32 parent, s32 flags, s32 baseX, s32 bas } } - if (scaleX == 0 || scaleY == 0 || (childWindow->flags & WINDOW_FLAGS_HIDDEN)) { + if (scaleX == 0 || scaleY == 0 || (childWindow->flags & WINDOW_FLAG_HIDDEN)) { continue; } @@ -314,7 +314,7 @@ void render_windows(s32* windowsArray, s32 parent, s32 flags, s32 baseX, s32 bas childDarkening = 255; } childFlags |= flags; - if (!(flags & DRAW_FLAGS_ROTSCALE)) { + if (!(flags & DRAW_FLAG_ROTSCALE)) { posX += baseX; posY += baseY; } @@ -331,8 +331,8 @@ void render_windows(s32* windowsArray, s32 parent, s32 flags, s32 baseX, s32 bas } boxFlags = childFlags; - if (childWindow->flags & WINDOW_FLAGS_40) { - boxFlags |= DRAW_FLAGS_ANIMATED_BACKGROUND; + if (childWindow->flags & WINDOW_FLAG_40) { + boxFlags |= DRAW_FLAG_ANIMATED_BACKGROUND; } if (draw_box(boxFlags, windowStyle, posX, posY, posZ, width, height, childOpacity, childDarkening, @@ -342,7 +342,7 @@ void render_windows(s32* windowsArray, s32 parent, s32 flags, s32 baseX, s32 bas outMtx = NULL; } - if (childWindow->flags & WINDOW_FLAGS_HAS_CHILDREN) { + if (childWindow->flags & WINDOW_FLAG_HAS_CHILDREN) { render_windows(windowsArray, childWindowIdCopy, childFlags, posX, posY, childOpacity, childDarkening, outMtx); } } @@ -380,7 +380,7 @@ void set_window_properties(s32 windowID, s32 posX, s32 posY, s32 width, s32 heig Window* window = &gWindows[windowID]; u8 priorityCopy = priority; - window->flags = WINDOW_FLAGS_INITIALIZED | WINDOW_FLAGS_HIDDEN; + window->flags = WINDOW_FLAG_INITIALIZED | WINDOW_FLAG_HIDDEN; window->pos.x = posX; window->pos.y = posY; window->width = width; @@ -390,7 +390,7 @@ void set_window_properties(s32 windowID, s32 posX, s32 posY, s32 width, s32 heig window->fpDrawContents = fpDrawContents; window->drawContentsArg0 = drawContentsArg0; if (parent >= 0) { - gWindows[parent].flags |= WINDOW_FLAGS_HAS_CHILDREN; + gWindows[parent].flags |= WINDOW_FLAG_HAS_CHILDREN; } update_window_hierarchy(windowID, priorityCopy); window->originalPriority = priority; @@ -432,19 +432,19 @@ void update_window_hierarchy(s32 windowID, u8 priority) { } void replace_window_update(s32 windowID, s8 priority, WindowUpdateFunc pendingFunc) { - if (gWindows[windowID].flags & WINDOW_FLAGS_INITIALIZED) { - gWindows[windowID].flags |= WINDOW_FLAGS_FPUPDATE_CHANGED | WINDOW_FLAGS_INITIAL_ANIMATION; + if (gWindows[windowID].flags & WINDOW_FLAG_INITIALIZED) { + gWindows[windowID].flags |= WINDOW_FLAG_FPUPDATE_CHANGED | WINDOW_FLAG_INITIAL_ANIMATION; gWindows[windowID].fpPending = pendingFunc; gWindows[windowID].originalPriority = priority; } } void set_window_update(s32 windowID, s32 func) { - if (gWindows[windowID].flags & WINDOW_FLAGS_INITIALIZED) { + if (gWindows[windowID].flags & WINDOW_FLAG_INITIALIZED) { if (func == gWindows[windowID].fpUpdate.i) { - gWindows[windowID].flags &= ~WINDOW_FLAGS_FPUPDATE_CHANGED; + gWindows[windowID].flags &= ~WINDOW_FLAG_FPUPDATE_CHANGED; } else { - gWindows[windowID].flags |= WINDOW_FLAGS_FPUPDATE_CHANGED | WINDOW_FLAGS_INITIAL_ANIMATION; + gWindows[windowID].flags |= WINDOW_FLAG_FPUPDATE_CHANGED | WINDOW_FLAG_INITIAL_ANIMATION; gWindows[windowID].fpPending.i = func; } } @@ -457,11 +457,11 @@ void set_windows_visible(s32 groupIdx) { u8 max = gWindowGroups[groupIdx].max; for (i = 0; i < ARRAY_COUNT(gWindows); i++, window++) { - if (window->flags & WINDOW_FLAGS_INITIALIZED) { + if (window->flags & WINDOW_FLAG_INITIALIZED) { if (i < min || i > max) { - window->flags |= WINDOW_FLAGS_DISABLED; + window->flags |= WINDOW_FLAG_DISABLED; } else { - window->flags &= ~WINDOW_FLAGS_DISABLED; + window->flags &= ~WINDOW_FLAG_DISABLED; } } } diff --git a/src/world/action/hammer.c b/src/world/action/hammer.c index a9c8fafe83..183aeadfa4 100644 --- a/src/world/action/hammer.c +++ b/src/world/action/hammer.c @@ -190,7 +190,7 @@ s32 func_802B62A4_E25174(void) { if (hammerLevel >= 0) { ret = -1; } else { - playerStatus->animFlags |= PA_FLAGS_SHIVERING; + playerStatus->animFlags |= PA_FLAG_SHIVERING; } break; case ENTITY_TYPE_HAMMER2_BLOCK: @@ -198,7 +198,7 @@ s32 func_802B62A4_E25174(void) { if (hammerLevel >= 1) { ret = -1; } else { - playerStatus->animFlags |= PA_FLAGS_SHIVERING; + playerStatus->animFlags |= PA_FLAG_SHIVERING; } break; case ENTITY_TYPE_HAMMER3_BLOCK: @@ -206,12 +206,12 @@ s32 func_802B62A4_E25174(void) { if (hammerLevel >= 2) { ret = -1; } else { - playerStatus->animFlags |= PA_FLAGS_SHIVERING; + playerStatus->animFlags |= PA_FLAG_SHIVERING; } break; case ENTITY_TYPE_WOODEN_CRATE: case ENTITY_TYPE_BOMBABLE_ROCK: - playerStatus->animFlags |= PA_FLAGS_SHIVERING; + playerStatus->animFlags |= PA_FLAG_SHIVERING; break; case ENTITY_TYPE_BLUE_SWITCH: case ENTITY_TYPE_RED_SWITCH: @@ -229,12 +229,12 @@ void action_update_hammer(void) { HammerHit->unk_1C = 0; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { AnimID anim; s32 soundID; - playerStatus->flags &= ~PS_FLAGS_ACTION_STATE_CHANGED; - playerStatus->flags |= PS_FLAGS_NO_FLIPPING; + playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; + playerStatus->flags |= PS_FLAG_NO_FLIPPING; HammerHit->timer = 0; playerStatus->actionSubstate = SUBSTATE_HAMMER_0; playerStatus->currentSpeed = 0.0f; @@ -270,10 +270,10 @@ void action_update_hammer(void) { HammerHit->unk_14 = 0; } - playerStatus->flags &= ~PS_FLAGS_HAMMER_CHECK; - if (HammerHit->timer < 3 && (playerStatus->flags & PS_FLAGS_ENTERING_BATTLE)) { + playerStatus->flags &= ~PS_FLAG_HAMMER_CHECK; + if (HammerHit->timer < 3 && (playerStatus->flags & PS_FLAG_ENTERING_BATTLE)) { // This is probably to stop Mario from triggering multiple battles at once by hammering while one is starting. - playerStatus->flags |= PS_FLAGS_TIME_STOPPED; + playerStatus->flags |= PS_FLAG_TIME_STOPPED; } else if (HammerHit->timer < 2) { HammerHit->timer++; } else { @@ -384,9 +384,9 @@ void func_802B6820_E256F0(void) { if (collisionStatus->lastWallHammered >= 0 && (collisionStatus->lastWallHammered & COLLISION_WITH_ENTITY_BIT)) { get_entity_by_index(collisionStatus->lastWallHammered)->collisionTimer = 0; - playerStatus->flags |= PS_FLAGS_HAMMER_CHECK; + playerStatus->flags |= PS_FLAG_HAMMER_CHECK; } else if (HammerHit->hitID < 0) { - playerStatus->flags |= PS_FLAGS_HAMMER_CHECK; + playerStatus->flags |= PS_FLAG_HAMMER_CHECK; } if (HammerHit->hitID < 0 && gPlayerData.hammerLevel >= 2) { @@ -406,7 +406,7 @@ void func_802B6820_E256F0(void) { HammerHit->unk_14 = 1; } if (HammerHit->timer == 6) { - playerStatus->flags &= ~PS_FLAGS_NO_FLIPPING; + playerStatus->flags &= ~PS_FLAG_NO_FLIPPING; } if (playerStatus->animNotifyValue == 1) { @@ -417,9 +417,9 @@ void func_802B6820_E256F0(void) { HammerHit->unk_14 = 0; ten = 10; // required to match if (HammerHit->unk_1C != 0 || HammerHit->timer > ten) { - playerStatus->flags &= ~PS_FLAGS_HAMMER_CHECK; + playerStatus->flags &= ~PS_FLAG_HAMMER_CHECK; set_action_state(ACTION_STATE_IDLE); } - playerStatus->flags &= ~PS_FLAGS_NO_FLIPPING; + playerStatus->flags &= ~PS_FLAG_NO_FLIPPING; } } diff --git a/src/world/action/hit_fire.c b/src/world/action/hit_fire.c index 5996798029..89c23adbee 100644 --- a/src/world/action/hit_fire.c +++ b/src/world/action/hit_fire.c @@ -12,11 +12,11 @@ void action_update_hit_fire(void) { static f32 ReturnAngle; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~PS_FLAGS_ACTION_STATE_CHANGED; + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; - playerStatus->animFlags |= PA_FLAGS_INTERRUPT_USE_PARTNER; - playerStatus->flags |= (PS_FLAGS_HIT_FIRE | PS_FLAGS_FLYING); + playerStatus->animFlags |= PA_FLAG_INTERRUPT_USE_PARTNER; + playerStatus->flags |= (PS_FLAG_HIT_FIRE | PS_FLAG_FLYING); suggest_player_anim_setUnkFlag(ANIM_Mario_Scared); @@ -36,7 +36,7 @@ void action_update_hit_fire(void) { sin_cos_rad(DEG_TO_RAD(ReturnAngle), &dx, &dy); speed = playerStatus->currentSpeed; - if (playerStatus->flags & PS_FLAGS_ENTERING_BATTLE) { + if (playerStatus->flags & PS_FLAG_ENTERING_BATTLE) { speed *= 0.5; } @@ -48,7 +48,7 @@ void action_update_hit_fire(void) { playerStatus->position.y += playerStatus->gravityIntegrator[0]; if (playerStatus->gravityIntegrator[0] < 0.0f) { playerStatus->actionSubstate = SUBSTATE_FALLING; - playerStatus->flags |= PS_FLAGS_FALLING; + playerStatus->flags |= PS_FLAG_FALLING; } } else { s32 colliderID; @@ -59,7 +59,7 @@ void action_update_hit_fire(void) { set_action_state(ACTION_STATE_LAND); playerStatus->blinkTimer = 60; playerStatus->hazardType = HAZARD_TYPE_NONE; - playerStatus->flags &= ~PS_FLAGS_HIT_FIRE; + playerStatus->flags &= ~PS_FLAG_HIT_FIRE; gOverrideFlags &= ~GLOBAL_OVERRIDES_40; } } diff --git a/src/world/action/hit_lava.c b/src/world/action/hit_lava.c index 11cfec79d9..1da94c073d 100644 --- a/src/world/action/hit_lava.c +++ b/src/world/action/hit_lava.c @@ -28,11 +28,11 @@ void action_update_hit_lava(void) { static f32 ReturnAngle; static f32 InitialPosY; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~PS_FLAGS_ACTION_STATE_CHANGED; - playerStatus->flags |= (PS_FLAGS_SCRIPTED_FALL | PS_FLAGS_FLYING); - playerStatus->animFlags |= PA_FLAGS_INTERRUPT_USE_PARTNER; - playerStatus->flags |= PS_FLAGS_HIT_FIRE; + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; + playerStatus->flags |= (PS_FLAG_SCRIPTED_FALL | PS_FLAG_FLYING); + playerStatus->animFlags |= PA_FLAG_INTERRUPT_USE_PARTNER; + playerStatus->flags |= PS_FLAG_HIT_FIRE; if (playerStatus->hazardType == HAZARD_TYPE_LAVA) { playerStatus->actionSubstate = SUBSTATE_DELAY_INIT_SINK; playerStatus->currentStateTime = 2; @@ -43,7 +43,7 @@ void action_update_hit_lava(void) { playerStatus->currentSpeed = 0.0f; LaunchVelocity = 0.0f; - gCameras[CAM_DEFAULT].moveFlags |= (CAMERA_MOVE_IGNORE_PLAYER_Y | CAMERA_MOVE_FLAGS_2); + gCameras[CAM_DEFAULT].moveFlags |= (CAMERA_MOVE_IGNORE_PLAYER_Y | CAMERA_MOVE_FLAG_2); LaunchInterpPhase = 90.0f; subtract_hp(1); open_status_menu_long(); @@ -79,7 +79,7 @@ void action_update_hit_lava(void) { playerStatus->jumpFromPos.x = playerStatus->position.x; playerStatus->jumpFromPos.z = playerStatus->position.z; playerStatus->jumpFromHeight = playerStatus->position.y; - playerStatus->flags |= PS_FLAGS_JUMPING; + playerStatus->flags |= PS_FLAG_JUMPING; break; case SUBSTATE_DELAY_LAUNCH: if (--playerStatus->currentStateTime <= 0) { @@ -172,11 +172,11 @@ void action_update_hit_lava(void) { exec_ShakeCamX(0, 2, 1, 0.8f); start_rumble(256, 50); phys_adjust_cam_on_landing(); - gCameras[CAM_DEFAULT].moveFlags &= ~CAMERA_MOVE_FLAGS_2; + gCameras[CAM_DEFAULT].moveFlags &= ~CAMERA_MOVE_FLAG_2; sfx_play_sound_at_player(SOUND_3FB, 0); suggest_player_anim_setUnkFlag(ANIM_Mario_8001A); - playerStatus->flags &= ~PS_FLAGS_HIT_FIRE; - playerStatus->flags &= ~PS_FLAGS_FLYING; + playerStatus->flags &= ~PS_FLAG_HIT_FIRE; + playerStatus->flags &= ~PS_FLAG_FLYING; playerStatus->hazardType = HAZARD_TYPE_NONE; playerStatus->gravityIntegrator[0] = 6.0f; playerStatus->position.y += 6.0f; @@ -194,7 +194,7 @@ void action_update_hit_lava(void) { case SUBSTATE_DELAY_DONE: if (--playerStatus->currentStateTime <= 0) { set_action_state(ACTION_STATE_LAND); - playerStatus->flags &= ~PS_FLAGS_SCRIPTED_FALL; + playerStatus->flags &= ~PS_FLAG_SCRIPTED_FALL; gOverrideFlags &= ~GLOBAL_OVERRIDES_40; } break; diff --git a/src/world/action/idle.c b/src/world/action/idle.c index 1cf300adb7..db1fba304c 100644 --- a/src/world/action/idle.c +++ b/src/world/action/idle.c @@ -40,17 +40,17 @@ void action_update_idle(void) { f32 angle, magnitude; AnimID anim; - if (playerStatus->animFlags & PA_FLAGS_USING_PEACH_PHYSICS) { + if (playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS) { action_update_idle_peach(); return; } playerStatus->currentStateTime++; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~(PS_FLAGS_ACTION_STATE_CHANGED - | PS_FLAGS_ARMS_RAISED | PS_FLAGS_AIRBORNE); + playerStatus->flags &= ~(PS_FLAG_ACTION_STATE_CHANGED + | PS_FLAG_ARMS_RAISED | PS_FLAG_AIRBORNE); wasMoving = TRUE; playerStatus->actionSubstate = SUBSTATE_IDLE_DEFAULT; playerStatus->currentStateTime = 0; @@ -59,9 +59,9 @@ void action_update_idle(void) { playerStatus->currentSpeed = 0.0f; playerStatus->pitch = 0.0f; - if (playerStatus->animFlags & PA_FLAGS_8BIT_MARIO) { + if (playerStatus->animFlags & PA_FLAG_8BIT_MARIO) { anim = ANIM_Mario_90002; - } else if (!(playerStatus->animFlags & PA_FLAGS_USING_WATT)) { + } else if (!(playerStatus->animFlags & PA_FLAG_USING_WATT)) { anim = ANIM_Mario_10002; } else if (playerStatus->prevActionState == ACTION_STATE_IDLE) { anim = ANIM_Mario_60005; @@ -71,7 +71,7 @@ void action_update_idle(void) { suggest_player_anim_clearUnkFlag(anim); } - if (playerStatus->animFlags & PA_FLAGS_RAISED_ARMS) { + if (playerStatus->animFlags & PA_FLAG_RAISED_ARMS) { set_action_state(ACTION_STATE_RAISE_ARMS); } else { player_input_to_move_vector(&angle, &magnitude); @@ -89,7 +89,7 @@ void action_update_idle(void) { set_action_state(ACTION_STATE_WALK); if (magnitude != 0.0f) { playerStatus->targetYaw = angle; - playerStatus->animFlags &= ~PA_FLAGS_80000000; + playerStatus->animFlags &= ~PA_FLAG_80000000; } } } @@ -101,16 +101,16 @@ void action_update_idle_peach(void) { PlayerData* playerData = &gPlayerData; f32 angle, magnitude; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~PS_FLAGS_ACTION_STATE_CHANGED; + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; playerStatus->actionSubstate = SUBSTATE_IDLE_DEFAULT; playerStatus->currentStateTime = 0; playerStatus->timeInAir = 0; playerStatus->peakJumpTime = 0; playerStatus->currentSpeed = 0.0f; - playerStatus->flags &= ~PS_FLAGS_AIRBORNE; + playerStatus->flags &= ~PS_FLAG_AIRBORNE; - if (!(playerStatus->animFlags & PA_FLAGS_INVISIBLE)) { + if (!(playerStatus->animFlags & PA_FLAG_INVISIBLE)) { if (!(gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_HAS_INGREDIENT)) { suggest_player_anim_clearUnkFlag(IdlePeachAnims[gGameStatusPtr->peachCookingIngredient]); } else { @@ -121,10 +121,10 @@ void action_update_idle_peach(void) { } } - if (!(playerStatus->animFlags & PA_FLAGS_INVISIBLE)) { + if (!(playerStatus->animFlags & PA_FLAG_INVISIBLE)) { switch (playerStatus->actionSubstate) { case SUBSTATE_IDLE_DEFAULT: - if (!(playerStatus->flags & (PS_FLAGS_NO_STATIC_COLLISION | PS_FLAGS_INPUT_DISABLED)) + if (!(playerStatus->flags & (PS_FLAG_NO_STATIC_COLLISION | PS_FLAG_INPUT_DISABLED)) && (playerStatus->peachItemHeld == 0)) { if (playerStatus->currentStateTime > 1800) { // begin first yawm @@ -153,7 +153,7 @@ void action_update_idle_peach(void) { break; case SUBSTATE_IDLE_SLEEP: // peach is asleep - if (playerStatus->flags & (PS_FLAGS_NO_STATIC_COLLISION | PS_FLAGS_INPUT_DISABLED)) { + if (playerStatus->flags & (PS_FLAG_NO_STATIC_COLLISION | PS_FLAG_INPUT_DISABLED)) { suggest_player_anim_clearUnkFlag(ANIM_Peach_A0001); playerStatus->actionSubstate = SUBSTATE_IDLE_DEFAULT; } else if (playerStatus->animNotifyValue != 0) { diff --git a/src/world/action/jump.c b/src/world/action/jump.c index 42554a2aff..6f533afc99 100644 --- a/src/world/action/jump.c +++ b/src/world/action/jump.c @@ -16,17 +16,17 @@ void initialize_jump(void) { playerStatus->actionSubstate = JUMP_SUBSTATE_0; playerStatus->timeInAir = 0; playerStatus->peakJumpTime = 0; - playerStatus->flags &= ~(PS_FLAGS_ACTION_STATE_CHANGED | PS_FLAGS_FLYING); - playerStatus->flags |= PS_FLAGS_JUMPING; + playerStatus->flags &= ~(PS_FLAG_ACTION_STATE_CHANGED | PS_FLAG_FLYING); + playerStatus->flags |= PS_FLAG_JUMPING; playerStatus->jumpFromPos.x = playerStatus->position.x; playerStatus->jumpFromPos.z = playerStatus->position.z; playerStatus->jumpFromHeight = playerStatus->position.y; phys_init_integrator_for_current_state(); - if (playerStatus->animFlags & PA_FLAGS_8BIT_MARIO) { + if (playerStatus->animFlags & PA_FLAG_8BIT_MARIO) { anim = ANIM_Mario_90005; - } else if (!(playerStatus->animFlags & (PA_FLAGS_USING_WATT | PA_FLAGS_WATT_IN_HANDS))) { + } else if (!(playerStatus->animFlags & (PA_FLAG_USING_WATT | PA_FLAG_WATT_IN_HANDS))) { anim = ANIM_Mario_AnimMidairStill; } else { anim = ANIM_Mario_60009; @@ -41,8 +41,8 @@ void action_update_jump(void) { PlayerStatus* playerStatus = &gPlayerStatus; AnimID anim; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~PS_FLAGS_ACTION_STATE_CHANGED; + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; initialize_jump(); if (playerStatus->actionState == ACTION_STATE_LAUNCH) { @@ -52,7 +52,7 @@ void action_update_jump(void) { } if (playerStatus->actionState == ACTION_STATE_JUMP) { - if (playerStatus->animFlags & PA_FLAGS_8BIT_MARIO) { + if (playerStatus->animFlags & PA_FLAG_8BIT_MARIO) { sfx_play_sound_at_player(SOUND_JUMP_8BIT_MARIO, 0); } else { @@ -61,9 +61,9 @@ void action_update_jump(void) { } } - if (playerStatus->animFlags & PA_FLAGS_8BIT_MARIO) { + if (playerStatus->animFlags & PA_FLAG_8BIT_MARIO) { anim = ANIM_Mario_90005; - } else if (!(playerStatus->animFlags & (PA_FLAGS_USING_WATT | PA_FLAGS_WATT_IN_HANDS))) { + } else if (!(playerStatus->animFlags & (PA_FLAG_USING_WATT | PA_FLAG_WATT_IN_HANDS))) { anim = ANIM_Mario_AnimMidairStill; } else { anim = ANIM_Mario_60009; @@ -78,13 +78,13 @@ void action_update_landing_on_switch(void) { CollisionStatus* collisionStatus = &gCollisionStatus; AnimID anim; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { Entity* entity = get_entity_by_index(collisionStatus->currentFloor); JumpedOnSwitchX = entity->position.x; JumpedOnSwitchZ = entity->position.z; initialize_jump(); - playerStatus->flags |= (PS_FLAGS_SCRIPTED_FALL | PS_FLAGS_ARMS_RAISED); + playerStatus->flags |= (PS_FLAG_SCRIPTED_FALL | PS_FLAG_ARMS_RAISED); disable_player_input(); } @@ -94,11 +94,11 @@ void action_update_landing_on_switch(void) { return; } - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~(PS_FLAGS_ACTION_STATE_CHANGED | PS_FLAGS_JUMPING | PS_FLAGS_FLYING); - playerStatus->flags |= PS_FLAGS_FALLING; + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~(PS_FLAG_ACTION_STATE_CHANGED | PS_FLAG_JUMPING | PS_FLAG_FLYING); + playerStatus->flags |= PS_FLAG_FALLING; - if (!(playerStatus->animFlags & (PA_FLAGS_USING_WATT | PA_FLAGS_WATT_IN_HANDS))) { + if (!(playerStatus->animFlags & (PA_FLAG_USING_WATT | PA_FLAG_WATT_IN_HANDS))) { anim = ANIM_Mario_AnimMidair; } else { anim = ANIM_Mario_6000A; @@ -114,20 +114,20 @@ void action_update_landing_on_switch(void) { void action_update_falling(void) { PlayerStatus* playerStatus = &gPlayerStatus; - if (playerStatus->animFlags & PA_FLAGS_USING_PEACH_PHYSICS) { + if (playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS) { action_update_peach_falling(); return; } - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { s32 anim; - playerStatus->flags &= ~(PS_FLAGS_ACTION_STATE_CHANGED | PS_FLAGS_JUMPING | PS_FLAGS_FLYING); - playerStatus->flags |= PS_FLAGS_FALLING; + playerStatus->flags &= ~(PS_FLAG_ACTION_STATE_CHANGED | PS_FLAG_JUMPING | PS_FLAG_FLYING); + playerStatus->flags |= PS_FLAG_FALLING; - if (playerStatus->animFlags & PA_FLAGS_8BIT_MARIO) { + if (playerStatus->animFlags & PA_FLAG_8BIT_MARIO) { anim = ANIM_Mario_90005; - } else if (!(playerStatus->animFlags & (PA_FLAGS_USING_WATT | PA_FLAGS_WATT_IN_HANDS))) { + } else if (!(playerStatus->animFlags & (PA_FLAG_USING_WATT | PA_FLAG_WATT_IN_HANDS))) { anim = ANIM_Mario_AnimMidair; } else { anim = ANIM_Mario_6000A; @@ -147,14 +147,14 @@ void action_update_step_down(void) { f32 hitDirX, hitDirZ; f32 height; - if (playerStatus->animFlags & PA_FLAGS_USING_PEACH_PHYSICS) { + if (playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS) { action_update_peach_step_down(); return; } - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~(PS_FLAGS_ACTION_STATE_CHANGED | PS_FLAGS_JUMPING | PS_FLAGS_FLYING); - playerStatus->flags |= PS_FLAGS_FALLING; + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~(PS_FLAG_ACTION_STATE_CHANGED | PS_FLAG_JUMPING | PS_FLAG_FLYING); + playerStatus->flags |= PS_FLAG_FALLING; gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_IGNORE_PLAYER_Y; } @@ -169,7 +169,7 @@ void action_update_step_down(void) { surfaceType = get_collider_flags(colliderID) & COLLIDER_FLAGS_SURFACE_TYPE_MASK; if (!(surfaceType == SURFACE_TYPE_SPIKES || surfaceType == SURFACE_TYPE_LAVA) && check_input_jump()) { set_action_state(ACTION_STATE_JUMP); - playerStatus->flags &= ~PS_FLAGS_AIRBORNE; + playerStatus->flags &= ~PS_FLAG_AIRBORNE; action_update_jump(); } } @@ -178,12 +178,12 @@ void action_update_peach_falling(void) { PlayerStatus* playerStatus = &gPlayerStatus; AnimID anim; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~PS_FLAGS_ACTION_STATE_CHANGED; - playerStatus->flags &= ~(PS_FLAGS_JUMPING | PS_FLAGS_FLYING); - playerStatus->flags |= PS_FLAGS_FALLING; + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; + playerStatus->flags &= ~(PS_FLAG_JUMPING | PS_FLAG_FLYING); + playerStatus->flags |= PS_FLAG_FALLING; - if (!(playerStatus->animFlags & PA_FLAGS_USING_PEACH_PHYSICS)) { + if (!(playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS)) { anim = ANIM_Mario_AnimMidair; } else { anim = ANIM_Peach_A0006; @@ -198,13 +198,13 @@ void action_update_peach_falling(void) { void action_update_peach_step_down(void) { PlayerStatus* playerStatus = &gPlayerStatus; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~PS_FLAGS_ACTION_STATE_CHANGED; - playerStatus->flags &= ~(PS_FLAGS_JUMPING | PS_FLAGS_FLYING); - playerStatus->flags |= PS_FLAGS_FALLING; + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; + playerStatus->flags &= ~(PS_FLAG_JUMPING | PS_FLAG_FLYING); + playerStatus->flags |= PS_FLAG_FALLING; gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_IGNORE_PLAYER_Y; - if (playerStatus->animFlags & PA_FLAGS_USING_PEACH_PHYSICS) { + if (playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS) { suggest_player_anim_clearUnkFlag(ANIM_Peach_A0006); } } diff --git a/src/world/action/knockback.c b/src/world/action/knockback.c index 217d1222df..84558c5389 100644 --- a/src/world/action/knockback.c +++ b/src/world/action/knockback.c @@ -12,12 +12,12 @@ void action_update_knockback(void) { static f32 ReturnAngle; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~PS_FLAGS_ACTION_STATE_CHANGED; + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; suggest_player_anim_setUnkFlag(ANIM_Mario_FallBack); - playerStatus->flags |= PS_FLAGS_FLYING; + playerStatus->flags |= PS_FLAG_FLYING; playerStatus->actionSubstate = SUBSTATE_FLYING; playerStatus->gravityIntegrator[0] = 18.3473f; @@ -36,7 +36,7 @@ void action_update_knockback(void) { speed = playerStatus->currentSpeed; - if (playerStatus->flags & PS_FLAGS_ENTERING_BATTLE) { + if (playerStatus->flags & PS_FLAG_ENTERING_BATTLE) { speed *= 0.5f; } @@ -50,7 +50,7 @@ void action_update_knockback(void) { if (playerStatus->gravityIntegrator[0] < 0.0f) { playerStatus->actionSubstate = SUBSTATE_FALLING; - playerStatus->flags |= PS_FLAGS_FALLING; + playerStatus->flags |= PS_FLAG_FALLING; } } else { s32 colliderID; diff --git a/src/world/action/land.c b/src/world/action/land.c index 1d9a4810c8..1938c20c15 100644 --- a/src/world/action/land.c +++ b/src/world/action/land.c @@ -17,17 +17,17 @@ void action_update_land(void) { s32 jumpInputCheck; AnimID anim; - if (playerStatus->animFlags & PA_FLAGS_USING_PEACH_PHYSICS) { + if (playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS) { action_update_peach_land(); return; } - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { playerStatus->flags &= ~( - PS_FLAGS_ACTION_STATE_CHANGED | - PS_FLAGS_SCRIPTED_FALL | - PS_FLAGS_ARMS_RAISED | - PS_FLAGS_AIRBORNE + PS_FLAG_ACTION_STATE_CHANGED | + PS_FLAG_SCRIPTED_FALL | + PS_FLAG_ARMS_RAISED | + PS_FLAG_AIRBORNE ); playerStatus->actionSubstate = SUBSTATE_INIT; playerStatus->timeInAir = 0; @@ -35,9 +35,9 @@ void action_update_land(void) { playerStatus->landPos.x = playerStatus->position.x; playerStatus->landPos.z = playerStatus->position.z; - if (playerStatus->animFlags & PA_FLAGS_8BIT_MARIO) { + if (playerStatus->animFlags & PA_FLAG_8BIT_MARIO) { anim = ANIM_Mario_90002; - } else if (!(playerStatus->animFlags & PA_FLAGS_USING_WATT)) { + } else if (!(playerStatus->animFlags & PA_FLAG_USING_WATT)) { anim = ANIM_Mario_10009; } else { anim = ANIM_Mario_6000B; @@ -52,8 +52,8 @@ void action_update_land(void) { } collisionStatus->lastTouchedFloor = -1; - playerStatus->animFlags &= ~PA_FLAGS_INTERRUPT_SPIN; - camera->moveFlags &= ~CAMERA_MOVE_FLAGS_4; + playerStatus->animFlags &= ~PA_FLAG_INTERRUPT_SPIN; + camera->moveFlags &= ~CAMERA_MOVE_FLAG_4; } playerStatus->actionSubstate++; // SUBSTATE_DONE playerStatus->currentSpeed *= 0.6f; @@ -79,17 +79,17 @@ void action_update_step_down_land(void) { f32 inputMoveMagnitude; f32 inputMoveAngle; - if (playerStatus->animFlags & PA_FLAGS_USING_PEACH_PHYSICS) { + if (playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS) { action_update_peach_step_down_land(); return; } - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { playerStatus->flags &= ~( - PS_FLAGS_ACTION_STATE_CHANGED | - PS_FLAGS_SCRIPTED_FALL | - PS_FLAGS_ARMS_RAISED | - PS_FLAGS_AIRBORNE + PS_FLAG_ACTION_STATE_CHANGED | + PS_FLAG_SCRIPTED_FALL | + PS_FLAG_ARMS_RAISED | + PS_FLAG_AIRBORNE ); playerStatus->actionSubstate = SUBSTATE_INIT; playerStatus->timeInAir = 0; @@ -123,12 +123,12 @@ void action_update_peach_land(void) { f32 inputMoveMagnitude; f32 inputMoveAngle; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~PS_FLAGS_ACTION_STATE_CHANGED; + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; playerStatus->actionSubstate = SUBSTATE_INIT; playerStatus->timeInAir = 0; playerStatus->peakJumpTime = 0; - playerStatus->flags &= ~PS_FLAGS_AIRBORNE; + playerStatus->flags &= ~PS_FLAG_AIRBORNE; playerStatus->landPos.x = playerStatus->position.x; playerStatus->landPos.z = playerStatus->position.z; @@ -167,12 +167,12 @@ void action_update_peach_step_down_land(void) { f32 inputMoveMagnitude; f32 inputMoveAngle; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~PS_FLAGS_ACTION_STATE_CHANGED; + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; playerStatus->actionSubstate = SUBSTATE_INIT; playerStatus->timeInAir = 0; playerStatus->peakJumpTime = 0; - playerStatus->flags &= ~PS_FLAGS_AIRBORNE; + playerStatus->flags &= ~PS_FLAG_AIRBORNE; playerStatus->landPos.x = playerStatus->position.x; playerStatus->landPos.z = playerStatus->position.z; diff --git a/src/world/action/misc.c b/src/world/action/misc.c index d8e39c5703..790aa7fd1d 100644 --- a/src/world/action/misc.c +++ b/src/world/action/misc.c @@ -9,9 +9,9 @@ s32 action_update_ride(void) { PlayerStatus* playerStatus = &gPlayerStatus; s32 oldFlags = playerStatus->flags; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { playerStatus->flags &= ~( - PS_FLAGS_ACTION_STATE_CHANGED | PS_FLAGS_ARMS_RAISED | PS_FLAGS_AIRBORNE + PS_FLAG_ACTION_STATE_CHANGED | PS_FLAG_ARMS_RAISED | PS_FLAG_AIRBORNE ); playerStatus->actionSubstate = 0; playerStatus->currentStateTime = 0; @@ -21,7 +21,7 @@ s32 action_update_ride(void) { playerStatus->pitch = 0.0f; } - if (playerStatus->animFlags & PA_FLAGS_RIDING_PARTNER) { + if (playerStatus->animFlags & PA_FLAG_RIDING_PARTNER) { if (partnerActionStatus->actingPartner == PARTNER_LAKILESTER) { return func_802BD100_317020(oldFlags); } @@ -53,9 +53,9 @@ void action_update_state_23(void) { f32 zDelta; f32 playerOffsetTempVar; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~(PS_FLAGS_ACTION_STATE_CHANGED - | PS_FLAGS_ARMS_RAISED | PS_FLAGS_AIRBORNE); + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~(PS_FLAG_ACTION_STATE_CHANGED + | PS_FLAG_ARMS_RAISED | PS_FLAG_AIRBORNE); playerStatus->actionSubstate = 0; playerStatus->currentStateTime = 0; playerStatus->timeInAir = 0; @@ -125,8 +125,8 @@ void action_update_state_23(void) { void action_update_launch(void) { PlayerStatus* playerStatus = &gPlayerStatus; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~(PS_FLAGS_ACTION_STATE_CHANGED | PS_FLAGS_ARMS_RAISED | PS_FLAGS_AIRBORNE); + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~(PS_FLAG_ACTION_STATE_CHANGED | PS_FLAG_ARMS_RAISED | PS_FLAG_AIRBORNE); playerStatus->actionSubstate = 0; playerStatus->currentStateTime = 0; playerStatus->timeInAir = 0; @@ -134,7 +134,7 @@ void action_update_launch(void) { playerStatus->currentSpeed = 0.0f; playerStatus->pitch = 0.0f; - if (playerStatus->animFlags & PA_FLAGS_USING_PEACH_PHYSICS) { + if (playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS) { return; } playerStatus->currentStateTime = 5; @@ -149,8 +149,8 @@ void action_update_launch(void) { void action_update_first_strike(void) { PlayerStatus* playerStatus = &gPlayerStatus; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~(PS_FLAGS_ACTION_STATE_CHANGED | PS_FLAGS_AIRBORNE); + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~(PS_FLAG_ACTION_STATE_CHANGED | PS_FLAG_AIRBORNE); playerStatus->actionSubstate = 0; playerStatus->timeInAir = 0; playerStatus->peakJumpTime = 0; @@ -170,9 +170,9 @@ void action_update_first_strike(void) { void action_update_raise_arms(void) { PlayerStatus* playerStatus = &gPlayerStatus; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~PS_FLAGS_ACTION_STATE_CHANGED; - playerStatus->flags |= PS_FLAGS_ARMS_RAISED; + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; + playerStatus->flags |= PS_FLAG_ARMS_RAISED; playerStatus->currentStateTime = 0; playerStatus->actionSubstate = 0; playerStatus->currentSpeed = 0.0f; @@ -180,20 +180,20 @@ void action_update_raise_arms(void) { suggest_player_anim_setUnkFlag(ANIM_Mario_GotItem); } - if (!(playerStatus->animFlags & PA_FLAGS_RAISED_ARMS)) { + if (!(playerStatus->animFlags & PA_FLAG_RAISED_ARMS)) { set_action_state(ACTION_STATE_IDLE); - playerStatus->flags &= ~PS_FLAGS_ARMS_RAISED; + playerStatus->flags &= ~PS_FLAG_ARMS_RAISED; } } void action_update_pushing_block(void) { PlayerStatus* playerStatus = &gPlayerStatus; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { f32 angle; f32 magnitude; - playerStatus->flags &= ~PS_FLAGS_ACTION_STATE_CHANGED; + playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; playerStatus->currentSpeed = 0.0f; playerStatus->unk_60 = 0; playerStatus->currentStateTime = 5; @@ -208,7 +208,7 @@ void action_update_pushing_block(void) { check_input_jump(); - if (playerStatus->animFlags & PA_FLAGS_PUSHED_ALBINO_DINO) { + if (playerStatus->animFlags & PA_FLAG_PUSHED_ALBINO_DINO) { if (playerStatus->currentStateTime != 0) { playerStatus->currentStateTime--; if (playerStatus->currentStateTime == 0) { @@ -221,15 +221,15 @@ void action_update_pushing_block(void) { void action_update_talk(void) { PlayerStatus* playerStatus = &gPlayerStatus; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~PS_FLAGS_ACTION_STATE_CHANGED; + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; playerStatus->currentSpeed = 0.0f; playerStatus->unk_60 = 0; - if (!(playerStatus->animFlags & PA_FLAGS_USING_PEACH_PHYSICS)) { + if (!(playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS)) { suggest_player_anim_setUnkFlag(ANIM_Mario_80007); } else if (playerStatus->peachItemHeld == 0) { - if (!(playerStatus->animFlags & PA_FLAGS_INVISIBLE)) { + if (!(playerStatus->animFlags & PA_FLAG_INVISIBLE)) { suggest_player_anim_setUnkFlag(ANIM_Peach_C0000); } else { peach_set_disguise_anim(BasicPeachDisguiseAnims[playerStatus->peachDisguise].talk); @@ -238,11 +238,11 @@ void action_update_talk(void) { playerStatus->currentStateTime = 30; } - if (playerStatus->animFlags & PA_FLAGS_USING_PEACH_PHYSICS) { + if (playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS) { if (playerStatus->currentStateTime != 0) { playerStatus->currentStateTime--; } else if (playerStatus->peachItemHeld == 0) { - if (!(playerStatus->animFlags & PA_FLAGS_INVISIBLE)) { + if (!(playerStatus->animFlags & PA_FLAG_INVISIBLE)) { suggest_player_anim_setUnkFlag(ANIM_Peach_A0001); } else { peach_set_disguise_anim(BasicPeachDisguiseAnims[playerStatus->peachDisguise].idle); diff --git a/src/world/action/slide.c b/src/world/action/slide.c index 2e8f12e151..e9d9362bdf 100644 --- a/src/world/action/slide.c +++ b/src/world/action/slide.c @@ -44,11 +44,11 @@ void action_update_sliding(void) { f32 hitRx, hitRy, hitDirX, hitDirZ; s32 hitID; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~PS_FLAGS_ACTION_STATE_CHANGED; + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; playerStatus->actionSubstate = SUBSTATE_SLIDING; playerStatus->currentSpeed = 0.0f; - playerStatus->animFlags |= PA_FLAGS_INTERRUPT_USE_PARTNER; + playerStatus->animFlags |= PA_FLAG_INTERRUPT_USE_PARTNER; func_802B6000_E27510(); SlideAcceleration = 0.0f; D_802B6790 = 0.0f; diff --git a/src/world/action/sneaky_parasol.c b/src/world/action/sneaky_parasol.c index 5743f9be06..1a064345bc 100644 --- a/src/world/action/sneaky_parasol.c +++ b/src/world/action/sneaky_parasol.c @@ -81,8 +81,8 @@ void action_update_parasol(void) { f32 angle; f32 radius; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~PS_FLAGS_ACTION_STATE_CHANGED; + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; mem_clear(&ParasolTransformation, sizeof(ParasolTransformation)); disable_player_static_collisions(); tempUnk_1C = &transformation->playerRotationRate; @@ -98,7 +98,7 @@ void action_update_parasol(void) { } *tempUnk_1C = phi_f4; - if (!(playerStatus->animFlags & PA_FLAGS_INVISIBLE)) { + if (!(playerStatus->animFlags & PA_FLAG_INVISIBLE)) { playerStatus->currentStateTime = 20; playerStatus->actionSubstate = SUBSTATE_DISGUISE_INIT; transformation->disguiseTime = 15; @@ -110,7 +110,7 @@ void action_update_parasol(void) { transformation->revertTime = 12; disguiseNpc = get_npc_by_index(PeachDisguiseNpcIndex); disguiseNpc->flags |= NPC_FLAG_40000; - playerStatus->flags |= PS_FLAGS_ROTATION_LOCKED; + playerStatus->flags |= PS_FLAG_ROTATION_LOCKED; sfx_play_sound_at_player(SOUND_FD, 0); } } @@ -143,7 +143,7 @@ void action_update_parasol(void) { case SUBSTATE_PUT_AWAY: if (playerStatus->animNotifyValue != 0) { playerStatus->currentStateTime = 12; - playerStatus->flags |= PS_FLAGS_ROTATION_LOCKED; + playerStatus->flags |= PS_FLAG_ROTATION_LOCKED; playerStatus->actionSubstate++; // SUBSTATE_DISGUISE_BEGIN sfx_play_sound_at_player(SOUND_FD, 0); } @@ -187,7 +187,7 @@ void action_update_parasol(void) { break; case SUBSTATE_DISGUISE_MAKE_NPC: gameStatus = gGameStatusPtr; - playerStatus->animFlags |= PA_FLAGS_INVISIBLE; + playerStatus->animFlags |= PA_FLAG_INVISIBLE; gameStatus->peachFlags |= PEACH_STATUS_FLAG_DISGUISED; playerStatus->actionSubstate++; // SUBSTATE_DISGUISE_SPIN_DOWN case SUBSTATE_DISGUISE_SPIN_DOWN: @@ -230,7 +230,7 @@ void action_update_parasol(void) { set_time_freeze_mode(TIME_FREEZE_NORMAL); disguiseNpc = get_npc_by_index(PeachDisguiseNpcIndex); disguiseNpc->flags &= ~NPC_FLAG_40000; - playerStatus->flags &= ~PS_FLAGS_ROTATION_LOCKED; + playerStatus->flags &= ~PS_FLAG_ROTATION_LOCKED; set_action_state(ACTION_STATE_IDLE); enable_player_static_collisions(); } @@ -263,7 +263,7 @@ void action_update_parasol(void) { playerStatus->currentStateTime = 2; playerStatus->actionSubstate++; // SUBSTATE_SPIN_DOWN gameStatus2 = gGameStatusPtr; - playerStatus->animFlags &= ~PA_FLAGS_INVISIBLE; + playerStatus->animFlags &= ~PA_FLAG_INVISIBLE; gameStatus2->peachFlags &= ~PEACH_STATUS_FLAG_DISGUISED; playerStatus->peachDisguise = 0; free_npc_by_index(PeachDisguiseNpcIndex); @@ -310,7 +310,7 @@ void action_update_parasol(void) { case SUBSTATE_REVERT_DONE: if (--playerStatus->currentStateTime == 0) { set_time_freeze_mode(TIME_FREEZE_NORMAL); - playerStatus->flags &= ~PS_FLAGS_ROTATION_LOCKED; + playerStatus->flags &= ~PS_FLAG_ROTATION_LOCKED; set_action_state(ACTION_STATE_IDLE); enable_player_static_collisions(); } diff --git a/src/world/action/spin.c b/src/world/action/spin.c index cd9e61d885..b72fb4019b 100644 --- a/src/world/action/spin.c +++ b/src/world/action/spin.c @@ -34,11 +34,11 @@ void action_update_spin(void) { s32 firstCall = FALSE; // initialization - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~(PS_FLAGS_ACTION_STATE_CHANGED | PS_FLAGS_ARMS_RAISED); - playerStatus->animFlags &= ~PA_FLAGS_INTERRUPT_SPIN; - playerStatus->animFlags |= PA_FLAGS_SPINNING; - playerStatus->flags |= PS_FLAGS_SPINNING; + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~(PS_FLAG_ACTION_STATE_CHANGED | PS_FLAG_ARMS_RAISED); + playerStatus->animFlags &= ~PA_FLAG_INTERRUPT_SPIN; + playerStatus->animFlags |= PA_FLAG_SPINNING; + playerStatus->flags |= PS_FLAG_SPINNING; playerStatus->currentStateTime = 0; playerStatus->actionSubstate = SUBSTATE_SPIN_0; playerSpinState->stopSoundTimer = 0; @@ -142,8 +142,8 @@ void action_update_spin(void) { // check for spin cancel if (!firstCall && (check_input_hammer() || check_input_jump())) { - playerStatus->animFlags &= ~PA_FLAGS_SPINNING; - playerStatus->flags &= ~PS_FLAGS_SPINNING; + playerStatus->animFlags &= ~PA_FLAG_SPINNING; + playerStatus->flags &= ~PS_FLAG_SPINNING; sfx_stop_sound(playerSpinState->spinSoundID); player_input_to_move_vector(&angle, &magnitude); playerStatus->targetYaw = angle; @@ -172,8 +172,8 @@ void action_update_spin(void) { if ((playerStatus->currentStateTime) == 0) { playerSpinState->stopSoundTimer = 4; set_action_state(ACTION_STATE_IDLE); - playerStatus->flags &= ~PS_FLAGS_SPINNING; - playerStatus->animFlags &= ~PA_FLAGS_SPINNING; + playerStatus->flags &= ~PS_FLAG_SPINNING; + playerStatus->animFlags &= ~PA_FLAG_SPINNING; sfx_stop_sound(playerSpinState->spinSoundID); } playerStatus->currentSpeed = 0.0f; @@ -181,7 +181,7 @@ void action_update_spin(void) { } if (playerStatus->actionSubstate == SUBSTATE_SPIN_0) { - if (playerStatus->animFlags & PA_FLAGS_INTERRUPT_SPIN) { + if (playerStatus->animFlags & PA_FLAG_INTERRUPT_SPIN) { playerStatus->actionSubstate = SUBSTATE_SPIN_1; } else if (gCollisionStatus.pushingAgainstWall >= 0) { playerSpinState->hitWallTime++; @@ -255,21 +255,21 @@ void action_update_spin(void) { if (playerSpinState->hasBufferedSpin) { playerStatus->currentStateTime = 2; playerStatus->actionSubstate = SUBSTATE_SPIN_2; - playerStatus->flags &= ~PS_FLAGS_SPINNING; + playerStatus->flags &= ~PS_FLAG_SPINNING; suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); } else if (angle < playerStatus->spriteFacingAngle) { if (playerStatus->spriteFacingAngle >= 180.0f && angle < 180.0f) { playerStatus->spriteFacingAngle = 180.0f; playerStatus->currentStateTime = 2; playerStatus->actionSubstate = SUBSTATE_SPIN_2; - playerStatus->flags &= ~PS_FLAGS_SPINNING; + playerStatus->flags &= ~PS_FLAG_SPINNING; suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); } } else if (playerStatus->spriteFacingAngle <= 0.0f && angle < 90.0f) { playerStatus->spriteFacingAngle = 0.0f; playerStatus->currentStateTime = 2; playerStatus->actionSubstate = SUBSTATE_SPIN_2; - playerStatus->flags &= ~PS_FLAGS_SPINNING; + playerStatus->flags &= ~PS_FLAG_SPINNING; suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); } playerStatus->spriteFacingAngle = clamp_angle(playerStatus->spriteFacingAngle); diff --git a/src/world/action/spin_jump.c b/src/world/action/spin_jump.c index f1770219fc..a582c5993c 100644 --- a/src/world/action/spin_jump.c +++ b/src/world/action/spin_jump.c @@ -27,9 +27,9 @@ void action_update_spin_jump(void) { static f32 RotationRate; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~(PS_FLAGS_ACTION_STATE_CHANGED | PS_FLAGS_JUMPING | PS_FLAGS_FALLING); - playerStatus->flags |= (PS_FLAGS_JUMPING | PS_FLAGS_FLYING); + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~(PS_FLAG_ACTION_STATE_CHANGED | PS_FLAG_JUMPING | PS_FLAG_FALLING); + playerStatus->flags |= (PS_FLAG_JUMPING | PS_FLAG_FLYING); playerStatus->actionSubstate = SUBSTATE_SPIN; playerStatus->currentSpeed = 0.0f; @@ -37,7 +37,7 @@ void action_update_spin_jump(void) { playerStatus->gravityIntegrator[0] = 5.2f; suggest_player_anim_clearUnkFlag(ANIM_Mario_1000A); disable_player_input(); - playerStatus->flags |= PS_FLAGS_SPECIAL_JUMP; + playerStatus->flags |= PS_FLAG_SPECIAL_JUMP; gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_IGNORE_PLAYER_Y; sfx_play_sound_at_player(SOUND_SPIN_JUMP, 0); } @@ -109,19 +109,19 @@ void action_update_spin_jump(void) { entityType == ENTITY_TYPE_RED_SWITCH || entityType == ENTITY_TYPE_BLUE_SWITCH)) { get_entity_by_index(collisionStatus->currentFloor)->collisionFlags |= ENTITY_COLLISION_PLAYER_TOUCH_FLOOR; playerStatus->actionSubstate = SUBSTATE_HIT_SWITCH; - playerStatus->flags &= ~PS_FLAGS_FLYING; + playerStatus->flags &= ~PS_FLAG_FLYING; break; } else { surfaceType = get_collider_flags(belowColliderID) & COLLIDER_FLAGS_SURFACE_TYPE_MASK; if (surfaceType == SURFACE_TYPE_LAVA) { playerStatus->hazardType = HAZARD_TYPE_LAVA; set_action_state(ACTION_STATE_HIT_LAVA); - playerStatus->flags |= PS_FLAGS_HIT_FIRE; - playerStatus->flags &= ~PS_FLAGS_FLYING; + playerStatus->flags |= PS_FLAG_HIT_FIRE; + playerStatus->flags &= ~PS_FLAG_FLYING; return; } else if (surfaceType == SURFACE_TYPE_SPIKES) { set_action_state(ACTION_STATE_HIT_LAVA); - playerStatus->flags &= ~PS_FLAGS_FLYING; + playerStatus->flags &= ~PS_FLAG_FLYING; return; } else { playerStatus->gravityIntegrator[1] = -3.4744f; @@ -140,7 +140,7 @@ void action_update_spin_jump(void) { panels = &gCurrentHiddenPanels; panels->tryFlipTrigger = TRUE; panels->flipTriggerPosY = playerStatus->position.y; - playerStatus->flags |= PS_FLAGS_SPECIAL_LAND; + playerStatus->flags |= PS_FLAG_SPECIAL_LAND; } } } @@ -186,7 +186,7 @@ void action_update_spin_jump(void) { if (landed) { set_action_state(ACTION_STATE_LAND); - playerStatus->flags &= ~PS_FLAGS_FLYING; + playerStatus->flags &= ~PS_FLAG_FLYING; } if (playerStatus->gravityIntegrator[0] < 0.0f) { belowColliderID = get_collider_below_spin_jump(); diff --git a/src/world/action/step_up.c b/src/world/action/step_up.c index 78b32adb33..4ca5f23066 100644 --- a/src/world/action/step_up.c +++ b/src/world/action/step_up.c @@ -33,11 +33,11 @@ void action_update_step_up(void) { s32 colliderID; AnimID anim; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~PS_FLAGS_ACTION_STATE_CHANGED; + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; phys_adjust_cam_on_landing(); - if (!(playerStatus->animFlags & PA_FLAGS_USING_PEACH_PHYSICS)) { - if (!(playerStatus->animFlags & PA_FLAGS_USING_WATT)) { + if (!(playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS)) { + if (!(playerStatus->animFlags & PA_FLAG_USING_WATT)) { anim = ANIM_Mario_Walking; } else { anim = ANIM_Mario_60000; @@ -77,7 +77,7 @@ void action_update_step_up(void) { } void func_802B6198_E24768(void) { - if (!(gPlayerStatus.animFlags & PA_FLAGS_INVISIBLE)) { + if (!(gPlayerStatus.animFlags & PA_FLAG_INVISIBLE)) { if (!(gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_HAS_INGREDIENT)) { suggest_player_anim_clearUnkFlag((StepUpPeachAnims)[gGameStatusPtr->peachCookingIngredient]); } else { @@ -91,8 +91,8 @@ void func_802B6198_E24768(void) { void action_update_step_up_peach(void) { PlayerStatus* playerStatus = &gPlayerStatus; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~PS_FLAGS_ACTION_STATE_CHANGED; + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; suggest_player_anim_clearUnkFlag(ANIM_Peach_A0005); playerStatus->currentStateTime = 8; } @@ -103,7 +103,7 @@ void action_update_step_up_peach(void) { try_player_footstep_sounds(1); } } else { - if (!(playerStatus->flags & PS_FLAGS_CUTSCENE_MOVEMENT)) { + if (!(playerStatus->flags & PS_FLAG_CUTSCENE_MOVEMENT)) { set_action_state(ACTION_STATE_IDLE); } else if (playerStatus->currentSpeed >= playerStatus->runSpeed) { set_action_state(ACTION_STATE_RUN); diff --git a/src/world/action/tornado_jump.c b/src/world/action/tornado_jump.c index 4e2efb419a..5394d0cf04 100644 --- a/src/world/action/tornado_jump.c +++ b/src/world/action/tornado_jump.c @@ -28,9 +28,9 @@ void action_update_tornado_jump(void) { s32 colliderBelow; u32 entityType; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~PS_FLAGS_ACTION_STATE_CHANGED; - playerStatus->flags |= (PS_FLAGS_SPINNING | PS_FLAGS_FLYING | PS_FLAGS_JUMPING); + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; + playerStatus->flags |= (PS_FLAG_SPINNING | PS_FLAG_FLYING | PS_FLAG_JUMPING); phys_clear_spin_history(); playerStatus->actionSubstate = SUBSTATE_ASCEND; playerStatus->currentSpeed = 0.0f; @@ -40,7 +40,7 @@ void action_update_tornado_jump(void) { playerStatus->gravityIntegrator[3] = -0.75f; suggest_player_anim_setUnkFlag(ANIM_Mario_80000); disable_player_input(); - playerStatus->flags |= PS_FLAGS_SPECIAL_JUMP; + playerStatus->flags |= PS_FLAG_SPECIAL_JUMP; gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_IGNORE_PLAYER_Y; cameraRelativeYaw = clamp_angle(playerStatus->targetYaw - gCameras[gCurrentCameraID].currentYaw); if (cameraRelativeYaw <= 180.0f) { @@ -89,12 +89,12 @@ void action_update_tornado_jump(void) { if (fallVelocity <= 0.0f) { record_jump_apex(); playerStatus->currentStateTime = 3; - playerStatus->flags |= PS_FLAGS_FALLING; + playerStatus->flags |= PS_FLAG_FALLING; playerStatus->actionSubstate++; sfx_play_sound_at_player(SOUND_TORNADO_JUMP, 0); } if (colliderBelow >= 0) { - playerStatus->flags &= ~(PS_FLAGS_SPINNING | PS_FLAGS_FLYING); + playerStatus->flags &= ~(PS_FLAG_SPINNING | PS_FLAG_FLYING); set_action_state(ACTION_STATE_LAND); } break; @@ -116,11 +116,11 @@ void action_update_tornado_jump(void) { if (collisionStatus->currentFloor & COLLISION_WITH_ENTITY_BIT) { entityType = get_entity_type(collisionStatus->currentFloor); if (entityType == ENTITY_TYPE_SIMPLE_SPRING || entityType == ENTITY_TYPE_SCRIPT_SPRING) { - playerStatus->flags &= ~(PS_FLAGS_SPINNING | PS_FLAGS_FLYING); + playerStatus->flags &= ~(PS_FLAG_SPINNING | PS_FLAG_FLYING); set_action_state(ACTION_STATE_LAND); return; } else if (entityType == ENTITY_TYPE_BLUE_SWITCH || entityType == ENTITY_TYPE_RED_SWITCH) { - playerStatus->flags &= ~(PS_FLAGS_SPINNING | PS_FLAGS_FLYING); + playerStatus->flags &= ~(PS_FLAG_SPINNING | PS_FLAG_FLYING); phys_player_land(); exec_ShakeCam1(0, 0, 4); sfx_play_sound_at_player(SOUND_14A, 0); @@ -128,7 +128,7 @@ void action_update_tornado_jump(void) { gCurrentHiddenPanels.tryFlipTrigger = TRUE; gCurrentHiddenPanels.flipTriggerPosY = playerStatus->position.y; - playerStatus->flags |= PS_FLAGS_SPECIAL_LAND; + playerStatus->flags |= PS_FLAG_SPECIAL_LAND; return; } } @@ -136,13 +136,13 @@ void action_update_tornado_jump(void) { surfaceType = get_collider_flags(colliderBelow) & COLLIDER_FLAGS_SURFACE_TYPE_MASK; if (surfaceType == SURFACE_TYPE_LAVA) { playerStatus->hazardType = HAZARD_TYPE_LAVA; - playerStatus->flags &= ~(PS_FLAGS_SPINNING | PS_FLAGS_FLYING); + playerStatus->flags &= ~(PS_FLAG_SPINNING | PS_FLAG_FLYING); set_action_state(ACTION_STATE_HIT_LAVA); - playerStatus->flags |= PS_FLAGS_HIT_FIRE; + playerStatus->flags |= PS_FLAG_HIT_FIRE; return; } else if (surfaceType == SURFACE_TYPE_SPIKES) { set_action_state(ACTION_STATE_HIT_LAVA); - playerStatus->flags &= ~(PS_FLAGS_SPINNING | PS_FLAGS_FLYING); + playerStatus->flags &= ~(PS_FLAG_SPINNING | PS_FLAG_FLYING); return; } playerStatus->currentStateTime = 8; @@ -155,13 +155,13 @@ void action_update_tornado_jump(void) { gCurrentHiddenPanels.tryFlipTrigger = TRUE; gCurrentHiddenPanels.flipTriggerPosY = playerStatus->position.y; - playerStatus->flags |= PS_FLAGS_SPECIAL_LAND; + playerStatus->flags |= PS_FLAG_SPECIAL_LAND; } break; case SUBSTATE_IMPACT: if (--playerStatus->currentStateTime == 0) { playerStatus->actionSubstate++; - playerStatus->flags &= ~(PS_FLAGS_SPINNING | PS_FLAGS_FLYING); + playerStatus->flags &= ~(PS_FLAG_SPINNING | PS_FLAG_FLYING); set_action_state(ACTION_STATE_LAND); } break; diff --git a/src/world/action/use_munchlesia.c b/src/world/action/use_munchlesia.c index 9921308c44..12119d78a8 100644 --- a/src/world/action/use_munchlesia.c +++ b/src/world/action/use_munchlesia.c @@ -19,8 +19,8 @@ void action_update_use_munchlesia(void) { s32 colliderID; f32 hitPosY; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~PS_FLAGS_ACTION_STATE_CHANGED; + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; playerStatus->actionSubstate = SUBSTATE_INIT; gOverrideFlags |= GLOBAL_OVERRIDES_40; disable_player_static_collisions(); diff --git a/src/world/action/use_spinning_flower.c b/src/world/action/use_spinning_flower.c index 71bcbe38e0..75162d2325 100644 --- a/src/world/action/use_spinning_flower.c +++ b/src/world/action/use_spinning_flower.c @@ -49,8 +49,8 @@ void action_update_use_spinning_flower(void) { f32 distToCenter; s8 switchCondition; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~PS_FLAGS_ACTION_STATE_CHANGED; + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; gOverrideFlags |= GLOBAL_OVERRIDES_40; func_800EF300(); playerStatus->actionSubstate = SUBSTATE_ATTRACT; @@ -61,7 +61,7 @@ void action_update_use_spinning_flower(void) { D_802B6EDC = 3.0f; disable_player_static_collisions(); disable_player_input(); - playerStatus->flags |= PS_FLAGS_ROTATION_LOCKED; + playerStatus->flags |= PS_FLAG_ROTATION_LOCKED; entityID = gCollisionStatus.currentFloor; TempPointer = &SpinningFlower_EntityIndex; @@ -74,7 +74,7 @@ void action_update_use_spinning_flower(void) { } else { SpinningFlower_EntityIndex = -1; } - if (!(playerStatus->animFlags & (PA_FLAGS_USING_WATT | PA_FLAGS_WATT_IN_HANDS))) { + if (!(playerStatus->animFlags & (PA_FLAG_USING_WATT | PA_FLAG_WATT_IN_HANDS))) { suggest_player_anim_clearUnkFlag(ANIM_Mario_1002B); } } @@ -127,10 +127,10 @@ void action_update_use_spinning_flower(void) { D_802B6EF4 = playerStatus->position.y; playerStatus->actionSubstate++; D_802B6EF0 = 1.6f; - playerStatus->flags |= PS_FLAGS_SCRIPTED_FALL; + playerStatus->flags |= PS_FLAG_SCRIPTED_FALL; } if (gGameStatusPtr->pressedButtons[0] & BUTTON_Z && - !(playerStatus->animFlags & (PA_FLAGS_USING_WATT | PA_FLAGS_WATT_IN_HANDS))) { + !(playerStatus->animFlags & (PA_FLAG_USING_WATT | PA_FLAG_WATT_IN_HANDS))) { suggest_player_anim_setUnkFlag(ANIM_Mario_AnimMidairStill); playerStatus->actionSubstate = SUBSTATE_SPIN_UP; playerStatus->currentStateTime = 30; @@ -143,7 +143,7 @@ void action_update_use_spinning_flower(void) { gOverrideFlags |= GLOBAL_OVERRIDES_40; if (--D_802B6EE4 < 0.0f) { D_802B6EE4 = 0.0f; - playerStatus->flags &= ~PS_FLAGS_ROTATION_LOCKED; + playerStatus->flags &= ~PS_FLAG_ROTATION_LOCKED; } playerStatus->spriteFacingAngle = clamp_angle(playerStatus->spriteFacingAngle + D_802B6EE4); sin_cos_rad(DEG_TO_RAD(SpinningFlower_AngleToCenter - 60.0f), &dx, &dz); @@ -159,7 +159,7 @@ void action_update_use_spinning_flower(void) { gCameras[CAM_DEFAULT].targetPos.y = playerStatus->position.y; gCameras[CAM_DEFAULT].targetPos.z = playerStatus->position.z; if (entityID >= 0) { - playerStatus->flags &= ~PS_FLAGS_ROTATION_LOCKED; + playerStatus->flags &= ~PS_FLAG_ROTATION_LOCKED; enable_player_input(); enable_player_static_collisions(); set_action_state(ACTION_STATE_LAND); @@ -277,8 +277,8 @@ void action_update_use_spinning_flower(void) { case SUBSTATE_FINISH: enable_player_static_collisions(); enable_player_input(); - playerStatus->flags &= ~PS_FLAGS_ROTATION_LOCKED; - playerStatus->flags |= PS_FLAGS_SCRIPTED_FALL; + playerStatus->flags &= ~PS_FLAG_ROTATION_LOCKED; + playerStatus->flags |= PS_FLAG_SCRIPTED_FALL; start_falling(); enable_partner_ai(); gOverrideFlags &= ~GLOBAL_OVERRIDES_40; diff --git a/src/world/action/use_tweester.c b/src/world/action/use_tweester.c index 9214b28c4e..3407fc8b42 100644 --- a/src/world/action/use_tweester.c +++ b/src/world/action/use_tweester.c @@ -17,11 +17,11 @@ void action_update_use_tweester(void) { Entity* entity; entity = TweesterTouchingPlayer; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~PS_FLAGS_ACTION_STATE_CHANGED; + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; disable_player_static_collisions(); disable_player_input(); - playerStatus->flags |= (PS_FLAGS_ROTATION_LOCKED | PS_FLAGS_FLYING); + playerStatus->flags |= (PS_FLAG_ROTATION_LOCKED | PS_FLAG_FLYING); suggest_player_anim_clearUnkFlag(ANIM_Mario_8001F); playerStatus->actionSubstate = SUBSTATE_LAUNCH; mem_clear(PlayerTweesterPhysics, sizeof(*PlayerTweesterPhysics)); @@ -71,7 +71,7 @@ void action_update_use_tweester(void) { playerStatus->blinkTimer = 50; enable_player_static_collisions(); enable_player_input(); - playerStatus->flags &= ~(PS_FLAGS_ROTATION_LOCKED | PS_FLAGS_FLYING); + playerStatus->flags &= ~(PS_FLAG_ROTATION_LOCKED | PS_FLAG_FLYING); set_action_state(ACTION_STATE_IDLE); break; } diff --git a/src/world/action/walk.c b/src/world/action/walk.c index 4c40bc19e8..d1f531e176 100644 --- a/src/world/action/walk.c +++ b/src/world/action/walk.c @@ -36,25 +36,25 @@ void action_update_walk(void) { s32 stickAxisY; AnimID anim; s32 changedAnim = FALSE; - if (playerStatus->animFlags & PA_FLAGS_USING_PEACH_PHYSICS) { + if (playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS) { action_update_walk_peach(); return; } - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { playerStatus->flags &= ~( - PS_FLAGS_ACTION_STATE_CHANGED | PS_FLAGS_SCRIPTED_FALL | PS_FLAGS_ARMS_RAISED); + PS_FLAG_ACTION_STATE_CHANGED | PS_FLAG_SCRIPTED_FALL | PS_FLAG_ARMS_RAISED); playerStatus->unk_60 = 0; changedAnim = TRUE; - if (!(playerStatus->flags & PS_FLAGS_CUTSCENE_MOVEMENT)) { + if (!(playerStatus->flags & PS_FLAG_CUTSCENE_MOVEMENT)) { playerStatus->currentSpeed = playerStatus->walkSpeed; } - if (playerStatus->animFlags & PA_FLAGS_8BIT_MARIO) { + if (playerStatus->animFlags & PA_FLAG_8BIT_MARIO) { anim = ANIM_Mario_90003; } - else if (!(playerStatus->animFlags & PA_FLAGS_USING_WATT)) { + else if (!(playerStatus->animFlags & PA_FLAG_USING_WATT)) { anim = ANIM_Mario_Walking; } else { @@ -63,7 +63,7 @@ void action_update_walk(void) { suggest_player_anim_clearUnkFlag(anim); } - if (playerStatus->flags & PS_FLAGS_CUTSCENE_MOVEMENT) { + if (playerStatus->flags & PS_FLAG_CUTSCENE_MOVEMENT) { playerStatus->targetYaw = playerStatus->heading; try_player_footstep_sounds(8); return; @@ -81,17 +81,17 @@ void action_update_walk(void) { } if (fabsf(PrevPlayerCamRelativeYaw - moveVectorAngle) <= 90.0f && abs(moveVectorMagnitude - D_800F7B44) < 20) { - if (!(playerStatus->animFlags & PA_FLAGS_80000000)) { + if (!(playerStatus->animFlags & PA_FLAG_80000000)) { if (moveVectorMagnitude >= 20.0f) { playerStatus->targetYaw = moveVectorAngle; } } - playerStatus->animFlags &= ~PA_FLAGS_80000000; + playerStatus->animFlags &= ~PA_FLAG_80000000; } else { - if (playerStatus->animFlags & PA_FLAGS_80000000) { + if (playerStatus->animFlags & PA_FLAG_80000000) { playerStatus->targetYaw = moveVectorAngle; } else { - playerStatus->animFlags |= PA_FLAGS_80000000; + playerStatus->animFlags |= PA_FLAG_80000000; } } @@ -121,25 +121,25 @@ void action_update_run(void) { s32 phi_s3; phi_s3 = 0; - if (playerStatus->animFlags & PA_FLAGS_USING_PEACH_PHYSICS) { + if (playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS) { action_update_run_peach(); return; } - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~(PS_FLAGS_ACTION_STATE_CHANGED | - PS_FLAGS_SCRIPTED_FALL | PS_FLAGS_ARMS_RAISED); + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~(PS_FLAG_ACTION_STATE_CHANGED | + PS_FLAG_SCRIPTED_FALL | PS_FLAG_ARMS_RAISED); D_8010C980 = 0; playerStatus->unk_60 = 0; phi_s3 = 1; - if (!(playerStatus->flags & PS_FLAGS_CUTSCENE_MOVEMENT)) { + if (!(playerStatus->flags & PS_FLAG_CUTSCENE_MOVEMENT)) { playerStatus->currentSpeed = playerStatus->runSpeed; } - if (playerStatus->animFlags & PA_FLAGS_8BIT_MARIO) { + if (playerStatus->animFlags & PA_FLAG_8BIT_MARIO) { anim = ANIM_Mario_90003; } else { - if (!(playerStatus->animFlags & PA_FLAGS_USING_WATT)) { + if (!(playerStatus->animFlags & PA_FLAG_USING_WATT)) { anim = ANIM_Mario_Running; } else { anim = ANIM_Mario_60002; @@ -148,7 +148,7 @@ void action_update_run(void) { suggest_player_anim_clearUnkFlag(anim); } - if (playerStatus->flags & PS_FLAGS_CUTSCENE_MOVEMENT) { + if (playerStatus->flags & PS_FLAG_CUTSCENE_MOVEMENT) { playerStatus->targetYaw = playerStatus->heading; try_player_footstep_sounds(4); return; @@ -157,7 +157,7 @@ void action_update_run(void) { D_8010C980++; runSpeedModifier = 1.0f; - if (playerStatus->animFlags & PA_FLAGS_SPINNING) { + if (playerStatus->animFlags & PA_FLAG_SPINNING) { runSpeedModifier = 1.5f; } @@ -178,15 +178,15 @@ void action_update_run(void) { } if (fabsf(PrevPlayerCamRelativeYaw - moveX) <= 90.0f) { - if (!(playerStatus->animFlags & PA_FLAGS_80000000)) { + if (!(playerStatus->animFlags & PA_FLAG_80000000)) { playerStatus->targetYaw = moveX; } - playerStatus->animFlags &= ~PA_FLAGS_80000000; + playerStatus->animFlags &= ~PA_FLAG_80000000; } else { - if (playerStatus->animFlags & PA_FLAGS_80000000) { + if (playerStatus->animFlags & PA_FLAG_80000000) { playerStatus->targetYaw = moveX; } else { - playerStatus->animFlags |= PA_FLAGS_80000000; + playerStatus->animFlags |= PA_FLAG_80000000; } } @@ -205,7 +205,7 @@ void action_update_run(void) { } void func_802B6550_E23C30(void) { - if (!(gPlayerStatus.animFlags & PA_FLAGS_INVISIBLE)) { + if (!(gPlayerStatus.animFlags & PA_FLAG_INVISIBLE)) { if (!(gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_HAS_INGREDIENT)) { suggest_player_anim_clearUnkFlag(WalkPeachAnims[gGameStatusPtr->peachCookingIngredient]); return; @@ -221,16 +221,16 @@ static void action_update_walk_peach(void) { f32 magnitude; f32 angle; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~PS_FLAGS_ACTION_STATE_CHANGED; + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; playerStatus->unk_60 = 0; - if (!(playerStatus->flags & PS_FLAGS_CUTSCENE_MOVEMENT)) { + if (!(playerStatus->flags & PS_FLAG_CUTSCENE_MOVEMENT)) { playerStatus->currentSpeed = playerStatus->walkSpeed; } func_802B6550_E23C30(); } - if (playerStatus->flags & PS_FLAGS_CUTSCENE_MOVEMENT) { + if (playerStatus->flags & PS_FLAG_CUTSCENE_MOVEMENT) { playerStatus->targetYaw = playerStatus->heading; try_player_footstep_sounds(8); return; @@ -258,14 +258,14 @@ static void action_update_run_peach(void) { f32 moveX; f32 moveY; - if (playerStatus->flags & PS_FLAGS_ACTION_STATE_CHANGED) { - playerStatus->flags &= ~PS_FLAGS_ACTION_STATE_CHANGED; + if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { + playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; playerStatus->unk_60 = 0; - if (!(playerStatus->flags & PS_FLAGS_CUTSCENE_MOVEMENT)) { + if (!(playerStatus->flags & PS_FLAG_CUTSCENE_MOVEMENT)) { playerStatus->currentSpeed = playerStatus->runSpeed; } - if (!(playerStatus->animFlags & PA_FLAGS_INVISIBLE)) { + if (!(playerStatus->animFlags & PA_FLAG_INVISIBLE)) { gameStatus = gGameStatusPtr; if (!(gameStatus->peachFlags & PEACH_STATUS_FLAG_HAS_INGREDIENT)) { if (!gameStatus->peachCookingIngredient) { @@ -281,7 +281,7 @@ static void action_update_run_peach(void) { } } - if (playerStatus->flags & PS_FLAGS_CUTSCENE_MOVEMENT) { + if (playerStatus->flags & PS_FLAG_CUTSCENE_MOVEMENT) { playerStatus->targetYaw = playerStatus->heading; try_player_footstep_sounds(4); return; diff --git a/src/world/area_arn/arn_02/arn_02_4_npc.c b/src/world/area_arn/arn_02/arn_02_4_npc.c index ca5a94c5b7..58ac81c6b6 100644 --- a/src/world/area_arn/arn_02/arn_02_4_npc.c +++ b/src/world/area_arn/arn_02/arn_02_4_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_HyperCleft_01) = { .settings = &N(NpcSettings_HyperCleft), .pos = { -196.0f, 130.0f, 104.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = HYPER_CLEFT_DROPS, .territory = { .wander = { @@ -31,7 +31,7 @@ StaticNpc N(NpcData_HyperCleft_02) = { .settings = &N(NpcSettings_HyperCleft), .pos = { 641.0f, 268.0f, 202.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = HYPER_CLEFT_DROPS, .territory = { .wander = { @@ -54,7 +54,7 @@ StaticNpc N(NpcData_HyperGoomba) = { .settings = &N(NpcSettings_HyperGoomba), .pos = { 333.0f, 215.0f, 85.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = HYPER_GOOMBA_DROPS, .territory = { .wander = { diff --git a/src/world/area_arn/arn_03/arn_03_3_npc.c b/src/world/area_arn/arn_03/arn_03_3_npc.c index a4904328a2..308314f13b 100644 --- a/src/world/area_arn/arn_03/arn_03_3_npc.c +++ b/src/world/area_arn/arn_03/arn_03_3_npc.c @@ -380,7 +380,7 @@ StaticNpc N(NpcData_Boo_01) = { .settings = &N(NpcSettings_Boo_Patrol), .pos = { 36.0f, 185.0f, 140.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Boo_01), .drops = BOO_DROPS, .territory = { @@ -406,7 +406,7 @@ StaticNpc N(NpcData_Boo_02) = { .settings = &N(NpcSettings_Boo), .pos = { 209.0f, 185.0f, 217.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Boo_02), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, @@ -418,7 +418,7 @@ StaticNpc N(NpcData_Boo_03) = { .settings = &N(NpcSettings_Boo_Patrol), .pos = { 379.0f, 186.0f, 186.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Boo_03), .drops = BOO_DROPS, .territory = { @@ -444,7 +444,7 @@ StaticNpc N(NpcData_Boo_04) = { .settings = &N(NpcSettings_Boo), .pos = { 544.0f, 235.0f, 128.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Boo_04), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, @@ -456,7 +456,7 @@ StaticNpc N(NpcData_Boo_05) = { .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Boo_05), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, @@ -520,7 +520,7 @@ StaticNpc N(NpcData_Boo_06)[] = { .settings = &N(NpcSettings_Boo), .pos = { 36.0f, 277.0f, 140.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Boo_06), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, @@ -530,7 +530,7 @@ StaticNpc N(NpcData_Boo_06)[] = { .settings = &N(NpcSettings_Boo), .pos = { 180.0f, 285.0f, 182.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Boo_07), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, @@ -540,7 +540,7 @@ StaticNpc N(NpcData_Boo_06)[] = { .settings = &N(NpcSettings_Boo), .pos = { 349.0f, 286.0f, 152.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Boo_08), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, @@ -550,7 +550,7 @@ StaticNpc N(NpcData_Boo_06)[] = { .settings = &N(NpcSettings_Boo), .pos = { 490.0f, 324.0f, 128.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Boo_09), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, diff --git a/src/world/area_arn/arn_04/arn_04_3_npc.c b/src/world/area_arn/arn_04/arn_04_3_npc.c index 517d8acd2c..07048fb626 100644 --- a/src/world/area_arn/arn_04/arn_04_3_npc.c +++ b/src/world/area_arn/arn_04/arn_04_3_npc.c @@ -9,7 +9,7 @@ StaticNpc N(NpcData_HyperParagoomba) = { .settings = &N(NpcSettings_HyperParagoomba), .pos = { -350.0f, 180.0f, 150.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = HYPER_PARAGOOMBA_DROPS, .territory = { .wander = { @@ -32,7 +32,7 @@ StaticNpc N(NpcData_HyperGoomba) = { .settings = &N(NpcSettings_HyperGoomba_Patrol), .pos = { 360.0f, 208.0f, 100.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = HYPER_GOOMBA_DROPS, .territory = { .wander = { @@ -55,7 +55,7 @@ StaticNpc N(NpcData_HyperCleft_01) = { .settings = &N(NpcSettings_HyperCleft), .pos = { 150.0f, 177.0f, 160.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = HYPER_CLEFT_DROPS, .territory = { .wander = { @@ -78,7 +78,7 @@ StaticNpc N(NpcData_HyperCleft_02) = { .settings = &N(NpcSettings_HyperCleft), .pos = { 550.0f, 230.0f, 125.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = HYPER_CLEFT_DROPS, .territory = { .wander = { diff --git a/src/world/area_arn/arn_05/arn_05_3_npc.c b/src/world/area_arn/arn_05/arn_05_3_npc.c index d2086f7980..79060e045d 100644 --- a/src/world/area_arn/arn_05/arn_05_3_npc.c +++ b/src/world/area_arn/arn_05/arn_05_3_npc.c @@ -234,7 +234,7 @@ StaticNpc N(NpcData_Boo_01)[] = { .settings = &N(NpcSettings_Boo_Patrol), .pos = { 55.0f, 195.0f, 160.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Boo_01), .drops = BOO_DROPS, .territory = { @@ -259,7 +259,7 @@ StaticNpc N(NpcData_Boo_01)[] = { .settings = &N(NpcSettings_Boo), .pos = { 160.0f, 191.0f, 250.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Boo_02), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, @@ -270,7 +270,7 @@ StaticNpc N(NpcData_Boo_01)[] = { .settings = &N(NpcSettings_Boo), .pos = { 390.0f, 190.0f, 255.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Boo_03), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, @@ -281,7 +281,7 @@ StaticNpc N(NpcData_Boo_01)[] = { .settings = &N(NpcSettings_Boo), .pos = { 503.0f, 206.0f, 210.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Boo_04), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, @@ -292,7 +292,7 @@ StaticNpc N(NpcData_Boo_01)[] = { .settings = &N(NpcSettings_Boo_Patrol), .pos = { 350.0f, 185.0f, 197.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Boo_05), .drops = BOO_DROPS, .territory = { @@ -639,7 +639,7 @@ StaticNpc N(NpcData_Tubba) = { .settings = &N(NpcSettings_TubbaBlubba), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Tubba), .drops = TUBBA_DROPS, .animations = TUBBA_ANIMS, @@ -704,7 +704,7 @@ StaticNpc N(NpcData_Boo_06)[] = { .settings = &N(NpcSettings_Boo), .pos = { 36.0f, 277.0f, 140.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Boo_06), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, @@ -714,7 +714,7 @@ StaticNpc N(NpcData_Boo_06)[] = { .settings = &N(NpcSettings_Boo), .pos = { 200.0f, 275.0f, 182.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Boo_07), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, @@ -724,7 +724,7 @@ StaticNpc N(NpcData_Boo_06)[] = { .settings = &N(NpcSettings_Boo), .pos = { 379.0f, 300.0f, 192.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Boo_08), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, @@ -734,7 +734,7 @@ StaticNpc N(NpcData_Boo_06)[] = { .settings = &N(NpcSettings_Boo), .pos = { 525.0f, 286.0f, 178.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Boo_09), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, diff --git a/src/world/area_arn/arn_07/arn_07_5_npc.c b/src/world/area_arn/arn_07/arn_07_5_npc.c index 5a4dbfac39..65a291c5f4 100644 --- a/src/world/area_arn/arn_07/arn_07_5_npc.c +++ b/src/world/area_arn/arn_07/arn_07_5_npc.c @@ -305,7 +305,7 @@ EvtScript N(EVS_NpcIdle_Boo) = { }; EvtScript N(EVS_NpcDefeat_Tubba) = { - EVT_CALL(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAGS_2, TRUE) + EVT_CALL(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_2, TRUE) EVT_CALL(GetBattleOutcome, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(OUTCOME_PLAYER_WON) @@ -564,7 +564,7 @@ StaticNpc N(NpcData_Tubba)[] = { .settings = &N(NpcSettings_TubbaBlubba), .pos = { 309.0f, 0.0f, 11.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Tubba), .drops = TUBBA_DROPS, .animations = TUBBA_ANIMS, @@ -575,7 +575,7 @@ StaticNpc N(NpcData_Tubba)[] = { .settings = &N(NpcSettings_TubbasHeart), .pos = { -10.0f, 50.0f, -170.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_TubbasHeart), .drops = TUBBAS_HEART_DROPS, .animations = TUBBAS_HEART_ANIMS, @@ -588,7 +588,7 @@ StaticNpc N(NpcData_Boos)[] = { .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Boo), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, @@ -599,7 +599,7 @@ StaticNpc N(NpcData_Boos)[] = { .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Boo), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, @@ -610,7 +610,7 @@ StaticNpc N(NpcData_Boos)[] = { .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Boo), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, @@ -621,7 +621,7 @@ StaticNpc N(NpcData_Boos)[] = { .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Boo), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, @@ -632,7 +632,7 @@ StaticNpc N(NpcData_Boos)[] = { .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Boo), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -643,7 +643,7 @@ StaticNpc N(NpcData_Boos)[] = { .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Boo), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -656,10 +656,10 @@ StaticNpc N(NpcData_Bow) = { .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Bow), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -688,10 +688,10 @@ StaticNpc N(NpcData_Bootler) = { .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Bootler), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -731,7 +731,7 @@ StaticNpc N(NpcData_HyperParagoomba_01) = { .settings = &N(NpcSettings_HyperParagoomba), .pos = { -216.0f, 60.0f, -10.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_HyperParagoomba), .drops = HYPER_PARAGOOMBA_DROPS, .territory = { @@ -755,7 +755,7 @@ StaticNpc N(NpcData_HyperParagoomba_02) = { .settings = &N(NpcSettings_HyperParagoomba), .pos = { 0.0f, 60.0f, 150.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_HyperParagoomba), .drops = HYPER_PARAGOOMBA_DROPS, .territory = { @@ -779,7 +779,7 @@ StaticNpc N(NpcData_HyperParagoomba_03) = { .settings = &N(NpcSettings_HyperParagoomba), .pos = { 260.0f, 60.0f, 30.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_HyperParagoomba), .drops = HYPER_PARAGOOMBA_DROPS, .territory = { @@ -803,7 +803,7 @@ StaticNpc N(NpcData_Skolar) = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Skolar), .drops = SKOLAR_DROPS, .animations = SKOLAR_ANIMS, diff --git a/src/world/area_arn/arn_08/arn_08_6_npc.c b/src/world/area_arn/arn_08/arn_08_6_npc.c index fdd3e0e2bc..94a0360668 100644 --- a/src/world/area_arn/arn_08/arn_08_6_npc.c +++ b/src/world/area_arn/arn_08/arn_08_6_npc.c @@ -50,7 +50,7 @@ StaticNpc N(NpcData_TubbasHeart) = { .settings = &N(NpcSettings_TubbasHeart), .pos = { -23.0f, 75.0f, 31.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TubbasHeart), .drops = TUBBAS_HEART_DROPS, .animations = TUBBAS_HEART_ANIMS, @@ -61,7 +61,7 @@ StaticNpc N(NpcData_Yakkey) = { .settings = &N(NpcSettings_Yakkey), .pos = { 38.0f, 0.0f, 97.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Yakkey), .drops = YAKKEY_DROPS, .animations = YAKKEY_ANIMS, diff --git a/src/world/area_arn/arn_09/arn_09_5_npc.c b/src/world/area_arn/arn_09/arn_09_5_npc.c index 4c47e3b8d7..cae8abd5a4 100644 --- a/src/world/area_arn/arn_09/arn_09_5_npc.c +++ b/src/world/area_arn/arn_09/arn_09_5_npc.c @@ -50,7 +50,7 @@ StaticNpc N(NpcData_TubbasHeart) = { .settings = &N(NpcSettings_TubbasHeart), .pos = { 0.0f, 25.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TubbasHeart), .drops = TUBBAS_HEART_DROPS, .animations = TUBBAS_HEART_ANIMS, diff --git a/src/world/area_arn/arn_10/arn_10_3_npc.c b/src/world/area_arn/arn_10/arn_10_3_npc.c index 9340eb203e..81c0d75b4b 100644 --- a/src/world/area_arn/arn_10/arn_10_3_npc.c +++ b/src/world/area_arn/arn_10/arn_10_3_npc.c @@ -64,7 +64,7 @@ StaticNpc N(NpcData_TubbasHeart) = { .settings = &N(NpcSettings_TubbasHeart), .pos = { 80.0f, 50.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TubbasHeart), .drops = TUBBAS_HEART_DROPS, .animations = TUBBAS_HEART_ANIMS, @@ -75,7 +75,7 @@ StaticNpc N(NpcData_HyperGoomba) = { .settings = &N(NpcSettings_HyperGoomba), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_HyperGoomba), .drops = HYPER_GOOMBA_DROPS, .territory = { diff --git a/src/world/area_arn/arn_11/arn_11_3_npc.c b/src/world/area_arn/arn_11/arn_11_3_npc.c index 04f1298ec9..06d728e37f 100644 --- a/src/world/area_arn/arn_11/arn_11_3_npc.c +++ b/src/world/area_arn/arn_11/arn_11_3_npc.c @@ -154,7 +154,7 @@ StaticNpc N(NpcData_TubbasHeart) = { .settings = &N(NpcSettings_TubbasHeart), .pos = { 119.0f, 60.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_TubbasHeart), .drops = TUBBAS_HEART_DROPS, .animations = TUBBAS_HEART_ANIMS, diff --git a/src/world/area_arn/arn_12/arn_12_3_npc.c b/src/world/area_arn/arn_12/arn_12_3_npc.c index aae6a8893a..c7a4087925 100644 --- a/src/world/area_arn/arn_12/arn_12_3_npc.c +++ b/src/world/area_arn/arn_12/arn_12_3_npc.c @@ -65,7 +65,7 @@ StaticNpc N(NpcData_TubbasHeart) = { .settings = &N(NpcSettings_TubbasHeart), .pos = { 80.0f, 50.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TubbasHeart), .drops = TUBBAS_HEART_DROPS, .animations = TUBBAS_HEART_ANIMS, @@ -76,7 +76,7 @@ StaticNpc N(NpcData_HyperGoomba) = { .settings = &N(NpcSettings_HyperGoomba), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_HyperGoomba), .drops = HYPER_GOOMBA_DROPS, .territory = { diff --git a/src/world/area_arn/arn_13/arn_13_3_npc.c b/src/world/area_arn/arn_13/arn_13_3_npc.c index 2af43d300f..e7b49b37bf 100644 --- a/src/world/area_arn/arn_13/arn_13_3_npc.c +++ b/src/world/area_arn/arn_13/arn_13_3_npc.c @@ -65,7 +65,7 @@ StaticNpc N(NpcData_TubbasHeart) = { .settings = &N(NpcSettings_TubbasHeart), .pos = { 80.0f, 50.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TubbasHeart), .drops = TUBBAS_HEART_DROPS, .animations = TUBBAS_HEART_ANIMS, @@ -76,7 +76,7 @@ StaticNpc N(NpcData_HyperGoomba) = { .settings = &N(NpcSettings_HyperGoomba), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_HyperGoomba), .drops = HYPER_GOOMBA_DROPS, .territory = { diff --git a/src/world/area_dgb/dgb_00/dgb_00_3_npc.c b/src/world/area_dgb/dgb_00/dgb_00_3_npc.c index 8a9f8dfae6..b4cc46107d 100644 --- a/src/world/area_dgb/dgb_00/dgb_00_3_npc.c +++ b/src/world/area_dgb/dgb_00/dgb_00_3_npc.c @@ -445,7 +445,7 @@ StaticNpc N(NpcData_Boo_01) = { .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Boo_01), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, @@ -457,7 +457,7 @@ StaticNpc N(NpcData_Boo_02) = { .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Boo_02), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, @@ -468,7 +468,7 @@ StaticNpc N(NpcData_Boo_03) = { .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Boo_03), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, @@ -479,7 +479,7 @@ StaticNpc N(NpcData_Boo_04) = { .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Boo_04), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, @@ -490,7 +490,7 @@ StaticNpc N(NpcData_Boo_05) = { .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Boo_05), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, @@ -501,7 +501,7 @@ StaticNpc N(NpcData_Boo_06) = { .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Boo_06), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, @@ -658,7 +658,7 @@ StaticNpc N(NpcData_Sentinel) = { .settings = &N(NpcSettings_Sentinel), .pos = { 0.0f, 0.0f, -1000.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Sentinel), .drops = SENTINEL_DROPS, .animations = SENTINEL_ANIMS, diff --git a/src/world/area_dgb/dgb_01/dgb_01_5_npc.c b/src/world/area_dgb/dgb_01/dgb_01_5_npc.c index a9aa393aa7..ddef49120d 100644 --- a/src/world/area_dgb/dgb_01/dgb_01_5_npc.c +++ b/src/world/area_dgb/dgb_01/dgb_01_5_npc.c @@ -248,7 +248,7 @@ StaticNpc N(NpcData_Sentinel_01) = { .settings = &N(NpcSettings_Sentinel), .pos = { -180.0f, 100.0f, 230.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Sentinel_01), .drops = SENTINEL_DROPS, .territory = { @@ -271,7 +271,7 @@ StaticNpc N(NpcData_Sentinel_02) = { .settings = &N(NpcSettings_Sentinel), .pos = { 180.0f, 100.0f, 230.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Sentinel_02), .drops = SENTINEL_DROPS, .territory = { @@ -294,7 +294,7 @@ StaticNpc N(NpcData_Sentinel_03) = { .settings = &N(NpcSettings_Sentinel), .pos = { -180.0f, 100.0f, -230.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Sentinel_03), .drops = SENTINEL_DROPS, .territory = { @@ -317,7 +317,7 @@ StaticNpc N(NpcData_Sentinel_04) = { .settings = &N(NpcSettings_Sentinel), .pos = { 180.0f, 100.0f, -230.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Sentinel_04), .drops = SENTINEL_DROPS, .territory = { @@ -355,7 +355,7 @@ StaticNpc N(NpcData_Tubba_Floor3) = { .settings = &N(NpcSettings_TubbaBlubba), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Tubba_Floor3), .drops = TUBBA_DROPS, .animations = TUBBA_ANIMS, @@ -367,7 +367,7 @@ StaticNpc N(NpcData_Tubba_Floor2) = { .settings = &N(NpcSettings_TubbaBlubba_Patrol), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Tubba_Floor2), .drops = CLUBBA_DROPS, .territory = { @@ -394,7 +394,7 @@ StaticNpc N(NpcData_Tubba_Floor1) = { .settings = &N(NpcSettings_TubbaBlubba_Patrol), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Tubba_Floor1), .drops = CLUBBA_DROPS, .territory = { diff --git a/src/world/area_dgb/dgb_02/dgb_02_3_npc.c b/src/world/area_dgb/dgb_02/dgb_02_3_npc.c index 51ea1cf327..704e931b41 100644 --- a/src/world/area_dgb/dgb_02/dgb_02_3_npc.c +++ b/src/world/area_dgb/dgb_02/dgb_02_3_npc.c @@ -10,7 +10,7 @@ StaticNpc N(NpcData_Clubba_01)[] = { .settings = &N(NpcSettings_Clubba_Wander), .pos = { -200.0f, 0.0f, 180.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = CLUBBA_DROPS, .territory = { .wander = { @@ -37,7 +37,7 @@ StaticNpc N(NpcData_Clubba_02)[] = { .settings = &N(NpcSettings_Clubba_Napping), .pos = { 375.0f, 0.0f, 100.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = CLUBBA_DROPS, .territory = { .wander = { diff --git a/src/world/area_dgb/dgb_03/dgb_03_5_npc.c b/src/world/area_dgb/dgb_03/dgb_03_5_npc.c index 4aac57cfdc..cec1a0819a 100644 --- a/src/world/area_dgb/dgb_03/dgb_03_5_npc.c +++ b/src/world/area_dgb/dgb_03/dgb_03_5_npc.c @@ -20,7 +20,7 @@ StaticNpc N(NpcData_Clubba_Wander)[] = { .settings = &N(NpcSettings_Clubba_Wander), .pos = { 180.0f, 0.0f, -122.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = CLUBBA_DROPS, .territory = { .wander = { @@ -46,7 +46,7 @@ StaticNpc N(NpcData_Clubba_Patrol)[] = { .settings = &N(NpcSettings_Clubba_Patrol), .pos = { -272.0f, 0.0f, -135.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = CLUBBA_DROPS, .territory = { .patrol = { @@ -74,7 +74,7 @@ StaticNpc N(NpcData_Clubba_Napping)[] = { .settings = &N(NpcSettings_Clubba_Napping), .pos = { -326.0f, 210.0f, 80.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Clubba_Napping), .drops = CLUBBA_DROPS, .territory = { diff --git a/src/world/area_dgb/dgb_04/dgb_04_3_npc.c b/src/world/area_dgb/dgb_04/dgb_04_3_npc.c index 3955f80309..ef72afdfc0 100644 --- a/src/world/area_dgb/dgb_04/dgb_04_3_npc.c +++ b/src/world/area_dgb/dgb_04/dgb_04_3_npc.c @@ -9,7 +9,7 @@ StaticNpc N(NpcData_Sentinel) = { .settings = &N(NpcSettings_Sentinel), .pos = { 70.0f, -220.0f, 186.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = SENTINEL_DROPS, .territory = { .wander = { diff --git a/src/world/area_dgb/dgb_05/dgb_05_5_npc.c b/src/world/area_dgb/dgb_05/dgb_05_5_npc.c index eb032c7252..f64c34cc29 100644 --- a/src/world/area_dgb/dgb_05/dgb_05_5_npc.c +++ b/src/world/area_dgb/dgb_05/dgb_05_5_npc.c @@ -9,7 +9,7 @@ StaticNpc N(NpcData_Clubba_01)[] = { .settings = &N(NpcSettings_Clubba_Napping), .pos = { 132.0f, -110.0f, 238.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = CLUBBA_DROPS, .territory = { .wander = { @@ -35,7 +35,7 @@ StaticNpc N(NpcData_Clubba_02)[] = { .settings = &N(NpcSettings_Clubba_Napping), .pos = { 503.0f, -210.0f, 225.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = CLUBBA_DROPS, .territory = { .wander = { diff --git a/src/world/area_dgb/dgb_06/dgb_06_4_npc.c b/src/world/area_dgb/dgb_06/dgb_06_4_npc.c index 9bc343ab7e..b50abf6ba9 100644 --- a/src/world/area_dgb/dgb_06/dgb_06_4_npc.c +++ b/src/world/area_dgb/dgb_06/dgb_06_4_npc.c @@ -28,7 +28,7 @@ StaticNpc N(NpcData_Boo) = { .settings = &N(NpcSettings_Boo), .pos = { -300.0f, 10.0f, 150.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Boo), .drops = NPC_NO_DROPS, .animations = GUSTY_BOO_ANIMS, diff --git a/src/world/area_dgb/dgb_07/dgb_07_4_npc.c b/src/world/area_dgb/dgb_07/dgb_07_4_npc.c index 868058e09b..c678c4b7bb 100644 --- a/src/world/area_dgb/dgb_07/dgb_07_4_npc.c +++ b/src/world/area_dgb/dgb_07/dgb_07_4_npc.c @@ -9,7 +9,7 @@ StaticNpc N(NpcData_Clubba_01)[] = { .settings = &N(NpcSettings_Clubba_Napping), .pos = { -500.0f, 0.0f, -240.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_800, .drops = CLUBBA_DROPS, .territory = { .wander = { diff --git a/src/world/area_dgb/dgb_08/dgb_08_3_npc.c b/src/world/area_dgb/dgb_08/dgb_08_3_npc.c index ef71bacaa6..338d091bc2 100644 --- a/src/world/area_dgb/dgb_08/dgb_08_3_npc.c +++ b/src/world/area_dgb/dgb_08/dgb_08_3_npc.c @@ -90,7 +90,7 @@ API_CALLABLE(N(SetTubbaPatrolTerritory)) { API_CALLABLE(N(SetTubbaPatrolMode)) { if (get_enemy_safe(NPC_Tubba)) { Enemy* enemy = get_enemy(NPC_Tubba); - enemy->aiFlags |= ENEMY_AI_FLAGS_80; + enemy->aiFlags |= ENEMY_AI_FLAG_80; return ApiStatus_DONE2; } @@ -175,7 +175,7 @@ StaticNpc N(NpcData_Tubba) = { .settings = &N(NpcSettings_TubbaBlubba), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_800000, .init = &N(EVS_NpcInit_Tubba), .drops = CLUBBA_DROPS, .territory = { @@ -210,7 +210,7 @@ StaticNpc N(NpcData_Clubba_01)[] = { .settings = &N(NpcSettings_Clubba_Wander), .pos = { -250.0f, 0.0f, 135.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = CLUBBA_DROPS, .territory = { .wander = { @@ -237,7 +237,7 @@ StaticNpc N(NpcData_Clubba_02)[] = { .settings = &N(NpcSettings_Clubba_Wander), .pos = { 220.0f, 0.0f, 155.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = CLUBBA_DROPS, .territory = { .wander = { @@ -264,7 +264,7 @@ StaticNpc N(NpcData_Clubba_03)[] = { .settings = &N(NpcSettings_Clubba_Wander), .pos = { 825.0f, 100.0f, 200.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = CLUBBA_DROPS, .territory = { .wander = { @@ -290,7 +290,7 @@ StaticNpc N(NpcData_Sentinel_01) = { .settings = &N(NpcSettings_Sentinel), .pos = { 75.0f, 310.0f, 85.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = SENTINEL_DROPS, .territory = { .wander = { @@ -312,7 +312,7 @@ StaticNpc N(NpcData_Sentinel_02) = { .settings = &N(NpcSettings_Sentinel), .pos = { -451.0f, 310.0f, 81.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = SENTINEL_DROPS, .territory = { .wander = { @@ -399,7 +399,7 @@ StaticNpc N(NpcData_LastClubba) = { .settings = &N(NpcSettings_LastClubba), .pos = { 426.0f, 0.0f, 38.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_LastClubba), .drops = NPC_NO_DROPS, .territory = { @@ -436,7 +436,7 @@ StaticNpc N(NpcData_Clubba_Unused) = { .settings = &N(NpcSettings_Clubba_Wander), .pos = { -250.0f, 0.0f, 135.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Clubba_Unused), .drops = CLUBBA_DROPS, .territory = { diff --git a/src/world/area_dgb/dgb_09/dgb_09_4_npc.c b/src/world/area_dgb/dgb_09/dgb_09_4_npc.c index edcfe69042..cfe3bfbc2c 100644 --- a/src/world/area_dgb/dgb_09/dgb_09_4_npc.c +++ b/src/world/area_dgb/dgb_09/dgb_09_4_npc.c @@ -14,7 +14,7 @@ StaticNpc N(NpcData_Clubba_Wander)[] = { .settings = &N(NpcSettings_Clubba_Wander), .pos = { -350.0f, 0.0f, 180.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = CLUBBA_DROPS, .territory = { .wander = { @@ -51,7 +51,7 @@ StaticNpc N(NpcData_Clubba_Napping)[] = { .settings = &N(NpcSettings_Clubba_Napping), .pos = { 310.0f, 0.0f, 88.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Clubba_Napping), .drops = CLUBBA_DROPS, .territory = { @@ -78,7 +78,7 @@ StaticNpc N(NpcData_Sentinel) = { .settings = &N(NpcSettings_Sentinel), .pos = { -20.0f, 100.0f, 180.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = SENTINEL_DROPS, .territory = { .wander = { diff --git a/src/world/area_dgb/dgb_15/dgb_15_3_npc.c b/src/world/area_dgb/dgb_15/dgb_15_3_npc.c index dc14672988..286e229aa1 100644 --- a/src/world/area_dgb/dgb_15/dgb_15_3_npc.c +++ b/src/world/area_dgb/dgb_15/dgb_15_3_npc.c @@ -167,7 +167,7 @@ StaticNpc N(NpcData_Tubba) = { .settings = &N(NpcSettings_TubbaBlubba), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_800000, .init = &N(EVS_NpcInit_Tubba), .drops = CLUBBA_DROPS, .territory = { diff --git a/src/world/area_dgb/dgb_16/dgb_16_4_npc.c b/src/world/area_dgb/dgb_16/dgb_16_4_npc.c index eecf29fa58..f80ee0f9ce 100644 --- a/src/world/area_dgb/dgb_16/dgb_16_4_npc.c +++ b/src/world/area_dgb/dgb_16/dgb_16_4_npc.c @@ -9,7 +9,7 @@ StaticNpc N(NpcData_Clubba_01)[] = { .settings = &N(NpcSettings_Clubba_Napping), .pos = { -70.0f, 0.0f, -100.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = CLUBBA_DROPS, .territory = { .wander = { @@ -36,7 +36,7 @@ StaticNpc N(NpcData_Clubba_02)[] = { .settings = &N(NpcSettings_Clubba_Napping), .pos = { 0.0f, 0.0f, -235.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = CLUBBA_DROPS, .territory = { .wander = { @@ -62,7 +62,7 @@ StaticNpc N(NpcData_Clubba_03)[] = { .settings = &N(NpcSettings_Clubba_Napping), .pos = { 70.0f, 0.0f, -100.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = CLUBBA_DROPS, .territory = { .wander = { @@ -88,7 +88,7 @@ StaticNpc N(NpcData_Clubba_04)[] = { .settings = &N(NpcSettings_Clubba_Napping), .pos = { 140.0f, 0.0f, -235.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = CLUBBA_DROPS, .territory = { .wander = { @@ -114,7 +114,7 @@ StaticNpc N(NpcData_Clubba_05)[] = { .settings = &N(NpcSettings_Clubba_Napping), .pos = { 210.0f, 0.0f, -100.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = CLUBBA_DROPS, .territory = { .wander = { @@ -140,7 +140,7 @@ StaticNpc N(NpcData_Clubba_06)[] = { .settings = &N(NpcSettings_Clubba_Napping), .pos = { 280.0f, 0.0f, -235.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = CLUBBA_DROPS, .territory = { .wander = { diff --git a/src/world/area_dgb/dgb_18/dgb_18_3_npc.c b/src/world/area_dgb/dgb_18/dgb_18_3_npc.c index e6570021d7..155125d560 100644 --- a/src/world/area_dgb/dgb_18/dgb_18_3_npc.c +++ b/src/world/area_dgb/dgb_18/dgb_18_3_npc.c @@ -491,7 +491,7 @@ StaticNpc N(NpcData_Tubba) = { .settings = &N(NpcSettings_TubbaBlubba), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_800000, .init = &N(EVS_NpcInit_Tubba), .drops = TUBBA_DROPS, .territory = { @@ -519,7 +519,7 @@ StaticNpc N(NpcData_Yakkey) = { .settings = &N(NpcSettings_Yakkey), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Yakkey), .drops = NPC_NO_DROPS, .animations = { diff --git a/src/world/area_dro/dro_01/dro_01_3_npc.c b/src/world/area_dro/dro_01/dro_01_3_npc.c index c74955ea01..ef03d7d4e3 100644 --- a/src/world/area_dro/dro_01/dro_01_3_npc.c +++ b/src/world/area_dro/dro_01/dro_01_3_npc.c @@ -194,7 +194,7 @@ StaticNpc N(PassiveNPCs)[] = { .id = NPC_Mouser_01, .settings = &N(NpcSettings_Mouser), .pos = { -332.0f, 0.0f, 188.0f }, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Mouser_01), .yaw = 90, .drops = MOUSER_DROPS, @@ -205,7 +205,7 @@ StaticNpc N(PassiveNPCs)[] = { .id = NPC_Dryite_01, .settings = &N(NpcSettings_Dryite_Wander), .pos = { -235.0f, 0.0f, 160.0f }, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Dryite_01), .yaw = 90, .drops = DRYITE_DROPS, @@ -228,7 +228,7 @@ StaticNpc N(PassiveNPCs)[] = { .id = NPC_Dryite_02, .settings = &N(NpcSettings_Dryite), .pos = { -380.0f, 0.0f, -15.0f }, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Dryite_02), .yaw = 61, .drops = DRYITE_DROPS, @@ -239,7 +239,7 @@ StaticNpc N(PassiveNPCs)[] = { .id = NPC_Dryite_03, .settings = &N(NpcSettings_Dryite), .pos = { 195.0f, 0.0f, -75.0f }, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_HintDryite), .yaw = 74, .drops = DRYITE_DROPS, @@ -250,7 +250,7 @@ StaticNpc N(PassiveNPCs)[] = { .id = NPC_Dryite_04, .settings = &N(NpcSettings_Dryite), .pos = { 225.0f, 0.0f, -83.0f }, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Dryite_04), .yaw = 257, .drops = DRYITE_DROPS, @@ -261,11 +261,11 @@ StaticNpc N(PassiveNPCs)[] = { .id = NPC_ArtistToad, .settings = &N(NpcSettings_Dryite), .pos = { 285.0f, 0.0f, -274.0f }, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Composer), .yaw = 271, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -293,7 +293,7 @@ StaticNpc N(PassiveNPCs)[] = { .id = NPC_Mouser_ShopOwner, .settings = &N(NpcSettings_Mouser), .pos = { 31.0f, 0.0f, -374.0f }, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ShopOwner), .yaw = 180, .drops = MOUSER_DROPS, @@ -304,12 +304,12 @@ StaticNpc N(PassiveNPCs)[] = { .id = NPC_ChuckQuizmo, .settings = &N(NpcSettings_ChuckQuizmo), .pos = { -400.0f, 0.0f, 100.0f }, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_DRO, QUIZ_COUNT_DRO, QUIZ_MAP_DRO_01 }}, .yaw = 263, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -338,7 +338,7 @@ StaticNpc N(PassiveNPCs)[] = { .settings = &N(NpcSettings_Dryite_Wander), .pos = { -120.0f, 0.0f, 134.0f }, .yaw = 257, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_DojoGrad), .drops = DRYITE_DROPS, .territory = { @@ -361,7 +361,7 @@ StaticNpc N(PassiveNPCs)[] = { .settings = &N(NpcSettings_Dryite_Patrol), .pos = { 40.0f, 0.0f, 105.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Dryite_06), .drops = DRYITE_DROPS, .territory = { @@ -388,7 +388,7 @@ StaticNpc N(ThreeSisterNPCs)[] = { .id = NPC_ThreeSisters_01, .settings = &N(NpcSettings_Toad_Stationary), .pos = { -141.0f, 0.0f, -18.0f }, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ThreeSisters), .yaw = 62, .drops = TOADETTE_DROPS, @@ -399,7 +399,7 @@ StaticNpc N(ThreeSisterNPCs)[] = { .id = NPC_ThreeSisters_02, .settings = &N(NpcSettings_Toad_Stationary), .pos = { -124.0f, 0.0f, -61.0f }, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ThreeSisters), .yaw = 63, .drops = TOADETTE_DROPS, @@ -410,7 +410,7 @@ StaticNpc N(ThreeSisterNPCs)[] = { .id = NPC_ThreeSisters_03, .settings = &N(NpcSettings_Toad_Stationary), .pos = { -80.0f, 0.0f, -35.0f }, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ThreeSisters), .yaw = 244, .drops = TOADETTE_DROPS, diff --git a/src/world/area_dro/dro_02/dro_02_5_npc.c b/src/world/area_dro/dro_02/dro_02_5_npc.c index 2d67a71e8e..0ed6b46e57 100644 --- a/src/world/area_dro/dro_02/dro_02_5_npc.c +++ b/src/world/area_dro/dro_02/dro_02_5_npc.c @@ -33,7 +33,7 @@ NpcSettings N(NpcSettings_Archeologist_Wander) = { .radius = 24, .ai = &N(EVS_NpcAI_Archeologist), .level = 99, - .actionFlags = ENEMY_AI_FLAGS_10, + .actionFlags = ENEMY_AI_FLAG_10, }; NpcSettings N(NpcSettings_Archeologist) = { @@ -360,11 +360,11 @@ StaticNpc N(PassiveNPCs)[] = { .id = NPC_Archeologist, .settings = &N(NpcSettings_Archeologist), .pos = { -320.0f, 0.0f, -14.0f }, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Archeologist), .yaw = 90, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -393,7 +393,7 @@ StaticNpc N(PassiveNPCs)[] = { .id = NPC_Dryite_01, .settings = &N(NpcSettings_Dryite_Wander), .pos = { -20.0f, 0.0f, 40.0f }, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_MrE), .yaw = 270, .drops = DRYITE_DROPS, @@ -405,7 +405,7 @@ StaticNpc N(PassiveNPCs)[] = { .id = NPC_DisguisedMoustafa, .settings = &N(NpcSettings_Mouser), .pos = { 245.0f, 0.0f, -35.0f }, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_DisguisedMoustafa), .yaw = 90, .drops = MOUSER_DROPS, @@ -416,7 +416,7 @@ StaticNpc N(PassiveNPCs)[] = { .id = NPC_Toad, .settings = &N(NpcSettings_Toad_Stationary), .pos = { -143.0f, 0.0f, -170.0f }, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ToadHouseKeeper), .yaw = 180, .drops = TOAD_DROPS, @@ -427,11 +427,11 @@ StaticNpc N(PassiveNPCs)[] = { .id = NPC_Merlee, .settings = &N(NpcSettings_Merlee), .pos = { -130.0f, 0.0f, -400.0f }, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcAuxAI_Merlee), .yaw = 180, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -459,7 +459,7 @@ StaticNpc N(PassiveNPCs)[] = { .id = NPC_Moustafa, .settings = &N(NpcSettings_Mouser), .pos = { NPC_DISPOSE_LOCATION }, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Moustafa), .yaw = 0, .drops = MOUSER_DROPS, @@ -470,7 +470,7 @@ StaticNpc N(PassiveNPCs)[] = { .id = NPC_Dryite_02, .settings = &N(NpcSettings_Dryite), .pos = { 25.0f, 0.0f, -38.0f }, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Dryite_02), .yaw = 270, .drops = DRYITE_DROPS, @@ -481,7 +481,7 @@ StaticNpc N(PassiveNPCs)[] = { .id = NPC_Dryite_03, .settings = &N(NpcSettings_Dryite), .pos = { -375.0f, 0.0f, -10.0f }, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Dryite_03), .yaw = 270, .drops = DRYITE_DROPS, @@ -492,11 +492,11 @@ StaticNpc N(PassiveNPCs)[] = { .id = NPC_Mouser_01, .settings = &N(NpcSettings_Mouser), .pos = { -50.0f, 0.0f, -470.0f }, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Mouser_01), .yaw = 180, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -507,7 +507,7 @@ StaticNpc N(PassiveNPCs)[] = { .id = NPC_Mouser_02, .settings = &N(NpcSettings_Mouser), .pos = { -270.0f, 0.0f, 91.0f }, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Mouser_02), .yaw = 270, .drops = MOUSER_DROPS, @@ -518,7 +518,7 @@ StaticNpc N(PassiveNPCs)[] = { .id = NPC_Mouser_03, .settings = &N(NpcSettings_Mouser), .pos = { 210.0f, 0.0f, -35.0f }, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Mouser_03), .yaw = 90, .drops = MOUSER_DROPS, @@ -528,7 +528,7 @@ StaticNpc N(PassiveNPCs)[] = { .id = NPC_ChuckQuizmo, .settings = &N(NpcSettings_ChuckQuizmo), .pos = { -335.0f, 0.0f, 90.0f }, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_DRO, QUIZ_COUNT_DRO, QUIZ_MAP_DRO_02 } }, .yaw = 270, diff --git a/src/world/area_dro/dro_02/npc_merlee.c b/src/world/area_dro/dro_02/npc_merlee.c index 444f2928b4..05c1cbb026 100644 --- a/src/world/area_dro/dro_02/npc_merlee.c +++ b/src/world/area_dro/dro_02/npc_merlee.c @@ -551,7 +551,7 @@ void N(card_worker_update)(void) { sfx_play_sound(SOUND_206); for (j = 0; j < ARRAY_COUNT(N(D_8024EF90)); j++) { - N(D_8024EF90)[j]->flags |= EFFECT_INSTANCE_FLAGS_10; + N(D_8024EF90)[j]->flags |= EFFECT_INSTANCE_FLAG_10; } } break; diff --git a/src/world/area_flo/flo_00/flo_00_3_npc.c b/src/world/area_flo/flo_00/flo_00_3_npc.c index db3f9b1ca9..aa605a1644 100644 --- a/src/world/area_flo/flo_00/flo_00_3_npc.c +++ b/src/world/area_flo/flo_00/flo_00_3_npc.c @@ -623,7 +623,7 @@ StaticNpc N(NpcData_Wisterwood) = { .settings = &N(NpcSettings_Dummy), .pos = { -72.0f, 60.0f, -100.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_200 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Wisterwood), .drops = BUBULB_DROPS, .animations = BUBULB_PINK_ANIMS, @@ -635,7 +635,7 @@ StaticNpc N(NpcData_Bubulbs)[] = { .settings = &N(NpcSettings_Bubulb_Patrol), .pos = { -59.0f, 0.0f, -40.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Bubulb_01), .drops = BUBULB_DROPS, .territory = { @@ -660,7 +660,7 @@ StaticNpc N(NpcData_Bubulbs)[] = { .settings = &N(NpcSettings_Bubulb_Patrol), .pos = { 67.0f, 0.0f, 85.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Bubulb_02), .drops = BUBULB_DROPS, .territory = { @@ -685,7 +685,7 @@ StaticNpc N(NpcData_Bubulbs)[] = { .settings = &N(NpcSettings_Bubulb_Patrol), .pos = { 90.0f, 0.0f, 410.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Bubulb_03), .drops = BUBULB_DROPS, .territory = { @@ -710,7 +710,7 @@ StaticNpc N(NpcData_Bubulbs)[] = { .settings = &N(NpcSettings_Bubulb_Patrol), .pos = { 200.0f, 0.0f, 430.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Bubulb_04), .drops = BUBULB_DROPS, .territory = { @@ -737,7 +737,7 @@ StaticNpc N(NpcData_Tolielup) = { .settings = &N(NpcSettings_Tolielup), .pos = { -400.0f, 0.0f, 190.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Tolielup), .drops = TOLIELUP_DROPS, .animations = TOLIELUP_ANIMS, @@ -749,7 +749,7 @@ StaticNpc N(NpcData_Klevar) = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Klevar), .drops = KLEVAR_DROPS, .animations = KLEVAR_ANIMS, @@ -760,10 +760,10 @@ StaticNpc N(NpcData_Lakilulu) = { .settings = &N(NpcSettings_Dummy), .pos = { 198.0f, 0.0f, 363.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakilulu), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_flo/flo_00/flo_00_4_epilogue.c b/src/world/area_flo/flo_00/flo_00_4_epilogue.c index f994a53b12..a25b38c73a 100644 --- a/src/world/area_flo/flo_00/flo_00_4_epilogue.c +++ b/src/world/area_flo/flo_00/flo_00_4_epilogue.c @@ -86,10 +86,10 @@ StaticNpc N(NpcData_Lakilester_Epilogue)[] = { .settings = &N(NpcSettings_Lakilester_Epilogue), .pos = { 144.0f, 0.0f, 374.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakilester_Epilogue), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -117,10 +117,10 @@ StaticNpc N(NpcData_Lakilester_Epilogue)[] = { .settings = &N(NpcSettings_Lakilester_Epilogue), .pos = { 198.0f, 0.0f, 363.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakilulu_Epilogue), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -148,10 +148,10 @@ StaticNpc N(NpcData_Lakilester_Epilogue)[] = { .settings = &N(NpcSettings_Parakarry_Epilogue), .pos = { 266.0f, 0.0f, 322.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Parakarry_Epilogue), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_flo/flo_03/flo_03_3_npc.c b/src/world/area_flo/flo_03/flo_03_3_npc.c index 0ffbf594e2..61c32dcba3 100644 --- a/src/world/area_flo/flo_03/flo_03_3_npc.c +++ b/src/world/area_flo/flo_03/flo_03_3_npc.c @@ -232,11 +232,11 @@ EvtScript N(EVS_NpcInteract_Petunia) = { EVT_SET(LVar4, EVT_FLOAT(90.0)) EVT_EXEC_WAIT(N(EVS_FocusCamBetween)) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0057) - EVT_CALL(SetEnemyFlagBits, NPC_Dayzee, ENEMY_FLAGS_1, 0) - EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_01, ENEMY_FLAGS_1, 0) - EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_02, ENEMY_FLAGS_1, 0) - EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_03, ENEMY_FLAGS_1, 0) - EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_04, ENEMY_FLAGS_1, 0) + EVT_CALL(SetEnemyFlagBits, NPC_Dayzee, ENEMY_FLAG_1, 0) + EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_01, ENEMY_FLAG_1, 0) + EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_02, ENEMY_FLAG_1, 0) + EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_03, ENEMY_FLAG_1, 0) + EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_04, ENEMY_FLAG_1, 0) EVT_CALL(BindNpcAI, NPC_Dayzee, EVT_PTR(N(EVS_NpcAI_Dayzee))) EVT_SET(MV_PauseBurrowing, FALSE) EVT_SET(MV_NextBurrowTriggerRadius, 60) @@ -296,7 +296,7 @@ EvtScript N(EVS_NpcInit_Dayzee) = { EVT_CALL(SetNpcPos, NPC_Dayzee, NPC_DISPOSE_LOCATION) EVT_CASE_DEFAULT EVT_IF_EQ(GF_FLO03_Defeated_Dayzee, FALSE) - EVT_CALL(SetEnemyFlagBits, NPC_Dayzee, ENEMY_FLAGS_1, 0) + EVT_CALL(SetEnemyFlagBits, NPC_Dayzee, ENEMY_FLAG_1, 0) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcAI_Dayzee))) EVT_ELSE EVT_CALL(SetNpcPos, NPC_Dayzee, NPC_DISPOSE_LOCATION) @@ -403,7 +403,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_262, 0) EVT_CALL(ShowEmote, NPC_MontyMole_01, EMOTE_EXCLAMATION, 0, LVar1, TRUE, 0, 0, 0, 0) EVT_WAIT(LVar1) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_DIG, 0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim11) @@ -431,7 +431,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_SURFACE, 0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(10) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) EVT_CALL(RandInt, 30, LVar0) EVT_ADD(LVar0, 60) EVT_SET(MV_NextBurrowTime_Mole_01, LVar0) @@ -482,7 +482,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_262, 0) EVT_CALL(ShowEmote, NPC_MontyMole_02, EMOTE_EXCLAMATION, 0, LVar1, TRUE, 0, 0, 0, 0) EVT_WAIT(LVar1) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_BURROW_DIG, 0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim11) @@ -510,7 +510,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_BURROW_SURFACE, 0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(10) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) EVT_CALL(RandInt, 35, LVar0) EVT_ADD(LVar0, 55) EVT_SET(MV_NextBurrowTime_Mole_02, LVar0) @@ -561,7 +561,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_262, 0) EVT_CALL(ShowEmote, NPC_MontyMole_03, EMOTE_EXCLAMATION, 0, LVar1, TRUE, 0, 0, 0, 0) EVT_WAIT(LVar1) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_BURROW_DIG, 0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_03, ANIM_MontyMole_Dark_Anim11) @@ -589,7 +589,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_BURROW_SURFACE, 0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_03, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(10) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) EVT_CALL(RandInt, 40, LVar0) EVT_ADD(LVar0, 50) EVT_SET(MV_NextBurrowTime_Mole_03, LVar0) @@ -640,7 +640,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_262, 0) EVT_CALL(ShowEmote, NPC_MontyMole_04, EMOTE_EXCLAMATION, 0, LVar1, TRUE, 0, 0, 0, 0) EVT_WAIT(LVar1) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_BURROW_DIG, 0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim11) @@ -668,7 +668,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_BURROW_SURFACE, 0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(10) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) EVT_CALL(RandInt, 45, LVar0) EVT_ADD(LVar0, 45) EVT_SET(MV_NextBurrowTime_Mole_04, LVar0) @@ -696,7 +696,7 @@ EvtScript N(EVS_NpcInit_MontyMole_01) = { EVT_IF_EQ(GF_FLO03_Defeated_MontyMoleA, FALSE) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_MontyMole_01))) EVT_CALL(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim10) - EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_01, ENEMY_FLAGS_1, 0) + EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_01, ENEMY_FLAG_1, 0) EVT_ELSE EVT_CALL(SetNpcPos, NPC_MontyMole_01, NPC_DISPOSE_LOCATION) EVT_END_IF @@ -719,7 +719,7 @@ EvtScript N(EVS_NpcInit_MontyMole_02) = { EVT_IF_EQ(GF_FLO03_Defeated_MontyMoleB, FALSE) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_MontyMole_02))) EVT_CALL(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim10) - EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_02, ENEMY_FLAGS_1, 0) + EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_02, ENEMY_FLAG_1, 0) EVT_ELSE EVT_CALL(SetNpcPos, NPC_MontyMole_02, NPC_DISPOSE_LOCATION) EVT_END_IF @@ -742,7 +742,7 @@ EvtScript N(EVS_NpcInit_MontyMole_03) = { EVT_IF_EQ(GF_FLO03_Defeated_MontyMoleC, FALSE) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_MontyMole_03))) EVT_CALL(SetNpcAnimation, NPC_MontyMole_03, ANIM_MontyMole_Dark_Anim10) - EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_03, ENEMY_FLAGS_1, 0) + EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_03, ENEMY_FLAG_1, 0) EVT_ELSE EVT_CALL(SetNpcPos, NPC_MontyMole_03, NPC_DISPOSE_LOCATION) EVT_END_IF @@ -765,7 +765,7 @@ EvtScript N(EVS_NpcInit_MontyMole_04) = { EVT_IF_EQ(GF_FLO03_Defeated_MontyMoleD, FALSE) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_MontyMole_04))) EVT_CALL(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim10) - EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_04, ENEMY_FLAGS_1, 0) + EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_04, ENEMY_FLAG_1, 0) EVT_ELSE EVT_CALL(SetNpcPos, NPC_MontyMole_04, NPC_DISPOSE_LOCATION) EVT_END_IF @@ -781,10 +781,10 @@ StaticNpc N(NpcData_Petunia) = { .settings = &N(NpcSettings_Petunia), .pos = { -30.0f, 0.0f, 100.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Petunia), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -814,10 +814,10 @@ StaticNpc N(NpcData_Dayzee) = { .settings = &N(NpcSettings_Dayzee), .pos = { -233.0f, 0.0f, -217.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Dayzee), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -846,10 +846,10 @@ StaticNpc N(NpcData_MontyMole_01) = { .settings = &N(NpcSettings_Dayzee), .pos = { -100.0f, 0.0f, 210.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_MontyMole_01), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -878,10 +878,10 @@ StaticNpc N(NpcData_MontyMole_02) = { .settings = &N(NpcSettings_Dayzee), .pos = { -130.0f, 0.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_MontyMole_02), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -910,10 +910,10 @@ StaticNpc N(NpcData_MontyMole_03) = { .settings = &N(NpcSettings_Dayzee), .pos = { 75.0f, 0.0f, 20.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_MontyMole_03), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -942,10 +942,10 @@ StaticNpc N(NpcData_MontyMole_04) = { .settings = &N(NpcSettings_Dayzee), .pos = { 71.0f, 0.0f, 200.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_MontyMole_04), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_flo/flo_07/flo_07_3_npc.c b/src/world/area_flo/flo_07/flo_07_3_npc.c index 3f22057d2f..5ac5dabb1b 100644 --- a/src/world/area_flo/flo_07/flo_07_3_npc.c +++ b/src/world/area_flo/flo_07/flo_07_3_npc.c @@ -249,7 +249,7 @@ StaticNpc N(NpcData_Posie) = { .settings = &N(NpcSettings_Posie), .pos = { -260.0f, 0.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Posie), .drops = POSIE_DROPS, .animations = POSIE_ANIMS, diff --git a/src/world/area_flo/flo_08/flo_08_4_npc.c b/src/world/area_flo/flo_08/flo_08_4_npc.c index 81ad28ab04..3dbf2a7213 100644 --- a/src/world/area_flo/flo_08/flo_08_4_npc.c +++ b/src/world/area_flo/flo_08/flo_08_4_npc.c @@ -162,7 +162,7 @@ StaticNpc N(NpcData_GateFlower) = { .settings = &N(NpcSettings_GateFlower), .pos = { -695.0f, 0.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_GateFlower), .drops = GATE_FLOWER_DROPS, .animations = GATE_FLOWER_YELLOW_ANIMS, @@ -174,7 +174,7 @@ StaticNpc N(NpcData_Dayzee_01) = { .settings = &N(NpcSettings_CrazyDayzee), .pos = { 205.0f, 0.0f, -80.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { @@ -197,7 +197,7 @@ StaticNpc N(NpcData_Dayzee_02) = { .settings = &N(NpcSettings_CrazyDayzee), .pos = { 275.0f, 0.0f, -115.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { @@ -220,7 +220,7 @@ StaticNpc N(NpcData_Dayzee_03) = { .settings = &N(NpcSettings_CrazyDayzee), .pos = { -230.0f, 60.0f, -110.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { @@ -243,7 +243,7 @@ StaticNpc N(NpcData_Dayzee_04) = { .settings = &N(NpcSettings_CrazyDayzee), .pos = { -330.0f, 60.0f, -110.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { @@ -266,7 +266,7 @@ StaticNpc N(NpcData_Dayzee_05) = { .settings = &N(NpcSettings_CrazyDayzee), .pos = { -430.0f, 60.0f, -110.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { @@ -289,7 +289,7 @@ StaticNpc N(NpcData_Dayzee_06) = { .settings = &N(NpcSettings_CrazyDayzee), .pos = { -530.0f, 60.0f, -110.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { @@ -312,7 +312,7 @@ StaticNpc N(NpcData_Dayzee_07) = { .settings = &N(NpcSettings_CrazyDayzee), .pos = { -630.0f, 60.0f, -110.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { @@ -356,7 +356,7 @@ StaticNpc N(NpcData_AmazyDayzee) = { .settings = &N(NpcSettings_AmazyDayzee), .pos = { 240.0f, 0.0f, -90.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_AmazyDayzee), .drops = AMAZY_DAYZEE_DROPS, .territory = { diff --git a/src/world/area_flo/flo_09/flo_09_5_npc.c b/src/world/area_flo/flo_09/flo_09_5_npc.c index 031d4b377f..48490bb39d 100644 --- a/src/world/area_flo/flo_09/flo_09_5_npc.c +++ b/src/world/area_flo/flo_09/flo_09_5_npc.c @@ -63,7 +63,7 @@ StaticNpc N(NpcData_Dayzee_01) = { .settings = &N(NpcSettings_CrazyDayzee), .pos = { -350.0f, 0.0f, 40.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { @@ -86,7 +86,7 @@ StaticNpc N(NpcData_Dayzee_02) = { .settings = &N(NpcSettings_CrazyDayzee), .pos = { 260.0f, 0.0f, 75.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { @@ -109,7 +109,7 @@ StaticNpc N(NpcData_Bzzap_01) = { .settings = &N(NpcSettings_Bzzap), .pos = { -50.0f, 55.0f, 90.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BZZAP_DROPS, .territory = { .wander = { @@ -132,7 +132,7 @@ StaticNpc N(NpcData_Bzzap_02) = { .settings = &N(NpcSettings_Bzzap_02), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Bzzap_02), .drops = BZZAP_DROPS, .territory = { diff --git a/src/world/area_flo/flo_10/flo_10_5_npc.c b/src/world/area_flo/flo_10/flo_10_5_npc.c index 5f07173197..24bf3827e3 100644 --- a/src/world/area_flo/flo_10/flo_10_5_npc.c +++ b/src/world/area_flo/flo_10/flo_10_5_npc.c @@ -158,7 +158,7 @@ EvtScript N(EVS_NpcInteract_Lily) = { EVT_END_SWITCH EVT_WAIT(10) EVT_SET(GF_FLO10_LilyRequestedWaterStone, TRUE) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_400000, 0) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_400000, 0) EVT_ELSE EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Lily_TalkPlead, ANIM_Lily_IdlePlead, 5, MSG_CH6_007F) EVT_END_IF @@ -187,7 +187,7 @@ EvtScript N(EVS_NpcInit_Lily) = { EVT_IF_EQ(GF_FLO10_LilyRequestedWaterStone, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Lily_IdlePlead) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_400000, 1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_400000, 1) EVT_END_IF EVT_CASE_EQ(STORY_CH6_GOT_WATER_STONE) EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 1) @@ -203,7 +203,7 @@ StaticNpc N(NpcData_Lily) = { .settings = &N(NpcSettings_Lily), .pos = { 80.0f, -60.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lily), .drops = LILY_DROPS, .animations = LILY_ANIMS, diff --git a/src/world/area_flo/flo_11/flo_11_3_npc.c b/src/world/area_flo/flo_11/flo_11_3_npc.c index 4bdb76d6a7..1f32da6754 100644 --- a/src/world/area_flo/flo_11/flo_11_3_npc.c +++ b/src/world/area_flo/flo_11/flo_11_3_npc.c @@ -374,7 +374,7 @@ StaticNpc N(NpcData_Lakitus)[] = { .settings = &N(NpcSettings_Lakitu), .pos = { 553.0f, 60.0f, 52.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_Lakitu_01), .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, @@ -384,7 +384,7 @@ StaticNpc N(NpcData_Lakitus)[] = { .settings = &N(NpcSettings_Lakitu), .pos = { 553.0f, 60.0f, 52.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_Lakitu_02), .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, diff --git a/src/world/area_flo/flo_12/flo_12_3_npc.c b/src/world/area_flo/flo_12/flo_12_3_npc.c index c74a517944..1d223b41e4 100644 --- a/src/world/area_flo/flo_12/flo_12_3_npc.c +++ b/src/world/area_flo/flo_12/flo_12_3_npc.c @@ -194,7 +194,7 @@ StaticNpc N(NpcData_Rosie)[] = { .settings = &N(NpcSettings_Rosie), .pos = { -70.0f, 0.0f, 20.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Rosie), .drops = ROSIE_DROPS, .animations = ROSIE_ANIMS, @@ -205,7 +205,7 @@ StaticNpc N(NpcData_Rosie)[] = { .settings = &N(NpcSettings_Dummy), .pos = { -70.0f, 0.0f, 20.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_200, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_200, .drops = ROSIE_DROPS, .animations = ROSIE_ANIMS, }, diff --git a/src/world/area_flo/flo_13/flo_13_4_npc.c b/src/world/area_flo/flo_13/flo_13_4_npc.c index 010d315971..cf95be63a4 100644 --- a/src/world/area_flo/flo_13/flo_13_4_npc.c +++ b/src/world/area_flo/flo_13/flo_13_4_npc.c @@ -597,10 +597,10 @@ StaticNpc N(NpcData_Lakilester) = { .settings = &N(NpcSettings_Lakilester), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_Lakilester), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -629,10 +629,10 @@ StaticNpc N(NpcData_Lakilulu) = { .settings = &N(NpcSettings_Lakilester), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakilulu), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -662,10 +662,10 @@ StaticNpc N(NpcData_Lakilulu_Spiny) = { .settings = &N(NpcSettings_Lakilester), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakilulu_Spiny), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -694,7 +694,7 @@ StaticNpc N(NpcData_Lakitu_01) = { .settings = &N(NpcSettings_Lakitu_SpinySpawner), .pos = { 335.0f, 90.0f, 45.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakitu), .drops = LAKITU_DROPS, .territory = { @@ -718,7 +718,7 @@ StaticNpc N(NpcData_Lakitu_02) = { .settings = &N(NpcSettings_Lakitu_SpinySpawner), .pos = { -320.0f, 90.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakitu), .drops = LAKITU_DROPS, .territory = { @@ -742,7 +742,7 @@ StaticNpc N(NpcData_Spiny_01) = { .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Spiny), .drops = SPINY_DROPS, .territory = { @@ -766,7 +766,7 @@ StaticNpc N(NpcData_Spiny_02) = { .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Spiny), .drops = SPINY_DROPS, .territory = { @@ -790,7 +790,7 @@ StaticNpc N(NpcData_Spiny_03) = { .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Spiny), .drops = SPINY_DROPS, .territory = { @@ -814,7 +814,7 @@ StaticNpc N(NpcData_Spiny_04) = { .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Spiny), .drops = SPINY_DROPS, .territory = { @@ -838,7 +838,7 @@ StaticNpc N(NpcData_Spiny_05) = { .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Spiny), .drops = SPINY_DROPS, .territory = { @@ -862,7 +862,7 @@ StaticNpc N(NpcData_Spiny_06) = { .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Spiny), .drops = SPINY_DROPS, .territory = { diff --git a/src/world/area_flo/flo_14/flo_14_4_npc.c b/src/world/area_flo/flo_14/flo_14_4_npc.c index 2d00f01cae..c88396abb0 100644 --- a/src/world/area_flo/flo_14/flo_14_4_npc.c +++ b/src/world/area_flo/flo_14/flo_14_4_npc.c @@ -83,7 +83,7 @@ StaticNpc N(NpcData_BubbleFlower) = { .settings = &N(NpcSettings_BubbleFlower), .pos = { 617.0f, 0.0f, 108.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_4000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000, .init = &N(EVS_NpcInit_BubbleFlower), .drops = BUBULB_DROPS, .animations = BUBULB_PINK_ANIMS, @@ -95,7 +95,7 @@ StaticNpc N(NpcData_Bzzap) = { .settings = &N(NpcSettings_Bzzap), .pos = { -175.0f, 55.0f, 15.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = BZZAP_DROPS, .territory = { .wander = { diff --git a/src/world/area_flo/flo_15/flo_15_3_npc.c b/src/world/area_flo/flo_15/flo_15_3_npc.c index ee217c4c61..0e4f94989f 100644 --- a/src/world/area_flo/flo_15/flo_15_3_npc.c +++ b/src/world/area_flo/flo_15/flo_15_3_npc.c @@ -203,7 +203,7 @@ StaticNpc N(NpcData_Sun)[] = { .settings = &N(NpcSettings_Sun), .pos = { 0.0f, 250.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Sun_01), .drops = SUN_DROPS, .animations = SUN_ANIMS, @@ -214,7 +214,7 @@ StaticNpc N(NpcData_Sun)[] = { .settings = &N(NpcSettings_Sun), .pos = { 0.0f, 250.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_8000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_8000, .init = &N(EVS_NpcInit_Sun_02), .drops = SUN_DROPS, .animations = SUN_ANIMS, diff --git a/src/world/area_flo/flo_16/flo_16_5_npc.c b/src/world/area_flo/flo_16/flo_16_5_npc.c index 3cc18ed5b0..aeb7ce2cc9 100644 --- a/src/world/area_flo/flo_16/flo_16_5_npc.c +++ b/src/world/area_flo/flo_16/flo_16_5_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_TuffPuff_01) = { .settings = &N(NpcSettings_TuffPuff), .pos = { 440.0f, 145.0f, 15.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = TUFF_PUFF_DROPS, .territory = { .wander = { @@ -31,7 +31,7 @@ StaticNpc N(NpcData_TuffPuff_02) = { .settings = &N(NpcSettings_TuffPuff), .pos = { 600.0f, 145.0f, 15.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = TUFF_PUFF_DROPS, .territory = { .wander = { diff --git a/src/world/area_flo/flo_17/flo_17_4_npc.c b/src/world/area_flo/flo_17/flo_17_4_npc.c index 228e34caab..be47dcbbf8 100644 --- a/src/world/area_flo/flo_17/flo_17_4_npc.c +++ b/src/world/area_flo/flo_17/flo_17_4_npc.c @@ -11,7 +11,7 @@ StaticNpc N(NpcData_Lakitu_01) = { .settings = &N(NpcSettings_Lakitu_SpinySpawner), .pos = { -185.0f, 90.0f, 10.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = LAKITU_DROPS, .territory = { .wander = { @@ -34,7 +34,7 @@ StaticNpc N(NpcData_Lakitu_02) = { .settings = &N(NpcSettings_Lakitu_SpinySpawner), .pos = { 200.0f, 90.0f, -25.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = LAKITU_DROPS, .territory = { .wander = { @@ -57,7 +57,7 @@ StaticNpc N(NpcData_Spiny_01) = { .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = SPINY_DROPS, .territory = { .wander = { @@ -80,7 +80,7 @@ StaticNpc N(NpcData_Spiny_02) = { .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = SPINY_DROPS, .territory = { .wander = { @@ -103,7 +103,7 @@ StaticNpc N(NpcData_Spiny_03) = { .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = SPINY_DROPS, .territory = { .wander = { @@ -126,7 +126,7 @@ StaticNpc N(NpcData_Spiny_04) = { .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = SPINY_DROPS, .territory = { .wander = { diff --git a/src/world/area_flo/flo_18/flo_18_4_npc.c b/src/world/area_flo/flo_18/flo_18_4_npc.c index 1fc2e4c883..5c536035e3 100644 --- a/src/world/area_flo/flo_18/flo_18_4_npc.c +++ b/src/world/area_flo/flo_18/flo_18_4_npc.c @@ -603,7 +603,7 @@ StaticNpc N(NpcData_MachineGang)[] = { .settings = &N(NpcSettings_Lakitu), .pos = { 0.0f, 15.0f, 60.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Lakitu_01), .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, @@ -614,7 +614,7 @@ StaticNpc N(NpcData_MachineGang)[] = { .settings = &N(NpcSettings_Lakitu), .pos = { 65.0f, 15.0f, 60.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Lakitu_02), .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, @@ -625,7 +625,7 @@ StaticNpc N(NpcData_MachineGang)[] = { .settings = &N(NpcSettings_Lakitu), .pos = { 135.0f, 15.0f, 35.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Lakitu_03), .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, @@ -636,7 +636,7 @@ StaticNpc N(NpcData_MachineGang)[] = { .settings = &N(NpcSettings_Magikoopa), .pos = { -60.0f, 0.0f, 50.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Magikoopa), .drops = MAGIKOOPA_DROPS, .animations = MAGIKOOPA_YELLOW_ANIMS, @@ -647,7 +647,7 @@ StaticNpc N(NpcData_MachineGang)[] = { .settings = &N(NpcSettings_Magikoopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_FlyingMagikoopa), .drops = MAGIKOOPA_DROPS, .animations = FLYING_MAGIKOOPA_YELLOW_ANIMS, diff --git a/src/world/area_flo/flo_21/flo_21_4_npc.c b/src/world/area_flo/flo_21/flo_21_4_npc.c index ecbbde0b3d..19a3a221ab 100644 --- a/src/world/area_flo/flo_21/flo_21_4_npc.c +++ b/src/world/area_flo/flo_21/flo_21_4_npc.c @@ -525,7 +525,7 @@ EvtScript N(EVS_NpcDefeat_HuffNPuff_Main) = { EVT_CALL(GetBattleOutcome, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(OUTCOME_PLAYER_WON) - EVT_CALL(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAGS_1, TRUE) + EVT_CALL(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_1, TRUE) EVT_CALL(SetNpcYaw, NPC_PARTNER, 90) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar3) EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) @@ -547,7 +547,7 @@ EvtScript N(EVS_NpcDefeat_HuffNPuff_Aux) = { EvtScript N(EVS_NpcInit_HuffNPuff_Face) = { EVT_IF_LT(GB_StoryProgress, STORY_CH6_DEFEATED_HUFF_N_PUFF) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_400000, 1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_400000, 1) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_HuffNPuff_01))) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_HuffNPuff_Main))) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HuffNPuff_Anim02) @@ -560,7 +560,7 @@ EvtScript N(EVS_NpcInit_HuffNPuff_Face) = { EvtScript N(EVS_NpcInit_HuffNPuff_Body) = { EVT_IF_LT(GB_StoryProgress, STORY_CH6_DEFEATED_HUFF_N_PUFF) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_400000, 1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_400000, 1) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_HuffNPuff_Aux))) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HuffNPuff_Anim01) EVT_EXEC(N(EVS_HuffNPuff_AnimateBodyScale)) @@ -573,7 +573,7 @@ EvtScript N(EVS_NpcInit_HuffNPuff_Body) = { EvtScript N(EVS_NpcInit_HuffNPuff_Arms) = { EVT_IF_LT(GB_StoryProgress, STORY_CH6_DEFEATED_HUFF_N_PUFF) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_400000, 1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_400000, 1) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_HuffNPuff_Aux))) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HuffNPuff_Anim19) EVT_ELSE @@ -608,7 +608,7 @@ StaticNpc N(NpcData_HuffNPuff)[] = { .settings = &N(NpcSettings_HuffNPuff), .pos = { 650.0f, NPC_DISPOSE_POS_Y, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_HuffNPuff_Face), .drops = HUFF_N_PUFF_NO_DROPS, .animations = HUFF_N_PUFF_ANIMS, @@ -619,7 +619,7 @@ StaticNpc N(NpcData_HuffNPuff)[] = { .settings = &N(NpcSettings_HuffNPuff), .pos = { 650.0f, 100.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_HuffNPuff_Body), .drops = HUFF_N_PUFF_NO_DROPS, .animations = HUFF_N_PUFF_ANIMS, @@ -630,7 +630,7 @@ StaticNpc N(NpcData_HuffNPuff)[] = { .settings = &N(NpcSettings_HuffNPuff), .pos = { 650.0f, NPC_DISPOSE_POS_Y, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_HuffNPuff_Arms), .drops = HUFF_N_PUFF_NO_DROPS, .animations = HUFF_N_PUFF_ANIMS, @@ -649,7 +649,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = { .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), .drops = TUFF_PUFF_NO_DROPS, .animations = TUFF_PUFF_ANIMS, @@ -660,7 +660,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = { .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), .drops = TUFF_PUFF_NO_DROPS, .animations = TUFF_PUFF_ANIMS, @@ -671,7 +671,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = { .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), .drops = TUFF_PUFF_NO_DROPS, .animations = TUFF_PUFF_ANIMS, @@ -682,7 +682,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = { .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), .drops = TUFF_PUFF_NO_DROPS, .animations = TUFF_PUFF_ANIMS, @@ -693,7 +693,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = { .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), .drops = TUFF_PUFF_NO_DROPS, .animations = TUFF_PUFF_ANIMS, @@ -704,7 +704,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = { .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), .drops = TUFF_PUFF_NO_DROPS, .animations = TUFF_PUFF_ANIMS, @@ -715,7 +715,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = { .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), .drops = TUFF_PUFF_NO_DROPS, .animations = TUFF_PUFF_ANIMS, @@ -726,7 +726,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = { .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), .drops = TUFF_PUFF_NO_DROPS, .animations = TUFF_PUFF_ANIMS, @@ -737,7 +737,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = { .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), .drops = TUFF_PUFF_NO_DROPS, .animations = TUFF_PUFF_ANIMS, @@ -748,7 +748,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = { .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), .drops = TUFF_PUFF_NO_DROPS, .animations = TUFF_PUFF_ANIMS, @@ -759,7 +759,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = { .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), .drops = TUFF_PUFF_NO_DROPS, .animations = TUFF_PUFF_ANIMS, @@ -770,7 +770,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = { .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), .drops = TUFF_PUFF_NO_DROPS, .animations = TUFF_PUFF_ANIMS, @@ -781,7 +781,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = { .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), .drops = TUFF_PUFF_NO_DROPS, .animations = TUFF_PUFF_ANIMS, @@ -792,7 +792,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = { .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), .drops = TUFF_PUFF_NO_DROPS, .animations = TUFF_PUFF_ANIMS, @@ -803,7 +803,7 @@ StaticNpc N(NpcData_TuffPuffs)[] = { .settings = &N(NpcSettings_TuffPuff), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff), .drops = TUFF_PUFF_NO_DROPS, .animations = TUFF_PUFF_ANIMS, diff --git a/src/world/area_flo/flo_22/flo_22_3_npc.c b/src/world/area_flo/flo_22/flo_22_3_npc.c index e433bc5e57..2fab050769 100644 --- a/src/world/area_flo/flo_22/flo_22_3_npc.c +++ b/src/world/area_flo/flo_22/flo_22_3_npc.c @@ -108,7 +108,7 @@ StaticNpc N(NpcData_Bzzap) = { .settings = &N(NpcSettings_Dummy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bzzap), .drops = BZZAP_NO_DROPS, .animations = BZZAP_ANIMS, @@ -119,7 +119,7 @@ StaticNpc N(NpcData_Dayzee) = { .settings = &N(NpcSettings_Dummy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Dayzee), .drops = CRAZY_DAYZEE_DROPS, .animations = CRAZY_DAYZEE_ANIMS, diff --git a/src/world/area_flo/flo_23/flo_23_3_npc.c b/src/world/area_flo/flo_23/flo_23_3_npc.c index 8248ce6a1e..03fa9a9a7e 100644 --- a/src/world/area_flo/flo_23/flo_23_3_npc.c +++ b/src/world/area_flo/flo_23/flo_23_3_npc.c @@ -162,7 +162,7 @@ StaticNpc N(NpcData_GateFlower) = { .settings = &N(NpcSettings_GateFlower), .pos = { 385.0f, 0.0f, -35.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_GateFlower), .drops = GATE_FLOWER_DROPS, .animations = GATE_FLOWER_BLUE_ANIMS, @@ -174,7 +174,7 @@ StaticNpc N(NpcData_Spiny_01) = { .settings = &N(NpcSettings_Spiny), .pos = { 80.0f, 0.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = SPINY_DROPS, .territory = { .wander = { @@ -196,7 +196,7 @@ StaticNpc N(NpcData_Spiny_02) = { .settings = &N(NpcSettings_Spiny), .pos = { -320.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = SPINY_DROPS, .territory = { .wander = { diff --git a/src/world/area_flo/flo_24/flo_24_2_main.c b/src/world/area_flo/flo_24/flo_24_2_main.c index da7a95814b..be8832e799 100644 --- a/src/world/area_flo/flo_24/flo_24_2_main.c +++ b/src/world/area_flo/flo_24/flo_24_2_main.c @@ -31,9 +31,9 @@ EvtScript N(EVS_Main) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o177, SURFACE_TYPE_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o178, SURFACE_TYPE_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o179, SURFACE_TYPE_DOCK_WALL) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o177, COLLIDER_FLAGS_80000) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o178, COLLIDER_FLAGS_80000) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o179, COLLIDER_FLAGS_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o177, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o178, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o179, COLLIDER_FLAG_80000) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o176, SURFACE_TYPE_WATER) EVT_FLOWER_SPAWN_REGION( -480, -350, -65, -260, 0) EVT_FLOWER_SPAWN_REGION( 100, -350, 480, -260, 0) diff --git a/src/world/area_flo/flo_25/flo_25_3_npc.c b/src/world/area_flo/flo_25/flo_25_3_npc.c index 3123b6ae0c..5f3b7c51f9 100644 --- a/src/world/area_flo/flo_25/flo_25_3_npc.c +++ b/src/world/area_flo/flo_25/flo_25_3_npc.c @@ -162,7 +162,7 @@ StaticNpc N(NpcData_GateFlower) = { .settings = &N(NpcSettings_GateFlower), .pos = { 505.0f, 0.0f, -25.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_GateFlower), .drops = GATE_FLOWER_DROPS, .animations = GATE_FLOWER_RED_ANIMS, @@ -174,7 +174,7 @@ StaticNpc N(NpcData_TuffPuff) = { .settings = &N(NpcSettings_TuffPuff), .pos = { -200.0f, 45.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = TUFF_PUFF_DROPS, .territory = { .wander = { @@ -197,7 +197,7 @@ StaticNpc N(NpcData_Bzzap) = { .settings = &N(NpcSettings_Bzzap), .pos = { 150.0f, 55.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = BZZAP_DROPS, .territory = { .wander = { diff --git a/src/world/area_gv/gv_01/gv_01_1_main.c b/src/world/area_gv/gv_01/gv_01_1_main.c index d238680d56..801f17f913 100644 --- a/src/world/area_gv/gv_01/gv_01_1_main.c +++ b/src/world/area_gv/gv_01/gv_01_1_main.c @@ -57,7 +57,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcPos, NPC_PARTNER, NPC_DISPOSE_LOCATION) EVT_END_IF - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_NO_FLIPPING, TRUE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, TRUE) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_WAIT(2) EVT_CALL(RandInt, 4, LVar0) diff --git a/src/world/area_hos/hos_05/A2AAC0.c b/src/world/area_hos/hos_05/A2AAC0.c index 84d18460cd..6afa7678d3 100644 --- a/src/world/area_hos/hos_05/A2AAC0.c +++ b/src/world/area_hos/hos_05/A2AAC0.c @@ -365,7 +365,7 @@ ApiStatus func_802416BC_A2B8FC(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[gCurrentCameraID]; if (isInitialCall) { - camera->flags |= CAMERA_FLAGS_SHAKING; + camera->flags |= CAMERA_FLAG_SHAKING; } guTranslateF(camera->viewMtxShaking, D_80249904_A33B44 * sin_deg(D_80249900_A33B40 * 486), @@ -376,7 +376,7 @@ ApiStatus func_802416BC_A2B8FC(Evt* script, s32 isInitialCall) { D_80249904_A33B44 += (12.0f - D_80249904_A33B44) * 0.2; if (D_80249900_A33B40 > 20) { guTranslateF(camera->viewMtxShaking, 0.0f, 0.0f, 0.0f); - camera->flags &= ~CAMERA_FLAGS_SHAKING; + camera->flags &= ~CAMERA_FLAG_SHAKING; return ApiStatus_DONE1; } return ApiStatus_BLOCK; @@ -388,7 +388,7 @@ ApiStatus func_80241850_A2BA90(Evt* script, s32 isInitialCall) { f32 x, y; if (isInitialCall) { - camera->flags |= CAMERA_FLAGS_SHAKING; + camera->flags |= CAMERA_FLAG_SHAKING; } x = D_8024990C_A33B4C * sin_deg(D_80249908_A33B48 * 486); y = D_8024990C_A33B4C * cos_deg(D_80249908_A33B48 * 254); @@ -482,7 +482,7 @@ ApiStatus func_80241D08_A2BF48(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[gCurrentCameraID]; if (isInitialCall) { - camera->flags &= ~CAMERA_FLAGS_SHAKING; + camera->flags &= ~CAMERA_FLAG_SHAKING; } guTranslateF(camera->viewMtxShaking, 0.0f, 0.0f, 0.0f); return ApiStatus_DONE2; @@ -922,7 +922,7 @@ ApiStatus func_802440D0_A2E310(Evt* script, s32 isInitialCall) { D_8024AA20_A34C60->unk_3C = 0; D_8024AA20_A34C60->unk_3E = 0; } - gCameras[CAM_DEFAULT].flags &= ~CAMERA_FLAGS_ENABLED; + gCameras[CAM_DEFAULT].flags &= ~CAMERA_FLAG_ENABLED; D_8024AAB0_A34CF0++; } } diff --git a/src/world/area_isk/isk_01/isk_01_3_haze.c b/src/world/area_isk/isk_01/isk_01_3_haze.c index 3a543e0f81..1c37c93a3a 100644 --- a/src/world/area_isk/isk_01/isk_01_3_haze.c +++ b/src/world/area_isk/isk_01/isk_01_3_haze.c @@ -10,7 +10,7 @@ EvtScript N(EVS_SetupHaze) = { EVT_CALL(EnableTexPanning, MODEL_o99, TRUE) EVT_SET(LVar0, 0) EVT_CALL(SetCustomGfx, 0, EVT_PTR(N(HazePreGfx)), NULL) - EVT_CALL(SetModelFlags, MODEL_o99, MODEL_FLAGS_USES_CUSTOM_GFX, TRUE) + EVT_CALL(SetModelFlags, MODEL_o99, MODEL_FLAG_USES_CUSTOM_GFX, TRUE) EVT_LABEL(0) EVT_ADD(LVar0, 70) EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, LVar0, 0) diff --git a/src/world/area_isk/isk_02/isk_02_2_lock.c b/src/world/area_isk/isk_02/isk_02_2_lock.c index 3e1a22e97f..0ae20a1590 100644 --- a/src/world/area_isk/isk_02/isk_02_2_lock.c +++ b/src/world/area_isk/isk_02/isk_02_2_lock.c @@ -47,7 +47,7 @@ EvtScript N(EVS_SetupLock) = { EVT_BIND_PADLOCK(EVT_PTR(N(EVS_UnlockDoor)), TRIGGER_WALL_PRESS_A, EVT_ENTITY_INDEX(0), EVT_PTR(N(KeyList)), 0, 1) EVT_ELSE EVT_CALL(EnableGroup, MODEL_g304, FALSE) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittne, COLLIDER_FLAGS_SURFACE_TYPE_MASK | COLLIDER_FLAGS_SAFE_FLOOR | COLLIDER_FLAGS_IGNORE_SHELL | COLLIDER_FLAGS_IGNORE_PLAYER | COLLIDER_FLAGS_80000 | 0x7FF47E00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittne, COLLIDER_FLAGS_SURFACE_TYPE_MASK | COLLIDER_FLAG_SAFE_FLOOR | COLLIDER_FLAG_IGNORE_SHELL | COLLIDER_FLAG_IGNORE_PLAYER | COLLIDER_FLAG_80000 | 0x7FF47E00) EVT_END_IF EVT_RETURN EVT_END diff --git a/src/world/area_isk/isk_02/isk_02_5_npc.c b/src/world/area_isk/isk_02/isk_02_5_npc.c index 5fe1d3a7a1..7164afd1dc 100644 --- a/src/world/area_isk/isk_02/isk_02_5_npc.c +++ b/src/world/area_isk/isk_02/isk_02_5_npc.c @@ -3,7 +3,7 @@ #include "world/common/enemy/complete/PokeyMummy.inc.c" EvtScript N(EVS_NpcIdle_Pokey_01) = { - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) EVT_LABEL(1) EVT_IF_EQ(AF_ISK02_OpeningSarcophagus1, FALSE) @@ -12,17 +12,17 @@ EvtScript N(EVS_NpcIdle_Pokey_01) = { EVT_END_IF EVT_WAIT(15) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) EVT_CALL(NpcMoveTo, NPC_SELF, -315, 455, 10) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, FALSE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_40000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_PokeyMummy))) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcIdle_Pokey_02) = { - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) EVT_LABEL(1) EVT_IF_EQ(AF_ISK02_OpeningSarcophagus2, FALSE) @@ -31,17 +31,17 @@ EvtScript N(EVS_NpcIdle_Pokey_02) = { EVT_END_IF EVT_WAIT(15) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) EVT_CALL(NpcMoveTo, NPC_SELF, -145, 535, 10) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, FALSE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_40000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_PokeyMummy))) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcIdle_Pokey_03) = { - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) EVT_LABEL(1) EVT_IF_EQ(AF_ISK02_OpeningSarcophagus3, FALSE) @@ -50,10 +50,10 @@ EvtScript N(EVS_NpcIdle_Pokey_03) = { EVT_END_IF EVT_WAIT(15) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) EVT_CALL(NpcMoveTo, NPC_SELF, 50, 550, 10) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, FALSE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_40000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_PokeyMummy))) EVT_RETURN EVT_END @@ -85,7 +85,7 @@ StaticNpc N(NpcData_Pokey_01) = { .settings = &N(NpcSettings_PokeyMummy), .pos = { -296.0f, 0.0f, 421.0f }, .yaw = 304, - .flags = ENEMY_FLAGS_200 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Pokey_01), .drops = POKEY_MUMMY_DROPS, .territory = { @@ -108,7 +108,7 @@ StaticNpc N(NpcData_Pokey_02) = { .settings = &N(NpcSettings_PokeyMummy), .pos = { -133.0f, 0.0f, 497.0f }, .yaw = 284, - .flags = ENEMY_FLAGS_200 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Pokey_02), .drops = POKEY_MUMMY_DROPS, .territory = { @@ -131,7 +131,7 @@ StaticNpc N(NpcData_Pokey_03) = { .settings = &N(NpcSettings_PokeyMummy), .pos = { 45.0f, 0.0f, 505.0f }, .yaw = 264, - .flags = ENEMY_FLAGS_200 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Pokey_03), .drops = POKEY_MUMMY_DROPS, .territory = { diff --git a/src/world/area_isk/isk_04/isk_04_5_npc.c b/src/world/area_isk/isk_04/isk_04_5_npc.c index ebbd93556d..c6ad25ee5f 100644 --- a/src/world/area_isk/isk_04/isk_04_5_npc.c +++ b/src/world/area_isk/isk_04/isk_04_5_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_BuzzyBeetle_01) = { .settings = &N(NpcSettings_BuzzyBeetle), .pos = { 561.0f, 25.0f, 47.0f }, .yaw = 355, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = ISK_BUZZY_BEETLE_DROPS, .territory = { .wander = { @@ -29,7 +29,7 @@ StaticNpc N(NpcData_BuzzyBeetle_02) = { .settings = &N(NpcSettings_BuzzyBeetle), .pos = { 608.0f, -260.0f, -158.0f }, .yaw = 175, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = ISK_BUZZY_BEETLE_DROPS, .territory = { .wander = { diff --git a/src/world/area_isk/isk_05/isk_05_3_npc.c b/src/world/area_isk/isk_05/isk_05_3_npc.c index 6460bd113d..561e1237eb 100644 --- a/src/world/area_isk/isk_05/isk_05_3_npc.c +++ b/src/world/area_isk/isk_05/isk_05_3_npc.c @@ -27,7 +27,7 @@ void N(func_80241610_97F0E0)(void) { Matrix4f transformMtx, tempMtx; gSPViewport(gMasterGfxPos++, &cam->vp); - if (!(cam->flags & CAMERA_FLAGS_ORTHO)) { + if (!(cam->flags & CAMERA_FLAG_ORTHO)) { gSPPerspNormalize(gMasterGfxPos++, cam->perspNorm); } guMtxF2L(cam->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCameraID]); @@ -155,14 +155,14 @@ API_CALLABLE(N(func_80241E24_97F8F4)) { } EvtScript N(EVS_NpcIdle_StoneChomp) = { - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_20, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_20, 1) EVT_LABEL(100) EVT_IF_EQ(GF_ISK05_Hammer2Block, FALSE) EVT_WAIT(1) EVT_GOTO(100) EVT_END_IF EVT_CALL(PlaySound, SOUND_A) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_20, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_20, 0) EVT_THREAD EVT_WAIT(5) EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_266, 0) @@ -272,7 +272,7 @@ StaticNpc N(NpcData_StoneChomp) = { .settings = &N(NpcSettings_StoneChomp), .pos = { 385.0f, 71.0f, -330.0f }, .yaw = 320, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_StoneChomp), .initVarCount = 1, .initVar = { .value = 0 }, diff --git a/src/world/area_isk/isk_07/isk_07_3_npc.c b/src/world/area_isk/isk_07/isk_07_3_npc.c index aac20de490..236ccd5121 100644 --- a/src/world/area_isk/isk_07/isk_07_3_npc.c +++ b/src/world/area_isk/isk_07/isk_07_3_npc.c @@ -71,7 +71,7 @@ EvtScript N(EVS_NpcDefeat_Pokey_01) = { EVT_CASE_EQ(OUTCOME_PLAYER_FLED) EVT_CALL(OnPlayerFled, 0) EVT_CASE_EQ(OUTCOME_ENEMY_FLED) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_SWITCH EVT_RETURN @@ -79,7 +79,7 @@ EvtScript N(EVS_NpcDefeat_Pokey_01) = { }; EvtScript N(EVS_NpcIdle_Pokey_01) = { - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) EVT_LABEL(1) EVT_IF_EQ(AF_ISK07_MummiesReleased, FALSE) @@ -89,17 +89,17 @@ EvtScript N(EVS_NpcIdle_Pokey_01) = { EVT_CALL(SetNpcYaw, NPC_SELF, 105) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) EVT_CALL(NpcMoveTo, NPC_SELF, -140, 528, 10) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, FALSE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_40000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_PokeyMummy))) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcIdle_Pokey_02) = { - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) EVT_LABEL(1) EVT_IF_EQ(AF_ISK07_MummiesReleased, FALSE) @@ -109,17 +109,17 @@ EvtScript N(EVS_NpcIdle_Pokey_02) = { EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) EVT_WAIT(15) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) EVT_CALL(NpcMoveTo, NPC_SELF, 47, 543, 10) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, FALSE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_40000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_PokeyMummy))) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcIdle_Pokey_03) = { - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) EVT_LABEL(1) EVT_IF_EQ(AF_ISK07_MummiesReleased, FALSE) @@ -129,10 +129,10 @@ EvtScript N(EVS_NpcIdle_Pokey_03) = { EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) EVT_WAIT(15) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) EVT_CALL(NpcMoveTo, NPC_SELF, 227, 489, 10) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, FALSE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_40000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_PokeyMummy))) EVT_RETURN EVT_END @@ -140,7 +140,7 @@ EvtScript N(EVS_NpcIdle_Pokey_03) = { EvtScript N(EVS_NpcInit_Pokey_01) = { EVT_IF_EQ(GF_ISK07_Defeated_Mummies, FALSE) - EVT_CALL(SetSelfEnemyFlags, ENEMY_FLAGS_800000) + EVT_CALL(SetSelfEnemyFlags, ENEMY_FLAG_800000) EVT_END_IF EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Pokey_01))) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Pokey_01))) @@ -152,7 +152,7 @@ EvtScript N(EVS_NpcInit_Pokey_01) = { EvtScript N(EVS_NpcInit_Pokey_02) = { EVT_IF_EQ(GF_ISK07_Defeated_Mummies, FALSE) - EVT_CALL(SetSelfEnemyFlags, ENEMY_FLAGS_800000) + EVT_CALL(SetSelfEnemyFlags, ENEMY_FLAG_800000) EVT_END_IF EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Pokey_02))) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Pokey_01))) @@ -163,7 +163,7 @@ EvtScript N(EVS_NpcInit_Pokey_02) = { EvtScript N(EVS_NpcInit_Pokey_03) = { EVT_IF_EQ(GF_ISK07_Defeated_Mummies, FALSE) - EVT_CALL(SetSelfEnemyFlags, ENEMY_FLAGS_800000) + EVT_CALL(SetSelfEnemyFlags, ENEMY_FLAG_800000) EVT_END_IF EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Pokey_03))) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Pokey_01))) @@ -177,7 +177,7 @@ StaticNpc N(NpcData_Pokey_01) = { .settings = &N(NpcSettings_PokeyMummy), .pos = { -132.0f, -390.0f, 492.0f }, .yaw = 304, - .flags = ENEMY_FLAGS_200 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Pokey_01), .drops = POKEY_MUMMY_DROPS, .territory = { @@ -200,7 +200,7 @@ StaticNpc N(NpcData_Pokey_02) = { .settings = &N(NpcSettings_PokeyMummy), .pos = { 45.0f, -390.0f, 507.0f }, .yaw = 263, - .flags = ENEMY_FLAGS_200 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Pokey_02), .drops = POKEY_MUMMY_DROPS, .territory = { @@ -223,7 +223,7 @@ StaticNpc N(NpcData_Pokey_03) = { .settings = &N(NpcSettings_PokeyMummy), .pos = { 220.0f, -389.0f, 467.0f }, .yaw = 244, - .flags = ENEMY_FLAGS_200 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Pokey_03), .drops = POKEY_MUMMY_DROPS, .territory = { diff --git a/src/world/area_isk/isk_08/isk_08_2_npc.c b/src/world/area_isk/isk_08/isk_08_2_npc.c index 614737f086..f7ad8c5c5e 100644 --- a/src/world/area_isk/isk_08/isk_08_2_npc.c +++ b/src/world/area_isk/isk_08/isk_08_2_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_BuzzyBeetle) = { .settings = &N(NpcSettings_BuzzyBeetle), .pos = { -415.0f, -520.0f, 355.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = ISK_BUZZY_BEETLE_DROPS, .territory = { .wander = { diff --git a/src/world/area_isk/isk_11/isk_11_6_lock.c b/src/world/area_isk/isk_11/isk_11_6_lock.c index 518d1f9bba..a973448965 100644 --- a/src/world/area_isk/isk_11/isk_11_6_lock.c +++ b/src/world/area_isk/isk_11/isk_11_6_lock.c @@ -47,7 +47,7 @@ EvtScript N(EVS_SetupLock) = { EVT_BIND_PADLOCK(EVT_PTR(N(EVS_UnlockPrompt_RuinsKey)), TRIGGER_WALL_PRESS_A, EVT_ENTITY_INDEX(0), EVT_PTR(N(ItemList_RuinsKey)), 0, 1) EVT_ELSE EVT_CALL(EnableGroup, MODEL_g374, FALSE) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittne, COLLIDER_FLAGS_SURFACE_TYPE_MASK | COLLIDER_FLAGS_SAFE_FLOOR | COLLIDER_FLAGS_IGNORE_SHELL | COLLIDER_FLAGS_IGNORE_PLAYER | COLLIDER_FLAGS_80000 | 0x7FF47E00) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittne, COLLIDER_FLAGS_SURFACE_TYPE_MASK | COLLIDER_FLAG_SAFE_FLOOR | COLLIDER_FLAG_IGNORE_SHELL | COLLIDER_FLAG_IGNORE_PLAYER | COLLIDER_FLAG_80000 | 0x7FF47E00) EVT_END_IF EVT_RETURN EVT_END diff --git a/src/world/area_isk/isk_13/isk_13_3_npc.c b/src/world/area_isk/isk_13/isk_13_3_npc.c index 07b31d1db2..c95a192895 100644 --- a/src/world/area_isk/isk_13/isk_13_3_npc.c +++ b/src/world/area_isk/isk_13/isk_13_3_npc.c @@ -26,7 +26,7 @@ void N(func_80241610_990DF0)(void) { Matrix4f transformMtx, tempMtx; gSPViewport(gMasterGfxPos++, &cam->vp); - if (!(cam->flags & CAMERA_FLAGS_ORTHO)) { + if (!(cam->flags & CAMERA_FLAG_ORTHO)) { gSPPerspNormalize(gMasterGfxPos++, cam->perspNorm); } guMtxF2L(cam->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCameraID]); @@ -300,7 +300,7 @@ StaticNpc N(NpcData_StoneChomp) = { .settings = &N(NpcSettings_StoneChomp), .pos = { 440.0f, -470.0f, -300.0f }, .yaw = 320, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_StoneChomp), .initVarCount = 1, .initVar = { .value = -650 }, diff --git a/src/world/area_isk/isk_14/isk_14_3_npc.c b/src/world/area_isk/isk_14/isk_14_3_npc.c index 0204deb1e9..6c36314cf1 100644 --- a/src/world/area_isk/isk_14/isk_14_3_npc.c +++ b/src/world/area_isk/isk_14/isk_14_3_npc.c @@ -26,7 +26,7 @@ void N(func_80241610_993D40)(void) { Matrix4f transformMtx, tempMtx; gSPViewport(gMasterGfxPos++, &cam->vp); - if (!(cam->flags & CAMERA_FLAGS_ORTHO)) { + if (!(cam->flags & CAMERA_FLAG_ORTHO)) { gSPPerspNormalize(gMasterGfxPos++, cam->perspNorm); } guMtxF2L(cam->perspectiveMatrix, &gDisplayContext->camPerspMatrix[gCurrentCameraID]); @@ -166,7 +166,7 @@ EvtScript N(EVS_NpcIdle_StoneChomp) = { EVT_WAIT(1) EVT_CALL(N(DestroyAmbushWorker)) EVT_CALL(func_802CFD30, -1, 0, 0, 0, 0, 0) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_4 | ENEMY_FLAGS_100000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_4 | ENEMY_FLAG_100000, 0) EVT_WAIT(3) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetNpcJumpscale, NPC_SELF, 1) @@ -220,7 +220,7 @@ StaticNpc N(NpcData_StoneChomp) = { .settings = &N(NpcSettings_StoneChomp), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 218, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_StoneChomp), .initVarCount = 1, .initVar = { .value = -780 }, diff --git a/src/world/area_isk/isk_16/isk_16_2_npc.c b/src/world/area_isk/isk_16/isk_16_2_npc.c index 425d648739..79a33e0dba 100644 --- a/src/world/area_isk/isk_16/isk_16_2_npc.c +++ b/src/world/area_isk/isk_16/isk_16_2_npc.c @@ -69,12 +69,12 @@ StaticNpc N(NpcData_Tutankoopa)[] = { .settings = &N(NpcSettings_Tutankoopa_01), .pos = { 457.0f, -1300.0f, 316.0f }, .yaw = 230, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_200 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Tutankoopa_01), .initVarCount = 1, .initVar = { .value = 0 }, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -102,9 +102,9 @@ StaticNpc N(NpcData_Tutankoopa)[] = { .settings = &N(NpcSettings_Tutankoopa_02), .pos = { 500.0f, -1300.0f, 316.0f }, .yaw = 230, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_200 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -134,10 +134,10 @@ StaticNpc N(NpcData_ChainChomp) = { .settings = &N(NpcSettings_ChainChomp), .pos = { 457.0f, -1300.0f, 316.0f }, .yaw = 230, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_200 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_200 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ChainChomp), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_isk/isk_18/isk_18_2_npc.c b/src/world/area_isk/isk_18/isk_18_2_npc.c index 614f3ac5de..afe28cf088 100644 --- a/src/world/area_isk/isk_18/isk_18_2_npc.c +++ b/src/world/area_isk/isk_18/isk_18_2_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_BuzzyBeetle_01) = { .settings = &N(NpcSettings_BuzzyBeetle_Ceiling), .pos = { -372.0f, -700.0f, 439.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .initVarCount = 1, .initVar = { .value = BTL_ISK_PART_1_FORMATION_0E }, .drops = ISK_BUZZY_BEETLE_DROPS, @@ -31,7 +31,7 @@ StaticNpc N(NpcData_BuzzyBeetle_02) = { .settings = &N(NpcSettings_BuzzyBeetle_Ceiling), .pos = { -58.0f, -700.0f, 591.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .initVarCount = 1, .initVar = { .value = BTL_ISK_PART_1_FORMATION_0B }, .drops = ISK_BUZZY_BEETLE_DROPS, @@ -55,7 +55,7 @@ StaticNpc N(NpcData_BuzzyBeetle_03) = { .settings = &N(NpcSettings_BuzzyBeetle), .pos = { 292.0f, -780.0f, 488.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = ISK_BUZZY_BEETLE_DROPS, .territory = { .wander = { diff --git a/src/world/area_iwa/iwa_00/iwa_00_3_npc.c b/src/world/area_iwa/iwa_00/iwa_00_3_npc.c index fd97c5a81e..00d012a731 100644 --- a/src/world/area_iwa/iwa_00/iwa_00_3_npc.c +++ b/src/world/area_iwa/iwa_00/iwa_00_3_npc.c @@ -49,7 +49,7 @@ StaticNpc N(NpcData_MontyMole_GroundAmbush)[] = { .settings = &N(NpcSettings_MontyMole_GroundAmbush), .pos = { 880.0f, 70.0f, 67.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = MONTY_MOLE_DROPS, .territory = { .wander = { @@ -71,9 +71,9 @@ StaticNpc N(NpcData_MontyMole_GroundAmbush)[] = { .settings = &N(NpcSettings_MontyMole_GroundAmbush_Hole), .pos = { 880.0f, 70.0f, 67.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_20 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_20 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -99,7 +99,7 @@ StaticNpc N(NpcData_MontyMole_WallAmbush)[] = { .settings = &N(NpcSettings_MontyMole_WallAmbush), .pos = { 1220.0f, -30.0f, 70.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = MONTY_MOLE_DROPS, .territory = { .wander = { @@ -121,9 +121,9 @@ StaticNpc N(NpcData_MontyMole_WallAmbush)[] = { .settings = &N(NpcSettings_MontyMole_WallAmbush_Hole), .pos = { 1220.0f, -30.0f, 70.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_20 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_20 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -348,7 +348,7 @@ StaticNpc N(NpcData_Whacka)[] = { .settings = &N(NpcSettings_Whacka), .pos = { 725.0f, -30.0f, 225.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Whacka_01), .drops = WHACKA_DROPS, .animations = WHACKA_ANIMS, @@ -359,7 +359,7 @@ StaticNpc N(NpcData_Whacka)[] = { .settings = &N(NpcSettings_Whacka), .pos = { 725.0f, -30.0f, 225.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_4000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Whacka_02), .drops = WHACKA_DROPS, .animations = WHACKA_ANIMS, diff --git a/src/world/area_iwa/iwa_00/iwa_00_4_slide.c b/src/world/area_iwa/iwa_00/iwa_00_4_slide.c index 8935c4ce86..de2ab42709 100644 --- a/src/world/area_iwa/iwa_00/iwa_00_4_slide.c +++ b/src/world/area_iwa/iwa_00/iwa_00_4_slide.c @@ -10,7 +10,7 @@ SlideParams N(SlideData) = { API_CALLABLE(N(SetPlayerSliding)) { gPlayerStatus.slideParams = script->varTablePtr[0]; - gPlayerStatus.flags |= PS_FLAGS_SLIDING; + gPlayerStatus.flags |= PS_FLAG_SLIDING; return ApiStatus_DONE2; } diff --git a/src/world/area_iwa/iwa_01/iwa_01_4_npc.c b/src/world/area_iwa/iwa_01/iwa_01_4_npc.c index c57cba9eed..f733135033 100644 --- a/src/world/area_iwa/iwa_01/iwa_01_4_npc.c +++ b/src/world/area_iwa/iwa_01/iwa_01_4_npc.c @@ -11,7 +11,7 @@ StaticNpc N(NpcData_MontyMole_WallAmbush)[] = { .settings = &N(NpcSettings_MontyMole_WallAmbush), .pos = { 340.0f, 70.0f, 101.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = MONTY_MOLE_DROPS, .territory = { .wander = { @@ -33,9 +33,9 @@ StaticNpc N(NpcData_MontyMole_WallAmbush)[] = { .settings = &N(NpcSettings_MontyMole_WallAmbush_Hole), .pos = { 340.0f, 70.0f, 101.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_20 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_20 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_800000, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -62,7 +62,7 @@ StaticNpc N(NpcData_MontyMole_StoneThrower_01)[] = { .settings = &N(NpcSettings_MontyMole_StoneThrower), .pos = { -250.0f, 10.0f, 260.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_800, .drops = MONTY_MOLE_DROPS, .territory = { .wander = { @@ -88,7 +88,7 @@ StaticNpc N(NpcData_MontyMole_StoneThrower_02)[] = { .settings = &N(NpcSettings_MontyMole_StoneThrower), .pos = { -175.0f, 10.0f, 240.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_800, .drops = MONTY_MOLE_DROPS, .territory = { .wander = { @@ -114,7 +114,7 @@ StaticNpc N(NpcData_MontyMole_StoneThrower_03)[] = { .settings = &N(NpcSettings_MontyMole_StoneThrower), .pos = { -55.0f, 10.0f, 180.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_800, .drops = MONTY_MOLE_DROPS, .territory = { .wander = { @@ -139,7 +139,7 @@ StaticNpc N(NpcData_Cleft) = { .settings = &N(NpcSettings_Cleft), .pos = { -657.0f, 163.0f, 155.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = CLEFT_DROPS, .territory = { .wander = { diff --git a/src/world/area_iwa/iwa_01/iwa_01_5_slide.c b/src/world/area_iwa/iwa_01/iwa_01_5_slide.c index 112d0342e9..84edb841b8 100644 --- a/src/world/area_iwa/iwa_01/iwa_01_5_slide.c +++ b/src/world/area_iwa/iwa_01/iwa_01_5_slide.c @@ -2,7 +2,7 @@ API_CALLABLE(N(SetPlayerSliding)) { gPlayerStatus.slideParams = script->varTablePtr[0]; - gPlayerStatus.flags |= PS_FLAGS_SLIDING; + gPlayerStatus.flags |= PS_FLAG_SLIDING; return ApiStatus_DONE2; } diff --git a/src/world/area_iwa/iwa_02/iwa_02_3_npc.c b/src/world/area_iwa/iwa_02/iwa_02_3_npc.c index bded7f0fd3..dd10b838cd 100644 --- a/src/world/area_iwa/iwa_02/iwa_02_3_npc.c +++ b/src/world/area_iwa/iwa_02/iwa_02_3_npc.c @@ -12,7 +12,7 @@ StaticNpc N(NpcData_Cleft_01) = { .settings = &N(NpcSettings_Cleft), .pos = { 526.0f, 238.0f, 69.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_2000, .drops = CLEFT_DROPS, .territory = { .wander = { @@ -35,7 +35,7 @@ StaticNpc N(NpcData_Cleft_02) = { .settings = &N(NpcSettings_Cleft), .pos = { 450.0f, 50.0f, 215.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_2000, .drops = CLEFT_DROPS, .territory = { .wander = { @@ -58,7 +58,7 @@ StaticNpc N(NpcData_Cleft_03) = { .settings = &N(NpcSettings_Cleft), .pos = { 90.0f, 0.0f, 160.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_2000, .drops = CLEFT_DROPS, .territory = { .wander = { @@ -82,7 +82,7 @@ StaticNpc N(NpcData_MontyMole_01)[] = { .settings = &N(NpcSettings_MontyMole_WallAmbush), .pos = { 867.0f, 0.0f, 101.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = MONTY_MOLE_DROPS, .territory = { .wander = { @@ -104,9 +104,9 @@ StaticNpc N(NpcData_MontyMole_01)[] = { .settings = &N(NpcSettings_MontyMole_WallAmbush_Hole), .pos = { 867.0f, 0.0f, 101.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_20 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_20 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -189,7 +189,7 @@ StaticNpc N(NpcData_Bubulb) = { .settings = &N(NpcSettings_Bubulb), .pos = { 1075.0f, 50.0f, 230.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bubulb), .drops = BUBULB_DROPS, .animations = BUBULB_PURPLE_ANIMS, diff --git a/src/world/area_iwa/iwa_03/iwa_03_3_npc.c b/src/world/area_iwa/iwa_03/iwa_03_3_npc.c index af8aab6837..0a34d3b05d 100644 --- a/src/world/area_iwa/iwa_03/iwa_03_3_npc.c +++ b/src/world/area_iwa/iwa_03/iwa_03_3_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_Cleft_01) = { .settings = &N(NpcSettings_Cleft), .pos = { -525.0f, -75.0f, 60.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = CLEFT_DROPS, .territory = { .wander = { @@ -31,7 +31,7 @@ StaticNpc N(NpcData_Cleft_02) = { .settings = &N(NpcSettings_Cleft), .pos = { -1686.0f, -60.0f, 180.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = CLEFT_DROPS, .territory = { .wander = { @@ -54,7 +54,7 @@ StaticNpc N(NpcData_Cleft_03) = { .settings = &N(NpcSettings_Cleft), .pos = { -1300.0f, 408.0f, -125.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = CLEFT_DROPS, .territory = { .wander = { @@ -78,7 +78,7 @@ StaticNpc N(NpcData_MontyMole)[] = { .settings = &N(NpcSettings_MontyMole_GroundAmbush), .pos = { -1000.0f, 23.0f, 60.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = MONTY_MOLE_DROPS, .territory = { .wander = { @@ -100,9 +100,9 @@ StaticNpc N(NpcData_MontyMole)[] = { .settings = &N(NpcSettings_MontyMole_GroundAmbush_Hole), .pos = { -1000.0f, 23.0f, 60.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_20 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_20 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_iwa/iwa_03/iwa_03_4_slide.c b/src/world/area_iwa/iwa_03/iwa_03_4_slide.c index 5ad5646374..8d36c82a00 100644 --- a/src/world/area_iwa/iwa_03/iwa_03_4_slide.c +++ b/src/world/area_iwa/iwa_03/iwa_03_4_slide.c @@ -10,7 +10,7 @@ SlideParams N(SlideData) = { API_CALLABLE(N(SetPlayerSliding)) { gPlayerStatus.slideParams = script->varTablePtr[0]; - gPlayerStatus.flags |= PS_FLAGS_SLIDING; + gPlayerStatus.flags |= PS_FLAG_SLIDING; return ApiStatus_DONE2; } diff --git a/src/world/area_iwa/iwa_04/iwa_04_4_npc.c b/src/world/area_iwa/iwa_04/iwa_04_4_npc.c index 9ed394cf79..f3db0866d7 100644 --- a/src/world/area_iwa/iwa_04/iwa_04_4_npc.c +++ b/src/world/area_iwa/iwa_04/iwa_04_4_npc.c @@ -282,7 +282,7 @@ StaticNpc N(NpcData_Cleft) = { .settings = &N(NpcSettings_Cleft), .pos = { -412.0f, -250.0f, 143.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_800, .drops = CLEFT_DROPS, .territory = { .wander = { @@ -305,9 +305,9 @@ StaticNpc N(NpcData_Buzzar) = { .settings = &N(NpcSettings_Buzzar), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_800000, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = STANDARD_HEART_DROPS(3), .flowerDrops = STANDARD_FLOWER_DROPS(2), .minCoinBonus = 1, diff --git a/src/world/area_iwa/iwa_10/iwa_10_3_npc.c b/src/world/area_iwa/iwa_10/iwa_10_3_npc.c index 7e60ba0a4c..05026c2487 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_3_npc.c +++ b/src/world/area_iwa/iwa_10/iwa_10_3_npc.c @@ -128,7 +128,7 @@ StaticNpc N(NpcData_TrainConductorToad)[] = { .settings = &N(NpcSettings_TrainConductorToad), .pos = { -440.0f, 20.0f, 110.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_TrainStationToad_01), .drops = TRAIN_CONDUCTOR_DROPS, .animations = TRAIN_CONDUCTOR_WHITE_ANIMS, @@ -139,7 +139,7 @@ StaticNpc N(NpcData_TrainConductorToad)[] = { .settings = &N(NpcSettings_TrainConductorToad), .pos = { -425.0f, 70.0f, -20.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_TrainStationToad_02), .drops = TRAIN_CONDUCTOR_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, @@ -151,10 +151,10 @@ StaticNpc N(NpcData_Toad) = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -254.0f, 20.0f, 165.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Toad), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -168,7 +168,7 @@ StaticNpc N(NpcData_ThreeSisters)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -562.0f, 0.0f, 384.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ThreeSisters_02), .drops = TOADETTE_DROPS, .animations = TOADETTE_PINK_ANIMS, @@ -179,7 +179,7 @@ StaticNpc N(NpcData_ThreeSisters)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -582.0f, 0.0f, 406.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ThreeSisters_02), .drops = TOADETTE_DROPS, .animations = TOADETTE_PINK_ANIMS, @@ -190,7 +190,7 @@ StaticNpc N(NpcData_ThreeSisters)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -524.0f, 0.0f, 411.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ThreeSisters_02), .drops = TOADETTE_DROPS, .animations = TOADETTE_PINK_ANIMS, @@ -204,7 +204,7 @@ StaticNpc N(NpcData_Dryite)[] = { .settings = &N(NpcSettings_Dryite), .pos = { -344.0f, 0.0f, 379.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Dryite), .drops = DRYITE_DROPS, .animations = DRYITE_GREEN_ANIMS, @@ -215,7 +215,7 @@ StaticNpc N(NpcData_Dryite)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -760.0f, 0.0f, 160.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ThreeSisters_01), .drops = TOADETTE_DROPS, .animations = TOADETTE_GREEN_ANIMS, diff --git a/src/world/area_iwa/iwa_10/iwa_10_4_train.c b/src/world/area_iwa/iwa_10/iwa_10_4_train.c index 25a57d1e30..f97c744c07 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_4_train.c +++ b/src/world/area_iwa/iwa_10/iwa_10_4_train.c @@ -533,7 +533,7 @@ EvtScript N(EVS_DepartForToadTown) = { EvtScript N(EVS_InitializeTrainScene) = { EVT_CALL(EnableModel, MODEL_km, FALSE) - EVT_CALL(SetModelFlags, MODEL_km, MODEL_FLAGS_USE_CAMERA_UNK_MATRIX, TRUE) + EVT_CALL(SetModelFlags, MODEL_km, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) EVT_CALL(CloneModel, MODEL_km, CLONED_MODEL(0)) EVT_CALL(CloneModel, MODEL_km, CLONED_MODEL(1)) EVT_CALL(CloneModel, MODEL_km, CLONED_MODEL(2)) diff --git a/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c b/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c index a117598d07..0405769914 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c +++ b/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c @@ -114,7 +114,7 @@ EvtScript N(EVS_Scene_MeetParakarry) = { EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_SUB(LVar0, 15) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_NO_FLIPPING, TRUE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, TRUE) EVT_CALL(InterpPlayerYaw, 270, 0) EVT_WAIT(1) EVT_CALL(SetPlayerAnimation, ANIM_Mario_DeadStill) @@ -131,7 +131,7 @@ EvtScript N(EVS_Scene_MeetParakarry) = { EVT_CALL(GetNpcPos, NPC_Parakarry, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_CALL(NpcJump1, NPC_Parakarry, LVar0, LVar1, LVar2, 8) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_NO_FLIPPING, FALSE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, FALSE) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) EVT_WAIT(30) @@ -315,10 +315,10 @@ StaticNpc N(NpcData_Parakarry) = { .settings = &N(NpcSettings_Parakarry), .pos = { -610.0f, 230.0f, -485.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Parakarry), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_iwa/iwa_11/iwa_11_3_train.c b/src/world/area_iwa/iwa_11/iwa_11_3_train.c index 4db5a982d4..992d4657db 100644 --- a/src/world/area_iwa/iwa_11/iwa_11_3_train.c +++ b/src/world/area_iwa/iwa_11/iwa_11_3_train.c @@ -386,7 +386,7 @@ EvtScript N(EVS_TravelToMtRugged) = { EvtScript N(EVS_InitializeTrainScene) = { EVT_CALL(EnableModel, MODEL_km, FALSE) - EVT_CALL(SetModelFlags, MODEL_km, MODEL_FLAGS_USE_CAMERA_UNK_MATRIX, TRUE) + EVT_CALL(SetModelFlags, MODEL_km, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) EVT_CALL(CloneModel, MODEL_km, CLONED_MODEL(0)) EVT_CALL(CloneModel, MODEL_km, CLONED_MODEL(1)) EVT_CALL(CloneModel, MODEL_km, CLONED_MODEL(2)) diff --git a/src/world/area_iwa/iwa_11/iwa_11_5_npc.c b/src/world/area_iwa/iwa_11/iwa_11_5_npc.c index bf95b2b8cd..12adc9b673 100644 --- a/src/world/area_iwa/iwa_11/iwa_11_5_npc.c +++ b/src/world/area_iwa/iwa_11/iwa_11_5_npc.c @@ -23,7 +23,7 @@ StaticNpc N(NpcData_TrainConductorToad) = { .settings = &N(NpcSettings_TrainConductorToad), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_TrainConductorToad), .drops = TRAIN_CONDUCTOR_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, diff --git a/src/world/area_jan/jan_00/jan_00_2_npc.c b/src/world/area_jan/jan_00/jan_00_2_npc.c index 892d31b6fd..bd537d9a6d 100644 --- a/src/world/area_jan/jan_00/jan_00_2_npc.c +++ b/src/world/area_jan/jan_00/jan_00_2_npc.c @@ -707,10 +707,10 @@ StaticNpc N(D_8024488C_B24DCC)[] = { .settings = &N(NpcSettings_Kolorado_01), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kolorado_01), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -739,10 +739,10 @@ StaticNpc N(D_8024488C_B24DCC)[] = { .settings = &N(NpcSettings_Kolorado_02), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kolorado_02), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -771,10 +771,10 @@ StaticNpc N(D_8024488C_B24DCC)[] = { .settings = &N(NpcSettings_JrTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_JrTroopa), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -804,9 +804,9 @@ StaticNpc N(D_80244E5C_B2539C) = { .settings = &N(NpcSettings_HeartPlant_01), .pos = { 455.0f, 0.0f, 115.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_8000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -836,9 +836,9 @@ StaticNpc N(D_8024504C_B2558C) = { .settings = &N(NpcSettings_HeartPlant_01), .pos = { 167.0f, 0.0f, 404.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_8000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -868,9 +868,9 @@ StaticNpc N(D_8024523C_B2577C) = { .settings = &N(NpcSettings_HeartPlant_01), .pos = { 90.0f, 0.0f, 316.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_8000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -900,9 +900,9 @@ StaticNpc N(D_8024542C_B2596C) = { .settings = &N(NpcSettings_HeartPlant_01), .pos = { 424.0f, 0.0f, 182.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_8000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -932,9 +932,9 @@ StaticNpc N(D_8024561C_B25B5C) = { .settings = &N(NpcSettings_HeartPlant_01), .pos = { 143.0f, 0.0f, 260.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_8000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_kgr/kgr_02/kgr_02_3_npc.c b/src/world/area_kgr/kgr_02/kgr_02_3_npc.c index 6ec5b297ed..ba6d55ed80 100644 --- a/src/world/area_kgr/kgr_02/kgr_02_3_npc.c +++ b/src/world/area_kgr/kgr_02/kgr_02_3_npc.c @@ -113,11 +113,11 @@ EvtScript N(EVS_Fuzzipede_ReactToLight) = { EVT_SET(LVarB, 1) EVT_CALL(DisablePlayerInput, FALSE) EVT_END_IF - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, 0) EVT_SET(LVarA, 1) EVT_ELSE EVT_CALL(N(AwaitPartnerNotWatt)) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, 1) EVT_SET(LVarA, 0) EVT_END_IF EVT_WAIT(1) @@ -166,7 +166,7 @@ EvtScript N(EVS_NpcAI_Fuzzipede) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000, 0) EVT_CALL(StartBossBattle, SONG_SPECIAL_BATTLE) EVT_RETURN EVT_END @@ -185,9 +185,9 @@ EvtScript N(EVS_NpcDefeat_Fuzzipede) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) EVT_CALL(SetPlayerPos, -40, 0, 0) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_NO_FLIPPING, TRUE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, TRUE) EVT_CALL(InterpPlayerYaw, 90, 0) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_NO_FLIPPING, FALSE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, FALSE) EVT_CALL(SetNpcPos, NPC_SELF, 30, 0, 0) EVT_CALL(SetNpcYaw, NPC_SELF, 270) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -5, 0, 0) @@ -291,9 +291,9 @@ StaticNpc N(NpcData_Fuzzipede) = { .settings = &N(NpcSettings_Fuzzipede), .pos = { 333.0f, -10.0f, -130.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_8000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_kkj/kkj_00/ABB290.c b/src/world/area_kkj/kkj_00/ABB290.c index 012cd421b2..1ccd541fab 100644 --- a/src/world/area_kkj/kkj_00/ABB290.c +++ b/src/world/area_kkj/kkj_00/ABB290.c @@ -24,6 +24,6 @@ ApiStatus func_80240040_ABB2D0(Evt* script, s32 isInitialCall) { status->slideParams = &D_8024162C_ABC8BC; } - status->flags |= PS_FLAGS_SLIDING; + status->flags |= PS_FLAG_SLIDING; return ApiStatus_DONE2; } diff --git a/src/world/area_kkj/kkj_18/AF2FE0.c b/src/world/area_kkj/kkj_18/AF2FE0.c index 6c7747905d..477fc06d66 100644 --- a/src/world/area_kkj/kkj_18/AF2FE0.c +++ b/src/world/area_kkj/kkj_18/AF2FE0.c @@ -93,7 +93,7 @@ ApiStatus func_80240774_AF3414(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[CAM_DEFAULT]; if (isInitialCall) { - camera->flags |= CAMERA_FLAGS_SHAKING; + camera->flags |= CAMERA_FLAG_SHAKING; script->functionTempF[0] = 0.0f; } diff --git a/src/world/area_kkj/kkj_19/AF7C00.c b/src/world/area_kkj/kkj_19/AF7C00.c index 42ceff0625..a51b761215 100644 --- a/src/world/area_kkj/kkj_19/AF7C00.c +++ b/src/world/area_kkj/kkj_19/AF7C00.c @@ -133,21 +133,21 @@ ApiStatus func_802406C4_AF8014(Evt* script, s32 isInitialCall) { D_80246568_C8C018[0] = hudElemID; hud_element_set_render_pos(hudElemID, D_8024655C, D_80246560_kkj_19); hud_element_set_render_depth(hudElemID, 0); - hud_element_set_flags(hudElemID, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElemID, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hudElemID = hud_element_create(&HES_BlueMeter); D_80246568_C8C018[1] = hudElemID; hud_element_set_render_pos(hudElemID, D_8024655C, D_80246560_kkj_19 + 28); hud_element_set_render_depth(hudElemID, 0); - hud_element_set_flags(hudElemID, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(hudElemID, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); hudElemID = D_80246568_C8C018[0]; hud_element_set_alpha(hudElemID, 255); - hud_element_clear_flags(hudElemID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElemID, HUD_ELEMENT_FLAG_DISABLED); hudElemID = D_80246568_C8C018[1]; hud_element_set_alpha(hudElemID, 255); - hud_element_clear_flags(hudElemID, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(hudElemID, HUD_ELEMENT_FLAG_DISABLED); D_80246558_kkj_19 = 1; script->functionTemp[0] = 10; diff --git a/src/world/area_kmr/kmr_00/kmr_00_3_revival.c b/src/world/area_kmr/kmr_00/kmr_00_3_revival.c index 05d26ef5f3..d7c6f0ac9d 100644 --- a/src/world/area_kmr/kmr_00/kmr_00_3_revival.c +++ b/src/world/area_kmr/kmr_00/kmr_00_3_revival.c @@ -224,7 +224,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_CALL(N(func_80240388_8AC318)) EVT_CALL(N(func_80240000_8ABF90), 255, 255, 255, 60, 60, 60, 0) EVT_CALL(FadeOutMusic, 0, 500) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_NO_FLIPPING, TRUE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, TRUE) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) diff --git a/src/world/area_kmr/kmr_00/kmr_00_4_npc.c b/src/world/area_kmr/kmr_00/kmr_00_4_npc.c index 2318e05c88..47b3650cca 100644 --- a/src/world/area_kmr/kmr_00/kmr_00_4_npc.c +++ b/src/world/area_kmr/kmr_00/kmr_00_4_npc.c @@ -111,7 +111,7 @@ StaticNpc N(NpcData_Goombaria) = { .settings = &N(NpcSettings_Goombaria_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Goombaria), .drops = GOOMBARIA_DROPS, .animations = GOOMBARIA_ANIMS, @@ -123,7 +123,7 @@ StaticNpc N(NpcData_StarSpirits)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarSpirit), .drops = ELDSTAR_DROPS, .animations = ELDSTAR_ANIMS, @@ -133,7 +133,7 @@ StaticNpc N(NpcData_StarSpirits)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarSpirit), .drops = MAMAR_DROPS, .animations = MAMAR_ANIMS, @@ -143,7 +143,7 @@ StaticNpc N(NpcData_StarSpirits)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarSpirit), .drops = SKOLAR_DROPS, .animations = SKOLAR_ANIMS, @@ -153,7 +153,7 @@ StaticNpc N(NpcData_StarSpirits)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarSpirit), .drops = MUSKULAR_DROPS, .animations = MUSKULAR_ANIMS, @@ -163,7 +163,7 @@ StaticNpc N(NpcData_StarSpirits)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarSpirit), .drops = MISSTAR_DROPS, .animations = MISSTAR_ANIMS, @@ -173,7 +173,7 @@ StaticNpc N(NpcData_StarSpirits)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarSpirit), .drops = KLEVAR_DROPS, .animations = KLEVAR_ANIMS, @@ -183,7 +183,7 @@ StaticNpc N(NpcData_StarSpirits)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarSpirit), .drops = KALMAR_DROPS, .animations = KALMAR_ANIMS, diff --git a/src/world/area_kmr/kmr_02/kmr_02_3_npc.c b/src/world/area_kmr/kmr_02/kmr_02_3_npc.c index 6c6651888d..7dd9a837e7 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_3_npc.c +++ b/src/world/area_kmr/kmr_02/kmr_02_3_npc.c @@ -1776,7 +1776,7 @@ StaticNpc N(NpcData_GoombaFamily)[] = { .settings = &N(NpcSettings_GoombaFamily_Wander), .pos = { 506.0f, 30.0f, -364.0f }, .yaw = 45, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Goompa), .drops = GOOMPA_DROPS, .territory = { @@ -1799,7 +1799,7 @@ StaticNpc N(NpcData_GoombaFamily)[] = { .settings = &N(NpcSettings_GoombaFamily_Wander), .pos = { 92.0f, 0.0f, 76.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Goombaria), .drops = GOOMBARIA_DROPS, .territory = { @@ -1822,7 +1822,7 @@ StaticNpc N(NpcData_GoombaFamily)[] = { .settings = &N(NpcSettings_GoombaFamily_Wander), .pos = { -50.0f, 0.0f, -30.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Goombario), .drops = GOOMBARIO_DROPS, .territory = { @@ -1844,7 +1844,7 @@ StaticNpc N(NpcData_GoombaFamily)[] = { .settings = &N(NpcSettings_GoombaFamily_Wander), .pos = { 100.0f, 0.0f, -256.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Gooma), .drops = GOOMA_DROPS, .territory = { @@ -1867,7 +1867,7 @@ StaticNpc N(NpcData_GoombaFamily)[] = { .settings = &N(NpcSettings_GoombaFamily_Wander), .pos = { 163.0f, 0.0f, 283.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Goompapa), .drops = GOOMPAPA_DROPS, .territory = { @@ -1892,7 +1892,7 @@ StaticNpc N(NpcData_Goomama) = { .settings = &N(NpcSettings_GoombaFamily_Wander), .pos = { -200.0f, 0.0f, 100.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Goomama), .drops = GOOMAMA_DROPS, .territory = { @@ -1922,7 +1922,7 @@ StaticNpc N(NpcData_Toad) = { .settings = &N(NpcSettings_Toad_Guard), .pos = { -138.0f, 19.0f, -297.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad), .drops = TOAD_DROPS, .territory = { @@ -1956,10 +1956,10 @@ StaticNpc N(NpcData_Kammy) = { .settings = &N(NpcSettings_Kammy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Kammy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2001,7 +2001,7 @@ StaticNpc N(NpcData_ChuckQuizmo) = { .settings = &N(NpcSettings_ChuckQuizmo), .pos = { -300.0f, 0.0f, 175.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_4000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000 | ENEMY_FLAG_400000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_KMR, QUIZ_COUNT_KMR, QUIZ_MAP_KMR_02 }}, .drops = QUIZMO_DROPS, @@ -2048,7 +2048,7 @@ StaticNpc N(NpcData_Eldstar_Prologue)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_4000 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Eldstar_01), .drops = ELDSTAR_DROPS, .animations = ELDSTAR_ANIMS, @@ -2059,7 +2059,7 @@ StaticNpc N(NpcData_Eldstar_Prologue)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Eldstar_02), .drops = ELDSTAR_DROPS, .animations = ELDSTAR_ANIMS, @@ -2264,7 +2264,7 @@ StaticNpc N(NpcData_Epilogue)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_4000 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Eldstar_Epilogue), .drops = ELDSTAR_DROPS, .animations = ELDSTAR_ANIMS, @@ -2275,10 +2275,10 @@ StaticNpc N(NpcData_Epilogue)[] = { .settings = &N(NpcSettings_GoombaFamily), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Parakarry_Epilogue), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2306,7 +2306,7 @@ StaticNpc N(NpcData_Epilogue)[] = { .settings = &N(NpcSettings_GoombaFamily), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Goombario_Epilogue), .drops = GOOMBARIO_DROPS, .animations = GOOMBARIO_ANIMS, @@ -2316,7 +2316,7 @@ StaticNpc N(NpcData_Epilogue)[] = { .settings = &N(NpcSettings_GoombaFamily), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Goombaria_Epilogue), .drops = GOOMBARIA_DROPS, .animations = GOOMBARIA_ANIMS, diff --git a/src/world/area_kmr/kmr_03/kmr_03_3_npc.c b/src/world/area_kmr/kmr_03/kmr_03_3_npc.c index ac9cf93d56..635da0a4b6 100644 --- a/src/world/area_kmr/kmr_03/kmr_03_3_npc.c +++ b/src/world/area_kmr/kmr_03/kmr_03_3_npc.c @@ -168,10 +168,10 @@ StaticNpc N(NpcData_GoombaFamily) = { .settings = &N(NpcSettings_Goompa), .pos = { -50.0f, 0.0f, 80.0f }, .yaw = 45, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Goompa), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_kmr/kmr_04/kmr_04_3_npc.c b/src/world/area_kmr/kmr_04/kmr_04_3_npc.c index 85afbbc263..217beab94d 100644 --- a/src/world/area_kmr/kmr_04/kmr_04_3_npc.c +++ b/src/world/area_kmr/kmr_04/kmr_04_3_npc.c @@ -246,7 +246,7 @@ NpcSettings N(NpcSettings_Goompa) = { .ai = &N(EVS_NpcAI_Goompa), .aux = &N(EVS_NpcAux_Goompa), .onDefeat = &N(EVS_NpcDefeat_Goompa), - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100, }; EvtScript N(EVS_NpcInit_JrTroopa) = { @@ -263,10 +263,10 @@ StaticNpc N(NpcData_JrTroopa) = { .settings = &N(NpcSettings_JrTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_800000, .init = &N(EVS_NpcInit_JrTroopa), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -295,7 +295,7 @@ StaticNpc N(NpcData_GoombaFamily) = { .settings = &N(NpcSettings_Goompa), .pos = { -58.0f, 0.0f, 130.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200000, .animations = { }, }; diff --git a/src/world/area_kmr/kmr_05/kmr_05_3_npc.c b/src/world/area_kmr/kmr_05/kmr_05_3_npc.c index fbaf85dbda..d74168b418 100644 --- a/src/world/area_kmr/kmr_05/kmr_05_3_npc.c +++ b/src/world/area_kmr/kmr_05/kmr_05_3_npc.c @@ -59,7 +59,7 @@ EvtScript N(EVS_NpcIdle_SpikedGoomba) = { EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0)) EVT_CALL(NpcJump0, NPC_SELF, 685, 100, -35, 0) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_40000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_SpikedGoomba_Wander))) EVT_CASE_OR_EQ(102) EVT_CASE_OR_EQ(3) @@ -76,7 +76,7 @@ StaticNpc N(NpcData_Goomba_01) = { .settings = &N(NpcSettings_Goomba_Wander), .pos = { 305.0f, 50.0f, -13.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = GOOMBA_DROPS, .territory = { .wander = { @@ -99,7 +99,7 @@ StaticNpc N(NpcData_Goomba_02) = { .settings = &N(NpcSettings_Goomba_Wander), .pos = { 700.0f, 210.0f, -165.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = GOOMBA_DROPS, .territory = { .wander = { @@ -129,7 +129,7 @@ StaticNpc N(NpcData_SpikedGoomba) = { .settings = &N(NpcSettings_SpikedGoomba_Wander), .pos = { 712.0f, 100.0f, -95.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .init = &N(EVS_NpcInit_SpikedGoomba), .drops = SPIKED_GOOMBA_DROPS, .territory = { @@ -153,7 +153,7 @@ StaticNpc N(NpcData_Paragoomba) = { .settings = &N(NpcSettings_Paragoomba_Wander), .pos = { 960.0f, 210.0f, -20.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = PARAGOOMBA_DROPS, .territory = { .wander = { diff --git a/src/world/area_kmr/kmr_06/kmr_06_3_npc.c b/src/world/area_kmr/kmr_06/kmr_06_3_npc.c index 024e5d7d28..4e44df9c5c 100644 --- a/src/world/area_kmr/kmr_06/kmr_06_3_npc.c +++ b/src/world/area_kmr/kmr_06/kmr_06_3_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_SpikedGoomba) = { .settings = &N(NpcSettings_SpikedGoomba_Wander), .pos = { 160.0f, 0.0f, 30.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = SPIKED_GOOMBA_DROPS, .territory = { .wander = { @@ -30,7 +30,7 @@ StaticNpc N(NpcData_Paragoomba) = { .settings = &N(NpcSettings_Paragoomba_Wander), .pos = { 525.0f, 60.0f, 15.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = PARAGOOMBA_DROPS, .territory = { .wander = { diff --git a/src/world/area_kmr/kmr_07/kmr_07_3_npc.c b/src/world/area_kmr/kmr_07/kmr_07_3_npc.c index 03b29178e1..04753e27fc 100644 --- a/src/world/area_kmr/kmr_07/kmr_07_3_npc.c +++ b/src/world/area_kmr/kmr_07/kmr_07_3_npc.c @@ -212,7 +212,7 @@ StaticNpc N(NpcData_GoombaBros_Red)[] = { .settings = &N(NpcSettings_GoombaBros_Stationary), .pos = { 526.0f, 80.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_800000, .init = &N(EVS_NpcInit_GoombaBros_Red), .drops = GOOMBA_BROS_DROPS, .territory = { @@ -234,7 +234,7 @@ StaticNpc N(NpcData_GoombaBros_Red)[] = { .settings = &N(NpcSettings_GoombaBros_Stationary), .pos = { 498.0f, 80.0f, -10.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_800000, .init = &N(EVS_NpcInit_GoombaBros_Blue), .drops = GOOMBA_BROS_DROPS, .territory = { diff --git a/src/world/area_kmr/kmr_09/kmr_09_3_npc.c b/src/world/area_kmr/kmr_09/kmr_09_3_npc.c index 452264cadf..9e67a5246e 100644 --- a/src/world/area_kmr/kmr_09/kmr_09_3_npc.c +++ b/src/world/area_kmr/kmr_09/kmr_09_3_npc.c @@ -9,7 +9,7 @@ StaticNpc N(NpcData_Goomba_01) = { .settings = &N(NpcSettings_Goomba_Wander), .pos = { 200.0f, 0.0f, 24.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = GOOMBA_DROPS, .territory = { .wander = { @@ -31,7 +31,7 @@ StaticNpc N(NpcData_Goomba_02) = { .settings = &N(NpcSettings_Goomba_Wander), .pos = { 250.0f, 0.0f, 35.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = GOOMBA_DROPS, .territory = { .wander = { @@ -80,7 +80,7 @@ EvtScript N(EVS_OnReadBillboard) = { EvtScript N(EVS_NpcIdle_Goomba_Ambush) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Goomba_Still) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_20, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_20, 1) EVT_LABEL(0) EVT_CALL(GetSelfVar, 0, LVar0) EVT_IF_EQ(LVar0, 0) @@ -112,8 +112,8 @@ EvtScript N(EVS_NpcIdle_Goomba_Ambush) = { EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_NO_AI, TRUE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, FALSE) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, TRUE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_20, 0) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_40000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_20, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnReadBillboard)), TRIGGER_WALL_PRESS_A, COLLIDER_kan, 1, 0) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_Goomba_Wander))) EVT_RETURN @@ -132,7 +132,7 @@ StaticNpc N(NpcData_Goomba_Ambush) = { .settings = &N(NpcSettings_Goomba_Wander), .pos = { -34.0f, 29.0f, -32.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Goomba_Ambush), .drops = GOOMBA_DROPS, .territory = { @@ -155,7 +155,7 @@ StaticNpc N(NpcData_Paragoomba) = { .settings = &N(NpcSettings_Paragoomba_Wander), .pos = { 670.0f, 60.0f, 20.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = PARAGOOMBA_DROPS, .territory = { .wander = { diff --git a/src/world/area_kmr/kmr_10/kmr_10_3_npc.c b/src/world/area_kmr/kmr_10/kmr_10_3_npc.c index dd0b375ddd..e35357cb6c 100644 --- a/src/world/area_kmr/kmr_10/kmr_10_3_npc.c +++ b/src/world/area_kmr/kmr_10/kmr_10_3_npc.c @@ -13,7 +13,7 @@ StaticNpc N(NpcData_Toad) = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_4000 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Toad), .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, diff --git a/src/world/area_kmr/kmr_11/kmr_11_4_npc.c b/src/world/area_kmr/kmr_11/kmr_11_4_npc.c index 0cc0808b8a..aa4e4e052e 100644 --- a/src/world/area_kmr/kmr_11/kmr_11_4_npc.c +++ b/src/world/area_kmr/kmr_11/kmr_11_4_npc.c @@ -63,7 +63,7 @@ EvtScript N(EVS_NpcIdle_GoombaKing) = { }; EvtScript N(EVS_Scene_BossDefeated) = { - EVT_CALL(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAGS_2, TRUE) + EVT_CALL(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_2, TRUE) EVT_CALL(N(SetupFog)) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_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_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, }; StaticNpc N(NpcData_Enemies)[] = { @@ -297,10 +297,10 @@ StaticNpc N(NpcData_Enemies)[] = { .settings = &N(NpcSettings_GoombaBros_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_800000, .init = &N(EVS_NpcInit_GoombaBros_01), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -340,10 +340,10 @@ StaticNpc N(NpcData_Enemies)[] = { .settings = &N(NpcSettings_GoombaBros_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_800000, .init = &N(EVS_NpcInit_GoombaBros_02), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -383,10 +383,10 @@ StaticNpc N(NpcData_Enemies)[] = { .settings = &N(NpcSettings_GoombaBros_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_800000, .init = &N(EVS_NpcInit_GoombaKing), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -428,7 +428,7 @@ StaticNpc N(NpcData_Kammy) = { .settings = &N(NpcSettings_Kammy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 100, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_200000, .initVarCount = 1, .initVar = { .value = 0 }, .animations = {}, diff --git a/src/world/area_kmr/kmr_12/kmr_12_3_npc.c b/src/world/area_kmr/kmr_12/kmr_12_3_npc.c index 964495eec7..92676f12ae 100644 --- a/src/world/area_kmr/kmr_12/kmr_12_3_npc.c +++ b/src/world/area_kmr/kmr_12/kmr_12_3_npc.c @@ -37,7 +37,7 @@ EvtScript N(EVS_NpcIdle_Goomba) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Goomba_FakeMushroom) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_20, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_20, 1) EVT_LABEL(0) EVT_CALL(GetSelfVar, 0, LVar0) EVT_WAIT(1) @@ -73,8 +73,8 @@ EvtScript N(EVS_NpcIdle_Goomba) = { EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40000 | NPC_FLAG_200000, FALSE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_20, 0) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_40000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_20, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnReadBillboard)), TRIGGER_WALL_PRESS_A, COLLIDER_o78, 1, 0) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_Goomba_Wander))) EVT_RETURN @@ -92,7 +92,7 @@ StaticNpc N(NpcData_Goomba) = { .settings = &N(NpcSettings_Goomba_Wander), .pos = { -33.0f, 30.0f, -25.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Goomba), .drops = GOOMBA_DROPS, .territory = { diff --git a/src/world/area_kmr/kmr_20/kmr_20_10_npc.c b/src/world/area_kmr/kmr_20/kmr_20_10_npc.c index c9cb697a4d..39575f55ac 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_10_npc.c +++ b/src/world/area_kmr/kmr_20/kmr_20_10_npc.c @@ -614,7 +614,7 @@ EvtScript N(EVS_NpcInit_Luigi_1) = { EVT_CASE_LT(STORY_EPILOGUE) EVT_CALL(SetNpcPos, NPC_SELF, 306, 30, -145) EVT_CALL(InterpNpcYaw, NPC_SELF, 39, 0) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_400000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_400000, 1) EVT_END_SWITCH EVT_RETURN EVT_END @@ -625,10 +625,10 @@ StaticNpc N(NpcData_Luigi_0) = { .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Luigi_0), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -658,10 +658,10 @@ StaticNpc N(NpcData_Luigi_1) = { .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Luigi_1), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -756,7 +756,7 @@ EvtScript N(EVS_NpcHit_ShyGuy) = { EVT_SET(GF_KMR20_ChasedOffShyGuy, TRUE) EVT_CALL(SetNpcVar, NPC_Luigi_1, 0, 1) EVT_WAIT(2) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, 1) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_ShyGuy))) EVT_RETURN EVT_END @@ -786,10 +786,10 @@ StaticNpc N(NpcData_ShyGuy) = { .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_10000000, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_ShyGuy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_kmr/kmr_20/kmr_20_5_entity.c b/src/world/area_kmr/kmr_20/kmr_20_5_entity.c index 4c8ebccf50..47228c5188 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_5_entity.c +++ b/src/world/area_kmr/kmr_20/kmr_20_5_entity.c @@ -65,7 +65,7 @@ EvtScript N(EVS_UseSpring_Basement) = { EvtScript N(EVS_Luigi_JumpFromBlock) = { EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(SetEnemyFlagBits, NPC_Luigi_1, ENEMY_FLAGS_100, 0) + EVT_CALL(SetEnemyFlagBits, NPC_Luigi_1, ENEMY_FLAG_100, 0) EVT_CALL(SetNpcFlagBits, NPC_Luigi_1, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcVar, NPC_Luigi_1, 0, 1) EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Jump) @@ -81,7 +81,7 @@ EvtScript N(EVS_Luigi_JumpFromBlock) = { EvtScript N(EVS_Luigi_JumpFromHighBlock) = { EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(SetEnemyFlagBits, NPC_Luigi_1, ENEMY_FLAGS_100, 0) + EVT_CALL(SetEnemyFlagBits, NPC_Luigi_1, ENEMY_FLAG_100, 0) EVT_CALL(SetNpcFlagBits, NPC_Luigi_1, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcVar, NPC_Luigi_1, 0, 1) EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Jump) diff --git a/src/world/area_kmr/kmr_20/kmr_20_9_npc_scenes.c b/src/world/area_kmr/kmr_20/kmr_20_9_npc_scenes.c index ba82e9d375..785ad0c6c8 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_9_npc_scenes.c +++ b/src/world/area_kmr/kmr_20/kmr_20_9_npc_scenes.c @@ -27,9 +27,9 @@ StaticNpc N(NpcData_Scenes)[] = { .settings = &N(NpcSettings_Scenes), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -57,10 +57,10 @@ StaticNpc N(NpcData_Scenes)[] = { .settings = &N(NpcSettings_Scenes), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_GRAVITY, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_GRAVITY, .init = &N(EVS_NpcInit_Luigi_Scenes), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_kmr/kmr_22/kmr_22_1_main.c b/src/world/area_kmr/kmr_22/kmr_22_1_main.c index 1b3cc1f840..ae9f89c59a 100644 --- a/src/world/area_kmr/kmr_22/kmr_22_1_main.c +++ b/src/world/area_kmr/kmr_22/kmr_22_1_main.c @@ -132,7 +132,7 @@ EvtScript N(EVS_Main) = { EVT_ELSE EVT_CALL(SetPlayerPos, -95, 0, 0) EVT_END_IF - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_NO_FLIPPING, TRUE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, TRUE) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_WAIT(1) EVT_CALL(SetPlayerAnimation, ANIM_Mario_BeforeJump) diff --git a/src/world/area_kmr/kmr_22/kmr_22_2_npc.c b/src/world/area_kmr/kmr_22/kmr_22_2_npc.c index 9248031cac..2b5c1f989f 100644 --- a/src/world/area_kmr/kmr_22/kmr_22_2_npc.c +++ b/src/world/area_kmr/kmr_22/kmr_22_2_npc.c @@ -36,7 +36,7 @@ StaticNpc N(NpcData_Chapter1)[] = { .settings = &N(NpcSettings_Dummy), .pos = { -62.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar), .drops = ELDSTAR_DROPS, .animations = ELDSTAR_ANIMS, @@ -46,7 +46,7 @@ StaticNpc N(NpcData_Chapter1)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 10.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_KoopaBros), .drops = KOOPA_BROS_DROPS, .animations = BLACK_KOOPA_BROS_ANIMS, @@ -56,7 +56,7 @@ StaticNpc N(NpcData_Chapter1)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 90.0f, 10.0f, 91.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_KoopaBros), .drops = KOOPA_BROS_DROPS, .animations = BLACK_KOOPA_BROS_ANIMS, @@ -66,7 +66,7 @@ StaticNpc N(NpcData_Chapter1)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 86.0f, 0.0f, -7.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_KoopaBros), .drops = KOOPA_BROS_DROPS, .animations = BLACK_KOOPA_BROS_ANIMS, @@ -76,7 +76,7 @@ StaticNpc N(NpcData_Chapter1)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 54.0f, -2.0f, -47.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_KoopaBros), .drops = KOOPA_BROS_DROPS, .animations = BLACK_KOOPA_BROS_ANIMS, @@ -89,7 +89,7 @@ StaticNpc N(NpcData_Chapter2)[] = { .settings = &N(NpcSettings_Dummy), .pos = { -62.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Mamar), .drops = MAMAR_DROPS, .animations = MAMAR_ANIMS, @@ -99,10 +99,10 @@ StaticNpc N(NpcData_Chapter2)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 78.0f, 19.0f, 20.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Tutankoopa), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -130,10 +130,10 @@ StaticNpc N(NpcData_Chapter2)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 23.0f, -4.0f, -180.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ChainChomp), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -161,9 +161,9 @@ StaticNpc N(NpcData_Chapter2)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 23.0f, -4.0f, -180.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -191,9 +191,9 @@ StaticNpc N(NpcData_Chapter2)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 23.0f, -4.0f, -180.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -221,9 +221,9 @@ StaticNpc N(NpcData_Chapter2)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 23.0f, -4.0f, -180.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -251,9 +251,9 @@ StaticNpc N(NpcData_Chapter2)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 23.0f, -4.0f, -180.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -284,7 +284,7 @@ StaticNpc N(NpcData_Chapter3)[] = { .settings = &N(NpcSettings_Dummy), .pos = { -62.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Skolar), .drops = SKOLAR_DROPS, .animations = SKOLAR_ANIMS, @@ -294,10 +294,10 @@ StaticNpc N(NpcData_Chapter3)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 54.0f, -1.0f, 1.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Tubba), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -328,7 +328,7 @@ StaticNpc N(NpcData_Chapter4)[] = { .settings = &N(NpcSettings_Dummy), .pos = { -62.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Muskular), .drops = MUSKULAR_DROPS, .animations = MUSKULAR_ANIMS, @@ -338,10 +338,10 @@ StaticNpc N(NpcData_Chapter4)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 97.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_GeneralGuy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -369,7 +369,7 @@ StaticNpc N(NpcData_Chapter4)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 17.0f, 0.0f, -14.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ShyGuy), .drops = SHY_GUY_NO_DROPS, .animations = RED_SHY_GUY_ANIMS, @@ -379,7 +379,7 @@ StaticNpc N(NpcData_Chapter4)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 47.0f, 0.0f, 25.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ShyGuy), .drops = SHY_GUY_NO_DROPS, .animations = RED_SHY_GUY_ANIMS, @@ -392,7 +392,7 @@ StaticNpc N(NpcData_Chapter5)[] = { .settings = &N(NpcSettings_Dummy), .pos = { -62.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Misstar), .drops = MISSTAR_DROPS, .animations = MISSTAR_ANIMS, @@ -402,7 +402,7 @@ StaticNpc N(NpcData_Chapter5)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_4, + .flags = ENEMY_FLAG_4, .init = &N(EVS_NpcInit_LavaPiranhaHead), .drops = LAVA_PIRANHA_NO_DROPS, .animations = LAVA_PIRANHA_HEAD_ANIMS, @@ -413,7 +413,7 @@ StaticNpc N(NpcData_Chapter5)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4, .init = &N(EVS_NpcInit_LavaBud_01), .drops = LAVA_PIRANHA_NO_DROPS, .animations = LAVA_PIRANHA_BUD_ANIMS, @@ -424,7 +424,7 @@ StaticNpc N(NpcData_Chapter5)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4, .init = &N(EVS_NpcInit_LavaBud_01), .drops = LAVA_PIRANHA_NO_DROPS, .animations = LAVA_PIRANHA_BUD_ANIMS, @@ -438,7 +438,7 @@ StaticNpc N(NpcData_Chapter6)[] = { .settings = &N(NpcSettings_Dummy), .pos = { -62.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Klevar), .drops = KLEVAR_DROPS, .animations = KLEVAR_ANIMS, @@ -448,10 +448,10 @@ StaticNpc N(NpcData_Chapter6)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 70.0f, 109.0f, 1.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_HuffNPuff_Body), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -479,10 +479,10 @@ StaticNpc N(NpcData_Chapter6)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 70.0f, 109.0f, 1.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_HuffNPuff_Face), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -510,10 +510,10 @@ StaticNpc N(NpcData_Chapter6)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 70.0f, 109.0f, 1.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_HuffNPuff_Arms), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -541,10 +541,10 @@ StaticNpc N(NpcData_Chapter6)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 60.0f, 40.0f, -50.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TuffPuff_01), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -572,9 +572,9 @@ StaticNpc N(NpcData_Chapter6)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 14.0f, 61.0f, 1.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -605,7 +605,7 @@ StaticNpc N(NpcData_Chapter7)[] = { .settings = &N(NpcSettings_Dummy), .pos = { -62.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Kalmar), .drops = KALMAR_DROPS, .animations = KALMAR_ANIMS, @@ -615,10 +615,10 @@ StaticNpc N(NpcData_Chapter7)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 60.0f, -2.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_CrystalKing), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -646,10 +646,10 @@ StaticNpc N(NpcData_Chapter7)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 10.0f, 31.0f, -12.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_IceCube), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -677,10 +677,10 @@ StaticNpc N(NpcData_Chapter7)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 40.0f, 68.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_IceSphere), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -708,10 +708,10 @@ StaticNpc N(NpcData_Chapter7)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 96.0f, 53.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_IceSpike), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -741,10 +741,10 @@ StaticNpc N(NpcData_Chapter8) = { .settings = &N(NpcSettings_Dummy), .pos = { 58.0f, 0.0f, 20.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bowser), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_kmr/kmr_22/npc/lava_piranha.inc.c b/src/world/area_kmr/kmr_22/npc/lava_piranha.inc.c index 0308b42181..aa8e2c9353 100644 --- a/src/world/area_kmr/kmr_22/npc/lava_piranha.inc.c +++ b/src/world/area_kmr/kmr_22/npc/lava_piranha.inc.c @@ -196,22 +196,22 @@ EvtScript N(EVS_NpcInit_LavaPiranhaHead) = { EVT_CALL(N(LoadAnimationFromTable), VINE_0, 0) EVT_CALL(PlayModelAnimation, VINE_0, VINE_0_BASE) EVT_CALL(SetAnimatedModelRootPosition, VINE_0, -40, 0, 0) - EVT_CALL(SetAnimatorFlags, VINE_0, MODEL_ANIMATOR_FLAGS_HIDDEN, 1) + EVT_CALL(SetAnimatorFlags, VINE_0, MODEL_ANIMATOR_FLAG_HIDDEN, 1) EVT_CALL(LoadAnimatedModel, VINE_1, EVT_PTR(N(AnimModel_SideHeadVine))) EVT_CALL(N(LoadAnimationFromTable), VINE_1, 31) EVT_CALL(PlayModelAnimation, VINE_1, VINE_1_BASE) EVT_CALL(SetAnimatedModelRootPosition, VINE_1, -40, 0, 0) - EVT_CALL(SetAnimatorFlags, VINE_1, MODEL_ANIMATOR_FLAGS_HIDDEN, 1) + EVT_CALL(SetAnimatorFlags, VINE_1, MODEL_ANIMATOR_FLAG_HIDDEN, 1) EVT_CALL(LoadAnimatedModel, VINE_2, EVT_PTR(N(AnimModel_SideHeadVine))) EVT_CALL(N(LoadAnimationFromTable), VINE_2, 31) EVT_CALL(PlayModelAnimation, VINE_2, VINE_2_BASE) EVT_CALL(SetAnimatedModelRootPosition, VINE_2, 10, 0, 20) - EVT_CALL(SetAnimatorFlags, VINE_2, MODEL_ANIMATOR_FLAGS_HIDDEN, 1) + EVT_CALL(SetAnimatorFlags, VINE_2, MODEL_ANIMATOR_FLAG_HIDDEN, 1) EVT_CALL(LoadAnimatedModel, VINE_3, EVT_PTR(N(AnimModel_ExtraVine))) EVT_CALL(N(LoadAnimationFromTable), VINE_3, 34) EVT_CALL(PlayModelAnimation, VINE_3, VINE_3_BASE) EVT_CALL(SetAnimatedModelRootPosition, VINE_3, -40, 0, 0) - EVT_CALL(SetAnimatorFlags, VINE_3, MODEL_ANIMATOR_FLAGS_HIDDEN, 1) + EVT_CALL(SetAnimatorFlags, VINE_3, MODEL_ANIMATOR_FLAG_HIDDEN, 1) EVT_CALL(N(CreateVineRenderer)) EVT_RETURN EVT_END diff --git a/src/world/area_kmr/kmr_23/kmr_23_1_main.c b/src/world/area_kmr/kmr_23/kmr_23_1_main.c index 7ff95f5e28..19628feecb 100644 --- a/src/world/area_kmr/kmr_23/kmr_23_1_main.c +++ b/src/world/area_kmr/kmr_23/kmr_23_1_main.c @@ -31,7 +31,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(SetPlayerPos, -2, 0, 0) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_NO_FLIPPING, TRUE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, TRUE) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_WAIT(1) EVT_CALL(SetPlayerAnimation, ANIM_Mario_10024) diff --git a/src/world/area_kmr/kmr_23/kmr_23_2_npc.c b/src/world/area_kmr/kmr_23/kmr_23_2_npc.c index b65d8829b0..2692566185 100644 --- a/src/world/area_kmr/kmr_23/kmr_23_2_npc.c +++ b/src/world/area_kmr/kmr_23/kmr_23_2_npc.c @@ -230,7 +230,7 @@ API_CALLABLE(N(FlashScreenWhite)) { set_screen_overlay_color(0, 208, 208, 208); set_screen_overlay_params_front(1, data->screenWhiteness); if (data->screenWhiteness == 255) { - data->spiritCardEffect->flags |= EFFECT_INSTANCE_FLAGS_10; + data->spiritCardEffect->flags |= EFFECT_INSTANCE_FLAG_10; data->spiritCardEffect = NULL; gCameras->bgColor[0] = 208; gCameras->bgColor[1] = 208; @@ -454,7 +454,7 @@ void func_80240DA4_9087D4(void) { f64 lrx = baseX + (fullWidth * 0.5) + (D_802417CC_9091FC * 0.5); f64 lry = baseY + (fullHeight * 0.5) + (D_802417D0_909200 * 0.5); gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry); - draw_box(DRAW_FLAGS_NO_CLIP, &D_802417D8_909208, ulx, uly, 0, D_802417CC_9091FC, D_802417D0_909200, 180, 0, 1.0f, 1.0f, + draw_box(DRAW_FLAG_NO_CLIP, &D_802417D8_909208, ulx, uly, 0, D_802417CC_9091FC, D_802417D0_909200, 180, 0, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL, 320, 240, NULL); } } @@ -541,7 +541,7 @@ StaticNpc N(NpcData_Eldstar)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_01), .drops = ELDSTAR_DROPS, .animations = ELDSTAR_ANIMS, @@ -551,7 +551,7 @@ StaticNpc N(NpcData_Eldstar)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_02), .drops = ELDSTAR_DROPS, .animations = ELDSTAR_ANIMS, @@ -564,7 +564,7 @@ StaticNpc N(NpcData_Mamar)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_01), .drops = MAMAR_DROPS, .animations = MAMAR_ANIMS, @@ -574,7 +574,7 @@ StaticNpc N(NpcData_Mamar)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_02), .drops = MAMAR_DROPS, .animations = MAMAR_ANIMS, @@ -587,7 +587,7 @@ StaticNpc N(NpcData_Skolar)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_01), .drops = SKOLAR_DROPS, .animations = SKOLAR_ANIMS, @@ -597,7 +597,7 @@ StaticNpc N(NpcData_Skolar)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_02), .drops = SKOLAR_DROPS, .animations = SKOLAR_ANIMS, @@ -610,7 +610,7 @@ StaticNpc N(NpcData_Muskular)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_01), .drops = MUSKULAR_DROPS, .animations = MUSKULAR_ANIMS, @@ -620,7 +620,7 @@ StaticNpc N(NpcData_Muskular)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_02), .drops = MUSKULAR_DROPS, .animations = MUSKULAR_ANIMS, @@ -633,7 +633,7 @@ StaticNpc N(NpcData_Misstar)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_01), .drops = MISSTAR_DROPS, .animations = MISSTAR_ANIMS, @@ -643,7 +643,7 @@ StaticNpc N(NpcData_Misstar)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_02), .drops = MISSTAR_DROPS, .animations = MISSTAR_ANIMS, @@ -656,7 +656,7 @@ StaticNpc N(NpcData_Klevar)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_01), .drops = KLEVAR_DROPS, .animations = KLEVAR_ANIMS, @@ -666,7 +666,7 @@ StaticNpc N(NpcData_Klevar)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_02), .drops = KLEVAR_DROPS, .animations = KLEVAR_ANIMS, @@ -679,7 +679,7 @@ StaticNpc N(NpcData_Kalmar)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_01), .drops = KALMAR_DROPS, .animations = KALMAR_ANIMS, @@ -689,7 +689,7 @@ StaticNpc N(NpcData_Kalmar)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { -40.0f, 96.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar_02), .drops = KALMAR_DROPS, .animations = KALMAR_ANIMS, diff --git a/src/world/area_kmr/kmr_30/kmr_30_2_npc.c b/src/world/area_kmr/kmr_30/kmr_30_2_npc.c index e0030353a2..3d56d8fc4c 100644 --- a/src/world/area_kmr/kmr_30/kmr_30_2_npc.c +++ b/src/world/area_kmr/kmr_30/kmr_30_2_npc.c @@ -11,9 +11,9 @@ StaticNpc N(NpcData_ParadePeach) = { .settings = &N(NpcSettings_ParadePeach), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_kpa/kpa_01/kpa_01_3_npc.c b/src/world/area_kpa/kpa_01/kpa_01_3_npc.c index f19d9fc7db..f027981072 100644 --- a/src/world/area_kpa/kpa_01/kpa_01_3_npc.c +++ b/src/world/area_kpa/kpa_01/kpa_01_3_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_BonyBeetle_01) = { .settings = &N(NpcSettings_BonyBeetle), .pos = { 1740.0f, -215.0f, 60.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BONY_BEETLE_DROPS, .territory = { .wander = { @@ -29,7 +29,7 @@ StaticNpc N(NpcData_BonyBeetle_02) = { .settings = &N(NpcSettings_BonyBeetle), .pos = { 243.0f, 5.0f, 230.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BONY_BEETLE_DROPS, .territory = { .wander = { diff --git a/src/world/area_kpa/kpa_03/kpa_03_3_npc.c b/src/world/area_kpa/kpa_03/kpa_03_3_npc.c index 801a1c5ca8..8d348bd10b 100644 --- a/src/world/area_kpa/kpa_03/kpa_03_3_npc.c +++ b/src/world/area_kpa/kpa_03/kpa_03_3_npc.c @@ -18,7 +18,7 @@ StaticNpc N(NpcData_Koopatrol_01) = { .settings = &N(NpcSettings_Koopatrol_Wander), .pos = { 1045.0f, -255.0f, -194.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = KOOPATROL_DROPS, .territory = { .wander = { @@ -42,7 +42,7 @@ StaticNpc N(NpcData_Koopatrol_02) = { .settings = &N(NpcSettings_Koopatrol_Wander), .pos = { 950.0f, -265.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = KOOPATROL_DROPS, .territory = { .wander = { @@ -66,7 +66,7 @@ StaticNpc N(NpcData_BonyBeetle_01) = { .settings = &N(NpcSettings_BonyBeetle), .pos = { -940.0f, 140.0f, -145.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BONY_BEETLE_DROPS_ALT, .territory = { .wander = { @@ -89,7 +89,7 @@ StaticNpc N(NpcData_BonyBeetle_02) = { .settings = &N(NpcSettings_BonyBeetle), .pos = { 175.0f, -130.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BONY_BEETLE_DROPS, .territory = { .wander = { @@ -113,7 +113,7 @@ StaticNpc N(NpcData_Magikoopa_01)[] = { .settings = &N(NpcSettings_Magikoopa), .pos = { -1000.0f, -160.0f, -150.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = MAGIKOOPA_DROPS, .territory = { .wander = { diff --git a/src/world/area_kpa/kpa_08/kpa_08_4_npc.c b/src/world/area_kpa/kpa_08/kpa_08_4_npc.c index 330adfa7d1..22af388c1b 100644 --- a/src/world/area_kpa/kpa_08/kpa_08_4_npc.c +++ b/src/world/area_kpa/kpa_08/kpa_08_4_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_Magikoopa)[] = { .settings = &N(NpcSettings_Magikoopa), .pos = { -210.0f, 0.0f, 25.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = MAGIKOOPA_DROPS, .territory = { .wander = { diff --git a/src/world/area_kpa/kpa_09/kpa_09_4_npc.c b/src/world/area_kpa/kpa_09/kpa_09_4_npc.c index 21c6ed2a6c..3f9d34df2f 100644 --- a/src/world/area_kpa/kpa_09/kpa_09_4_npc.c +++ b/src/world/area_kpa/kpa_09/kpa_09_4_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_DryBones)[] = { .settings = &N(NpcSettings_DryBones), .pos = { -73.0f, 0.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_800, .drops = DRY_BONES_DROPS, .territory = { .wander = { diff --git a/src/world/area_kpa/kpa_10/kpa_10_3_npc.c b/src/world/area_kpa/kpa_10/kpa_10_3_npc.c index 51b1d8904e..22b9a79dc1 100644 --- a/src/world/area_kpa/kpa_10/kpa_10_3_npc.c +++ b/src/world/area_kpa/kpa_10/kpa_10_3_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_Prisoners)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 845.0f, 30.0f, -285.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadA, @@ -18,7 +18,7 @@ StaticNpc N(NpcData_Prisoners)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 872.0f, 30.0f, -315.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = TOAD_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveToadB, @@ -28,7 +28,7 @@ StaticNpc N(NpcData_Prisoners)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 900.0f, 30.0f, -285.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = TOAD_DROPS, .animations = TOAD_GUARD_YELLOW_ANIMS, .tattle = MSG_NpcTattle_KPA_CaptiveSoldierA, diff --git a/src/world/area_kpa/kpa_102/kpa_102_3_npc.c b/src/world/area_kpa/kpa_102/kpa_102_3_npc.c index 72d2029fd3..c9c558c5c9 100644 --- a/src/world/area_kpa/kpa_102/kpa_102_3_npc.c +++ b/src/world/area_kpa/kpa_102/kpa_102_3_npc.c @@ -9,7 +9,7 @@ StaticNpc N(NpcData_Koopatrol) = { .settings = &N(NpcSettings_Koopatrol_Wander), .pos = { -200.0f, 0.0f, -225.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = KOOPATROL_DROPS, .territory = { .wander = { @@ -32,7 +32,7 @@ StaticNpc N(NpcData_FlyingMagikoopa)[] = { .settings = &N(NpcSettings_FlyingMagikoopa), .pos = { 125.0f, 50.0f, -225.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_800, .drops = FLYING_MAGIKOOPA_DROPS, .territory = { .wander = { @@ -59,7 +59,7 @@ StaticNpc N(NpcData_HammerBros)[] = { .settings = &N(NpcSettings_HammerBros), .pos = { 450.0f, 0.0f, -225.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = HAMMER_BROS_DROPS, .territory = { .wander = { diff --git a/src/world/area_kpa/kpa_11/kpa_11_4_npc.c b/src/world/area_kpa/kpa_11/kpa_11_4_npc.c index 4543a28e61..466c6ce00b 100644 --- a/src/world/area_kpa/kpa_11/kpa_11_4_npc.c +++ b/src/world/area_kpa/kpa_11/kpa_11_4_npc.c @@ -16,7 +16,7 @@ EvtScript N(EVS_NpcDefeat_Koopatrol) = { EVT_SET(GF_KPA11_Defeated_Guard, TRUE) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(MakeItemEntity, ITEM_BOWSER_CASTLE_KEY, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_TOSS_NEVER_VANISH, GF_KPA11_Item_CastleKey2) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_SWITCH EVT_RETURN @@ -38,7 +38,7 @@ StaticNpc N(NpcData_Koopatrol) = { .settings = &N(NpcSettings_Koopatrol_Wander), .pos = { 550.0f, 30.0f, -145.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_800000, .init = &N(EVS_NpcInit_Koopatrol), .drops = NPC_NO_DROPS, .territory = { @@ -67,7 +67,7 @@ StaticNpc N(NpcData_Prisoners)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 845.0f, 30.0f, -285.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Prisoner), .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, @@ -78,7 +78,7 @@ StaticNpc N(NpcData_Prisoners)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 872.0f, 30.0f, -315.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Prisoner), .drops = TOAD_DROPS, .animations = TOAD_BLUE_ANIMS, @@ -89,7 +89,7 @@ StaticNpc N(NpcData_Prisoners)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 900.0f, 30.0f, -285.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Prisoner), .drops = TOAD_DROPS, .animations = TOAD_GUARD_YELLOW_ANIMS, diff --git a/src/world/area_kpa/kpa_111/kpa_111_4_npc.c b/src/world/area_kpa/kpa_111/kpa_111_4_npc.c index ab34cf105d..ba55953403 100644 --- a/src/world/area_kpa/kpa_111/kpa_111_4_npc.c +++ b/src/world/area_kpa/kpa_111/kpa_111_4_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_DryBones)[] = { .settings = &N(NpcSettings_DryBones), .pos = { -10.0f, 0.0f, 100.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_800, .drops = DRY_BONES_DROPS, .territory = { .wander = { @@ -35,7 +35,7 @@ StaticNpc N(NpcData_DryBones_02)[] = { .settings = &N(NpcSettings_DryBones), .pos = { 200.0f, 0.0f, 140.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_800, .drops = DRY_BONES_DROPS, .territory = { .wander = { diff --git a/src/world/area_kpa/kpa_113/kpa_113_5_npc.c b/src/world/area_kpa/kpa_113/kpa_113_5_npc.c index 4c76895d40..e6f4fe3a94 100644 --- a/src/world/area_kpa/kpa_113/kpa_113_5_npc.c +++ b/src/world/area_kpa/kpa_113/kpa_113_5_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_BonyBeetle) = { .settings = &N(NpcSettings_BonyBeetle), .pos = { 100.0f, 0.0f, 83.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BONY_BEETLE_DROPS, .territory = { .wander = { diff --git a/src/world/area_kpa/kpa_115/kpa_115_4_npc.c b/src/world/area_kpa/kpa_115/kpa_115_4_npc.c index 30013595b1..3e9eafe77f 100644 --- a/src/world/area_kpa/kpa_115/kpa_115_4_npc.c +++ b/src/world/area_kpa/kpa_115/kpa_115_4_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_HammerBros)[] = { .settings = &N(NpcSettings_HammerBros), .pos = { 100.0f, 0.0f, 120.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = HAMMER_BROS_DROPS, .territory = { .wander = { diff --git a/src/world/area_kpa/kpa_130/kpa_130_3_npc.c b/src/world/area_kpa/kpa_130/kpa_130_3_npc.c index 9229104cb3..37aefa626b 100644 --- a/src/world/area_kpa/kpa_130/kpa_130_3_npc.c +++ b/src/world/area_kpa/kpa_130/kpa_130_3_npc.c @@ -60,7 +60,7 @@ EvtScript N(EVS_NpcDefeat_BillBlaster) = { EVT_CASE_EQ(OUTCOME_PLAYER_FLED) EVT_CALL(OnPlayerFled, 0) EVT_CASE_EQ(OUTCOME_ENEMY_FLED) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_SWITCH EVT_RETURN @@ -95,7 +95,7 @@ EvtScript N(EVS_NpcDefeat_BulletBill) = { EVT_CASE_EQ(OUTCOME_PLAYER_FLED) EVT_CALL(OnPlayerFled, 0) EVT_CASE_EQ(OUTCOME_ENEMY_FLED) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_SWITCH EVT_RETURN @@ -157,7 +157,7 @@ StaticNpc N(NpcData_BillBlaster_01)[] = { .settings = &N(NpcSettings_BillBlaster), .pos = { -288.0f, 120.0f, 120.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_BillBlaster), .drops = BOMBSHELL_BLASTER_NO_DROPS, .territory = { @@ -179,7 +179,7 @@ StaticNpc N(NpcData_BillBlaster_01)[] = { .settings = &N(NpcSettings_BillBlaster), .pos = { -288.0f, 120.0f, 78.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_BillBlaster), .drops = BOMBSHELL_BLASTER_NO_DROPS, .territory = { @@ -204,7 +204,7 @@ StaticNpc N(NpcData_BillBlaster_03)[] = { .settings = &N(NpcSettings_BillBlaster), .pos = { -748.0f, 300.0f, -22.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_BillBlaster_03), .drops = BOMBSHELL_BLASTER_DROPS, .territory = { @@ -226,7 +226,7 @@ StaticNpc N(NpcData_BillBlaster_03)[] = { .settings = &N(NpcSettings_BillBlaster), .pos = { -748.0f, 300.0f, 22.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_BillBlaster_03), .drops = BOMBSHELL_BLASTER_NO_DROPS, .territory = { @@ -251,7 +251,7 @@ StaticNpc N(NpcData_BillBlaster_05)[] = { .settings = &N(NpcSettings_BillBlaster), .pos = { 30.0f, 480.0f, -122.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_BillBlaster), .drops = BOMBSHELL_BLASTER_DROPS, .territory = { @@ -273,7 +273,7 @@ StaticNpc N(NpcData_BillBlaster_05)[] = { .settings = &N(NpcSettings_BillBlaster), .pos = { 30.0f, 480.0f, -78.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_BillBlaster), .drops = BOMBSHELL_BLASTER_NO_DROPS, .territory = { @@ -298,7 +298,7 @@ StaticNpc N(NpcData_BillBlaster_07)[] = { .settings = &N(NpcSettings_BillBlaster), .pos = { 820.0f, 600.0f, -122.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_BillBlaster), .drops = BOMBSHELL_BLASTER_DROPS, .territory = { @@ -320,7 +320,7 @@ StaticNpc N(NpcData_BillBlaster_07)[] = { .settings = &N(NpcSettings_BillBlaster), .pos = { 820.0f, 600.0f, -78.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_BillBlaster), .drops = BOMBSHELL_BLASTER_NO_DROPS, .territory = { diff --git a/src/world/area_kpa/kpa_133/kpa_133_4_npc.c b/src/world/area_kpa/kpa_133/kpa_133_4_npc.c index e61a8c32f3..6046f272eb 100644 --- a/src/world/area_kpa/kpa_133/kpa_133_4_npc.c +++ b/src/world/area_kpa/kpa_133/kpa_133_4_npc.c @@ -13,7 +13,7 @@ StaticNpc N(NpcData_Dummy) = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_4000 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Toad), .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, diff --git a/src/world/area_kpa/kpa_133/kpa_133_5_water.c b/src/world/area_kpa/kpa_133/kpa_133_5_water.c index d9dba695f9..52a31e8e8a 100644 --- a/src/world/area_kpa/kpa_133/kpa_133_5_water.c +++ b/src/world/area_kpa/kpa_133/kpa_133_5_water.c @@ -19,7 +19,7 @@ EvtScript N(EVS_SetWaterLevel) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o418, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o414, SURFACE_TYPE_DOCK_WALL) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o414, COLLIDER_FLAGS_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o414, COLLIDER_FLAG_80000) EVT_CASE_EQ(2) EVT_CALL(TranslateGroup, MODEL_suimen, 0, 220, 0) EVT_CALL(EnableModel, MODEL_sui, FALSE) @@ -28,8 +28,8 @@ EvtScript N(EVS_SetWaterLevel) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_kabe_2, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o418, SURFACE_TYPE_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o440, SURFACE_TYPE_DOCK_WALL) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o418, COLLIDER_FLAGS_80000) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o440, COLLIDER_FLAGS_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o418, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o440, COLLIDER_FLAG_80000) EVT_END_SWITCH EVT_RETURN EVT_END diff --git a/src/world/area_kpa/kpa_134/kpa_134_3_chains.c b/src/world/area_kpa/kpa_134/kpa_134_3_chains.c index b25d92203c..2b5df2bc86 100644 --- a/src/world/area_kpa/kpa_134/kpa_134_3_chains.c +++ b/src/world/area_kpa/kpa_134/kpa_134_3_chains.c @@ -27,7 +27,7 @@ EvtScript N(EVS_SetupChains) = { EVT_CALL(TranslateModel, MODEL_o385, 0, 120, 0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_deiliaw, SURFACE_TYPE_DOCK_WALL) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliaw, COLLIDER_FLAGS_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliaw, COLLIDER_FLAG_80000) EVT_CASE_EQ(2) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_hidari, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(EnableModel, MODEL_o385, FALSE) @@ -277,9 +277,9 @@ EvtScript N(EVS_RaiseWaterLevel1) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_hidari, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_migi, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deiliaw, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliaw, COLLIDER_FLAGS_IGNORE_SHELL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliaw, COLLIDER_FLAG_IGNORE_SHELL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_deiliaw, SURFACE_TYPE_DOCK_WALL) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliaw, COLLIDER_FLAGS_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliaw, COLLIDER_FLAG_80000) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(DisablePlayerInput, FALSE) EVT_THREAD diff --git a/src/world/area_kpa/kpa_134/kpa_134_4_npc.c b/src/world/area_kpa/kpa_134/kpa_134_4_npc.c index 314fd246b5..52cf31b518 100644 --- a/src/world/area_kpa/kpa_134/kpa_134_4_npc.c +++ b/src/world/area_kpa/kpa_134/kpa_134_4_npc.c @@ -13,7 +13,7 @@ StaticNpc N(NpcData_Dummy) = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_4000 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Toad), .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, diff --git a/src/world/area_kpa/kpa_16/kpa_16_4_npc.c b/src/world/area_kpa/kpa_16/kpa_16_4_npc.c index 0091aae2a3..6c24cfe42f 100644 --- a/src/world/area_kpa/kpa_16/kpa_16_4_npc.c +++ b/src/world/area_kpa/kpa_16/kpa_16_4_npc.c @@ -292,7 +292,7 @@ StaticNpc N(NpcData_Guards)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 585.0f, 230.0f, -145.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000, .init = &N(EVS_NpcInit_Guards), .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, @@ -302,7 +302,7 @@ StaticNpc N(NpcData_Guards)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 525.0f, 230.0f, -165.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000, .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, }, @@ -311,7 +311,7 @@ StaticNpc N(NpcData_Guards)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 550.0f, 230.0f, -120.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000, .drops = KOOPATROL_DROPS, .animations = KOOPATROL_ANIMS, }, @@ -320,7 +320,7 @@ StaticNpc N(NpcData_Guards)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 505.0f, 230.0f, -120.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000, .drops = MAGIKOOPA_DROPS, .animations = MAGIKOOPA_ANIMS, }, diff --git a/src/world/area_kpa/kpa_17/kpa_17_4_npc.c b/src/world/area_kpa/kpa_17/kpa_17_4_npc.c index 47e7ad39ec..22809f007c 100644 --- a/src/world/area_kpa/kpa_17/kpa_17_4_npc.c +++ b/src/world/area_kpa/kpa_17/kpa_17_4_npc.c @@ -193,7 +193,7 @@ StaticNpc N(NpcData_Prisoners)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Toad_01), .drops = NPC_NO_DROPS, .animations = TOAD_RED_ANIMS, @@ -204,7 +204,7 @@ StaticNpc N(NpcData_Prisoners)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Toad_02), .drops = NPC_NO_DROPS, .animations = TOAD_BLUE_ANIMS, @@ -215,7 +215,7 @@ StaticNpc N(NpcData_Prisoners)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ToadGuard), .drops = NPC_NO_DROPS, .animations = TOAD_GUARD_YELLOW_ANIMS, @@ -226,7 +226,7 @@ StaticNpc N(NpcData_Prisoners)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ToadMinister), .drops = NPC_NO_DROPS, .animations = { diff --git a/src/world/area_kpa/kpa_50/kpa_50_3_npc.c b/src/world/area_kpa/kpa_50/kpa_50_3_npc.c index 526182e442..df8ecb51bb 100644 --- a/src/world/area_kpa/kpa_50/kpa_50_3_npc.c +++ b/src/world/area_kpa/kpa_50/kpa_50_3_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_Koopatrol_01) = { .settings = &N(NpcSettings_Koopatrol_Wander), .pos = { -251.0f, 0.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = KOOPATROL_DROPS, .territory = { .wander = { @@ -30,7 +30,7 @@ StaticNpc N(NpcData_Koopatrol_02) = { .settings = &N(NpcSettings_Koopatrol_Wander), .pos = { 100.0f, 0.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = KOOPATROL_DROPS, .territory = { .wander = { @@ -53,7 +53,7 @@ StaticNpc N(NpcData_HammerBros_01)[] = { .settings = &N(NpcSettings_HammerBros), .pos = { 450.0f, 0.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = HAMMER_BROS_DROPS, .territory = { .wander = { diff --git a/src/world/area_kpa/kpa_51/kpa_51_3_npc.c b/src/world/area_kpa/kpa_51/kpa_51_3_npc.c index dde0f0639b..19e6939aa7 100644 --- a/src/world/area_kpa/kpa_51/kpa_51_3_npc.c +++ b/src/world/area_kpa/kpa_51/kpa_51_3_npc.c @@ -10,7 +10,7 @@ StaticNpc N(NpcData_Magikoopa_01)[] = { .settings = &N(NpcSettings_Magikoopa), .pos = { -130.0f, 0.0f, -30.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = MAGIKOOPA_DROPS, .territory = { .wander = { @@ -37,7 +37,7 @@ StaticNpc N(NpcData_Magikoopa_02)[] = { .settings = &N(NpcSettings_Magikoopa), .pos = { 150.0f, 0.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = MAGIKOOPA_DROPS, .territory = { .wander = { @@ -63,7 +63,7 @@ StaticNpc N(NpcData_Koopatrol) = { .settings = &N(NpcSettings_Koopatrol_Wander), .pos = { 0.0f, 0.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = KOOPATROL_DROPS, .territory = { .wander = { diff --git a/src/world/area_kpa/kpa_52/kpa_52_4_npc.c b/src/world/area_kpa/kpa_52/kpa_52_4_npc.c index d9a70de80a..249c93229e 100644 --- a/src/world/area_kpa/kpa_52/kpa_52_4_npc.c +++ b/src/world/area_kpa/kpa_52/kpa_52_4_npc.c @@ -9,7 +9,7 @@ StaticNpc N(NpcData_HammerBros_01)[] = { .settings = &N(NpcSettings_HammerBros), .pos = { 190.0f, 0.0f, -27.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = HAMMER_BROS_DROPS, .territory = { .wander = { @@ -39,7 +39,7 @@ StaticNpc N(NpcData_HammerBros_02)[] = { .settings = &N(NpcSettings_HammerBros), .pos = { 190.0f, 120.0f, -145.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = HAMMER_BROS_DROPS, .territory = { .wander = { diff --git a/src/world/area_kpa/kpa_53/kpa_53_3_npc.c b/src/world/area_kpa/kpa_53/kpa_53_3_npc.c index b5282386ba..28ce345374 100644 --- a/src/world/area_kpa/kpa_53/kpa_53_3_npc.c +++ b/src/world/area_kpa/kpa_53/kpa_53_3_npc.c @@ -237,7 +237,7 @@ EvtScript N(EVS_NpcHit_Guardian) = { EVT_CALL(SpeakToPlayer, NPC_Follower, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_002B) EVT_ELSE EVT_CALL(SpeakToPlayer, NPC_Follower, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_002C) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_8000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 1) EVT_CALL(BindNpcAI, NPC_Duplighost, EVT_PTR(N(EVS_NpcAI_Duplighost_Caught))) EVT_END_IF EVT_END_SWITCH @@ -349,7 +349,7 @@ StaticNpc N(NpcData_Imposter)[] = { .settings = &N(NpcSettings_Peach), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_20000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_20000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_800000, .init = &N(EVS_NpcInit_Follower), .drops = NPC_NO_DROPS, .animations = { @@ -377,7 +377,7 @@ StaticNpc N(NpcData_Imposter)[] = { .settings = &N(NpcSettings_Peach), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH, .init = &N(EVS_NpcInit_Guardian), .drops = NPC_NO_DROPS, .animations = { @@ -405,10 +405,10 @@ StaticNpc N(NpcData_Imposter)[] = { .settings = &N(NpcSettings_Duplighost), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000, .init = &N(EVS_NpcInit_Duplighost), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_SUPER_SHROOM, 5, 0 }, diff --git a/src/world/area_kpa/kpa_61/kpa_61_3_npc.c b/src/world/area_kpa/kpa_61/kpa_61_3_npc.c index 046fe769a1..1a0ba677c4 100644 --- a/src/world/area_kpa/kpa_61/kpa_61_3_npc.c +++ b/src/world/area_kpa/kpa_61/kpa_61_3_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_Koopatrol_01) = { .settings = &N(NpcSettings_Koopatrol_Wander), .pos = { 300.0f, -160.0f, 140.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = KOOPATROL_DROPS, .territory = { .wander = { @@ -30,7 +30,7 @@ StaticNpc N(NpcData_Koopatrol_02) = { .settings = &N(NpcSettings_Koopatrol_Wander), .pos = { 850.0f, -160.0f, 390.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = KOOPATROL_DROPS, .territory = { .wander = { @@ -53,7 +53,7 @@ StaticNpc N(NpcData_FlyingMagikoopa_01)[] = { .settings = &N(NpcSettings_FlyingMagikoopa), .pos = { 500.0f, 250.0f, -50.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_800, .drops = FLYING_MAGIKOOPA_DROPS, .territory = { .wander = { @@ -80,7 +80,7 @@ StaticNpc N(NpcData_FlyingMagikoopa_02)[] = { .settings = &N(NpcSettings_FlyingMagikoopa), .pos = { 200.0f, 250.0f, -50.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_800, .drops = FLYING_MAGIKOOPA_DROPS, .territory = { .wander = { diff --git a/src/world/area_kpa/kpa_70/kpa_70_3_npc.c b/src/world/area_kpa/kpa_70/kpa_70_3_npc.c index e837681fa0..e6069a49ae 100644 --- a/src/world/area_kpa/kpa_70/kpa_70_3_npc.c +++ b/src/world/area_kpa/kpa_70/kpa_70_3_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_Koopatrol_01) = { .settings = &N(NpcSettings_Koopatrol_Wander), .pos = { 435.0f, 10.0f, 125.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = KOOPATROL_DROPS, .territory = { .wander = { @@ -29,7 +29,7 @@ StaticNpc N(NpcData_Koopatrol_02) = { .settings = &N(NpcSettings_Koopatrol_Wander), .pos = { 815.0f, 10.0f, 125.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = KOOPATROL_DROPS, .territory = { .wander = { diff --git a/src/world/area_kpa/kpa_81/kpa_81_3_npc.c b/src/world/area_kpa/kpa_81/kpa_81_3_npc.c index 621f0e3e97..bfb8a44cb3 100644 --- a/src/world/area_kpa/kpa_81/kpa_81_3_npc.c +++ b/src/world/area_kpa/kpa_81/kpa_81_3_npc.c @@ -218,7 +218,7 @@ StaticNpc N(NpcData_Door) = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_4000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Door), .drops = NPC_NO_DROPS, .animations = TOAD_RED_ANIMS, diff --git a/src/world/area_kpa/kpa_82/kpa_82_3_npc.c b/src/world/area_kpa/kpa_82/kpa_82_3_npc.c index 5945c64c66..64c2bc2fff 100644 --- a/src/world/area_kpa/kpa_82/kpa_82_3_npc.c +++ b/src/world/area_kpa/kpa_82/kpa_82_3_npc.c @@ -1277,10 +1277,10 @@ StaticNpc N(NpcData_AntiGuys)[] = { .settings = &N(NpcSettings_AntiGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_4000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Door), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -1308,10 +1308,10 @@ StaticNpc N(NpcData_AntiGuys)[] = { .settings = &N(NpcSettings_AntiGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_AntiGuy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -1339,10 +1339,10 @@ StaticNpc N(NpcData_AntiGuys)[] = { .settings = &N(NpcSettings_AntiGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_AntiGuy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -1370,10 +1370,10 @@ StaticNpc N(NpcData_AntiGuys)[] = { .settings = &N(NpcSettings_AntiGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_AntiGuy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -1404,7 +1404,7 @@ StaticNpc N(NpcData_Goombas)[] = { .settings = &N(NpcSettings_Short), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Goomba), .drops = GOOMBA_DROPS, .territory = { @@ -1426,7 +1426,7 @@ StaticNpc N(NpcData_Goombas)[] = { .settings = &N(NpcSettings_Short), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Goomba), .drops = GOOMBA_DROPS, .territory = { @@ -1448,7 +1448,7 @@ StaticNpc N(NpcData_Goombas)[] = { .settings = &N(NpcSettings_Short), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Goomba), .drops = GOOMBA_DROPS, .territory = { @@ -1470,7 +1470,7 @@ StaticNpc N(NpcData_Goombas)[] = { .settings = &N(NpcSettings_Short), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Goomba), .drops = GOOMBA_DROPS, .territory = { @@ -1492,7 +1492,7 @@ StaticNpc N(NpcData_Goombas)[] = { .settings = &N(NpcSettings_Short), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Goomba), .drops = GOOMBA_DROPS, .territory = { @@ -1517,10 +1517,10 @@ StaticNpc N(NpcData_RedShyGuys)[] = { .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_ShyGuy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_DIZZY_DIAL, 2, 0 }, @@ -1555,10 +1555,10 @@ StaticNpc N(NpcData_RedShyGuys)[] = { .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_ShyGuy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_DIZZY_DIAL, 2, 0 }, @@ -1593,10 +1593,10 @@ StaticNpc N(NpcData_RedShyGuys)[] = { .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_ShyGuy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_DIZZY_DIAL, 2, 0 }, @@ -1631,10 +1631,10 @@ StaticNpc N(NpcData_RedShyGuys)[] = { .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_ShyGuy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_DIZZY_DIAL, 2, 0 }, @@ -1669,10 +1669,10 @@ StaticNpc N(NpcData_RedShyGuys)[] = { .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_ShyGuy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_DIZZY_DIAL, 2, 0 }, @@ -1710,10 +1710,10 @@ StaticNpc N(NpcData_BlueShyGuys)[] = { .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_ShyGuy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_DIZZY_DIAL, 2, 0 }, @@ -1748,10 +1748,10 @@ StaticNpc N(NpcData_BlueShyGuys)[] = { .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_ShyGuy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_DIZZY_DIAL, 2, 0 }, @@ -1786,10 +1786,10 @@ StaticNpc N(NpcData_BlueShyGuys)[] = { .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_ShyGuy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_DIZZY_DIAL, 2, 0 }, @@ -1824,10 +1824,10 @@ StaticNpc N(NpcData_BlueShyGuys)[] = { .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_ShyGuy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_DIZZY_DIAL, 2, 0 }, @@ -1862,10 +1862,10 @@ StaticNpc N(NpcData_BlueShyGuys)[] = { .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_ShyGuy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_DIZZY_DIAL, 2, 0 }, @@ -1903,10 +1903,10 @@ StaticNpc N(NpcData_GreenShyGuys)[] = { .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_ShyGuy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_DIZZY_DIAL, 2, 0 }, @@ -1941,10 +1941,10 @@ StaticNpc N(NpcData_GreenShyGuys)[] = { .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_ShyGuy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_DIZZY_DIAL, 2, 0 }, @@ -1979,10 +1979,10 @@ StaticNpc N(NpcData_GreenShyGuys)[] = { .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_ShyGuy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_DIZZY_DIAL, 2, 0 }, @@ -2017,10 +2017,10 @@ StaticNpc N(NpcData_GreenShyGuys)[] = { .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_ShyGuy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_DIZZY_DIAL, 2, 0 }, @@ -2055,10 +2055,10 @@ StaticNpc N(NpcData_GreenShyGuys)[] = { .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_ShyGuy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_DIZZY_DIAL, 2, 0 }, @@ -2096,10 +2096,10 @@ StaticNpc N(NpcData_DarkTroopas)[] = { .settings = &N(NpcSettings_KoopaTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_KoopaTroopa), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_MUSHROOM, 3, 0 }, @@ -2129,10 +2129,10 @@ StaticNpc N(NpcData_DarkTroopas)[] = { .settings = &N(NpcSettings_KoopaTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_KoopaTroopa), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_MUSHROOM, 3, 0 }, @@ -2162,10 +2162,10 @@ StaticNpc N(NpcData_DarkTroopas)[] = { .settings = &N(NpcSettings_KoopaTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_KoopaTroopa), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_MUSHROOM, 3, 0 }, @@ -2195,10 +2195,10 @@ StaticNpc N(NpcData_DarkTroopas)[] = { .settings = &N(NpcSettings_KoopaTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_KoopaTroopa), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_MUSHROOM, 3, 0 }, @@ -2228,10 +2228,10 @@ StaticNpc N(NpcData_DarkTroopas)[] = { .settings = &N(NpcSettings_KoopaTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_KoopaTroopa), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_MUSHROOM, 3, 0 }, @@ -2264,10 +2264,10 @@ StaticNpc N(NpcData_KoopaTroopas)[] = { .settings = &N(NpcSettings_KoopaTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_KoopaTroopa), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_MUSHROOM, 3, 0 }, @@ -2297,10 +2297,10 @@ StaticNpc N(NpcData_KoopaTroopas)[] = { .settings = &N(NpcSettings_KoopaTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_KoopaTroopa), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_MUSHROOM, 3, 0 }, @@ -2330,10 +2330,10 @@ StaticNpc N(NpcData_KoopaTroopas)[] = { .settings = &N(NpcSettings_KoopaTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_KoopaTroopa), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_MUSHROOM, 3, 0 }, @@ -2363,10 +2363,10 @@ StaticNpc N(NpcData_KoopaTroopas)[] = { .settings = &N(NpcSettings_KoopaTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_KoopaTroopa), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_MUSHROOM, 3, 0 }, @@ -2396,10 +2396,10 @@ StaticNpc N(NpcData_KoopaTroopas)[] = { .settings = &N(NpcSettings_KoopaTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_KoopaTroopa), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_MUSHROOM, 3, 0 }, @@ -2432,10 +2432,10 @@ StaticNpc N(NpcData_Bobombs)[] = { .settings = &N(NpcSettings_Short), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Bobomb), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2475,10 +2475,10 @@ StaticNpc N(NpcData_Bobombs)[] = { .settings = &N(NpcSettings_Short), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Bobomb), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2518,10 +2518,10 @@ StaticNpc N(NpcData_Bobombs)[] = { .settings = &N(NpcSettings_Short), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Bobomb), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2561,10 +2561,10 @@ StaticNpc N(NpcData_Bobombs)[] = { .settings = &N(NpcSettings_Short), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Bobomb), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2604,10 +2604,10 @@ StaticNpc N(NpcData_Bobombs)[] = { .settings = &N(NpcSettings_Short), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_800000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_800000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Bobomb), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_kpa/kpa_83/kpa_83_3_npc.c b/src/world/area_kpa/kpa_83/kpa_83_3_npc.c index 67abbf9a0d..d2a4b8be89 100644 --- a/src/world/area_kpa/kpa_83/kpa_83_3_npc.c +++ b/src/world/area_kpa/kpa_83/kpa_83_3_npc.c @@ -340,7 +340,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_NO_STATIC_COLLISION | PS_FLAGS_ROTATION_LOCKED | PS_FLAGS_FACE_FORWARDS, TRUE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_STATIC_COLLISION | PS_FLAG_ROTATION_LOCKED | PS_FLAG_FACE_FORWARDS, TRUE) EVT_CALL(MakeLerp, 0, 11 * 180, 50, EASING_QUADRATIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -351,7 +351,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_NO_STATIC_COLLISION | PS_FLAGS_ROTATION_LOCKED | PS_FLAGS_FACE_FORWARDS, FALSE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_STATIC_COLLISION | PS_FLAG_ROTATION_LOCKED | PS_FLAG_FACE_FORWARDS, FALSE) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) EVT_END_THREAD @@ -516,7 +516,7 @@ StaticNpc N(NpcData_Enemies)[] = { .settings = &N(NpcSettings_KoopaBros), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_KoopaBros), .drops = KOOPA_BROS_DROPS, .animations = BLACK_KOOPA_BROS_ANIMS, @@ -527,7 +527,7 @@ StaticNpc N(NpcData_Enemies)[] = { .settings = &N(NpcSettings_KoopaBros), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_KoopaBros), .drops = KOOPA_BROS_DROPS, .animations = RED_KOOPA_BROS_ANIMS, @@ -538,7 +538,7 @@ StaticNpc N(NpcData_Enemies)[] = { .settings = &N(NpcSettings_KoopaBros), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_KoopaBros), .drops = KOOPA_BROS_DROPS, .animations = YELLOW_KOOPA_BROS_ANIMS, @@ -549,7 +549,7 @@ StaticNpc N(NpcData_Enemies)[] = { .settings = &N(NpcSettings_KoopaBros), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_KoopaBros), .drops = KOOPA_BROS_DROPS, .animations = GREEN_KOOPA_BROS_ANIMS, @@ -560,7 +560,7 @@ StaticNpc N(NpcData_Enemies)[] = { .settings = &N(NpcSettings_JrTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_JrTroopa), .drops = NPC_NO_DROPS, .animations = { @@ -587,7 +587,7 @@ StaticNpc N(NpcData_Enemies)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_4000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Door), .drops = NPC_NO_DROPS, .animations = TOAD_RED_ANIMS, diff --git a/src/world/area_kpa/kpa_91/kpa_91_3_npc.c b/src/world/area_kpa/kpa_91/kpa_91_3_npc.c index a77d9732a3..bc90106346 100644 --- a/src/world/area_kpa/kpa_91/kpa_91_3_npc.c +++ b/src/world/area_kpa/kpa_91/kpa_91_3_npc.c @@ -162,7 +162,7 @@ StaticNpc N(NpcData_Prisoners)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Toad_01), .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, @@ -173,7 +173,7 @@ StaticNpc N(NpcData_Prisoners)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Toad_02), .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, @@ -184,7 +184,7 @@ StaticNpc N(NpcData_Prisoners)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ToadGuard), .drops = TOAD_DROPS, .animations = TOAD_GUARD_RED_ANIMS, @@ -195,7 +195,7 @@ StaticNpc N(NpcData_Prisoners)[] = { .settings = &N(NpcSettings_Dryite), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Dryite), .drops = DRYITE_DROPS, .animations = DRYITE_GREEN_ANIMS, @@ -216,7 +216,7 @@ EvtScript N(EVS_NpcDefeat_Koopatrol) = { EVT_SET(GF_KPA91_Defeated_Guard, TRUE) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(MakeItemEntity, ITEM_PRISON_KEY1, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_TOSS_NEVER_VANISH, GF_KPA91_Item_PrisonKey1) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_SWITCH EVT_RETURN @@ -238,7 +238,7 @@ StaticNpc N(NpcData_Koopatrol) = { .settings = &N(NpcSettings_Koopatrol_Patrol), .pos = { 60.0f, 0.0f, 55.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_800000, .init = &N(EVS_NpcInit_Koopatrol), .drops = KOOPATROL_NO_DROPS, .territory = { diff --git a/src/world/area_kpa/kpa_95/kpa_95_4_npc.c b/src/world/area_kpa/kpa_95/kpa_95_4_npc.c index 3932634407..252be7e2d4 100644 --- a/src/world/area_kpa/kpa_95/kpa_95_4_npc.c +++ b/src/world/area_kpa/kpa_95/kpa_95_4_npc.c @@ -163,7 +163,7 @@ StaticNpc N(NpcData_Prisoners)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Toad_01), .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, @@ -174,7 +174,7 @@ StaticNpc N(NpcData_Prisoners)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Toad_02), .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, @@ -185,7 +185,7 @@ StaticNpc N(NpcData_Prisoners)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ToadGuard), .drops = TOAD_DROPS, .animations = TOAD_GUARD_RED_ANIMS, @@ -196,7 +196,7 @@ StaticNpc N(NpcData_Prisoners)[] = { .settings = &N(NpcSettings_Penguin), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Penguin), .drops = PENGUIN_DROPS, .animations = PENGUIN_ANIMS, @@ -217,7 +217,7 @@ EvtScript N(EVS_NpcDefeat_Koopatrol) = { EVT_SET(GF_KPA95_Defeated_Guard, TRUE) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(MakeItemEntity, ITEM_PRISON_KEY1, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_TOSS_NEVER_VANISH, GF_KPA95_Item_PrisonKey1) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_SWITCH EVT_RETURN @@ -239,7 +239,7 @@ StaticNpc N(NpcData_Koopatrol) = { .settings = &N(NpcSettings_Koopatrol_Patrol), .pos = { -70.0f, 0.0f, 55.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_800000, .init = &N(EVS_NpcInit_Koopatrol), .drops = NPC_NO_DROPS, .territory = { diff --git a/src/world/area_kpa/kpa_96/kpa_96_3_npc.c b/src/world/area_kpa/kpa_96/kpa_96_3_npc.c index 5a9ea1f92f..6aa8f574af 100644 --- a/src/world/area_kpa/kpa_96/kpa_96_3_npc.c +++ b/src/world/area_kpa/kpa_96/kpa_96_3_npc.c @@ -145,7 +145,7 @@ StaticNpc N(NpcData_SpikedGoomba) = { .settings = &N(NpcSettings_SpikedGoomba), .pos = { -122.0f, 0.0f, 163.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_SpikedGoomba), .drops = NPC_NO_DROPS, .animations = { diff --git a/src/world/area_kzn/kzn_01/kzn_01_2_npc.c b/src/world/area_kzn/kzn_01/kzn_01_2_npc.c index 21873473bd..33a566b31e 100644 --- a/src/world/area_kzn/kzn_01/kzn_01_2_npc.c +++ b/src/world/area_kzn/kzn_01/kzn_01_2_npc.c @@ -50,7 +50,7 @@ StaticNpc N(NpcPutridPiranha) = { .settings = &N(NpcSettings_PutridPiranhaSentinel), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_PutridPiranha), .drops = PIRANHA_SENTINEL_DROPS, .animations = PIRANHA_SENTINEL_ANIMS, diff --git a/src/world/area_kzn/kzn_02/kzn_02_3_npc.c b/src/world/area_kzn/kzn_02/kzn_02_3_npc.c index 93a5f84763..224539f401 100644 --- a/src/world/area_kzn/kzn_02/kzn_02_3_npc.c +++ b/src/world/area_kzn/kzn_02/kzn_02_3_npc.c @@ -167,7 +167,7 @@ StaticNpc N(NpcData_Kolorado) = { .settings = &N(NpcSettings_Kolorado), .pos = { -740.0f, 20.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Kolorado), .drops = KOLORADO_DROPS, .animations = KOLORADO_ANIMS, @@ -179,7 +179,7 @@ StaticNpc N(NpcData_LavaBubble) = { .settings = &N(NpcSettings_LavaBubble), .pos = { 250.0f, 50.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = LAVA_BUBBLE_DROPS, .territory = { .wander = { diff --git a/src/world/area_kzn/kzn_03/kzn_03_2_npc.c b/src/world/area_kzn/kzn_03/kzn_03_2_npc.c index eea4660b3c..f64d134b8d 100644 --- a/src/world/area_kzn/kzn_03/kzn_03_2_npc.c +++ b/src/world/area_kzn/kzn_03/kzn_03_2_npc.c @@ -170,7 +170,7 @@ StaticNpc N(NpcData_PassiveNPCs)[] = { .settings = &N(NpcSettings_Kolorado), .pos = { 392.0f, 470.0f, 218.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Kolorado), .drops = KOLORADO_DROPS, .animations = KOLORADO_ANIMS, @@ -181,7 +181,7 @@ StaticNpc N(NpcData_PassiveNPCs)[] = { .settings = &N(NpcSettings_ZiplineDummy), .pos = { 392.0f, 470.0f, 218.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_ZiplineDummy), .drops = KOLORADO_DROPS, .animations = KOLORADO_ANIMS, @@ -192,7 +192,7 @@ StaticNpc N(NpcData_PassiveNPCs)[] = { .settings = &N(NpcSettings_ZiplineDummy), .pos = { 392.0f, 470.0f, 218.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_ZiplineDummy), .drops = KOLORADO_DROPS, .animations = KOLORADO_ANIMS, @@ -205,7 +205,7 @@ StaticNpc N(NpcData_SpikeTop_01) = { .settings = &N(NpcSettings_SpikeTop), .pos = { 140.0f, 670.0f, -20.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = SPIKE_TOP_DROPS, .territory = { .wander = { @@ -228,7 +228,7 @@ StaticNpc N(NpcData_SpikeTop_02) = { .settings = &N(NpcSettings_SpikeTop), .pos = { -200.0f, 670.0f, -35.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = SPIKE_TOP_DROPS, .territory = { .wander = { @@ -251,7 +251,7 @@ StaticNpc N(NpcData_SpikeTop_03) = { .settings = &N(NpcSettings_SpikeTop), .pos = { 30.0f, 20.0f, 320.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = SPIKE_TOP_DROPS, .territory = { .wander = { @@ -275,7 +275,7 @@ StaticNpc N(NpcData_PutridPiranha)[] = { .settings = &N(NpcSettings_PutridPiranha), .pos = { 260.0f, 20.0f, 255.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = PUTRID_PIRANHA_DROPS, .territory = { .wander = { diff --git a/src/world/area_kzn/kzn_03/kzn_03_3_entity.c b/src/world/area_kzn/kzn_03/kzn_03_3_entity.c index 8b0af03784..fe89b4f541 100644 --- a/src/world/area_kzn/kzn_03/kzn_03_3_entity.c +++ b/src/world/area_kzn/kzn_03/kzn_03_3_entity.c @@ -41,7 +41,7 @@ EvtScript N(EVS_UseSpringA) = { EVT_EXEC_GET_TID(N(EVS_TetherCameraToPlayer), LVarA) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.7)) EVT_CALL(PlayerJump, 335, 290, 360, 40) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_FLYING, TRUE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_FLYING, TRUE) EVT_CALL(SetPlayerActionState, ACTION_STATE_FALLING) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_KILL_THREAD(LVarA) diff --git a/src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c b/src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c index dcaaa28535..4f86bf80d8 100644 --- a/src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c +++ b/src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c @@ -138,7 +138,7 @@ EvtScript N(EVS_RideZipline) = { EVT_END_IF EVT_CALL(PlaySound, SOUND_2087) EVT_LABEL(10) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_SCRIPTED_FALL, TRUE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_SCRIPTED_FALL, TRUE) EVT_SET(MF_RidingZipline1, FALSE) EVT_CALL(StopSound, SOUND_80000019) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, FALSE) diff --git a/src/world/area_kzn/kzn_04/kzn_04_3_npc.c b/src/world/area_kzn/kzn_04/kzn_04_3_npc.c index de3b6458c1..5624b08807 100644 --- a/src/world/area_kzn/kzn_04/kzn_04_3_npc.c +++ b/src/world/area_kzn/kzn_04/kzn_04_3_npc.c @@ -116,7 +116,7 @@ NpcSettings N(NpcSettings_FireBar_01) = { .height = 12, .radius = 20, .ai = &N(EVS_NpcAI_FireBar_01), - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_FireBar_02) = { @@ -124,7 +124,7 @@ NpcSettings N(NpcSettings_FireBar_02) = { .height = 12, .radius = 20, .ai = &N(EVS_NpcAI_FireBar_02), - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_FireBar_03) = { @@ -132,14 +132,14 @@ NpcSettings N(NpcSettings_FireBar_03) = { .height = 12, .radius = 20, .ai = &N(EVS_NpcAI_FireBar_03), - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_FireBar_Extra) = { .defaultAnim = ANIM_Fire_Brighest_Burn, .height = 12, .radius = 25, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; StaticNpc N(NpcData_FireBar_01)[] = { @@ -148,7 +148,7 @@ StaticNpc N(NpcData_FireBar_01)[] = { .settings = &N(NpcSettings_FireBar_01), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -158,7 +158,7 @@ StaticNpc N(NpcData_FireBar_01)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -168,7 +168,7 @@ StaticNpc N(NpcData_FireBar_01)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -178,7 +178,7 @@ StaticNpc N(NpcData_FireBar_01)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -191,7 +191,7 @@ StaticNpc N(NpcData_FireBar_02)[] = { .settings = &N(NpcSettings_FireBar_02), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -201,7 +201,7 @@ StaticNpc N(NpcData_FireBar_02)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -211,7 +211,7 @@ StaticNpc N(NpcData_FireBar_02)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -221,7 +221,7 @@ StaticNpc N(NpcData_FireBar_02)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -234,7 +234,7 @@ StaticNpc N(NpcData_FireBar_03)[] = { .settings = &N(NpcSettings_FireBar_03), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -244,7 +244,7 @@ StaticNpc N(NpcData_FireBar_03)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -254,7 +254,7 @@ StaticNpc N(NpcData_FireBar_03)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -264,7 +264,7 @@ StaticNpc N(NpcData_FireBar_03)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, diff --git a/src/world/area_kzn/kzn_06/kzn_06_3_extra.c b/src/world/area_kzn/kzn_06/kzn_06_3_extra.c index 12d1b024e7..21e798b5d4 100644 --- a/src/world/area_kzn/kzn_06/kzn_06_3_extra.c +++ b/src/world/area_kzn/kzn_06/kzn_06_3_extra.c @@ -26,7 +26,7 @@ API_CALLABLE(N(AdjustFog)) { Model* mdl = get_model_from_list_index(treeIndex); set_mdl_custom_gfx_set(mdl, -1, 3); if (mode) { - mdl->flags &= ~MODEL_FLAGS_ENABLED; + mdl->flags &= ~MODEL_FLAG_ENABLED; } } script->functionTemp[0] = duration; @@ -47,7 +47,7 @@ API_CALLABLE(N(AdjustFog)) { Model* mdl = get_model_from_list_index(treeIndex); set_mdl_custom_gfx_set(mdl, -1, 0); if (!mode) { - mdl->flags |= MODEL_FLAGS_ENABLED; + mdl->flags |= MODEL_FLAG_ENABLED; } } return ApiStatus_DONE1; diff --git a/src/world/area_kzn/kzn_07/kzn_07_4_npc.c b/src/world/area_kzn/kzn_07/kzn_07_4_npc.c index 45a6b9443b..054655a583 100644 --- a/src/world/area_kzn/kzn_07/kzn_07_4_npc.c +++ b/src/world/area_kzn/kzn_07/kzn_07_4_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_LavaBubble_01) = { .settings = &N(NpcSettings_LavaBubble), .pos = { -200.0f, 50.0f, 150.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = LAVA_BUBBLE_DROPS, .territory = { .wander = { @@ -31,7 +31,7 @@ StaticNpc N(NpcData_LavaBubble_02) = { .settings = &N(NpcSettings_LavaBubble), .pos = { -250.0f, 80.0f, 50.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = LAVA_BUBBLE_DROPS, .territory = { .wander = { diff --git a/src/world/area_kzn/kzn_08/kzn_08_3_npc.c b/src/world/area_kzn/kzn_08/kzn_08_3_npc.c index 6d3d606cb7..a4a43e40b2 100644 --- a/src/world/area_kzn/kzn_08/kzn_08_3_npc.c +++ b/src/world/area_kzn/kzn_08/kzn_08_3_npc.c @@ -9,7 +9,7 @@ StaticNpc N(NpcData_PutridPiranha)[] = { .settings = &N(NpcSettings_PutridPiranha), .pos = { 80.0f, 0.0f, 135.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400, .drops = PUTRID_PIRANHA_DROPS, .territory = { .wander = { diff --git a/src/world/area_kzn/kzn_09/kzn_09_3_zipline.c b/src/world/area_kzn/kzn_09/kzn_09_3_zipline.c index 7a63cb9cc1..4375e2e6dc 100644 --- a/src/world/area_kzn/kzn_09/kzn_09_3_zipline.c +++ b/src/world/area_kzn/kzn_09/kzn_09_3_zipline.c @@ -132,7 +132,7 @@ EvtScript N(EVS_RideZipline) = { EVT_END_IF EVT_CALL(PlaySound, SOUND_2087) EVT_LABEL(10) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_SCRIPTED_FALL, TRUE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_SCRIPTED_FALL, TRUE) EVT_SET(MF_Zipline_GoingDown, FALSE) EVT_CALL(StopSound, SOUND_80000019) EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, FALSE) diff --git a/src/world/area_kzn/kzn_09/kzn_09_4_npc.c b/src/world/area_kzn/kzn_09/kzn_09_4_npc.c index d7881c92c9..e8cea9dcee 100644 --- a/src/world/area_kzn/kzn_09/kzn_09_4_npc.c +++ b/src/world/area_kzn/kzn_09/kzn_09_4_npc.c @@ -231,7 +231,7 @@ StaticNpc N(NpcData_PassiveNPCs)[] = { .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .init = &N(EVS_Kolorado_Init), .drops = KOLORADO_DROPS, .animations = KOLORADO_ANIMS, @@ -242,7 +242,7 @@ StaticNpc N(NpcData_PassiveNPCs)[] = { .settings = &N(NpcSettings_Zipline), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_Dummy_Init), .drops = KOLORADO_DROPS, .animations = KOLORADO_ANIMS, @@ -255,7 +255,7 @@ StaticNpc N(NpcData_SpikeTop) = { .settings = &N(NpcSettings_SpikeTop), .pos = { -100.0f, 350.0f, 50.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = SPIKE_TOP_DROPS, .territory = { .wander = { @@ -279,7 +279,7 @@ StaticNpc N(NpcData_PutridPiranha)[] = { .settings = &N(NpcSettings_PutridPiranha), .pos = { 200.0f, 350.0f, 100.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = PUTRID_PIRANHA_DROPS, .territory = { .wander = { diff --git a/src/world/area_kzn/kzn_10/kzn_10_1_main.c b/src/world/area_kzn/kzn_10/kzn_10_1_main.c index 2183eb248e..999d74129d 100644 --- a/src/world/area_kzn/kzn_10/kzn_10_1_main.c +++ b/src/world/area_kzn/kzn_10/kzn_10_1_main.c @@ -13,7 +13,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; API_CALLABLE(N(func_8024030C_C7E48C)) { - if (gPlayerStatus.flags & PS_FLAGS_CAMERA_DOESNT_FOLLOW) { + if (gPlayerStatus.flags & PS_FLAG_CAMERA_DOESNT_FOLLOW) { return ApiStatus_BLOCK; } else { return ApiStatus_DONE2; diff --git a/src/world/area_kzn/kzn_11/kzn_11_3_npc.c b/src/world/area_kzn/kzn_11/kzn_11_3_npc.c index a564c4b19f..5a9c784a7c 100644 --- a/src/world/area_kzn/kzn_11/kzn_11_3_npc.c +++ b/src/world/area_kzn/kzn_11/kzn_11_3_npc.c @@ -117,7 +117,7 @@ NpcSettings N(NpcSettings_FireBar_01) = { .height = 12, .radius = 20, .ai = &N(EVS_NpcAI_FireBar_01), - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_FireBar_02) = { @@ -125,7 +125,7 @@ NpcSettings N(NpcSettings_FireBar_02) = { .height = 12, .radius = 20, .ai = &N(EVS_NpcAI_FireBar_02), - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_FireBar_03) = { @@ -133,14 +133,14 @@ NpcSettings N(NpcSettings_FireBar_03) = { .height = 12, .radius = 20, .ai = &N(EVS_NpcAI_FireBar_03), - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_FireBar_Extra) = { .defaultAnim = ANIM_Fire_Brighest_Burn, .height = 12, .radius = 20, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; StaticNpc N(NpcData_FireBar_01)[] = { @@ -149,7 +149,7 @@ StaticNpc N(NpcData_FireBar_01)[] = { .settings = &N(NpcSettings_FireBar_01), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -159,7 +159,7 @@ StaticNpc N(NpcData_FireBar_01)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -169,7 +169,7 @@ StaticNpc N(NpcData_FireBar_01)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -179,7 +179,7 @@ StaticNpc N(NpcData_FireBar_01)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -192,7 +192,7 @@ StaticNpc N(NpcData_FireBar_02)[] = { .settings = &N(NpcSettings_FireBar_02), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -202,7 +202,7 @@ StaticNpc N(NpcData_FireBar_02)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -212,7 +212,7 @@ StaticNpc N(NpcData_FireBar_02)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -222,7 +222,7 @@ StaticNpc N(NpcData_FireBar_02)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -235,7 +235,7 @@ StaticNpc N(NpcData_FireBar_03)[] = { .settings = &N(NpcSettings_FireBar_03), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -245,7 +245,7 @@ StaticNpc N(NpcData_FireBar_03)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -255,7 +255,7 @@ StaticNpc N(NpcData_FireBar_03)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -265,7 +265,7 @@ StaticNpc N(NpcData_FireBar_03)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -277,7 +277,7 @@ StaticNpc N(NpcData_Bubble_01) = { .settings = &N(NpcSettings_LavaBubble), .pos = { -150.0f, 50.0f, 10.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = LAVA_BUBBLE_DROPS, .territory = { .wander = { @@ -300,7 +300,7 @@ StaticNpc N(NpcData_Bubble_02) = { .settings = &N(NpcSettings_LavaBubble), .pos = { 150.0f, 50.0f, 10.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = LAVA_BUBBLE_DROPS, .territory = { .wander = { diff --git a/src/world/area_kzn/kzn_17/kzn_17_3_npc.c b/src/world/area_kzn/kzn_17/kzn_17_3_npc.c index 285ad34915..570cc401f6 100644 --- a/src/world/area_kzn/kzn_17/kzn_17_3_npc.c +++ b/src/world/area_kzn/kzn_17/kzn_17_3_npc.c @@ -41,7 +41,7 @@ EvtScript N(EVS_Kolorado_TrompPanic) = { }; EvtScript N(EVS_Kolorado_TrompImpact) = { - EVT_CALL(SetEnemyFlagBits, NPC_Kolorado, ENEMY_FLAGS_400000, 1) + EVT_CALL(SetEnemyFlagBits, NPC_Kolorado, ENEMY_FLAG_400000, 1) EVT_CALL(func_802CDE68, 0, 13) EVT_CALL(SetNpcRotation, NPC_Kolorado, 0, 0, 250) EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_HurtStill) @@ -66,7 +66,7 @@ EvtScript N(EVS_Kolorado_TrompImpact) = { EvtScript N(EVS_Kolorado_HurtInit) = { EVT_CALL(SetNpcPos, NPC_Kolorado, 447, 0, 70) EVT_CALL(SetNpcYaw, NPC_Kolorado, 270) - EVT_CALL(SetEnemyFlagBits, NPC_Kolorado, ENEMY_FLAGS_400000, 1) + EVT_CALL(SetEnemyFlagBits, NPC_Kolorado, ENEMY_FLAG_400000, 1) EVT_CALL(func_802CDE68, 0, 13) EVT_CALL(SetNpcRotation, NPC_Kolorado, 0, 0, 250) EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_HurtStill) @@ -138,7 +138,7 @@ StaticNpc N(NpcData_Kolorado) = { .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kolorado), .drops = KOLORADO_DROPS, .animations = KOLORADO_ANIMS, @@ -151,7 +151,7 @@ StaticNpc N(NpcData_Piranha)[] = { .settings = &N(NpcSettings_PutridPiranha), .pos = { -325.0f, 0.0f, 150.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = PUTRID_PIRANHA_DROPS, .territory = { .wander = { @@ -176,7 +176,7 @@ StaticNpc N(NpcData_SpikeTop) = { .settings = &N(NpcSettings_SpikeTop), .pos = { -450.0f, 0.0f, 100.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = SPIKE_TOP_DROPS, .territory = { .wander = { diff --git a/src/world/area_kzn/kzn_18/kzn_18_2_npc.c b/src/world/area_kzn/kzn_18/kzn_18_2_npc.c index 88d71a6c81..ea3faea876 100644 --- a/src/world/area_kzn/kzn_18/kzn_18_2_npc.c +++ b/src/world/area_kzn/kzn_18/kzn_18_2_npc.c @@ -148,7 +148,7 @@ StaticNpc N(NpcData_Kolorado) = { .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Kolorado), .drops = KOLORADO_DROPS, .animations = KOLORADO_ANIMS, @@ -160,7 +160,7 @@ StaticNpc N(NpcData_Piranha) = { .settings = &N(NpcSettings_PutridPiranhaSentinel), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Piranha), .drops = PIRANHA_SENTINEL_DROPS, .animations = PIRANHA_SENTINEL_ANIMS, diff --git a/src/world/area_kzn/kzn_19/kzn_19_4_npc.c b/src/world/area_kzn/kzn_19/kzn_19_4_npc.c index 37da30e1fa..4c739de4e3 100644 --- a/src/world/area_kzn/kzn_19/kzn_19_4_npc.c +++ b/src/world/area_kzn/kzn_19/kzn_19_4_npc.c @@ -259,22 +259,22 @@ EvtScript N(EVS_NpcIdle_LavaPiranha) = { EVT_CALL(N(LoadAnimationFromTable), VINE_0, 0) EVT_CALL(PlayModelAnimation, VINE_0, VINE_0_BASE) EVT_CALL(SetAnimatedModelRootPosition, VINE_0, 220, -100, -40) - EVT_CALL(SetAnimatorFlags, VINE_0, MODEL_ANIMATOR_FLAGS_HIDDEN, 1) + EVT_CALL(SetAnimatorFlags, VINE_0, MODEL_ANIMATOR_FLAG_HIDDEN, 1) EVT_CALL(LoadAnimatedModel, VINE_1, EVT_PTR(N(AnimModel_SideHeadVine))) EVT_CALL(N(LoadAnimationFromTable), VINE_1, 31) EVT_CALL(PlayModelAnimation, VINE_1, VINE_1_BASE) EVT_CALL(SetAnimatedModelRootPosition, VINE_1, 220, -100, -40) - EVT_CALL(SetAnimatorFlags, VINE_1, MODEL_ANIMATOR_FLAGS_HIDDEN, 1) + EVT_CALL(SetAnimatorFlags, VINE_1, MODEL_ANIMATOR_FLAG_HIDDEN, 1) EVT_CALL(LoadAnimatedModel, VINE_2, EVT_PTR(N(AnimModel_SideHeadVine))) EVT_CALL(N(LoadAnimationFromTable), VINE_2, 31) EVT_CALL(PlayModelAnimation, VINE_2, VINE_2_BASE) EVT_CALL(SetAnimatedModelRootPosition, VINE_2, 270, -100, -20) - EVT_CALL(SetAnimatorFlags, VINE_2, MODEL_ANIMATOR_FLAGS_HIDDEN, 1) + EVT_CALL(SetAnimatorFlags, VINE_2, MODEL_ANIMATOR_FLAG_HIDDEN, 1) EVT_CALL(LoadAnimatedModel, VINE_3, EVT_PTR(N(AnimModel_ExtraVine))) EVT_CALL(N(LoadAnimationFromTable), VINE_3, 34) EVT_CALL(PlayModelAnimation, VINE_3, VINE_3_BASE) EVT_CALL(SetAnimatedModelRootPosition, VINE_3, 220, -100, -40) - EVT_CALL(SetAnimatorFlags, VINE_3, MODEL_ANIMATOR_FLAGS_HIDDEN, 1) + EVT_CALL(SetAnimatorFlags, VINE_3, MODEL_ANIMATOR_FLAG_HIDDEN, 1) EVT_CALL(N(CreateVineRenderer)) EVT_CALL(SetSelfVar, 1, 1) EVT_CALL(InterpPlayerYaw, 90, 0) @@ -541,7 +541,7 @@ EvtScript N(EVS_NpcDefeat_LavaPiranha) = { EVT_CALL(GetBattleOutcome, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(OUTCOME_PLAYER_WON) - EVT_CALL(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAGS_2, TRUE) + EVT_CALL(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_2, TRUE) EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) EVT_CALL(SetPlayerPos, 125, 25, -35) EVT_CALL(SetNpcPos, NPC_PARTNER, 100, 25, -35) @@ -618,7 +618,7 @@ StaticNpc N(NpcData_Kolorado) = { .settings = &N(NpcSettings_Kolorado), .pos = { 380.0f, 250.0f, -330.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kolorado), .drops = KOLORADO_DROPS, .animations = KOLORADO_ANIMS, @@ -630,7 +630,7 @@ StaticNpc N(NpcData_Misstar) = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_400000, .drops = MISSTAR_DROPS, .animations = MISSTAR_ANIMS, .tattle = MSG_NpcTattle_Misstar, @@ -653,7 +653,7 @@ StaticNpc N(NpcData_LavaPiranha)[] = { .settings = &N(NpcSettings_LavaPiranhaHead), .pos = { 400.0f, 25.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_LavaPiranha), .drops = LAVA_PIRANHA_DROPS, .animations = LAVA_PIRANHA_HEAD_ANIMS, @@ -665,7 +665,7 @@ StaticNpc N(NpcData_LavaPiranha)[] = { .settings = &N(NpcSettings_LavaPiranhaHead), .pos = { 400.0f, 25.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_LavaBud), .drops = LAVA_PIRANHA_DROPS, .animations = LAVA_PIRANHA_BUD_ANIMS, @@ -677,7 +677,7 @@ StaticNpc N(NpcData_LavaPiranha)[] = { .settings = &N(NpcSettings_LavaPiranhaHead), .pos = { 400.0f, 25.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_LavaBud), .drops = LAVA_PIRANHA_DROPS, .animations = LAVA_PIRANHA_BUD_ANIMS, diff --git a/src/world/area_kzn/kzn_20/kzn_20_3_npc.c b/src/world/area_kzn/kzn_20/kzn_20_3_npc.c index 99a0eb85f1..bef7a7c744 100644 --- a/src/world/area_kzn/kzn_20/kzn_20_3_npc.c +++ b/src/world/area_kzn/kzn_20/kzn_20_3_npc.c @@ -530,7 +530,7 @@ StaticNpc N(NpcData_Kolorado) = { .settings = &N(NpcSettings_Kolorado), .pos = { -65.0f, 0.0f, 190.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kolorado), .drops = KOLORADO_DROPS, .animations = KOLORADO_ANIMS, @@ -542,7 +542,7 @@ StaticNpc N(NpcData_Misstar) = { .settings = &N(NpcSettings_StarSpirit), .pos = { 100.0f, 160.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Misstar), .drops = MISSTAR_DROPS, .animations = MISSTAR_ANIMS, diff --git a/src/world/area_kzn/kzn_22/kzn_22_4_npc.c b/src/world/area_kzn/kzn_22/kzn_22_4_npc.c index ca52154877..406c97759b 100644 --- a/src/world/area_kzn/kzn_22/kzn_22_4_npc.c +++ b/src/world/area_kzn/kzn_22/kzn_22_4_npc.c @@ -267,7 +267,7 @@ StaticNpc N(NpcData_Kolorado) = { .settings = &N(NpcSettings_Kolorado), .pos = { 445.0f, 150.0f, 175.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Kolorado), .drops = KOLORADO_DROPS, .animations = KOLORADO_ANIMS, @@ -279,7 +279,7 @@ StaticNpc N(NpcData_Misstar) = { .settings = &N(NpcSettings_StarSpirit), .pos = { 285.0f, 160.0f, 80.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Misstar), .drops = MISSTAR_DROPS, .animations = MISSTAR_ANIMS, diff --git a/src/world/area_kzn/kzn_23/kzn_23_3_npc.c b/src/world/area_kzn/kzn_23/kzn_23_3_npc.c index c7f485e4c7..ad287a6438 100644 --- a/src/world/area_kzn/kzn_23/kzn_23_3_npc.c +++ b/src/world/area_kzn/kzn_23/kzn_23_3_npc.c @@ -280,7 +280,7 @@ StaticNpc N(NpcData_Kolorado) = { .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Kolorado), .drops = KOLORADO_DROPS, .animations = KOLORADO_ANIMS, @@ -292,7 +292,7 @@ StaticNpc N(NpcData_Misstar) = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_Misstar), .drops = MISSTAR_DROPS, .animations = MISSTAR_ANIMS, diff --git a/src/world/area_mac/mac_00/mac_00_10_shared_npc.c b/src/world/area_mac/mac_00/mac_00_10_shared_npc.c index 2166ccb4ad..9189f53f43 100644 --- a/src/world/area_mac/mac_00/mac_00_10_shared_npc.c +++ b/src/world/area_mac/mac_00/mac_00_10_shared_npc.c @@ -578,7 +578,7 @@ StaticNpc N(NpcData_SharedTownsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary_Shared), .pos = { -150.0f, 0.0f, -275.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Toad_04), .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, @@ -589,7 +589,7 @@ StaticNpc N(NpcData_SharedTownsfolk)[] = { .settings = &N(NpcSettings_Toad_Wander_Shared), .pos = { 219.0f, 0.0f, -45.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_Toad_05), .drops = TOAD_DROPS, .territory = { @@ -617,7 +617,7 @@ StaticNpc N(NpcData_SharedTownsfolk)[] = { .settings = &N(NpcSettings_Toad_Patrol_Shared), .pos = { -290.0f, 0.0f, -120.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_Toad_06), .drops = TOAD_DROPS, .territory = { @@ -642,7 +642,7 @@ StaticNpc N(NpcData_SharedTownsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary_Shared), .pos = { -40.0f, 0.0f, 61.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_FickleLover), .drops = TOAD_DROPS, .animations = TOAD_BLUE_ANIMS, @@ -653,7 +653,7 @@ StaticNpc N(NpcData_SharedTownsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary_Shared), .pos = { -15.0f, 0.0f, 60.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ShamelessLover), .drops = TOADETTE_DROPS, .animations = TOADETTE_PINK_ANIMS, @@ -664,7 +664,7 @@ StaticNpc N(NpcData_SharedTownsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary_Shared), .pos = { 426.0f, 20.0f, 268.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_KrisT), .drops = TOADETTE_DROPS, .animations = TOADETTE_GREEN_ANIMS, @@ -675,7 +675,7 @@ StaticNpc N(NpcData_SharedTownsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary_Shared), .pos = { 381.0f, 20.0f, 326.0f }, .yaw = 180, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_MissT), .drops = TOADETTE_DROPS, .animations = TOADETTE_ORANGE_ANIMS, @@ -686,7 +686,7 @@ StaticNpc N(NpcData_SharedTownsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary_Shared), .pos = { 476.0f, 20.0f, 326.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_FelissaT), .drops = TOADETTE_DROPS, .animations = TOADETTE_PURPLE_ANIMS, @@ -697,7 +697,7 @@ StaticNpc N(NpcData_SharedTownsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary_Shared), .pos = { 424.0f, 20.0f, -85.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_DojoSpectator), .drops = TOAD_DROPS, .animations = TOAD_BLUE_ANIMS, @@ -708,7 +708,7 @@ StaticNpc N(NpcData_SharedTownsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary_Shared), .pos = { 373.0f, 0.0f, 22.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_DojoFan), .drops = TOAD_DROPS, .animations = TOAD_YELLOW_ANIMS, diff --git a/src/world/area_mac/mac_00/mac_00_11_intro_npc.c b/src/world/area_mac/mac_00/mac_00_11_intro_npc.c index 6d9c712b27..13e6c4f0d2 100644 --- a/src/world/area_mac/mac_00/mac_00_11_intro_npc.c +++ b/src/world/area_mac/mac_00/mac_00_11_intro_npc.c @@ -40,7 +40,7 @@ StaticNpc N(NpcData_IntroNPCs)[] = { .settings = &N(NpcSettings_Luigi_Intro), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = LUIGI_DROPS, .animations = LUIGI_ANIMS, }, @@ -49,7 +49,7 @@ StaticNpc N(NpcData_IntroNPCs)[] = { .settings = &N(NpcSettings_Toad_Stationary_Intro), .pos = { -150.0f, 0.0f, -275.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_GateGuardian, @@ -59,7 +59,7 @@ StaticNpc N(NpcData_IntroNPCs)[] = { .settings = &N(NpcSettings_Toad_Wander_Intro), .pos = { 219.0f, 0.0f, -45.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .drops = TOAD_DROPS, .territory = { .patrol = { @@ -86,7 +86,7 @@ StaticNpc N(NpcData_IntroNPCs)[] = { .settings = &N(NpcSettings_Toad_Stationary_Intro), .pos = { 424.0f, 20.0f, -85.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .drops = TOAD_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_MAC_DojoSpectator, @@ -96,10 +96,10 @@ StaticNpc N(NpcData_IntroNPCs)[] = { .settings = &N(NpcSettings_Toad_Stationary_Intro), .pos = { 310.0f, 115.0f, -390.0f }, .yaw = 45, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Chan_Intro), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -114,10 +114,10 @@ StaticNpc N(NpcData_IntroNPCs)[] = { .settings = &N(NpcSettings_Toad_Stationary_Intro), .pos = { 330.0f, 115.0f, -410.0f }, .yaw = 45, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Lee_Intro), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_mac/mac_00/mac_00_13_epilogue_npc.c b/src/world/area_mac/mac_00/mac_00_13_epilogue_npc.c index c481f9a10e..0c59c6220e 100644 --- a/src/world/area_mac/mac_00/mac_00_13_epilogue_npc.c +++ b/src/world/area_mac/mac_00/mac_00_13_epilogue_npc.c @@ -151,7 +151,7 @@ StaticNpc N(NpcData_Luigi_Epilogue) = { .settings = &N(NpcSettings_Luigi_Epilogue), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = LUIGI_DROPS, .animations = LUIGI_ANIMS, .extraAnimations = N(ExtraAnims_Luigi_Epilogue), @@ -184,7 +184,7 @@ StaticNpc N(NpcData_GoombaFamilypa_Epilogue)[] = { .settings = &N(NpcSettings_GoombaFamily_Epilogue), .pos = { 70.0f, 0.0f, -30.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_Goompapa_Epilogue), .drops = GOOMPAPA_DROPS, .animations = GOOMPAPA_ANIMS, @@ -196,7 +196,7 @@ StaticNpc N(NpcData_GoombaFamilypa_Epilogue)[] = { .settings = &N(NpcSettings_GoombaFamily_Epilogue), .pos = { 40.0f, 0.0f, 20.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_Goomama_Epilogue), .drops = GOOMAMA_DROPS, .animations = GOOMAMA_ANIMS, @@ -208,7 +208,7 @@ StaticNpc N(NpcData_GoombaFamilypa_Epilogue)[] = { .settings = &N(NpcSettings_GoombaFamily_Epilogue), .pos = { 20.0f, 0.0f, -35.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_Gooma_Epilogue), .drops = GOOMA_DROPS, .animations = GOOMA_ANIMS, @@ -237,10 +237,10 @@ StaticNpc N(NpcData_ChuckQuizmo_Epilogue)[] = { .settings = &N(NpcSettings_Luigi_Epilogue), .pos = { 545.0f, 20.0f, 150.0f }, .yaw = 30, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ChuckQuizmo_Epilogue), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -270,10 +270,10 @@ StaticNpc N(NpcData_ChuckQuizmo_Epilogue)[] = { .settings = &N(NpcSettings_Toad_Stationary_Epilogue), .pos = { 500.0f, 20.0f, -130.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_VannaT_Epilogue), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -327,10 +327,10 @@ StaticNpc N(NpcData_DojoMembers_Epilogue)[] = { .settings = &N(NpcSettings_Luigi_Epilogue), .pos = { 375.0f, 115.0f, -440.0f }, .yaw = 225, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_TheMaster_Epilogue), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -360,10 +360,10 @@ StaticNpc N(NpcData_DojoMembers_Epilogue)[] = { .settings = &N(NpcSettings_Luigi_Epilogue), .pos = { 310.0f, 115.0f, -390.0f }, .yaw = 45, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_Chan_Epilogue), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -378,10 +378,10 @@ StaticNpc N(NpcData_DojoMembers_Epilogue)[] = { .settings = &N(NpcSettings_Luigi_Epilogue), .pos = { 330.0f, 115.0f, -410.0f }, .yaw = 45, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_Lee_Epilogue), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -406,10 +406,10 @@ StaticNpc N(NpcData_Toad_01_Epilogue)[] = { .settings = &N(NpcSettings_Toad_Stationary_Epilogue), .pos = { 430.0f, 20.0f, -373.0f }, .yaw = 223, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Toad_01_Epilogue), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -428,10 +428,10 @@ StaticNpc N(NpcData_Toad_01_Epilogue)[] = { .settings = &N(NpcSettings_Toad_Stationary_Epilogue), .pos = { 410.0f, 20.0f, -320.0f }, .yaw = 43, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_HarryT_Epilogue), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_mac/mac_00/mac_00_2_main.c b/src/world/area_mac/mac_00/mac_00_2_main.c index aa530d16ee..f2c6a38af7 100644 --- a/src/world/area_mac/mac_00/mac_00_2_main.c +++ b/src/world/area_mac/mac_00/mac_00_2_main.c @@ -103,9 +103,9 @@ EvtScript N(EVS_Main) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_op_1, SURFACE_TYPE_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_op2, SURFACE_TYPE_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_op3, SURFACE_TYPE_DOCK_WALL) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_op_1, COLLIDER_FLAGS_80000) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_op2, COLLIDER_FLAGS_80000) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_op3, COLLIDER_FLAGS_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_op_1, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_op2, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_op3, COLLIDER_FLAG_80000) EVT_CALL(N(DummyColliderFunction), COLLIDER_op_1) EVT_CALL(N(DummyColliderFunction), COLLIDER_op2) EVT_CALL(N(DummyColliderFunction), COLLIDER_op3) diff --git a/src/world/area_mac/mac_00/mac_00_5_npc.c b/src/world/area_mac/mac_00/mac_00_5_npc.c index b96b6c5a25..a7802a7291 100644 --- a/src/world/area_mac/mac_00/mac_00_5_npc.c +++ b/src/world/area_mac/mac_00/mac_00_5_npc.c @@ -92,7 +92,7 @@ EvtScript N(EVS_NpcHit_ShyGuy_03) = { EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203E, 0) EVT_SET(GF_MAC00_ShyGuyChasedFromShop, TRUE) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) - EVT_CALL(SetEnemyFlagBits, NPC_ShyGuy_02, ENEMY_FLAGS_8000000, 1) + EVT_CALL(SetEnemyFlagBits, NPC_ShyGuy_02, ENEMY_FLAG_8000000, 1) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_ShyGuy_03))) EVT_RETURN EVT_END @@ -190,7 +190,7 @@ StaticNpc N(NpcData_ShyGuy_01)[] = { .settings = &N(NpcSettings_ShyGuy_NoAI), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ShyGuyThief), .drops = SHY_GUY_NO_DROPS, .animations = RED_SHY_GUY_ANIMS, @@ -200,7 +200,7 @@ StaticNpc N(NpcData_ShyGuy_01)[] = { .settings = &N(NpcSettings_ShyGuy_NoAI), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ShyGuy_02), .drops = SHY_GUY_NO_DROPS, .animations = RED_SHY_GUY_ANIMS, @@ -211,7 +211,7 @@ StaticNpc N(NpcData_ShyGuy_01)[] = { .settings = &N(NpcSettings_ShyGuy_NoAI), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH, .init = &N(EVS_NpcInit_GardenShyGuy1), .drops = SHY_GUY_NO_DROPS, .animations = RED_SHY_GUY_ANIMS, @@ -224,10 +224,10 @@ StaticNpc N(NpcData_RussT) = { .settings = &N(NpcSettings_RussT), .pos = { -66.0f, 20.0f, -532.0f }, .yaw = 119, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_RussT), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -258,10 +258,10 @@ StaticNpc N(NpcData_Toad_01)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 430.0f, 20.0f, -373.0f }, .yaw = 223, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Toad_01), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -279,10 +279,10 @@ StaticNpc N(NpcData_Toad_01)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 223, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Toad_02), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -327,10 +327,10 @@ StaticNpc N(NpcData_Toad_03)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 375.0f, 115.0f, -440.0f }, .yaw = 225, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_40000 | ENEMY_FLAG_800000, .init = &N(EVS_NpcInit_TheMaster), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -360,10 +360,10 @@ StaticNpc N(NpcData_Toad_03)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 310.0f, 115.0f, -390.0f }, .yaw = 45, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_40000 | ENEMY_FLAG_800000, .init = &N(EVS_NpcInit_Chan), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -378,10 +378,10 @@ StaticNpc N(NpcData_Toad_03)[] = { .settings = &N(NpcSettings_Dummy), .pos = { 330.0f, 115.0f, -410.0f }, .yaw = 45, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_40000 | ENEMY_FLAG_800000, .init = &N(EVS_NpcInit_Lee), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -398,7 +398,7 @@ StaticNpc N(NpcData_Quizmo_Unused) = { .settings = &N(NpcSettings_ChuckQuizmo), .pos = { 545.0f, 20.0f, 150.0f }, .yaw = 30, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_4000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_MAC, QUIZ_COUNT_MAC, QUIZ_MAP_MAC_00 }}, .drops = QUIZMO_DROPS, @@ -412,7 +412,7 @@ StaticNpc N(NpcData_Waterfront_Family)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -496.0f, 20.0f, 218.0f }, .yaw = 133, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_WaterfrontDad), .drops = TOAD_DROPS, .animations = TOAD_GREEN_ANIMS, @@ -423,7 +423,7 @@ StaticNpc N(NpcData_Waterfront_Family)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -566.0f, 20.0f, 267.0f }, .yaw = 133, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_WaterfrontMom), .drops = TOADETTE_DROPS, .animations = TOADETTE_ORANGE_ANIMS, @@ -434,7 +434,7 @@ StaticNpc N(NpcData_Waterfront_Family)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -508.0f, 20.0f, 324.0f }, .yaw = 313, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_WaterfrontKid1), .drops = TOAD_KID_DROPS, .animations = TOAD_KID_GREEN_ANIMS, @@ -445,7 +445,7 @@ StaticNpc N(NpcData_Waterfront_Family)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -480.0f, 20.0f, 329.0f }, .yaw = 313, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_WaterfrontKid2), .drops = TOAD_KID_DROPS, .animations = TOAD_KID_GREEN_ANIMS, @@ -458,7 +458,7 @@ StaticNpc N(NpcData_PrizeToad) = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -112.0f, 0.0f, -62.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_TradingToad), .drops = TOAD_DROPS, .animations = { diff --git a/src/world/area_mac/mac_00/mac_00_6_shop.c b/src/world/area_mac/mac_00/mac_00_6_shop.c index 3d9297f834..a40512827e 100644 --- a/src/world/area_mac/mac_00/mac_00_6_shop.c +++ b/src/world/area_mac/mac_00/mac_00_6_shop.c @@ -76,7 +76,7 @@ ShopOwner N(Owner) = { }; EvtScript N(EVS_SetupShop) = { - EVT_CALL(MakeShop, EVT_PTR(N(ItemPositions)), EVT_PTR(N(Inventory)), EVT_PTR(N(PriceList)), ITEM_ENTITY_FLAGS_10000) + EVT_CALL(MakeShop, EVT_PTR(N(ItemPositions)), EVT_PTR(N(Inventory)), EVT_PTR(N(PriceList)), ITEM_ENTITY_FLAG_10000) EVT_CALL(MakeShopOwner, EVT_PTR(N(Owner))) EVT_RETURN EVT_END 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 fcbd5e07ae..8ee93ace97 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 @@ -61,7 +61,7 @@ EvtScript N(EVS_NpcAI_Chan) = { }; EvtScript N(EVS_NpcDefeat_Chan) = { - EVT_CALL(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAGS_4, TRUE) + EVT_CALL(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_4, TRUE) EVT_CALL(N(ResetBackgroundPostBattle)) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Chan_Walk) @@ -129,7 +129,7 @@ EvtScript N(EVS_NpcAI_Lee) = { }; EvtScript N(EVS_NpcDefeat_Lee) = { - EVT_CALL(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAGS_4, TRUE) + EVT_CALL(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_4, TRUE) EVT_CALL(N(ResetBackgroundPostBattle)) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Lee_Walk) @@ -243,7 +243,7 @@ EvtScript N(EVS_NpcIdle_TheMaster) = { }; EvtScript N(EVS_NpcDefeat_Dojo) = { - EVT_CALL(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAGS_4, TRUE) + EVT_CALL(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_4, TRUE) EVT_CALL(N(ResetBackgroundPostBattle)) EVT_CALL(GetBattleOutcome, LVar0) EVT_CALL(SetSelfVar, VAR_BATTLE_OUTCOME, LVar0) diff --git a/src/world/area_mac/mac_00/npc/russ_and_thief.inc.c b/src/world/area_mac/mac_00/npc/russ_and_thief.inc.c index 3276860f20..fa97a629e4 100644 --- a/src/world/area_mac/mac_00/npc/russ_and_thief.inc.c +++ b/src/world/area_mac/mac_00/npc/russ_and_thief.inc.c @@ -381,5 +381,5 @@ NpcSettings N(NpcSettings_RussT) = { .height = 30, .radius = 24, .level = 99, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, }; diff --git a/src/world/area_mac/mac_01/mac_01_10_intro_npc.c b/src/world/area_mac/mac_01/mac_01_10_intro_npc.c index 3ba7970950..8506e76e68 100644 --- a/src/world/area_mac/mac_01/mac_01_10_intro_npc.c +++ b/src/world/area_mac/mac_01/mac_01_10_intro_npc.c @@ -12,7 +12,7 @@ StaticNpc N(NpcData_IntroNPCs)[] = { .settings = &N(NpcSettings_Luigi_Intro), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = LUIGI_DROPS, .animations = LUIGI_ANIMS, }, @@ -21,7 +21,7 @@ StaticNpc N(NpcData_IntroNPCs)[] = { .settings = &N(NpcSettings_Toad_Stationary_Intro), .pos = { -94.0f, 0.0f, -117.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_RunsHisMouth, @@ -31,7 +31,7 @@ StaticNpc N(NpcData_IntroNPCs)[] = { .settings = &N(NpcSettings_Toad_Stationary_Intro), .pos = { 40.0f, 0.0f, -300.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = TOAD_DROPS, .territory = { .patrol = { @@ -55,7 +55,7 @@ StaticNpc N(NpcData_IntroNPCs)[] = { .settings = &N(NpcSettings_Toad_Stationary_Intro), .pos = { -380.0f, 20.0f, -100.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = TOAD_DROPS, .animations = TOAD_GREEN_ANIMS, .tattle = MSG_NpcTattle_MAC_SeeksTheSouth, diff --git a/src/world/area_mac/mac_01/mac_01_11_epilogue_npc.c b/src/world/area_mac/mac_01/mac_01_11_epilogue_npc.c index 9acbe48962..7744438bb1 100644 --- a/src/world/area_mac/mac_01/mac_01_11_epilogue_npc.c +++ b/src/world/area_mac/mac_01/mac_01_11_epilogue_npc.c @@ -201,7 +201,7 @@ StaticNpc N(NpcData_Koopas)[] = { .settings = &N(NpcSettings_Kolorado), .pos = { 60.0f, 0.0f, -120.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Kolorado), .drops = KOLORADO_DROPS, .animations = KOLORADO_ANIMS, @@ -212,7 +212,7 @@ StaticNpc N(NpcData_Koopas)[] = { .settings = &N(NpcSettings_KoloradoWife), .pos = { 100.0f, 0.0f, -110.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_KoloradoWife), .drops = KOLORADO_WIFE_DROPS, .animations = KOLORADO_WIFE_ANIMS, @@ -223,7 +223,7 @@ StaticNpc N(NpcData_Koopas)[] = { .settings = &N(NpcSettings_KoopaKoot), .pos = { -330.0f, 0.0f, 330.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_KoopaKoot), .drops = KOOPA_KOOT_DROPS, .animations = KOOPA_KOOT_ANIMS, @@ -234,7 +234,7 @@ StaticNpc N(NpcData_Koopas)[] = { .settings = &N(NpcSettings_Koopa), .pos = { 300.0f, 20.0f, -100.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Koopa), .drops = KOOPA_DROPS, .animations = KOOPA_ANIMS, @@ -245,7 +245,7 @@ StaticNpc N(NpcData_Koopas)[] = { .settings = &N(NpcSettings_Bobomb), .pos = { 252.0f, 20.0f, -100.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Bobomb), .drops = BOBOMB_DROPS, .animations = BOBOMB_ANIMS, @@ -266,10 +266,10 @@ StaticNpc N(NpcData_RowfAndRhuff)[] = { .settings = &N(NpcSettings_Dummy), .pos = { -213.0f, -54.0f, 256.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Rowf), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -284,10 +284,10 @@ StaticNpc N(NpcData_RowfAndRhuff)[] = { .settings = &N(NpcSettings_Dummy), .pos = { -250.0f, 0.0f, 263.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Rhuff), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -312,7 +312,7 @@ StaticNpc N(NpcData_Dryites)[] = { .settings = &N(NpcSettings_Dryite), .pos = { -10.0f, 0.0f, 360.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Dryite_01), .drops = DRYITE_DROPS, .animations = DRYITE_GREEN_ANIMS, @@ -323,7 +323,7 @@ StaticNpc N(NpcData_Dryites)[] = { .settings = &N(NpcSettings_Dryite), .pos = { 25.0f, 0.0f, 300.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Dryite_02), .drops = DRYITE_DROPS, .animations = DRYITE_GREEN_ANIMS, @@ -352,10 +352,10 @@ StaticNpc N(NpcData_Artists)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 260.0f, 20.0f, 560.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Chanterelle), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -385,10 +385,10 @@ StaticNpc N(NpcData_Artists)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 230.0f, 20.0f, 500.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Poet), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -418,10 +418,10 @@ StaticNpc N(NpcData_Artists)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 300.0f, 20.0f, 500.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Composer), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_mac/mac_01/mac_01_12_intro.c b/src/world/area_mac/mac_01/mac_01_12_intro.c index 1371631e73..a6b50c0672 100644 --- a/src/world/area_mac/mac_01/mac_01_12_intro.c +++ b/src/world/area_mac/mac_01/mac_01_12_intro.c @@ -2,13 +2,13 @@ API_CALLABLE(N(HideRowfBadges_IntroScene)) { if (evt_get_variable(NULL, GF_MAC01_RowfBadgeAvailableA) == 0) { - set_item_entity_flags(gGameStatusPtr->shopItemEntities[0].index, ITEM_ENTITY_FLAGS_HIDDEN); + set_item_entity_flags(gGameStatusPtr->shopItemEntities[0].index, ITEM_ENTITY_FLAG_HIDDEN); } if (evt_get_variable(NULL, GF_MAC01_RowfBadgeAvailableB) == 0) { - set_item_entity_flags(gGameStatusPtr->shopItemEntities[1].index, ITEM_ENTITY_FLAGS_HIDDEN); + set_item_entity_flags(gGameStatusPtr->shopItemEntities[1].index, ITEM_ENTITY_FLAG_HIDDEN); } if (evt_get_variable(NULL, GF_MAC01_RowfBadgeAvailableC) == 0) { - set_item_entity_flags(gGameStatusPtr->shopItemEntities[2].index, ITEM_ENTITY_FLAGS_HIDDEN); + set_item_entity_flags(gGameStatusPtr->shopItemEntities[2].index, ITEM_ENTITY_FLAG_HIDDEN); } return ApiStatus_DONE2; } diff --git a/src/world/area_mac/mac_01/mac_01_5_shop.c b/src/world/area_mac/mac_01/mac_01_5_shop.c index e7201df967..2f67c2d028 100644 --- a/src/world/area_mac/mac_01/mac_01_5_shop.c +++ b/src/world/area_mac/mac_01/mac_01_5_shop.c @@ -3,7 +3,7 @@ API_CALLABLE(N(HideRowfBadge)) { s32 itemIndex = evt_get_variable(script, *script->ptrReadPos); - set_item_entity_flags(gGameStatusPtr->shopItemEntities[itemIndex].index, ITEM_ENTITY_FLAGS_HIDDEN); + set_item_entity_flags(gGameStatusPtr->shopItemEntities[itemIndex].index, ITEM_ENTITY_FLAG_HIDDEN); return ApiStatus_DONE2; } @@ -11,7 +11,7 @@ API_CALLABLE(N(SetRowfBadgeBought)) { s32 itemIndex = evt_get_variable(script, *script->ptrReadPos); s32* buyFlags = (s32*) evt_get_variable(NULL, MV_RowfShopBuyFlags); - set_item_entity_flags(gGameStatusPtr->shopItemEntities[itemIndex].index, ITEM_ENTITY_FLAGS_HIDDEN); + set_item_entity_flags(gGameStatusPtr->shopItemEntities[itemIndex].index, ITEM_ENTITY_FLAG_HIDDEN); evt_set_variable(NULL, buyFlags[itemIndex], TRUE); return ApiStatus_DONE2; } diff --git a/src/world/area_mac/mac_01/mac_01_6_crystal_ball_gfx.c b/src/world/area_mac/mac_01/mac_01_6_crystal_ball_gfx.c index a7de90038e..f116be9c5d 100644 --- a/src/world/area_mac/mac_01/mac_01_6_crystal_ball_gfx.c +++ b/src/world/area_mac/mac_01/mac_01_6_crystal_ball_gfx.c @@ -130,8 +130,8 @@ EvtScript N(EVS_SetupCrystalBallGfx) = { EVT_CALL(EnableModel, MODEL_mirrorball, FALSE) EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_3, EVT_PTR(N(gfx_build_inside_crystal_ball)), 0) EVT_CALL(SetModelCustomGfx, MODEL_tama, CUSTOM_GFX_3, -1) - EVT_CALL(SetModelFlags, MODEL_tama, MODEL_FLAGS_USE_CAMERA_UNK_MATRIX, TRUE) - EVT_CALL(SetModelFlags, MODEL_ohosi, MODEL_FLAGS_USE_CAMERA_UNK_MATRIX, TRUE) + EVT_CALL(SetModelFlags, MODEL_tama, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) + EVT_CALL(SetModelFlags, MODEL_ohosi, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) EVT_RETURN EVT_END }; diff --git a/src/world/area_mac/mac_01/mac_01_9_npc.c b/src/world/area_mac/mac_01/mac_01_9_npc.c index d0e0f82149..bac2353e8a 100644 --- a/src/world/area_mac/mac_01/mac_01_9_npc.c +++ b/src/world/area_mac/mac_01/mac_01_9_npc.c @@ -413,14 +413,14 @@ EvtScript N(EVS_MerlonBargeOut) = { EVT_THREAD EVT_WAIT(1) EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_NO_FLIPPING, TRUE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, TRUE) EVT_CALL(InterpPlayerYaw, 270, 0) EVT_WAIT(1) EVT_CALL(SetPlayerAnimation, ANIM_Mario_FallBack) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) EVT_CALL(PlayerJump1, -222, 20, -158, 8) EVT_WAIT(5) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_NO_FLIPPING, FALSE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, FALSE) EVT_CALL(N(KnockDownPlayerB), 1, 37) EVT_CALL(N(KnockDownPlayerD), -215, 20, -158) EVT_WAIT(1) @@ -528,13 +528,13 @@ EvtScript N(EVS_MerlonBargeOut) = { EvtScript N(D_80250D14_811594) = { EVT_CALL(AwaitPlayerApproach, -130, -110, 150) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_8000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 1) EVT_CALL(SetNpcFlagBits, NPC_Merlon, NPC_FLAG_100 | NPC_FLAG_GRAVITY, TRUE) EVT_CALL(NpcMoveTo, NPC_Merlon, 0, 0, 0) EVT_CALL(NpcMoveTo, NPC_Merlon, 410, 0, 0) EVT_CALL(SetNpcPos, NPC_Merlon, 410, 0, 0) EVT_CALL(SetNpcAnimation, NPC_Merlon, ANIM_Merlon_Idle) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_8000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_8000000, 0) EVT_CALL(SetNpcFlagBits, NPC_Merlon, NPC_FLAG_100 | NPC_FLAG_GRAVITY, FALSE) EVT_RETURN EVT_END @@ -1056,10 +1056,10 @@ StaticNpc N(NpcData_Merlon) = { .settings = &N(NpcSettings_Merlon), .pos = { -337.0f, 20.0f, -360.0f }, .yaw = 30, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Merlon), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -1075,10 +1075,10 @@ StaticNpc N(NpcData_DarkToads)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 505.0f, 0.0f, 5.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_DarkToad_01), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -1092,10 +1092,10 @@ StaticNpc N(NpcData_DarkToads)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 530.0f, 0.0f, -35.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_DarkToad_02), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -1109,10 +1109,10 @@ StaticNpc N(NpcData_DarkToads)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 540.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_DarkToad_02), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -1126,10 +1126,10 @@ StaticNpc N(NpcData_DarkToads)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 550.0f, 0.0f, 35.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_DarkToad_02), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -1154,9 +1154,9 @@ StaticNpc N(NpcData_KoopaBros)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -1185,9 +1185,9 @@ StaticNpc N(NpcData_KoopaBros)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -1216,9 +1216,9 @@ StaticNpc N(NpcData_KoopaBros)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -1247,9 +1247,9 @@ StaticNpc N(NpcData_KoopaBros)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -1280,9 +1280,9 @@ StaticNpc N(NpcData_Ninji) = { .settings = &N(NpcSettings_Ninji), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_10000000, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -1961,7 +1961,7 @@ EvtScript N(EVS_NpcHit_ShyGuy_02) = { EVT_SET(GF_MAC01_ChasedShyGuyFromToadHouse, TRUE) EVT_SET(AF_MAC_43, TRUE) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_ShyGuy_02))) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, 1) EVT_RETURN EVT_END }; @@ -2128,7 +2128,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -94.0f, 0.0f, -117.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_04), .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, @@ -2140,7 +2140,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Wander), .pos = { -145.0f, 0.0f, -25.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_05), .drops = TOAD_DROPS, .territory = { @@ -2164,7 +2164,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Patrol), .pos = { 40.0f, 0.0f, -300.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_06), .drops = TOAD_DROPS, .territory = { @@ -2190,7 +2190,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Patrol), .pos = { -440.0f, 0.0f, -20.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_07), .drops = TOAD_DROPS, .territory = { @@ -2216,7 +2216,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Patrol), .pos = { 400.0f, 20.0f, 260.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_08), .drops = TOAD_DROPS, .territory = { @@ -2242,7 +2242,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -380.0f, 20.0f, -100.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_09), .drops = TOAD_DROPS, .animations = TOAD_GREEN_ANIMS, @@ -2254,7 +2254,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 488.0f, 20.0f, -174.0f }, .yaw = 30, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ToadHouseKeeper), .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, @@ -2266,7 +2266,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Bubulb), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Bubulb), .drops = BUBULB_DROPS, .animations = BUBULB_PINK_ANIMS, @@ -2278,7 +2278,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 150.0f, 20.0f, 485.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_MinhT), .drops = TOAD_DROPS, .animations = { @@ -2291,10 +2291,10 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 312.0f, 30.0f, -438.0f }, .yaw = 300, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_Postmaster), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2310,10 +2310,10 @@ StaticNpc N(NpcData_Parakarry) = { .settings = &N(NpcSettings_Parakarry), .pos = { 145.0f, 20.0f, -472.0f }, .yaw = 120, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Parakarry), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2351,7 +2351,7 @@ StaticNpc N(NpcData_Twink) = { .settings = &N(NpcSettings_Twink), .pos = { -350.0f, 20.0f, -100.0f }, .yaw = 274, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Twink), .drops = TWINK_DROPS, .animations = TWINK_ANIMS, @@ -2364,7 +2364,7 @@ StaticNpc N(NpcData_ShyGuys)[] = { .settings = &N(NpcSettings_ShyGuy_NoAI), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ShyGuy_01), .drops = SHY_GUY_NO_DROPS, .animations = RED_SHY_GUY_ANIMS, @@ -2374,7 +2374,7 @@ StaticNpc N(NpcData_ShyGuys)[] = { .settings = &N(NpcSettings_ShyGuy_NoAI), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_IGNORE_TOUCH, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH, .init = &N(EVS_NpcInit_ShyGuy_02), .drops = SHY_GUY_NO_DROPS, .animations = RED_SHY_GUY_ANIMS, @@ -2384,7 +2384,7 @@ StaticNpc N(NpcData_ShyGuys)[] = { .settings = &N(NpcSettings_ShyGuy_NoAI), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_IGNORE_TOUCH, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH, .init = &N(EVS_NpcInit_GardenShyGuy1), .drops = SHY_GUY_NO_DROPS, .animations = RED_SHY_GUY_ANIMS, @@ -2394,7 +2394,7 @@ StaticNpc N(NpcData_ShyGuys)[] = { .settings = &N(NpcSettings_ShyGuy_NoAI), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_IGNORE_TOUCH, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH, .init = &N(EVS_NpcInit_GardenShyGuy2), .drops = SHY_GUY_NO_DROPS, .animations = RED_SHY_GUY_ANIMS, @@ -2413,7 +2413,7 @@ StaticNpc N(NpcData_Kolorado) = { .settings = &N(NpcSettings_Kolorado), .pos = { 520.0f, 0.0f, -25.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Kolorado), .drops = KOLORADO_DROPS, .animations = KOLORADO_ANIMS, @@ -2426,7 +2426,7 @@ StaticNpc N(NpcData_ChuckQuizmo) = { .settings = &N(NpcSettings_ChuckQuizmo), .pos = { -440.0f, 20.0f, -140.0f }, .yaw = 30, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_4000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_MAC, QUIZ_COUNT_MAC, QUIZ_MAP_MAC_01 }}, .drops = QUIZMO_DROPS, 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 5556df1888..39ac020095 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) = { EVT_END_IF EVT_SET(GF_MAC01_ChasedShyGuysFromGardenA, TRUE) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_GardenShyGuy_RunAway))) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, 1) EVT_RETURN EVT_END }; @@ -130,7 +130,7 @@ EvtScript N(EVS_NpcHit_GardenShyGuy2) = { EVT_END_IF EVT_SET(GF_MAC01_ChasedShyGuysFromGardenB, TRUE) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_GardenShyGuy_RunAway))) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, 1) EVT_RETURN EVT_END }; @@ -569,7 +569,7 @@ EvtScript N(EVS_NpcIdle_MinhT) = { EVT_ADD(LVar0, GF_MAC01_ChasedShyGuysFromGardenB) EVT_IF_EQ(LVar0, 2) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_MinhT_Idle) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_400000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_400000, 0) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_MinhT))) EVT_BREAK_LOOP EVT_END_IF @@ -605,7 +605,7 @@ EvtScript N(EVS_NpcInit_MinhT) = { EVT_SWITCH(GB_StoryProgress) EVT_CASE_RANGE(STORY_CH3_STAR_SPRIT_DEPARTED, STORY_CH4_STAR_SPIRIT_RESCUED) EVT_SET(GF_MAC01_ShyGuysTramplingGarden, TRUE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_400000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_400000, 1) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_MinhT))) EVT_END_SWITCH EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_MinhT_Idle) diff --git a/src/world/area_mac/mac_01/npc/rowf_and_rhuff.inc.c b/src/world/area_mac/mac_01/npc/rowf_and_rhuff.inc.c index 015cfdc1da..4c3879096e 100644 --- a/src/world/area_mac/mac_01/npc/rowf_and_rhuff.inc.c +++ b/src/world/area_mac/mac_01/npc/rowf_and_rhuff.inc.c @@ -28,10 +28,10 @@ API_CALLABLE(N(RhuffUnravelUpdate)) { if (rugRotAngle == 0) { npc->currentAnim = ANIM_Rowf_Idle; - enemy->flags &= ~ENEMY_FLAGS_8000000; + enemy->flags &= ~ENEMY_FLAG_8000000; } else { npc->currentAnim = ANIM_Rowf_Walk; - enemy->flags |= ENEMY_FLAGS_8000000; + enemy->flags |= ENEMY_FLAG_8000000; } if (rugRotAngle == -60) { @@ -83,26 +83,26 @@ void N(gfx_build_rowf_rug_with_ripples)(void) { API_CALLABLE(N(RevealRowfBadges)) { if (!evt_get_variable(NULL, GF_MAC01_RowfBadgeAvailableA)) { - clear_item_entity_flags(gGameStatusPtr->shopItemEntities[0].index, ITEM_ENTITY_FLAGS_HIDDEN); + clear_item_entity_flags(gGameStatusPtr->shopItemEntities[0].index, ITEM_ENTITY_FLAG_HIDDEN); } if (!evt_get_variable(NULL, GF_MAC01_RowfBadgeAvailableB)) { - clear_item_entity_flags(gGameStatusPtr->shopItemEntities[1].index, ITEM_ENTITY_FLAGS_HIDDEN); + clear_item_entity_flags(gGameStatusPtr->shopItemEntities[1].index, ITEM_ENTITY_FLAG_HIDDEN); } if (!evt_get_variable(NULL, GF_MAC01_RowfBadgeAvailableC)) { - clear_item_entity_flags(gGameStatusPtr->shopItemEntities[2].index, ITEM_ENTITY_FLAGS_HIDDEN); + clear_item_entity_flags(gGameStatusPtr->shopItemEntities[2].index, ITEM_ENTITY_FLAG_HIDDEN); } return ApiStatus_DONE2; } API_CALLABLE(N(HideRowfBadges)) { if (!evt_get_variable(NULL, GF_MAC01_RowfBadgeAvailableA)) { - set_item_entity_flags(gGameStatusPtr->shopItemEntities[0].index, ITEM_ENTITY_FLAGS_HIDDEN); + set_item_entity_flags(gGameStatusPtr->shopItemEntities[0].index, ITEM_ENTITY_FLAG_HIDDEN); } if (!evt_get_variable(NULL, GF_MAC01_RowfBadgeAvailableB)) { - set_item_entity_flags(gGameStatusPtr->shopItemEntities[1].index, ITEM_ENTITY_FLAGS_HIDDEN); + set_item_entity_flags(gGameStatusPtr->shopItemEntities[1].index, ITEM_ENTITY_FLAG_HIDDEN); } if (!evt_get_variable(NULL, GF_MAC01_RowfBadgeAvailableC)) { - set_item_entity_flags(gGameStatusPtr->shopItemEntities[2].index, ITEM_ENTITY_FLAGS_HIDDEN); + set_item_entity_flags(gGameStatusPtr->shopItemEntities[2].index, ITEM_ENTITY_FLAG_HIDDEN); } return ApiStatus_DONE2; } @@ -621,7 +621,7 @@ EvtScript N(EVS_NpcInit_Rowf) = { EVT_END_IF EVT_END_SWITCH EVT_SET(AF_MAC_41, FALSE) - EVT_CALL(SetModelFlags, MODEL_ju_2, MODEL_FLAGS_FLAG_200, FALSE) + EVT_CALL(SetModelFlags, MODEL_ju_2, MODEL_FLAG_FLAG_200, FALSE) EVT_CALL(EnableGroup, MODEL_jutan1, FALSE) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_b1, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_b2, COLLIDER_FLAGS_UPPER_MASK) @@ -640,9 +640,9 @@ EvtScript N(EVS_NpcInit_Rowf) = { EVT_END_IF EVT_THREAD EVT_WAIT(5) - EVT_CALL(SetModelFlags, MODEL_b1, MODEL_FLAGS_FLAG_4, FALSE) - EVT_CALL(SetModelFlags, MODEL_b2, MODEL_FLAGS_FLAG_4, FALSE) - EVT_CALL(SetModelFlags, MODEL_b3, MODEL_FLAGS_FLAG_4, FALSE) + EVT_CALL(SetModelFlags, MODEL_b1, MODEL_FLAG_FLAG_4, FALSE) + EVT_CALL(SetModelFlags, MODEL_b2, MODEL_FLAG_FLAG_4, FALSE) + EVT_CALL(SetModelFlags, MODEL_b3, MODEL_FLAG_FLAG_4, FALSE) EVT_CALL(N(HideRowfBadges)) EVT_LABEL(0) EVT_IF_EQ(GF_MAC01_RowfBadgeAvailableA, FALSE) @@ -709,13 +709,13 @@ s32 N(ExtraAnims_Rowf)[] = { NpcSettings N(NpcSettings_Rowf) = { .height = 36, .radius = 24, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, }; NpcSettings N(NpcSettings_Rhuff) = { .height = 27, .radius = 18, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, }; StaticNpc N(NpcData_RowfAndRhuff)[] = { @@ -724,10 +724,10 @@ StaticNpc N(NpcData_RowfAndRhuff)[] = { .settings = &N(NpcSettings_Rowf), .pos = { -213.0f, -54.0f, 256.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Rowf), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -742,10 +742,10 @@ StaticNpc N(NpcData_RowfAndRhuff)[] = { .settings = &N(NpcSettings_Rhuff), .pos = { -250.0f, 0.0f, 263.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Rhuff), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_mac/mac_02/mac_02_6_npc.c b/src/world/area_mac/mac_02/mac_02_6_npc.c index a41e57492d..7691068c8d 100644 --- a/src/world/area_mac/mac_02/mac_02_6_npc.c +++ b/src/world/area_mac/mac_02/mac_02_6_npc.c @@ -58,7 +58,7 @@ StaticNpc N(NpcData_TayceT)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -217.0f, 20.0f, -434.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_TayceT), .drops = TOAD_DROPS, .animations = { @@ -72,7 +72,7 @@ StaticNpc N(NpcData_TayceT)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 389.0f, 0.0f, -90.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_FiceT), .drops = TOAD_DROPS, .animations = { @@ -85,7 +85,7 @@ StaticNpc N(NpcData_TayceT)[] = { .settings = &N(NpcSettings_Bubulb), .pos = { 150.0f, 20.0f, 500.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bubulb), .drops = BUBULB_DROPS, .animations = BUBULB_PINK_ANIMS, @@ -97,7 +97,7 @@ StaticNpc N(NpcData_TayceT)[] = { .settings = &N(NpcSettings_Toad_Wander), .pos = { 40.0f, 0.0f, -60.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_01), .drops = TOAD_DROPS, .territory = { @@ -120,7 +120,7 @@ StaticNpc N(NpcData_TayceT)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -26.0f, 0.0f, -220.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_CookingApprentice), .drops = TOADETTE_DROPS, .animations = TOADETTE_PURPLE_ANIMS, @@ -131,7 +131,7 @@ StaticNpc N(NpcData_TayceT)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -350.0f, 20.0f, -140.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_02), .drops = TOAD_DROPS, .animations = TOAD_GREEN_ANIMS, @@ -142,7 +142,7 @@ StaticNpc N(NpcData_TayceT)[] = { .settings = &N(NpcSettings_Toad_Wander), .pos = { 180.0f, 20.0f, -435.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ToadKid), .drops = TOAD_KID_DROPS, .territory = { @@ -165,7 +165,7 @@ StaticNpc N(NpcData_TayceT)[] = { .settings = &N(NpcSettings_Toad_Wander), .pos = { -160.0f, 0.0f, 25.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_03), .drops = TOAD_DROPS, .territory = { @@ -188,10 +188,10 @@ StaticNpc N(NpcData_TayceT)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -80.0f, 0.0f, 300.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_04), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -205,7 +205,7 @@ StaticNpc N(NpcData_Bootler) = { .settings = &N(NpcSettings_Bootler), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bootler), .drops = BOOTLER_DROPS, .animations = BOOTLER_ANIMS, @@ -227,10 +227,10 @@ StaticNpc N(NpcData_ShyGuy) = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ShyGuy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_mac/mac_03/mac_03_3_train.c b/src/world/area_mac/mac_03/mac_03_3_train.c index acbc2e60fc..a94fc5d6ec 100644 --- a/src/world/area_mac/mac_03/mac_03_3_train.c +++ b/src/world/area_mac/mac_03/mac_03_3_train.c @@ -564,7 +564,7 @@ EvtScript N(EVS_DepartForMtRugged) = { }; EvtScript N(EVS_InitializeTrainScene) = { - EVT_CALL(SetModelFlags, MODEL_km, MODEL_FLAGS_USE_CAMERA_UNK_MATRIX, TRUE) + EVT_CALL(SetModelFlags, MODEL_km, MODEL_FLAG_USE_CAMERA_UNK_MATRIX, TRUE) EVT_CALL(EnableModel, MODEL_km, FALSE) EVT_CALL(CloneModel, MODEL_km, CLONED_MODEL(0)) EVT_CALL(CloneModel, MODEL_km, CLONED_MODEL(1)) diff --git a/src/world/area_mac/mac_03/mac_03_4_npc.c b/src/world/area_mac/mac_03/mac_03_4_npc.c index f5638c2228..b921f73283 100644 --- a/src/world/area_mac/mac_03/mac_03_4_npc.c +++ b/src/world/area_mac/mac_03/mac_03_4_npc.c @@ -549,7 +549,7 @@ EvtScript N(EVS_NpcHit_ShyGuy) = { EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203E, 0) EVT_SET(GF_MAC03_ShyGuyChasedOff, TRUE) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_ShyGuy))) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, 1) EVT_RETURN EVT_END }; @@ -613,7 +613,7 @@ StaticNpc N(NpcData_Toads)[] = { .settings = &N(NpcSettings_TrainConductorToad), .pos = { -370.0f, 20.0f, 90.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_TrainStationToad_01), .drops = TRAIN_CONDUCTOR_DROPS, .animations = TRAIN_CONDUCTOR_WHITE_ANIMS, @@ -624,7 +624,7 @@ StaticNpc N(NpcData_Toads)[] = { .settings = &N(NpcSettings_TrainConductorToad), .pos = { -424.0f, 74.0f, 2.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = TRAIN_CONDUCTOR_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, .tattle = MSG_NpcTattle_MAC_StationMaster, @@ -634,7 +634,7 @@ StaticNpc N(NpcData_Toads)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -232.0f, 10.0f, 74.0f }, .yaw = 75, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_01), .drops = TOAD_DROPS, .animations = TOAD_BLUE_ANIMS, @@ -645,7 +645,7 @@ StaticNpc N(NpcData_Toads)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 85.0f, 0.0f, 235.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ThreeSisters_01), .drops = TOADETTE_DROPS, .animations = TOADETTE_PURPLE_ANIMS, @@ -656,7 +656,7 @@ StaticNpc N(NpcData_Toads)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -255.0f, 20.0f, 400.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_02), .drops = TOAD_DROPS, .animations = TOAD_GREEN_ANIMS, @@ -667,7 +667,7 @@ StaticNpc N(NpcData_Toads)[] = { .settings = &N(NpcSettings_ToadKid_Wander), .pos = { 260.0f, 20.0f, 410.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ToadKid_01), .drops = TOAD_KID_DROPS, .territory = { @@ -690,7 +690,7 @@ StaticNpc N(NpcData_Toads)[] = { .settings = &N(NpcSettings_ToadKid_Wander), .pos = { 320.0f, 20.0f, 410.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ToadKid_02), .drops = TOAD_KID_DROPS, .territory = { @@ -713,7 +713,7 @@ StaticNpc N(NpcData_Toads)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 220.0f, 20.0f, -160.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Toad_03), .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, @@ -727,7 +727,7 @@ StaticNpc N(NpcData_ThreeSisters)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -130.0f, 0.0f, 220.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ThreeSisters_02), .drops = TOADETTE_DROPS, .animations = TOADETTE_PINK_ANIMS, @@ -738,7 +738,7 @@ StaticNpc N(NpcData_ThreeSisters)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -100.0f, 0.0f, 220.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ThreeSisters_02), .drops = TOADETTE_DROPS, .animations = TOADETTE_PINK_ANIMS, @@ -749,7 +749,7 @@ StaticNpc N(NpcData_ThreeSisters)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -70.0f, 0.0f, 220.0f }, .yaw = 180, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ThreeSisters_02), .drops = TOADETTE_DROPS, .animations = TOADETTE_PINK_ANIMS, @@ -762,10 +762,10 @@ StaticNpc N(NpcData_ShyGuy) = { .settings = &N(NpcSettings_ShyGuy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_IGNORE_TOUCH, + .flags = ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH, .init = &N(EVS_NpcInit_ShyGuy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -795,7 +795,7 @@ StaticNpc N(NpcData_LilOinks)[] = { .settings = &N(NpcSettings_Toad_Wander), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Toad_04), .drops = TOAD_DROPS, .territory = { @@ -817,7 +817,7 @@ StaticNpc N(NpcData_LilOinks)[] = { .settings = &N(NpcSettings_Toad_Wander), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Toad_04), .drops = TOAD_DROPS, .territory = { @@ -839,7 +839,7 @@ StaticNpc N(NpcData_LilOinks)[] = { .settings = &N(NpcSettings_Toad_Wander), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Toad_04), .drops = TOAD_DROPS, .territory = { @@ -861,7 +861,7 @@ StaticNpc N(NpcData_LilOinks)[] = { .settings = &N(NpcSettings_Toad_Wander), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Toad_04), .drops = TOAD_DROPS, .territory = { @@ -883,7 +883,7 @@ StaticNpc N(NpcData_LilOinks)[] = { .settings = &N(NpcSettings_Toad_Wander), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Toad_04), .drops = TOAD_DROPS, .territory = { @@ -905,7 +905,7 @@ StaticNpc N(NpcData_LilOinks)[] = { .settings = &N(NpcSettings_Toad_Wander), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Toad_04), .drops = TOAD_DROPS, .territory = { @@ -927,7 +927,7 @@ StaticNpc N(NpcData_LilOinks)[] = { .settings = &N(NpcSettings_Toad_Wander), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Toad_04), .drops = TOAD_DROPS, .territory = { @@ -949,7 +949,7 @@ StaticNpc N(NpcData_LilOinks)[] = { .settings = &N(NpcSettings_Toad_Wander), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Toad_04), .drops = TOAD_DROPS, .territory = { @@ -971,7 +971,7 @@ StaticNpc N(NpcData_LilOinks)[] = { .settings = &N(NpcSettings_Toad_Wander), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Toad_04), .drops = TOAD_DROPS, .territory = { @@ -993,7 +993,7 @@ StaticNpc N(NpcData_LilOinks)[] = { .settings = &N(NpcSettings_Toad_Wander), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Toad_04), .drops = TOAD_DROPS, .territory = { @@ -1015,7 +1015,7 @@ StaticNpc N(NpcData_LilOinks)[] = { .settings = &N(NpcSettings_Dummy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Toad_14), .drops = TOAD_DROPS, .territory = { diff --git a/src/world/area_mac/mac_04/mac_04_5_shop.c b/src/world/area_mac/mac_04/mac_04_5_shop.c index 30896f7305..d4a495084b 100644 --- a/src/world/area_mac/mac_04/mac_04_5_shop.c +++ b/src/world/area_mac/mac_04/mac_04_5_shop.c @@ -75,7 +75,7 @@ ShopOwner N(Owner) = { }; EvtScript N(EVS_SetupShop) = { - EVT_CALL(MakeShop, EVT_PTR(N(ItemPositions)), EVT_PTR(N(Inventory)), EVT_PTR(N(PriceList)), ITEM_ENTITY_FLAGS_10000) + EVT_CALL(MakeShop, EVT_PTR(N(ItemPositions)), EVT_PTR(N(Inventory)), EVT_PTR(N(PriceList)), ITEM_ENTITY_FLAG_10000) EVT_CALL(MakeShopOwner, EVT_PTR(N(Owner))) EVT_RETURN EVT_END diff --git a/src/world/area_mac/mac_04/mac_04_6_npc.c b/src/world/area_mac/mac_04/mac_04_6_npc.c index 8e8b024969..7a01701d2e 100644 --- a/src/world/area_mac/mac_04/mac_04_6_npc.c +++ b/src/world/area_mac/mac_04/mac_04_6_npc.c @@ -175,10 +175,10 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_ChetRippo), .pos = { 410.0f, 20.0f, -200.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_ChetRippo), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -192,10 +192,10 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 310.0f, 20.0f, -430.0f }, .yaw = 230, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_HarryT), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -213,7 +213,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -80.0f, 20.0f, -100.0f }, .yaw = 133, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_NewResident1), .drops = TOADETTE_DROPS, .animations = TOADETTE_GREEN_ANIMS, @@ -224,7 +224,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -133.0f, 20.0f, -82.0f }, .yaw = 133, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_NewResident2), .drops = TOADETTE_DROPS, .animations = TOADETTE_PURPLE_ANIMS, @@ -235,7 +235,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Wander), .pos = { 48.0f, 0.0f, 153.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_01), .drops = TOAD_DROPS, .territory = { @@ -258,7 +258,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -239.0f, 20.0f, 105.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_02), .drops = TOAD_DROPS, .animations = TOAD_BLUE_ANIMS, @@ -269,7 +269,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 254.0f, 20.0f, 436.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ToadKid_01), .drops = TOAD_KID_DROPS, .animations = TOAD_KID_RED_ANIMS, @@ -280,7 +280,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 304.0f, 20.0f, 410.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ToadKid_02), .drops = TOAD_KID_DROPS, .animations = TOAD_KID_YELLOW_ANIMS, @@ -291,7 +291,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 345.0f, 20.0f, 438.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ToadKid_03), .drops = TOAD_KID_DROPS, .animations = TOAD_KID_GREEN_ANIMS, @@ -302,7 +302,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -274.0f, 0.0f, 400.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toadette_03), .drops = TOADETTE_DROPS, .animations = TOADETTE_ORANGE_ANIMS, @@ -313,7 +313,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 500.0f, 20.0f, -160.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_03), .drops = TOAD_DROPS, .animations = TOAD_GREEN_ANIMS, @@ -324,7 +324,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -110.0f, 0.0f, 568.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_GossipTrio1), .drops = TOAD_DROPS, .animations = TOAD_GREEN_ANIMS, @@ -335,7 +335,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -114.0f, 0.0f, 498.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_GossipTrio2), .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, @@ -346,7 +346,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -52.0f, 0.0f, 525.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_GossipTrio3), .drops = TOAD_DROPS, .animations = TOAD_YELLOW_ANIMS, @@ -367,7 +367,7 @@ StaticNpc N(NpcData_Chapter4)[] = { .settings = &N(NpcSettings_Twink), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_TwinkStartCh4), .drops = TWINK_DROPS, .animations = TWINK_ANIMS, @@ -378,9 +378,9 @@ StaticNpc N(NpcData_Chapter4)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -408,10 +408,10 @@ StaticNpc N(NpcData_Chapter4)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ShyGuy_02), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -442,7 +442,7 @@ StaticNpc N(NpcData_PostChapter4)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { -486.0f, 20.0f, 259.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Muskular), .drops = MUSKULAR_DROPS, .animations = MUSKULAR_ANIMS, @@ -452,10 +452,10 @@ StaticNpc N(NpcData_PostChapter4)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TwinkEndCh4), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -469,7 +469,7 @@ StaticNpc N(NpcData_GoombaFamily)[] = { .settings = &N(NpcSettings_GoombaFamily), .pos = { -126.0f, 0.0f, 329.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Goomama), .drops = GOOMAMA_DROPS, .animations = GOOMAMA_ANIMS, @@ -480,7 +480,7 @@ StaticNpc N(NpcData_GoombaFamily)[] = { .settings = &N(NpcSettings_GoombaFamily), .pos = { -117.0f, 0.0f, 305.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Goombaria), .drops = GOOMBARIA_DROPS, .animations = GOOMBARIA_ANIMS, @@ -493,7 +493,7 @@ StaticNpc N(NpcData_ChuckQuizmo) = { .settings = &N(NpcSettings_ChuckQuizmo), .pos = { 57.0f, 20.0f, -114.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_4000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_MAC, QUIZ_COUNT_MAC, QUIZ_MAP_MAC_04 }}, .drops = QUIZMO_DROPS, diff --git a/src/world/area_mac/mac_04/mac_04_7_wish_scene.c b/src/world/area_mac/mac_04/mac_04_7_wish_scene.c index 89ff10ecc9..4af2b72076 100644 --- a/src/world/area_mac/mac_04/mac_04_7_wish_scene.c +++ b/src/world/area_mac/mac_04/mac_04_7_wish_scene.c @@ -41,7 +41,7 @@ StaticNpc N(NpcData_WishSceneToads)[] = { .settings = &N(NpcSettings_Toad_Stationary_Wish), .pos = { 350.0f, 0.0f, -20.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_WishingToadKid), .drops = TOAD_KID_DROPS, .animations = TOAD_KID_RED_ANIMS, @@ -51,7 +51,7 @@ StaticNpc N(NpcData_WishSceneToads)[] = { .settings = &N(NpcSettings_Toad_Stationary_Wish), .pos = { -245.0f, 20.0f, 100.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8, .drops = TOAD_DROPS, .animations = TOAD_GREEN_ANIMS, .tattle = MSG_NpcTattle_GreatGossipTrioA, @@ -61,7 +61,7 @@ StaticNpc N(NpcData_WishSceneToads)[] = { .settings = &N(NpcSettings_Toad_Stationary_Wish), .pos = { -25.0f, 0.0f, 170.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8, .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_GreatGossipTrioB, @@ -71,7 +71,7 @@ StaticNpc N(NpcData_WishSceneToads)[] = { .settings = &N(NpcSettings_Toad_Stationary_Wish), .pos = { -100.0f, 0.0f, 305.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8, .drops = TOAD_DROPS, .animations = TOAD_YELLOW_ANIMS, .tattle = MSG_NpcTattle_GreatGossipTrioC, diff --git a/src/world/area_mac/mac_04/mac_04_8_entity.c b/src/world/area_mac/mac_04/mac_04_8_entity.c index 2a407f4b41..6ee5f56f8b 100644 --- a/src/world/area_mac/mac_04/mac_04_8_entity.c +++ b/src/world/area_mac/mac_04/mac_04_8_entity.c @@ -8,7 +8,7 @@ void N(appendGfx_shrunk_player)(void*); MAP_RODATA_PAD(2,unk); API_CALLABLE(N(CreateShrinkingWorker)) { - gPlayerStatus.animFlags |= PA_FLAGS_INVISIBLE; + gPlayerStatus.animFlags |= PA_FLAG_INVISIBLE; evt_set_variable(script, MV_DrawShinkingPlayerWorker, create_worker_world(NULL, N(render_shrunk_player))); return ApiStatus_DONE2; @@ -16,7 +16,7 @@ API_CALLABLE(N(CreateShrinkingWorker)) { API_CALLABLE(N(DestroyShrinkingWorker)) { s32 index = evt_get_variable(script, MV_DrawShinkingPlayerWorker); - gPlayerStatus.animFlags &= ~PA_FLAGS_INVISIBLE; + gPlayerStatus.animFlags &= ~PA_FLAG_INVISIBLE; free_worker(index); return ApiStatus_DONE2; @@ -55,7 +55,7 @@ void N(appendGfx_shrunk_player)(void* data) { EvtScript N(EVS_ShrinkPlayer) = { EVT_SETF(MV_PlayerShrinkScale, EVT_FLOAT(1.0)) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_TIME_STOPPED, TRUE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_TIME_STOPPED, TRUE) EVT_CALL(N(CreateShrinkingWorker)) EVT_THREAD EVT_WAIT(8) @@ -76,7 +76,7 @@ EvtScript N(EVS_ShrinkPlayer) = { EvtScript N(EVS_UnshrinkPlayer) = { EVT_SETF(MV_PlayerShrinkScale, EVT_FLOAT(0.2)) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_TIME_STOPPED, TRUE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_TIME_STOPPED, TRUE) EVT_CALL(N(CreateShrinkingWorker)) EVT_THREAD EVT_CALL(MakeLerp, 20, 100, 40, EASING_QUADRATIC_OUT) @@ -95,7 +95,7 @@ EvtScript N(EVS_UnshrinkPlayer) = { }; EvtScript N(EVS_FinishUnshrinking) = { - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_TIME_STOPPED, FALSE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_TIME_STOPPED, FALSE) EVT_CALL(N(DestroyShrinkingWorker)) EVT_RETURN EVT_END diff --git a/src/world/area_mac/mac_05/mac_05_3_main.c b/src/world/area_mac/mac_05/mac_05_3_main.c index bb76c1c889..b637abaeb2 100644 --- a/src/world/area_mac/mac_05/mac_05_3_main.c +++ b/src/world/area_mac/mac_05/mac_05_3_main.c @@ -98,7 +98,7 @@ EvtScript N(D_802448C4_856A34) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(SetPlayerPos, -160, -10, 371) EVT_CALL(SetNpcPos, NPC_PARTNER, -160, -10, 371) - EVT_CALL(SetEnemyFlagBits, NPC_Whale, ENEMY_FLAGS_8000000, 1) + EVT_CALL(SetEnemyFlagBits, NPC_Whale, ENEMY_FLAG_8000000, 1) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(InterruptUsePartner) EVT_WAIT(10) @@ -123,7 +123,7 @@ EvtScript N(D_802448C4_856A34) = { EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC_WAIT(EnterWalk) EVT_CALL(SetNpcPos, NPC_Whale, -220, 10, 372) - EVT_CALL(SetEnemyFlagBits, NPC_Whale, ENEMY_FLAGS_8000000, 0) + EVT_CALL(SetEnemyFlagBits, NPC_Whale, ENEMY_FLAG_8000000, 0) EVT_END_SWITCH EVT_RETURN EVT_END diff --git a/src/world/area_mac/mac_05/mac_05_4_npc.c b/src/world/area_mac/mac_05/mac_05_4_npc.c index 9184112e33..a592d8d731 100644 --- a/src/world/area_mac/mac_05/mac_05_4_npc.c +++ b/src/world/area_mac/mac_05/mac_05_4_npc.c @@ -1450,7 +1450,7 @@ EvtScript N(EVS_NpcInit_Fishmael) = { EVT_IF_LT(GB_StoryProgress, STORY_CH3_STAR_SPIRIT_RESCUED) EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Fuzzipede1))) EVT_ELSE - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_400000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_400000, 0) EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Fishmael))) EVT_END_IF EVT_RETURN @@ -1464,7 +1464,7 @@ EvtScript N(EVS_NpcInit_Fuzzipede) = { EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_CASE_DEFAULT - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_400000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_400000, 0) EVT_CALL(SetNpcPos, NPC_SELF, -575, 40, 120) EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Fuzzipede2))) EVT_CASE_DEFAULT @@ -1919,7 +1919,7 @@ API_CALLABLE(N(func_8024335C_8554CC)) { EvtScript N(D_8024E23C_8603AC) = { EVT_SET(MF_Unk_0A, TRUE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_400000 | ENEMY_FLAGS_8000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_400000 | ENEMY_FLAG_8000000, 1) EVT_CALL(InterpNpcYaw, NPC_Chanterelle, 270, 0) EVT_CALL(SetMusicTrack, 0, SONG_POP_DIVA_SONG, 1, 8) EVT_CHILD_THREAD @@ -1941,7 +1941,7 @@ EvtScript N(D_8024E23C_8603AC) = { EVT_END_LOOP EVT_EXEC(N(EVS_802442E8)) EVT_CALL(SetNpcAnimation, NPC_Chanterelle, ANIM_Chanterelle_Idle) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_400000 | ENEMY_FLAGS_8000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_400000 | ENEMY_FLAG_8000000, 0) EVT_RETURN EVT_END }; @@ -2063,7 +2063,7 @@ StaticNpc N(NpcData_Toad_01) = { .settings = &N(NpcSettings_Whale), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Toad_01), .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, @@ -2075,7 +2075,7 @@ StaticNpc N(NpcData_Kolorado) = { .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Kolorado), .drops = KOLORADO_DROPS, .animations = KOLORADO_ANIMS, @@ -2087,10 +2087,10 @@ StaticNpc N(NpcData_Fishmael) = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 370.0f, -10.0f, -115.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Fishmael), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2114,10 +2114,10 @@ StaticNpc N(NpcData_Fuzzipede) = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 320.0f, -10.0f, -115.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Fuzzipede), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2150,10 +2150,10 @@ StaticNpc N(NpcData_JrTroopa_01)[] = { .settings = &N(NpcSettings_JrTroopa_01), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_JrTroopa_01), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2183,10 +2183,10 @@ StaticNpc N(NpcData_JrTroopa_01)[] = { .settings = &N(NpcSettings_JrTroopa_01), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_20000000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_JrTroopa_02), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2219,10 +2219,10 @@ StaticNpc N(NpcData_Toad_04)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 320.0f, 0.0f, -300.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_04), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2251,10 +2251,10 @@ StaticNpc N(NpcData_Toad_04)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -330.0f, -10.0f, -90.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_05), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2283,10 +2283,10 @@ StaticNpc N(NpcData_Toad_04)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -50.0f, 0.0f, -400.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_06), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2315,10 +2315,10 @@ StaticNpc N(NpcData_Toad_04)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 200.0f, 0.0f, -220.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_07), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2364,10 +2364,10 @@ StaticNpc N(NpcData_Bartender)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -85.0f, 0.0f, -520.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Bartender), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2396,10 +2396,10 @@ StaticNpc N(NpcData_Bartender)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 30.0f, 0.0f, -570.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_02), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2428,10 +2428,10 @@ StaticNpc N(NpcData_Bartender)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 208.0f, 0.0f, -530.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Chanterelle), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2460,10 +2460,10 @@ StaticNpc N(NpcData_Bartender)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 158.0f, 0.0f, -555.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ArtistToad), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2492,10 +2492,10 @@ StaticNpc N(NpcData_Bartender)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 92.0f, 0.0f, -500.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_TradeEventToad), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2526,11 +2526,11 @@ StaticNpc N(NpcData_ChuckQuizmo) = { .settings = &N(NpcSettings_ChuckQuizmo), .pos = { 472.0f, 0.0f, -230.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_4000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_MAC, QUIZ_COUNT_MAC, QUIZ_MAP_MAC_05 }}, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_mac/mac_06/mac_06_3_npc.c b/src/world/area_mac/mac_06/mac_06_3_npc.c index a025971562..30103c1fae 100644 --- a/src/world/area_mac/mac_06/mac_06_3_npc.c +++ b/src/world/area_mac/mac_06/mac_06_3_npc.c @@ -164,7 +164,7 @@ API_CALLABLE(N(func_802412AC_865DEC)) { Model* model = get_model_from_list_index(modelIndex); f32 x, y, z; - if (model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED) { + if (model->flags & MODEL_FLAG_HAS_TRANSFORM_APPLIED) { // get model translation from transform matrix x = model->transformMatrix[3][0]; y = model->transformMatrix[3][1]; @@ -514,10 +514,10 @@ StaticNpc N(NpcData_Whale) = { .settings = &N(NpcSettings_Whale), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Whale), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -546,10 +546,10 @@ StaticNpc N(NpcData_Kolorado) = { .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Kolorado), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -585,10 +585,10 @@ StaticNpc N(NpcData_JrTroopa) = { .settings = &N(NpcSettings_JrTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_JrTroopa), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_mac/machi/machi_4_goomba_king.c b/src/world/area_mac/machi/machi_4_goomba_king.c index d735c032cf..6b25330343 100644 --- a/src/world/area_mac/machi/machi_4_goomba_king.c +++ b/src/world/area_mac/machi/machi_4_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_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; diff --git a/src/world/area_mac/machi/machi_5_npc.c b/src/world/area_mac/machi/machi_5_npc.c index c2c54a8338..66ff13e63a 100644 --- a/src/world/area_mac/machi/machi_5_npc.c +++ b/src/world/area_mac/machi/machi_5_npc.c @@ -217,7 +217,7 @@ NpcSettings N(NpcSettings_StarRod) = { .otherAI = &N(EVS_NpcAuxAI_StarRod), .onInteract = &N(EVS_NpcInteract_StarRod), .ai = &N(EVS_NpcAI_StarRod), - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, }; NpcSettings N(NpcSettings_Koopa) = { @@ -226,7 +226,7 @@ NpcSettings N(NpcSettings_Koopa) = { .radius = 24, .onInteract = &N(EVS_NpcInteract_Koopa), .ai = &N(EVS_NpcAI_Koopa), - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, }; NpcSettings N(NpcSettings_Kolorado) = { @@ -235,7 +235,7 @@ NpcSettings N(NpcSettings_Kolorado) = { .radius = 24, .onInteract = &N(EVS_NpcInteract_Kolorado), .ai = &N(EVS_NpcAI_Kolorado), - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, }; NpcSettings N(NpcSettings_Goompa) = { @@ -245,7 +245,7 @@ NpcSettings N(NpcSettings_Goompa) = { .otherAI = &N(EVS_NpcAuxAI_Goompa), .onInteract = &N(EVS_NpcInteract_Goompa), .onHit = &N(EVS_NpcHit_Goompa), - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000, }; StaticNpc N(NpcData_05)[] = { @@ -283,7 +283,7 @@ StaticNpc N(NpcData_GoombaFamily) = { .settings = &N(NpcSettings_Goompa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_8, + .flags = ENEMY_FLAG_8, .init = (void*) 0x1F64, .animations = { }, @@ -295,7 +295,7 @@ StaticNpc N(NpcData_0B)[] = { .settings = &N(NpcSettings_Goompa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_8, + .flags = ENEMY_FLAG_8, .init = (void*) 0x1F64, .animations = {}, }, @@ -304,7 +304,7 @@ StaticNpc N(NpcData_0B)[] = { .settings = &N(NpcSettings_Goompa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_8, + .flags = ENEMY_FLAG_8, .init = (void*) 0x1F64, .animations = {}, }, @@ -313,7 +313,7 @@ StaticNpc N(NpcData_0B)[] = { .settings = &N(NpcSettings_Goompa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_8, + .flags = ENEMY_FLAG_8, .init = (void*) 0x1F64, .animations = {}, }, @@ -322,7 +322,7 @@ StaticNpc N(NpcData_0B)[] = { .settings = &N(NpcSettings_Goompa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_8, + .flags = ENEMY_FLAG_8, .init = (void*) 0x1F64, .animations = {}, }, @@ -331,7 +331,7 @@ StaticNpc N(NpcData_0B)[] = { .settings = &N(NpcSettings_Goompa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_8, + .flags = ENEMY_FLAG_8, .init = (void*) 0x1F64, .animations = {}, }, @@ -340,7 +340,7 @@ StaticNpc N(NpcData_0B)[] = { .settings = &N(NpcSettings_Goompa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_8, + .flags = ENEMY_FLAG_8, .init = (void*) 0x1F64, .animations = {}, }, @@ -349,7 +349,7 @@ StaticNpc N(NpcData_0B)[] = { .settings = &N(NpcSettings_Goompa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_8, + .flags = ENEMY_FLAG_8, .init = (void*) 0x1F64, .animations = {}, }, @@ -358,7 +358,7 @@ StaticNpc N(NpcData_0B)[] = { .settings = &N(NpcSettings_Goompa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_8, + .flags = ENEMY_FLAG_8, .init = (void*) 0x1F64, .animations = {}, }, @@ -367,7 +367,7 @@ StaticNpc N(NpcData_0B)[] = { .settings = &N(NpcSettings_Goompa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_8, + .flags = ENEMY_FLAG_8, .init = (void*) 0x1F64, .animations = {}, }, diff --git a/src/world/area_mac/machi/machi_6_misstar.c b/src/world/area_mac/machi/machi_6_misstar.c index cb1a0fd38c..dd9b9fa3da 100644 --- a/src/world/area_mac/machi/machi_6_misstar.c +++ b/src/world/area_mac/machi/machi_6_misstar.c @@ -102,7 +102,7 @@ NpcSettings N(NpcSettings_Misstar) = { .otherAI = &N(EVS_NpcAuxAI_Misstar), .ai = &N(EVS_NpcAI_Misstar), .aux = &N(EVS_NpcAux_Misstar), - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; StaticNpc N(NpcData_Misstar) = { @@ -110,6 +110,6 @@ StaticNpc N(NpcData_Misstar) = { .settings = &N(NpcSettings_Misstar), .pos = { 320.0f, 30.0f, -290.0f }, .yaw = 100, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .animations = {}, }; diff --git a/src/world/area_mgm/mgm_00/mgm_00_2_npc.c b/src/world/area_mgm/mgm_00/mgm_00_2_npc.c index 8ec97a68a8..6aa45b6b70 100644 --- a/src/world/area_mgm/mgm_00/mgm_00_2_npc.c +++ b/src/world/area_mgm/mgm_00/mgm_00_2_npc.c @@ -170,7 +170,7 @@ StaticNpc N(NpcData_RedToad) = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -213.0f, 12.0f, -180.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_RedToad), .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, @@ -210,7 +210,7 @@ StaticNpc N(NpcData_GreenToad) = { .settings = &N(NpcSettings_Toad_Patrol), .pos = { -88.0f, 0.0f, -95.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_GreenToad), .drops = TOAD_DROPS, .territory = { @@ -260,7 +260,7 @@ StaticNpc N(NpcData_BlueToad) = { .settings = &N(NpcSettings_Toad_Patrol), .pos = { 46.0f, 0.0f, -205.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_BlueToad), .drops = TOAD_DROPS, .territory = { diff --git a/src/world/area_mgm/mgm_01/mgm_01_2_npc.c b/src/world/area_mgm/mgm_01/mgm_01_2_npc.c index 3d52da8123..d52468e71f 100644 --- a/src/world/area_mgm/mgm_01/mgm_01_2_npc.c +++ b/src/world/area_mgm/mgm_01/mgm_01_2_npc.c @@ -632,7 +632,7 @@ API_CALLABLE(N(CreateMinigame)) { hudElemID = hud_element_create(&HES_StatusCoin); data->hudElemID = hudElemID; - hud_element_set_flags(data->hudElemID, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(data->hudElemID, HUD_ELEMENT_FLAG_80); hud_element_set_tint(data->hudElemID, 255, 255, 255); data->scoreWindowPosX = SCREEN_WIDTH + 1; @@ -1018,7 +1018,7 @@ StaticNpc N(NpcData_Toad) = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 0.0f, 0.0f, -20.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad), .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, diff --git a/src/world/area_mgm/mgm_02/mgm_02_2_npc.c b/src/world/area_mgm/mgm_02/mgm_02_2_npc.c index c2fddd1804..3eb9d08488 100644 --- a/src/world/area_mgm/mgm_02/mgm_02_2_npc.c +++ b/src/world/area_mgm/mgm_02/mgm_02_2_npc.c @@ -48,9 +48,9 @@ typedef enum SmashGameBoxCotent { } SmashGameBoxCotent; typedef enum SmashGameStunFlags { - STUN_FLAGS_STUNNED = 1, - STUN_FLAGS_CHANGED = 2, - STUN_FLAGS_GRABBED = 4 + STUN_FLAG_STUNNED = 1, + STUN_FLAG_CHANGED = 2, + STUN_FLAG_GRABBED = 4 } SmashGameStunFlags; typedef enum SmashGameBoxState { @@ -120,7 +120,7 @@ void N(appendGfx_score_display)(void* renderData) { s32 deciseconds; // show mash meter while grabbed by a fuzzy - if (data->stunFlags & STUN_FLAGS_GRABBED) { + if (data->stunFlags & STUN_FLAG_GRABBED) { hudElemA = data->hudElemID_AButton; hud_element_set_render_pos(hudElemA, 90, 90); hud_element_draw_clipped(hudElemA); @@ -202,14 +202,14 @@ API_CALLABLE(N(CreateScoreDisplay)) { hudElemA = hud_element_create(&HES_AButton); data->hudElemID_AButton = hudElemA; hud_element_set_render_depth(hudElemA, 0); - hud_element_set_flags(hudElemA, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(hudElemA, HUD_ELEMENT_FLAG_80); hud_element_set_tint(hudElemA, 255, 255, 255); hud_element_set_script(hudElemA, &HES_AButton); hudElemMeter = hud_element_create(&HES_BlueMeter); data->hudElemID_Meter = hudElemMeter; hud_element_set_render_depth(hudElemMeter, 0); - hud_element_set_flags(hudElemMeter, HUD_ELEMENT_FLAGS_80); + hud_element_set_flags(hudElemMeter, HUD_ELEMENT_FLAG_80); } return ApiStatus_BLOCK; @@ -475,9 +475,9 @@ API_CALLABLE(N(RunMinigame)) { hud_element_set_alpha(data->hudElemID_AButton, 160); hud_element_set_alpha(data->hudElemID_Meter, 160); data->mashProgress = 0; - data->stunFlags |= STUN_FLAGS_GRABBED; + data->stunFlags |= STUN_FLAG_GRABBED; enable_npc_shadow(npc); - data->stunFlags |= (STUN_FLAGS_STUNNED | STUN_FLAGS_CHANGED); + data->stunFlags |= (STUN_FLAG_STUNNED | STUN_FLAG_CHANGED); npc->duration = 8; sfx_play_sound(enemy->varTable[8]); data->box[i].state = BOX_STATE_FUZZY_ATTACH; @@ -528,8 +528,8 @@ API_CALLABLE(N(RunMinigame)) { } if (data->mashProgress >= 12) { gPlayerStatusPtr->anim = ANIM_Mario_10002; - data->stunFlags &= ~STUN_FLAGS_STUNNED; - data->stunFlags |= STUN_FLAGS_CHANGED; + data->stunFlags &= ~STUN_FLAG_STUNNED; + data->stunFlags |= STUN_FLAG_CHANGED; data->box[i].state = BOX_STATE_FUZZY_DETACH; npc->duration = 10; hud_element_set_script(data->hudElemID_AButton, &HES_AButton); @@ -542,7 +542,7 @@ API_CALLABLE(N(RunMinigame)) { case BOX_STATE_FUZZY_DETACH: npc->duration--; if (npc->duration == 8) { - data->stunFlags &= ~STUN_FLAGS_GRABBED; + data->stunFlags &= ~STUN_FLAG_GRABBED; } if (npc->duration <= 0) { data->box[i].state = BOX_STATE_FUZZY_DONE; @@ -601,7 +601,7 @@ API_CALLABLE(N(RunMinigame)) { enable_npc_shadow(npc); npc->duration = 15; npc->currentAnim = ANIM_Bobomb_Anim05; - data->stunFlags |= (STUN_FLAGS_STUNNED | STUN_FLAGS_CHANGED); + data->stunFlags |= (STUN_FLAG_STUNNED | STUN_FLAG_CHANGED); data->box[i].state = BOX_STATE_BOMB_ATTACK; get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); npc->pos.x = centerX; @@ -644,8 +644,8 @@ API_CALLABLE(N(RunMinigame)) { } if (npc->duration <= 0) { gPlayerStatusPtr->anim = ANIM_Mario_10002; - data->stunFlags &= ~STUN_FLAGS_STUNNED; - data->stunFlags |= STUN_FLAGS_CHANGED; + data->stunFlags &= ~STUN_FLAG_STUNNED; + data->stunFlags |= STUN_FLAG_CHANGED; data->box[i].state = BOX_STATE_BOMB_DONE; disable_npc_shadow(npc); npc->flags |= NPC_FLAG_2; @@ -676,10 +676,10 @@ API_CALLABLE(N(RunMinigame)) { npc->jumpScale = 1.1f; data->box[i].stateTimer = 0; model = get_model_from_list_index(get_model_list_index_from_tree_index(data->box[i].peachPanelModelID)); - model->flags &= -(MODEL_FLAGS_FLAG_1 | MODEL_FLAGS_ENABLED); - if (!(model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) { + model->flags &= -(MODEL_FLAG_FLAG_1 | MODEL_FLAG_ENABLED); + if (!(model->flags & MODEL_FLAG_HAS_TRANSFORM_APPLIED)) { guTranslateF(model->transformMatrix, npc->pos.x, npc->pos.y, npc->pos.z); - model->flags |= (MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED); + model->flags |= (MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED); } else { guTranslateF(mtx, npc->pos.x, npc->pos.y, npc->pos.z); @@ -692,9 +692,9 @@ API_CALLABLE(N(RunMinigame)) { npc->pos.y += npc->jumpVelocity; npc->jumpVelocity -= npc->jumpScale; model = get_model_from_list_index(get_model_list_index_from_tree_index(data->box[i].peachPanelModelID)); - if (!(model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) { + if (!(model->flags & MODEL_FLAG_HAS_TRANSFORM_APPLIED)) { guTranslateF(model->transformMatrix, npc->pos.x, npc->pos.y, npc->pos.z); - model->flags |= (MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED); + model->flags |= (MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED); } else { guTranslateF(mtx, npc->pos.x, npc->pos.y, npc->pos.z); guMtxCatF(mtx, model->transformMatrix, model->transformMatrix); @@ -708,7 +708,7 @@ API_CALLABLE(N(RunMinigame)) { data->box[i].state = BOX_STATE_PEACH_IDLE; data->box[i].stateTimer = rand_int(330) + 90; disable_npc_shadow(npc); - model->flags |= MODEL_FLAGS_ENABLED; + model->flags |= MODEL_FLAG_ENABLED; } break; case BOX_STATE_PEACH_HIT: @@ -717,15 +717,15 @@ API_CALLABLE(N(RunMinigame)) { enable_npc_shadow(npc); npc->duration = 0; data->box[i].state = BOX_STATE_PEACH_EMERGE; - model->flags &= -(MODEL_FLAGS_FLAG_1 | MODEL_FLAGS_ENABLED); + model->flags &= -(MODEL_FLAG_FLAG_1 | MODEL_FLAG_ENABLED); // fallthrough case BOX_STATE_PEACH_EMERGE: hittingPeachBlock = TRUE; model = get_model_from_list_index(get_model_list_index_from_tree_index(data->box[i].peachPanelModelID)); centerY = update_lerp(EASING_QUADRATIC_OUT, npc->moveToPos.y, npc->moveToPos.y + 30.0, npc->duration, 30); - if (!(model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) { + if (!(model->flags & MODEL_FLAG_HAS_TRANSFORM_APPLIED)) { guTranslateF(model->transformMatrix, npc->pos.x, centerY, npc->pos.z); - model->flags |= (MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED); + model->flags |= (MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED); } else { guTranslateF(mtx, npc->pos.x, centerY, npc->pos.z); guMtxCatF(mtx, model->transformMatrix, model->transformMatrix); @@ -734,7 +734,7 @@ API_CALLABLE(N(RunMinigame)) { if (npc->duration >= 30) { data->box[i].state = BOX_STATE_PEACH_DONE; disable_npc_shadow(npc); - model->flags |= MODEL_FLAGS_ENABLED; + model->flags |= MODEL_FLAG_ENABLED; } break; case BOX_STATE_PEACH_DONE: @@ -780,19 +780,19 @@ API_CALLABLE(N(RunMinigame)) { } } if ((data->timeLeft > 0) && (data->found == NUM_PANELS)) { - if (!(data->stunFlags & STUN_FLAGS_STUNNED)) { - data->stunFlags |= (STUN_FLAGS_STUNNED | STUN_FLAGS_CHANGED); + if (!(data->stunFlags & STUN_FLAG_STUNNED)) { + data->stunFlags |= (STUN_FLAG_STUNNED | STUN_FLAG_CHANGED); } } } if ((data->timeLeft == 0) && hittingPeachBlock) { - if (!(data->stunFlags & STUN_FLAGS_STUNNED)) { - data->stunFlags |= (STUN_FLAGS_STUNNED | STUN_FLAGS_CHANGED); + if (!(data->stunFlags & STUN_FLAG_STUNNED)) { + data->stunFlags |= (STUN_FLAG_STUNNED | STUN_FLAG_CHANGED); } } - if (data->stunFlags & STUN_FLAGS_CHANGED) { - data->stunFlags &= ~STUN_FLAGS_CHANGED; - if (data->stunFlags & STUN_FLAGS_STUNNED) { + if (data->stunFlags & STUN_FLAG_CHANGED) { + data->stunFlags &= ~STUN_FLAG_CHANGED; + if (data->stunFlags & STUN_FLAG_STUNNED) { disable_player_input(); partner_disable_input(); } else { @@ -805,7 +805,7 @@ API_CALLABLE(N(RunMinigame)) { gameFinished = TRUE; } if (gameFinished) { - if (data->stunFlags & STUN_FLAGS_STUNNED) { + if (data->stunFlags & STUN_FLAG_STUNNED) { enable_player_input(); partner_enable_input(); } @@ -1638,7 +1638,7 @@ EvtScript N(EVS_Toad_GovernGame) = { EVT_CALL(SetNpcPos, NPC_Toad, 358, -20, 185) EVT_CALL(EnableNpcShadow, NPC_Toad, TRUE) EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 1, 358, 5, 189) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, 0) EVT_END_THREAD EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_Toad, LVar3, LVar4, LVar5) @@ -1788,7 +1788,7 @@ StaticNpc N(NpcData_GuideToad) = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 353.0f, -20.0f, 185.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad), .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, @@ -1872,10 +1872,10 @@ StaticNpc N(NpcData_Fuzzy_01) = { .settings = &N(NpcSettings_Fuzzy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000 | ENEMY_FLAGS_20000000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Fuzzy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -1905,10 +1905,10 @@ StaticNpc N(NpcData_Fuzzy_02) = { .settings = &N(NpcSettings_Fuzzy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000 | ENEMY_FLAGS_20000000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Fuzzy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -1938,10 +1938,10 @@ StaticNpc N(NpcData_Fuzzy_03) = { .settings = &N(NpcSettings_Fuzzy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000 | ENEMY_FLAGS_20000000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Fuzzy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -1971,10 +1971,10 @@ StaticNpc N(NpcData_Fuzzy_04) = { .settings = &N(NpcSettings_Fuzzy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000 | ENEMY_FLAGS_20000000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Fuzzy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2004,10 +2004,10 @@ StaticNpc N(NpcData_Fuzzy_05) = { .settings = &N(NpcSettings_Fuzzy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000 | ENEMY_FLAGS_20000000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Fuzzy), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2037,10 +2037,10 @@ StaticNpc N(NpcData_Bobomb_01) = { .settings = &N(NpcSettings_Bobomb), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000 | ENEMY_FLAGS_20000000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Bobomb), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2070,10 +2070,10 @@ StaticNpc N(NpcData_Bobomb_02) = { .settings = &N(NpcSettings_Bobomb), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000 | ENEMY_FLAGS_20000000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Bobomb), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2103,10 +2103,10 @@ StaticNpc N(NpcData_Bobomb_03) = { .settings = &N(NpcSettings_Bobomb), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000 | ENEMY_FLAGS_20000000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Bobomb), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2136,10 +2136,10 @@ StaticNpc N(NpcData_Bobomb_04) = { .settings = &N(NpcSettings_Bobomb), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000 | ENEMY_FLAGS_20000000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Bobomb), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2169,10 +2169,10 @@ StaticNpc N(NpcData_Bobomb_05) = { .settings = &N(NpcSettings_Bobomb), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000 | ENEMY_FLAGS_20000000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Bobomb), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2203,10 +2203,10 @@ StaticNpc N(NpcData_Luigis)[] = { .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000 | ENEMY_FLAGS_20000000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Luigi), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2235,10 +2235,10 @@ StaticNpc N(NpcData_Luigis)[] = { .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000 | ENEMY_FLAGS_20000000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Luigi), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2267,10 +2267,10 @@ StaticNpc N(NpcData_Luigis)[] = { .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000 | ENEMY_FLAGS_20000000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Luigi), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2299,10 +2299,10 @@ StaticNpc N(NpcData_Luigis)[] = { .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000 | ENEMY_FLAGS_20000000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Luigi), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2331,10 +2331,10 @@ StaticNpc N(NpcData_Luigis)[] = { .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000 | ENEMY_FLAGS_20000000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Luigi), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2363,10 +2363,10 @@ StaticNpc N(NpcData_Luigis)[] = { .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000 | ENEMY_FLAGS_20000000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Luigi), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2395,10 +2395,10 @@ StaticNpc N(NpcData_Luigis)[] = { .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000 | ENEMY_FLAGS_20000000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Luigi), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2427,10 +2427,10 @@ StaticNpc N(NpcData_Luigis)[] = { .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000 | ENEMY_FLAGS_20000000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Luigi), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2459,10 +2459,10 @@ StaticNpc N(NpcData_Luigis)[] = { .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000 | ENEMY_FLAGS_20000000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Luigi), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -2491,10 +2491,10 @@ StaticNpc N(NpcData_Luigis)[] = { .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000 | ENEMY_FLAGS_20000000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, .init = &N(EVS_NpcInit_Luigi), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_mim/mim_01/mim_01_6_npc.c b/src/world/area_mim/mim_01/mim_01_6_npc.c index 291074d782..c37210d92f 100644 --- a/src/world/area_mim/mim_01/mim_01_6_npc.c +++ b/src/world/area_mim/mim_01/mim_01_6_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_PiranhaPlant)[] = { .settings = &N(NpcSettings_PiranhaPlant), .pos = { 135.0f, 0.0f, -300.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = PIRANHA_PLANT_DROPS, .territory = { .wander = { diff --git a/src/world/area_mim/mim_02/mim_02_3_npc.c b/src/world/area_mim/mim_02/mim_02_3_npc.c index 460832413c..a4a6612d48 100644 --- a/src/world/area_mim/mim_02/mim_02_3_npc.c +++ b/src/world/area_mim/mim_02/mim_02_3_npc.c @@ -161,7 +161,7 @@ StaticNpc N(NpcData_Oaklie) = { .settings = &N(NpcSettings_Oaklie), .pos = { -426.0f, 58.0f, -70.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Oaklie), .drops = OAKLIE_DROPS, .animations = OAKLIE_ANIMS, diff --git a/src/world/area_mim/mim_03/mim_03_6_npc.c b/src/world/area_mim/mim_03/mim_03_6_npc.c index 34fe871022..8efa07d055 100644 --- a/src/world/area_mim/mim_03/mim_03_6_npc.c +++ b/src/world/area_mim/mim_03/mim_03_6_npc.c @@ -46,7 +46,7 @@ StaticNpc N(NpcData_Oaklie) = { .settings = &N(NpcSettings_Oaklie), .pos = { 0.0f, 32.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Oaklie), .drops = OAKLIE_DROPS, .animations = OAKLIE_ANIMS, diff --git a/src/world/area_mim/mim_04/mim_04_6_npc.c b/src/world/area_mim/mim_04/mim_04_6_npc.c index 4850ccd737..a92a58fbe1 100644 --- a/src/world/area_mim/mim_04/mim_04_6_npc.c +++ b/src/world/area_mim/mim_04/mim_04_6_npc.c @@ -59,7 +59,7 @@ StaticNpc N(NpcData_Fuzzy) = { .settings = &N(NpcSettings_ForestFuzzy), .pos = { 240.0f, 0.0f, -240.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, .drops = FOREST_FUZZY_DROPS, .territory = { .wander = { @@ -82,7 +82,7 @@ StaticNpc N(NpcData_Bubulb) = { .settings = &N(NpcSettings_Bubulb), .pos = { 0.0f, 32.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bubulb), .drops = BUBULB_DROPS, .animations = BUBULB_GREEN_ANIMS, diff --git a/src/world/area_mim/mim_05/mim_05_6_npc.c b/src/world/area_mim/mim_05/mim_05_6_npc.c index 198267ea7e..98d27b8245 100644 --- a/src/world/area_mim/mim_05/mim_05_6_npc.c +++ b/src/world/area_mim/mim_05/mim_05_6_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_PiranhaPlant_01)[] = { .settings = &N(NpcSettings_PiranhaPlant), .pos = { -240.0f, 0.0f, 240.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = PIRANHA_PLANT_DROPS, .territory = { .wander = { @@ -34,7 +34,7 @@ StaticNpc N(NpcData_PiranhaPlant_02)[] = { .settings = &N(NpcSettings_PiranhaPlant), .pos = { 240.0f, 0.0f, -240.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = PIRANHA_PLANT_DROPS, .territory = { .wander = { diff --git a/src/world/area_mim/mim_06/mim_06_6_npc.c b/src/world/area_mim/mim_06/mim_06_6_npc.c index 669a2bf731..85f41435ce 100644 --- a/src/world/area_mim/mim_06/mim_06_6_npc.c +++ b/src/world/area_mim/mim_06/mim_06_6_npc.c @@ -60,7 +60,7 @@ StaticNpc N(NpcData_Fuzzy) = { .settings = &N(NpcSettings_ForestFuzzy), .pos = { -140.0f, 0.0f, 300.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = FOREST_FUZZY_DROPS, .territory = { .wander = { diff --git a/src/world/area_mim/mim_07/mim_07_6_npc.c b/src/world/area_mim/mim_07/mim_07_6_npc.c index 53d9907920..6b72833ccf 100644 --- a/src/world/area_mim/mim_07/mim_07_6_npc.c +++ b/src/world/area_mim/mim_07/mim_07_6_npc.c @@ -235,10 +235,10 @@ StaticNpc N(NpcData_JrTroopa) = { .settings = &N(NpcSettings_JrTroopa), .pos = { -338.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_800000, .init = &N(EVS_NpcInit_JrTroopa), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_mim/mim_08/mim_08_5_npc.c b/src/world/area_mim/mim_08/mim_08_5_npc.c index f6de8ce50d..e8562c0e36 100644 --- a/src/world/area_mim/mim_08/mim_08_5_npc.c +++ b/src/world/area_mim/mim_08/mim_08_5_npc.c @@ -30,7 +30,7 @@ StaticNpc N(NpcData_Bzzap) = { .settings = &N(NpcSettings_Bzzap), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Bzzap), .drops = BZZAP_NO_DROPS, .territory = { @@ -54,7 +54,7 @@ StaticNpc N(NpcData_PiranhaPlant_01)[] = { .settings = &N(NpcSettings_PiranhaPlant), .pos = { -240.0f, 0.0f, -240.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = PIRANHA_PLANT_DROPS, .territory = { .wander = { @@ -80,7 +80,7 @@ StaticNpc N(NpcData_PiranhaPlant_02)[] = { .settings = &N(NpcSettings_PiranhaPlant), .pos = { 240.0f, 0.0f, 240.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = PIRANHA_PLANT_DROPS, .territory = { .wander = { diff --git a/src/world/area_mim/mim_09/mim_09_6_npc.c b/src/world/area_mim/mim_09/mim_09_6_npc.c index 7504854ad1..85d88562b3 100644 --- a/src/world/area_mim/mim_09/mim_09_6_npc.c +++ b/src/world/area_mim/mim_09/mim_09_6_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_Fuzzy) = { .settings = &N(NpcSettings_ForestFuzzy), .pos = { 270.0f, 0.0f, 200.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .drops = FOREST_FUZZY_DROPS, .territory = { .wander = { diff --git a/src/world/area_mim/mim_10/mim_10_4_npc.c b/src/world/area_mim/mim_10/mim_10_4_npc.c index b593e67caa..8947c7cad6 100644 --- a/src/world/area_mim/mim_10/mim_10_4_npc.c +++ b/src/world/area_mim/mim_10/mim_10_4_npc.c @@ -251,10 +251,10 @@ StaticNpc N(NpcData_Bootler) = { .settings = &N(NpcSettings_Bootler), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bootler), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -283,10 +283,10 @@ StaticNpc N(NpcData_JrTroopa) = { .settings = &N(NpcSettings_JrTroopa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_JrTroopa), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_mim/mim_11/mim_11_2_main.c b/src/world/area_mim/mim_11/mim_11_2_main.c index 274579a8b6..82a865830e 100644 --- a/src/world/area_mim/mim_11/mim_11_2_main.c +++ b/src/world/area_mim/mim_11/mim_11_2_main.c @@ -106,9 +106,9 @@ EvtScript N(EVS_Scene_ReachedMansion) = { EVT_CALL(SetPlayerPos, -701, 0, -34) EVT_CALL(SetNpcPos, NPC_PARTNER, -701, 0, -34) EVT_CALL(DisablePlayerPhysics, FALSE) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_NO_FLIPPING, TRUE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, TRUE) EVT_CALL(PlayerMoveTo, -407, 103, 120) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_NO_FLIPPING, FALSE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, FALSE) EVT_WAIT(10) EVT_THREAD EVT_WAIT(15) diff --git a/src/world/area_mim/mim_11/mim_11_5_npc.c b/src/world/area_mim/mim_11/mim_11_5_npc.c index 9a6fe4096a..74f3d102c3 100644 --- a/src/world/area_mim/mim_11/mim_11_5_npc.c +++ b/src/world/area_mim/mim_11/mim_11_5_npc.c @@ -80,10 +80,10 @@ StaticNpc N(NpcData_Bootler)[] = { .settings = &N(NpcSettings_Bootler), .pos = { 68.0f, 60.0f, -145.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bootler), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -111,10 +111,10 @@ StaticNpc N(NpcData_Bootler)[] = { .settings = &N(NpcSettings_Skolar), .pos = { 68.0f, 60.0f, -145.0f }, .yaw = 135, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Skolar), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_mim/mim_12/mim_12_4_npc.c b/src/world/area_mim/mim_12/mim_12_4_npc.c index 8f3686a05e..f77034dc57 100644 --- a/src/world/area_mim/mim_12/mim_12_4_npc.c +++ b/src/world/area_mim/mim_12/mim_12_4_npc.c @@ -18,10 +18,10 @@ StaticNpc N(NpcData_GateBoos)[] = { .settings = &N(NpcSettings_Boo), .pos = { -68.0f, 65.0f, -56.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_GateBoo_01), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -32,10 +32,10 @@ StaticNpc N(NpcData_GateBoos)[] = { .settings = &N(NpcSettings_Boo), .pos = { -125.0f, 65.0f, 60.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_GateBoo_02), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_obk/RockingChair.inc.c b/src/world/area_obk/RockingChair.inc.c index 2ead67e603..2ba63bdfa8 100644 --- a/src/world/area_obk/RockingChair.inc.c +++ b/src/world/area_obk/RockingChair.inc.c @@ -171,7 +171,7 @@ API_CALLABLE(N(UpdateRockingChair)) { physics->verticalOffset = SQ(physics->rotationAngle) / 90.0f; model = get_model_from_list_index(get_model_list_index_from_tree_index(MODEL_i3)); - model->flags |= (MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED); + model->flags |= (MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED); guTranslateF(model->transformMatrix, 0.0f, physics->verticalOffset, 0.0f); guRotateF(tempMtx, physics->rotationAngle, 0.0f, 0.0f, 1.0f); guMtxCatF(model->transformMatrix, tempMtx, model->transformMatrix); @@ -179,13 +179,13 @@ API_CALLABLE(N(UpdateRockingChair)) { update_collider_transform(COLLIDER_i2); model = get_model_from_list_index(get_model_list_index_from_tree_index(MODEL_i2)); - model->flags |= (MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED); + model->flags |= (MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED); guTranslateF(model->transformMatrix, 0.0f, physics->verticalOffset, 0.0f); guRotateF(tempMtx, physics->rotationAngle, 0.0f, 0.0f, 1.0f); guMtxCatF(model->transformMatrix, tempMtx, model->transformMatrix); model = get_model_from_list_index(get_model_list_index_from_tree_index(MODEL_i1)); - model->flags |= (MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED); + model->flags |= (MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED); guTranslateF(model->transformMatrix, 0.0f, physics->verticalOffset, 0.0f); guRotateF(tempMtx, physics->rotationAngle, 0.0f, 0.0f, 1.0f); guMtxCatF(model->transformMatrix, tempMtx, model->transformMatrix); diff --git a/src/world/area_obk/obk_01/obk_01_3_chandelier.c b/src/world/area_obk/obk_01/obk_01_3_chandelier.c index a1a9ca5a94..f89ae835cf 100644 --- a/src/world/area_obk/obk_01/obk_01_3_chandelier.c +++ b/src/world/area_obk/obk_01/obk_01_3_chandelier.c @@ -252,11 +252,11 @@ API_CALLABLE(N(UpdateChandelier)) { guTranslateF(tempMtx, 0.0f, 300.0f, 0.0f); guMtxCatF(model->transformMatrix, tempMtx, model->transformMatrix); guMtxCatF(chandelier->transformMtx, model->transformMatrix, model->transformMatrix); - model->flags |= MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED; + model->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED; for (i = 1; i < ARRAY_COUNT(chandelier->models); i++) { copy_matrix(model->transformMatrix, chandelier->models[i]->transformMatrix); - chandelier->models[i]->flags |= MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED; + chandelier->models[i]->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED; } if (chandelier->flags & CHANDELIER_FLAG_TETHER_PLAYER) { diff --git a/src/world/area_obk/obk_01/obk_01_4_portrait.c b/src/world/area_obk/obk_01/obk_01_4_portrait.c index 4659a1c482..29348a60a5 100644 --- a/src/world/area_obk/obk_01/obk_01_4_portrait.c +++ b/src/world/area_obk/obk_01/obk_01_4_portrait.c @@ -4,7 +4,7 @@ API_CALLABLE(N(SetPortraitItemAlpha)) { ItemEntity* item = get_item_entity(script->varTable[0]); - set_item_entity_flags(script->varTable[0], ITEM_ENTITY_FLAGS_TRANSPARENT); + set_item_entity_flags(script->varTable[0], ITEM_ENTITY_FLAG_TRANSPARENT); item->alpha = 255; return ApiStatus_DONE2; } diff --git a/src/world/area_obk/obk_01/obk_01_6_npc.c b/src/world/area_obk/obk_01/obk_01_6_npc.c index 41eb484e10..0963e5fab8 100644 --- a/src/world/area_obk/obk_01/obk_01_6_npc.c +++ b/src/world/area_obk/obk_01/obk_01_6_npc.c @@ -200,7 +200,7 @@ StaticNpc N(NpcData_JumpScareBoo) = { .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_200 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_200 | ENEMY_FLAG_800, .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, }; @@ -210,7 +210,7 @@ StaticNpc N(NpcData_TrafficBoo1) = { .settings = &N(NpcSettings_Boo), .pos = { 523.0f, -139.0f, 193.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TrafficBoo1), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -221,7 +221,7 @@ StaticNpc N(NpcData_TrafficBoo2) = { .settings = &N(NpcSettings_Boo), .pos = { 473.0f, -122.0f, 247.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TrafficBoo2), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -233,7 +233,7 @@ StaticNpc N(NpcData_Boos)[] = { .settings = &N(NpcSettings_Boo_Wander), .pos = { 422.0f, -200.0f, 112.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_UpstairsBoo), .drops = BOO_DROPS, .territory = { @@ -256,7 +256,7 @@ StaticNpc N(NpcData_Boos)[] = { .settings = &N(NpcSettings_Boo_Wander), .pos = { 397.0f, -410.0f, 352.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Franky), .drops = BOO_DROPS, .territory = { diff --git a/src/world/area_obk/obk_02/obk_02_3_npc.c b/src/world/area_obk/obk_02/obk_02_3_npc.c index cd011f526b..702825ede4 100644 --- a/src/world/area_obk/obk_02/obk_02_3_npc.c +++ b/src/world/area_obk/obk_02/obk_02_3_npc.c @@ -24,7 +24,7 @@ StaticNpc N(NpcData_TrafficBoos)[] = { .settings = &N(NpcSettings_Boo), .pos = { 523.0f, -139.0f, 193.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TrafficBoo1), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -34,7 +34,7 @@ StaticNpc N(NpcData_TrafficBoos)[] = { .settings = &N(NpcSettings_Boo), .pos = { 473.0f, -122.0f, 247.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TrafficBoo2), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, diff --git a/src/world/area_obk/obk_03/obk_03_6_npc.c b/src/world/area_obk/obk_03/obk_03_6_npc.c index 4b9766eac5..e9a57602f2 100644 --- a/src/world/area_obk/obk_03/obk_03_6_npc.c +++ b/src/world/area_obk/obk_03/obk_03_6_npc.c @@ -54,7 +54,7 @@ StaticNpc N(NpcData_Igor) = { .settings = &N(NpcSettings_Boo), .pos = { 43.0f, -200.0f, -9.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Igor), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, diff --git a/src/world/area_obk/obk_04/obk_04_2_entity.c b/src/world/area_obk/obk_04/obk_04_2_entity.c index 4ec8e96098..33162d989b 100644 --- a/src/world/area_obk/obk_04/obk_04_2_entity.c +++ b/src/world/area_obk/obk_04/obk_04_2_entity.c @@ -4,7 +4,7 @@ API_CALLABLE(N(SetItemAlpha)) { ItemEntity* item = get_item_entity(script->varTable[0]); - set_item_entity_flags(script->varTable[0], ITEM_ENTITY_FLAGS_TRANSPARENT); + set_item_entity_flags(script->varTable[0], ITEM_ENTITY_FLAG_TRANSPARENT); item->alpha = 255; return ApiStatus_DONE2; } diff --git a/src/world/area_obk/obk_04/obk_04_3_npc.c b/src/world/area_obk/obk_04/obk_04_3_npc.c index 4843f11b22..3832f653b7 100644 --- a/src/world/area_obk/obk_04/obk_04_3_npc.c +++ b/src/world/area_obk/obk_04/obk_04_3_npc.c @@ -491,7 +491,7 @@ StaticNpc N(NpcData_Boo_01) = { .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_10000000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_Boo_01), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -502,7 +502,7 @@ StaticNpc N(NpcData_KeepAwayBoo1) = { .settings = &N(NpcSettings_Boo), .pos = { 176.0f, 0.0f, -173.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_10000000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo1), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -513,7 +513,7 @@ StaticNpc N(NpcData_KeepAwayBoo2) = { .settings = &N(NpcSettings_Boo), .pos = { 176.0f, 0.0f, -173.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_10000000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo2), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -524,7 +524,7 @@ StaticNpc N(NpcData_KeepAwayBoo3) = { .settings = &N(NpcSettings_Boo), .pos = { 176.0f, 0.0f, -173.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_10000000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo3), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -535,7 +535,7 @@ StaticNpc N(NpcData_KeepAwayBoo4) = { .settings = &N(NpcSettings_Boo), .pos = { 176.0f, 0.0f, -173.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_10000000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo4), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -546,7 +546,7 @@ StaticNpc N(NpcData_KeepAwayBoo5) = { .settings = &N(NpcSettings_Boo), .pos = { 176.0f, 0.0f, -173.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_10000000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo5), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -557,7 +557,7 @@ StaticNpc N(NpcData_KeepAwayBoo6) = { .settings = &N(NpcSettings_Boo), .pos = { 176.0f, 0.0f, -173.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_10000000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo6), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -568,7 +568,7 @@ StaticNpc N(NpcData_KeepAwayBoo7) = { .settings = &N(NpcSettings_Boo), .pos = { 176.0f, 0.0f, -173.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_10000000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo7), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -579,7 +579,7 @@ StaticNpc N(NpcData_KeepAwayBoo8) = { .settings = &N(NpcSettings_Boo), .pos = { 176.0f, 0.0f, -173.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_10000000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo8), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -626,7 +626,7 @@ StaticNpc N(NpcData_KeepAwayExtras)[] = { .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Boo_10), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -636,7 +636,7 @@ StaticNpc N(NpcData_KeepAwayExtras)[] = { .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_4000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000, .init = &N(EVS_NpcInit_Boo_11), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -648,7 +648,7 @@ StaticNpc N(NpcData_TutorialBoo) = { .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TutorialBoo), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, diff --git a/src/world/area_obk/obk_05/obk_05_5_npc.c b/src/world/area_obk/obk_05/obk_05_5_npc.c index fa75dcf8fa..93e0925985 100644 --- a/src/world/area_obk/obk_05/obk_05_5_npc.c +++ b/src/world/area_obk/obk_05/obk_05_5_npc.c @@ -24,7 +24,7 @@ StaticNpc N(NpcData_Boo_01)[] = { .settings = &N(NpcSettings_Boo), .pos = { 523.0f, -139.0f, 193.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TrafficBoo1), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -34,7 +34,7 @@ StaticNpc N(NpcData_Boo_01)[] = { .settings = &N(NpcSettings_Boo), .pos = { 473.0f, -122.0f, 247.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TrafficBoo2), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, diff --git a/src/world/area_obk/obk_07/obk_07_5_npc.c b/src/world/area_obk/obk_07/obk_07_5_npc.c index ea386a1c3d..a33a13de22 100644 --- a/src/world/area_obk/obk_07/obk_07_5_npc.c +++ b/src/world/area_obk/obk_07/obk_07_5_npc.c @@ -17,7 +17,7 @@ StaticNpc N(NpcData_TrafficBoo1) = { .settings = &N(NpcSettings_Boo), .pos = { 523.0f, -139.0f, 193.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TrafficBoo1), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -34,7 +34,7 @@ StaticNpc N(NpcData_TrafficBoo2) = { .settings = &N(NpcSettings_Boo), .pos = { 473.0f, -122.0f, 247.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TrafficBoo2), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -56,7 +56,7 @@ StaticNpc N(NpcData_GuardBoo) = { .settings = &N(NpcSettings_Boo), .pos = { 168.0f, 0.0f, -161.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_GuardBoo), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, diff --git a/src/world/area_obk/obk_07/obk_07_6_phonograph.c b/src/world/area_obk/obk_07/obk_07_6_phonograph.c index 0cceba37bf..12c2089bf2 100644 --- a/src/world/area_obk/obk_07/obk_07_6_phonograph.c +++ b/src/world/area_obk/obk_07/obk_07_6_phonograph.c @@ -204,13 +204,13 @@ void N(worker_update_phonograph_hud)(void) { case PHONOGRAPH_HUD_STATE_INIT: id = data->hudElemAButton; hud_element_set_alpha(id, 255); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); id = data->hudElemBlueMeter; hud_element_set_alpha(id, 255); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); id = data->hudElemOK; hud_element_set_alpha(id, 255); - hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAG_DISABLED); data->state = PHONOGRAPH_HUD_STATE_APPEAR; break; case PHONOGRAPH_HUD_STATE_APPEAR: @@ -354,17 +354,17 @@ API_CALLABLE(N(CreatePhonographHudData)) { data->hudElemAButton = id = hud_element_create(&HES_AButton); hud_element_set_render_pos(id, data->hudBaseX, data->hudBaseY); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); data->hudElemBlueMeter = id = hud_element_create(&HES_BlueMeter); hud_element_set_render_pos(id, data->hudBaseX, data->hudBaseY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); data->hudElemOK = id = hud_element_create(&HES_RunAwayOK); hud_element_set_render_pos(id, data->hudBaseX, data->hudBaseY + 28); hud_element_set_render_depth(id, 0); - hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_flags(id, HUD_ELEMENT_FLAG_80 | HUD_ELEMENT_FLAG_DISABLED); return ApiStatus_DONE2; } diff --git a/src/world/area_obk/obk_08/obk_08_4_entity.c b/src/world/area_obk/obk_08/obk_08_4_entity.c index 2d616b7fda..a2964b8418 100644 --- a/src/world/area_obk/obk_08/obk_08_4_entity.c +++ b/src/world/area_obk/obk_08/obk_08_4_entity.c @@ -9,7 +9,7 @@ API_CALLABLE(N(ShutterCrashRumble)) { } API_CALLABLE(N(EnableItemTransparency)) { - set_item_entity_flags(script->varTable[0], ITEM_ENTITY_FLAGS_TRANSPARENT); + set_item_entity_flags(script->varTable[0], ITEM_ENTITY_FLAG_TRANSPARENT); return ApiStatus_DONE2; } diff --git a/src/world/area_obk/obk_08/obk_08_5_npc.c b/src/world/area_obk/obk_08/obk_08_5_npc.c index ebfdfe41f2..4ec3d44d1b 100644 --- a/src/world/area_obk/obk_08/obk_08_5_npc.c +++ b/src/world/area_obk/obk_08/obk_08_5_npc.c @@ -451,7 +451,7 @@ StaticNpc N(NpcData_Boo_01) = { .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_10000000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_Boo_01), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -462,7 +462,7 @@ StaticNpc N(NpcData_KeepAwayBoo1) = { .settings = &N(NpcSettings_Boo), .pos = { -268.0f, 52.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_10000000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo1), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -473,7 +473,7 @@ StaticNpc N(NpcData_KeepAwayBoo2) = { .settings = &N(NpcSettings_Boo), .pos = { -268.0f, 52.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_10000000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo2), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -484,7 +484,7 @@ StaticNpc N(NpcData_KeepAwayBoo3) = { .settings = &N(NpcSettings_Boo), .pos = { -268.0f, 52.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_10000000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo3), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -495,7 +495,7 @@ StaticNpc N(NpcData_KeepAwayBoo4) = { .settings = &N(NpcSettings_Boo), .pos = { -268.0f, 52.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_10000000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo4), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -506,7 +506,7 @@ StaticNpc N(NpcData_KeepAwayBoo5) = { .settings = &N(NpcSettings_Boo), .pos = { -268.0f, 52.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_10000000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo5), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -517,7 +517,7 @@ StaticNpc N(NpcData_KeepAwayBoo6) = { .settings = &N(NpcSettings_Boo), .pos = { -268.0f, 52.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_10000000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo6), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -528,7 +528,7 @@ StaticNpc N(NpcData_KeepAwayBoo7) = { .settings = &N(NpcSettings_Boo), .pos = { -268.0f, 52.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_10000000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo7), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -539,7 +539,7 @@ StaticNpc N(NpcData_KeepAwayBoo8) = { .settings = &N(NpcSettings_Boo), .pos = { -268.0f, 52.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_10000000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_KeepAwayBoo8), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -567,7 +567,7 @@ StaticNpc N(NpcData_TrafficBoos)[] = { .settings = &N(NpcSettings_Boo), .pos = { 523.0f, -139.0f, 193.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TrafficBoo1), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -577,7 +577,7 @@ StaticNpc N(NpcData_TrafficBoos)[] = { .settings = &N(NpcSettings_Boo), .pos = { 473.0f, -122.0f, 247.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_TrafficBoo2), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -601,7 +601,7 @@ StaticNpc N(NpcData_KeepAwayExtras)[] = { .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Boo_12), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -611,7 +611,7 @@ StaticNpc N(NpcData_KeepAwayExtras)[] = { .settings = &N(NpcSettings_Boo), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_4000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000, .init = &N(EVS_NpcInit_Boo_13), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, diff --git a/src/world/area_obk/obk_09/obk_09_4_npc.c b/src/world/area_obk/obk_09/obk_09_4_npc.c index b32c405b12..8d7daf98f0 100644 --- a/src/world/area_obk/obk_09/obk_09_4_npc.c +++ b/src/world/area_obk/obk_09/obk_09_4_npc.c @@ -136,7 +136,7 @@ StaticNpc N(NpcData_Default)[] = { .settings = &N(NpcSettings_Dummy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bow), .drops = BOW_DROPS, .animations = BOW_ANIMS, @@ -146,7 +146,7 @@ StaticNpc N(NpcData_Default)[] = { .settings = &N(NpcSettings_Dummy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bootler), .drops = BOOTLER_DROPS, .animations = BOOTLER_ANIMS, @@ -157,7 +157,7 @@ StaticNpc N(NpcData_Default)[] = { .settings = &N(NpcSettings_Dummy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Skolar), .drops = SKOLAR_DROPS, .animations = SKOLAR_ANIMS, @@ -170,7 +170,7 @@ StaticNpc N(NpcData_Epilogue)[] = { .settings = &N(NpcSettings_Dummy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bow_Epilogue), .drops = BOW_DROPS, .animations = BOW_ANIMS, @@ -180,7 +180,7 @@ StaticNpc N(NpcData_Epilogue)[] = { .settings = &N(NpcSettings_Dummy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bootler_Epilogue), .drops = BOOTLER_DROPS, .animations = BOOTLER_ANIMS, diff --git a/src/world/area_omo/omo_01/D9AEF0.c b/src/world/area_omo/omo_01/D9AEF0.c index 27206d6527..bd47ce6126 100644 --- a/src/world/area_omo/omo_01/D9AEF0.c +++ b/src/world/area_omo/omo_01/D9AEF0.c @@ -41,7 +41,7 @@ ApiStatus func_80240000_D9AEF0(Evt* script, s32 isInitialCall) { it->unk_08 = temp_f20; } model = get_model_from_list_index(get_model_list_index_from_tree_index(it->treeIndex)); - model->flags |= MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED; + model->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED; guTranslateF(sp18, -it->unk_00, 0.0f, -it->unk_04); guRotateF(sp58, temp_f20, 0.0f, 0.0f, 1.0f); guMtxCatF(sp18, sp58, model->transformMatrix); diff --git a/src/world/area_omo/omo_02/D9D510.c b/src/world/area_omo/omo_02/D9D510.c index b5eae68cfb..e05dd34a89 100644 --- a/src/world/area_omo/omo_02/D9D510.c +++ b/src/world/area_omo/omo_02/D9D510.c @@ -41,7 +41,7 @@ ApiStatus func_80240040_D9D510(Evt* script, s32 isInitialCall) { it->unk_08 = temp_f20; } model = get_model_from_list_index(get_model_list_index_from_tree_index(it->treeIndex)); - model->flags |= MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED; + model->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED; guTranslateF(sp18, -it->unk_00, 0.0f, -it->unk_04); guRotateF(sp58, temp_f20, 0.0f, 0.0f, 1.0f); guMtxCatF(sp18, sp58, model->transformMatrix); diff --git a/src/world/area_omo/omo_05/DB22C0.c b/src/world/area_omo/omo_05/DB22C0.c index 65c93c35db..3a255b7695 100644 --- a/src/world/area_omo/omo_05/DB22C0.c +++ b/src/world/area_omo/omo_05/DB22C0.c @@ -67,7 +67,7 @@ ApiStatus func_80242328_DB45E8(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[CAM_DEFAULT]; if (isInitialCall) { - camera->flags |= CAMERA_FLAGS_SHAKING; + camera->flags |= CAMERA_FLAG_SHAKING; script->functionTempF[0] = 0.0f; } script->functionTempF[0] += 10.0f; diff --git a/src/world/area_omo/omo_09/DCCCD0.c b/src/world/area_omo/omo_09/DCCCD0.c index 14340754f0..5f22e4275f 100644 --- a/src/world/area_omo/omo_09/DCCCD0.c +++ b/src/world/area_omo/omo_09/DCCCD0.c @@ -10,7 +10,7 @@ ApiStatus func_80240000_DCCCD0(void) { PlayerStatus* playerStatus = &gPlayerStatus; PlayerData* playerData = &gPlayerData; - if (playerStatus->flags & PS_FLAGS_PAUSED) { + if (playerStatus->flags & PS_FLAG_PAUSED) { return TRUE; } diff --git a/src/world/area_omo/omo_13/DE2490.c b/src/world/area_omo/omo_13/DE2490.c index e63fb8ecea..034e9c3182 100644 --- a/src/world/area_omo/omo_13/DE2490.c +++ b/src/world/area_omo/omo_13/DE2490.c @@ -44,7 +44,7 @@ ApiStatus func_80240000_DE2490(Evt* script, s32 isInitialCall) { it->unk_08 = temp_f20; } model = get_model_from_list_index(get_model_list_index_from_tree_index(it->treeIndex)); - model->flags |= MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED; + model->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED; guTranslateF(sp18, -it->unk_00, 0.0f, -it->unk_04); guRotateF(sp58, temp_f20, 0.0f, 0.0f, 1.0f); guMtxCatF(sp18, sp58, model->transformMatrix); diff --git a/src/world/area_osr/osr_00/osr_00_3_npc_intro.c b/src/world/area_osr/osr_00/osr_00_3_npc_intro.c index 6d1c28348c..895dd321b1 100644 --- a/src/world/area_osr/osr_00/osr_00_3_npc_intro.c +++ b/src/world/area_osr/osr_00/osr_00_3_npc_intro.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_Luigi) = { .settings = &N(NpcSettings_Luigi), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = LUIGI_DROPS, .animations = LUIGI_ANIMS, }; diff --git a/src/world/area_osr/osr_00/osr_00_4_npc_epilogue.c b/src/world/area_osr/osr_00/osr_00_4_npc_epilogue.c index 96adde0b2a..1ade3dd871 100644 --- a/src/world/area_osr/osr_00/osr_00_4_npc_epilogue.c +++ b/src/world/area_osr/osr_00/osr_00_4_npc_epilogue.c @@ -222,7 +222,7 @@ StaticNpc N(NpcData_Yoshis)[] = { .settings = &N(NpcSettings_Yoshi), .pos = { 70.0f, 0.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_LeaderYoshi), .drops = YOSHI_DROPS, .animations = YOSHI_LEADER_ANIMS, @@ -234,7 +234,7 @@ StaticNpc N(NpcData_Yoshis)[] = { .settings = &N(NpcSettings_Yoshi), .pos = { 70.0f, 0.0f, 400.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Yoshi), .drops = YOSHI_DROPS, .animations = YOSHI_GREEN_ANIMS, @@ -246,7 +246,7 @@ StaticNpc N(NpcData_Yoshis)[] = { .settings = &N(NpcSettings_YoshiKid), .pos = { 160.0f, 0.0f, 540.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_YoshiKid), .drops = YOSHI_KID_DROPS, .animations = YOSHI_KID_GREEN_ANIMS, @@ -282,7 +282,7 @@ StaticNpc N(NpcData_Penguins)[] = { .settings = &N(NpcSettings_Penguin), .pos = { 150.0f, 0.0f, 105.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_MayorPenguin), .drops = PENGUIN_DROPS, .animations = MAYOR_PENGUIN_ANIMS, @@ -294,7 +294,7 @@ StaticNpc N(NpcData_Penguins)[] = { .settings = &N(NpcSettings_Penguin), .pos = { 200.0f, 0.0f, 105.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_MayorPenguinWife), .drops = PENGUIN_DROPS, .animations = MAYOR_PENGUIN_WIFE_ANIMS, @@ -306,7 +306,7 @@ StaticNpc N(NpcData_Penguins)[] = { .settings = &N(NpcSettings_Penguin), .pos = { 115.0f, 0.0f, 540.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Penguin_01), .drops = PENGUIN_DROPS, .animations = PENGUIN_ANIMS, @@ -317,7 +317,7 @@ StaticNpc N(NpcData_Penguins)[] = { .settings = &N(NpcSettings_Penguin), .pos = { 208.0f, 0.0f, 540.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Penguin_02), .drops = PENGUIN_DROPS, .animations = PENGUIN_ANIMS, @@ -345,7 +345,7 @@ StaticNpc N(NpcData_Mousers)[] = { .settings = &N(NpcSettings_Mouser), .pos = { -60.0f, 0.0f, -20.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Moustafa), .drops = MOUSER_DROPS, .animations = MOUSTAFA_ANIMS, @@ -357,7 +357,7 @@ StaticNpc N(NpcData_Mousers)[] = { .settings = &N(NpcSettings_Mouser), .pos = { -100.0f, 0.0f, -50.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Mouser), .drops = MOUSER_DROPS, .animations = MOUSER_PURPLE_ANIMS, @@ -378,7 +378,7 @@ StaticNpc N(NpcData_Boos)[] = { .settings = &N(NpcSettings_Boo), .pos = { 270.0f, 20.0f, 175.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Boo_01), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -389,7 +389,7 @@ StaticNpc N(NpcData_Boos)[] = { .settings = &N(NpcSettings_Boo), .pos = { 320.0f, 20.0f, 200.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Boo_02), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, @@ -417,7 +417,7 @@ StaticNpc N(NpcData_Toads)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -25.0f, 0.0f, 200.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad), .drops = TOAD_DROPS, .animations = TOAD_BLUE_ANIMS, @@ -428,7 +428,7 @@ StaticNpc N(NpcData_Toads)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -50.0f, 0.0f, -200.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ToadGuard_01), .drops = TOAD_DROPS, .animations = TOAD_GUARD_RED_ANIMS, @@ -439,7 +439,7 @@ StaticNpc N(NpcData_Toads)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 560.0f, 20.0f, 100.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ToadGuard_02), .drops = TOAD_DROPS, .animations = TOAD_GUARD_YELLOW_ANIMS, diff --git a/src/world/area_osr/osr_01/osr_01_3_npc.c b/src/world/area_osr/osr_01/osr_01_3_npc.c index b5d68b9595..bbff5f1fe1 100644 --- a/src/world/area_osr/osr_01/osr_01_3_npc.c +++ b/src/world/area_osr/osr_01/osr_01_3_npc.c @@ -104,7 +104,7 @@ StaticNpc N(NpcData_Toad) = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 25.0f, 0.0f, 130.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Toad), .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, diff --git a/src/world/area_osr/osr_02/osr_02_3_npc.c b/src/world/area_osr/osr_02/osr_02_3_npc.c index 9b6f32144f..70a97929d0 100644 --- a/src/world/area_osr/osr_02/osr_02_3_npc.c +++ b/src/world/area_osr/osr_02/osr_02_3_npc.c @@ -549,7 +549,7 @@ StaticNpc N(NpcData_Spirits)[] = { .settings = &N(NpcSettings_Peach), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_20000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_20000, .init = &N(EVS_NpcInit_Peach), .drops = NPC_NO_DROPS, .animations = { @@ -577,7 +577,7 @@ StaticNpc N(NpcData_Spirits)[] = { .settings = &N(NpcSettings_Twink), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Twink), .drops = NPC_NO_DROPS, .animations = TWINK_ANIMS, @@ -588,7 +588,7 @@ StaticNpc N(NpcData_Spirits)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar), .drops = NPC_NO_DROPS, .animations = ELDSTAR_ANIMS, @@ -599,7 +599,7 @@ StaticNpc N(NpcData_Spirits)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Mamar), .drops = NPC_NO_DROPS, .animations = MAMAR_ANIMS, @@ -610,7 +610,7 @@ StaticNpc N(NpcData_Spirits)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Skolar), .drops = NPC_NO_DROPS, .animations = SKOLAR_ANIMS, @@ -621,7 +621,7 @@ StaticNpc N(NpcData_Spirits)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Muskular), .drops = NPC_NO_DROPS, .animations = MUSKULAR_ANIMS, @@ -632,7 +632,7 @@ StaticNpc N(NpcData_Spirits)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Misstar), .drops = NPC_NO_DROPS, .animations = MISSTAR_ANIMS, @@ -643,7 +643,7 @@ StaticNpc N(NpcData_Spirits)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Klevar), .drops = NPC_NO_DROPS, .animations = KLEVAR_ANIMS, @@ -654,7 +654,7 @@ StaticNpc N(NpcData_Spirits)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Kalmar), .drops = NPC_NO_DROPS, .animations = KALMAR_ANIMS, @@ -665,7 +665,7 @@ StaticNpc N(NpcData_Spirits)[] = { .settings = &N(NpcSettings_StarRod), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_StarRod), .drops = NPC_NO_DROPS, .animations = { diff --git a/src/world/area_osr/osr_02/osr_02_4_npc_peach.c b/src/world/area_osr/osr_02/osr_02_4_npc_peach.c index 52d0a41359..45a7cda7f3 100644 --- a/src/world/area_osr/osr_02/osr_02_4_npc_peach.c +++ b/src/world/area_osr/osr_02/osr_02_4_npc_peach.c @@ -78,7 +78,7 @@ StaticNpc N(NpcData_Clubba) = { .settings = &N(NpcSettings_Clubba), .pos = { -70.0f, 0.0f, -100.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Clubba), .drops = NPC_NO_DROPS, .animations = CLUBBA_ANIMS, diff --git a/src/world/area_osr/osr_03/osr_03_2_npc.c b/src/world/area_osr/osr_03/osr_03_2_npc.c index f943e3ac35..f51d2b54ef 100644 --- a/src/world/area_osr/osr_03/osr_03_2_npc.c +++ b/src/world/area_osr/osr_03/osr_03_2_npc.c @@ -32,9 +32,9 @@ StaticNpc N(NpcData_Kammy) = { .settings = &N(NpcSettings_Kammy), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_osr/osr_03/osr_03_3_intro.c b/src/world/area_osr/osr_03/osr_03_3_intro.c index ef42b7488a..64881245c4 100644 --- a/src/world/area_osr/osr_03/osr_03_3_intro.c +++ b/src/world/area_osr/osr_03/osr_03_3_intro.c @@ -285,10 +285,10 @@ EvtScript N(MV_Scene_PlayerTossedOut) = { EvtScript N(EVS_Scene_UnusedTossOut) = { EVT_CALL(FadeOutMusic, 0, 500) EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_NO_FLIPPING, TRUE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, TRUE) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(SetPlayerAnimation, ANIM_Mario_FallBack) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_NO_FLIPPING, FALSE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, FALSE) EVT_CALL(EnableGroup, MODEL_hiru, FALSE) EVT_CALL(EnableGroup, MODEL_niwa, FALSE) EVT_CALL(EnableGroup, MODEL_jimidori, FALSE) diff --git a/src/world/area_pra/pra_13/D64600.c b/src/world/area_pra/pra_13/D64600.c index f55b97648e..a2f95a806c 100644 --- a/src/world/area_pra/pra_13/D64600.c +++ b/src/world/area_pra/pra_13/D64600.c @@ -82,7 +82,7 @@ void func_8024140C_D659EC(void) { RenderTask* rtPtr = &rt; Npc* npc = get_npc_safe(0); - if (gPlayerStatusPtr->flags & PS_FLAGS_HAS_REFLECTION) { + if (gPlayerStatusPtr->flags & PS_FLAG_HAS_REFLECTION) { s32 x, y, z; get_screen_coords(gCurrentCamID, npc->pos.x, npc->pos.y, -npc->pos.z, &x, &y, &z); diff --git a/src/world/area_pra/pra_19/D6E9D0.c b/src/world/area_pra/pra_19/D6E9D0.c index 7e876e779d..861f803874 100644 --- a/src/world/area_pra/pra_19/D6E9D0.c +++ b/src/world/area_pra/pra_19/D6E9D0.c @@ -113,7 +113,7 @@ void func_80241530_D6FEE0(void) { RenderTask* rtPtr = &rt; Npc* npc = get_npc_safe(5); - if (gPlayerStatusPtr->flags & PS_FLAGS_HAS_REFLECTION) { + if (gPlayerStatusPtr->flags & PS_FLAG_HAS_REFLECTION) { s32 x, y, z; get_screen_coords(gCurrentCamID, npc->pos.x, npc->pos.y, -npc->pos.z, &x, &y, &z); diff --git a/src/world/area_pra/pra_31/D7F270.c b/src/world/area_pra/pra_31/D7F270.c index 9648a76a62..2f8ae6162f 100644 --- a/src/world/area_pra/pra_31/D7F270.c +++ b/src/world/area_pra/pra_31/D7F270.c @@ -273,7 +273,7 @@ ApiStatus func_80240F2C_D7FC8C(Evt* script, s32 isInitialCall) { ApiStatus func_80240FD0_D7FD30(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; - playerStatus->animFlags |= PA_FLAGS_PUSHED_ALBINO_DINO; + playerStatus->animFlags |= PA_FLAG_PUSHED_ALBINO_DINO; return ApiStatus_DONE2; } diff --git a/src/world/area_sam/sam_11/D3A930.c b/src/world/area_sam/sam_11/D3A930.c index b419ff552e..4922361ffe 100644 --- a/src/world/area_sam/sam_11/D3A930.c +++ b/src/world/area_sam/sam_11/D3A930.c @@ -102,7 +102,7 @@ ApiStatus func_8024059C_D3AB6C(Evt* script, s32 isInitialCall) { ApiStatus func_8024072C_D3ACFC(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; - if (playerStatus->flags & (PS_FLAGS_INPUT_DISABLED | PS_FLAGS_NO_STATIC_COLLISION)) { + if (playerStatus->flags & (PS_FLAG_INPUT_DISABLED | PS_FLAG_NO_STATIC_COLLISION)) { script->varTable[0] = 1; } else { script->varTable[0] = 0; diff --git a/src/world/area_sbk/sbk_00/sbk_00_2_npc.c b/src/world/area_sbk/sbk_00/sbk_00_2_npc.c index bd0ce45a8e..ad5a6592c7 100644 --- a/src/world/area_sbk/sbk_00/sbk_00_2_npc.c +++ b/src/world/area_sbk/sbk_00/sbk_00_2_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_Pokey_01) = { .settings = &N(NpcSettings_Pokey), .pos = { -40.0f, 0.0f, 160.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_800, .drops = POKEY_DROPS, .territory = { .wander = { @@ -30,7 +30,7 @@ StaticNpc N(NpcData_Pokey_02) = { .settings = &N(NpcSettings_Pokey), .pos = { 245.0f, 0.0f, 75.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_800, .drops = POKEY_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_01/sbk_01_2_npc.c b/src/world/area_sbk/sbk_01/sbk_01_2_npc.c index 43a5425f20..ca4251eab6 100644 --- a/src/world/area_sbk/sbk_01/sbk_01_2_npc.c +++ b/src/world/area_sbk/sbk_01/sbk_01_2_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_Pokey_01) = { .settings = &N(NpcSettings_Pokey), .pos = { 205.0f, 0.0f, -60.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -31,7 +31,7 @@ StaticNpc N(NpcData_Pokey_02) = { .settings = &N(NpcSettings_Pokey), .pos = { -200.0f, 0.0f, 180.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_02/sbk_02_4_npc.c b/src/world/area_sbk/sbk_02/sbk_02_4_npc.c index 4a295f9f92..99e461e92c 100644 --- a/src/world/area_sbk/sbk_02/sbk_02_4_npc.c +++ b/src/world/area_sbk/sbk_02/sbk_02_4_npc.c @@ -256,7 +256,7 @@ StaticNpc N(NpcData_Mamar) = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Mamar), .drops = MAMAR_DROPS, .animations = MAMAR_ANIMS, @@ -267,10 +267,10 @@ StaticNpc N(NpcData_TradingToad) = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 0.0f, 2.0f, 150.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_TradingToad), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_sbk/sbk_03/sbk_03_2_npc.c b/src/world/area_sbk/sbk_03/sbk_03_2_npc.c index 5910541803..e0dfd9929a 100644 --- a/src/world/area_sbk/sbk_03/sbk_03_2_npc.c +++ b/src/world/area_sbk/sbk_03/sbk_03_2_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_Pokey_01) = { .settings = &N(NpcSettings_Pokey), .pos = { -340.0f, 0.0f, -125.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -30,7 +30,7 @@ StaticNpc N(NpcData_Pokey_02) = { .settings = &N(NpcSettings_Pokey), .pos = { 10.0f, 0.0f, 100.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -53,7 +53,7 @@ StaticNpc N(NpcData_Pokey_03) = { .settings = &N(NpcSettings_Pokey), .pos = { -90.0f, 0.0f, 260.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -76,7 +76,7 @@ StaticNpc N(NpcData_Pokey_04) = { .settings = &N(NpcSettings_Pokey), .pos = { 165.0f, 0.0f, 300.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_04/sbk_04_2_npc.c b/src/world/area_sbk/sbk_04/sbk_04_2_npc.c index b58715950d..6049a1cda7 100644 --- a/src/world/area_sbk/sbk_04/sbk_04_2_npc.c +++ b/src/world/area_sbk/sbk_04/sbk_04_2_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_Pokey_01) = { .settings = &N(NpcSettings_Pokey), .pos = { -295.0f, 0.0f, -110.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -30,7 +30,7 @@ StaticNpc N(NpcData_Pokey_02) = { .settings = &N(NpcSettings_Pokey), .pos = { -140.0f, 0.0f, -30.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_05/sbk_05_3_npc.c b/src/world/area_sbk/sbk_05/sbk_05_3_npc.c index 0aaed51ee7..ad6c1b77da 100644 --- a/src/world/area_sbk/sbk_05/sbk_05_3_npc.c +++ b/src/world/area_sbk/sbk_05/sbk_05_3_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_Pokey_01) = { .settings = &N(NpcSettings_Pokey), .pos = { -280.0f, 0.0f, -110.0f }, .yaw = 180, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -30,7 +30,7 @@ StaticNpc N(NpcData_Pokey_02) = { .settings = &N(NpcSettings_Pokey), .pos = { -200.0f, 0.0f, -80.0f }, .yaw = 120, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -53,7 +53,7 @@ StaticNpc N(NpcData_Pokey_03) = { .settings = &N(NpcSettings_Pokey), .pos = { -160.0f, 0.0f, -225.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -76,7 +76,7 @@ StaticNpc N(NpcData_Pokey_04) = { .settings = &N(NpcSettings_Pokey), .pos = { -100.0f, 0.0f, 70.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -99,7 +99,7 @@ StaticNpc N(NpcData_Pokey_05) = { .settings = &N(NpcSettings_Pokey), .pos = { -10.0f, 0.0f, 30.0f }, .yaw = 80, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -122,7 +122,7 @@ StaticNpc N(NpcData_Pokey_06) = { .settings = &N(NpcSettings_Pokey), .pos = { 20.0f, 0.0f, -110.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -145,7 +145,7 @@ StaticNpc N(NpcData_Pokey_07) = { .settings = &N(NpcSettings_Pokey), .pos = { 170.0f, 0.0f, -50.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -168,7 +168,7 @@ StaticNpc N(NpcData_Pokey_08) = { .settings = &N(NpcSettings_Pokey), .pos = { 250.0f, 0.0f, 130.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -191,7 +191,7 @@ StaticNpc N(NpcData_Pokey_09) = { .settings = &N(NpcSettings_Pokey), .pos = { 340.0f, 0.0f, 200.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -214,7 +214,7 @@ StaticNpc N(NpcData_Pokey_10) = { .settings = &N(NpcSettings_Pokey), .pos = { -150.0f, 0.0f, 360.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_06/sbk_06_2_npc.c b/src/world/area_sbk/sbk_06/sbk_06_2_npc.c index f8a4aa26e8..58220c8ba7 100644 --- a/src/world/area_sbk/sbk_06/sbk_06_2_npc.c +++ b/src/world/area_sbk/sbk_06/sbk_06_2_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_Bandit) = { .settings = &N(NpcSettings_Bandit), .pos = { -200.0f, 0.0f, 230.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BANDIT_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_11/sbk_11_2_npc.c b/src/world/area_sbk/sbk_11/sbk_11_2_npc.c index 9e01f52d40..c88d6c15c5 100644 --- a/src/world/area_sbk/sbk_11/sbk_11_2_npc.c +++ b/src/world/area_sbk/sbk_11/sbk_11_2_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_Pokey) = { .settings = &N(NpcSettings_Pokey), .pos = { -120.0f, 0.0f, 90.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -31,7 +31,7 @@ StaticNpc N(NpcData_Bandit) = { .settings = &N(NpcSettings_Bandit), .pos = { -200.0f, 0.0f, 230.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BANDIT_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_12/sbk_12_2_npc.c b/src/world/area_sbk/sbk_12/sbk_12_2_npc.c index 6336f48381..a82bf51a82 100644 --- a/src/world/area_sbk/sbk_12/sbk_12_2_npc.c +++ b/src/world/area_sbk/sbk_12/sbk_12_2_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_Pokey_01) = { .settings = &N(NpcSettings_Pokey), .pos = { -190.0f, 0.0f, -130.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -30,7 +30,7 @@ StaticNpc N(NpcData_Pokey_02) = { .settings = &N(NpcSettings_Pokey), .pos = { -40.0f, 0.0f, -200.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -53,7 +53,7 @@ StaticNpc N(NpcData_Pokey_03) = { .settings = &N(NpcSettings_Pokey), .pos = { 195.0f, 0.0f, -255.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_13/sbk_13_2_npc.c b/src/world/area_sbk/sbk_13/sbk_13_2_npc.c index b70643e04c..1f3e00629c 100644 --- a/src/world/area_sbk/sbk_13/sbk_13_2_npc.c +++ b/src/world/area_sbk/sbk_13/sbk_13_2_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_Pokey_01) = { .settings = &N(NpcSettings_Pokey), .pos = { -70.0f, 0.0f, -60.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -31,7 +31,7 @@ StaticNpc N(NpcData_Pokey_02) = { .settings = &N(NpcSettings_Pokey), .pos = { 120.0f, 0.0f, -50.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -54,7 +54,7 @@ StaticNpc N(NpcData_Bandit) = { .settings = &N(NpcSettings_Bandit), .pos = { -200.0f, 0.0f, 230.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BANDIT_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_15/sbk_15_2_npc.c b/src/world/area_sbk/sbk_15/sbk_15_2_npc.c index c11bd321ce..701f8443a6 100644 --- a/src/world/area_sbk/sbk_15/sbk_15_2_npc.c +++ b/src/world/area_sbk/sbk_15/sbk_15_2_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_Pokey_01) = { .settings = &N(NpcSettings_Pokey), .pos = { -230.0f, 0.0f, 100.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -30,7 +30,7 @@ StaticNpc N(NpcData_Pokey_02) = { .settings = &N(NpcSettings_Pokey), .pos = { 20.0f, 0.0f, 260.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_20/sbk_20_2_npc.c b/src/world/area_sbk/sbk_20/sbk_20_2_npc.c index 139dc45ba2..9c84dbbe44 100644 --- a/src/world/area_sbk/sbk_20/sbk_20_2_npc.c +++ b/src/world/area_sbk/sbk_20/sbk_20_2_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_Bandit_01) = { .settings = &N(NpcSettings_Bandit), .pos = { -100.0f, 0.0f, 80.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_800, .drops = BANDIT_DROPS, .territory = { .wander = { @@ -30,7 +30,7 @@ StaticNpc N(NpcData_Bandit_02) = { .settings = &N(NpcSettings_Bandit), .pos = { 120.0f, 0.0f, 30.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_800, .drops = BANDIT_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_22/sbk_22_2_npc.c b/src/world/area_sbk/sbk_22/sbk_22_2_npc.c index 570e989bc6..d9ea849b73 100644 --- a/src/world/area_sbk/sbk_22/sbk_22_2_npc.c +++ b/src/world/area_sbk/sbk_22/sbk_22_2_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_Pokey) = { .settings = &N(NpcSettings_Pokey), .pos = { -140.0f, 0.0f, -230.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -31,7 +31,7 @@ StaticNpc N(NpcData_Bandit) = { .settings = &N(NpcSettings_Bandit), .pos = { 40.0f, 0.0f, 90.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BANDIT_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_25/sbk_25_2_npc.c b/src/world/area_sbk/sbk_25/sbk_25_2_npc.c index 465279048c..3f64e4c093 100644 --- a/src/world/area_sbk/sbk_25/sbk_25_2_npc.c +++ b/src/world/area_sbk/sbk_25/sbk_25_2_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_Bandit_01) = { .settings = &N(NpcSettings_Bandit), .pos = { -80.0f, 0.0f, -20.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BANDIT_DROPS, .territory = { .wander = { @@ -30,7 +30,7 @@ StaticNpc N(NpcData_Bandit_02) = { .settings = &N(NpcSettings_Bandit), .pos = { 120.0f, 0.0f, 20.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BANDIT_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_26/sbk_26_2_npc.c b/src/world/area_sbk/sbk_26/sbk_26_2_npc.c index e4bcba8808..e3913d2982 100644 --- a/src/world/area_sbk/sbk_26/sbk_26_2_npc.c +++ b/src/world/area_sbk/sbk_26/sbk_26_2_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_Bandit) = { .settings = &N(NpcSettings_Bandit), .pos = { -223.0f, 0.0f, 101.0f }, .yaw = 180, - .flags = ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_800, .drops = BANDIT_DROPS, .territory = { .wander = { @@ -31,7 +31,7 @@ StaticNpc N(NpcData_Pokey) = { .settings = &N(NpcSettings_Pokey), .pos = { -140.0f, 0.0f, -230.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_30/sbk_30_3_npc.c b/src/world/area_sbk/sbk_30/sbk_30_3_npc.c index 8580468926..5249eb9f9a 100644 --- a/src/world/area_sbk/sbk_30/sbk_30_3_npc.c +++ b/src/world/area_sbk/sbk_30/sbk_30_3_npc.c @@ -303,10 +303,10 @@ StaticNpc N(NpcData_Archeologist_02)[] = { .settings = &N(NpcSettings_Kolorado), .pos = { 200.0f, 0.0f, -100.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Kolorado), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -335,10 +335,10 @@ StaticNpc N(NpcData_Archeologist_02)[] = { .settings = &N(NpcSettings_Archeologist_01), .pos = { 238.0f, 0.0f, -112.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Archeologist_01), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -379,10 +379,10 @@ StaticNpc N(NpcData_Archeologist_02)[] = { .settings = &N(NpcSettings_Archeologist_01), .pos = { 170.0f, 0.0f, -190.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Archeologist_02), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_sbk/sbk_31/sbk_31_2_npc.c b/src/world/area_sbk/sbk_31/sbk_31_2_npc.c index 70b61df34d..f0045bea37 100644 --- a/src/world/area_sbk/sbk_31/sbk_31_2_npc.c +++ b/src/world/area_sbk/sbk_31/sbk_31_2_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_Bandit) = { .settings = &N(NpcSettings_Bandit), .pos = { 23.0f, 0.0f, -260.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BANDIT_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_32/sbk_32_2_npc.c b/src/world/area_sbk/sbk_32/sbk_32_2_npc.c index 81a3b34456..dbd58f651b 100644 --- a/src/world/area_sbk/sbk_32/sbk_32_2_npc.c +++ b/src/world/area_sbk/sbk_32/sbk_32_2_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_Pokey_01) = { .settings = &N(NpcSettings_Pokey), .pos = { -140.0f, 0.0f, -270.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -31,7 +31,7 @@ StaticNpc N(NpcData_Pokey_02) = { .settings = &N(NpcSettings_Pokey), .pos = { -120.0f, 0.0f, 110.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -54,7 +54,7 @@ StaticNpc N(NpcData_Bandit) = { .settings = &N(NpcSettings_Bandit), .pos = { 23.0f, 0.0f, -260.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BANDIT_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_34/sbk_34_2_npc.c b/src/world/area_sbk/sbk_34/sbk_34_2_npc.c index 7fcfb5b471..3fd33ffd84 100644 --- a/src/world/area_sbk/sbk_34/sbk_34_2_npc.c +++ b/src/world/area_sbk/sbk_34/sbk_34_2_npc.c @@ -86,10 +86,10 @@ StaticNpc N(NpcData_Nomadimouse)[] = { .settings = &N(NpcSettings_Nomadimouse), .pos = { 114.0f, 0.0f, -50.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Nomadimouse), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -118,10 +118,10 @@ StaticNpc N(NpcData_Nomadimouse)[] = { .settings = &N(NpcSettings_Nomadimouse), .pos = { 134.0f, 0.0f, -50.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Sack), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_sbk/sbk_35/sbk_35_2_npc.c b/src/world/area_sbk/sbk_35/sbk_35_2_npc.c index 09a86e628e..09323b1ba9 100644 --- a/src/world/area_sbk/sbk_35/sbk_35_2_npc.c +++ b/src/world/area_sbk/sbk_35/sbk_35_2_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_Bandit) = { .settings = &N(NpcSettings_Bandit), .pos = { -40.0f, 0.0f, 155.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BANDIT_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_40/sbk_40_2_npc.c b/src/world/area_sbk/sbk_40/sbk_40_2_npc.c index bb65973241..fac02f48a8 100644 --- a/src/world/area_sbk/sbk_40/sbk_40_2_npc.c +++ b/src/world/area_sbk/sbk_40/sbk_40_2_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_Bandit_01) = { .settings = &N(NpcSettings_Bandit), .pos = { -300.0f, 0.0f, 85.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BANDIT_DROPS, .territory = { .wander = { @@ -30,7 +30,7 @@ StaticNpc N(NpcData_Bandit_02) = { .settings = &N(NpcSettings_Bandit), .pos = { -80.0f, 0.0f, 190.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BANDIT_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_42/sbk_42_2_npc.c b/src/world/area_sbk/sbk_42/sbk_42_2_npc.c index 4041a5e243..09a4107826 100644 --- a/src/world/area_sbk/sbk_42/sbk_42_2_npc.c +++ b/src/world/area_sbk/sbk_42/sbk_42_2_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_Bandit_01) = { .settings = &N(NpcSettings_Bandit), .pos = { -40.0f, 0.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BANDIT_DROPS, .territory = { .wander = { @@ -30,7 +30,7 @@ StaticNpc N(NpcData_Bandit_02) = { .settings = &N(NpcSettings_Bandit), .pos = { 60.0f, 0.0f, 30.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BANDIT_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_44/sbk_44_2_npc.c b/src/world/area_sbk/sbk_44/sbk_44_2_npc.c index 09a8e9b4ca..649eed9cfe 100644 --- a/src/world/area_sbk/sbk_44/sbk_44_2_npc.c +++ b/src/world/area_sbk/sbk_44/sbk_44_2_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_Pokey_01) = { .settings = &N(NpcSettings_Pokey), .pos = { -100.0f, 0.0f, -55.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -31,7 +31,7 @@ StaticNpc N(NpcData_Pokey_02) = { .settings = &N(NpcSettings_Pokey), .pos = { -22.0f, 0.0f, -5.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -54,7 +54,7 @@ StaticNpc N(NpcData_Bandit) = { .settings = &N(NpcSettings_Bandit), .pos = { 150.0f, 0.0f, 80.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BANDIT_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_46/sbk_46_2_npc.c b/src/world/area_sbk/sbk_46/sbk_46_2_npc.c index 488911cd20..7c57f1ea34 100644 --- a/src/world/area_sbk/sbk_46/sbk_46_2_npc.c +++ b/src/world/area_sbk/sbk_46/sbk_46_2_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_Pokey) = { .settings = &N(NpcSettings_Pokey), .pos = { 310.0f, 0.0f, -100.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_800, .drops = POKEY_DROPS, .territory = { .wander = { @@ -31,7 +31,7 @@ StaticNpc N(NpcData_Bandit_01) = { .settings = &N(NpcSettings_Bandit), .pos = { -190.0f, 0.0f, -318.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_800, .drops = BANDIT_DROPS, .territory = { .wander = { @@ -54,7 +54,7 @@ StaticNpc N(NpcData_Bandit_02) = { .settings = &N(NpcSettings_Bandit), .pos = { -200.0f, 0.0f, 115.0f }, .yaw = 300, - .flags = ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_800, .drops = BANDIT_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_51/sbk_51_2_npc.c b/src/world/area_sbk/sbk_51/sbk_51_2_npc.c index f1875dd613..b6fceb5103 100644 --- a/src/world/area_sbk/sbk_51/sbk_51_2_npc.c +++ b/src/world/area_sbk/sbk_51/sbk_51_2_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_Pokey) = { .settings = &N(NpcSettings_Pokey), .pos = { 180.0f, 0.0f, 120.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -31,7 +31,7 @@ StaticNpc N(NpcData_Bandit) = { .settings = &N(NpcSettings_Bandit), .pos = { -60.0f, 0.0f, -88.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BANDIT_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_53/sbk_53_2_npc.c b/src/world/area_sbk/sbk_53/sbk_53_2_npc.c index 806343098d..b391170903 100644 --- a/src/world/area_sbk/sbk_53/sbk_53_2_npc.c +++ b/src/world/area_sbk/sbk_53/sbk_53_2_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_Pokey_01) = { .settings = &N(NpcSettings_Pokey), .pos = { -176.0f, 0.0f, -196.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -30,7 +30,7 @@ StaticNpc N(NpcData_Pokey_02) = { .settings = &N(NpcSettings_Pokey), .pos = { -110.0f, 0.0f, -270.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -53,7 +53,7 @@ StaticNpc N(NpcData_Pokey_03) = { .settings = &N(NpcSettings_Pokey), .pos = { 252.0f, 0.0f, -233.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_55/sbk_55_2_npc.c b/src/world/area_sbk/sbk_55/sbk_55_2_npc.c index 1fcb91bf2d..d014122401 100644 --- a/src/world/area_sbk/sbk_55/sbk_55_2_npc.c +++ b/src/world/area_sbk/sbk_55/sbk_55_2_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_Pokey_01) = { .settings = &N(NpcSettings_Pokey), .pos = { 43.0f, 0.0f, -120.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -30,7 +30,7 @@ StaticNpc N(NpcData_Pokey_02) = { .settings = &N(NpcSettings_Pokey), .pos = { -100.0f, 0.0f, -120.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_60/sbk_60_2_npc.c b/src/world/area_sbk/sbk_60/sbk_60_2_npc.c index ca942cc850..312a45acb7 100644 --- a/src/world/area_sbk/sbk_60/sbk_60_2_npc.c +++ b/src/world/area_sbk/sbk_60/sbk_60_2_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_Pokey) = { .settings = &N(NpcSettings_Pokey), .pos = { 160.0f, 0.0f, -120.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_62/sbk_62_2_npc.c b/src/world/area_sbk/sbk_62/sbk_62_2_npc.c index 432c989081..7312a0e1bb 100644 --- a/src/world/area_sbk/sbk_62/sbk_62_2_npc.c +++ b/src/world/area_sbk/sbk_62/sbk_62_2_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_Pokey_01) = { .settings = &N(NpcSettings_Pokey), .pos = { -180.0f, 0.0f, -100.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -30,7 +30,7 @@ StaticNpc N(NpcData_Pokey_02) = { .settings = &N(NpcSettings_Pokey), .pos = { 120.0f, 0.0f, 110.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -53,7 +53,7 @@ StaticNpc N(NpcData_Pokey_03) = { .settings = &N(NpcSettings_Pokey), .pos = { 245.0f, 0.0f, 285.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_63/sbk_63_2_npc.c b/src/world/area_sbk/sbk_63/sbk_63_2_npc.c index 3f3cab264d..4fef8f2afe 100644 --- a/src/world/area_sbk/sbk_63/sbk_63_2_npc.c +++ b/src/world/area_sbk/sbk_63/sbk_63_2_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_Pokey_01) = { .settings = &N(NpcSettings_Pokey), .pos = { -180.0f, 0.0f, -120.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { @@ -30,7 +30,7 @@ StaticNpc N(NpcData_Pokey_02) = { .settings = &N(NpcSettings_Pokey), .pos = { 120.0f, 0.0f, -105.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = POKEY_DROPS, .territory = { .wander = { diff --git a/src/world/area_sbk/sbk_66/sbk_66_2_npc.c b/src/world/area_sbk/sbk_66/sbk_66_2_npc.c index a03b7ccf55..309ee46083 100644 --- a/src/world/area_sbk/sbk_66/sbk_66_2_npc.c +++ b/src/world/area_sbk/sbk_66/sbk_66_2_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_Bandit_01) = { .settings = &N(NpcSettings_Bandit), .pos = { -120.0f, 0.0f, 45.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BANDIT_DROPS, .territory = { .wander = { @@ -30,7 +30,7 @@ StaticNpc N(NpcData_Bandit_02) = { .settings = &N(NpcSettings_Bandit), .pos = { -76.0f, 0.0f, -20.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BANDIT_DROPS, .territory = { .wander = { @@ -53,7 +53,7 @@ StaticNpc N(NpcData_Bandit_03) = { .settings = &N(NpcSettings_Bandit), .pos = { -78.0f, 0.0f, 80.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BANDIT_DROPS, .territory = { .wander = { @@ -76,7 +76,7 @@ StaticNpc N(NpcData_Bandit_04) = { .settings = &N(NpcSettings_Bandit), .pos = { -20.0f, 0.0f, 40.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BANDIT_DROPS, .territory = { .wander = { @@ -99,7 +99,7 @@ StaticNpc N(NpcData_Bandit_05) = { .settings = &N(NpcSettings_Bandit), .pos = { 45.0f, 0.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BANDIT_DROPS, .territory = { .wander = { @@ -122,7 +122,7 @@ StaticNpc N(NpcData_Bandit_06) = { .settings = &N(NpcSettings_Bandit), .pos = { 40.0f, 0.0f, 150.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BANDIT_DROPS, .territory = { .wander = { diff --git a/src/world/area_tik/tik_01/tik_01_5_npc.c b/src/world/area_tik/tik_01/tik_01_5_npc.c index 53cc8710c0..8d5e0f2f32 100644 --- a/src/world/area_tik/tik_01/tik_01_5_npc.c +++ b/src/world/area_tik/tik_01/tik_01_5_npc.c @@ -92,7 +92,7 @@ StaticNpc N(NpcData_Blooper) = { .settings = &N(NpcSettings_Blooper), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_800000, .init = &N(EVS_NpcInit_Blooper), .drops = BLOOPER_NO_DROPS, .animations = BLOOPER_ANIMS, diff --git a/src/world/area_tik/tik_02/tik_02_5_npc.c b/src/world/area_tik/tik_02/tik_02_5_npc.c index c070d8adb8..163ee718f8 100644 --- a/src/world/area_tik/tik_02/tik_02_5_npc.c +++ b/src/world/area_tik/tik_02/tik_02_5_npc.c @@ -110,7 +110,7 @@ StaticNpc N(NpcData_Blooper) = { .settings = &N(NpcSettings_Blooper), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_800000, .init = &N(EVS_NpcInit_Blooper), .drops = BLOOPER_NO_DROPS, .animations = BLOOPER_ANIMS, diff --git a/src/world/area_tik/tik_04/tik_04_5_npc.c b/src/world/area_tik/tik_04/tik_04_5_npc.c index 0fe69f7ead..b11c5107f0 100644 --- a/src/world/area_tik/tik_04/tik_04_5_npc.c +++ b/src/world/area_tik/tik_04/tik_04_5_npc.c @@ -49,7 +49,7 @@ StaticNpc N(NpcData_SpikedGloomba_01) = { .settings = &N(NpcSettings_SpikedGloomba_Wander), .pos = { 40.0f, -135.0f, 10.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .init = &N(EVS_NpcInit_SpikedGloomba), .drops = SPIKED_GLOOMBA_DROPS, .territory = { @@ -72,7 +72,7 @@ StaticNpc N(NpcData_SpikedGloomba_02) = { .settings = &N(NpcSettings_SpikedGloomba_Wander), .pos = { 141.0f, -135.0f, 85.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_400, .init = &N(EVS_NpcInit_SpikedGloomba), .drops = SPIKED_GLOOMBA_DROPS, .territory = { diff --git a/src/world/area_tik/tik_05/tik_05_5_npc.c b/src/world/area_tik/tik_05/tik_05_5_npc.c index e2853647c1..775b5fd3a2 100644 --- a/src/world/area_tik/tik_05/tik_05_5_npc.c +++ b/src/world/area_tik/tik_05/tik_05_5_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_SpikedGloomba_01) = { .settings = &N(NpcSettings_SpikedGloomba_Wander), .pos = { 220.0f, -10.0f, -80.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = SPIKED_GLOOMBA_DROPS, .territory = { .wander = { @@ -29,7 +29,7 @@ StaticNpc N(NpcData_SpikedGloomba_02) = { .settings = &N(NpcSettings_SpikedGloomba_Wander), .pos = { 130.0f, -10.0f, 45.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = SPIKED_GLOOMBA_DROPS, .territory = { .wander = { diff --git a/src/world/area_tik/tik_07/tik_07_6_npc.c b/src/world/area_tik/tik_07/tik_07_6_npc.c index 9f1c8d7577..dd0130a1d2 100644 --- a/src/world/area_tik/tik_07/tik_07_6_npc.c +++ b/src/world/area_tik/tik_07/tik_07_6_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_Paragloomba_01) = { .settings = &N(NpcSettings_Paragloomba_Wander), .pos = { 230.0f, 50.0f, 50.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = PARAGLOOMBA_DROPS, .territory = { .wander = { @@ -29,7 +29,7 @@ StaticNpc N(NpcData_Paragloomba_02) = { .settings = &N(NpcSettings_Paragloomba_Wander), .pos = { 535.0f, 50.0f, 20.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = PARAGLOOMBA_DROPS, .territory = { .wander = { diff --git a/src/world/area_tik/tik_08/tik_08_2_main.c b/src/world/area_tik/tik_08/tik_08_2_main.c index 94aa20394a..6dd48b4e58 100644 --- a/src/world/area_tik/tik_08/tik_08_2_main.c +++ b/src/world/area_tik/tik_08/tik_08_2_main.c @@ -64,8 +64,8 @@ EvtScript N(EVS_Main) = { EVT_END_THREAD EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o77, SURFACE_TYPE_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o75, SURFACE_TYPE_DOCK_WALL) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o77, COLLIDER_FLAGS_80000) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o75, COLLIDER_FLAGS_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o77, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o75, COLLIDER_FLAG_80000) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_suimen, SURFACE_TYPE_WATER) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_ttd, COLLIDER_FLAGS_UPPER_MASK) EVT_WAIT(1) diff --git a/src/world/area_tik/tik_08/tik_08_5_npc.c b/src/world/area_tik/tik_08/tik_08_5_npc.c index ed433f690a..40085e770e 100644 --- a/src/world/area_tik/tik_08/tik_08_5_npc.c +++ b/src/world/area_tik/tik_08/tik_08_5_npc.c @@ -109,7 +109,7 @@ StaticNpc N(NpcData_Blooper) = { .settings = &N(NpcSettings_Blooper), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_800000, .init = &N(EVS_NpcInit_Blooper), .drops = BLOOPER_NO_DROPS, .animations = BLOOPER_ANIMS, diff --git a/src/world/area_tik/tik_09/tik_09_5_npc.c b/src/world/area_tik/tik_09/tik_09_5_npc.c index df62b61582..427698474f 100644 --- a/src/world/area_tik/tik_09/tik_09_5_npc.c +++ b/src/world/area_tik/tik_09/tik_09_5_npc.c @@ -54,7 +54,7 @@ StaticNpc N(NpcData_KoopaTroopa_01) = { .settings = &N(NpcSettings_DarkTroopa_Wander), .pos = { -80.0f, -10.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_DarkTroopa), .drops = DARK_TROOPA_DROPS, .territory = { @@ -78,7 +78,7 @@ StaticNpc N(NpcData_KoopaTroopa_02) = { .settings = &N(NpcSettings_DarkTroopa_Wander), .pos = { 60.0f, -10.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_DarkTroopa), .drops = DARK_TROOPA_DROPS, .territory = { @@ -102,7 +102,7 @@ StaticNpc N(NpcData_KoopaTroopa_03) = { .settings = &N(NpcSettings_DarkTroopa_Wander), .pos = { 180.0f, -10.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_DarkTroopa), .drops = DARK_TROOPA_DROPS, .territory = { diff --git a/src/world/area_tik/tik_12/tik_12_5_npc.c b/src/world/area_tik/tik_12/tik_12_5_npc.c index 400b286932..6ef48cf6e7 100644 --- a/src/world/area_tik/tik_12/tik_12_5_npc.c +++ b/src/world/area_tik/tik_12/tik_12_5_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_BuzzyBeetle) = { .settings = &N(NpcSettings_BuzzyBeetle), .pos = { -6.0f, -135.0f, 75.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = TIK_BUZZY_BEETLE_DROPS, .territory = { .wander = { diff --git a/src/world/area_tik/tik_15/tik_15_5_npc.c b/src/world/area_tik/tik_15/tik_15_5_npc.c index 2287f9ce69..113f14e588 100644 --- a/src/world/area_tik/tik_15/tik_15_5_npc.c +++ b/src/world/area_tik/tik_15/tik_15_5_npc.c @@ -131,10 +131,10 @@ StaticNpc N(NpcData_RipCheato) = { .settings = &N(NpcSettings_RipCheato), .pos = { -80.0f, -10.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_RipCheato), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_tik/tik_18/tik_18_4_npc.c b/src/world/area_tik/tik_18/tik_18_4_npc.c index b992d04f4f..508677851e 100644 --- a/src/world/area_tik/tik_18/tik_18_4_npc.c +++ b/src/world/area_tik/tik_18/tik_18_4_npc.c @@ -56,7 +56,7 @@ StaticNpc N(NpcData_Gloomba) = { .settings = &N(NpcSettings_Gloomba_Wander), .pos = { -60.0f, -10.0f, -30.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = GLOOMBA_DROPS, .territory = { .wander = { @@ -78,7 +78,7 @@ StaticNpc N(NpcData_SpikedGloomba) = { .settings = &N(NpcSettings_SpikedGloomba_Wander), .pos = { 30.0f, -10.0f, -20.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_SpikedGloomba), .drops = SPIKED_GLOOMBA_DROPS, .territory = { diff --git a/src/world/area_tik/tik_20/tik_20_3_npc.c b/src/world/area_tik/tik_20/tik_20_3_npc.c index 14ec4c6a91..83ebd20dd2 100644 --- a/src/world/area_tik/tik_20/tik_20_3_npc.c +++ b/src/world/area_tik/tik_20/tik_20_3_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_DarkTroopa_01) = { .settings = &N(NpcSettings_DarkTroopa_Wander), .pos = { -50.0f, -20.0f, 100.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = DARK_TROOPA_DROPS, .territory = { .wander = { @@ -30,7 +30,7 @@ StaticNpc N(NpcData_DarkTroopa_02) = { .settings = &N(NpcSettings_DarkTroopa_Wander), .pos = { 250.0f, -20.0f, 100.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = DARK_TROOPA_DROPS, .territory = { .wander = { diff --git a/src/world/area_tik/tik_23/tik_23_4_npc.c b/src/world/area_tik/tik_23/tik_23_4_npc.c index ba3a8f43fc..5d92fc6eb6 100644 --- a/src/world/area_tik/tik_23/tik_23_4_npc.c +++ b/src/world/area_tik/tik_23/tik_23_4_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_Spiny_01) = { .settings = &N(NpcSettings_Spiny), .pos = { 25.0f, -20.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = SPINY_DROPS, .territory = { .wander = { @@ -30,7 +30,7 @@ StaticNpc N(NpcData_Spiny_02) = { .settings = &N(NpcSettings_Spiny), .pos = { 275.0f, -20.0f, 120.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = SPINY_DROPS, .territory = { .wander = { @@ -53,7 +53,7 @@ StaticNpc N(NpcData_Spiny_03) = { .settings = &N(NpcSettings_Spiny), .pos = { -150.0f, -20.0f, 120.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = SPINY_DROPS, .territory = { .wander = { diff --git a/src/world/area_tik/tik_24/tik_24_5_npc.c b/src/world/area_tik/tik_24/tik_24_5_npc.c index 18c4c2a2d1..7ee432a8ca 100644 --- a/src/world/area_tik/tik_24/tik_24_5_npc.c +++ b/src/world/area_tik/tik_24/tik_24_5_npc.c @@ -7,7 +7,7 @@ StaticNpc N(NpcData_DarkTroopa_01) = { .settings = &N(NpcSettings_DarkTroopa_Wander), .pos = { -75.0f, -10.0f, 50.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = DARK_TROOPA_DROPS, .territory = { .wander = { @@ -30,7 +30,7 @@ StaticNpc N(NpcData_DarkTroopa_02) = { .settings = &N(NpcSettings_DarkTroopa_Wander), .pos = { 175.0f, -10.0f, -50.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = DARK_TROOPA_DROPS, .territory = { .wander = { diff --git a/src/world/area_trd/trd_00/trd_00_3_npc.c b/src/world/area_trd/trd_00/trd_00_3_npc.c index 655fb1eed3..b198bff535 100644 --- a/src/world/area_trd/trd_00/trd_00_3_npc.c +++ b/src/world/area_trd/trd_00/trd_00_3_npc.c @@ -309,10 +309,10 @@ StaticNpc N(NpcData_KoopaBros) = { .settings = &N(NpcSettings_KoopaBros), .pos = { -469.0f, 0.0f, 101.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_KoopaBros), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -341,7 +341,7 @@ StaticNpc N(NpcData_Eldstar) = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Eldstar), .drops = ELDSTAR_DROPS, .territory = { diff --git a/src/world/area_trd/trd_01/trd_01_3_npc.c b/src/world/area_trd/trd_01/trd_01_3_npc.c index e1865de40e..7876c209a5 100644 --- a/src/world/area_trd/trd_01/trd_01_3_npc.c +++ b/src/world/area_trd/trd_01/trd_01_3_npc.c @@ -149,10 +149,10 @@ StaticNpc N(NpcData_KoopaTroopa_01) = { .settings = &N(NpcSettings_KoopaTroopa_Wander), .pos = { 260.0f, 0.0f, 30.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_800000, .init = &N(EVS_NpcInit_KoopaTroopa_01), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -177,7 +177,7 @@ StaticNpc N(NpcData_KoopaTroopa_02) = { .settings = &N(NpcSettings_KoopaTroopa_Wander), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_KoopaTroopa_02), .drops = KOOPA_TROOPA_DROPS, .territory = { @@ -201,7 +201,7 @@ StaticNpc N(NpcData_KoopaTroopa_03) = { .settings = &N(NpcSettings_KoopaTroopa_Wander), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_KoopaTroopa_02), .drops = KOOPA_TROOPA_DROPS, .territory = { @@ -225,7 +225,7 @@ StaticNpc N(NpcData_Bobomb) = { .settings = &N(NpcSettings_Bobomb_Stationary), .pos = { -255.0f, 640.0f, 35.0f }, .yaw = 180, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BOBOMB_DROPS, .territory = { .wander = { diff --git a/src/world/area_trd/trd_02/trd_02_3_npc.c b/src/world/area_trd/trd_02/trd_02_3_npc.c index 4704f77efe..6e3da8099f 100644 --- a/src/world/area_trd/trd_02/trd_02_3_npc.c +++ b/src/world/area_trd/trd_02/trd_02_3_npc.c @@ -9,7 +9,7 @@ StaticNpc N(NpcData_Bobomb_01) = { .settings = &N(NpcSettings_Bobomb_Wander), .pos = { -70.0f, 0.0f, 80.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = BOBOMB_DROPS, .territory = { .wander = { @@ -32,7 +32,7 @@ StaticNpc N(NpcData_Bobomb_02) = { .settings = &N(NpcSettings_Bobomb_Wander), .pos = { 140.0f, 0.0f, 80.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = BOBOMB_DROPS, .territory = { .wander = { @@ -55,7 +55,7 @@ StaticNpc N(NpcData_KoopaTroopa) = { .settings = &N(NpcSettings_KoopaTroopa_Patrol), .pos = { 50.0f, 187.0f, 183.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = KOOPA_TROOPA_DROPS, .territory = { .patrol = { diff --git a/src/world/area_trd/trd_03/trd_03_3_npc.c b/src/world/area_trd/trd_03/trd_03_3_npc.c index d1de39175a..09a67f66f7 100644 --- a/src/world/area_trd/trd_03/trd_03_3_npc.c +++ b/src/world/area_trd/trd_03/trd_03_3_npc.c @@ -185,10 +185,10 @@ StaticNpc N(NpcData_KoopaBros) = { .settings = &N(NpcSettings_KoopaBros), .pos = { -569.0f, 0.0f, -57.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_KoopaBros), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -217,7 +217,7 @@ StaticNpc N(NpcData_KoopaTroopa_01) = { .settings = &N(NpcSettings_KoopaTroopa_Wander), .pos = { -520.0f, 0.0f, 15.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_KoopaTroopa_01), .drops = KOOPA_TROOPA_DROPS, .territory = { @@ -241,7 +241,7 @@ StaticNpc N(NpcData_KoopaTroopa_02) = { .settings = &N(NpcSettings_KoopaTroopa_Wander), .pos = { -52.0f, 0.0f, -21.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_KoopaTroopa_02), .drops = KOOPA_TROOPA_DROPS, .territory = { @@ -265,7 +265,7 @@ StaticNpc N(NpcData_KoopaTroopa_03) = { .settings = &N(NpcSettings_KoopaTroopa_Wander), .pos = { 375.0f, 0.0f, 15.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = KOOPA_TROOPA_DROPS, .territory = { .wander = { diff --git a/src/world/area_trd/trd_04/trd_04_3_npc.c b/src/world/area_trd/trd_04/trd_04_3_npc.c index 3e37a8ba16..0c4d416c9a 100644 --- a/src/world/area_trd/trd_04/trd_04_3_npc.c +++ b/src/world/area_trd/trd_04/trd_04_3_npc.c @@ -35,7 +35,7 @@ StaticNpc N(NpcData_KoopaTroopa_Wander) = { .settings = &N(NpcSettings_KoopaTroopa_Wander), .pos = { 0.0f, 0.0f, 125.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = KOOPA_TROOPA_DROPS, .territory = { .wander = { @@ -58,10 +58,10 @@ StaticNpc N(NpcData_KoopaTroopa_Patrol) = { .settings = &N(NpcSettings_KoopaTroopa_Patrol), .pos = { 220.0f, 0.0f, 30.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_800000, .init = &N(EVS_NpcInit_KoopaTroopa), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -88,7 +88,7 @@ StaticNpc N(NpcData_ParaTroopa) = { .settings = &N(NpcSettings_ParaTroopa), .pos = { -5.0f, 237.0f, 157.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = PARATROOPA_DROPS, .territory = { .wander = { diff --git a/src/world/area_trd/trd_05/trd_05_4_npc.c b/src/world/area_trd/trd_05/trd_05_4_npc.c index 3c9a953306..5764730246 100644 --- a/src/world/area_trd/trd_05/trd_05_4_npc.c +++ b/src/world/area_trd/trd_05/trd_05_4_npc.c @@ -207,10 +207,10 @@ StaticNpc N(NpcData_KoopaBros)[] = { .settings = &N(NpcSettings_KoopaBros), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_KoopaBros), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -238,10 +238,10 @@ StaticNpc N(NpcData_KoopaBros)[] = { .settings = &N(NpcSettings_KoopaBros), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_KoopaBros), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_trd/trd_06/trd_06_1_main.c b/src/world/area_trd/trd_06/trd_06_1_main.c index a80c6c216d..44f1f3ff3d 100644 --- a/src/world/area_trd/trd_06/trd_06_1_main.c +++ b/src/world/area_trd/trd_06/trd_06_1_main.c @@ -46,7 +46,7 @@ BombTrigger N(BombPos_CellWall) = { }; EvtScript N(EVS_BombWall_Cell) = { - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_NO_CHANGE_PARTNER | PS_FLAGS_NO_PARTNER_USAGE, TRUE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_CHANGE_PARTNER | PS_FLAG_NO_PARTNER_USAGE, TRUE) EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 19, 19, 1, 10, 30) EVT_CALL(SetGroupEnabled, MODEL_ana, 1) EVT_LOOP(10) @@ -92,7 +92,7 @@ EvtScript N(EVS_BombWall_Cell) = { EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00E3) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_NO_CHANGE_PARTNER | PS_FLAGS_NO_PARTNER_USAGE, FALSE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_CHANGE_PARTNER | PS_FLAG_NO_PARTNER_USAGE, FALSE) EVT_CALL(EnablePartnerAI) EVT_CALL(DisablePlayerInput, FALSE) EVT_THREAD diff --git a/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c b/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c index ddbd27be16..ff37114a08 100644 --- a/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c +++ b/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c @@ -343,10 +343,10 @@ StaticNpc N(NpcData_Bombette) = { .settings = &N(NpcSettings_Bobomb), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bombette), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -377,10 +377,10 @@ StaticNpc N(NpcData_Jailers)[] = { .settings = &N(NpcSettings_KoopaTroopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_KoopaTroopa), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_MUSHROOM, 5, 0 }, @@ -413,10 +413,10 @@ StaticNpc N(NpcData_Jailers)[] = { .settings = &N(NpcSettings_Bobomb), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_Bobomb_Jailer), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -444,10 +444,10 @@ StaticNpc N(NpcData_Jailers)[] = { .settings = &N(NpcSettings_Bobomb), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_Bobomb_Jailer), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -478,10 +478,10 @@ StaticNpc N(NpcData_Inmates)[] = { .settings = &N(NpcSettings_Bobomb), .pos = { 25.0f, 0.0f, 127.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bobomb_01), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_HONEY_SYRUP, 5, 0 }, @@ -517,10 +517,10 @@ StaticNpc N(NpcData_Inmates)[] = { .settings = &N(NpcSettings_Bobomb), .pos = { -30.0f, 0.0f, 130.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bobomb_02), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_HONEY_SYRUP, 5, 0 }, @@ -556,10 +556,10 @@ StaticNpc N(NpcData_Inmates)[] = { .settings = &N(NpcSettings_Bobomb), .pos = { -140.0f, 0.0f, -90.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bobomb_03), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_HONEY_SYRUP, 5, 0 }, @@ -595,10 +595,10 @@ StaticNpc N(NpcData_Inmates)[] = { .settings = &N(NpcSettings_Bobomb), .pos = { -75.0f, 0.0f, -80.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Bobomb_04), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 5, .itemDrops = { { ITEM_HONEY_SYRUP, 5, 0 }, diff --git a/src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c b/src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c index 923a94d0fb..8a393d3ba7 100644 --- a/src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c +++ b/src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c @@ -52,7 +52,7 @@ StaticNpc N(NpcData_KoopaBros)[] = { .settings = &N(NpcSettings_KoopaBros), .pos = { 60.0f, 0.0f, -60.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = KOOPA_BROS_DROPS, .territory = { .wander = { @@ -73,7 +73,7 @@ StaticNpc N(NpcData_KoopaBros)[] = { .settings = &N(NpcSettings_KoopaBros), .pos = { 60.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = KOOPA_BROS_DROPS, .territory = { .wander = { @@ -94,7 +94,7 @@ StaticNpc N(NpcData_KoopaBros)[] = { .settings = &N(NpcSettings_KoopaBros), .pos = { -10.0f, 0.0f, -60.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = KOOPA_BROS_DROPS, .territory = { .wander = { @@ -115,7 +115,7 @@ StaticNpc N(NpcData_KoopaBros)[] = { .settings = &N(NpcSettings_KoopaBros), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = KOOPA_BROS_DROPS, .territory = { .wander = { diff --git a/src/world/area_trd/trd_07/trd_07_2_npc.c b/src/world/area_trd/trd_07/trd_07_2_npc.c index eed3bd3773..7a873e6cb9 100644 --- a/src/world/area_trd/trd_07/trd_07_2_npc.c +++ b/src/world/area_trd/trd_07/trd_07_2_npc.c @@ -20,7 +20,7 @@ EvtScript N(EVS_NpcDefeat_KoopaTroopa) = { EVT_CASE_EQ(OUTCOME_PLAYER_FLED) EVT_CALL(OnPlayerFled, 0) EVT_CASE_EQ(OUTCOME_ENEMY_FLED) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_SWITCH EVT_RETURN @@ -28,7 +28,7 @@ EvtScript N(EVS_NpcDefeat_KoopaTroopa) = { }; EvtScript N(EVS_NpcInit_KoopaTroopa) = { - EVT_CALL(SetSelfEnemyFlags, ENEMY_FLAGS_800000) + EVT_CALL(SetSelfEnemyFlags, ENEMY_FLAG_800000) EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_KoopaTroopa))) EVT_IF_EQ(GF_TRD07_Defeated_DungeonAmbush, TRUE) EVT_CALL(RemoveNpc, NPC_SELF) @@ -42,7 +42,7 @@ StaticNpc N(NpcData_KoopaTroopa) = { .settings = &N(NpcSettings_KoopaTroopa_Wander), .pos = { -75.0f, 0.0f, -30.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_KoopaTroopa), .drops = KOOPA_TROOPA_DROPS, .territory = { @@ -65,7 +65,7 @@ StaticNpc N(NpcData_ParaTroopa_01) = { .settings = &N(NpcSettings_ParaTroopa), .pos = { 0.0f, 50.0f, 30.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_KoopaTroopa), .drops = PARATROOPA_DROPS, .territory = { @@ -88,7 +88,7 @@ StaticNpc N(NpcData_ParaTroopa_02) = { .settings = &N(NpcSettings_ParaTroopa), .pos = { 75.0f, 50.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_KoopaTroopa), .drops = PARATROOPA_DROPS, .territory = { diff --git a/src/world/area_trd/trd_08/trd_08_3_npc.c b/src/world/area_trd/trd_08/trd_08_3_npc.c index 8b8b04892c..7baea6708f 100644 --- a/src/world/area_trd/trd_08/trd_08_3_npc.c +++ b/src/world/area_trd/trd_08/trd_08_3_npc.c @@ -110,7 +110,7 @@ NpcSettings N(NpcSettings_FireBar_01) = { .radius = 20, .otherAI = &N(EVS_NpcAuxAI_00), .ai = &N(EVS_NpcAI_FireBar_01), - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_FireBar_02) = { @@ -119,7 +119,7 @@ NpcSettings N(NpcSettings_FireBar_02) = { .radius = 20, .otherAI = &N(EVS_NpcAuxAI_00), .ai = &N(EVS_NpcAI_FireBar_02), - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_FireBar_Extra) = { @@ -127,7 +127,7 @@ NpcSettings N(NpcSettings_FireBar_Extra) = { .height = 12, .radius = 20, .otherAI = &N(EVS_NpcAuxAI_00), - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; StaticNpc N(NpcData_00)[] = { @@ -136,7 +136,7 @@ StaticNpc N(NpcData_00)[] = { .settings = &N(NpcSettings_FireBar_01), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -146,7 +146,7 @@ StaticNpc N(NpcData_00)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -156,7 +156,7 @@ StaticNpc N(NpcData_00)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -166,7 +166,7 @@ StaticNpc N(NpcData_00)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -179,7 +179,7 @@ StaticNpc N(NpcData_05)[] = { .settings = &N(NpcSettings_FireBar_02), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -189,7 +189,7 @@ StaticNpc N(NpcData_05)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -199,7 +199,7 @@ StaticNpc N(NpcData_05)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -209,7 +209,7 @@ StaticNpc N(NpcData_05)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, diff --git a/src/world/area_trd/trd_09/trd_09_3_npcs.c b/src/world/area_trd/trd_09/trd_09_3_npcs.c index 9e9457617b..8bae854965 100644 --- a/src/world/area_trd/trd_09/trd_09_3_npcs.c +++ b/src/world/area_trd/trd_09/trd_09_3_npcs.c @@ -25,7 +25,7 @@ API_CALLABLE(N(func_80240000_9BD660)) { } EvtScript N(EVS_NpcAuxAI_BillBlaster) = { - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_200000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_200000, 1) EVT_RETURN EVT_END }; @@ -100,7 +100,7 @@ EvtScript N(D_80240B80_9BE1E0) = { EVT_CALL(DoNpcDefeat) EVT_CASE_EQ(OUTCOME_PLAYER_FLED) EVT_CASE_EQ(OUTCOME_ENEMY_FLED) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_SWITCH EVT_RETURN @@ -389,7 +389,7 @@ EvtScript N(EVS_NpcAI_BillBlaster) = { }; EvtScript N(EVS_NpcAI_BulletBill) = { - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_200000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_200000, 1) EVT_LABEL(1) EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) @@ -470,7 +470,7 @@ NpcSettings N(NpcSettings_KoopaBros_Red) = { .level = 99, .otherAI = &N(EVS_NpcAuxAI_KoopaBros_Red), .ai = &N(EVS_NpcAI_KoopaBros_Red), - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, }; NpcSettings N(NpcSettings_KoopaBros_Black) = { @@ -480,7 +480,7 @@ NpcSettings N(NpcSettings_KoopaBros_Black) = { .level = 99, .otherAI = &N(EVS_NpcAuxAI_KoopaBros_Black), .ai = &N(EVS_NpcAI_KoopaBros_Black), - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, }; NpcSettings N(NpcSettings_KoopaBros_Yellow) = { @@ -490,7 +490,7 @@ NpcSettings N(NpcSettings_KoopaBros_Yellow) = { .level = 99, .otherAI = &N(EVS_NpcAuxAI_KoopaBros_Yellow), .ai = &N(EVS_NpcAI_KoopaBros_Yellow), - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, }; NpcSettings N(NpcSettings_KoopaBros_Green) = { @@ -500,7 +500,7 @@ NpcSettings N(NpcSettings_KoopaBros_Green) = { .level = 99, .otherAI = &N(EVS_NpcAuxAI_KoopaBros_Green), .ai = &N(EVS_NpcAI_KoopaBros_Green), - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400, }; NpcSettings N(NpcSettings_BillBlaster) = { @@ -548,7 +548,7 @@ StaticNpc N(NpcData_BillBlasters)[] = { .settings = &N(NpcSettings_BillBlaster), .pos = { 1260.0f, 0.0f, -40.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_BillBlaster), .drops = BILL_BLASTER_NO_DROPS, .territory = { @@ -570,7 +570,7 @@ StaticNpc N(NpcData_BillBlasters)[] = { .settings = &N(NpcSettings_BillBlaster), .pos = { 1275.0f, 0.0f, 5.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000, .drops = BILL_BLASTER_DROPS, .territory = { .wander = { @@ -591,7 +591,7 @@ StaticNpc N(NpcData_BillBlasters)[] = { .settings = &N(NpcSettings_BillBlaster), .pos = { 1290.0f, 0.0f, 50.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000, .drops = BILL_BLASTER_NO_DROPS, .territory = { .wander = { @@ -626,7 +626,7 @@ StaticNpc N(NpcData_KoopaBros)[] = { .settings = &N(NpcSettings_KoopaBros_Red), .pos = { 1590.0f, 60.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .initVarCount = 1, .initVar = { .value = 0 }, }, @@ -635,7 +635,7 @@ StaticNpc N(NpcData_KoopaBros)[] = { .settings = &N(NpcSettings_KoopaBros_Green), .pos = { 1590.0f, 60.0f, -10.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .initVarCount = 1, .initVar = { .value = 0 }, }, @@ -644,7 +644,7 @@ StaticNpc N(NpcData_KoopaBros)[] = { .settings = &N(NpcSettings_KoopaBros_Yellow), .pos = { 1605.0f, 60.0f, 5.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .initVarCount = 1, .initVar = { .value = 0 }, }, @@ -653,7 +653,7 @@ StaticNpc N(NpcData_KoopaBros)[] = { .settings = &N(NpcSettings_KoopaBros_Black), .pos = { 1620.0f, 60.0f, 20.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .initVarCount = 1, .initVar = { .value = 0 }, }, @@ -695,12 +695,12 @@ StaticNpc N(NpcData_BulletBill_Demo1) = { .settings = &N(NpcSettings_BulletBill), .pos = { -100.0f, 11.0f, 50.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_80000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_80000, .init = &N(EVS_NpcInit_BulletBill_Demo), .initVarCount = 1, .initVar = { .value = 0 }, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 3, .itemDrops = { { ITEM_MUSHROOM, 10, 0 }, @@ -745,12 +745,12 @@ StaticNpc N(NpcData_BulletBill_Demo2) = { .settings = &N(NpcSettings_BulletBill), .pos = { -150.0f, 11.0f, 5.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_80000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_80000, .init = &N(EVS_NpcInit_BulletBill_Demo), .initVarCount = 1, .initVar = { .value = 0 }, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 3, .itemDrops = { { ITEM_MUSHROOM, 10, 0 }, @@ -795,12 +795,12 @@ StaticNpc N(NpcData_BulletBill_Demo3) = { .settings = &N(NpcSettings_BulletBill), .pos = { 120.0f, 11.0f, 50.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_80000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_80000, .init = &N(EVS_NpcInit_BulletBill_Demo), .initVarCount = 1, .initVar = { .value = 0 }, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 3, .itemDrops = { { ITEM_MUSHROOM, 10, 0 }, @@ -845,12 +845,12 @@ StaticNpc N(NpcData_BulletBill_Demo4) = { .settings = &N(NpcSettings_BulletBill), .pos = { 330.0f, 11.0f, 5.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_80000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_80000, .init = &N(EVS_NpcInit_BulletBill_Demo), .initVarCount = 1, .initVar = { .value = 0 }, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 3, .itemDrops = { { ITEM_MUSHROOM, 10, 0 }, @@ -895,12 +895,12 @@ StaticNpc N(NpcData_BulletBill_Demo5) = { .settings = &N(NpcSettings_BulletBill), .pos = { 380.0f, 11.0f, -40.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_80000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_80000, .init = &N(EVS_NpcInit_BulletBill_Demo), .initVarCount = 1, .initVar = { .value = 0 }, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .itemDropChance = 3, .itemDrops = { { ITEM_MUSHROOM, 10, 0 }, diff --git a/src/world/area_trd/trd_10/trd_10_2_npc.c b/src/world/area_trd/trd_10/trd_10_2_npc.c index f406443ce1..59342441ea 100644 --- a/src/world/area_trd/trd_10/trd_10_2_npc.c +++ b/src/world/area_trd/trd_10/trd_10_2_npc.c @@ -122,7 +122,7 @@ EvtScript N(EVS_NpcInteract_KoopaBros_01) = { }; EvtScript N(EVS_NpcDefeat_KoopaBros_01) = { - EVT_CALL(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAGS_2, TRUE) + EVT_CALL(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_2, TRUE) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(SetNpcPos, NPC_KoopaBros_01, 0, -1000, 0) EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_01, NPC_FLAG_2, FALSE) @@ -293,7 +293,7 @@ NpcSettings N(NpcSettings_KoopaBros_01) = { .onHit = &N(EVS_NpcHit_KoopaBros_01), .aux = &N(EVS_NpcAux_KoopaBros_01), .onDefeat = &N(EVS_NpcDefeat_KoopaBros_01), - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_KoopaBros_02) = { @@ -306,7 +306,7 @@ NpcSettings N(NpcSettings_KoopaBros_02) = { .onHit = &N(EVS_NpcHit_KoopaBros_02), .aux = &N(EVS_NpcAux_KoopaBros_02), .onDefeat = &N(EVS_NpcDefeat_KoopaBros_02), - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_KoopaBros_03) = { @@ -319,7 +319,7 @@ NpcSettings N(NpcSettings_KoopaBros_03) = { .onHit = &N(EVS_NpcHit_KoopaBros_03), .aux = &N(EVS_NpcAux_KoopaBros_03), .onDefeat = &N(EVS_NpcDefeat_KoopaBros_03), - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_KoopaBros_04) = { @@ -332,7 +332,7 @@ NpcSettings N(NpcSettings_KoopaBros_04) = { .onHit = &N(EVS_NpcHit_KoopaBros_04), .aux = &N(EVS_NpcAux_KoopaBros_04), .onDefeat = &N(EVS_NpcDefeat_KoopaBros_04), - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; StaticNpc N(NpcData_KoopaBros_01)[] = { @@ -341,9 +341,9 @@ StaticNpc N(NpcData_KoopaBros_01)[] = { .settings = &N(NpcSettings_KoopaBros_01), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_800000, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -371,9 +371,9 @@ StaticNpc N(NpcData_KoopaBros_01)[] = { .settings = &N(NpcSettings_KoopaBros_02), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_800000, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -401,9 +401,9 @@ StaticNpc N(NpcData_KoopaBros_01)[] = { .settings = &N(NpcSettings_KoopaBros_03), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_800000, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -431,9 +431,9 @@ StaticNpc N(NpcData_KoopaBros_01)[] = { .settings = &N(NpcSettings_KoopaBros_04), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_800000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_800000, .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/area_tst/tst_03/tst_03_1_main.c b/src/world/area_tst/tst_03/tst_03_1_main.c index 2e5f44504f..efd798f003 100644 --- a/src/world/area_tst/tst_03/tst_03_1_main.c +++ b/src/world/area_tst/tst_03/tst_03_1_main.c @@ -46,8 +46,8 @@ EvtScript N(EVS_Main) = { EVT_BIND_TRIGGER(EVT_PTR(N(EVS_GotoMap_tst_04_0)), TRIGGER_WALL_PUSH, COLLIDER_deilite, 1, 0) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_puku, SURFACE_TYPE_DOCK_WALL) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_pukut, SURFACE_TYPE_DOCK_WALL) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_puku, COLLIDER_FLAGS_80000) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_pukut, COLLIDER_FLAGS_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_puku, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_pukut, COLLIDER_FLAG_80000) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o264, SURFACE_TYPE_WATER) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o265, SURFACE_TYPE_SPIKES) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o236, SURFACE_TYPE_LAVA) diff --git a/src/world/area_tst/tst_04/tst_04_3_reflection.c b/src/world/area_tst/tst_04/tst_04_3_reflection.c index 58c43c81b2..259a3fadd5 100644 --- a/src/world/area_tst/tst_04/tst_04_3_reflection.c +++ b/src/world/area_tst/tst_04/tst_04_3_reflection.c @@ -23,9 +23,9 @@ void N(worker_render_player_reflection)(void) { s32 screenY; s32 screenZ; - if (playerStatus->flags & PS_FLAGS_HAS_REFLECTION) { + if (playerStatus->flags & PS_FLAG_HAS_REFLECTION) { entityModel = get_entity_model(get_shadow_by_index(playerStatus->shadowID)->entityModelID); - entityModel->flags |= MODEL_FLAGS_FLAG_200; + entityModel->flags |= MODEL_FLAG_FLAG_200; get_screen_coords(gCurrentCamID, playerStatus->position.x, playerStatus->position.y, -playerStatus->position.z, &screenX, &screenY, &screenZ); diff --git a/src/world/area_tst/tst_04/tst_04_4_npc.c b/src/world/area_tst/tst_04/tst_04_4_npc.c index f10660fa6d..b5fca186e6 100644 --- a/src/world/area_tst/tst_04/tst_04_4_npc.c +++ b/src/world/area_tst/tst_04/tst_04_4_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_FLAGS_1 | ENEMY_FLAGS_4, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4, }; StaticNpc N(NpcData_GoombaFamily) = { @@ -56,7 +56,7 @@ StaticNpc N(NpcData_GoombaFamily) = { .settings = &N(NpcSettings_Goompa), .pos = { 80.0f, 40.0f, -84.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_GRAVITY, + .flags = ENEMY_FLAG_GRAVITY, }; NpcGroupList N(DefaultNPCs) = { diff --git a/src/world/area_tst/tst_11/tst_11_2_extra.c b/src/world/area_tst/tst_11/tst_11_2_extra.c index f07ac3ecde..04fdc415dc 100644 --- a/src/world/area_tst/tst_11/tst_11_2_extra.c +++ b/src/world/area_tst/tst_11/tst_11_2_extra.c @@ -21,9 +21,9 @@ void N(test_reflection_worker_render_wall)(void) { RenderTask* renderTaskPtr = &renderTask; s32 screenX, screenY, screenZ; - if (playerStatus->flags & PS_FLAGS_HAS_REFLECTION) { + if (playerStatus->flags & PS_FLAG_HAS_REFLECTION) { entityModel = get_entity_model(get_shadow_by_index(playerStatus->shadowID)->entityModelID); - entityModel->flags |= ENTITY_MODEL_FLAGS_REFLECT; + entityModel->flags |= ENTITY_MODEL_FLAG_REFLECT; get_screen_coords(gCurrentCamID, playerStatus->position.x, playerStatus->position.y, -playerStatus->position.z, &screenX, &screenY, &screenZ); @@ -72,9 +72,9 @@ void N(test_reflection_worker_render_floor)(void) { RenderTask* renderTaskPtr = &renderTask; s32 screenX, screenY, screenZ; - if (playerStatus->flags & PS_FLAGS_HAS_REFLECTION) { + if (playerStatus->flags & PS_FLAG_HAS_REFLECTION) { entityModel = get_entity_model(get_shadow_by_index(playerStatus->shadowID)->entityModelID); - entityModel->flags |= ENTITY_MODEL_FLAGS_REFLECT; + entityModel->flags |= ENTITY_MODEL_FLAG_REFLECT; get_screen_coords(gCurrentCamID, playerStatus->position.x, -playerStatus->position.y, playerStatus->position.z, &screenX, &screenY, &screenZ); diff --git a/src/world/area_tst/tst_13/tst_13_1_main.c b/src/world/area_tst/tst_13/tst_13_1_main.c index 3d832b9fce..d929fd6829 100644 --- a/src/world/area_tst/tst_13/tst_13_1_main.c +++ b/src/world/area_tst/tst_13/tst_13_1_main.c @@ -90,7 +90,7 @@ NpcSettings N(NpcSettings_00) = { .radius = 24, .otherAI = &N(EVS_NpcAuxAI_00), .onInteract = &N(EVS_NpcInteract_00), - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, }; NpcSettings N(NpcSettings_01) = { @@ -99,7 +99,7 @@ NpcSettings N(NpcSettings_01) = { .radius = 24, .otherAI = &N(EVS_NpcAuxAI_00), .onInteract = &N(EVS_NpcInteract_01), - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, }; NpcSettings N(NpcSettings_02) = { @@ -108,7 +108,7 @@ NpcSettings N(NpcSettings_02) = { .radius = 24, .otherAI = &N(EVS_NpcAuxAI_00), .onInteract = &N(EVS_NpcInteract_02), - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, }; NpcSettings N(NpcSettings_03) = { @@ -117,7 +117,7 @@ NpcSettings N(NpcSettings_03) = { .radius = 24, .otherAI = &N(EVS_NpcAuxAI_00), .onInteract = &N(EVS_NpcInteract_03), - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, }; NpcSettings N(NpcSettings_04) = { @@ -126,7 +126,7 @@ NpcSettings N(NpcSettings_04) = { .radius = 24, .otherAI = &N(EVS_NpcAuxAI_00), .onInteract = &N(EVS_NpcInteract_04), - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, }; NpcSettings N(NpcSettings_05) = { @@ -135,7 +135,7 @@ NpcSettings N(NpcSettings_05) = { .radius = 24, .otherAI = &N(EVS_NpcAuxAI_00), .onInteract = &N(EVS_NpcInteract_05), - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, }; NpcSettings N(NpcSettings_06) = { @@ -144,7 +144,7 @@ NpcSettings N(NpcSettings_06) = { .radius = 24, .otherAI = &N(EVS_NpcAuxAI_00), .onInteract = &N(EVS_NpcInteract_06), - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, }; NpcSettings N(NpcSettings_07) = { @@ -153,7 +153,7 @@ NpcSettings N(NpcSettings_07) = { .radius = 24, .otherAI = &N(EVS_NpcAuxAI_00), .onInteract = &N(EVS_NpcInteract_07), - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, }; NpcSettings N(NpcSettings_08) = { @@ -162,7 +162,7 @@ NpcSettings N(NpcSettings_08) = { .radius = 24, .otherAI = &N(EVS_NpcAuxAI_00), .onInteract = &N(EVS_NpcInteract_08), - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, }; NpcSettings N(NpcSettings_09) = { @@ -171,7 +171,7 @@ NpcSettings N(NpcSettings_09) = { .radius = 24, .otherAI = &N(EVS_NpcAuxAI_00), .onInteract = &N(EVS_NpcInteract_09), - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, }; StaticNpc N(NpcData_Testing)[] = { @@ -180,7 +180,7 @@ StaticNpc N(NpcData_Testing)[] = { .settings = &N(NpcSettings_00), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .animations = { }, }, @@ -189,7 +189,7 @@ StaticNpc N(NpcData_Testing)[] = { .settings = &N(NpcSettings_01), .pos = { 20.0f, 0.0f, 20.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .animations = { }, }, @@ -198,7 +198,7 @@ StaticNpc N(NpcData_Testing)[] = { .settings = &N(NpcSettings_02), .pos = { 40.0f, 0.0f, 40.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .animations = { }, }, @@ -207,7 +207,7 @@ StaticNpc N(NpcData_Testing)[] = { .settings = &N(NpcSettings_03), .pos = { 60.0f, 0.0f, 60.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .animations = { }, }, @@ -216,7 +216,7 @@ StaticNpc N(NpcData_Testing)[] = { .settings = &N(NpcSettings_04), .pos = { 80.0f, 0.0f, 80.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .animations = { }, }, @@ -225,7 +225,7 @@ StaticNpc N(NpcData_Testing)[] = { .settings = &N(NpcSettings_05), .pos = { 100.0f, 0.0f, 100.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .animations = { }, }, @@ -234,7 +234,7 @@ StaticNpc N(NpcData_Testing)[] = { .settings = &N(NpcSettings_06), .pos = { 120.0f, 0.0f, 120.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .animations = { }, }, @@ -243,7 +243,7 @@ StaticNpc N(NpcData_Testing)[] = { .settings = &N(NpcSettings_07), .pos = { 140.0f, 0.0f, 140.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .animations = { }, }, @@ -252,7 +252,7 @@ StaticNpc N(NpcData_Testing)[] = { .settings = &N(NpcSettings_08), .pos = { 160.0f, 0.0f, 160.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .animations = { }, }, @@ -261,7 +261,7 @@ StaticNpc N(NpcData_Testing)[] = { .settings = &N(NpcSettings_09), .pos = { 180.0f, 0.0f, 180.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .animations = { }, }, diff --git a/src/world/common/atomic/Quizmo.inc.c b/src/world/common/atomic/Quizmo.inc.c index c9a6b624ca..4f4076f990 100644 --- a/src/world/common/atomic/Quizmo.inc.c +++ b/src/world/common/atomic/Quizmo.inc.c @@ -151,8 +151,8 @@ ApiStatus N(Quizmo_HideWorld)(Evt* script, s32 isInitialCall) { for (i = 0; i < MAX_ITEM_ENTITIES; i++) { ItemEntity* itemEntity = get_item_entity(i); - if (itemEntity != NULL && itemEntity->flags & ITEM_ENTITY_FLAGS_10) { - itemEntity->flags |= ITEM_ENTITY_FLAGS_8000000; + if (itemEntity != NULL && itemEntity->flags & ITEM_ENTITY_FLAG_10) { + itemEntity->flags |= ITEM_ENTITY_FLAG_8000000; } } @@ -205,8 +205,8 @@ ApiStatus N(Quizmo_FadeInWorld)(Evt* script, s32 isInitialCall) { for (i = 0; i < MAX_ITEM_ENTITIES; i++) { ItemEntity* entity = get_item_entity(i); - if (entity != NULL && entity->flags & ITEM_ENTITY_FLAGS_10) { - entity->flags &= ~ITEM_ENTITY_FLAGS_8000000; + if (entity != NULL && entity->flags & ITEM_ENTITY_FLAG_10) { + entity->flags &= ~ITEM_ENTITY_FLAG_8000000; } } @@ -278,8 +278,8 @@ ApiStatus N(Quizmo_DestroyEffects)(Evt* script, s32 isInitialCall) { QuizmoStageFXData* stageData; if (isInitialCall) { - N(Quizmo_AudienceEffect)->flags |= EFFECT_INSTANCE_FLAGS_10; - N(Quizmo_VannaTEffect)->flags |= EFFECT_INSTANCE_FLAGS_10; + N(Quizmo_AudienceEffect)->flags |= EFFECT_INSTANCE_FLAG_10; + N(Quizmo_VannaTEffect)->flags |= EFFECT_INSTANCE_FLAG_10; } stageData = N(Quizmo_StageEffect)->data.quizmoStage; diff --git a/src/world/common/atomic/QuizmoData.inc.c b/src/world/common/atomic/QuizmoData.inc.c index c2f0f1a935..950990b644 100644 --- a/src/world/common/atomic/QuizmoData.inc.c +++ b/src/world/common/atomic/QuizmoData.inc.c @@ -661,10 +661,10 @@ EvtScript N(EVS_Quizmo_NPC_Interact) = { EVT_USE_ARRAY(EVT_PTR(N(Quizmo_ScriptArray))) EVT_SET(GF_Quizmo_ChangedLocation, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_MOVEMENT_LOCKED, 1) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_MOVEMENT_LOCKED, 1) EVT_EXEC_WAIT(N(EVS_Quizmo_QuizMain)) EVT_CALL(DisablePlayerPhysics, FALSE) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_MOVEMENT_LOCKED, 0) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_MOVEMENT_LOCKED, 0) EVT_RETURN EVT_END }; @@ -697,11 +697,11 @@ NpcSettings N(NpcSettings_ChuckQuizmo) = { .otherAI = &N(EVS_Quizmo_NPC_OtherAI), .onInteract = &N(EVS_Quizmo_NPC_Interact), .aux = &N(EVS_Quizmo_NPC_Aux), - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .level = 99, }; -// alternate (unused?) variant of quizmo with AI and ENEMY_FLAGS_100 unset +// alternate (unused?) variant of quizmo with AI and ENEMY_FLAG_100 unset NpcSettings N(Quizmo_AltNpcSettings) = { .defaultAnim = ANIM_ChuckQuizmo_Idle, .height = 35, @@ -710,7 +710,7 @@ NpcSettings N(Quizmo_AltNpcSettings) = { .onInteract = &N(EVS_Quizmo_NPC_Interact), .ai = &N(EVS_Quizmo_Npc_AI), .aux = &N(EVS_Quizmo_NPC_Aux), - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .level = 99, .actionFlags = 16, }; diff --git a/src/world/common/atomic/Reflection.inc.c b/src/world/common/atomic/Reflection.inc.c index d6d5af9041..a33457a0c2 100644 --- a/src/world/common/atomic/Reflection.inc.c +++ b/src/world/common/atomic/Reflection.inc.c @@ -77,9 +77,9 @@ void N(worker_reflect_player_wall)(void) { RenderTask* renderTaskPtr = &renderTask; s32 screenX, screenY, screenZ; - if (playerStatus->flags & PS_FLAGS_HAS_REFLECTION) { + if (playerStatus->flags & PS_FLAG_HAS_REFLECTION) { entityModel = get_entity_model(get_shadow_by_index(playerStatus->shadowID)->entityModelID); - entityModel->flags |= ENTITY_MODEL_FLAGS_REFLECT; + entityModel->flags |= ENTITY_MODEL_FLAG_REFLECT; get_screen_coords(gCurrentCamID, playerStatus->position.x, playerStatus->position.y, -playerStatus->position.z, &screenX, &screenY, &screenZ); @@ -92,7 +92,7 @@ void N(worker_reflect_player_wall)(void) { spr_update_player_sprite(2, anim, 1.0f); - if (!(playerStatus->flags & PS_FLAGS_SPINNING)) { + if (!(playerStatus->flags & PS_FLAG_SPINNING)) { if (playerStatus->alpha1 != D_802D9D70) { if (playerStatus->alpha1 < 254) { renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; @@ -159,7 +159,7 @@ void N(worker_reflect_player_floor)(void) { RenderTask* renderTaskPtr = &renderTask; s32 screenX, screenY, screenZ; - if (playerStatus->flags & PS_FLAGS_HAS_REFLECTION) { + if (playerStatus->flags & PS_FLAG_HAS_REFLECTION) { entityModel = get_entity_model(get_shadow_by_index(playerStatus->shadowID)->entityModelID); get_screen_coords(gCurrentCamID, playerStatus->position.x, -playerStatus->position.y, playerStatus->position.z, @@ -167,7 +167,7 @@ void N(worker_reflect_player_floor)(void) { spr_update_player_sprite(1, playerStatus->trueAnimation, 1.0f); - if (!(playerStatus->flags & PS_FLAGS_SPINNING)) { + if (!(playerStatus->flags & PS_FLAG_SPINNING)) { if (playerStatus->alpha1 != D_802D9D71) { if (playerStatus->alpha1 < 254) { renderMode = RENDER_MODE_SURFACE_XLU_LAYER1; @@ -187,7 +187,7 @@ void N(worker_reflect_player_floor)(void) { renderTaskPtr->appendGfxArg = playerStatus; renderTaskPtr->distance = -screenZ; renderTaskPtr->appendGfx = (void (*)(void*)) ( - !(playerStatus->flags & PS_FLAGS_SPINNING) + !(playerStatus->flags & PS_FLAG_SPINNING) ? N(appendGfx_reflect_player_floor_basic) : N(appendGfx_reflect_player_floor_fancy) ); diff --git a/src/world/common/atomic/UnkPhysicsFuncs.inc.c b/src/world/common/atomic/UnkPhysicsFuncs.inc.c index 4b9796ade5..b8c6c74f55 100644 --- a/src/world/common/atomic/UnkPhysicsFuncs.inc.c +++ b/src/world/common/atomic/UnkPhysicsFuncs.inc.c @@ -62,7 +62,7 @@ void N(UnkModelMatrixFunc)(s32 treeIndex, f32 x, f32 y, f32 z, f32 scale) { guTranslateF(model->transformMatrix, x, y, z); guScaleF(sp10, scale, 1.0f, scale); guMtxCatF(sp10, model->transformMatrix, model->transformMatrix); - model->flags |= MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED; + model->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED; } ApiStatus N(UnkModelMatrixFunc2)(Evt* script, s32 isInitialCall) { diff --git a/src/world/common/complete/Quizmo.inc.c b/src/world/common/complete/Quizmo.inc.c index d328b7333d..bb59873f12 100644 --- a/src/world/common/complete/Quizmo.inc.c +++ b/src/world/common/complete/Quizmo.inc.c @@ -10,7 +10,7 @@ #define QUIZMO_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } @@ -231,8 +231,8 @@ API_CALLABLE(N(Quizmo_HideWorld)) { for (i = 0; i < MAX_ITEM_ENTITIES; i++) { ItemEntity* itemEntity = get_item_entity(i); - if (itemEntity != NULL && itemEntity->flags & ITEM_ENTITY_FLAGS_10) { - itemEntity->flags |= ITEM_ENTITY_FLAGS_8000000; + if (itemEntity != NULL && itemEntity->flags & ITEM_ENTITY_FLAG_10) { + itemEntity->flags |= ITEM_ENTITY_FLAG_8000000; } } @@ -285,8 +285,8 @@ API_CALLABLE(N(Quizmo_FadeInWorld)) { for (i = 0; i < MAX_ITEM_ENTITIES; i++) { ItemEntity* entity = get_item_entity(i); - if (entity != NULL && entity->flags & ITEM_ENTITY_FLAGS_10) { - entity->flags &= ~ITEM_ENTITY_FLAGS_8000000; + if (entity != NULL && entity->flags & ITEM_ENTITY_FLAG_10) { + entity->flags &= ~ITEM_ENTITY_FLAG_8000000; } } @@ -358,8 +358,8 @@ API_CALLABLE(N(Quizmo_DestroyEffects)) { QuizmoStageFXData* stageData; if (isInitialCall) { - N(Quizmo_AudienceEffect)->flags |= EFFECT_INSTANCE_FLAGS_10; - N(Quizmo_VannaTEffect)->flags |= EFFECT_INSTANCE_FLAGS_10; + N(Quizmo_AudienceEffect)->flags |= EFFECT_INSTANCE_FLAG_10; + N(Quizmo_VannaTEffect)->flags |= EFFECT_INSTANCE_FLAG_10; } stageData = N(Quizmo_StageEffect)->data.quizmoStage; @@ -1161,10 +1161,10 @@ EvtScript N(EVS_Quizmo_NPC_Interact) = { EVT_USE_ARRAY(EVT_PTR(N(Quizmo_ScriptArray))) EVT_SET(GF_Quizmo_ChangedLocation, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_MOVEMENT_LOCKED, 1) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_MOVEMENT_LOCKED, 1) EVT_EXEC_WAIT(N(EVS_Quizmo_QuizMain)) EVT_CALL(DisablePlayerPhysics, FALSE) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_MOVEMENT_LOCKED, 0) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_MOVEMENT_LOCKED, 0) EVT_RETURN EVT_END }; @@ -1197,11 +1197,11 @@ NpcSettings N(NpcSettings_ChuckQuizmo) = { .otherAI = &N(EVS_Quizmo_NPC_OtherAI), .onInteract = &N(EVS_Quizmo_NPC_Interact), .aux = &N(EVS_Quizmo_NPC_Aux), - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .level = 99, }; -// alternate (unused?) variant of quizmo with AI and ENEMY_FLAGS_100 unset +// alternate (unused?) variant of quizmo with AI and ENEMY_FLAG_100 unset NpcSettings N(Quizmo_AltNpcSettings) = { .defaultAnim = ANIM_ChuckQuizmo_Idle, .height = 35, @@ -1210,7 +1210,7 @@ NpcSettings N(Quizmo_AltNpcSettings) = { .onInteract = &N(EVS_Quizmo_NPC_Interact), .ai = &N(EVS_Quizmo_Npc_AI), .aux = &N(EVS_Quizmo_NPC_Aux), - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .level = 99, .actionFlags = 16, }; diff --git a/src/world/common/enemy/ai/BulletBillAI.inc.c b/src/world/common/enemy/ai/BulletBillAI.inc.c index 44023e5a7c..68d82f0ff8 100644 --- a/src/world/common/enemy/ai/BulletBillAI.inc.c +++ b/src/world/common/enemy/ai/BulletBillAI.inc.c @@ -49,18 +49,18 @@ ApiStatus N(BulletBillAI_Main)(Evt* script, s32 isInitialCall) { if (isInitialCall || enemy->VAR_PROJECTILE_HITBOX_STATE == PROJECTILE_HITBOX_STATE_DONE) { script->AI_TEMP_STATE = AI_STATE_BULLET_INIT; npc->duration = 0; - enemy->aiFlags |= ENEMY_AI_FLAGS_8; - enemy->flags |= ENEMY_FLAGS_200000; + enemy->aiFlags |= ENEMY_AI_FLAG_8; + enemy->flags |= ENEMY_FLAG_200000; npc->flags |= NPC_FLAG_40000; enemy->VAR_PROJECTILE_HITBOX_STATE = PROJECTILE_HITBOX_STATE_NONE; enemy->AI_VAR_BULLET_BLASTER = -1; } - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { if (enemy->aiPaused != 0) { return 0; } - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; } switch (script->AI_TEMP_STATE) { @@ -163,7 +163,7 @@ ApiStatus N(BillBlasterAI_Main)(Evt* script, s32 isInitialCall) { script->AI_TEMP_STATE = AI_STATE_BLASTER_INIT; npc->duration = 30; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; - enemy->flags |= ENEMY_FLAGS_200000; + enemy->flags |= ENEMY_FLAG_200000; disable_npc_shadow(npc); } @@ -172,12 +172,12 @@ ApiStatus N(BillBlasterAI_Main)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; if (enemy->aiPaused != 0) { return ApiStatus_BLOCK; } - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; } switch (script->AI_TEMP_STATE) { diff --git a/src/world/common/enemy/ai/CleftAI.inc.c b/src/world/common/enemy/ai/CleftAI.inc.c index 945ad14fa2..4cde64d6e6 100644 --- a/src/world/common/enemy/ai/CleftAI.inc.c +++ b/src/world/common/enemy/ai/CleftAI.inc.c @@ -316,11 +316,11 @@ s32 N(CleftAI_Main)(Evt* script, s32 isInitialCall) { } } - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { if (enemy->aiPaused) { return ApiStatus_BLOCK; } - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; } if (((script->AI_TEMP_STATE == AI_STATE_CLEFT_CHASE_INIT) diff --git a/src/world/common/enemy/ai/ClubbaNappingAI.inc.c b/src/world/common/enemy/ai/ClubbaNappingAI.inc.c index d1824b8fc4..203250fb0e 100644 --- a/src/world/common/enemy/ai/ClubbaNappingAI.inc.c +++ b/src/world/common/enemy/ai/ClubbaNappingAI.inc.c @@ -216,7 +216,7 @@ ApiStatus N(ClubbaNappingAI_Main)(Evt* script, s32 isInitialCall) { territory.halfHeight = 40.0f; territory.detectFlags = 0; - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { script->AI_TEMP_STATE = AI_STATE_NAPPING_CLUBBA_INIT; npc->duration = 30; npc->currentAnim = enemy->animList[10]; @@ -227,12 +227,12 @@ ApiStatus N(ClubbaNappingAI_Main)(Evt* script, s32 isInitialCall) { } else { npc->flags = (npc->flags & ~NPC_FLAG_GRAVITY) | NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { script->AI_TEMP_STATE = AI_STATE_SUSPEND; script->AI_TEMP_STATE_AFTER_SUSPEND = AI_RETURN_HOME_INIT; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; } - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; } if (script->AI_TEMP_STATE >= AI_STATE_ALERT_INIT diff --git a/src/world/common/enemy/ai/ClubbaPatrolAI.inc.c b/src/world/common/enemy/ai/ClubbaPatrolAI.inc.c index 2c980a55db..c1e874d2b4 100644 --- a/src/world/common/enemy/ai/ClubbaPatrolAI.inc.c +++ b/src/world/common/enemy/ai/ClubbaPatrolAI.inc.c @@ -22,7 +22,7 @@ ApiStatus N(ClubbaPatrolAI_Main)(Evt* script, s32 isInitialCall) { territory.halfHeight = 65.0f; territory.detectFlags = 0; - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { script->AI_TEMP_STATE = AI_STATE_PATROL_INIT; npc->duration = 0; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; @@ -34,10 +34,10 @@ ApiStatus N(ClubbaPatrolAI_Main)(Evt* script, s32 isInitialCall) { npc->flags &= ~NPC_FLAG_GRAVITY; npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { script->AI_TEMP_STATE = AI_STATE_SUSPEND; script->functionTemp[1] = AI_STATE_PATROL_INIT; - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; } enemy->varTable[0] = 0; } diff --git a/src/world/common/enemy/ai/FireBarAI.inc.c b/src/world/common/enemy/ai/FireBarAI.inc.c index dc96060aa5..0068315886 100644 --- a/src/world/common/enemy/ai/FireBarAI.inc.c +++ b/src/world/common/enemy/ai/FireBarAI.inc.c @@ -67,7 +67,7 @@ ApiStatus N(FireBarAI_Main)(Evt* script, s32 isInitialCall) { npc->pos.z = data->centerPos.z + dZ; npc->yaw = atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z); } - if (!(data->flags & 2) && !(playerStatus->flags & PS_FLAGS_HAZARD_INVINCIBILITY)) { + if (!(data->flags & 2) && !(playerStatus->flags & PS_FLAG_HAZARD_INVINCIBILITY)) { dY = playerStatus->position.y - npc->pos.y; if (partnerActionStatus->partnerActionState == PARTNER_ACTION_USE) { if (partnerActionStatus->actingPartner == PARTNER_LAKILESTER) { @@ -84,7 +84,7 @@ ApiStatus N(FireBarAI_Main)(Evt* script, s32 isInitialCall) { } } } - if (playerStatus->flags & PS_FLAGS_HAZARD_INVINCIBILITY) { + if (playerStatus->flags & PS_FLAG_HAZARD_INVINCIBILITY) { hitDetected = -1; } data->yaw += data->rotationRate; diff --git a/src/world/common/enemy/ai/FlyingAI.inc.c b/src/world/common/enemy/ai/FlyingAI.inc.c index 946b843ec6..599e8e6c21 100644 --- a/src/world/common/enemy/ai/FlyingAI.inc.c +++ b/src/world/common/enemy/ai/FlyingAI.inc.c @@ -429,7 +429,7 @@ void N(FlyingAI_Init)(Npc* npc, Enemy* enemy, Evt* script, MobileAISettings* aiS enemy->varTable[3] = (depth * 100.0) + 0.5; enemy->varTable[7] = (posY * 100.0) + 0.5; script->functionTemp[1] = aiSettings->playerSearchInterval; - enemy->aiFlags |= ENEMY_AI_FLAGS_10; + enemy->aiFlags |= ENEMY_AI_FLAG_10; } ApiStatus N(FlyingAI_Main)(Evt* script, s32 isInitialCall) { @@ -471,11 +471,11 @@ ApiStatus N(FlyingAI_Main)(Evt* script, s32 isInitialCall) { npc->verticalRenderOffset = -2; - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { if (enemy->aiPaused != 0) { return ApiStatus_BLOCK; } - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; } switch (script->AI_TEMP_STATE) { diff --git a/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c b/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c index 6bf79ece88..75544bb517 100644 --- a/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c +++ b/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c @@ -297,7 +297,7 @@ ApiStatus N(FlyingMagikoopaAI_Main)(Evt* script, s32 isInitialCall) { npc->flags &= ~NPC_FLAG_GRAVITY; npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; npc->flags |= NPC_FLAG_200000; - enemy->flags |= ENEMY_FLAGS_200000; + enemy->flags |= ENEMY_FLAG_200000; enemy->varTable[1] = npc->pos.y * 100.0; enemy->varTable[0] = 0; enemy->varTable[2] = 0; @@ -307,11 +307,11 @@ ApiStatus N(FlyingMagikoopaAI_Main)(Evt* script, s32 isInitialCall) { npc->verticalRenderOffset = -5; - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { if (enemy->aiPaused != 0) { return ApiStatus_BLOCK; } - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; } switch (script->AI_TEMP_STATE) { diff --git a/src/world/common/enemy/ai/FlyingNoAttackAI.inc.c b/src/world/common/enemy/ai/FlyingNoAttackAI.inc.c index ac2dec423a..c7c26e201a 100644 --- a/src/world/common/enemy/ai/FlyingNoAttackAI.inc.c +++ b/src/world/common/enemy/ai/FlyingNoAttackAI.inc.c @@ -134,11 +134,11 @@ ApiStatus N(FlyingNoAttackAI_Main)(Evt* script, s32 isInitialCall) { } npc->verticalRenderOffset = -2; - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { if (enemy->aiPaused) { return ApiStatus_BLOCK; } - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; } switch (script->functionTemp[0]) { diff --git a/src/world/common/enemy/ai/GrooveGuyAI.inc.c b/src/world/common/enemy/ai/GrooveGuyAI.inc.c index ad3b823635..221713a997 100644 --- a/src/world/common/enemy/ai/GrooveGuyAI.inc.c +++ b/src/world/common/enemy/ai/GrooveGuyAI.inc.c @@ -86,7 +86,7 @@ ApiStatus N(GrooveGuyAI_Main)(Evt* script, s32 isInitialCall) { territory.halfHeight = 65.0f; territory.detectFlags = 0; - if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAG_4) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; @@ -100,14 +100,14 @@ ApiStatus N(GrooveGuyAI_Main)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - } else if (enemy->flags & ENEMY_FLAGS_40000000) { + } else if (enemy->flags & ENEMY_FLAG_40000000) { script->functionTemp[0] = 12; } - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; - enemy->flags &= ~ENEMY_FLAGS_40000000; + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->flags &= ~ENEMY_FLAG_40000000; hitDepth = 100.0f; posX = npc->pos.x; diff --git a/src/world/common/enemy/ai/HoppingAI.inc.c b/src/world/common/enemy/ai/HoppingAI.inc.c index 11171fcabe..127477ce79 100644 --- a/src/world/common/enemy/ai/HoppingAI.inc.c +++ b/src/world/common/enemy/ai/HoppingAI.inc.c @@ -150,7 +150,7 @@ void N(HoppingAI_ChaseInit)(Evt* script, MobileAISettings* aiSettings, EnemyDete Npc* enemy = get_npc_unsafe(script->owner1.enemy->npcID); basic_ai_chase_init(script, aiSettings, territory); - enemy->flags |= ENEMY_FLAGS_800; + enemy->flags |= ENEMY_FLAG_800; enemy->jumpVelocity = rand_int(5) + 10.0; enemy->jumpScale = 1.5f; enemy->yaw = atan2(enemy->pos.x, enemy->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); @@ -245,18 +245,18 @@ ApiStatus N(HoppingAI_Main)(Evt* script, s32 isInitialCall) { npc->flags &= ~NPC_FLAG_GRAVITY; npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; - enemy->aiFlags |= (ENEMY_AI_FLAGS_8 | ENEMY_AI_FLAGS_10); - if (enemy->flags & ENEMY_FLAGS_40000000) { + enemy->aiFlags |= (ENEMY_AI_FLAG_8 | ENEMY_AI_FLAG_10); + if (enemy->flags & ENEMY_FLAG_40000000) { script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; - enemy->flags &= ~ENEMY_FLAGS_40000000; + enemy->flags &= ~ENEMY_FLAG_40000000; } } - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { if (enemy->aiPaused != 0) { return ApiStatus_BLOCK; } - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; } switch (script->AI_TEMP_STATE) { diff --git a/src/world/common/enemy/ai/KoopaPatrolAI.inc.c b/src/world/common/enemy/ai/KoopaPatrolAI.inc.c index e88e76bf38..2d2b411552 100644 --- a/src/world/common/enemy/ai/KoopaPatrolAI.inc.c +++ b/src/world/common/enemy/ai/KoopaPatrolAI.inc.c @@ -25,10 +25,10 @@ ApiStatus N(KoopaPatrolAI_Main)(Evt* script, s32 isInitialCall) { if (isInitialCall) { enemy->varTable[6] = npc->collisionHeight; - enemy->aiFlags |= ENEMY_AI_FLAGS_8; + enemy->aiFlags |= ENEMY_AI_FLAG_8; } - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { npc->duration = 0; script->functionTemp[0] = 0; enemy->unk_07 = 0; @@ -46,16 +46,16 @@ ApiStatus N(KoopaPatrolAI_Main)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { s32 emoteTemp; script->functionTemp[0] = 99; script->functionTemp[1] = 0; fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 40, &emoteTemp); - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; - } else if (enemy->flags & ENEMY_FLAGS_40000000) { + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + } else if (enemy->flags & ENEMY_FLAG_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~ENEMY_FLAGS_40000000; + enemy->flags &= ~ENEMY_FLAG_40000000; } } diff --git a/src/world/common/enemy/ai/LakituAI.inc.c b/src/world/common/enemy/ai/LakituAI.inc.c index d2c30126c5..55f525b1c3 100644 --- a/src/world/common/enemy/ai/LakituAI.inc.c +++ b/src/world/common/enemy/ai/LakituAI.inc.c @@ -200,11 +200,11 @@ s32 N(LakituAI_Main)(Evt* script, s32 isInitialCall) { } npc->verticalRenderOffset = -3; - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { if (enemy->aiPaused != 0) { return ApiStatus_BLOCK; } - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; } switch (script->AI_TEMP_STATE) { diff --git a/src/world/common/enemy/ai/MagikoopaAI.inc.c b/src/world/common/enemy/ai/MagikoopaAI.inc.c index a28cdfcad1..d681c31349 100644 --- a/src/world/common/enemy/ai/MagikoopaAI.inc.c +++ b/src/world/common/enemy/ai/MagikoopaAI.inc.c @@ -8,8 +8,8 @@ typedef struct MagikoopaTeleportAnim { u8 alpha; } MagikoopaTeleportAnim; -#define ENEMY_FLAG_COMBINATION (ENEMY_FLAGS_10000000 | ENEMY_FLAGS_8000000 | \ - ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_100000) +#define ENEMY_FLAG_COMBINATION (ENEMY_FLAG_10000000 | ENEMY_FLAG_8000000 | \ + ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_100000) extern MagikoopaTeleportAnim N(MagikoopaAI_TeleportAnim)[]; @@ -248,14 +248,14 @@ ApiStatus N(MagikoopaAI_Main)(Evt* script, s32 isInitialCall) { territory.halfHeight = 100.0f; territory.detectFlags = 0; - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { npc->currentAnim = enemy->animList[0]; npc->flags &= ~NPC_FLAG_JUMPING; npc->flags |= NPC_FLAG_200000; - enemy->flags |= ENEMY_FLAGS_200000; + enemy->flags |= ENEMY_FLAG_200000; npc->duration = 0; - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; npc->alpha = 0xFF; npc->duration = 20; npc->scale.x = 1.0f; diff --git a/src/world/common/enemy/ai/MagikoopaSpellAI.inc.c b/src/world/common/enemy/ai/MagikoopaSpellAI.inc.c index 10aae71b61..e141aed381 100644 --- a/src/world/common/enemy/ai/MagikoopaSpellAI.inc.c +++ b/src/world/common/enemy/ai/MagikoopaSpellAI.inc.c @@ -48,16 +48,16 @@ ApiStatus N(MagikoopaAI_SpellMain)(Evt* script, s32 isInitialCall) { f32 t1; f32 t2; - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { script->functionTemp[0] = 0; npc1->duration = 0; npc1->flags |= NPC_FLAG_200000 | NPC_FLAG_40000 | NPC_FLAG_100 | NPC_FLAG_2; - enemy->flags |= ENEMY_FLAGS_10000000 | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_IGNORE_JUMP | - ENEMY_FLAGS_200000 | ENEMY_FLAGS_40; + enemy->flags |= ENEMY_FLAG_10000000 | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_JUMP | + ENEMY_FLAG_200000 | ENEMY_FLAG_40; npc1->scale.x = 0.4f; npc1->scale.y = 0.4f; - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; } } diff --git a/src/world/common/enemy/ai/MeleeHitbox.inc.c b/src/world/common/enemy/ai/MeleeHitbox.inc.c index f8bd8c277a..29334b9121 100644 --- a/src/world/common/enemy/ai/MeleeHitbox.inc.c +++ b/src/world/common/enemy/ai/MeleeHitbox.inc.c @@ -120,16 +120,16 @@ ApiStatus N(MeleeHitbox_Main)(Evt* script, s32 isInitialCall) { hitboxEnemy->unk_118 = 0.0001f; #endif - if (isInitialCall || (hitboxEnemy->aiFlags & ENEMY_AI_FLAGS_4)) { + if (isInitialCall || (hitboxEnemy->aiFlags & ENEMY_AI_FLAG_4)) { script->functionTemp[0] = 0; hitboxNpc->duration = 0; hitboxNpc->flags |= (NPC_FLAG_2 | NPC_FLAG_100); - hitboxEnemy->flags |= ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000; + hitboxEnemy->flags |= ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000; hitboxNpc->pos.x = NPC_DISPOSE_POS_X; hitboxNpc->pos.y = NPC_DISPOSE_POS_Y; hitboxNpc->pos.z = NPC_DISPOSE_POS_Z; - if (hitboxEnemy->aiFlags & ENEMY_AI_FLAGS_4) { - hitboxEnemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + if (hitboxEnemy->aiFlags & ENEMY_AI_FLAG_4) { + hitboxEnemy->aiFlags &= ~ENEMY_AI_FLAG_4; } } @@ -156,7 +156,7 @@ ApiStatus N(MeleeHitbox_Main)(Evt* script, s32 isInitialCall) { hitboxEnemy->unk_10.z = hitboxNpc->pos.z; hitboxNpc->yaw = atan2(hitboxNpc->pos.x, hitboxNpc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - hitboxEnemy->flags &= ~(ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000); + hitboxEnemy->flags &= ~(ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000); hitboxNpc->duration = 0; script->functionTemp[0] = 1; } @@ -169,7 +169,7 @@ ApiStatus N(MeleeHitbox_Main)(Evt* script, s32 isInitialCall) { hitboxEnemy->unk_07 = 0; } if (baseEnemy->AI_VAR_ATTACK_STATE == MELEE_HITBOX_STATE_POST) { - hitboxEnemy->flags |= ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000; + hitboxEnemy->flags |= ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000; hitboxNpc->pos.x = 0.0f; hitboxNpc->pos.y = -1000.0f; hitboxNpc->pos.z = 0.0f; diff --git a/src/world/common/enemy/ai/MontyMoleAI.inc.c b/src/world/common/enemy/ai/MontyMoleAI.inc.c index e4fb0c2d47..ca01f5fe96 100644 --- a/src/world/common/enemy/ai/MontyMoleAI.inc.c +++ b/src/world/common/enemy/ai/MontyMoleAI.inc.c @@ -246,12 +246,12 @@ ApiStatus N(MontyMoleAI_Main)(Evt* script, s32 isInitialCall) { script->AI_TEMP_STATE = AI_STATE_MOLE_INIT; npc->duration = 0; npc->flags &= -(NPC_FLAG_PASSIVE | NPC_FLAG_JUMPING); - enemy->aiFlags |= (ENEMY_AI_FLAGS_8 | ENEMY_AI_FLAGS_10); + enemy->aiFlags |= (ENEMY_AI_FLAG_8 | ENEMY_AI_FLAG_10); } - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { if (enemy->aiPaused == 0) { - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; } else { return ApiStatus_BLOCK; } diff --git a/src/world/common/enemy/ai/ParatroopaAI.inc.c b/src/world/common/enemy/ai/ParatroopaAI.inc.c index bc4767517c..495bdfc203 100644 --- a/src/world/common/enemy/ai/ParatroopaAI.inc.c +++ b/src/world/common/enemy/ai/ParatroopaAI.inc.c @@ -121,11 +121,11 @@ ApiStatus N(ParatroopaAI_Main)(Evt* script, s32 isInitialCall) { npc->verticalRenderOffset = -3; - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { if (enemy->aiPaused != 0) { return ApiStatus_BLOCK; } - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; } switch (script->AI_TEMP_STATE) { diff --git a/src/world/common/enemy/ai/PatrolNoAttackAI.inc.c b/src/world/common/enemy/ai/PatrolNoAttackAI.inc.c index 3587432ecc..756c70c4b2 100644 --- a/src/world/common/enemy/ai/PatrolNoAttackAI.inc.c +++ b/src/world/common/enemy/ai/PatrolNoAttackAI.inc.c @@ -38,7 +38,7 @@ ApiStatus N(PatrolNoAttackAI_Main)(Evt* script, s32 isInitialCall) { enemy->unk_118 = 0.0001f; #endif - if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAG_4) { script->AI_TEMP_STATE = AI_STATE_PATROL_INIT; npc->duration = 0; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; @@ -52,13 +52,13 @@ ApiStatus N(PatrolNoAttackAI_Main)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { script->AI_TEMP_STATE = AI_STATE_SUSPEND; script->functionTemp[1] = 0; - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; - } else if (enemy->flags & ENEMY_FLAGS_40000000) { + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + } else if (enemy->flags & ENEMY_FLAG_40000000) { script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; - enemy->flags &= ~ENEMY_FLAGS_40000000; + enemy->flags &= ~ENEMY_FLAG_40000000; } posX = npc->pos.x; diff --git a/src/world/common/enemy/ai/ProjectileHitbox.inc.c b/src/world/common/enemy/ai/ProjectileHitbox.inc.c index 08740126ff..913310bc09 100644 --- a/src/world/common/enemy/ai/ProjectileHitbox.inc.c +++ b/src/world/common/enemy/ai/ProjectileHitbox.inc.c @@ -149,18 +149,18 @@ ApiStatus N(ProjectileAI_Main)(Evt* script, s32 isInitialCall) { npc->verticalRenderOffset = npc->collisionHeight / 2; } - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { script->functionTemp[0] = 0; npc->duration = 0; npc->flags |= NPC_FLAG_40000 | NPC_FLAG_100 | NPC_FLAG_2; disable_npc_shadow(npc); npc->flags &= ~NPC_FLAG_JUMPING; enemy->varTable[0] = 0; - enemy->flags |= ENEMY_FLAGS_10000000 | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_IGNORE_HAMMER | - ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_200000 | - ENEMY_FLAGS_100000 | ENEMY_FLAGS_40; - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + enemy->flags |= ENEMY_FLAG_10000000 | ENEMY_FLAG_8000000 | ENEMY_FLAG_IGNORE_HAMMER | + ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_200000 | + ENEMY_FLAG_100000 | ENEMY_FLAG_40; + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; } } @@ -198,8 +198,8 @@ ApiStatus N(ProjectileAI_Main)(Evt* script, s32 isInitialCall) { npc->flags &= ~NPC_FLAG_2; enable_npc_shadow(npc); npc->flags |= NPC_FLAG_JUMPING; - enemy->flags &= ~(ENEMY_FLAGS_10000000 | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_IGNORE_HAMMER | - ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_TOUCH); + enemy->flags &= ~(ENEMY_FLAG_10000000 | ENEMY_FLAG_8000000 | ENEMY_FLAG_IGNORE_HAMMER | + ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_TOUCH); npc->duration = 90; script->functionTemp[0] = 2; break; @@ -256,8 +256,8 @@ ApiStatus N(ProjectileAI_Main)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_2; disable_npc_shadow(npc); npc->flags &= ~NPC_FLAG_JUMPING; - enemy->flags |= ENEMY_FLAGS_10000000 | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_IGNORE_HAMMER | - ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_TOUCH; + enemy->flags |= ENEMY_FLAG_10000000 | ENEMY_FLAG_8000000 | ENEMY_FLAG_IGNORE_HAMMER | + ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_TOUCH; script->functionTemp[0] = 0; } } @@ -360,8 +360,8 @@ ApiStatus N(ProjectileAI_Reflect)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_2; disable_npc_shadow(npc); npc->flags &= ~NPC_FLAG_JUMPING; - enemy->flags |= ENEMY_FLAGS_10000000 | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_IGNORE_HAMMER | - ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_TOUCH; + enemy->flags |= ENEMY_FLAG_10000000 | ENEMY_FLAG_8000000 | ENEMY_FLAG_IGNORE_HAMMER | + ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_TOUCH; script->functionTemp[0] = 0; evt_set_variable(script, LVar0, 1); return ApiStatus_DONE2; diff --git a/src/world/common/enemy/ai/RangedAttackAI.inc.c b/src/world/common/enemy/ai/RangedAttackAI.inc.c index 34a8ed7953..859e173982 100644 --- a/src/world/common/enemy/ai/RangedAttackAI.inc.c +++ b/src/world/common/enemy/ai/RangedAttackAI.inc.c @@ -29,7 +29,7 @@ ApiStatus N(RangedAttackAI_Main)(Evt* script, s32 isInitialCall) { territory.halfHeight = 40.0f; territory.detectFlags = 0; - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { script->AI_TEMP_STATE = 0; npc->duration = 0; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; @@ -43,15 +43,15 @@ ApiStatus N(RangedAttackAI_Main)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { script->AI_TEMP_STATE = AI_STATE_SUSPEND; script->functionTemp[1] = 0; - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; - } else if (enemy->flags & ENEMY_FLAGS_40000000) { + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + } else if (enemy->flags & ENEMY_FLAG_40000000) { script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; } - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; - enemy->flags &= ~ENEMY_FLAGS_40000000; + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->flags &= ~ENEMY_FLAG_40000000; } switch (script->AI_TEMP_STATE) { diff --git a/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c b/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c index f55c9b398f..afdfc85b5d 100644 --- a/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c +++ b/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c @@ -80,7 +80,7 @@ ApiStatus N(ShyGuyPatrolAI_Main)(Evt* script, s32 isInitialCall) { territory.halfHeight = 65.0f; territory.detectFlags = 0; - if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAG_4) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; @@ -94,13 +94,13 @@ ApiStatus N(ShyGuyPatrolAI_Main)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; - } else if (enemy->flags & ENEMY_FLAGS_40000000) { + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + } else if (enemy->flags & ENEMY_FLAG_40000000) { script->functionTemp[0] = 12; - enemy->flags &= ~ENEMY_FLAGS_40000000; + enemy->flags &= ~ENEMY_FLAG_40000000; } posX = npc->pos.x; diff --git a/src/world/common/enemy/ai/ShyGuyWanderAI.inc.c b/src/world/common/enemy/ai/ShyGuyWanderAI.inc.c index f1fd416afc..67024d1968 100644 --- a/src/world/common/enemy/ai/ShyGuyWanderAI.inc.c +++ b/src/world/common/enemy/ai/ShyGuyWanderAI.inc.c @@ -78,7 +78,7 @@ ApiStatus N(ShyGuyWanderAI_Main)(Evt* script, s32 isInitialCall) { territory.halfHeight = 65.0f; territory.detectFlags = 0; - if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAG_4) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; @@ -92,14 +92,14 @@ ApiStatus N(ShyGuyWanderAI_Main)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - } else if (enemy->flags & ENEMY_FLAGS_40000000) { + } else if (enemy->flags & ENEMY_FLAG_40000000) { script->functionTemp[0] = 12; } - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; - enemy->flags &= ~ENEMY_FLAGS_40000000; + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->flags &= ~ENEMY_FLAG_40000000; hitDepth = 100.0f; posX = npc->pos.x; diff --git a/src/world/common/enemy/ai/SpearGuyAI.inc.c b/src/world/common/enemy/ai/SpearGuyAI.inc.c index c0c0119dbf..3303770164 100644 --- a/src/world/common/enemy/ai/SpearGuyAI.inc.c +++ b/src/world/common/enemy/ai/SpearGuyAI.inc.c @@ -97,7 +97,7 @@ ApiStatus N(SpearGuyAI_Main)(Evt *script, s32 isInitialCall) { territory.halfHeight = 65.0f; territory.detectFlags = 0; - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { script->AI_TEMP_STATE = AI_STATE_WANDER_INIT; npc->duration = 0; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; @@ -111,10 +111,10 @@ ApiStatus N(SpearGuyAI_Main)(Evt *script, s32 isInitialCall) { npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { script->AI_TEMP_STATE = AI_STATE_SUSPEND; script->AI_TEMP_STATE_AFTER_SUSPEND = AI_STATE_WANDER_INIT; - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; } enemy->varTable[0] = 0; } diff --git a/src/world/common/enemy/ai/SpinyAI.inc.c b/src/world/common/enemy/ai/SpinyAI.inc.c index 489e041fbc..fd3c0554b9 100644 --- a/src/world/common/enemy/ai/SpinyAI.inc.c +++ b/src/world/common/enemy/ai/SpinyAI.inc.c @@ -42,7 +42,7 @@ ApiStatus N(SpinyAI_Main)(Evt* script, s32 isInitialCall) { if (isInitialCall) { enemy->varTable[6] = npc->collisionHeight; - enemy->aiFlags |= ENEMY_AI_FLAGS_8; + enemy->aiFlags |= ENEMY_AI_FLAG_8; } if (isInitialCall || (enemy->varTable[10] == 100)) { @@ -50,7 +50,7 @@ ApiStatus N(SpinyAI_Main)(Evt* script, s32 isInitialCall) { npc->duration = 0; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; npc->flags &= ~NPC_FLAG_JUMPING; - enemy->flags |= ENEMY_FLAGS_200000; + enemy->flags |= ENEMY_FLAG_200000; npc->flags &= ~NPC_FLAG_GRAVITY; npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; enemy->varTable[10] = 0; @@ -60,10 +60,10 @@ ApiStatus N(SpinyAI_Main)(Evt* script, s32 isInitialCall) { npc->pos.z = 0.0f; } - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { npc->duration = 0; npc->collisionHeight = enemy->varTable[6]; - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; if (npc->flags & NPC_FLAG_JUMPING) { npc->currentAnim = ANIM_Spiny_Anim18; npc->moveSpeed = 0.0f; diff --git a/src/world/common/enemy/ai/States_PatrolAI.inc.c b/src/world/common/enemy/ai/States_PatrolAI.inc.c index cefe49d1db..5005c2713c 100644 --- a/src/world/common/enemy/ai/States_PatrolAI.inc.c +++ b/src/world/common/enemy/ai/States_PatrolAI.inc.c @@ -235,7 +235,7 @@ void N(PatrolAI_LosePlayer)(Evt* script, MobileAISettings* aiSettings, EnemyDete npc->duration--; if (npc->duration == 0) { - if (enemy->aiFlags & ENEMY_AI_FLAGS_80) { + if (enemy->aiFlags & ENEMY_AI_FLAG_80) { script->AI_TEMP_STATE = AI_STATE_PATROL_15; } else { script->AI_TEMP_STATE = AI_STATE_WANDER_INIT; diff --git a/src/world/common/enemy/ai/StationaryAI.inc.c b/src/world/common/enemy/ai/StationaryAI.inc.c index 2337f78514..198d33808d 100644 --- a/src/world/common/enemy/ai/StationaryAI.inc.c +++ b/src/world/common/enemy/ai/StationaryAI.inc.c @@ -26,7 +26,7 @@ void N(StationaryAI_IdleInit)(Evt* script, StationaryAISettings* aiSettings, Ene npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; script->AI_TEMP_STATE = AI_STATE_STATIONARY_IDLE; - if (enemy->flags & ENEMY_FLAGS_100000) { + if (enemy->flags & ENEMY_FLAG_100000) { npc->yaw = enemy->varTable[0]; } @@ -202,7 +202,7 @@ ApiStatus N(StationaryAI_Main)(Evt* script, s32 isInitialCall) { territory.halfHeight = 65.0f; territory.detectFlags = 0; - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { script->AI_TEMP_STATE = AI_STATE_STATIONARY_IDLE_INIT; npc->duration = 0; enemy->varTable[0] = npc->yaw; @@ -217,13 +217,13 @@ ApiStatus N(StationaryAI_Main)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { script->AI_TEMP_STATE = AI_STATE_SUSPEND; script->functionTemp[1] = 15; - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; - } else if (enemy->flags & ENEMY_FLAGS_40000000) { + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + } else if (enemy->flags & ENEMY_FLAG_40000000) { script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; - enemy->flags &= ~ENEMY_FLAGS_40000000; + enemy->flags &= ~ENEMY_FLAG_40000000; } } diff --git a/src/world/common/enemy/ai/StoneChompAI.inc.c b/src/world/common/enemy/ai/StoneChompAI.inc.c index efc81b1500..18e852c42e 100644 --- a/src/world/common/enemy/ai/StoneChompAI.inc.c +++ b/src/world/common/enemy/ai/StoneChompAI.inc.c @@ -41,9 +41,9 @@ ApiStatus N(StoneChompAI_Main)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; script->functionTemp[1] = 0; script->AI_TEMP_STATE = AI_STATE_HOP_INIT; - if (enemy->flags & ENEMY_FLAGS_40000000) { + if (enemy->flags & ENEMY_FLAG_40000000) { script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; - enemy->flags &= ~ENEMY_FLAGS_40000000; + enemy->flags &= ~ENEMY_FLAG_40000000; } } diff --git a/src/world/common/enemy/ai/TackleAI.inc.c b/src/world/common/enemy/ai/TackleAI.inc.c index c0931430ae..abdd21144e 100644 --- a/src/world/common/enemy/ai/TackleAI.inc.c +++ b/src/world/common/enemy/ai/TackleAI.inc.c @@ -44,10 +44,10 @@ ApiStatus N(TackleAI_Main)(Evt* script, s32 isInitialCall) { enemy->varTable[6] = npc->collisionHeight; enemy->varTable[8] = 0; enemy->unk_B5 = 0; - enemy->aiFlags |= ENEMY_AI_FLAGS_8; + enemy->aiFlags |= ENEMY_AI_FLAG_8; } - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { script->AI_TEMP_STATE = 0; npc->duration = 0; enemy->unk_07 = 0; @@ -64,16 +64,16 @@ ApiStatus N(TackleAI_Main)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { s32 emoteTemp; script->AI_TEMP_STATE = 99; script->functionTemp[1] = 0; fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 40, &emoteTemp); - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; - } else if (enemy->flags & ENEMY_FLAGS_40000000) { + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + } else if (enemy->flags & ENEMY_FLAG_40000000) { script->AI_TEMP_STATE = 12; - enemy->flags &= ~ENEMY_FLAGS_40000000; + enemy->flags &= ~ENEMY_FLAG_40000000; } } diff --git a/src/world/common/enemy/ai/UnkFloAI.inc.c b/src/world/common/enemy/ai/UnkFloAI.inc.c index 0d982fc7cc..8c0869728b 100644 --- a/src/world/common/enemy/ai/UnkFloAI.inc.c +++ b/src/world/common/enemy/ai/UnkFloAI.inc.c @@ -188,7 +188,7 @@ ApiStatus N(UnkFloAI_Main)(Evt* script, s32 isInitialCall) { enemy->unk_118 = 0.01f; #endif - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { script->functionTemp[0] = AI_STATE_WANDER_INIT; npc->duration = 0; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; @@ -200,10 +200,10 @@ ApiStatus N(UnkFloAI_Main)(Evt* script, s32 isInitialCall) { npc->flags &= ~NPC_FLAG_GRAVITY; npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { script->functionTemp[0] = AI_STATE_SUSPEND; script->functionTemp[1] = AI_STATE_WANDER_INIT; - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; } } diff --git a/src/world/common/enemy/ai/WanderMeleeAI.inc.c b/src/world/common/enemy/ai/WanderMeleeAI.inc.c index 3a836282b0..d811a24b46 100644 --- a/src/world/common/enemy/ai/WanderMeleeAI.inc.c +++ b/src/world/common/enemy/ai/WanderMeleeAI.inc.c @@ -42,7 +42,7 @@ ApiStatus N(WanderMeleeAI_Main)(Evt *script, s32 isInitialCall) { enemy->unk_118 = 0.0001f; #endif - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { script->AI_TEMP_STATE = AI_STATE_WANDER_INIT; npc->duration = 0; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; @@ -56,10 +56,10 @@ ApiStatus N(WanderMeleeAI_Main)(Evt *script, s32 isInitialCall) { npc->flags |= NPC_FLAG_ENABLE_HIT_SCRIPT; } - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { script->AI_TEMP_STATE = AI_STATE_SUSPEND; script->functionTemp[1] = AI_STATE_WANDER_INIT; - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; } enemy->AI_VAR_ATTACK_STATE = MELEE_HITBOX_STATE_NONE; } diff --git a/src/world/common/enemy/complete/AmazyDayzee.h b/src/world/common/enemy/complete/AmazyDayzee.h index 98505be1b5..9b08904a3a 100644 --- a/src/world/common/enemy/complete/AmazyDayzee.h +++ b/src/world/common/enemy/complete/AmazyDayzee.h @@ -3,7 +3,7 @@ #define AMAZY_DAYZEE_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 20, \ .itemDrops = { \ { ITEM_HONEY_SYRUP, 24, 0 }, \ diff --git a/src/world/common/enemy/complete/Bandit.h b/src/world/common/enemy/complete/Bandit.h index 41e255e567..1773f9fda6 100644 --- a/src/world/common/enemy/complete/Bandit.h +++ b/src/world/common/enemy/complete/Bandit.h @@ -3,7 +3,7 @@ #define BANDIT_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ .itemDrops = { \ { ITEM_HONEY_SYRUP, 10, 0 }, \ diff --git a/src/world/common/enemy/complete/Bandit.inc.c b/src/world/common/enemy/complete/Bandit.inc.c index 13713fe475..743fdba5d1 100644 --- a/src/world/common/enemy/complete/Bandit.inc.c +++ b/src/world/common/enemy/complete/Bandit.inc.c @@ -101,7 +101,7 @@ EvtScript N(EVS_NpcDefeat_Bandit) = { EVT_CALL(NpcMoveTo, NPC_SELF, LVar7, LVar9, 0) EVT_SET(HAS_COIN_FLAG, FALSE) EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_SWITCH EVT_RETURN diff --git a/src/world/common/enemy/complete/Blooper.h b/src/world/common/enemy/complete/Blooper.h index 21d4e5f725..41c55f2a3d 100644 --- a/src/world/common/enemy/complete/Blooper.h +++ b/src/world/common/enemy/complete/Blooper.h @@ -3,7 +3,7 @@ #define BLOOPER_NO_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/enemy/complete/Bobomb.h b/src/world/common/enemy/complete/Bobomb.h index f880df1e1c..de3cfff4eb 100644 --- a/src/world/common/enemy/complete/Bobomb.h +++ b/src/world/common/enemy/complete/Bobomb.h @@ -3,7 +3,7 @@ #define BOBOMB_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ .itemDrops = { \ { ITEM_HONEY_SYRUP, 5, 0 }, \ diff --git a/src/world/common/enemy/complete/BombshellBill.h b/src/world/common/enemy/complete/BombshellBill.h index 17b140b823..5cb0e2fb02 100644 --- a/src/world/common/enemy/complete/BombshellBill.h +++ b/src/world/common/enemy/complete/BombshellBill.h @@ -3,7 +3,7 @@ #define BOMBSHELL_BLASTER_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = STANDARD_HEART_DROPS(4), \ .flowerDrops = STANDARD_FLOWER_DROPS(2), \ .minCoinBonus = 1, \ @@ -12,7 +12,7 @@ #define BOMBSHELL_BLASTER_NO_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } @@ -39,7 +39,7 @@ #define BOMBSHELL_BILL_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 3, \ .itemDrops = { \ { ITEM_SUPER_SHROOM, 10, 0 }, \ @@ -76,7 +76,7 @@ .settings = &N(NpcSettings_BulletBill), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 0, \ - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_80000 | ENEMY_FLAGS_200000, \ + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_80000 | ENEMY_FLAG_200000, \ .drops = BOMBSHELL_BILL_DROPS, \ .territory = { \ .wander = { \ diff --git a/src/world/common/enemy/complete/BulletBill.h b/src/world/common/enemy/complete/BulletBill.h index b5a2b808bf..ac02dc4ba0 100644 --- a/src/world/common/enemy/complete/BulletBill.h +++ b/src/world/common/enemy/complete/BulletBill.h @@ -3,7 +3,7 @@ #define BILL_BLASTER_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = STANDARD_HEART_DROPS(2), \ .flowerDrops = STANDARD_FLOWER_DROPS(2), \ .minCoinBonus = 1, \ @@ -12,7 +12,7 @@ #define BILL_BLASTER_NO_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } @@ -39,7 +39,7 @@ #define BULLET_BILL_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 3, \ .itemDrops = { \ { ITEM_MUSHROOM, 10, 0 }, \ @@ -74,7 +74,7 @@ .settings = &N(NpcSettings_BulletBill), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 270, \ - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_80000, \ + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_80000, \ .initVarCount = 1, \ .initVar = { .value = 0 }, \ .drops = BULLET_BILL_DROPS, \ diff --git a/src/world/common/enemy/complete/Bzzap.h b/src/world/common/enemy/complete/Bzzap.h index 5a34391dbf..a6b7afa044 100644 --- a/src/world/common/enemy/complete/Bzzap.h +++ b/src/world/common/enemy/complete/Bzzap.h @@ -3,14 +3,14 @@ #define BZZAP_NO_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } #define BZZAP_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 15, \ .itemDrops = { \ { ITEM_MAPLE_SYRUP, 6, 0 }, \ diff --git a/src/world/common/enemy/complete/Cleft.h b/src/world/common/enemy/complete/Cleft.h index 35d35c04fe..a32bb6ce5b 100644 --- a/src/world/common/enemy/complete/Cleft.h +++ b/src/world/common/enemy/complete/Cleft.h @@ -3,7 +3,7 @@ #define CLEFT_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = STANDARD_HEART_DROPS(3), \ .flowerDrops = STANDARD_FLOWER_DROPS(2), \ .minCoinBonus = 1, \ diff --git a/src/world/common/enemy/complete/Clubba.h b/src/world/common/enemy/complete/Clubba.h index 5373167a68..d25551f5ba 100644 --- a/src/world/common/enemy/complete/Clubba.h +++ b/src/world/common/enemy/complete/Clubba.h @@ -3,7 +3,7 @@ #define CLUBBA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ .itemDrops = { \ { ITEM_SUPER_SHROOM, 10, 0 }, \ @@ -40,7 +40,7 @@ .settings = &N(NpcSettings_Clubba_Hitbox), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 0, \ - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, \ + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_800000, \ .drops = NPC_NO_DROPS, \ .animations = CLUBBA_ANIMS, \ .extraAnimations = N(ExtraAnims_Clubba_Hitbox), \ diff --git a/src/world/common/enemy/complete/Clubba_Multi.inc.c b/src/world/common/enemy/complete/Clubba_Multi.inc.c index 1381b4436b..50e3718b91 100644 --- a/src/world/common/enemy/complete/Clubba_Multi.inc.c +++ b/src/world/common/enemy/complete/Clubba_Multi.inc.c @@ -9,7 +9,7 @@ EvtScript N(EVS_NpcDefeat_Clubba) = { EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(OnPlayerFled, 1) EVT_CASE_EQ(OUTCOME_ENEMY_FLED) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_SWITCH EVT_RETURN diff --git a/src/world/common/enemy/complete/CrazyDayzee.h b/src/world/common/enemy/complete/CrazyDayzee.h index fc2117f3f3..b6bbdf1c45 100644 --- a/src/world/common/enemy/complete/CrazyDayzee.h +++ b/src/world/common/enemy/complete/CrazyDayzee.h @@ -3,7 +3,7 @@ #define CRAZY_DAYZEE_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 15, \ .itemDrops = { \ { ITEM_MAPLE_SYRUP, 6, 0 }, \ diff --git a/src/world/common/enemy/complete/DarkTroopa.h b/src/world/common/enemy/complete/DarkTroopa.h index 2e41eb7d74..18e31b982f 100644 --- a/src/world/common/enemy/complete/DarkTroopa.h +++ b/src/world/common/enemy/complete/DarkTroopa.h @@ -3,7 +3,7 @@ #define DARK_TROOPA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 20, \ .itemDrops = { \ { ITEM_POW_BLOCK, 10, 0 }, \ diff --git a/src/world/common/enemy/complete/DryBones.h b/src/world/common/enemy/complete/DryBones.h index eaa33f07c2..a7f7175025 100644 --- a/src/world/common/enemy/complete/DryBones.h +++ b/src/world/common/enemy/complete/DryBones.h @@ -3,7 +3,7 @@ #define DRY_BONES_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ .itemDrops = { \ { ITEM_SUPER_SHROOM, 10, 0 }, \ @@ -40,9 +40,9 @@ .settings = &N(NpcSettings_ThrownBone), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 90, \ - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, \ + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_800000, \ .drops = { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ }, \ diff --git a/src/world/common/enemy/complete/DryBones.inc.c b/src/world/common/enemy/complete/DryBones.inc.c index 90ecb40648..8f7a2de2b2 100644 --- a/src/world/common/enemy/complete/DryBones.inc.c +++ b/src/world/common/enemy/complete/DryBones.inc.c @@ -13,7 +13,7 @@ EvtScript N(EVS_NpcDefeat_ThrownBone) = { EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(OnPlayerFled, 1) EVT_CASE_EQ(OUTCOME_ENEMY_FLED) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_SWITCH EVT_RETURN diff --git a/src/world/common/enemy/complete/FlyingMagikoopa.h b/src/world/common/enemy/complete/FlyingMagikoopa.h index 9a10f026d2..2a604ca88d 100644 --- a/src/world/common/enemy/complete/FlyingMagikoopa.h +++ b/src/world/common/enemy/complete/FlyingMagikoopa.h @@ -4,7 +4,7 @@ #define FLYING_MAGIKOOPA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ .itemDrops = { \ { ITEM_SUPER_SHROOM, 5, 0 }, \ @@ -44,9 +44,9 @@ .settings = &N(NpcSettings_FlyingMagikoopa_Hitbox), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 90, \ - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, \ + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_800000, \ .drops = { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ }, \ diff --git a/src/world/common/enemy/complete/FlyingMagikoopa.inc.c b/src/world/common/enemy/complete/FlyingMagikoopa.inc.c index 1a0b9247ca..17249bdb21 100644 --- a/src/world/common/enemy/complete/FlyingMagikoopa.inc.c +++ b/src/world/common/enemy/complete/FlyingMagikoopa.inc.c @@ -31,7 +31,7 @@ EvtScript N(EVS_NpcDefeat_FlyingMagikoopa) = { EVT_CASE_EQ(OUTCOME_PLAYER_FLED) EVT_CALL(OnPlayerFled, 0) EVT_CASE_EQ(OUTCOME_ENEMY_FLED) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_SWITCH EVT_RETURN @@ -98,7 +98,7 @@ EvtScript N(EVS_NpcDefeat_FlyingMagikoopa_Hitbox) = { EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(OnPlayerFled, 1) EVT_CASE_EQ(OUTCOME_ENEMY_FLED) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_SWITCH EVT_RETURN diff --git a/src/world/common/enemy/complete/ForestFuzzy.h b/src/world/common/enemy/complete/ForestFuzzy.h index 78ccc9605f..69987ab9f0 100644 --- a/src/world/common/enemy/complete/ForestFuzzy.h +++ b/src/world/common/enemy/complete/ForestFuzzy.h @@ -3,7 +3,7 @@ #define FOREST_FUZZY_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ .itemDrops = { \ { ITEM_THUNDER_BOLT, 10, 0 }, \ diff --git a/src/world/common/enemy/complete/Gloomba.h b/src/world/common/enemy/complete/Gloomba.h index a7a90d7fca..7b628b2567 100644 --- a/src/world/common/enemy/complete/Gloomba.h +++ b/src/world/common/enemy/complete/Gloomba.h @@ -3,7 +3,7 @@ #define GLOOMBA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 20, \ .itemDrops = { \ { ITEM_DIZZY_DIAL, 5, 0 }, \ diff --git a/src/world/common/enemy/complete/Goomba.h b/src/world/common/enemy/complete/Goomba.h index 667832a2da..5db30e3859 100644 --- a/src/world/common/enemy/complete/Goomba.h +++ b/src/world/common/enemy/complete/Goomba.h @@ -3,7 +3,7 @@ #define GOOMBA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ .itemDrops = { \ { ITEM_MUSHROOM, 10, 0 }, \ diff --git a/src/world/common/enemy/complete/GoombaBros.h b/src/world/common/enemy/complete/GoombaBros.h index 2d6a811bbb..b68dc0d214 100644 --- a/src/world/common/enemy/complete/GoombaBros.h +++ b/src/world/common/enemy/complete/GoombaBros.h @@ -3,7 +3,7 @@ #define GOOMBA_BROS_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/enemy/complete/HammerBros.h b/src/world/common/enemy/complete/HammerBros.h index b4558daa30..428f6ed8b4 100644 --- a/src/world/common/enemy/complete/HammerBros.h +++ b/src/world/common/enemy/complete/HammerBros.h @@ -3,7 +3,7 @@ #define HAMMER_BROS_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ .itemDrops = { \ { ITEM_SUPER_SHROOM, 5, 0 }, \ @@ -41,9 +41,9 @@ .settings = &N(NpcSettings_HammerBros_Hammer), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 90, \ - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, \ + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_800000, \ .drops = { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ }, \ diff --git a/src/world/common/enemy/complete/HammerBros.inc.c b/src/world/common/enemy/complete/HammerBros.inc.c index 180f39c5e3..43f470782e 100644 --- a/src/world/common/enemy/complete/HammerBros.inc.c +++ b/src/world/common/enemy/complete/HammerBros.inc.c @@ -14,7 +14,7 @@ EvtScript N(EVS_NpcDefeat_HammerBros_Hammer) = { EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(OnPlayerFled, 1) EVT_CASE_EQ(OUTCOME_ENEMY_FLED) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_SWITCH EVT_RETURN diff --git a/src/world/common/enemy/complete/HuffNPuff.h b/src/world/common/enemy/complete/HuffNPuff.h index eb469e42b5..9c5926d220 100644 --- a/src/world/common/enemy/complete/HuffNPuff.h +++ b/src/world/common/enemy/complete/HuffNPuff.h @@ -3,7 +3,7 @@ #define HUFF_N_PUFF_NO_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/enemy/complete/HyperCleft.h b/src/world/common/enemy/complete/HyperCleft.h index 3aeb7884c7..dc35f7a3cb 100644 --- a/src/world/common/enemy/complete/HyperCleft.h +++ b/src/world/common/enemy/complete/HyperCleft.h @@ -3,7 +3,7 @@ #define HYPER_CLEFT_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = STANDARD_HEART_DROPS(3), \ .flowerDrops = STANDARD_FLOWER_DROPS(2), \ .minCoinBonus = 1, \ diff --git a/src/world/common/enemy/complete/HyperGoomba.h b/src/world/common/enemy/complete/HyperGoomba.h index 48523d9de1..5f9a09fa19 100644 --- a/src/world/common/enemy/complete/HyperGoomba.h +++ b/src/world/common/enemy/complete/HyperGoomba.h @@ -3,7 +3,7 @@ #define HYPER_GOOMBA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 20, \ .itemDrops = { \ { ITEM_DRIED_SHROOM, 10, 0 }, \ diff --git a/src/world/common/enemy/complete/HyperParagoomba.h b/src/world/common/enemy/complete/HyperParagoomba.h index da2cc7958f..ab022b8e59 100644 --- a/src/world/common/enemy/complete/HyperParagoomba.h +++ b/src/world/common/enemy/complete/HyperParagoomba.h @@ -3,7 +3,7 @@ #define HYPER_PARAGOOMBA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 20, \ .itemDrops = { \ { ITEM_DRIED_SHROOM, 10, 0 }, \ diff --git a/src/world/common/enemy/complete/KoopaTroopa.h b/src/world/common/enemy/complete/KoopaTroopa.h index b8a63f0358..032224c17b 100644 --- a/src/world/common/enemy/complete/KoopaTroopa.h +++ b/src/world/common/enemy/complete/KoopaTroopa.h @@ -3,7 +3,7 @@ #define KOOPA_TROOPA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ .itemDrops = { \ { ITEM_MUSHROOM, 5, 0 }, \ diff --git a/src/world/common/enemy/complete/Koopatrol.h b/src/world/common/enemy/complete/Koopatrol.h index d31cea0ed6..066f6821c8 100644 --- a/src/world/common/enemy/complete/Koopatrol.h +++ b/src/world/common/enemy/complete/Koopatrol.h @@ -3,7 +3,7 @@ #define KOOPATROL_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ .itemDrops = { \ { ITEM_SUPER_SHROOM, 10, 0 }, \ @@ -16,7 +16,7 @@ #define KOOPATROL_NO_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/enemy/complete/Lakitu.h b/src/world/common/enemy/complete/Lakitu.h index f1c3ad3e30..38fabea04b 100644 --- a/src/world/common/enemy/complete/Lakitu.h +++ b/src/world/common/enemy/complete/Lakitu.h @@ -3,7 +3,7 @@ #define LAKITU_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 25, \ .itemDrops = { \ { ITEM_SUPER_SHROOM, 2, 0 }, \ diff --git a/src/world/common/enemy/complete/Lakitu_SpinySpawner.inc.c b/src/world/common/enemy/complete/Lakitu_SpinySpawner.inc.c index 019a612aef..ad56528467 100644 --- a/src/world/common/enemy/complete/Lakitu_SpinySpawner.inc.c +++ b/src/world/common/enemy/complete/Lakitu_SpinySpawner.inc.c @@ -82,7 +82,7 @@ EvtScript N(EVS_NpcDefeat_SpawnedSpiny) = { EVT_CASE_EQ(OUTCOME_PLAYER_FLED) EVT_CALL(OnPlayerFled, 0) EVT_CASE_EQ(OUTCOME_ENEMY_FLED) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_SWITCH EVT_RETURN diff --git a/src/world/common/enemy/complete/LavaBubble.h b/src/world/common/enemy/complete/LavaBubble.h index e32f372929..84622b7eca 100644 --- a/src/world/common/enemy/complete/LavaBubble.h +++ b/src/world/common/enemy/complete/LavaBubble.h @@ -3,7 +3,7 @@ #define LAVA_BUBBLE_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ .itemDrops = { \ { ITEM_SUPER_SHROOM, 10, 0 }, \ diff --git a/src/world/common/enemy/complete/LavaPiranha.h b/src/world/common/enemy/complete/LavaPiranha.h index 0c0e62a9cb..41a04eaa05 100644 --- a/src/world/common/enemy/complete/LavaPiranha.h +++ b/src/world/common/enemy/complete/LavaPiranha.h @@ -4,7 +4,7 @@ #define LAVA_PIRANHA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ .itemDrops = { \ { ITEM_SUPER_SHROOM, 10, 0 }, \ @@ -17,7 +17,7 @@ #define LAVA_PIRANHA_NO_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/enemy/complete/Magikoopa.h b/src/world/common/enemy/complete/Magikoopa.h index c8bc7c21ca..a0cdc3d1c3 100644 --- a/src/world/common/enemy/complete/Magikoopa.h +++ b/src/world/common/enemy/complete/Magikoopa.h @@ -4,7 +4,7 @@ #define MAGIKOOPA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ .itemDrops = { \ { ITEM_SUPER_SHROOM, 5, 0 }, \ @@ -44,9 +44,9 @@ .settings = &N(NpcSettings_Magikoopa_GroundHitbox), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 90, \ - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, \ + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_800000, \ .drops = { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ }, \ diff --git a/src/world/common/enemy/complete/Magikoopa.inc.c b/src/world/common/enemy/complete/Magikoopa.inc.c index d7aa1752a5..bf187c41e6 100644 --- a/src/world/common/enemy/complete/Magikoopa.inc.c +++ b/src/world/common/enemy/complete/Magikoopa.inc.c @@ -124,7 +124,7 @@ EvtScript N(EVS_NpcDefeat_Magikoopa_Hitbox) = { EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(OnPlayerFled, 1) EVT_CASE_EQ(OUTCOME_ENEMY_FLED) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_SWITCH EVT_RETURN diff --git a/src/world/common/enemy/complete/MontyMole.h b/src/world/common/enemy/complete/MontyMole.h index 8aaeaec780..5e5d5e8e48 100644 --- a/src/world/common/enemy/complete/MontyMole.h +++ b/src/world/common/enemy/complete/MontyMole.h @@ -3,7 +3,7 @@ #define MONTY_MOLE_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 10, \ .itemDrops = { \ { ITEM_HONEY_SYRUP, 10, 0 }, \ diff --git a/src/world/common/enemy/complete/MontyMole_GroundAmbush.inc.c b/src/world/common/enemy/complete/MontyMole_GroundAmbush.inc.c index 86e8b98f91..b07abe33e0 100644 --- a/src/world/common/enemy/complete/MontyMole_GroundAmbush.inc.c +++ b/src/world/common/enemy/complete/MontyMole_GroundAmbush.inc.c @@ -39,7 +39,7 @@ MobileAISettings N(AISettings_MontyMole_GroundAmbush) = { EvtScript N(EVS_NpcAI_MontyMole_GroundAmbush) = { EVT_CALL(func_800445D4, LVar0) EVT_IF_EQ(LVar0, 100) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_20, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_20, 1) EVT_LABEL(10) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(IsPlayerWithin, LVar0, LVar2, 80, LVar3) @@ -62,9 +62,9 @@ EvtScript N(EVS_NpcAI_MontyMole_GroundAmbush) = { EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_MOLE_POP, 0) EVT_CALL(NpcJump0, NPC_SELF, LVar4, LVar5, LVar6, 20) EVT_CALL(SetNpcPos, LVar0, NPC_DISPOSE_LOCATION) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_20, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_20, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 0) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_40000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1) EVT_CALL(BasicAI_Main, EVT_PTR(N(AISettings_MontyMole_GroundAmbush))) EVT_RETURN EVT_END diff --git a/src/world/common/enemy/complete/MontyMole_StoneThrower.inc.c b/src/world/common/enemy/complete/MontyMole_StoneThrower.inc.c index 97e4a5ec3d..c607fd4a60 100644 --- a/src/world/common/enemy/complete/MontyMole_StoneThrower.inc.c +++ b/src/world/common/enemy/complete/MontyMole_StoneThrower.inc.c @@ -16,7 +16,7 @@ EvtScript N(EVS_NpcDefeat_MontyMole_Stone) = { EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(OnPlayerFled, 1) EVT_CASE_EQ(OUTCOME_ENEMY_FLED) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_SWITCH EVT_RETURN @@ -125,9 +125,9 @@ NpcSettings N(NpcSettings_MontyMole_Stone) = { .settings = &N(NpcSettings_MontyMole_Stone), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 90, \ - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, \ + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_800000, \ .drops = { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ }, \ diff --git a/src/world/common/enemy/complete/MontyMole_WallAmbush.inc.c b/src/world/common/enemy/complete/MontyMole_WallAmbush.inc.c index 8ee2cb60c3..9b1adbbcc5 100644 --- a/src/world/common/enemy/complete/MontyMole_WallAmbush.inc.c +++ b/src/world/common/enemy/complete/MontyMole_WallAmbush.inc.c @@ -39,7 +39,7 @@ MobileAISettings N(AISettings_MontyMole_WallAmbush) = { EvtScript N(EVS_NpcAI_MontyMole_WallAmbush) = { EVT_CALL(func_800445D4, LVar0) EVT_IF_EQ(LVar0, 100) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_20, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_20, 1) EVT_LABEL(10) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 130) @@ -66,9 +66,9 @@ EvtScript N(EVS_NpcAI_MontyMole_WallAmbush) = { EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_MOLE_POP, 0) EVT_CALL(NpcJump0, NPC_SELF, LVar1, LVar2, LVar3, 20) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, FALSE) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_20, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_20, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 0) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_40000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_40000000, 1) EVT_END_IF EVT_CALL(BasicAI_Main, EVT_PTR(N(AISettings_MontyMole_WallAmbush))) EVT_RETURN diff --git a/src/world/common/enemy/complete/Paragloomba.h b/src/world/common/enemy/complete/Paragloomba.h index 6db2bb2007..8bbc914dab 100644 --- a/src/world/common/enemy/complete/Paragloomba.h +++ b/src/world/common/enemy/complete/Paragloomba.h @@ -3,7 +3,7 @@ #define PARAGLOOMBA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 20, \ .itemDrops = { \ { ITEM_DIZZY_DIAL, 5, 0 }, \ diff --git a/src/world/common/enemy/complete/Paragoomba.h b/src/world/common/enemy/complete/Paragoomba.h index 5380b295de..067bb75d43 100644 --- a/src/world/common/enemy/complete/Paragoomba.h +++ b/src/world/common/enemy/complete/Paragoomba.h @@ -3,7 +3,7 @@ #define PARAGOOMBA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ .itemDrops = { \ { ITEM_MUSHROOM, 10, 0 }, \ diff --git a/src/world/common/enemy/complete/Paratroopa.h b/src/world/common/enemy/complete/Paratroopa.h index e01067e0f9..ee8c8a223c 100644 --- a/src/world/common/enemy/complete/Paratroopa.h +++ b/src/world/common/enemy/complete/Paratroopa.h @@ -3,7 +3,7 @@ #define PARATROOPA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ .itemDrops = { \ { ITEM_POW_BLOCK, 10, 0 }, \ diff --git a/src/world/common/enemy/complete/PiranhaPlant.h b/src/world/common/enemy/complete/PiranhaPlant.h index ddb0be71c1..2bc097ea84 100644 --- a/src/world/common/enemy/complete/PiranhaPlant.h +++ b/src/world/common/enemy/complete/PiranhaPlant.h @@ -3,7 +3,7 @@ #define PIRANHA_PLANT_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ .itemDrops = { \ { ITEM_FIRE_FLOWER, 10, 0 }, \ @@ -40,9 +40,9 @@ .settings = &N(NpcSettings_PiranhaPlant_Hitbox), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 0, \ - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, \ + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_800000, \ .drops = { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ }, \ diff --git a/src/world/common/enemy/complete/PiranhaPlant.inc.c b/src/world/common/enemy/complete/PiranhaPlant.inc.c index bc63c882dd..43319ee320 100644 --- a/src/world/common/enemy/complete/PiranhaPlant.inc.c +++ b/src/world/common/enemy/complete/PiranhaPlant.inc.c @@ -11,7 +11,7 @@ EvtScript N(EVS_NpcDefeat_PiranhaPlant_Hitbox) = { EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(OnPlayerFled, 1) EVT_CASE_EQ(OUTCOME_ENEMY_FLED) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_SWITCH EVT_RETURN diff --git a/src/world/common/enemy/complete/Pokey.h b/src/world/common/enemy/complete/Pokey.h index a676198868..4ea4e527b0 100644 --- a/src/world/common/enemy/complete/Pokey.h +++ b/src/world/common/enemy/complete/Pokey.h @@ -3,7 +3,7 @@ #define POKEY_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 15, \ .itemDrops = { \ { ITEM_DRIED_FRUIT, 9, 0 }, \ diff --git a/src/world/common/enemy/complete/PokeyMummy.h b/src/world/common/enemy/complete/PokeyMummy.h index 339e28df89..0fe7a31e58 100644 --- a/src/world/common/enemy/complete/PokeyMummy.h +++ b/src/world/common/enemy/complete/PokeyMummy.h @@ -3,7 +3,7 @@ #define POKEY_MUMMY_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ .itemDrops = { \ { ITEM_TASTY_TONIC, 10, 0 }, \ diff --git a/src/world/common/enemy/complete/PutridPiranha.h b/src/world/common/enemy/complete/PutridPiranha.h index f285fa0287..347640007d 100644 --- a/src/world/common/enemy/complete/PutridPiranha.h +++ b/src/world/common/enemy/complete/PutridPiranha.h @@ -3,7 +3,7 @@ #define PUTRID_PIRANHA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ .itemDrops = { \ { ITEM_SUPER_SHROOM, 10, 0 }, \ @@ -41,9 +41,9 @@ .settings = &N(NpcSettings_PutridPiranha_Hitbox), \ .pos = { NPC_DISPOSE_LOCATION }, \ .yaw = 0, \ - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, \ + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_800000, \ .drops = { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ }, \ diff --git a/src/world/common/enemy/complete/PutridPiranha.inc.c b/src/world/common/enemy/complete/PutridPiranha.inc.c index 61c78942c9..5d6c6d12c8 100644 --- a/src/world/common/enemy/complete/PutridPiranha.inc.c +++ b/src/world/common/enemy/complete/PutridPiranha.inc.c @@ -11,7 +11,7 @@ EvtScript N(EVS_NpcDefeat_PutridPiranha_Hitbox) = { EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(OnPlayerFled, 1) EVT_CASE_EQ(OUTCOME_ENEMY_FLED) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_SWITCH EVT_RETURN diff --git a/src/world/common/enemy/complete/PutridPiranhaSentinel.h b/src/world/common/enemy/complete/PutridPiranhaSentinel.h index 83120fd4ed..343a764059 100644 --- a/src/world/common/enemy/complete/PutridPiranhaSentinel.h +++ b/src/world/common/enemy/complete/PutridPiranhaSentinel.h @@ -3,7 +3,7 @@ #define PIRANHA_SENTINEL_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ .itemDrops = { \ { ITEM_FIRE_FLOWER, 10, 0 } \ diff --git a/src/world/common/enemy/complete/Sentinel.h b/src/world/common/enemy/complete/Sentinel.h index 217d7e8348..38eb4e3f32 100644 --- a/src/world/common/enemy/complete/Sentinel.h +++ b/src/world/common/enemy/complete/Sentinel.h @@ -3,7 +3,7 @@ #define SENTINEL_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/enemy/complete/Sentinel.inc.c b/src/world/common/enemy/complete/Sentinel.inc.c index 760e631537..9d617362c9 100644 --- a/src/world/common/enemy/complete/Sentinel.inc.c +++ b/src/world/common/enemy/complete/Sentinel.inc.c @@ -8,7 +8,7 @@ f32 N(FlyingAI_JumpVels)[] = { }; EvtScript N(EVS_NpcAuxAI_Sentinel) = { - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000 | ENEMY_FLAGS_20000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000 | ENEMY_FLAG_20000000, 1) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, TRUE) EVT_RETURN EVT_END diff --git a/src/world/common/enemy/complete/ShyGuy.h b/src/world/common/enemy/complete/ShyGuy.h index aa0f98bbad..0e87e4bb6b 100644 --- a/src/world/common/enemy/complete/ShyGuy.h +++ b/src/world/common/enemy/complete/ShyGuy.h @@ -3,7 +3,7 @@ #define SHY_GUY_NO_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/enemy/complete/SpikeTop.h b/src/world/common/enemy/complete/SpikeTop.h index 95306c1d5d..0e9cc6215c 100644 --- a/src/world/common/enemy/complete/SpikeTop.h +++ b/src/world/common/enemy/complete/SpikeTop.h @@ -5,7 +5,7 @@ #define TIK_BUZZY_BEETLE_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ .itemDrops = { \ { ITEM_SUPER_SODA, 10, 0 }, \ @@ -18,7 +18,7 @@ #define ISK_BUZZY_BEETLE_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = GENEROUS_HEART_DROPS(2), \ .flowerDrops = STANDARD_FLOWER_DROPS(2), \ .minCoinBonus = 1, \ @@ -48,7 +48,7 @@ #define SPIKE_TOP_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ .itemDrops = { \ { ITEM_SUPER_SODA, 10, 0 }, \ @@ -81,7 +81,7 @@ #define BONY_BEETLE_DROPS_ALT \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ .itemDrops = { \ { ITEM_SUPER_SHROOM, 10, 0 }, \ @@ -94,7 +94,7 @@ #define BONY_BEETLE_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ .itemDrops = { \ { ITEM_SUPER_SHROOM, 10, 0 }, \ diff --git a/src/world/common/enemy/complete/SpikedGloomba.h b/src/world/common/enemy/complete/SpikedGloomba.h index 5f39df0ca5..67a511df49 100644 --- a/src/world/common/enemy/complete/SpikedGloomba.h +++ b/src/world/common/enemy/complete/SpikedGloomba.h @@ -3,7 +3,7 @@ #define SPIKED_GLOOMBA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 20, \ .itemDrops = { \ { ITEM_DIZZY_DIAL, 5, 0 }, \ diff --git a/src/world/common/enemy/complete/SpikedGoomba.h b/src/world/common/enemy/complete/SpikedGoomba.h index 6c362028e2..71d1f990a3 100644 --- a/src/world/common/enemy/complete/SpikedGoomba.h +++ b/src/world/common/enemy/complete/SpikedGoomba.h @@ -3,7 +3,7 @@ #define SPIKED_GOOMBA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ .itemDrops = { \ { ITEM_MUSHROOM, 10, 0 }, \ diff --git a/src/world/common/enemy/complete/Spiny.h b/src/world/common/enemy/complete/Spiny.h index 7c3bd64378..baeca3d9e3 100644 --- a/src/world/common/enemy/complete/Spiny.h +++ b/src/world/common/enemy/complete/Spiny.h @@ -3,7 +3,7 @@ #define SPINY_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = STANDARD_HEART_DROPS(3), \ .flowerDrops = STANDARD_FLOWER_DROPS(2), \ .minCoinBonus = 0, \ diff --git a/src/world/common/enemy/complete/StoneChomp.h b/src/world/common/enemy/complete/StoneChomp.h index 576403c8a7..c170ef9df3 100644 --- a/src/world/common/enemy/complete/StoneChomp.h +++ b/src/world/common/enemy/complete/StoneChomp.h @@ -3,7 +3,7 @@ #define STONE_CHOMP_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 5, \ .itemDrops = { \ { ITEM_HONEY_SYRUP, 10, 0 }, \ diff --git a/src/world/common/enemy/complete/TubbaBlubba.h b/src/world/common/enemy/complete/TubbaBlubba.h index 1cde081c30..ac7aabcf62 100644 --- a/src/world/common/enemy/complete/TubbaBlubba.h +++ b/src/world/common/enemy/complete/TubbaBlubba.h @@ -3,7 +3,7 @@ #define TUBBA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/enemy/complete/TuffPuff.h b/src/world/common/enemy/complete/TuffPuff.h index 41ecedb010..7cbfe01abd 100644 --- a/src/world/common/enemy/complete/TuffPuff.h +++ b/src/world/common/enemy/complete/TuffPuff.h @@ -3,14 +3,14 @@ #define TUFF_PUFF_NO_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } #define TUFF_PUFF_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 10, \ .itemDrops = { \ { ITEM_THUNDER_RAGE, 10, 0 }, \ diff --git a/src/world/common/enemy/complete/Whacka.h b/src/world/common/enemy/complete/Whacka.h index 5beed26b35..5cf62e8b4e 100644 --- a/src/world/common/enemy/complete/Whacka.h +++ b/src/world/common/enemy/complete/Whacka.h @@ -3,7 +3,7 @@ #define WHACKA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/enemy/complete/YMagikoopa.h b/src/world/common/enemy/complete/YMagikoopa.h index 0b455480fa..3ca3341e97 100644 --- a/src/world/common/enemy/complete/YMagikoopa.h +++ b/src/world/common/enemy/complete/YMagikoopa.h @@ -4,7 +4,7 @@ #define MAGIKOOPA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .itemDropChance = 25, \ .itemDrops = { \ { ITEM_SUPER_SHROOM, 2, 0 }, \ diff --git a/src/world/common/enemy/wip/Dead_PiranhaPlantAI_Main.inc.c b/src/world/common/enemy/wip/Dead_PiranhaPlantAI_Main.inc.c index ec1bc35e0e..aaf0613525 100644 --- a/src/world/common/enemy/wip/Dead_PiranhaPlantAI_Main.inc.c +++ b/src/world/common/enemy/wip/Dead_PiranhaPlantAI_Main.inc.c @@ -25,21 +25,21 @@ ApiStatus N(PiranhaPlantAI_Main)(Evt* script, s32 isInitialCall) { // Dead Func that doesn't seem to have an alive counterpart, probably because of the // difference in the Enemy and DeadEnemy struct. func_8004D8E0(enemy); - if (enemy->flags & ENEMY_FLAGS_100000) { + if (enemy->flags & ENEMY_FLAG_100000) { enemy->unk_114 = 10.0f; enemy->unk_118 = 0.7f; } - if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAG_4) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; enemy->varTable[0] = 0; - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; } } diff --git a/src/world/common/enemy/wip/PiranhaPlantAI_10.inc.c b/src/world/common/enemy/wip/PiranhaPlantAI_10.inc.c index e18d9cf041..ecc9a5f3d0 100644 --- a/src/world/common/enemy/wip/PiranhaPlantAI_10.inc.c +++ b/src/world/common/enemy/wip/PiranhaPlantAI_10.inc.c @@ -23,8 +23,8 @@ void N(PiranhaPlantAI_10)(Evt* script, MobileAISettings* aiSettings, EnemyDetect npc->duration--; if (enemy->varTable[9] >= npc->duration) { - enemy->flags |= (ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | - ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000); + enemy->flags |= (ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | + ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000); } if (npc->duration == 0) { diff --git a/src/world/common/enemy/wip/PiranhaPlantAI_11.inc.c b/src/world/common/enemy/wip/PiranhaPlantAI_11.inc.c index effe1eadef..54371c1c80 100644 --- a/src/world/common/enemy/wip/PiranhaPlantAI_11.inc.c +++ b/src/world/common/enemy/wip/PiranhaPlantAI_11.inc.c @@ -6,7 +6,7 @@ void N(PiranhaPlantAI_11)(Evt* script, MobileAISettings* aiSettings, EnemyDetect npc->duration--; if (enemy->varTable[11] >= npc->duration) { - enemy->flags &= ~(ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000); + enemy->flags &= ~(ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000); } if (npc->duration == 0) { npc->currentAnim = enemy->animList[10]; diff --git a/src/world/common/enemy/wip/PiranhaPlantAI_Main.inc.c b/src/world/common/enemy/wip/PiranhaPlantAI_Main.inc.c index fbe2293df9..7975afad4b 100644 --- a/src/world/common/enemy/wip/PiranhaPlantAI_Main.inc.c +++ b/src/world/common/enemy/wip/PiranhaPlantAI_Main.inc.c @@ -36,22 +36,22 @@ s32 N(PiranhaPlantAI_Main)(Evt* script, s32 isInitialCall) { // difference in the Enemy and DeadEnemy struct. func_8004D8E0(enemy); - if (enemy->flags & ENEMY_FLAGS_100000) { + if (enemy->flags & ENEMY_FLAG_100000) { enemy->unk_114 = 10.0f; enemy->unk_118 = 0.7f; } #endif - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAGS_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { script->AI_TEMP_STATE = AI_STATE_PIRANHA_PLANT_00; npc->duration = 0; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; enemy->AI_VAR_ATTACK_STATE = MELEE_HITBOX_STATE_NONE; - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { script->AI_TEMP_STATE = AI_STATE_SUSPEND; script->functionTemp[1] = AI_STATE_PIRANHA_PLANT_00; - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; } } diff --git a/src/world/common/entity/Pipe.data.inc.c b/src/world/common/entity/Pipe.data.inc.c index b79e8d0a5f..c43133c6e4 100644 --- a/src/world/common/entity/Pipe.data.inc.c +++ b/src/world/common/entity/Pipe.data.inc.c @@ -154,11 +154,11 @@ EvtScript N(EVS_Pipe_ExitVertical_Impl) = { EVT_SET(LVar0, LVarA) EVT_CALL(N(Pipe_GetEntryPos)) EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_NO_FLIPPING, TRUE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, TRUE) EVT_CALL(N(Pipe_GetCameraYaw)) EVT_CALL(InterpPlayerYaw, LVar0, 0) EVT_WAIT(2) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_NO_FLIPPING, FALSE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, FALSE) EVT_CALL(PlaySound, SOUND_ENTER_PIPE) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_THREAD diff --git a/src/world/common/entity/Pipe.inc.c b/src/world/common/entity/Pipe.inc.c index 3c0de29621..5377eda950 100644 --- a/src/world/common/entity/Pipe.inc.c +++ b/src/world/common/entity/Pipe.inc.c @@ -2,7 +2,7 @@ #include "npc.h" API_CALLABLE(N(Pipe_SetAnimFlag)) { - gPlayerStatusPtr->animFlags |= PA_FLAGS_CHANGING_MAP; + gPlayerStatusPtr->animFlags |= PA_FLAG_CHANGING_MAP; return ApiStatus_DONE2; } diff --git a/src/world/common/entity/PipeData.inc.c b/src/world/common/entity/PipeData.inc.c index 9be3166e5b..a4a7d244b2 100644 --- a/src/world/common/entity/PipeData.inc.c +++ b/src/world/common/entity/PipeData.inc.c @@ -153,11 +153,11 @@ EvtScript N(Pipe_ScriptD) = { EVT_SET(LVar0, LVarA) EVT_CALL(N(Pipe_GetEntryPos)) EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_NO_FLIPPING, TRUE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, TRUE) EVT_CALL(N(Pipe_GetCameraYaw)) EVT_CALL(InterpPlayerYaw, LVar0, 0) EVT_WAIT(2) - EVT_CALL(SetPlayerFlagBits, PS_FLAGS_NO_FLIPPING, FALSE) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, FALSE) EVT_CALL(PlaySound, SOUND_ENTER_PIPE) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_THREAD diff --git a/src/world/common/entity/SuperBlock.inc.c b/src/world/common/entity/SuperBlock.inc.c index 167f78b8a8..4def7ab8dd 100644 --- a/src/world/common/entity/SuperBlock.inc.c +++ b/src/world/common/entity/SuperBlock.inc.c @@ -156,7 +156,7 @@ API_CALLABLE(N(SuperBlock_StartGlowEffect)) { API_CALLABLE(N(SuperBlock_EndGlowEffect)) { EffectInstance* effect = (EffectInstance*)evt_get_variable(script, *script->ptrReadPos); - effect->flags |= EFFECT_INSTANCE_FLAGS_10; + effect->flags |= EFFECT_INSTANCE_FLAG_10; return ApiStatus_DONE2; } @@ -271,7 +271,7 @@ API_CALLABLE(N(SuperBlock_AnimateEnergyOrbs)) { userData->scatterStateTime++; if (userData->scatterStateTime > 30) { for (i = 0; i < SUPER_BLOCK_NUM_ORBS; i++) { - userData->orbEffects[i]->flags |= EFFECT_INSTANCE_FLAGS_10; + userData->orbEffects[i]->flags |= EFFECT_INSTANCE_FLAG_10; } return ApiStatus_DONE2; } diff --git a/src/world/common/npc/Bobomb.h b/src/world/common/npc/Bobomb.h index 5e7874d76f..b1becbd09f 100644 --- a/src/world/common/npc/Bobomb.h +++ b/src/world/common/npc/Bobomb.h @@ -3,7 +3,7 @@ #define BOBOMB_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/Boo.h b/src/world/common/npc/Boo.h index ad395b0dd4..0f3ae87391 100644 --- a/src/world/common/npc/Boo.h +++ b/src/world/common/npc/Boo.h @@ -3,7 +3,7 @@ #define BOO_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/Bootler.h b/src/world/common/npc/Bootler.h index 1a25cd8a07..40a13eab54 100644 --- a/src/world/common/npc/Bootler.h +++ b/src/world/common/npc/Bootler.h @@ -3,7 +3,7 @@ #define BOOTLER_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/Bow.h b/src/world/common/npc/Bow.h index 5940128a94..8f5bd1e6d1 100644 --- a/src/world/common/npc/Bow.h +++ b/src/world/common/npc/Bow.h @@ -3,7 +3,7 @@ #define BOW_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/Bubulb.h b/src/world/common/npc/Bubulb.h index 23eba94e9b..59836040ef 100644 --- a/src/world/common/npc/Bubulb.h +++ b/src/world/common/npc/Bubulb.h @@ -3,7 +3,7 @@ #define BUBULB_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/Dryite.h b/src/world/common/npc/Dryite.h index 86d953662d..4b8cb5a339 100644 --- a/src/world/common/npc/Dryite.h +++ b/src/world/common/npc/Dryite.h @@ -3,7 +3,7 @@ #define DRYITE_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/GateFlower.h b/src/world/common/npc/GateFlower.h index 1715bec764..412913a8d7 100644 --- a/src/world/common/npc/GateFlower.h +++ b/src/world/common/npc/GateFlower.h @@ -3,7 +3,7 @@ #define GATE_FLOWER_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/GoombaFamily.h b/src/world/common/npc/GoombaFamily.h index 6632e3c6c7..664c39c477 100644 --- a/src/world/common/npc/GoombaFamily.h +++ b/src/world/common/npc/GoombaFamily.h @@ -7,7 +7,7 @@ #define GOOMPA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } @@ -34,7 +34,7 @@ #define GOOMA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } @@ -61,7 +61,7 @@ #define GOOMPAPA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } @@ -88,7 +88,7 @@ #define GOOMAMA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } @@ -115,7 +115,7 @@ #define GOOMBARIO_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } @@ -142,7 +142,7 @@ #define GOOMBARIA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/Goombaria.h b/src/world/common/npc/Goombaria.h index 77d0866012..0ec27c5cf8 100644 --- a/src/world/common/npc/Goombaria.h +++ b/src/world/common/npc/Goombaria.h @@ -3,7 +3,7 @@ #define GOOMBARIA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/Kolorado.h b/src/world/common/npc/Kolorado.h index 6284e2c335..fbfd763ae2 100644 --- a/src/world/common/npc/Kolorado.h +++ b/src/world/common/npc/Kolorado.h @@ -3,7 +3,7 @@ #define KOLORADO_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/KoloradoWife.h b/src/world/common/npc/KoloradoWife.h index 2999f9b44f..e9b29534fb 100644 --- a/src/world/common/npc/KoloradoWife.h +++ b/src/world/common/npc/KoloradoWife.h @@ -3,7 +3,7 @@ #define KOLORADO_WIFE_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/Koopa.h b/src/world/common/npc/Koopa.h index 7359ff4cfd..088f0f4aad 100644 --- a/src/world/common/npc/Koopa.h +++ b/src/world/common/npc/Koopa.h @@ -3,7 +3,7 @@ #define KOOPA_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/KoopaBros.h b/src/world/common/npc/KoopaBros.h index 9f53e9d5de..181d22ed2b 100644 --- a/src/world/common/npc/KoopaBros.h +++ b/src/world/common/npc/KoopaBros.h @@ -3,7 +3,7 @@ #define KOOPA_BROS_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/KoopaKoot.h b/src/world/common/npc/KoopaKoot.h index f23fd94dd2..ccb08f9d6f 100644 --- a/src/world/common/npc/KoopaKoot.h +++ b/src/world/common/npc/KoopaKoot.h @@ -3,7 +3,7 @@ #define KOOPA_KOOT_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/Lily.h b/src/world/common/npc/Lily.h index 7d6f4a812e..ab1f1e04e4 100644 --- a/src/world/common/npc/Lily.h +++ b/src/world/common/npc/Lily.h @@ -3,7 +3,7 @@ #define LILY_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/Luigi.h b/src/world/common/npc/Luigi.h index 408469b290..6f4abf7e2a 100644 --- a/src/world/common/npc/Luigi.h +++ b/src/world/common/npc/Luigi.h @@ -3,7 +3,7 @@ #define LUIGI_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/Mouser.h b/src/world/common/npc/Mouser.h index 818b13b648..bb2492d37a 100644 --- a/src/world/common/npc/Mouser.h +++ b/src/world/common/npc/Mouser.h @@ -6,7 +6,7 @@ #define MOUSER_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/Oaklie.h b/src/world/common/npc/Oaklie.h index a5cba79300..a0ba05426e 100644 --- a/src/world/common/npc/Oaklie.h +++ b/src/world/common/npc/Oaklie.h @@ -3,7 +3,7 @@ #define OAKLIE_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/Penguin.h b/src/world/common/npc/Penguin.h index 8a339132a3..91b87d357c 100644 --- a/src/world/common/npc/Penguin.h +++ b/src/world/common/npc/Penguin.h @@ -5,7 +5,7 @@ #define PENGUIN_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/Posie.h b/src/world/common/npc/Posie.h index f246fa105d..1b0961ee8e 100644 --- a/src/world/common/npc/Posie.h +++ b/src/world/common/npc/Posie.h @@ -3,7 +3,7 @@ #define POSIE_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/Rosie.h b/src/world/common/npc/Rosie.h index 204665b57d..1cfef71d47 100644 --- a/src/world/common/npc/Rosie.h +++ b/src/world/common/npc/Rosie.h @@ -3,7 +3,7 @@ #define ROSIE_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/StarSpirit.h b/src/world/common/npc/StarSpirit.h index 3ef8f8b471..e2472b4cb9 100644 --- a/src/world/common/npc/StarSpirit.h +++ b/src/world/common/npc/StarSpirit.h @@ -9,7 +9,7 @@ #define ELDSTAR_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } @@ -36,7 +36,7 @@ #define MAMAR_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } @@ -63,7 +63,7 @@ #define SKOLAR_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } @@ -90,7 +90,7 @@ #define MUSKULAR_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } @@ -117,7 +117,7 @@ #define MISSTAR_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } @@ -144,7 +144,7 @@ #define KLEVAR_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } @@ -171,7 +171,7 @@ #define KALMAR_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/Sun.h b/src/world/common/npc/Sun.h index 98500eefab..4b27048673 100644 --- a/src/world/common/npc/Sun.h +++ b/src/world/common/npc/Sun.h @@ -3,7 +3,7 @@ #define SUN_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/Toad.h b/src/world/common/npc/Toad.h index 8177a39918..b1e93ce1c2 100644 --- a/src/world/common/npc/Toad.h +++ b/src/world/common/npc/Toad.h @@ -108,7 +108,7 @@ #define TOAD_KID_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } @@ -195,7 +195,7 @@ #define TOADETTE_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/Tolielup.h b/src/world/common/npc/Tolielup.h index bb6641f00a..0b86a823ed 100644 --- a/src/world/common/npc/Tolielup.h +++ b/src/world/common/npc/Tolielup.h @@ -3,7 +3,7 @@ #define TOLIELUP_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/TrainConductorToad.h b/src/world/common/npc/TrainConductorToad.h index 4a5211a3fb..6a26c8cc9d 100644 --- a/src/world/common/npc/TrainConductorToad.h +++ b/src/world/common/npc/TrainConductorToad.h @@ -3,7 +3,7 @@ #define TRAIN_CONDUCTOR_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/TubbasHeart.h b/src/world/common/npc/TubbasHeart.h index 10b585f4c6..38da66d24b 100644 --- a/src/world/common/npc/TubbasHeart.h +++ b/src/world/common/npc/TubbasHeart.h @@ -3,7 +3,7 @@ #define TUBBAS_HEART_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/Twink.h b/src/world/common/npc/Twink.h index 55736cdb1f..9255c078fe 100644 --- a/src/world/common/npc/Twink.h +++ b/src/world/common/npc/Twink.h @@ -3,7 +3,7 @@ #define TWINK_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/Yakkey.h b/src/world/common/npc/Yakkey.h index 6128b86da4..06ccfebd5d 100644 --- a/src/world/common/npc/Yakkey.h +++ b/src/world/common/npc/Yakkey.h @@ -3,7 +3,7 @@ #define YAKKEY_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/Yoshi.h b/src/world/common/npc/Yoshi.h index 2fa6f40bff..ecb273e84b 100644 --- a/src/world/common/npc/Yoshi.h +++ b/src/world/common/npc/Yoshi.h @@ -6,7 +6,7 @@ #define YOSHI_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/npc/YoshiKid.h b/src/world/common/npc/YoshiKid.h index 3c99b910c9..5bc905d202 100644 --- a/src/world/common/npc/YoshiKid.h +++ b/src/world/common/npc/YoshiKid.h @@ -4,7 +4,7 @@ #define YOSHI_KID_DROPS \ { \ - .dropFlags = NPC_DROP_FLAGS_80, \ + .dropFlags = NPC_DROP_FLAG_80, \ .heartDrops = NO_DROPS, \ .flowerDrops = NO_DROPS, \ } diff --git a/src/world/common/todo/PullVineSub.inc.c b/src/world/common/todo/PullVineSub.inc.c index 35b152e6a1..734186c795 100644 --- a/src/world/common/todo/PullVineSub.inc.c +++ b/src/world/common/todo/PullVineSub.inc.c @@ -16,9 +16,9 @@ ApiStatus N(PullVine_ShearBushModel)(Evt* script) { Model* mdl = get_model_from_list_index(modelIndex); Matrix4f mtx; - if (!(mdl->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) { + if (!(mdl->flags & MODEL_FLAG_HAS_TRANSFORM_APPLIED)) { N(PullVine_apply_shear_mtx)(mdl->transformMatrix, f); - mdl->flags |= MODEL_FLAGS_USES_TRANSFORM_MATRIX | MODEL_FLAGS_HAS_TRANSFORM_APPLIED; + mdl->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED; } else { N(PullVine_apply_shear_mtx)(mtx, f); guMtxCatF(mtx, mdl->transformMatrix, mdl->transformMatrix); diff --git a/src/world/common/todo/RemovePadlock.inc.c b/src/world/common/todo/RemovePadlock.inc.c index 9b840a4c0b..7953a0afac 100644 --- a/src/world/common/todo/RemovePadlock.inc.c +++ b/src/world/common/todo/RemovePadlock.inc.c @@ -4,6 +4,6 @@ ApiStatus N(RemovePadlock)(Evt* script, s32 isInitialCall) { Entity* entity = get_entity_by_index(script->varTable[0]); - entity->flags |= ENTITY_FLAGS_100000; + entity->flags |= ENTITY_FLAG_100000; return ApiStatus_DONE2; } diff --git a/src/world/common/todo/SetCamera0Flag1000.inc.c b/src/world/common/todo/SetCamera0Flag1000.inc.c index 9c2d79c9f7..5c653d4a1d 100644 --- a/src/world/common/todo/SetCamera0Flag1000.inc.c +++ b/src/world/common/todo/SetCamera0Flag1000.inc.c @@ -5,6 +5,6 @@ ApiStatus N(SetCamera0Flag1000)(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[CAM_DEFAULT]; - camera->flags |= CAMERA_FLAGS_1000; + camera->flags |= CAMERA_FLAG_1000; return ApiStatus_DONE2; } diff --git a/src/world/common/todo/UnkFunc001.inc.c b/src/world/common/todo/UnkFunc001.inc.c index 3b9346e59f..1772911406 100644 --- a/src/world/common/todo/UnkFunc001.inc.c +++ b/src/world/common/todo/UnkFunc001.inc.c @@ -24,7 +24,7 @@ ApiStatus N(UnkFunc001)(Evt* script, s32 isInitialCall) { if (isInitialCall) { script->functionTemp[0] = 0; npc->duration = 0; - enemy->aiFlags |= ENEMY_AI_FLAGS_10; + enemy->aiFlags |= ENEMY_AI_FLAG_10; hitDepth = 1000.0f; x = npc->pos.x; y = npc->pos.y; @@ -33,9 +33,9 @@ ApiStatus N(UnkFunc001)(Evt* script, s32 isInitialCall) { enemy->varTable[1] = y; } - if (enemy->aiFlags & ENEMY_AI_FLAGS_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_4) { if (enemy->aiPaused == 0) { - enemy->aiFlags &= ~ENEMY_AI_FLAGS_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_4; } else { return ApiStatus_BLOCK; } diff --git a/src/world/common/todo/UnkFunc11.inc.c b/src/world/common/todo/UnkFunc11.inc.c index cd1049a68a..97de5f0ce4 100644 --- a/src/world/common/todo/UnkFunc11.inc.c +++ b/src/world/common/todo/UnkFunc11.inc.c @@ -21,7 +21,7 @@ ApiStatus N(UnkFunc11)(Evt* script, s32 isInitialCall) { (playerStatus->actionState != ACTION_STATE_RUN)) { script->varTable[0] = 0; - } else if (playerStatus->animFlags & PA_FLAGS_USING_WATT) { + } else if (playerStatus->animFlags & PA_FLAG_USING_WATT) { script->varTable[0] = 0; } else { script->varTable[0] = 1; diff --git a/src/world/common/todo/UnsetCamera0Flag1000.inc.c b/src/world/common/todo/UnsetCamera0Flag1000.inc.c index 63e089ce7a..f4a677bcd2 100644 --- a/src/world/common/todo/UnsetCamera0Flag1000.inc.c +++ b/src/world/common/todo/UnsetCamera0Flag1000.inc.c @@ -5,6 +5,6 @@ ApiStatus N(UnsetCamera0Flag1000)(Evt* script, s32 isInitialCall) { Camera* camera = &gCameras[CAM_DEFAULT]; - camera->flags &= ~CAMERA_FLAGS_1000; + camera->flags &= ~CAMERA_FLAG_1000; return ApiStatus_DONE2; } diff --git a/src/world/dead/area_flo/flo_00/flo_00_3_npc.c b/src/world/dead/area_flo/flo_00/flo_00_3_npc.c index db3f9b1ca9..aa605a1644 100644 --- a/src/world/dead/area_flo/flo_00/flo_00_3_npc.c +++ b/src/world/dead/area_flo/flo_00/flo_00_3_npc.c @@ -623,7 +623,7 @@ StaticNpc N(NpcData_Wisterwood) = { .settings = &N(NpcSettings_Dummy), .pos = { -72.0f, 60.0f, -100.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_200 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_200 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Wisterwood), .drops = BUBULB_DROPS, .animations = BUBULB_PINK_ANIMS, @@ -635,7 +635,7 @@ StaticNpc N(NpcData_Bubulbs)[] = { .settings = &N(NpcSettings_Bubulb_Patrol), .pos = { -59.0f, 0.0f, -40.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Bubulb_01), .drops = BUBULB_DROPS, .territory = { @@ -660,7 +660,7 @@ StaticNpc N(NpcData_Bubulbs)[] = { .settings = &N(NpcSettings_Bubulb_Patrol), .pos = { 67.0f, 0.0f, 85.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Bubulb_02), .drops = BUBULB_DROPS, .territory = { @@ -685,7 +685,7 @@ StaticNpc N(NpcData_Bubulbs)[] = { .settings = &N(NpcSettings_Bubulb_Patrol), .pos = { 90.0f, 0.0f, 410.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Bubulb_03), .drops = BUBULB_DROPS, .territory = { @@ -710,7 +710,7 @@ StaticNpc N(NpcData_Bubulbs)[] = { .settings = &N(NpcSettings_Bubulb_Patrol), .pos = { 200.0f, 0.0f, 430.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Bubulb_04), .drops = BUBULB_DROPS, .territory = { @@ -737,7 +737,7 @@ StaticNpc N(NpcData_Tolielup) = { .settings = &N(NpcSettings_Tolielup), .pos = { -400.0f, 0.0f, 190.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Tolielup), .drops = TOLIELUP_DROPS, .animations = TOLIELUP_ANIMS, @@ -749,7 +749,7 @@ StaticNpc N(NpcData_Klevar) = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Klevar), .drops = KLEVAR_DROPS, .animations = KLEVAR_ANIMS, @@ -760,10 +760,10 @@ StaticNpc N(NpcData_Lakilulu) = { .settings = &N(NpcSettings_Dummy), .pos = { 198.0f, 0.0f, 363.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakilulu), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/dead/area_flo/flo_00/flo_00_4_epilogue.c b/src/world/dead/area_flo/flo_00/flo_00_4_epilogue.c index f994a53b12..a25b38c73a 100644 --- a/src/world/dead/area_flo/flo_00/flo_00_4_epilogue.c +++ b/src/world/dead/area_flo/flo_00/flo_00_4_epilogue.c @@ -86,10 +86,10 @@ StaticNpc N(NpcData_Lakilester_Epilogue)[] = { .settings = &N(NpcSettings_Lakilester_Epilogue), .pos = { 144.0f, 0.0f, 374.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakilester_Epilogue), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -117,10 +117,10 @@ StaticNpc N(NpcData_Lakilester_Epilogue)[] = { .settings = &N(NpcSettings_Lakilester_Epilogue), .pos = { 198.0f, 0.0f, 363.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakilulu_Epilogue), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -148,10 +148,10 @@ StaticNpc N(NpcData_Lakilester_Epilogue)[] = { .settings = &N(NpcSettings_Parakarry_Epilogue), .pos = { 266.0f, 0.0f, 322.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Parakarry_Epilogue), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/dead/area_flo/flo_03/flo_03_3_npc.c b/src/world/dead/area_flo/flo_03/flo_03_3_npc.c index bcdf477437..fd4c4e2b4d 100644 --- a/src/world/dead/area_flo/flo_03/flo_03_3_npc.c +++ b/src/world/dead/area_flo/flo_03/flo_03_3_npc.c @@ -234,11 +234,11 @@ EvtScript N(EVS_NpcInteract_Petunia) = { EVT_SET(LVar4, EVT_FLOAT(90.0)) EVT_EXEC_WAIT(N(EVS_FocusCamBetween)) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0057) - EVT_CALL(SetEnemyFlagBits, NPC_Dayzee, ENEMY_FLAGS_1, 0) - EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_01, ENEMY_FLAGS_1, 0) - EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_02, ENEMY_FLAGS_1, 0) - EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_03, ENEMY_FLAGS_1, 0) - EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_04, ENEMY_FLAGS_1, 0) + EVT_CALL(SetEnemyFlagBits, NPC_Dayzee, ENEMY_FLAG_1, 0) + EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_01, ENEMY_FLAG_1, 0) + EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_02, ENEMY_FLAG_1, 0) + EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_03, ENEMY_FLAG_1, 0) + EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_04, ENEMY_FLAG_1, 0) EVT_CALL(BindNpcAI, NPC_Dayzee, EVT_PTR(N(EVS_NpcAI_Dayzee))) EVT_SET(MV_PauseBurrowing, FALSE) EVT_SET(MV_NextBurrowTriggerRadius, 60) @@ -298,7 +298,7 @@ EvtScript N(EVS_NpcInit_Dayzee) = { EVT_CALL(SetNpcPos, NPC_Dayzee, NPC_DISPOSE_LOCATION) EVT_CASE_DEFAULT EVT_IF_EQ(GF_FLO03_Defeated_Dayzee, FALSE) - EVT_CALL(SetEnemyFlagBits, NPC_Dayzee, ENEMY_FLAGS_1, 0) + EVT_CALL(SetEnemyFlagBits, NPC_Dayzee, ENEMY_FLAG_1, 0) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcAI_Dayzee))) EVT_ELSE EVT_CALL(SetNpcPos, NPC_Dayzee, NPC_DISPOSE_LOCATION) @@ -407,7 +407,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_262, 0) EVT_CALL(ShowEmote, NPC_MontyMole_01, EMOTE_EXCLAMATION, 0, LVar1, TRUE, 0, 0, 0, 0) EVT_WAIT(LVar1) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_DIG, 0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim11) @@ -435,7 +435,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_SURFACE, 0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(10) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) EVT_CALL(RandInt, 30, LVar0) EVT_ADD(LVar0, 60) EVT_SET(MV_NextBurrowTime_Mole_01, LVar0) @@ -486,7 +486,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_262, 0) EVT_CALL(ShowEmote, NPC_MontyMole_02, EMOTE_EXCLAMATION, 0, LVar1, TRUE, 0, 0, 0, 0) EVT_WAIT(LVar1) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_BURROW_DIG, 0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim11) @@ -514,7 +514,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_BURROW_SURFACE, 0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(10) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) EVT_CALL(RandInt, 35, LVar0) EVT_ADD(LVar0, 55) EVT_SET(MV_NextBurrowTime_Mole_02, LVar0) @@ -565,7 +565,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_262, 0) EVT_CALL(ShowEmote, NPC_MontyMole_03, EMOTE_EXCLAMATION, 0, LVar1, TRUE, 0, 0, 0, 0) EVT_WAIT(LVar1) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_BURROW_DIG, 0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_03, ANIM_MontyMole_Dark_Anim11) @@ -593,7 +593,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_BURROW_SURFACE, 0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_03, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(10) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) EVT_CALL(RandInt, 40, LVar0) EVT_ADD(LVar0, 50) EVT_SET(MV_NextBurrowTime_Mole_03, LVar0) @@ -644,7 +644,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_262, 0) EVT_CALL(ShowEmote, NPC_MontyMole_04, EMOTE_EXCLAMATION, 0, LVar1, TRUE, 0, 0, 0, 0) EVT_WAIT(LVar1) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_BURROW_DIG, 0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim11) @@ -672,7 +672,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_BURROW_SURFACE, 0) EVT_CALL(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim10) EVT_WAIT(10) - EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_10000000, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 0) EVT_CALL(RandInt, 45, LVar0) EVT_ADD(LVar0, 45) EVT_SET(MV_NextBurrowTime_Mole_04, LVar0) @@ -700,7 +700,7 @@ EvtScript N(EVS_NpcInit_MontyMole_01) = { EVT_IF_EQ(GF_FLO03_Defeated_MontyMoleA, FALSE) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_MontyMole_01))) EVT_CALL(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim10) - EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_01, ENEMY_FLAGS_1, 0) + EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_01, ENEMY_FLAG_1, 0) EVT_ELSE EVT_CALL(SetNpcPos, NPC_MontyMole_01, NPC_DISPOSE_LOCATION) EVT_END_IF @@ -723,7 +723,7 @@ EvtScript N(EVS_NpcInit_MontyMole_02) = { EVT_IF_EQ(GF_FLO03_Defeated_MontyMoleB, FALSE) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_MontyMole_02))) EVT_CALL(SetNpcAnimation, NPC_MontyMole_02, ANIM_MontyMole_Dark_Anim10) - EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_02, ENEMY_FLAGS_1, 0) + EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_02, ENEMY_FLAG_1, 0) EVT_ELSE EVT_CALL(SetNpcPos, NPC_MontyMole_02, NPC_DISPOSE_LOCATION) EVT_END_IF @@ -746,7 +746,7 @@ EvtScript N(EVS_NpcInit_MontyMole_03) = { EVT_IF_EQ(GF_FLO03_Defeated_MontyMoleC, FALSE) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_MontyMole_03))) EVT_CALL(SetNpcAnimation, NPC_MontyMole_03, ANIM_MontyMole_Dark_Anim10) - EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_03, ENEMY_FLAGS_1, 0) + EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_03, ENEMY_FLAG_1, 0) EVT_ELSE EVT_CALL(SetNpcPos, NPC_MontyMole_03, NPC_DISPOSE_LOCATION) EVT_END_IF @@ -769,7 +769,7 @@ EvtScript N(EVS_NpcInit_MontyMole_04) = { EVT_IF_EQ(GF_FLO03_Defeated_MontyMoleD, FALSE) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_MontyMole_04))) EVT_CALL(SetNpcAnimation, NPC_MontyMole_04, ANIM_MontyMole_Dark_Anim10) - EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_04, ENEMY_FLAGS_1, 0) + EVT_CALL(SetEnemyFlagBits, NPC_MontyMole_04, ENEMY_FLAG_1, 0) EVT_ELSE EVT_CALL(SetNpcPos, NPC_MontyMole_04, NPC_DISPOSE_LOCATION) EVT_END_IF @@ -785,10 +785,10 @@ StaticNpc N(NpcData_Petunia) = { .settings = &N(NpcSettings_Petunia), .pos = { -30.0f, 0.0f, 100.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Petunia), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -818,10 +818,10 @@ StaticNpc N(NpcData_Dayzee) = { .settings = &N(NpcSettings_Dayzee), .pos = { -233.0f, 0.0f, -217.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Dayzee), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -850,10 +850,10 @@ StaticNpc N(NpcData_MontyMole_01) = { .settings = &N(NpcSettings_Dayzee), .pos = { -100.0f, 0.0f, 210.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_MontyMole_01), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -882,10 +882,10 @@ StaticNpc N(NpcData_MontyMole_02) = { .settings = &N(NpcSettings_Dayzee), .pos = { -130.0f, 0.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_MontyMole_02), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -914,10 +914,10 @@ StaticNpc N(NpcData_MontyMole_03) = { .settings = &N(NpcSettings_Dayzee), .pos = { 75.0f, 0.0f, 20.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_MontyMole_03), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -946,10 +946,10 @@ StaticNpc N(NpcData_MontyMole_04) = { .settings = &N(NpcSettings_Dayzee), .pos = { 71.0f, 0.0f, 200.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_MontyMole_04), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, diff --git a/src/world/dead/area_flo/flo_07/flo_07_3_npc.c b/src/world/dead/area_flo/flo_07/flo_07_3_npc.c index 3f22057d2f..5ac5dabb1b 100644 --- a/src/world/dead/area_flo/flo_07/flo_07_3_npc.c +++ b/src/world/dead/area_flo/flo_07/flo_07_3_npc.c @@ -249,7 +249,7 @@ StaticNpc N(NpcData_Posie) = { .settings = &N(NpcSettings_Posie), .pos = { -260.0f, 0.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Posie), .drops = POSIE_DROPS, .animations = POSIE_ANIMS, diff --git a/src/world/dead/area_flo/flo_08/flo_08_4_npc.c b/src/world/dead/area_flo/flo_08/flo_08_4_npc.c index 5433e524c0..a6327bc725 100644 --- a/src/world/dead/area_flo/flo_08/flo_08_4_npc.c +++ b/src/world/dead/area_flo/flo_08/flo_08_4_npc.c @@ -162,7 +162,7 @@ StaticNpc N(NpcData_GateFlower) = { .settings = &N(NpcSettings_GateFlower), .pos = { -695.0f, 0.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_GateFlower), .drops = GATE_FLOWER_DROPS, .animations = GATE_FLOWER_YELLOW_ANIMS, @@ -174,7 +174,7 @@ StaticNpc N(NpcData_Dayzee_01) = { .settings = &N(NpcSettings_CrazyDayzee), .pos = { 205.0f, 0.0f, -80.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { @@ -197,7 +197,7 @@ StaticNpc N(NpcData_Dayzee_02) = { .settings = &N(NpcSettings_CrazyDayzee), .pos = { 275.0f, 0.0f, -115.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { @@ -220,7 +220,7 @@ StaticNpc N(NpcData_Dayzee_03) = { .settings = &N(NpcSettings_CrazyDayzee), .pos = { -230.0f, 60.0f, -110.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { @@ -243,7 +243,7 @@ StaticNpc N(NpcData_Dayzee_04) = { .settings = &N(NpcSettings_CrazyDayzee), .pos = { -330.0f, 60.0f, -110.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { @@ -266,7 +266,7 @@ StaticNpc N(NpcData_Dayzee_05) = { .settings = &N(NpcSettings_CrazyDayzee), .pos = { -430.0f, 60.0f, -110.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { @@ -289,7 +289,7 @@ StaticNpc N(NpcData_Dayzee_06) = { .settings = &N(NpcSettings_CrazyDayzee), .pos = { -530.0f, 60.0f, -110.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { @@ -312,7 +312,7 @@ StaticNpc N(NpcData_Dayzee_07) = { .settings = &N(NpcSettings_CrazyDayzee), .pos = { -630.0f, 60.0f, -110.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { @@ -356,7 +356,7 @@ StaticNpc N(NpcData_AmazyDayzee) = { .settings = &N(NpcSettings_AmazyDayzee), .pos = { 240.0f, 0.0f, -90.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_AmazyDayzee), .drops = AMAZY_DAYZEE_DROPS, .territory = { diff --git a/src/world/dead/area_flo/flo_09/flo_09_5_npc.c b/src/world/dead/area_flo/flo_09/flo_09_5_npc.c index 0f9f4bd553..b7f90e075c 100644 --- a/src/world/dead/area_flo/flo_09/flo_09_5_npc.c +++ b/src/world/dead/area_flo/flo_09/flo_09_5_npc.c @@ -63,7 +63,7 @@ StaticNpc N(NpcData_Dayzee_01) = { .settings = &N(NpcSettings_CrazyDayzee), .pos = { -350.0f, 0.0f, 40.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { @@ -86,7 +86,7 @@ StaticNpc N(NpcData_Dayzee_02) = { .settings = &N(NpcSettings_CrazyDayzee), .pos = { 260.0f, 0.0f, 75.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = CRAZY_DAYZEE_DROPS, .territory = { .wander = { @@ -109,7 +109,7 @@ StaticNpc N(NpcData_Bzzap_01) = { .settings = &N(NpcSettings_Bzzap), .pos = { -50.0f, 55.0f, 90.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .drops = BZZAP_DROPS, .territory = { .wander = { @@ -132,7 +132,7 @@ StaticNpc N(NpcData_Bzzap_02) = { .settings = &N(NpcSettings_Bzzap_02), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Bzzap_02), .drops = BZZAP_DROPS, .territory = { diff --git a/src/world/dead/area_flo/flo_10/flo_10_5_npc.c b/src/world/dead/area_flo/flo_10/flo_10_5_npc.c index 5f07173197..24bf3827e3 100644 --- a/src/world/dead/area_flo/flo_10/flo_10_5_npc.c +++ b/src/world/dead/area_flo/flo_10/flo_10_5_npc.c @@ -158,7 +158,7 @@ EvtScript N(EVS_NpcInteract_Lily) = { EVT_END_SWITCH EVT_WAIT(10) EVT_SET(GF_FLO10_LilyRequestedWaterStone, TRUE) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_400000, 0) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_400000, 0) EVT_ELSE EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Lily_TalkPlead, ANIM_Lily_IdlePlead, 5, MSG_CH6_007F) EVT_END_IF @@ -187,7 +187,7 @@ EvtScript N(EVS_NpcInit_Lily) = { EVT_IF_EQ(GF_FLO10_LilyRequestedWaterStone, FALSE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Lily_IdlePlead) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_400000, 1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_400000, 1) EVT_END_IF EVT_CASE_EQ(STORY_CH6_GOT_WATER_STONE) EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 1) @@ -203,7 +203,7 @@ StaticNpc N(NpcData_Lily) = { .settings = &N(NpcSettings_Lily), .pos = { 80.0f, -60.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lily), .drops = LILY_DROPS, .animations = LILY_ANIMS, diff --git a/src/world/dead/area_flo/flo_11/flo_11_3_npc.c b/src/world/dead/area_flo/flo_11/flo_11_3_npc.c index 7fc31898ac..d37828f560 100644 --- a/src/world/dead/area_flo/flo_11/flo_11_3_npc.c +++ b/src/world/dead/area_flo/flo_11/flo_11_3_npc.c @@ -374,7 +374,7 @@ StaticNpc N(NpcData_Lakitus)[] = { .settings = &N(NpcSettings_Lakitu), .pos = { 553.0f, 60.0f, 52.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_Lakitu_01), .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, @@ -384,7 +384,7 @@ StaticNpc N(NpcData_Lakitus)[] = { .settings = &N(NpcSettings_Lakitu), .pos = { 553.0f, 60.0f, 52.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_Lakitu_02), .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, diff --git a/src/world/dead/area_flo/flo_12/flo_12_3_npc.c b/src/world/dead/area_flo/flo_12/flo_12_3_npc.c index c74a517944..1d223b41e4 100644 --- a/src/world/dead/area_flo/flo_12/flo_12_3_npc.c +++ b/src/world/dead/area_flo/flo_12/flo_12_3_npc.c @@ -194,7 +194,7 @@ StaticNpc N(NpcData_Rosie)[] = { .settings = &N(NpcSettings_Rosie), .pos = { -70.0f, 0.0f, 20.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Rosie), .drops = ROSIE_DROPS, .animations = ROSIE_ANIMS, @@ -205,7 +205,7 @@ StaticNpc N(NpcData_Rosie)[] = { .settings = &N(NpcSettings_Dummy), .pos = { -70.0f, 0.0f, 20.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_200, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_200, .drops = ROSIE_DROPS, .animations = ROSIE_ANIMS, }, diff --git a/src/world/dead/area_flo/flo_13/flo_13_4_npc.c b/src/world/dead/area_flo/flo_13/flo_13_4_npc.c index 7dffde7a50..3545194511 100644 --- a/src/world/dead/area_flo/flo_13/flo_13_4_npc.c +++ b/src/world/dead/area_flo/flo_13/flo_13_4_npc.c @@ -598,10 +598,10 @@ StaticNpc N(NpcData_Lakilester) = { .settings = &N(NpcSettings_Lakilester), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_Lakilester), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -630,10 +630,10 @@ StaticNpc N(NpcData_Lakilulu) = { .settings = &N(NpcSettings_Lakilester), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakilulu), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -663,10 +663,10 @@ StaticNpc N(NpcData_Lakilulu_Spiny) = { .settings = &N(NpcSettings_Lakilester), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakilulu_Spiny), .drops = { - .dropFlags = NPC_DROP_FLAGS_80, + .dropFlags = NPC_DROP_FLAG_80, .heartDrops = NO_DROPS, .flowerDrops = NO_DROPS, }, @@ -695,7 +695,7 @@ StaticNpc N(NpcData_Lakitu_01) = { .settings = &N(NpcSettings_Lakitu_SpinySpawner), .pos = { 335.0f, 90.0f, 45.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakitu), .drops = LAKITU_DROPS, .territory = { @@ -719,7 +719,7 @@ StaticNpc N(NpcData_Lakitu_02) = { .settings = &N(NpcSettings_Lakitu_SpinySpawner), .pos = { -320.0f, 90.0f, 0.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .init = &N(EVS_NpcInit_Lakitu), .drops = LAKITU_DROPS, .territory = { @@ -743,7 +743,7 @@ StaticNpc N(NpcData_Spiny_01) = { .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Spiny), .drops = SPINY_DROPS, .territory = { @@ -767,7 +767,7 @@ StaticNpc N(NpcData_Spiny_02) = { .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Spiny), .drops = SPINY_DROPS, .territory = { @@ -791,7 +791,7 @@ StaticNpc N(NpcData_Spiny_03) = { .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Spiny), .drops = SPINY_DROPS, .territory = { @@ -815,7 +815,7 @@ StaticNpc N(NpcData_Spiny_04) = { .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Spiny), .drops = SPINY_DROPS, .territory = { @@ -839,7 +839,7 @@ StaticNpc N(NpcData_Spiny_05) = { .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Spiny), .drops = SPINY_DROPS, .territory = { @@ -863,7 +863,7 @@ StaticNpc N(NpcData_Spiny_06) = { .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_400, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400, .init = &N(EVS_NpcInit_Spiny), .drops = SPINY_DROPS, .territory = { diff --git a/src/world/dead/area_flo/flo_14/flo_14_4_npc.c b/src/world/dead/area_flo/flo_14/flo_14_4_npc.c index 863d12213c..ecf4a828b4 100644 --- a/src/world/dead/area_flo/flo_14/flo_14_4_npc.c +++ b/src/world/dead/area_flo/flo_14/flo_14_4_npc.c @@ -83,7 +83,7 @@ StaticNpc N(NpcData_BubbleFlower) = { .settings = &N(NpcSettings_BubbleFlower), .pos = { 617.0f, 0.0f, 108.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_4000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_4000, .init = &N(EVS_NpcInit_BubbleFlower), .drops = BUBULB_DROPS, .animations = BUBULB_PINK_ANIMS, @@ -95,7 +95,7 @@ StaticNpc N(NpcData_Bzzap) = { .settings = &N(NpcSettings_Bzzap), .pos = { -175.0f, 55.0f, 15.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = BZZAP_DROPS, .territory = { .wander = { diff --git a/src/world/dead/area_flo/flo_15/flo_15_3_npc.c b/src/world/dead/area_flo/flo_15/flo_15_3_npc.c index ee217c4c61..0e4f94989f 100644 --- a/src/world/dead/area_flo/flo_15/flo_15_3_npc.c +++ b/src/world/dead/area_flo/flo_15/flo_15_3_npc.c @@ -203,7 +203,7 @@ StaticNpc N(NpcData_Sun)[] = { .settings = &N(NpcSettings_Sun), .pos = { 0.0f, 250.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Sun_01), .drops = SUN_DROPS, .animations = SUN_ANIMS, @@ -214,7 +214,7 @@ StaticNpc N(NpcData_Sun)[] = { .settings = &N(NpcSettings_Sun), .pos = { 0.0f, 250.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_8000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_8000, .init = &N(EVS_NpcInit_Sun_02), .drops = SUN_DROPS, .animations = SUN_ANIMS, diff --git a/src/world/dead/area_flo/flo_16/flo_16_5_npc.c b/src/world/dead/area_flo/flo_16/flo_16_5_npc.c index 69d5a6faa3..3c71a63007 100644 --- a/src/world/dead/area_flo/flo_16/flo_16_5_npc.c +++ b/src/world/dead/area_flo/flo_16/flo_16_5_npc.c @@ -8,7 +8,7 @@ StaticNpc N(NpcData_TuffPuff_01) = { .settings = &N(NpcSettings_TuffPuff), .pos = { 440.0f, 145.0f, 15.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = TUFF_PUFF_DROPS, .territory = { .wander = { @@ -31,7 +31,7 @@ StaticNpc N(NpcData_TuffPuff_02) = { .settings = &N(NpcSettings_TuffPuff), .pos = { 600.0f, 145.0f, 15.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = TUFF_PUFF_DROPS, .territory = { .wander = { diff --git a/src/world/dead/area_flo/flo_17/flo_17_4_npc.c b/src/world/dead/area_flo/flo_17/flo_17_4_npc.c index 3da32cbdc7..71f238512c 100644 --- a/src/world/dead/area_flo/flo_17/flo_17_4_npc.c +++ b/src/world/dead/area_flo/flo_17/flo_17_4_npc.c @@ -11,7 +11,7 @@ StaticNpc N(NpcData_Lakitu_01) = { .settings = &N(NpcSettings_Lakitu_SpinySpawner), .pos = { -185.0f, 90.0f, 10.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = LAKITU_DROPS, .territory = { .wander = { @@ -34,7 +34,7 @@ StaticNpc N(NpcData_Lakitu_02) = { .settings = &N(NpcSettings_Lakitu_SpinySpawner), .pos = { 200.0f, 90.0f, -25.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = LAKITU_DROPS, .territory = { .wander = { @@ -57,7 +57,7 @@ StaticNpc N(NpcData_Spiny_01) = { .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = SPINY_DROPS, .territory = { .wander = { @@ -80,7 +80,7 @@ StaticNpc N(NpcData_Spiny_02) = { .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = SPINY_DROPS, .territory = { .wander = { @@ -103,7 +103,7 @@ StaticNpc N(NpcData_Spiny_03) = { .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = SPINY_DROPS, .territory = { .wander = { @@ -126,7 +126,7 @@ StaticNpc N(NpcData_Spiny_04) = { .settings = &N(NpcSettings_SpawnedSpiny), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = SPINY_DROPS, .territory = { .wander = { diff --git a/src/world/dead/area_flo/flo_18/flo_18_4_npc.c b/src/world/dead/area_flo/flo_18/flo_18_4_npc.c index baa8269f88..b664c348dc 100644 --- a/src/world/dead/area_flo/flo_18/flo_18_4_npc.c +++ b/src/world/dead/area_flo/flo_18/flo_18_4_npc.c @@ -603,7 +603,7 @@ StaticNpc N(NpcData_MachineGang)[] = { .settings = &N(NpcSettings_Lakitu), .pos = { 0.0f, 15.0f, 60.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Lakitu_01), .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, @@ -614,7 +614,7 @@ StaticNpc N(NpcData_MachineGang)[] = { .settings = &N(NpcSettings_Lakitu), .pos = { 65.0f, 15.0f, 60.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Lakitu_02), .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, @@ -625,7 +625,7 @@ StaticNpc N(NpcData_MachineGang)[] = { .settings = &N(NpcSettings_Lakitu), .pos = { 135.0f, 15.0f, 35.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Lakitu_03), .drops = LAKITU_DROPS, .animations = LAKITU_ANIMS, @@ -636,7 +636,7 @@ StaticNpc N(NpcData_MachineGang)[] = { .settings = &N(NpcSettings_Magikoopa), .pos = { -60.0f, 0.0f, 50.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Magikoopa), .drops = MAGIKOOPA_DROPS, .animations = MAGIKOOPA_YELLOW_ANIMS, @@ -647,7 +647,7 @@ StaticNpc N(NpcData_MachineGang)[] = { .settings = &N(NpcSettings_Magikoopa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_FlyingMagikoopa), .drops = MAGIKOOPA_DROPS, .animations = FLYING_MAGIKOOPA_YELLOW_ANIMS, diff --git a/src/world/dead/area_kzn/kzn_11/kzn_11_3_npc.c b/src/world/dead/area_kzn/kzn_11/kzn_11_3_npc.c index 8f2c899cb7..ddf8ba1006 100644 --- a/src/world/dead/area_kzn/kzn_11/kzn_11_3_npc.c +++ b/src/world/dead/area_kzn/kzn_11/kzn_11_3_npc.c @@ -117,7 +117,7 @@ NpcSettings N(NpcSettings_FireBar_01) = { .height = 12, .radius = 20, .ai = &N(EVS_NpcAI_FireBar_01), - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_FireBar_02) = { @@ -125,7 +125,7 @@ NpcSettings N(NpcSettings_FireBar_02) = { .height = 12, .radius = 20, .ai = &N(EVS_NpcAI_FireBar_02), - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_FireBar_03) = { @@ -133,14 +133,14 @@ NpcSettings N(NpcSettings_FireBar_03) = { .height = 12, .radius = 20, .ai = &N(EVS_NpcAI_FireBar_03), - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; NpcSettings N(NpcSettings_FireBar_Extra) = { .defaultAnim = ANIM_Fire_Brighest_Burn, .height = 12, .radius = 20, - .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800, }; StaticNpc N(NpcData_FireBar_01)[] = { @@ -149,7 +149,7 @@ StaticNpc N(NpcData_FireBar_01)[] = { .settings = &N(NpcSettings_FireBar_01), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -159,7 +159,7 @@ StaticNpc N(NpcData_FireBar_01)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -169,7 +169,7 @@ StaticNpc N(NpcData_FireBar_01)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -179,7 +179,7 @@ StaticNpc N(NpcData_FireBar_01)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -192,7 +192,7 @@ StaticNpc N(NpcData_FireBar_02)[] = { .settings = &N(NpcSettings_FireBar_02), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -202,7 +202,7 @@ StaticNpc N(NpcData_FireBar_02)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -212,7 +212,7 @@ StaticNpc N(NpcData_FireBar_02)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -222,7 +222,7 @@ StaticNpc N(NpcData_FireBar_02)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -235,7 +235,7 @@ StaticNpc N(NpcData_FireBar_03)[] = { .settings = &N(NpcSettings_FireBar_03), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -245,7 +245,7 @@ StaticNpc N(NpcData_FireBar_03)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -255,7 +255,7 @@ StaticNpc N(NpcData_FireBar_03)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -265,7 +265,7 @@ StaticNpc N(NpcData_FireBar_03)[] = { .settings = &N(NpcSettings_FireBar_Extra), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAGS_1, + .flags = ENEMY_FLAG_1, .init = (void*) 0x00004003, .animations = { }, @@ -277,7 +277,7 @@ StaticNpc N(NpcData_Bubble_01) = { .settings = &N(NpcSettings_LavaBubble), .pos = { -150.0f, 50.0f, 10.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = LAVA_BUBBLE_DROPS, .territory = { .wander = { @@ -300,7 +300,7 @@ StaticNpc N(NpcData_Bubble_02) = { .settings = &N(NpcSettings_LavaBubble), .pos = { 150.0f, 50.0f, 10.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = LAVA_BUBBLE_DROPS, .territory = { .wander = { diff --git a/src/world/dead/area_kzn/kzn_17/kzn_17_3_npc.c b/src/world/dead/area_kzn/kzn_17/kzn_17_3_npc.c index 067e761482..4aa8e60e3e 100644 --- a/src/world/dead/area_kzn/kzn_17/kzn_17_3_npc.c +++ b/src/world/dead/area_kzn/kzn_17/kzn_17_3_npc.c @@ -41,7 +41,7 @@ EvtScript N(EVS_Kolorado_TrompPanic) = { }; EvtScript N(EVS_Kolorado_TrompImpact) = { - EVT_CALL(SetEnemyFlagBits, NPC_Kolorado, ENEMY_FLAGS_400000, 1) + EVT_CALL(SetEnemyFlagBits, NPC_Kolorado, ENEMY_FLAG_400000, 1) EVT_CALL(func_802CDE68, 0, 13) EVT_CALL(SetNpcRotation, NPC_Kolorado, 0, 0, 250) EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_HurtStill) @@ -66,7 +66,7 @@ EvtScript N(EVS_Kolorado_TrompImpact) = { EvtScript N(EVS_Kolorado_HurtInit) = { EVT_CALL(SetNpcPos, NPC_Kolorado, 447, 0, 70) EVT_CALL(SetNpcYaw, NPC_Kolorado, 270) - EVT_CALL(SetEnemyFlagBits, NPC_Kolorado, ENEMY_FLAGS_400000, 1) + EVT_CALL(SetEnemyFlagBits, NPC_Kolorado, ENEMY_FLAG_400000, 1) EVT_CALL(func_802CDE68, 0, 13) EVT_CALL(SetNpcRotation, NPC_Kolorado, 0, 0, 250) EVT_CALL(SetNpcAnimation, NPC_Kolorado, ANIM_Kolorado_HurtStill) @@ -138,7 +138,7 @@ StaticNpc N(NpcData_Kolorado) = { .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kolorado), .drops = KOLORADO_DROPS, .animations = KOLORADO_ANIMS, @@ -151,7 +151,7 @@ StaticNpc N(NpcData_Piranha)[] = { .settings = &N(NpcSettings_PutridPiranha), .pos = { -325.0f, 0.0f, 150.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = PUTRID_PIRANHA_DROPS, .territory = { .wander = { @@ -176,7 +176,7 @@ StaticNpc N(NpcData_SpikeTop) = { .settings = &N(NpcSettings_SpikeTop), .pos = { -450.0f, 0.0f, 100.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, .drops = SPIKE_TOP_DROPS, .territory = { .wander = { diff --git a/src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c b/src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c index 88d71a6c81..ea3faea876 100644 --- a/src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c +++ b/src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c @@ -148,7 +148,7 @@ StaticNpc N(NpcData_Kolorado) = { .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Kolorado), .drops = KOLORADO_DROPS, .animations = KOLORADO_ANIMS, @@ -160,7 +160,7 @@ StaticNpc N(NpcData_Piranha) = { .settings = &N(NpcSettings_PutridPiranhaSentinel), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_200000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Piranha), .drops = PIRANHA_SENTINEL_DROPS, .animations = PIRANHA_SENTINEL_ANIMS, diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c b/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c index 3d036d7ecd..2c57961343 100644 --- a/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c +++ b/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c @@ -624,22 +624,22 @@ EvtScript N(EVS_NpcIdle_LavaPiranha) = { EVT_CALL(N(LoadAnimationFromTable), VINE_0, 0) EVT_CALL(PlayModelAnimation, VINE_0, VINE_0_BASE) EVT_CALL(SetAnimatedModelRootPosition, VINE_0, 220, -100, -40) - EVT_CALL(SetAnimatorFlags, VINE_0, MODEL_ANIMATOR_FLAGS_HIDDEN, 1) + EVT_CALL(SetAnimatorFlags, VINE_0, MODEL_ANIMATOR_FLAG_HIDDEN, 1) EVT_CALL(LoadAnimatedModel, VINE_1, EVT_PTR(N(AnimModel_SideHeadVine))) EVT_CALL(N(LoadAnimationFromTable), VINE_1, 31) EVT_CALL(PlayModelAnimation, VINE_1, VINE_1_BASE) EVT_CALL(SetAnimatedModelRootPosition, VINE_1, 220, -100, -40) - EVT_CALL(SetAnimatorFlags, VINE_1, MODEL_ANIMATOR_FLAGS_HIDDEN, 1) + EVT_CALL(SetAnimatorFlags, VINE_1, MODEL_ANIMATOR_FLAG_HIDDEN, 1) EVT_CALL(LoadAnimatedModel, VINE_2, EVT_PTR(N(AnimModel_SideHeadVine))) EVT_CALL(N(LoadAnimationFromTable), VINE_2, 31) EVT_CALL(PlayModelAnimation, VINE_2, VINE_2_BASE) EVT_CALL(SetAnimatedModelRootPosition, VINE_2, 270, -100, -20) - EVT_CALL(SetAnimatorFlags, VINE_2, MODEL_ANIMATOR_FLAGS_HIDDEN, 1) + EVT_CALL(SetAnimatorFlags, VINE_2, MODEL_ANIMATOR_FLAG_HIDDEN, 1) EVT_CALL(LoadAnimatedModel, VINE_3, EVT_PTR(N(AnimModel_ExtraVine))) EVT_CALL(N(LoadAnimationFromTable), VINE_3, 34) EVT_CALL(PlayModelAnimation, VINE_3, VINE_3_BASE) EVT_CALL(SetAnimatedModelRootPosition, VINE_3, 220, -100, -40) - EVT_CALL(SetAnimatorFlags, VINE_3, MODEL_ANIMATOR_FLAGS_HIDDEN, 1) + EVT_CALL(SetAnimatorFlags, VINE_3, MODEL_ANIMATOR_FLAG_HIDDEN, 1) EVT_CALL(N(CreateVineRenderer)) EVT_CALL(SetSelfVar, 1, 1) EVT_CALL(InterpPlayerYaw, 90, 0) @@ -906,7 +906,7 @@ EvtScript N(EVS_NpcDefeat_LavaPiranha) = { EVT_CALL(GetBattleOutcome, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(OUTCOME_PLAYER_WON) - EVT_CALL(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAGS_2, TRUE) + EVT_CALL(SetEncounterStatusFlags, ENCOUNTER_STATUS_FLAG_2, TRUE) EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) EVT_CALL(SetPlayerPos, 125, 25, -35) EVT_CALL(SetNpcPos, NPC_PARTNER, 100, 25, -35) @@ -983,7 +983,7 @@ StaticNpc N(NpcData_Kolorado) = { .settings = &N(NpcSettings_Kolorado), .pos = { 380.0f, 250.0f, -330.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kolorado), .drops = KOLORADO_DROPS, .animations = KOLORADO_ANIMS, @@ -995,7 +995,7 @@ StaticNpc N(NpcData_Misstar) = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_400000, .drops = MISSTAR_DROPS, .animations = MISSTAR_ANIMS, .tattle = MSG_NpcTattle_Misstar, @@ -1018,7 +1018,7 @@ StaticNpc N(NpcData_LavaPiranha)[] = { .settings = &N(NpcSettings_LavaPiranhaHead), .pos = { 400.0f, 25.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_800 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_LavaPiranha), .drops = LAVA_PIRANHA_DROPS, .animations = LAVA_PIRANHA_HEAD_ANIMS, @@ -1030,7 +1030,7 @@ StaticNpc N(NpcData_LavaPiranha)[] = { .settings = &N(NpcSettings_LavaPiranhaHead), .pos = { 400.0f, 25.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_LavaBud), .drops = LAVA_PIRANHA_DROPS, .animations = LAVA_PIRANHA_BUD_ANIMS, @@ -1042,7 +1042,7 @@ StaticNpc N(NpcData_LavaPiranha)[] = { .settings = &N(NpcSettings_LavaPiranhaHead), .pos = { 400.0f, 25.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_40000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_4 | ENEMY_FLAG_40000, .init = &N(EVS_NpcInit_LavaBud), .drops = LAVA_PIRANHA_DROPS, .animations = LAVA_PIRANHA_BUD_ANIMS, diff --git a/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c b/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c index 99a0eb85f1..bef7a7c744 100644 --- a/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c +++ b/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c @@ -530,7 +530,7 @@ StaticNpc N(NpcData_Kolorado) = { .settings = &N(NpcSettings_Kolorado), .pos = { -65.0f, 0.0f, 190.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kolorado), .drops = KOLORADO_DROPS, .animations = KOLORADO_ANIMS, @@ -542,7 +542,7 @@ StaticNpc N(NpcData_Misstar) = { .settings = &N(NpcSettings_StarSpirit), .pos = { 100.0f, 160.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_400000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Misstar), .drops = MISSTAR_DROPS, .animations = MISSTAR_ANIMS, diff --git a/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c b/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c index ca52154877..406c97759b 100644 --- a/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c +++ b/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c @@ -267,7 +267,7 @@ StaticNpc N(NpcData_Kolorado) = { .settings = &N(NpcSettings_Kolorado), .pos = { 445.0f, 150.0f, 175.0f }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Kolorado), .drops = KOLORADO_DROPS, .animations = KOLORADO_ANIMS, @@ -279,7 +279,7 @@ StaticNpc N(NpcData_Misstar) = { .settings = &N(NpcSettings_StarSpirit), .pos = { 285.0f, 160.0f, 80.0f }, .yaw = 270, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Misstar), .drops = MISSTAR_DROPS, .animations = MISSTAR_ANIMS, diff --git a/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c b/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c index c7f485e4c7..ad287a6438 100644 --- a/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c +++ b/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c @@ -280,7 +280,7 @@ StaticNpc N(NpcData_Kolorado) = { .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000, + .flags = ENEMY_FLAG_1 | ENEMY_FLAG_8 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Kolorado), .drops = KOLORADO_DROPS, .animations = KOLORADO_ANIMS, @@ -292,7 +292,7 @@ StaticNpc N(NpcData_Misstar) = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000, + .flags = ENEMY_FLAG_4 | ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000, .init = &N(EVS_NpcInit_Misstar), .drops = MISSTAR_DROPS, .animations = MISSTAR_ANIMS, diff --git a/src/world/partner/bombette.c b/src/world/partner/bombette.c index cb80acc98e..71636012d8 100644 --- a/src/world/partner/bombette.c +++ b/src/world/partner/bombette.c @@ -226,7 +226,7 @@ ApiStatus func_802BD758_3184A8(Evt *evt, s32 isInitialCall) { switch (evt->functionTemp[0]) { case 20: - if ((playerStatus->inputEnabledCounter != 0) || (playerStatus->flags & PS_FLAGS_JUMPING) || !(npc->flags & NPC_FLAG_1000)) { + if ((playerStatus->inputEnabledCounter != 0) || (playerStatus->flags & PS_FLAG_JUMPING) || !(npc->flags & NPC_FLAG_1000)) { return ApiStatus_DONE2; } disable_player_input(); @@ -250,7 +250,7 @@ ApiStatus func_802BD758_3184A8(Evt *evt, s32 isInitialCall) { evt->functionTemp[0] = 7; break; } - if (playerStatus->flags & PS_FLAGS_JUMPING) { + if (playerStatus->flags & PS_FLAG_JUMPING) { evt->functionTemp[0] = 7; break; } @@ -309,7 +309,7 @@ ApiStatus func_802BD758_3184A8(Evt *evt, s32 isInitialCall) { evt->functionTemp[0] = 2; evt->functionTemp[1] = 50; case 2: - if ((playerStatus->animFlags & PA_FLAGS_INTERRUPT_USE_PARTNER) || (playerStatus->actionState == ACTION_STATE_HIT_FIRE || playerStatus->actionState == ACTION_STATE_KNOCKBACK)) { + if ((playerStatus->animFlags & PA_FLAG_INTERRUPT_USE_PARTNER) || (playerStatus->actionState == ACTION_STATE_HIT_FIRE || playerStatus->actionState == ACTION_STATE_KNOCKBACK)) { evt->functionTemp[0] = 7; break; } @@ -621,7 +621,7 @@ void world_bombette_pre_battle(Npc* bombette) { } D_802BE928 = 0; - playerStatus->flags &= ~PS_FLAGS_JUMPING; + playerStatus->flags &= ~PS_FLAG_JUMPING; bombette->jumpVelocity = 0.0f; bombette->flags &= ~NPC_FLAG_JUMPING; diff --git a/src/world/partner/bow.c b/src/world/partner/bow.c index 2699f06e70..9571e27d5b 100644 --- a/src/world/partner/bow.c +++ b/src/world/partner/bow.c @@ -164,10 +164,10 @@ ApiStatus BowUseAbility(Evt* script, s32 isInitialCall) { if (isInitialCall) { func_802BD4FC_323E4C(bow); - if (!(playerStatus->animFlags & PA_FLAGS_CHANGING_MAP)) { + if (!(playerStatus->animFlags & PA_FLAG_CHANGING_MAP)) { if (func_800EA52C(PARTNER_BOW)) { - if (playerStatus->animFlags & PA_FLAGS_PARTNER_USAGE_FORCED) { - playerStatus->animFlags &= ~PA_FLAGS_PARTNER_USAGE_FORCED; + if (playerStatus->animFlags & PA_FLAG_PARTNER_USAGE_FORCED) { + playerStatus->animFlags &= ~PA_FLAG_PARTNER_USAGE_FORCED; script->functionTemp[2] = disable_player_input(); D_802BE0C4 = TRUE; script->functionTemp[0] = 20; @@ -188,7 +188,7 @@ ApiStatus BowUseAbility(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - playerStatus->flags |= PS_FLAGS_PAUSE_DISABLED; + playerStatus->flags |= PS_FLAG_PAUSE_DISABLED; script->functionTemp[1] = 3; script->functionTemp[2] = disable_player_input(); D_802BE0C4 = TRUE; @@ -201,7 +201,7 @@ ApiStatus BowUseAbility(Evt* script, s32 isInitialCall) { enable_player_input(); D_802BE0C4 = FALSE; - playerStatus->flags &= ~PS_FLAGS_PAUSE_DISABLED; + playerStatus->flags &= ~PS_FLAG_PAUSE_DISABLED; return ApiStatus_DONE2; } script->functionTemp[1]--; @@ -211,7 +211,7 @@ ApiStatus BowUseAbility(Evt* script, s32 isInitialCall) { enable_player_input(); D_802BE0C4 = FALSE; } - playerStatus->flags &= ~PS_FLAGS_PAUSE_DISABLED; + playerStatus->flags &= ~PS_FLAG_PAUSE_DISABLED; return ApiStatus_DONE2; } script->functionTemp[0] = 20; @@ -221,8 +221,8 @@ ApiStatus BowUseAbility(Evt* script, s32 isInitialCall) { switch (script->functionTemp[0]) { case 20: - if (playerStatus->flags & PS_FLAGS_HIT_FIRE) { - playerStatus->flags &= ~PS_FLAGS_PAUSE_DISABLED; + if (playerStatus->flags & PS_FLAG_HIT_FIRE) { + playerStatus->flags &= ~PS_FLAG_PAUSE_DISABLED; if (D_802BE0C4) { enable_player_input(); D_802BE0C4 = FALSE; @@ -237,7 +237,7 @@ ApiStatus BowUseAbility(Evt* script, s32 isInitialCall) { bow->flags &= ~(NPC_FLAG_JUMPING | NPC_FLAG_GRAVITY); partnerActionStatus->partnerActionState = 1; partnerActionStatus->actingPartner = 9; - playerStatus->flags |= PS_FLAGS_HAZARD_INVINCIBILITY; + playerStatus->flags |= PS_FLAG_HAZARD_INVINCIBILITY; func_800EF4E0(); bow->moveToPos.x = playerStatus->position.x; bow->moveToPos.y = playerStatus->position.y + (playerStatus->colliderHeight * 0.5f); @@ -254,7 +254,7 @@ ApiStatus BowUseAbility(Evt* script, s32 isInitialCall) { script->functionTemp[0]++; break; case 21: - if (collisionStatus->currentFloor >= 0 && !(playerStatus->animFlags & PA_FLAGS_CHANGING_MAP)) { + if (collisionStatus->currentFloor >= 0 && !(playerStatus->animFlags & PA_FLAG_CHANGING_MAP)) { bow->moveToPos.x = playerStatus->position.x; bow->moveToPos.y = playerStatus->position.y + (playerStatus->colliderHeight * 0.5f); bow->moveToPos.z = playerStatus->position.z; @@ -284,7 +284,7 @@ ApiStatus BowUseAbility(Evt* script, s32 isInitialCall) { playerStatus->alpha1 = 128; bow->renderMode = RENDER_MODE_SURFACE_XLU_LAYER2; script->functionTemp[0]++; - playerStatus->flags &= ~PS_FLAGS_PAUSE_DISABLED; + playerStatus->flags &= ~PS_FLAG_PAUSE_DISABLED; bow->flags |= NPC_FLAG_40; } @@ -311,7 +311,7 @@ ApiStatus BowUseAbility(Evt* script, s32 isInitialCall) { distance = dist2D(0.0f, 0.0f, partnerActionStatus->stickX, partnerActionStatus->stickY); if ((collisionStatus->currentFloor < 0) || distance > 10.0f || partnerActionStatus->pressedButtons & (BUTTON_B | BUTTON_C_DOWN) || - playerStatus->flags & PS_FLAGS_HIT_FIRE) { + playerStatus->flags & PS_FLAG_HIT_FIRE) { if (func_802BD540_323E90() < 0) { script->functionTemp[0]++; script->functionTemp[1] = 3; @@ -357,19 +357,19 @@ void func_802BDDF0_324740(Npc* bow) { enable_player_input(); } - playerStatus->flags &= ~(PS_FLAGS_HAZARD_INVINCIBILITY | PS_FLAGS_JUMPING); + playerStatus->flags &= ~(PS_FLAG_HAZARD_INVINCIBILITY | PS_FLAG_JUMPING); bow->flags &= ~(NPC_FLAG_40 | NPC_FLAG_2); D_802BE0C4 = FALSE; actionState = ACTION_STATE_IDLE; - if (playerStatus->flags & PS_FLAGS_HIT_FIRE) { + if (playerStatus->flags & PS_FLAG_HIT_FIRE) { actionState = ACTION_STATE_HIT_LAVA; } set_action_state(actionState); partnerActionStatus->partnerActionState = 0; partnerActionStatus->actingPartner = 0; - playerStatus->flags &= ~PS_FLAGS_PAUSE_DISABLED; + playerStatus->flags &= ~PS_FLAG_PAUSE_DISABLED; partner_clear_player_tracking(bow); D_802BE0C0 = FALSE; } diff --git a/src/world/partner/goombario.c b/src/world/partner/goombario.c index 1804172de4..9f904f72ed 100644 --- a/src/world/partner/goombario.c +++ b/src/world/partner/goombario.c @@ -235,11 +235,11 @@ ApiStatus func_802BD5D8_3174F8(Evt* script, s32 isInitialCall) { D_802BDF64 = 0; D_802BDF30 = 0; D_802BDF34 = 0; - if (playerStatus->animFlags & PA_FLAGS_SPEECH_PROMPT_AVAILABLE) { + if (playerStatus->animFlags & PA_FLAG_SPEECH_PROMPT_AVAILABLE) { D_802BDF30 = 1; D_802BDF38 = D_802B79A8_E21858->unk_00; } - if (playerStatus->animFlags & PA_FLAGS_INTERACT_PROMPT_AVAILABLE) { + if (playerStatus->animFlags & PA_FLAG_INTERACT_PROMPT_AVAILABLE) { D_802BDF34 = 1; } script->functionTemp[0] = 40; @@ -272,7 +272,7 @@ ApiStatus func_802BD5D8_3174F8(Evt* script, s32 isInitialCall) { break; case 0: set_time_freeze_mode(1); - playerStatus->flags &= ~PS_FLAGS_HAS_CONVERSATION_NPC; + playerStatus->flags &= ~PS_FLAG_HAS_CONVERSATION_NPC; goombario->currentAnim = 0x010001; goombario->yaw = clamp_angle(gCameras[CAM_DEFAULT].currentYaw + playerStatus->spriteFacingAngle - 90.0f); gPartnerActionStatus.partnerActionState = 1; diff --git a/src/world/partner/kooper.c b/src/world/partner/kooper.c index 84f922e6cb..21061bbb8f 100644 --- a/src/world/partner/kooper.c +++ b/src/world/partner/kooper.c @@ -51,7 +51,7 @@ s32 func_802BD17C_31B19C(Npc* kooper) { } else { D_802BEC6C = 1; gOverrideFlags |= GLOBAL_OVERRIDES_40; - set_item_entity_flags(D_802BEC68, ITEM_ENTITY_FLAGS_200000); + set_item_entity_flags(D_802BEC68, ITEM_ENTITY_FLAG_200000); return 1; } } @@ -200,7 +200,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { if (currentEncounter->unk_08 == 0) { if (isInitialCall) { func_802BD5F4_31B614(kooper); - if (playerStatus->animFlags & PA_FLAGS_CHANGING_MAP) { + if (playerStatus->animFlags & PA_FLAG_CHANGING_MAP) { return ApiStatus_DONE2; } @@ -278,7 +278,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { } disable_npc_blur(kooper); if (script->functionTemp[2] < playerStatus->inputEnabledCounter) { - if (!(playerStatus->animFlags & PA_FLAGS_CHANGING_MAP)) { + if (!(playerStatus->animFlags & PA_FLAG_CHANGING_MAP)) { suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); } else { suggest_player_anim_clearUnkFlag(ANIM_Mario_Running); @@ -294,7 +294,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { kooper->moveToPos.y = playerStatus->position.y; kooper->moveToPos.z = playerStatus->position.y + playerStatus->colliderHeight / 3; - playerStatus->flags |= PS_FLAGS_JUMPING; + playerStatus->flags |= PS_FLAG_JUMPING; gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_IGNORE_PLAYER_Y; suggest_player_anim_clearUnkFlag(ANIM_Mario_AnimMidairStill); @@ -405,7 +405,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { kooper->moveSpeed = 14.0f; } - if (!(func_800397E8(kooper, 6.0f) || playerStatus->flags & (PS_FLAGS_JUMPING | PS_FLAGS_FALLING))) { + if (!(func_800397E8(kooper, 6.0f) || playerStatus->flags & (PS_FLAG_JUMPING | PS_FLAG_FALLING))) { kooper->pos.y = (kooper->pos.y + ((playerStatus->position.y - kooper->pos.y) / 10.0f)); } @@ -694,7 +694,7 @@ void world_kooper_pre_battle(Npc* kooper) { } D_802BEB40_31CB60 = 0; - playerStatus->flags &= ~PS_FLAGS_JUMPING; + playerStatus->flags &= ~PS_FLAG_JUMPING; kooper->jumpVelocity = 0.0f; kooper->flags &= ~NPC_FLAG_JUMPING; diff --git a/src/world/partner/lakilester.c b/src/world/partner/lakilester.c index 77c4ad1641..37bc6d2c02 100644 --- a/src/world/partner/lakilester.c +++ b/src/world/partner/lakilester.c @@ -27,9 +27,9 @@ void func_802BD100_320C50(void) { f32 playerSpeedCopy; s32 temp_v0_2; - if (playerFlags & PS_FLAGS_CUTSCENE_MOVEMENT) { + if (playerFlags & PS_FLAG_CUTSCENE_MOVEMENT) { playerSpeedCopy = playerStatus->currentSpeed; - if (playerFlags & PS_FLAGS_ENTERING_BATTLE) { + if (playerFlags & PS_FLAG_ENTERING_BATTLE) { playerSpeedCopy *= 0.5f; } @@ -208,8 +208,8 @@ s32 lakilester_raycast_below(void) { s32 raycastResult; s32 ret; - if (playerStatus->animFlags & PA_FLAGS_DISMOUNTING_ALLOWED) { - playerStatus->animFlags &= ~PA_FLAGS_DISMOUNTING_ALLOWED; + if (playerStatus->animFlags & PA_FLAG_DISMOUNTING_ALLOWED) { + playerStatus->animFlags &= ~PA_FLAG_DISMOUNTING_ALLOWED; return TRUE; } @@ -547,20 +547,20 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { f32 yaw, camYaw; s32 i; - playerStatus->animFlags &= ~PA_FLAGS_RIDING_PARTNER; + playerStatus->animFlags &= ~PA_FLAG_RIDING_PARTNER; if (isInitialCall) { func_802BD678_3211C8(npc); - if (!(playerStatus->animFlags & PA_FLAGS_CHANGING_MAP)) { - npc->flags = npc->flags & ~PA_FLAGS_40; + if (!(playerStatus->animFlags & PA_FLAG_CHANGING_MAP)) { + npc->flags = npc->flags & ~PA_FLAG_40; npc->moveToPos.x = npc->pos.x; npc->moveToPos.y = npc->pos.y; npc->moveToPos.z = npc->pos.z; if (gGameStatusPtr->keepUsingPartnerOnMapChange || - (playerStatus->animFlags & PA_FLAGS_PARTNER_USAGE_FORCED)) { - if (playerStatus->animFlags & PA_FLAGS_PARTNER_USAGE_FORCED) { - playerStatus->animFlags &= ~PA_FLAGS_PARTNER_USAGE_FORCED; + (playerStatus->animFlags & PA_FLAG_PARTNER_USAGE_FORCED)) { + if (playerStatus->animFlags & PA_FLAG_PARTNER_USAGE_FORCED) { + playerStatus->animFlags &= ~PA_FLAG_PARTNER_USAGE_FORCED; } D_802BFF14 = 100; } else { @@ -575,14 +575,14 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { playerStatus->actionState == ACTION_STATE_RUN || playerStatus->actionState == ACTION_STATE_FALLING) { - playerStatus->flags |= PS_FLAGS_PAUSE_DISABLED; + playerStatus->flags |= PS_FLAG_PAUSE_DISABLED; } else { return ApiStatus_DONE2; } } } else { partnerActionStatus->partnerAction_unk_1 = 0; - playerStatus->flags &= ~PS_FLAGS_PAUSE_DISABLED; + playerStatus->flags &= ~PS_FLAG_PAUSE_DISABLED; npc->flags &= ~(NPC_FLAG_40 | NPC_FLAG_ENABLE_HIT_SCRIPT); npc->flags |= NPC_FLAG_100; set_action_state(ACTION_STATE_RIDE); @@ -623,10 +623,10 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { switch (D_802BFF14) { case 40: - if (playerStatus->flags & PS_FLAGS_HIT_FIRE || + if (playerStatus->flags & PS_FLAG_HIT_FIRE || playerStatus->inputEnabledCounter) { - playerStatus->flags &= ~PS_FLAGS_PAUSE_DISABLED; + playerStatus->flags &= ~PS_FLAG_PAUSE_DISABLED; return ApiStatus_DONE2; } script->functionTemp[1] = 3; @@ -635,8 +635,8 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { D_802BFF14 += 1; break; case 41: - if (playerStatus->flags & PS_FLAGS_HIT_FIRE) { - playerStatus->flags &= ~PS_FLAGS_PAUSE_DISABLED; + if (playerStatus->flags & PS_FLAG_HIT_FIRE) { + playerStatus->flags &= ~PS_FLAG_PAUSE_DISABLED; if (D_802BFF04 != 0) { enable_player_input(); D_802BFF04 = 0; @@ -644,12 +644,12 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - if (playerStatus->animFlags & PA_FLAGS_CHANGING_MAP) { + if (playerStatus->animFlags & PA_FLAG_CHANGING_MAP) { if (script->functionTemp[2] < playerStatus->inputEnabledCounter) { enable_player_input(); D_802BFF04 = 0; } - playerStatus->flags &= ~PS_FLAGS_PAUSE_DISABLED; + playerStatus->flags &= ~PS_FLAG_PAUSE_DISABLED; return ApiStatus_DONE2; } @@ -657,7 +657,7 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { if (script->functionTemp[2] < playerStatus->inputEnabledCounter) { enable_player_input(); D_802BFF04 = 0; - playerStatus->flags &= ~PS_FLAGS_PAUSE_DISABLED; + playerStatus->flags &= ~PS_FLAG_PAUSE_DISABLED; return ApiStatus_DONE2; } D_802BFF14 = 100; @@ -715,7 +715,7 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { D_802BFF14++; /* fallthrough */ case 103: - if (!(playerStatus->flags & PS_FLAGS_HIT_FIRE)) { + if (!(playerStatus->flags & PS_FLAG_HIT_FIRE)) { npc->pos.x += (npc->moveToPos.x - npc->pos.x) / npc->duration; npc->pos.z += (npc->moveToPos.z - npc->pos.z) / npc->duration; npc->pos.y += (npc->moveToPos.y - npc->pos.y) / npc->duration; @@ -748,20 +748,20 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { disable_player_shadow(); partnerActionStatus->actingPartner = PARTNER_LAKILESTER; partnerActionStatus->partnerActionState = PARTNER_ACTION_LAKILESTER_1; - playerStatus->flags &= ~PS_FLAGS_PAUSE_DISABLED; + playerStatus->flags &= ~PS_FLAG_PAUSE_DISABLED; gGameStatusPtr->keepUsingPartnerOnMapChange = 0; D_802BFF18 = 0; D_802BFF0C = 2; func_802BFB44_323694(2.0f); D_802BFF14 = 104; - playerStatus->animFlags |= PA_FLAGS_RIDING_PARTNER; + playerStatus->animFlags |= PA_FLAG_RIDING_PARTNER; } } else { D_802BFF14 = 10; } break; case 104: - if (playerStatus->flags & PS_FLAGS_HIT_FIRE) { + if (playerStatus->flags & PS_FLAG_HIT_FIRE) { D_802BFF14 = 10; break; } else { @@ -778,7 +778,7 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { } case 1: func_802BDDD8_321928(npc); - playerStatus->animFlags |= PA_FLAGS_RIDING_PARTNER; + playerStatus->animFlags |= PA_FLAG_RIDING_PARTNER; D_802BFF18++; npc->pos.y = npc->moveToPos.y + 2.0f; @@ -790,15 +790,15 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { playerStatus->targetYaw = npc->yaw; } - if (!(playerStatus->flags & PS_FLAGS_HIT_FIRE)) { + if (!(playerStatus->flags & PS_FLAG_HIT_FIRE)) { if (partnerActionStatus->pressedButtons & (BUTTON_B | D_CBUTTONS)) { if (lakilester_raycast_below()) { D_802BFF14 = 3; } else { - if (!(playerStatus->animFlags & PA_FLAGS_PARTNER_USAGE_STOPPED)) { + if (!(playerStatus->animFlags & PA_FLAG_PARTNER_USAGE_STOPPED)) { sfx_play_sound_at_npc(SOUND_MENU_ERROR, 0, NPC_PARTNER); } - playerStatus->animFlags &= ~PA_FLAGS_PARTNER_USAGE_STOPPED; + playerStatus->animFlags &= ~PA_FLAG_PARTNER_USAGE_STOPPED; } } } else { @@ -808,7 +808,7 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { break; case 3: npc->flags &= ~NPC_FLAG_40; - playerStatus->flags |= PS_FLAGS_PAUSE_DISABLED; + playerStatus->flags |= PS_FLAG_PAUSE_DISABLED; lakilester_raycast_below(); camYaw = camera->currentYaw; if (playerStatus->spriteFacingAngle >= 90.0f && playerStatus->spriteFacingAngle < 270.0f) { @@ -881,7 +881,7 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { enable_player_shadow(); gGameStatusPtr->keepUsingPartnerOnMapChange = 0; - if (playerStatus->flags & PS_FLAGS_HIT_FIRE) { + if (playerStatus->flags & PS_FLAG_HIT_FIRE) { partnerActionStatus->actingPartner = PARTNER_NONE; partnerActionStatus->partnerActionState = PARTNER_ACTION_NONE; @@ -892,7 +892,7 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { partner_clear_player_tracking(npc); set_action_state(ACTION_STATE_HIT_FIRE); - playerStatus->flags &= ~PS_FLAGS_PAUSE_DISABLED; + playerStatus->flags &= ~PS_FLAG_PAUSE_DISABLED; return ApiStatus_DONE1; } @@ -906,7 +906,7 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { npc->flags &= ~(NPC_FLAG_40 | NPC_FLAG_400000 | NPC_FLAG_ENABLE_HIT_SCRIPT); partnerActionStatus->actingPartner = PARTNER_NONE; partnerActionStatus->partnerActionState = PARTNER_ACTION_NONE; - playerStatus->flags &= ~PS_FLAGS_PAUSE_DISABLED; + playerStatus->flags &= ~PS_FLAG_PAUSE_DISABLED; if (D_802BFF04 != 0) { D_802BFF04 = 0; enable_player_input(); @@ -939,8 +939,8 @@ ApiStatus func_802BF4F0_323040(Evt* script, s32 isInitialCall) { D_802BFF00 = (D_802BFF0C == 0) ? 3 : 0; partner_init_put_away(lakilester); lakilester_raycast_below(); - playerStatus->animFlags &= ~PA_FLAGS_RIDING_PARTNER; - playerStatus->flags |= PS_FLAGS_PAUSE_DISABLED; + playerStatus->animFlags &= ~PA_FLAG_RIDING_PARTNER; + playerStatus->flags |= PS_FLAG_PAUSE_DISABLED; } switch (D_802BFF00) { @@ -979,7 +979,7 @@ ApiStatus func_802BF4F0_323040(Evt* script, s32 isInitialCall) { lakilester->moveSpeed, lakilester->yaw); func_800E4AD8(0); if (lakilester->jumpVelocity <= 0.0f) { - playerStatus->flags |= PS_FLAGS_FALLING; + playerStatus->flags |= PS_FLAG_FALLING; if (lakilester->jumpVelocity < -10.0) { lakilester->jumpVelocity = -10.0f; } @@ -1012,7 +1012,7 @@ ApiStatus func_802BF4F0_323040(Evt* script, s32 isInitialCall) { enable_player_shadow(); - if (playerStatus->flags & PS_FLAGS_HIT_FIRE) { + if (playerStatus->flags & PS_FLAG_HIT_FIRE) { partnerActionStatus->actingPartner = PARTNER_NONE; partnerActionStatus->partnerActionState = PARTNER_ACTION_NONE; if (D_802BFF04) { @@ -1039,7 +1039,7 @@ ApiStatus func_802BF4F0_323040(Evt* script, s32 isInitialCall) { case 4: partnerActionStatus->actingPartner = PARTNER_NONE; partnerActionStatus->partnerActionState = PARTNER_ACTION_NONE; - playerStatus->flags &= ~PS_FLAGS_PAUSE_DISABLED; + playerStatus->flags &= ~PS_FLAG_PAUSE_DISABLED; if (D_802BFF04) { D_802BFF04 = FALSE; @@ -1155,7 +1155,7 @@ s32 func_802BFBA0_3236F0(Evt* script, s32 isInitialCall) { sfx_play_sound_at_npc(SOUND_295, 0, -4); playerStatus->anim = ANIM_Mario_8000E; playerStatus->animNotifyValue = 0; - playerStatus->flags |= PS_FLAGS_FACE_FORWARDS; + playerStatus->flags |= PS_FLAG_FACE_FORWARDS; func_802BFB44_323694(2.0f); gGameStatusPtr->keepUsingPartnerOnMapChange = 1; npc->flags |= NPC_FLAG_100; diff --git a/src/world/partner/parakarry.c b/src/world/partner/parakarry.c index 705a1a430a..c42c68d5b1 100644 --- a/src/world/partner/parakarry.c +++ b/src/world/partner/parakarry.c @@ -155,7 +155,7 @@ s32 func_802BD558_319AC8(void) { if (surfaceType == SURFACE_TYPE_SPIKES || surfaceType == SURFACE_TYPE_LAVA) { gPlayerStatus.hazardType = HAZARD_TYPE_SPIKES; D_802BEBC0_31CBE0 = 0x15; - gPlayerStatus.flags |= PS_FLAGS_HIT_FIRE; + gPlayerStatus.flags |= PS_FLAG_HIT_FIRE; } return raycastResult; @@ -180,7 +180,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { if (gCurrentEncounter.unk_08 == 0) { if (isInitialCall) { func_802BD514_319A84(parakarry); - if (!(playerStatus->animFlags & PA_FLAGS_CHANGING_MAP)) { + if (!(playerStatus->animFlags & PA_FLAG_CHANGING_MAP)) { if (partnerActionStatus->partnerAction_unk_1 == 0) { if (!func_800EA52C(PARTNER_PARAKARRY)) { return ApiStatus_DONE2; @@ -365,7 +365,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { } } - if (testMove == 0 && !(playerStatus->animFlags & PA_FLAGS_NPC_COLLIDED)) { + if (testMove == 0 && !(playerStatus->animFlags & PA_FLAG_NPC_COLLIDED)) { add_vec2D_polar(¶karry->pos.x, ¶karry->pos.z, parakarry->moveSpeed, parakarry->yaw); add_vec2D_polar(&playerStatus->position.x, &playerStatus->position.z, parakarry->moveSpeed, parakarry->yaw); parakarry->planarFlyDist += parakarry->moveSpeed; @@ -380,7 +380,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { if (surfaceType == SURFACE_TYPE_SPIKES || surfaceType == SURFACE_TYPE_LAVA) { playerStatus->hazardType = HAZARD_TYPE_SPIKES; D_802BEBC0_31CBE0 = 0x15; - playerStatus->flags |= PS_FLAGS_HIT_FIRE; + playerStatus->flags |= PS_FLAG_HIT_FIRE; } playerStatus->position.y += (y - playerStatus->position.y) * 0.25f; @@ -415,7 +415,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { gCollisionStatus.currentFloor = func_802BD558_319AC8(); if (playerStatus->actionState != ACTION_STATE_HIT_FIRE && playerStatus->actionState != ACTION_STATE_HIT_LAVA && playerStatus->actionState != ACTION_STATE_KNOCKBACK) { suggest_player_anim_setUnkFlag(ANIM_Mario_8000D); - if (!(playerStatus->flags & PS_FLAGS_HIT_FIRE)) { + if (!(playerStatus->flags & PS_FLAG_HIT_FIRE)) { if (partnerActionStatus->pressedButtons & (BUTTON_A | BUTTON_B | BUTTON_C_DOWN)) { if (partnerActionStatus->pressedButtons & buttonTemp) { // TODO find a way to remove this while still loading 0x15 instead of moving it from register if (!parakarry->pos.x) { @@ -439,7 +439,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { parakarry->pos.y += parakarry->jumpVelocity; playerStatus->position.y += parakarry->jumpVelocity; - if (!(playerStatus->animFlags & PA_FLAGS_NPC_COLLIDED)) { + if (!(playerStatus->animFlags & PA_FLAG_NPC_COLLIDED)) { parakarry->moveSpeed += 0.1; if (parakarry->moveSpeed > 2.0) { parakarry->moveSpeed = 2.0f; @@ -455,7 +455,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { if (parakarry->planarFlyDist > 80.0f) { parakarry->animationSpeed += 0.5; } - if (!(playerStatus->animFlags & PA_FLAGS_NPC_COLLIDED)) { + if (!(playerStatus->animFlags & PA_FLAG_NPC_COLLIDED)) { x = playerStatus->position.x; y = playerStatus->position.y; z = playerStatus->position.z; @@ -492,7 +492,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { func_8003D660(parakarry, 0), parakarry->pos.y = y, (!tempConditional))) { if (!phys_adjust_cam_on_landing()) { - gCameras[0].moveFlags &= ~CAMERA_MOVE_FLAGS_2; + gCameras[0].moveFlags &= ~CAMERA_MOVE_FLAG_2; } gCameras[CAM_DEFAULT].targetPos.x = playerStatus->position.x; gCameras[CAM_DEFAULT].targetPos.y = playerStatus->position.y; @@ -552,13 +552,13 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { if (D_802BEBB8 != 0) { enable_player_static_collisions(); } - if (!(playerStatus->flags & PS_FLAGS_HIT_FIRE)) { + if (!(playerStatus->flags & PS_FLAG_HIT_FIRE)) { if (D_802BEBC0_31CBE0 == 0x14) { start_bounce_b(); } else if (D_802BEBC0_31CBE0 == 0x15) { start_falling(); gravity_use_fall_parms(); - playerStatus->flags |= PS_FLAGS_SCRIPTED_FALL; + playerStatus->flags |= PS_FLAG_SCRIPTED_FALL; } else { set_action_state(ACTION_STATE_IDLE); } diff --git a/src/world/partner/sushie.c b/src/world/partner/sushie.c index e6bdc309c8..7ee156cdad 100644 --- a/src/world/partner/sushie.c +++ b/src/world/partner/sushie.c @@ -354,7 +354,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) { script->functionTemp[0] = 0; } playerData->partnerUsedTime[PARTNER_SUSHIE]++; - playerStatus->animFlags &= ~PA_FLAGS_RIDING_PARTNER; + playerStatus->animFlags &= ~PA_FLAG_RIDING_PARTNER; switch (script->functionTemp[0]) { case 0: @@ -450,7 +450,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) { disable_npc_shadow(npc); func_8003D624(npc, 4, 2, 0, 0, 0, 0); npc->currentAnim = 0x7000A; - playerStatus->flags |= PS_FLAGS_MOVEMENT_LOCKED; + playerStatus->flags |= PS_FLAG_MOVEMENT_LOCKED; dist = dist2D(playerStatus->position.x, playerStatus->position.z, npc->moveToPos.x, npc->moveToPos.z); npc->jumpVelocity = 5.0f; npc->jumpScale = 0.6f; @@ -483,7 +483,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) { if (npc->duration == 0) { set_action_state(ACTION_STATE_RIDE); disable_player_shadow(); - playerStatus->flags &= ~PS_FLAGS_MOVEMENT_LOCKED; + playerStatus->flags &= ~PS_FLAG_MOVEMENT_LOCKED; suggest_player_anim_setUnkFlag(ANIM_Mario_8000F); sfx_play_sound_at_npc(SOUND_2013, 0, NPC_PARTNER); playerStatus->position.x = npc->pos.x; @@ -503,7 +503,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) { } break; case 1: - playerStatus->animFlags |= PA_FLAGS_RIDING_PARTNER; + playerStatus->animFlags |= PA_FLAG_RIDING_PARTNER; func_802BD414_31E184(npc); if (bss_802BFEE4 == 0) { script->functionTemp[2]++; @@ -527,7 +527,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) { } else { npc->pos.y = npc->moveToPos.y; } - if (!(playerStatus->animFlags & PA_FLAGS_RIDING_PARTNER)) { + if (!(playerStatus->animFlags & PA_FLAG_RIDING_PARTNER)) { func_802BD100_31DE70(); } @@ -601,7 +601,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) { sfx_play_sound_at_npc(SOUND_JUMP_2081, 0, NPC_PARTNER); suggest_player_anim_clearUnkFlag(ANIM_Mario_BeforeJump); enable_player_shadow(); - playerStatus->flags |= PS_FLAGS_MOVEMENT_LOCKED; + playerStatus->flags |= PS_FLAG_MOVEMENT_LOCKED; script->functionTemp[0] = 3; } } @@ -636,7 +636,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) { break; } if (collider >= 0) { - playerStatus->flags &= ~PS_FLAGS_MOVEMENT_LOCKED; + playerStatus->flags &= ~PS_FLAG_MOVEMENT_LOCKED; suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); npc->flags |= NPC_FLAG_40; dist = dist2D(npc->pos.x, npc->pos.z, npc->moveToPos.x, npc->moveToPos.z) + @@ -814,7 +814,7 @@ s32 SushiePutAway(Evt* script, s32 isInitialCall) { if (isInitialCall) { partner_init_put_away(sushie); - gPlayerStatusPtr->animFlags &= ~PA_FLAGS_RIDING_PARTNER; + gPlayerStatusPtr->animFlags &= ~PA_FLAG_RIDING_PARTNER; } return partner_put_away(sushie) ? ApiStatus_DONE1 : ApiStatus_BLOCK; diff --git a/src/world/partner/watt.c b/src/world/partner/watt.c index 2ab97f66d7..bb38b64b8e 100644 --- a/src/world/partner/watt.c +++ b/src/world/partner/watt.c @@ -215,18 +215,18 @@ ApiStatus func_802BD754_31D2C4(Evt* script, s32 isInitialCall) { if (isInitialCall) { func_802BD710_31D280(npc); - if (!(playerStatus->animFlags & PA_FLAGS_CHANGING_MAP)) { + if (!(playerStatus->animFlags & PA_FLAG_CHANGING_MAP)) { if (partnerActionStatus->partnerAction_unk_1 == 0) { if ((partnerActionStatus->partnerActionState != ACTION_STATE_IDLE) || (func_800EA52C(PARTNER_WATT) && !is_starting_conversation())) { if (gGameStatusPtr->keepUsingPartnerOnMapChange) { - if (playerStatus->animFlags & (PA_FLAGS_USING_WATT | PA_FLAGS_WATT_IN_HANDS)) { + if (playerStatus->animFlags & (PA_FLAG_USING_WATT | PA_FLAG_WATT_IN_HANDS)) { D_802BE304 = 20; } else { D_802BE304 = 40; } - } else if (playerStatus->animFlags & PA_FLAGS_USING_WATT) { + } else if (playerStatus->animFlags & PA_FLAG_USING_WATT) { D_802BE304 = 2; } else { D_802BE304 = 40; @@ -236,7 +236,7 @@ ApiStatus func_802BD754_31D2C4(Evt* script, s32 isInitialCall) { } } else { partnerActionStatus->partnerAction_unk_1 = 0; - playerStatus->animFlags |= (PA_FLAGS_USING_WATT | PA_FLAGS_WATT_IN_HANDS); + playerStatus->animFlags |= (PA_FLAG_USING_WATT | PA_FLAG_WATT_IN_HANDS); func_802BE014_31DB84(); npc->currentAnim = ANIM_WorldWatt_Idle; D_802BE304 = 1; @@ -259,7 +259,7 @@ ApiStatus func_802BD754_31D2C4(Evt* script, s32 isInitialCall) { case 41: if (script->functionTemp[1] == 0) { if (script->functionTemp[2] >= playerStatus->inputEnabledCounter) { - if (!(playerStatus->animFlags & PA_FLAGS_CHANGING_MAP)) { + if (!(playerStatus->animFlags & PA_FLAG_CHANGING_MAP)) { if (func_800EA52C(PARTNER_WATT)) { if (!is_starting_conversation()) { D_802BE304 = 20; @@ -277,7 +277,7 @@ ApiStatus func_802BD754_31D2C4(Evt* script, s32 isInitialCall) { switch (D_802BE304) { case 20: if (gGameStatusPtr->keepUsingPartnerOnMapChange) { - playerStatus->animFlags |= PA_FLAGS_USING_WATT; + playerStatus->animFlags |= PA_FLAG_USING_WATT; D_802BE30C = 1; npc->flags |= NPC_FLAG_100 | NPC_FLAG_ENABLE_HIT_SCRIPT; npc->flags &= ~(NPC_FLAG_JUMPING | NPC_FLAG_GRAVITY); @@ -291,13 +291,13 @@ ApiStatus func_802BD754_31D2C4(Evt* script, s32 isInitialCall) { add_vec2D_polar(&npc->moveToPos.x, &npc->moveToPos.z, 15.0f, playerStatus->targetYaw); npc->yaw = playerStatus->targetYaw; npc->currentAnim = ANIM_WorldWatt_Idle; - playerStatus->animFlags |= PA_FLAGS_WATT_IN_HANDS; + playerStatus->animFlags |= PA_FLAG_WATT_IN_HANDS; func_802BE014_31DB84(); npc_set_palswap_mode_A(npc, 1); script->functionTemp[1] = 2; D_802BE304 = 1; } else { - playerStatus->animFlags |= PA_FLAGS_USING_WATT; + playerStatus->animFlags |= PA_FLAG_USING_WATT; D_802BE30C = 1; npc->flags &= ~(NPC_FLAG_JUMPING | NPC_FLAG_GRAVITY); gGameStatusPtr->keepUsingPartnerOnMapChange = 0; @@ -323,7 +323,7 @@ ApiStatus func_802BD754_31D2C4(Evt* script, s32 isInitialCall) { npc->yaw = playerStatus->targetYaw; npc->currentAnim = ANIM_WorldWatt_Idle; partnerActionStatus->actingPartner = PARTNER_WATT; - playerStatus->animFlags |= PA_FLAGS_WATT_IN_HANDS; + playerStatus->animFlags |= PA_FLAG_WATT_IN_HANDS; func_802BE014_31DB84(); script->functionTemp[1] = 2; D_802BE304 = 1; @@ -331,7 +331,7 @@ ApiStatus func_802BD754_31D2C4(Evt* script, s32 isInitialCall) { break; case 1: world_watt_sync_held_position(); - if ((playerStatus->flags & PS_FLAGS_HIT_FIRE)) { + if ((playerStatus->flags & PS_FLAG_HIT_FIRE)) { D_802BE304 = 2; } else { s32 actionState = playerStatus->actionState; @@ -355,7 +355,7 @@ ApiStatus func_802BD754_31D2C4(Evt* script, s32 isInitialCall) { } if (D_802BE304 == 2) { - playerStatus->animFlags &= ~(PA_FLAGS_WATT_IN_HANDS | PA_FLAGS_USING_WATT); + playerStatus->animFlags &= ~(PA_FLAG_WATT_IN_HANDS | PA_FLAG_USING_WATT); npc->currentAnim = ANIM_WorldWatt_Idle; partner_clear_player_tracking(npc); D_802BE30C = 0; @@ -364,7 +364,7 @@ ApiStatus func_802BD754_31D2C4(Evt* script, s32 isInitialCall) { gGameStatusPtr->keepUsingPartnerOnMapChange = FALSE; D_802BE304 = 20; npc_set_palswap_mode_A(npc, 0); - if (!(playerStatus->flags & PS_FLAGS_HIT_FIRE)) { + if (!(playerStatus->flags & PS_FLAG_HIT_FIRE)) { set_action_state(0); } return ApiStatus_DONE1; @@ -396,7 +396,7 @@ s32 WattPutAway(Evt* script, s32 isInitialCall) { force_player_anim(ANIM_Mario_10002); wattActionStatus->actingPartner = PARTNER_NONE; wattActionStatus->partnerActionState = PARTNER_ACTION_NONE; - playerStatus->animFlags &= ~(PA_FLAGS_WATT_IN_HANDS | PA_FLAGS_USING_WATT); + playerStatus->animFlags &= ~(PA_FLAG_WATT_IN_HANDS | PA_FLAG_USING_WATT); gGameStatusPtr->keepUsingPartnerOnMapChange = 0; } @@ -461,7 +461,7 @@ ApiStatus func_802BDE88_31D9F8(Evt* script, s32 isInitialCall) { world_watt_sync_held_position(); watt->flags &= ~NPC_FLAG_GRAVITY; watt->flags |= NPC_FLAG_100; - playerStatus->animFlags |= (PA_FLAGS_WATT_IN_HANDS | PA_FLAGS_USING_WATT); + playerStatus->animFlags |= (PA_FLAG_WATT_IN_HANDS | PA_FLAG_USING_WATT); gGameStatusPtr->keepUsingPartnerOnMapChange = 1; wattActionStatus->partnerActionState = PARTNER_ACTION_WATT_SHINE; wattActionStatus->actingPartner = PARTNER_WATT; diff --git a/src/world/partners.c b/src/world/partners.c index 2cd45bd5d1..07c3a50a47 100644 --- a/src/world/partners.c +++ b/src/world/partners.c @@ -544,7 +544,7 @@ s32 func_800EA52C(s32 partnerID) { u32 playerActionState = playerStatus->actionState; s32 ret = FALSE; - if (playerStatus->flags & PS_FLAGS_HIT_FIRE) { + if (playerStatus->flags & PS_FLAG_HIT_FIRE) { return FALSE; } @@ -643,10 +643,10 @@ void _use_partner_ability(void) { partnerActionStatus->heldButtons = 0; } - if (playerStatus->animFlags & PA_FLAGS_INTERRUPT_USE_PARTNER) { - playerStatus->animFlags &= ~PA_FLAGS_INTERRUPT_USE_PARTNER; + if (playerStatus->animFlags & PA_FLAG_INTERRUPT_USE_PARTNER) { + playerStatus->animFlags &= ~PA_FLAG_INTERRUPT_USE_PARTNER; partnerActionStatus->pressedButtons |= BUTTON_B | BUTTON_C_DOWN; - playerStatus->animFlags |= PA_FLAGS_PARTNER_USAGE_STOPPED; + playerStatus->animFlags |= PA_FLAG_PARTNER_USAGE_STOPPED; } if (NextPartnerCommand != PARTNER_CMD_NONE) { @@ -1088,8 +1088,8 @@ void partner_handle_after_battle(void) { NextPartnerCommand = PARTNER_CMD_INIT; if (playerData->currentPartner != PARTNER_WATT && actionStatus->actingPartner == PARTNER_WATT) { - gPlayerStatusPtr->animFlags &= ~PA_FLAGS_USING_WATT; - gPlayerStatusPtr->animFlags &= ~PA_FLAGS_WATT_IN_HANDS; + gPlayerStatusPtr->animFlags &= ~PA_FLAG_USING_WATT; + gPlayerStatusPtr->animFlags &= ~PA_FLAG_WATT_IN_HANDS; actionStatus->actingPartner = PARTNER_NONE; } @@ -1170,7 +1170,7 @@ void partner_walking_update_player_tracking(Npc* partner) { s32 isPlayerJumping; PlayerPathElement* currentSnapshot; - if (playerStatus->flags & (PS_FLAGS_FALLING | PS_FLAGS_JUMPING)) { + if (playerStatus->flags & (PS_FLAG_FALLING | PS_FLAG_JUMPING)) { isPlayerJumping = (playerStatus->actionState == ACTION_STATE_LAND || playerStatus->actionState == ACTION_STATE_STEP_DOWN) ^ 1; } else { isPlayerJumping = FALSE; @@ -1196,9 +1196,9 @@ void partner_walking_update_motion(Npc* partner) { PlayerStatus* playerStatus = &gPlayerStatus; PartnerActionStatus* actionStatus = &gPartnerActionStatus; - if (gGameStatusPtr->multiplayerEnabled == 0 || playerStatus->flags & (PS_FLAGS_INPUT_DISABLED | PS_FLAGS_NO_STATIC_COLLISION) + if (gGameStatusPtr->multiplayerEnabled == 0 || playerStatus->flags & (PS_FLAG_INPUT_DISABLED | PS_FLAG_NO_STATIC_COLLISION) || actionStatus->inputDisabled != 0 || actionStatus->partnerAction_unk_2 != 0) { - if (!(playerStatus->animFlags & PA_FLAGS_OPENED_HIDDEN_PANEL)) { + if (!(playerStatus->animFlags & PA_FLAG_OPENED_HIDDEN_PANEL)) { partner_walking_follow_player(partner); } if (actionStatus->pressedButtons & (BUTTON_Z | BUTTON_B | BUTTON_C_LEFT | BUTTON_C_DOWN)) { @@ -1212,7 +1212,7 @@ void partner_walking_update_motion(Npc* partner) { partner->pos.z = playerStatus->position.z; partner->jumpVelocity = 0.0f; partner->jumpScale = 0.0f; - partner->flags = partner->flags & ~PA_FLAGS_OPENED_HIDDEN_PANEL; + partner->flags = partner->flags & ~PA_FLAG_OPENED_HIDDEN_PANEL; } partner_do_player_collision(partner); @@ -1246,7 +1246,7 @@ void partner_walking_follow_player(Npc* partner) { distance = dist2D(partner->pos.x, partner->pos.z, playerStatus->position.x, playerStatus->position.z); if (distance >= 50.0) { - partner->moveSpeed = !(playerStatus->animFlags & PA_FLAGS_SPINNING) ? 5.0f : 7.0f; + partner->moveSpeed = !(playerStatus->animFlags & PA_FLAG_SPINNING) ? 5.0f : 7.0f; } if (wPartnerTetherDistance < 20.0) { partner->moveSpeed = 4.0f; @@ -1789,11 +1789,11 @@ void partner_flying_update_motion(Npc* partner) { f32 var_f2; if (gGameStatusPtr->multiplayerEnabled == 0 || - (playerStatus->flags & (PS_FLAGS_INPUT_DISABLED | PS_FLAGS_NO_STATIC_COLLISION)) || + (playerStatus->flags & (PS_FLAG_INPUT_DISABLED | PS_FLAG_NO_STATIC_COLLISION)) || partnerActionStatus->inputDisabled || partnerActionStatus->partnerAction_unk_2 != 0) { - if (!(playerStatus->animFlags & PA_FLAGS_OPENED_HIDDEN_PANEL) || D_800F8020 == 0) { + if (!(playerStatus->animFlags & PA_FLAG_OPENED_HIDDEN_PANEL) || D_800F8020 == 0) { partner_flying_follow_player(partner); } if (partnerActionStatus->pressedButtons & (BUTTON_B | BUTTON_Z | BUTTON_C_DOWN | BUTTON_C_LEFT)) { @@ -2118,7 +2118,7 @@ void partner_flying_follow_player(Npc* partner) { } break; case 15: - if (!(playerStatus->animFlags & PA_FLAGS_CHANGING_MAP)) { + if (!(playerStatus->animFlags & PA_FLAG_CHANGING_MAP)) { switch (D_8010CFCE) { case 0: temp_f0_15 = clamp_angle(func_800E5348() + 180.0f); @@ -2297,7 +2297,7 @@ s32 partner_get_out(Npc* partner) { add_vec2D_polar(&x, &z, 2.0f, gCameras[gCurrentCameraID].currentYaw); hitDepth = 1000.0f; if (npc_raycast_down_around(COLLISION_CHANNEL_10000, &x, &y, &z, &hitDepth, partner->yaw, partner->collisionRadius)) { - // @bug? collider flags not properly masked with COLLIDER_FLAGS_SURFACE_TYPE + // @bug? collider flags not properly masked with COLLIDER_FLAG_SURFACE_TYPE s32 surfaceType = get_collider_flags(D_8010C978); if ((surfaceType == SURFACE_TYPE_SPIKES || surfaceType == SURFACE_TYPE_LAVA) || (hitDepth > 100.0f)) { diff --git a/src/world/script_api/7E0E80.c b/src/world/script_api/7E0E80.c index 1f59abce05..d14d75f086 100644 --- a/src/world/script_api/7E0E80.c +++ b/src/world/script_api/7E0E80.c @@ -186,7 +186,7 @@ ApiStatus func_802803C8(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - if ((playerStatus->flags & PS_FLAGS_PAUSE_DISABLED)) { + if ((playerStatus->flags & PS_FLAG_PAUSE_DISABLED)) { return ApiStatus_DONE2; } @@ -201,9 +201,9 @@ ApiStatus func_80280410(Evt* script, s32 isInitialCall) { Shop* shop = gGameStatusPtr->mapShop; s32 currentItemSlot = evt_get_variable(script, *script->ptrReadPos); - if (!(shop->flags & SHOP_FLAGS_8)) { + if (!(shop->flags & SHOP_FLAG_8)) { shop->currentItemSlot = currentItemSlot; - shop->flags |= SHOP_FLAGS_1; + shop->flags |= SHOP_FLAG_1; func_800E98EC(); shop->unk_358 = 5; @@ -218,7 +218,7 @@ ApiStatus func_80280410(Evt* script, s32 isInitialCall) { childScript->varTable[0] = currentItemSlot; D_80286520 = childScript; D_80286524 = childScript->id; - shop->flags |= SHOP_FLAGS_8; + shop->flags |= SHOP_FLAG_8; return ApiStatus_BLOCK; } else { return ApiStatus_DONE2; @@ -227,7 +227,7 @@ ApiStatus func_80280410(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } - shop->flags &= ~SHOP_FLAGS_8; + shop->flags &= ~SHOP_FLAG_8; enable_player_static_collisions(); enable_player_input(); return ApiStatus_DONE2; @@ -251,7 +251,7 @@ ApiStatus ShowShopPurchaseDialog(Evt* script, s32 isInitialCall) { static s32 D_80286530; static s32 D_80286534; - shop->flags &= ~SHOP_FLAGS_1; + shop->flags &= ~SHOP_FLAG_1; func_800E9900(); if (isInitialCall) { D_80286530 = 0; @@ -791,7 +791,7 @@ void draw_shop_items(void) { f32 inX, inY, inZ; ShopItemEntity* shopItemEntities; - if (shop->flags & SHOP_FLAGS_1) { + if (shop->flags & SHOP_FLAG_1) { set_window_update(WINDOW_ID_10, (s32) basic_window_update); set_window_update(WINDOW_ID_11, (s32) basic_window_update); } else { @@ -799,7 +799,7 @@ void draw_shop_items(void) { set_window_update(WINDOW_ID_11, (s32) basic_hidden_window_update); } - if (shop->flags & SHOP_FLAGS_1) { + if (shop->flags & SHOP_FLAG_1) { camera = &gCameras[gCurrentCameraID]; itemData = shop->staticInventory; shopItemEntities = gGameStatusPtr->shopItemEntities; @@ -827,7 +827,7 @@ void draw_shop_items(void) { xOffset = 0; } - if (!(get_item_entity(shopItemEntities->index)->flags & ITEM_ENTITY_FLAGS_HIDDEN)) { + if (!(get_item_entity(shopItemEntities->index)->flags & ITEM_ENTITY_FLAG_HIDDEN)) { draw_number(itemData->price, xTemp + xOffset, yTemp, DRAW_NUMBER_CHARSET_THIN, MSG_PAL_WHITE, 255, 0); } @@ -843,7 +843,7 @@ void draw_shop_items(void) { if (shop->unk_358 > 0) { shop->unk_358--; } else { - shop->flags &= ~SHOP_FLAGS_1; + shop->flags &= ~SHOP_FLAG_1; func_800E9900(); } } @@ -910,7 +910,7 @@ ApiStatus MakeShop(Evt* script, s32 isInitialCall) { gGameStatusPtr->shopItemEntities[numShopItems].pos.y = centerY; gGameStatusPtr->shopItemEntities[numShopItems].pos.z = centerZ; model = get_model_from_list_index(get_model_list_index_from_tree_index(itemDataPositions->posModelID)); - model->flags |= MODEL_FLAGS_FLAG_4; + model->flags |= MODEL_FLAG_FLAG_4; gGameStatusPtr->shopItemEntities[numShopItems].index = make_item_entity_nodelay(inventory->itemID | shop->inventoryItemFlags, centerX, centerY, centerZ, 1, 0); set_item_entity_flags(gGameStatusPtr->shopItemEntities[numShopItems].index, 0x4000); @@ -922,8 +922,8 @@ ApiStatus MakeShop(Evt* script, s32 isInitialCall) { } shop->costIconID = hud_element_create(&HES_Item_Coin); - hud_element_set_flags(shop->costIconID, HUD_ELEMENT_FLAGS_80); - hud_element_clear_flags(shop->costIconID, HUD_ELEMENT_FLAGS_FILTER_TEX); + hud_element_set_flags(shop->costIconID, HUD_ELEMENT_FLAG_80); + hud_element_clear_flags(shop->costIconID, HUD_ELEMENT_FLAG_FILTER_TEX); get_worker(create_worker_frontUI(NULL, draw_shop_items)); set_window_properties(WINDOW_ID_10, 100, 66, 120, 28, 0, shop_draw_item_name, NULL, -1); set_window_properties(WINDOW_ID_11, 32, 184, 256, 32, 1, shop_draw_item_desc, NULL, -1); @@ -931,7 +931,7 @@ ApiStatus MakeShop(Evt* script, s32 isInitialCall) { gWindowStyles[11].defaultStyleID = WINDOW_STYLE_3; shop->currentItemSlot = 0; shop->selectedStoreItemSlot = 0; - shop->flags = SHOP_FLAGS_0; + shop->flags = SHOP_FLAG_0; shop->owner = NULL; return ApiStatus_DONE2; diff --git a/src/world/script_api/7E3700.c b/src/world/script_api/7E3700.c index bd503f558b..03477aefd8 100644 --- a/src/world/script_api/7E3700.c +++ b/src/world/script_api/7E3700.c @@ -227,7 +227,7 @@ ApiStatus func_80283174(Evt* script, s32 isInitialCall) { if (playerStatus->actionState == ACTION_STATE_PUSHING_BLOCK || playerStatus->actionState == ACTION_STATE_WALK || playerStatus->actionState == ACTION_STATE_RUN) { - if (playerStatus->animFlags & PA_FLAGS_USING_WATT) { + if (playerStatus->animFlags & PA_FLAG_USING_WATT) { script->varTable[13] = FALSE; } else { script->varTable[13] = TRUE; diff --git a/src/world/script_api/7E4690.c b/src/world/script_api/7E4690.c index 0ed73cdf0e..1da4fd39e7 100644 --- a/src/world/script_api/7E4690.c +++ b/src/world/script_api/7E4690.c @@ -76,13 +76,13 @@ ApiStatus EnterPlayerPostPipe(Evt* script, s32 isInitialCall) { playerStatus->position.z = (*mapSettings->entryList)[gGameStatusPtr->entryID].z; script->varTable[2] = (*mapSettings->entryList)[gGameStatusPtr->entryID].y; playerStatus->position.y = script->varTable[2] - 40; - playerStatus->flags |= PS_FLAGS_CAMERA_DOESNT_FOLLOW; + playerStatus->flags |= PS_FLAG_CAMERA_DOESNT_FOLLOW; } else { do { playerStatus->position.y += 1.0f; if (!(playerStatus->position.y < script->varTable[2])) { playerStatus->position.y = script->varTable[2]; - playerStatus->flags &= ~PS_FLAGS_CAMERA_DOESNT_FOLLOW; + playerStatus->flags &= ~PS_FLAG_CAMERA_DOESNT_FOLLOW; ret = ApiStatus_DONE2; } } while (0); // todo required to match diff --git a/src/world/world.c b/src/world/world.c index 9c18564aa6..cd95c1594c 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -166,10 +166,10 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) { } gCurrentCameraID = CAM_DEFAULT; - gCameras[CAM_DEFAULT].flags |= CAMERA_FLAGS_ENABLED; - gCameras[CAM_BATTLE].flags |= CAMERA_FLAGS_ENABLED; - gCameras[CAM_TATTLE].flags |= CAMERA_FLAGS_ENABLED; - gCameras[CAM_3].flags |= CAMERA_FLAGS_ENABLED; + gCameras[CAM_DEFAULT].flags |= CAMERA_FLAG_ENABLED; + gCameras[CAM_BATTLE].flags |= CAMERA_FLAG_ENABLED; + gCameras[CAM_TATTLE].flags |= CAMERA_FLAG_ENABLED; + gCameras[CAM_3].flags |= CAMERA_FLAG_ENABLED; if (gGameStatusPtr->creditsViewportMode == -1) { set_cam_viewport(0, 12, 20, 296, 200);