Update flags and enums in enums.h (#525)

* prepare enums.h

* update enums.h

* add commits to enums.h

* resolve enum and flag issues with enums.h

* delete artifacts

* resolve issue with soundid enum

* :P

* setup first few parameterised flag enums

* add flags to npc.h related structs

* add flags to npc.h related structs

* create enums for several common structs

* .

* resolve issue with enum sizes

* resolve issue with enum sizes

* resolve issue with enum sizes

* parameterise entity and event related flags

* update enums.h

* add commits to enums.h

* resolve enum and flag issues with enums.h

* delete artifacts

* resolve issue with soundid enum

* :P

* setup first few parameterised flag enums

* add flags to npc.h related structs

* add flags to npc.h related structs

* create enums for several common structs

* .

* resolve issue with enum sizes

* resolve issue with enum sizes

* resolve issue with enum sizes

* parameterise entity and event related flags

* .

* Update 190B20.c

* Update enums.h

include/npc.h

@@ -136,7 +136,7 @@ typedef struct StaticNpc {
     /* 0x018 */ EvtSource* init;
     /* 0x01C */ char unk_1C[8];
     /* 0x024 */ s32 yaw;
-    /* 0x028 */ s8 dropFlags; // TODO: use EnemyDrops (requires tons of map edits)
+    /* 0x028 */ u8 dropFlags; // TODO: use EnemyDrops (requires tons of map edits)
     /* 0x029 */ s8 itemDropChance; // %
     /* 0x02A */ ItemDrop itemDrops[8];
     /* 0x05A */ StatDrop heartDrops[8];
@@ -177,7 +177,7 @@ typedef struct {
 #define NPC_GROUP(npcs, battle) { sizeof(npcs) / sizeof(StaticNpc), (StaticNpc*) &npcs, battle }
 
 typedef struct EnemyDrops {
-    /* 0x00 */ s8 dropFlags;
+    /* 0x00 */ u8 dropFlags;
     /* 0x01 */ s8 itemDropChance; // %
     /* 0x02 */ ItemDrop itemDrops[8];
     /* 0x32 */ StatDrop heartDrops[8];

src/104730.c

@@ -91,7 +91,7 @@ s32 D_802E9898[9] = {
 };
 
 StaticShadowData D_802E98BC = {
-    .flags = 0x20,
+    .flags = SHADOW_FLAGS_20,
     .unk_04 = D_802E9850,
     .animModelNode =  NULL,
     .onCreateCallback = entity_Shadow_init,
@@ -99,7 +99,7 @@ StaticShadowData D_802E98BC = {
 };
 
 StaticShadowData D_802E98E0 = {
-    .flags = 0x20,
+    .flags = SHADOW_FLAGS_20,
     .unk_04 = D_802E9874,
     .animModelNode =  NULL,
     .onCreateCallback = entity_Shadow_init,
@@ -107,7 +107,7 @@ StaticShadowData D_802E98E0 = {
 };
 
 StaticShadowData D_802E9904 = {
-    .flags = 0x20,
+    .flags = SHADOW_FLAGS_20,
     .unk_04 = D_802E9898,
     .animModelNode =  NULL,
     .onCreateCallback = entity_Shadow_init,

src/163400.c

@@ -100,14 +100,14 @@ void func_8024330C(
     s32 updateCounter = window->updateCounter;
 
     if (updateCounter == 0) {
-        window->flags &= ~0x4;
+        window->flags &= ~WINDOW_FLAGS_4;
     }
 
     if (updateCounter < ARRAY_COUNT(D_80249BBC)) {
         *posX -= D_80249BBC[updateCounter];
     } else {
         *posX -= D_80249BBC[ARRAY_COUNT(D_80249BBC) - 1];
-        window->flags &= ~0x8;
+        window->flags &= ~WINDOW_FLAGS_8;
     }
 }
 
@@ -124,14 +124,14 @@ void filemenu_update_show_name_input(
     s32 updateCounter = window->updateCounter;
 
     if (updateCounter == 0) {
-        window->flags &= ~0x4;
+        window->flags &= ~WINDOW_FLAGS_4;
     }
 
     if (updateCounter < ARRAY_COUNT(D_80249BDC)) {
         *posX += D_80249BDC[updateCounter];
     } else {
         *posX += D_80249BDC[ARRAY_COUNT(D_80249BDC) - 1];
-        window->flags &= ~0x8;
+        window->flags &= ~WINDOW_FLAGS_8;
     }
 }
 
@@ -148,14 +148,14 @@ void filemenu_update_show_options_left(
     s32 updateCounter = window->updateCounter;
 
     if (updateCounter == 0) {
-        window->flags &= ~0x4;
+        window->flags &= ~WINDOW_FLAGS_4;
     }
 
     if (updateCounter < ARRAY_COUNT(D_80249BFC)) {
         *posX -= D_80249BFC[updateCounter];
     } else {
         *posX -= D_80249BFC[ARRAY_COUNT(D_80249BFC) - 1];
-        window->flags &= ~0x8;
+        window->flags &= ~WINDOW_FLAGS_8;
     }
 }
 
@@ -172,14 +172,14 @@ void filemenu_update_show_options_right(
     s32 updateCounter = window->updateCounter;
 
     if (updateCounter == 0) {
-        window->flags &= ~0x4;
+        window->flags &= ~WINDOW_FLAGS_4;
     }
 
     if (updateCounter < ARRAY_COUNT(D_80249C1C)) {
         *posX += D_80249C1C[updateCounter];
     } else {
         *posX += D_80249C1C[ARRAY_COUNT(D_80249C1C) - 1];
-        window->flags &= ~0x8;
+        window->flags &= ~WINDOW_FLAGS_8;
     }
 }
 
@@ -196,14 +196,14 @@ void filemenu_update_show_options_bottom(
     s32 updateCounter = window->updateCounter;
 
     if (updateCounter == 0) {
-        window->flags &= ~0x4;
+        window->flags &= ~WINDOW_FLAGS_4;
     }
 
     if (updateCounter < ARRAY_COUNT(D_80249C3C)) {
         *posY += D_80249C3C[updateCounter];
     } else {
         *posY += D_80249C3C[ARRAY_COUNT(D_80249C3C) - 1];
-        window->flags &= ~0x8;
+        window->flags &= ~WINDOW_FLAGS_8;
     }
 }
 
@@ -220,14 +220,14 @@ void filemenu_update_show_title(
     s32 updateCounter = window->updateCounter;
 
     if (updateCounter == 0) {
-        window->flags &= ~0x4;
+        window->flags &= ~WINDOW_FLAGS_4;
     }
 
     if (updateCounter < ARRAY_COUNT(D_80249C5C)) {
         *posY -= D_80249C5C[updateCounter];
     } else {
         *posY -= D_80249C5C[ARRAY_COUNT(D_80249C5C) - 1];
-        window->flags &= ~0x8;
+        window->flags &= ~WINDOW_FLAGS_8;
     }
 }
 
@@ -247,8 +247,8 @@ void func_802435C4(
         *posX += D_80249C7C[updateCounter];
     } else {
         *posX += D_80249C7C[ARRAY_COUNT(D_80249C7C) - 1];
-        window->flags &= ~0x8;
+        window->flags &= ~WINDOW_FLAGS_8;
-        window->flags |= 0x4;
+        window->flags |= WINDOW_FLAGS_4;
     }
 }
 
@@ -268,8 +268,8 @@ void filemenu_update_hidden_name_input(
         *posX -= D_80249C90[updateCounter];
     } else {
         *posX -= D_80249C90[ARRAY_COUNT(D_80249C90) - 1];
-        window->flags &= ~0x8;
+        window->flags &= ~WINDOW_FLAGS_8;
-        window->flags |= 0x4;
+        window->flags |= WINDOW_FLAGS_4;
     }
 }
 
@@ -289,8 +289,8 @@ void filemenu_update_hidden_options_left(
         *posX += D_80249CA4[updateCounter];
     } else {
         *posX += D_80249CA4[ARRAY_COUNT(D_80249CA4) - 1];
-        window->flags &= ~0x8;
+        window->flags &= ~WINDOW_FLAGS_8;
-        window->flags |= 0x4;
+        window->flags |= WINDOW_FLAGS_4;
     }
 }
 
@@ -310,8 +310,8 @@ void filemenu_update_hidden_options_right(
         *posX -= D_80249CB8[updateCounter];
     } else {
         *posX -= D_80249CB8[ARRAY_COUNT(D_80249CB8) - 1];
-        window->flags &= ~0x8;
+        window->flags &= ~WINDOW_FLAGS_8;
-        window->flags |= 0x4;
+        window->flags |= WINDOW_FLAGS_4;
     }
 }
 
@@ -331,8 +331,8 @@ void filemenu_update_hidden_title(
         *posY += D_80249CCC[updateCounter];
     } else {
         *posY += D_80249CCC[ARRAY_COUNT(D_80249CCC) - 1];
-        window->flags &= ~0x8;
+        window->flags &= ~WINDOW_FLAGS_8;
-        window->flags |= 0x4;
+        window->flags |= WINDOW_FLAGS_4;
     }
 }
 
@@ -352,8 +352,8 @@ void filemenu_update_hidden_options_bottom(
         *posY -= D_80249CE0[updateCounter];
     } else {
         *posY -= D_80249CE0[ARRAY_COUNT(D_80249CE0) - 1];
-        window->flags &= ~0x8;
+        window->flags &= ~WINDOW_FLAGS_8;
-        window->flags |= 0x4;
+        window->flags |= WINDOW_FLAGS_4;
     }
 }
 
@@ -370,7 +370,7 @@ void filemenu_update_show_with_rotation(
     s32 updateCounter = window->updateCounter;
 
     if (updateCounter == 0) {
-        window->flags &= ~0x4;
+        window->flags &= ~WINDOW_FLAGS_4;
     }
 
     if (updateCounter < ARRAY_COUNT(D_80249CF4)) {
@@ -378,7 +378,7 @@ void filemenu_update_show_with_rotation(
         *flags = 8 | 1;
     } else {
         *flags = 0;
-        window->flags &= ~0x8;
+        window->flags &= ~WINDOW_FLAGS_8;
     }
 }
 
@@ -399,8 +399,8 @@ void filemenu_update_hidden_with_rotation(
         *flags = 8 | 1;
     } else {
         *flags = 0;
-        window->flags &= ~0x8;
+        window->flags &= ~WINDOW_FLAGS_8;
-        window->flags |= 0x4;
+        window->flags |= WINDOW_FLAGS_4;
     }
 }
 
@@ -431,8 +431,8 @@ void filemenu_update_hidden_name_confirm(
         mainmenu_draw_rect(0, 0, 1280, 960, 0, 0, 0, 0, 0);
         *posY -= D_80249D48[updateCounter];
     } else {
-        window->flags &= ~0x8;
+        window->flags &= ~WINDOW_FLAGS_8;
-        window->flags |= 0x4;
+        window->flags |= WINDOW_FLAGS_4;
     }
 }
 

src/168590.c

@@ -105,7 +105,7 @@ void func_80248170(s32 idx) {
     Window* window = &gWindows[idx];
 
     if (window->updateCounter == 8) {
-        window->flags &= ~0x8;
+        window->flags &= ~WINDOW_FLAGS_8;
         set_window_update(idx, 1);
     }
 }

src/16F740.c

@@ -130,8 +130,8 @@ void btl_state_update_switch_to_player(void) {
         for (i = 0; i < ARRAY_COUNT(gBattleStatus.enemyActors); i++) {
             Actor* enemy = gBattleStatus.enemyActors[i];
             if (enemy != NULL) {
-                enemy->flags |= 0x80000;
+                enemy->flags |= ENEMY_FLAGS_80000;
-                enemy->flags |= 0x8000000;
+                enemy->flags |= ENEMY_FLAGS_8000000;
             }
         }
 
@@ -165,8 +165,8 @@ void btl_state_update_switch_to_partner(void) {
         for (i = 0; i < ARRAY_COUNT(gBattleStatus.enemyActors); i++) {
             Actor* enemy = gBattleStatus.enemyActors[i];
             if (enemy != NULL) {
-                enemy->flags |= 0x80000;
+                enemy->flags |= ENEMY_FLAGS_80000;
-                enemy->flags |= 0x8000000;
+                enemy->flags |= ENEMY_FLAGS_8000000;
             }
         }
 

src/17FEB0.c

@@ -18,7 +18,7 @@ s32 calc_item_check_hit(void) {
         actorPart = get_actor_part(actor, currentTargetPart);
         ASSERT(actorPart != NULL);
 
-        if (!(actorPart->eventFlags & 0x20)) {
+        if (!(actorPart->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY)) {
             if (actor->transStatus == 0xE) {
                 return HIT_RESULT_MISS;
             }
@@ -26,7 +26,7 @@ s32 calc_item_check_hit(void) {
                 sfx_play_sound_at_position(0x10C, 0, walk->goalPos.x, walk->goalPos.y, walk->goalPos.z);
                 return HIT_RESULT_IMMUNE;
             }
-            if ((battleStatus->currentAttackElement & 0x80) && (actorPart->eventFlags & 0x10)) {
+            if ((battleStatus->currentAttackElement & 0x80) && (actorPart->eventFlags & ACTOR_EVENT_FLAG_SPIKY_TOP)) {
                 sfx_play_sound_at_position(0xE9, 0, walk->goalPos.x, walk->goalPos.y, walk->goalPos.z);
                 return HIT_RESULT_LANDED_ON_SPIKE;
             }

src/181810.c

@@ -42,7 +42,7 @@ ApiStatus ActorSpeak(Evt* script, s32 isInitialCall) {
         gSpeakingActorPart = part;
 
         headX = actor->currentPos.x + actor->headOffset.x;
-        if (!(actor->flags & 0x8000)) {
+        if (!(actor->flags & ACTOR_FLAG_8000)) {
             headY = actor->size.y + (actor->currentPos.y + actor->headOffset.y);
         } else {
             headY = actor->currentPos.y + actor->headOffset.y + (actor->size.y / 2);
@@ -68,7 +68,7 @@ ApiStatus ActorSpeak(Evt* script, s32 isInitialCall) {
         part = gSpeakingActorPart;
 
         headX = actor->currentPos.x + actor->headOffset.x;
-        if (!(actor->flags & 0x8000)) {
+        if (!(actor->flags & ACTOR_FLAG_8000)) {
             headY = actor->size.y + (actor->currentPos.y + actor->headOffset.y);
         } else {
             headY = actor->headOffset.y;
@@ -136,7 +136,7 @@ ApiStatus EndActorSpeech(Evt* script, s32 isInitialCall) {
         ActorPart* actorPart = gSpeakingActorPart;
 
         x = actor->currentPos.x + actor->headOffset.x;
-        if (!(gSpeakingActor->flags & 0x8000)) {
+        if (!(gSpeakingActor->flags & ACTOR_FLAG_8000)) {
             y = actor->currentPos.y + actor->headOffset.y + actor->size.y ;
         } else {
             y = actor->currentPos.y + actor->headOffset.y + actor->size.y / 2;
@@ -403,7 +403,7 @@ s32 is_actor_hp_bar_visible(Actor* actor) {
     }
 
     flags = get_global_byte((actor->actorType >> 3) + 365);
-    if (actor->flags & 0x1000) {
+    if (actor->flags & ACTOR_FLAG_1000) {
         flags |= battleStatus->tattleFlags[actor->actorType >> 3];
     }
     return (flags >> (actor->actorType & 7)) & 1;

src/182B30.c

@@ -31,7 +31,7 @@ INCLUDE_ASM(s32, "182B30", enable_actor_blur);
 void disable_actor_blur(Actor* actor) {
     ActorPart* actorPart = actor->partsTable;
 
-    if ((actorPart->idleAnimations != NULL) && !(actorPart->flags & 2)) {
+    if ((actorPart->idleAnimations != NULL) && !(actorPart->flags & ACTOR_PART_FLAG_2)) {
         DecorationTable* decorationTable = actorPart->decorationTable;
 
         if (decorationTable->unk_7DB != 0) {
@@ -46,7 +46,7 @@ void disable_actor_blur(Actor* actor) {
 void reset_actor_blur(Actor* actor) {
     ActorPart* actorPart = actor->partsTable;
 
-    if ((actorPart->idleAnimations != NULL) && !(actorPart->flags & 2)) {
+    if ((actorPart->idleAnimations != NULL) && !(actorPart->flags & ACTOR_PART_FLAG_2)) {
         DecorationTable* decorationTable = actorPart->decorationTable;
 
         if (decorationTable->unk_7DB != 0) {
@@ -62,7 +62,7 @@ void reset_actor_blur(Actor* actor) {
 void func_80254610(Actor* actor) {
     ActorPart* actorPart = actor->partsTable;
 
-    if (actorPart->idleAnimations != NULL && !(actorPart->flags & 2)) {
+    if (actorPart->idleAnimations != NULL && !(actorPart->flags & ACTOR_PART_FLAG_2)) {
         DecorationTable* decorationTable = actorPart->decorationTable;
 
         decorationTable->unk_7DB = 0;

src/18C790.c

@@ -19,25 +19,28 @@ ApiStatus func_8025E044(Evt* script, s32 isInitialCall) {
     EntityModel* model;
 
     model = get_entity_model(*virtual_entity_get_by_index(script->varTable[6]));
-    model->flags &= 0xFFFF000F;
+    model->flags &= ~MODEL_FLAGS_MASK_FFF0 ;
-    model->flags |= 0x8;
+    model->flags |= MODEL_FLAGS_TRANSFORM_GROUP_MEMBER;
     model = get_entity_model(*virtual_entity_get_by_index(script->varTable[7]));
-    model->flags &= 0xFFFF000F;
+    model->flags &= ~MODEL_FLAGS_MASK_FFF0 ;
-    model->flags |= 0x8;
+    model->flags |= MODEL_FLAGS_TRANSFORM_GROUP_MEMBER;
     model = get_entity_model(*virtual_entity_get_by_index(script->varTable[8]));
-    model->flags &= 0xFFFF000F;
+    model->flags &= ~MODEL_FLAGS_MASK_FFF0 ;
-    model->flags |= 0x8;
+    model->flags |= MODEL_FLAGS_TRANSFORM_GROUP_MEMBER;
     model = get_entity_model(*virtual_entity_get_by_index(script->varTable[9]));
-    model->flags &= 0xFFFF000F;
+    model->flags &= ~MODEL_FLAGS_MASK_FFF0 ;
-    model->flags |= 0x8;
+    model->flags |= MODEL_FLAGS_TRANSFORM_GROUP_MEMBER;
 
     return ApiStatus_DONE2;
 }
 
 ApiStatus func_8025E108(Evt* script, s32 isInitialCall) {
     EntityModel* model = get_entity_model(*virtual_entity_get_by_index(script->varTable[9]));
-    model->flags &= 0xFFFF000F;
+    model->flags &= ~(MODEL_FLAGS_USES_CUSTOM_GFX | MODEL_FLAGS_FLAG_20 | MODEL_FLAGS_FLAG_40
-    model->flags |= 0x8;
+        | 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);
+    model->flags |= MODEL_FLAGS_TRANSFORM_GROUP_MEMBER;
 
     return ApiStatus_DONE2;
 }

src/190B20.c

@@ -1194,7 +1194,7 @@ void func_802634B8(void) {
             if (player->targetListLength == 0) {
                 battleStatus->submenuEnabled[i] = -2;
             }
-            if ((gBattleStatus.flags2 & BS_FLAGS2_1000) != 0) {
+            if ((gBattleStatus.flags2 & BS_FLAGS2_NO_TARGET_AVAILABLE) != 0) {
                 battleStatus->submenuEnabled[moveCount] = -1;
             }
     }
@@ -1271,7 +1271,7 @@ void func_802636E4(void) {
             if (player->targetListLength == 0) {
                 battleStatus->submenuEnabled[i] = -2;
             }
-            if ((gBattleStatus.flags2 & BS_FLAGS2_1000) != 0) {
+            if ((gBattleStatus.flags2 & BS_FLAGS2_NO_TARGET_AVAILABLE) != 0) {
                 battleStatus->submenuEnabled[moveCount] = -1;
             }
     }
@@ -1334,7 +1334,7 @@ void func_80263914(void) {
                 battleStatus->submenuEnabled[i] = 0;
             }
 
-            if (gBattleStatus.flags2 & BS_FLAGS2_1000) {
+            if (gBattleStatus.flags2 & BS_FLAGS2_NO_TARGET_AVAILABLE) {
                 battleStatus->submenuEnabled[i] = -1;
             }
 
@@ -1832,7 +1832,7 @@ INCLUDE_ASM(s32, "190B20", func_80266F60);
 INCLUDE_ASM(s32, "190B20", func_80266F8C);
 
 void func_80266FD8(ActorPart* part, s32 arg1) {
-    if (part->idleAnimations != NULL && !(part->flags & 2)) {
+    if (part->idleAnimations != NULL && !(part->flags & ACTOR_PART_FLAG_2)) {
         DecorationTable* decorationTable = part->decorationTable;
 
         if (decorationTable->unk_764 != arg1) {
@@ -1847,7 +1847,7 @@ void func_80267018(Actor* actor, s32 arg1) {
     ActorPart* actorPart = &actor->partsTable[0];
 
     while (actorPart != NULL) {
-        if (!(actorPart->flags & 0x100001) && actorPart->decorationTable != NULL && !(actorPart->flags & 2) &&
+        if (!(actorPart->flags & (ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_100000)) && actorPart->decorationTable != NULL && !(actorPart->flags & ACTOR_PART_FLAG_2) &&
             actorPart->idleAnimations != NULL) {
             func_80266FD8(actorPart, arg1);
         }
@@ -1860,7 +1860,7 @@ INCLUDE_ASM(s32, "190B20", func_8026709C);
 INCLUDE_ASM(s32, "190B20", func_802670C8);
 
 void add_part_decoration(ActorPart* part, s32 decorationIndex, s32 decorationType) {
-    if ((part->idleAnimations) && !(part->flags & 2)) {
+    if ((part->idleAnimations) && !(part->flags & ACTOR_PART_FLAG_2)) {
         DecorationTable* decorationTable = part->decorationTable;
 
         _remove_part_decoration(part, decorationIndex);
@@ -1874,7 +1874,7 @@ void add_part_decoration(ActorPart* part, s32 decorationIndex, s32 decorationTyp
 void add_actor_decoration(Actor* actor, s32 decorationIndex, s32 decorationType) {
     ActorPart* part;
     for (part = actor->partsTable; part != NULL; part = part->nextPart) {
-        if ((part->flags & 0x100001) == 0 && part->idleAnimations && !(part->flags & 2)) {
+        if ((part->flags & (ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_100000)) == 0 && part->idleAnimations && !(part->flags & ACTOR_PART_FLAG_2)) {
             add_part_decoration(part, decorationIndex, decorationType);
         }
     }
@@ -1887,7 +1887,7 @@ void remove_part_decoration(ActorPart* part, s32 decorationIndex) {
 void remove_actor_decoration(Actor* actor, s32 decorationIndex) {
     ActorPart* part;
     for (part = actor->partsTable; part != NULL; part = part->nextPart) {
-        if ((part->flags & 0x100001) == 0 && part->idleAnimations && !(part->flags & 2)) {
+        if ((part->flags & (ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_100000)) == 0 && part->idleAnimations && !(part->flags & ACTOR_PART_FLAG_2)) {
             remove_part_decoration(part, decorationIndex);
         }
     }
@@ -1914,7 +1914,7 @@ s32 player_team_is_ability_active(Actor* actor, s32 ability) {
 void create_part_shadow(s32 actorID, s32 partIndex) {
     ActorPart* part = get_actor_part(get_actor(actorID), partIndex);
 
-    part->flags &= ~4;
+    part->flags &= ~ACTOR_PART_FLAG_4;
     part->shadowIndex = create_shadow_type(0, part->currentPos.x, part->currentPos.y, part->currentPos.z);
     part->shadowScale = part->size.x / 24.0;
 }
@@ -1922,12 +1922,12 @@ void create_part_shadow(s32 actorID, s32 partIndex) {
 void remove_part_shadow(s32 actorID, s32 partIndex) {
     ActorPart* part = get_actor_part(get_actor(actorID), partIndex);
 
-    part->flags |= 4;
+    part->flags |= ACTOR_PART_FLAG_4;
     delete_shadow(part->shadowIndex);
 }
 
 void create_part_shadow_by_ref(UNK_TYPE arg0, ActorPart* part) {
-    part->flags &= ~4;
+    part->flags &= ~ACTOR_PART_FLAG_4;
     part->shadowIndex = create_shadow_type(0, part->currentPos.x, part->currentPos.y, part->currentPos.z);
     part->shadowScale = part->size.x / 24.0;
 }
@@ -2039,7 +2039,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 |= 2;
+                model->flags |= MODEL_FLAGS_ENABLED;
             }
         }
     }
@@ -2054,7 +2054,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 &= ~2;
+                model->flags &= ~MODEL_FLAGS_ENABLED;
             }
         }
     }
@@ -2071,7 +2071,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 |= 2;
+                model->flags |= MODEL_FLAGS_ENABLED;
             }
 
         }
@@ -2089,7 +2089,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 &= ~2;
+                model->flags &= ~MODEL_FLAGS_ENABLED;
             }
         }
     }

src/197F40.c

@@ -561,7 +561,7 @@ ApiStatus GetPartOffset(Evt* script, s32 isInitialCall) {
     outY = *args++;
     outZ = *args++;
 
-    if (!(actorPart->flags & 0x100000)) {
+    if (!(actorPart->flags & ACTOR_PART_FLAG_100000)) {
         x = actorPart->partOffset.x;
         y = actorPart->partOffset.y;
         z = actorPart->partOffset.z;
@@ -687,7 +687,7 @@ ApiStatus SetPartPos(Evt* script, s32 isInitialCall) {
         case 0x200:
             actorPart = get_actor_part(actor, partIndex);
 
-            if (!(actorPart->flags & 0x100000)) {
+            if (!(actorPart->flags & ACTOR_PART_FLAG_100000)) {
                 actorPart->partOffset.x = x;
                 actorPart->partOffset.y = y;
                 actorPart->partOffset.z = z;
@@ -1020,7 +1020,7 @@ ApiStatus GetPartDispOffset(Evt* script, s32 isInitialCall) {
 
     actorPart = get_actor_part(get_actor(actorID), partIndex);
 
-    if (!(actorPart->flags & 0x100000)) {
+    if (!(actorPart->flags & ACTOR_PART_FLAG_100000)) {
         x = actorPart->partOffset.x;
         y = actorPart->partOffset.y;
         z = actorPart->partOffset.z;
@@ -1055,7 +1055,7 @@ ApiStatus SetPartDispOffset(Evt* script, s32 isInitialCall) {
     z = evt_get_float_variable(script, *args++);
     actorPart = get_actor_part(get_actor(actorID), partIndex);
 
-    if (!(actorPart->flags & 0x100000)) {
+    if (!(actorPart->flags & ACTOR_PART_FLAG_100000)) {
         actorPart->partOffset.x = x;
         actorPart->partOffset.y = y;
         actorPart->partOffset.z = z;
@@ -1086,7 +1086,7 @@ ApiStatus AddPartDispOffset(Evt* script, s32 isInitialCall) {
     z = evt_get_float_variable(script, *args++);
     actorPart = get_actor_part(get_actor(actorID), partIndex);
 
-    if (!(actorPart->flags & 0x100000)) {
+    if (!(actorPart->flags & ACTOR_PART_FLAG_100000)) {
         actorPart->partOffset.x += x;
         actorPart->partOffset.y += y;
         actorPart->partOffset.z += z;
@@ -1845,7 +1845,7 @@ ApiStatus HPBarToHome(Evt* script, s32 isInitialCall) {
     actor->healthBarPosition.y = actor->homePos.y + actor->staticActorData->hpBarOffset.y;
     actor->healthBarPosition.z = actor->homePos.z;
 
-    if (actor->flags & 0x800) {
+    if (actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW) {
         actor->healthBarPosition.y = actor->homePos.y - actor->size.y - actor->staticActorData->hpBarOffset.y;
     }
 
@@ -1868,7 +1868,7 @@ ApiStatus HPBarToCurrent(Evt* script, s32 isInitialCall) {
     actor->healthBarPosition.y = actor->currentPos.y + actor->staticActorData->hpBarOffset.y;
     actor->healthBarPosition.z = actor->currentPos.z;
 
-    if (actor->flags & 0x800) {
+    if (actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW) {
         actor->healthBarPosition.y = actor->currentPos.y - actor->size.y - actor->staticActorData->hpBarOffset.y;
     }
 
@@ -1911,7 +1911,7 @@ ApiStatus func_8026D940(Evt* script, s32 isInitialCall) {
     actor->healthBarPosition.y = actor->homePos.y + actor->staticActorData->hpBarOffset.y + actor->unk_198.y;
     actor->healthBarPosition.z = actor->homePos.z;
 
-    if (actor->flags & 0x800) {
+    if (actor->flags & ACTOR_FLAG_HP_OFFSET_BELOW) {
         actor->healthBarPosition.y = actor->homePos.y - actor->size.y;
     }
 
@@ -2473,7 +2473,7 @@ ApiStatus  GetStatusFlags(Evt* script, s32 isInitialCall) {
             if (partsTable->flags & 0x100) {
                 flags |= STATUS_FLAG_TRANSPARENT;
             }
-            if (partsTable->eventFlags & EVENT_FLAG_ILLUSORY) {
+            if (partsTable->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY) {
                 flags |= STATUS_FLAG_TRANSPARENT;
             }
     }

src/1A5830.c

@@ -18,7 +18,7 @@ s32 has_enchanted_part(Actor* actor) {
     s32 ret = FALSE;
 
     while (partIt != NULL) {
-        if (partIt->eventFlags & 0xC0000) {
+        if (partIt->eventFlags & (ACTOR_EVENT_FLAG_ENCHANTED | ACTOR_EVENT_FLAG_80000)) {
             ret = TRUE;
             break;
         } else {
@@ -174,7 +174,7 @@ s32 calc_enemy_test_target(Actor* actor) {
 
     hitResult = HIT_RESULT_HIT;
     target2 = target;
-    if (targetPart->eventFlags & EVENT_FLAG_ILLUSORY || battleStatus->outtaSightActive || target2->transStatus == STATUS_E) {
+    if (targetPart->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY || battleStatus->outtaSightActive || target2->transStatus == STATUS_E) {
         if (!(battleStatus->currentAttackElement & DAMAGE_TYPE_MAGIC)) {
             hitResult = HIT_RESULT_MISS;
         }
@@ -287,11 +287,11 @@ s32 calc_enemy_damage_target(Actor* attacker) {
             break;
     }
 
-    if (targetPart->eventFlags & EVENT_FLAG_ILLUSORY) {
+    if (targetPart->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY) {
         return HIT_RESULT_MISS;
     }
 
-    if (target->transStatus == STATUS_E || targetPart->eventFlags & EVENT_FLAG_800 && !(battleStatus->currentAttackElement & DAMAGE_TYPE_QUAKE)) {
+    if (target->transStatus == STATUS_E || targetPart->eventFlags & ACTOR_EVENT_FLAG_800 && !(battleStatus->currentAttackElement & DAMAGE_TYPE_QUAKE)) {
         return HIT_RESULT_MISS;
     }
 
@@ -303,7 +303,7 @@ s32 calc_enemy_damage_target(Actor* attacker) {
         return HIT_RESULT_HIT;
     }
     if (battleStatus->currentAttackElement & DAMAGE_TYPE_BLAST) {
-        if (!(battleStatus->currentAttackElement & DAMAGE_TYPE_NO_CONTACT) && (targetPart->eventFlags & EVENT_FLAG_EXPLOSIVE)) {
+        if (!(battleStatus->currentAttackElement & DAMAGE_TYPE_NO_CONTACT) && (targetPart->eventFlags & ACTOR_EVENT_FLAG_EXPLOSIVE)) {
             do {
                 play_hit_sound(attacker, state->goalPos.x, state->goalPos.y, state->goalPos.z, 3);
             } while (0); // TODO ?
@@ -313,7 +313,7 @@ s32 calc_enemy_damage_target(Actor* attacker) {
     }
     if ((battleStatus->currentAttackElement & DAMAGE_TYPE_QUAKE) && (target->flags & ACTOR_FLAG_FLYING)) {
         play_hit_sound(attacker, state->goalPos.x, state->goalPos.y, state->goalPos.z, 1);
-        return HIT_RESULT_MISS_QUAKE;
+        return HIT_RESULT_QUAKE_IMMUNE;
     }
     if (battleStatus->currentAttackElement & DAMAGE_TYPE_FIRE) {
         playFX_24(0, state->goalPos.x, state->goalPos.y, state->goalPos.z + 5.0f, 1.0f, 0x18);
@@ -331,7 +331,7 @@ s32 calc_enemy_damage_target(Actor* attacker) {
     }
 
     if (!(attacker->staticStatus == STATUS_STATIC)) {
-        if ((target->staticStatus == STATUS_STATIC) || (targetPart->eventFlags & EVENT_FLAG_ELECTRIFIED)) {
+        if ((target->staticStatus == STATUS_STATIC) || (targetPart->eventFlags & ACTOR_EVENT_FLAG_ELECTRIFIED)) {
             if (!(battleStatus->currentAttackElement & (DAMAGE_TYPE_ELECTRIC | DAMAGE_TYPE_NO_CONTACT))) {
                 if (!(battleStatus->currentAttackEventSuppression & 8)) {
                     if (!has_enchanted_part(attacker)) {
@@ -419,7 +419,7 @@ s32 calc_enemy_damage_target(Actor* attacker) {
     switch (actorMasked) {
         case ACTOR_PLAYER:
             // TODO figure out how to better write target->debuff >= STATUS_POISON
-            if ((target->debuff == 0 || target->debuff >= STATUS_POISON) && (target->stoneStatus == STATUS_END) && !(battleStatus->currentAttackElement & DAMAGE_TYPE_2000000)) {
+            if ((target->debuff == 0 || target->debuff >= STATUS_POISON) && (target->stoneStatus == STATUS_END) && !(battleStatus->currentAttackElement & DAMAGE_TYPE_UNBLOCKABLE)) {
                 s32 blocked;
 
                 if (player_team_is_ability_active(target, ABILITY_BERSERKER)) {
@@ -441,7 +441,7 @@ s32 calc_enemy_damage_target(Actor* attacker) {
             break;
         case ACTOR_PARTNER:
             if (target->stoneStatus == STATUS_END) {
-                if (target->koStatus == STATUS_END && !(battleStatus->currentAttackElement & DAMAGE_TYPE_2000000)) {
+                if (target->koStatus == STATUS_END && !(battleStatus->currentAttackElement & DAMAGE_TYPE_UNBLOCKABLE)) {
                     if (check_block_input(BUTTON_A)) {
                         damage = 0;
                         sfx_play_sound_at_position(SOUND_UNKNOWN_231, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
@@ -462,12 +462,12 @@ s32 calc_enemy_damage_target(Actor* attacker) {
     event = EVENT_HIT_COMBO;
     if (damage <= 0) {
         target->hpChangeCounter = 0;
-        if (!(battleStatus->currentAttackElement & DAMAGE_TYPE_40000000)) {
+        if (!(battleStatus->currentAttackElement & DAMAGE_TYPE_STATUS_ALWAYS_HITS)) {
-            hitResult = HIT_RESULT_MISS_QUAKE;
+            hitResult = HIT_RESULT_QUAKE_IMMUNE;
-            event = EVENT_23;
+            event = EVENT_UNKNOWN_TRIGGER;
         } else {
-            hitResult = HIT_RESULT_MISS_QUAKE;
+            hitResult = HIT_RESULT_QUAKE_IMMUNE;
-            event = EVENT_23;
+            event = EVENT_UNKNOWN_TRIGGER;
             if (target->currentHP <= 0) {
                 event = EVENT_DEATH;
             }
@@ -478,7 +478,7 @@ s32 calc_enemy_damage_target(Actor* attacker) {
         target->hpChangeCounter -= damage;
         battleStatus->lastAttackDamage = 0;
         hitResult = HIT_RESULT_HIT;
-        if (!(targetPart->flags & PART_FLAG_2000)) {
+        if (!(targetPart->flags & ACTOR_PART_FLAG_2000)) {
             if (!(gBattleStatus.flags1 & BS_FLAGS1_2000000)) {
                 if (!(target->flags & ACTOR_FLAG_NO_DMG_APPLY)) {
                     target->currentHP -= damage;
@@ -504,7 +504,7 @@ s32 calc_enemy_damage_target(Actor* attacker) {
         if (event == EVENT_HIT_COMBO) {
             event = EVENT_HIT;
         }
-        if (event == EVENT_23) {
+        if (event == EVENT_UNKNOWN_TRIGGER) {
             event = EVENT_IMMUNE;
         }
         if (target->currentHP <= 0 && event == EVENT_IMMUNE) {
@@ -520,7 +520,7 @@ s32 calc_enemy_damage_target(Actor* attacker) {
 
     if (gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE) {
         if (battleStatus->currentAttackElement & (DAMAGE_TYPE_POW | DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_JUMP)) {
-            if (targetPart->eventFlags & EVENT_FLAG_FLIPABLE) {
+            if (targetPart->eventFlags & ACTOR_EVENT_FLAG_FLIPABLE) {
                 if (event == EVENT_HIT) {
                     event = EVENT_FLIP_TRIGGER;
                 }
@@ -533,11 +533,11 @@ s32 calc_enemy_damage_target(Actor* attacker) {
 
     if (!(gBattleStatus.flags1 & BS_FLAGS1_SP_EVT_ACTIVE)) {
         if (battleStatus->currentAttackElement & (DAMAGE_TYPE_POW | DAMAGE_TYPE_QUAKE | DAMAGE_TYPE_JUMP)) {
-            if (targetPart->eventFlags & EVENT_FLAG_FLIPABLE) {
+            if (targetPart->eventFlags & ACTOR_EVENT_FLAG_FLIPABLE) {
                 if (event == EVENT_HIT_COMBO) {
                     event = EVENT_FLIP_TRIGGER;
                 }
-                if (event == EVENT_23) {
+                if (event == EVENT_UNKNOWN_TRIGGER) {
                     event = EVENT_FLIP_TRIGGER;
                 }
             }
@@ -550,7 +550,7 @@ s32 calc_enemy_damage_target(Actor* attacker) {
                 event = EVENT_BURN_HIT;
             }
             if (event == EVENT_DEATH) {
-                event = EVENT_41;
+                event = EVENT_FIRE_DEATH;
             }
             isFire = TRUE;
         }
@@ -558,13 +558,13 @@ s32 calc_enemy_damage_target(Actor* attacker) {
 
     if (gBattleStatus.flags1 & BS_FLAGS1_ATK_BLOCKED) {
         if (event == EVENT_HIT_COMBO) {
-            event = EVENT_24;
+            event = EVENT_18;
         }
         if (event == EVENT_HIT) {
             event = EVENT_BLOCK;
         }
-        if (event == EVENT_23) {
+        if (event == EVENT_UNKNOWN_TRIGGER) {
-            event = EVENT_24;
+            event = EVENT_18;
         }
         if (event == EVENT_IMMUNE) {
             event = EVENT_BLOCK;
@@ -633,7 +633,7 @@ s32 calc_enemy_damage_target(Actor* attacker) {
                             }
 
                             if (statusInflicted) {
-                                if (event == EVENT_23) {
+                                if (event == EVENT_UNKNOWN_TRIGGER) {
                                     event = EVENT_HIT_COMBO;
                                 }
                                 if (event == EVENT_IMMUNE) {
@@ -675,7 +675,7 @@ s32 calc_enemy_damage_target(Actor* attacker) {
                         // immune star fx?
                         func_8024EFE0(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, -3);
                     }
-                } else if (battleStatus->currentAttackElement & (DAMAGE_TYPE_UNBLOCKABLE | DAMAGE_TYPE_SMASH)) {
+                } else if (battleStatus->currentAttackElement & (DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS | DAMAGE_TYPE_SMASH)) {
                     show_damage_popup(state->goalPos.x, state->goalPos.y, state->goalPos.z, battleStatus->lastAttackDamage, 1);
                     func_802666E4(target, state->goalPos.x, state->goalPos.y, state->goalPos.z, battleStatus->lastAttackDamage);
                 } else {
@@ -689,7 +689,7 @@ s32 calc_enemy_damage_target(Actor* attacker) {
                     if (!statusInflicted2 && !statusInflicted) {
                         func_8024EFE0(state->goalPos.x, state->goalPos.y, state->goalPos.z, 0, 1, 3);
                     }
-                } else if (battleStatus->currentAttackElement & (DAMAGE_TYPE_UNBLOCKABLE | DAMAGE_TYPE_SMASH)) {
+                } else if (battleStatus->currentAttackElement & (DAMAGE_TYPE_NO_OTHER_DAMAGE_POPUPS | DAMAGE_TYPE_SMASH)) {
                     show_damage_popup(state->goalPos.x, state->goalPos.y, state->goalPos.z, battleStatus->lastAttackDamage, 0);
                     func_802666E4(target, state->goalPos.x, state->goalPos.y, state->goalPos.z, battleStatus->lastAttackDamage);
                 } else {
@@ -720,7 +720,7 @@ s32 calc_enemy_damage_target(Actor* attacker) {
         play_hit_sound(target, state->goalPos.x, state->goalPos.y, state->goalPos.z, hitSound);
     }
 
-    if ((battleStatus->lastAttackDamage <= 0 && !statusInflicted2 && !isEnchanted) || targetPart->flags & PART_FLAG_2000) {
+    if ((battleStatus->lastAttackDamage <= 0 && !statusInflicted2 && !isEnchanted) || targetPart->flags & ACTOR_PART_FLAG_2000) {
         sfx_play_sound_at_position(SOUND_10C, 0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
     }
 
@@ -783,7 +783,7 @@ s32 calc_enemy_damage_target(Actor* attacker) {
     func_80266ADC(target);
     if ((
             attacker->staticStatus != STATUS_STATIC
-            && (target->staticStatus == STATUS_STATIC || (targetPart->eventFlags & EVENT_FLAG_ELECTRIFIED))
+            && (target->staticStatus == STATUS_STATIC || (targetPart->eventFlags & ACTOR_EVENT_FLAG_ELECTRIFIED))
         )
         && !(battleStatus->currentAttackElement & DAMAGE_TYPE_NO_CONTACT)
         && !(battleStatus->currentAttackEventSuppression & 8)
@@ -834,7 +834,7 @@ s32 dispatch_damage_event_actor(Actor* actor, s32 damageAmount, s32 originalEven
         if (dispatchEvent == EVENT_HIT_COMBO) {
             dispatchEvent = EVENT_HIT;
         }
-        if (dispatchEvent == EVENT_23) {
+        if (dispatchEvent == EVENT_UNKNOWN_TRIGGER) {
             dispatchEvent = EVENT_IMMUNE;
         }
     }
@@ -1252,9 +1252,9 @@ ApiStatus DropStarPoints(Evt* script, s32 isInitialCall) {
         s32 i;
 
         if (dropper->flags & ACTOR_FLAG_HP_OFFSET_BELOW) {
-            spawnMode = ITEM_SPAWN_MODE_UNKNOWN_19;
+            spawnMode = ITEM_SPAWN_MODE_TOSS_FADE3;
         } else {
-            spawnMode = ITEM_SPAWN_MODE_UNKNOWN_17;
+            spawnMode = ITEM_SPAWN_MODE_TOSS_FADE1;
         }
 
         for (i = 0; i < numToDrop; i++) {

src/1a1f0_len_5390.c

@@ -523,15 +523,15 @@ s8 check_conversation_trigger(void) {
                 continue;
             }
 
-            if (encounterEnemy->flags & 0x80000020) {
+            if (encounterEnemy->flags & (ENEMY_FLAGS_80000000 | ENEMY_FLAGS_20)) {
                 continue;
             }
 
-            if (!(encounterEnemy->flags & 1)) {
+            if (!(encounterEnemy->flags & ENEMY_FLAGS_1)) {
                 continue;
             }
 
-            if ((encounterEnemy->flags & 0x8000000) || encounterEnemy->interactBytecode == NULL) {
+            if ((encounterEnemy->flags & ENEMY_FLAGS_8000000) || encounterEnemy->interactBytecode == NULL) {
                 continue;
             }
 
@@ -568,7 +568,7 @@ s8 check_conversation_trigger(void) {
                 continue;
             }
 
-            if (!(encounterEnemy->flags & 0x10000) && encounterNpc->flags & 0x20000000) {
+            if (!(encounterEnemy->flags & ENEMY_FLAGS_10000) && encounterNpc->flags & 0x20000000) {
                 xTemp = npcX;
                 yTemp = npcY;
                 zTemp = npcZ;
@@ -590,7 +590,7 @@ s8 check_conversation_trigger(void) {
         }
     }
 
-    if (!(playerStatus->animFlags & PLAYER_ANIM_FLAG_8BIT_MARIO) && npc != NULL && !is_picking_up_item()) {
+    if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO) && npc != NULL && !is_picking_up_item()) {
         playerStatus->unk_C8 = npc;
         playerStatus->flags |= 0x2000000;
         if (playerStatus->pressedButtons & BUTTON_A) {

src/23680.c

@@ -38,7 +38,7 @@ s32 get_coin_drop_amount(Enemy* enemy) {
 
     amt += currentEncounter->coinsEarned;
 
-    if (enemy->flags & 0x840000) {
+    if (enemy->flags & (ENEMY_FLAGS_800000 | ENEMY_FLAGS_40000)) {
         amt = 0;
     }
 
@@ -93,7 +93,7 @@ s32 func_80048F0C(void) {
             for (j = 0; j < encounter->count; j++) {
                 Enemy* enemy = encounter->enemy[j];
 
-                if (enemy != NULL && !(enemy->flags & 0x20)) {
+                if (enemy != NULL && !(enemy->flags & ENEMY_FLAGS_20)) {
                     get_npc_unsafe(enemy->npcID);
                 }
             }

src/77480.c

@@ -236,7 +236,7 @@ void update_player(void) {
         }
     }
 
-    if (!(playerStatus->animFlags & PLAYER_ANIM_FLAG_PEACH_PHYSICS)) {
+    if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS)) {
         func_800EFD08();
     }
 
@@ -249,7 +249,7 @@ void update_player(void) {
     gameStatus->playerYaw = playerStatus->currentYaw;
 
     check_input_open_menus();
-    if (!(playerStatus->animFlags & PLAYER_ANIM_FLAG_PEACH_PHYSICS)) {
+    if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS)) {
         check_input_status_menu();
     }
 
@@ -307,14 +307,14 @@ void phys_update_standard(void) {
 
     check_input_midair_jump();
 
-    if (playerStatus->actionState != ACTION_STATE_SLIDE) {
+    if (playerStatus->actionState != ACTION_STATE_SLIDING) {
         collision_main_lateral();
         collision_check_player_overlaps();
 
         if (
             collision_main_above() < 0 &&
             playerStatus->decorationList == 0 &&
-            playerStatus->animFlags & PLAYER_ANIM_FLAG_PEACH_PHYSICS
+            playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS
         ) {
             func_800E4F10();
         }
@@ -468,7 +468,7 @@ s32 enable_player_input(void) {
 void func_800E01DC(void) {
     PlayerStatus* playerStatus = &gPlayerStatus;
 
-    if (playerStatus->animFlags & PLAYER_ANIM_FLAG_INTERACT_PROMPT) {
+    if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_INTERACT_PROMPT_AVAILABLE) {
         playerStatus->flags |= 0x8000000;
     }
 }
@@ -517,14 +517,14 @@ INCLUDE_ASM(s32, "77480", check_for_ispy);
 #endif
 
 void func_800E0330(void) {
-    if ((gPlayerStatusPtr->animFlags & PLAYER_ANIM_FLAG_100) && (D_8010C93C != NULL)) {
+    if ((gPlayerStatusPtr->animFlags & PLAYER_STATUS_ANIM_FLAGS_100) && (D_8010C93C != NULL)) {
         func_802B7000_E225B0();
     }
 }
 
 void func_800E0374(void) {
     D_8010C93C = NULL;
-    gPlayerStatusPtr->animFlags &= ~PLAYER_ANIM_FLAG_100;
+    gPlayerStatusPtr->animFlags &= ~PLAYER_STATUS_ANIM_FLAGS_100;
 }
 
 INCLUDE_ASM(s32, "77480", check_for_pulse_stone);

src/7E9D0.c

@@ -86,7 +86,7 @@ void set_action_state(s32 actionState) {
             actionState == ACTION_STATE_IDLE || actionState == ACTION_STATE_WALK ||
             actionState == ACTION_STATE_RUN || actionState == ACTION_STATE_JUMP ||
             actionState == ACTION_STATE_BOUNCE || actionState == ACTION_STATE_HOP ||
-            actionState == ACTION_STATE_LAUNCH || actionState == ACTION_STATE_LAND_ON_SWITCH ||
+            actionState == ACTION_STATE_LAUNCH || actionState == ACTION_STATE_LANDING_ON_SWITCH ||
             actionState == ACTION_STATE_FALLING || actionState == ACTION_STATE_STEP_DOWN ||
             actionState == ACTION_STATE_LAND || actionState == ACTION_STATE_STEP_DOWN_LAND
         ) {
@@ -120,7 +120,7 @@ void set_action_state(s32 actionState) {
         }
     }
 
-    if (actionState == ACTION_STATE_SLIDE) {
+    if (actionState == ACTION_STATE_SLIDING) {
         playerStatus->flags |= 0x10;
         playerStatus->moveFrames = 0;
         playerStatus->flags &= ~0x4000;
@@ -218,7 +218,7 @@ void check_input_spin(void) {
     Temp8010F250* temp_8010F250 = &D_8010F250;
     Temp8010F250* temp2 = temp_8010F250;
 
-    if (!(playerStatus->flags & (PLAYER_ANIM_FLAG_8BIT_MARIO | PLAYER_ANIM_FLAG_PEACH_PHYSICS)) &&
+    if (!(playerStatus->flags & (PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO | PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS)) &&
         !(playerStatus->animFlags & 1) &&
         !(playerStatus->currentButtons & D_CBUTTONS) &&
         !is_ability_active(ABILITY_SLOW_GO)) {
@@ -260,9 +260,9 @@ void func_800E63A4(s32 arg0) {
     PlayerStatus* playerStatus = &gPlayerStatus;
 
     if (arg0 != 0) {
-        set_action_state(ACTION_STATE_SNEAKY_PARASOL);
+        set_action_state(ACTION_STATE_USE_SNEAKY_PARASOL);
     } else {
-        playerStatus->animFlags &= ~PLAYER_ANIM_FLAG_IN_DISGUISE;
+        playerStatus->animFlags &= ~PLAYER_STATUS_ANIM_FLAGS_IN_DISGUISE;
         gGameStatusPtr->peachFlags &= ~0x2;
         playerStatus->peachDisguise = 0;
         free_npc_by_index(D_8010C96C);
@@ -282,7 +282,7 @@ void peach_check_for_parasol_input(void) {
             D_8010C92C--;
             if (D_8010C92C == 0) {
                 if (gGameStatusPtr->peachFlags & 2) {
-                    playerStatus->animFlags |= PLAYER_ANIM_FLAG_IN_DISGUISE;
+                    playerStatus->animFlags |= PLAYER_STATUS_ANIM_FLAGS_IN_DISGUISE;
                     gGameStatusPtr->peachFlags |= 2;
 
                     disguiseNpc = peach_make_disguise_npc(gGameStatusPtr->peachDisguise);
@@ -292,7 +292,7 @@ void peach_check_for_parasol_input(void) {
                 }
             }
         } else if (gGameStatusPtr->peachFlags & 4 && playerStatus->pressedButtons & B_BUTTON) {
-            set_action_state(ACTION_STATE_SNEAKY_PARASOL);
+            set_action_state(ACTION_STATE_USE_SNEAKY_PARASOL);
         }
     }
 }

src/7bb60_len_41b0.c

@@ -126,7 +126,7 @@ void gravity_use_fall_parms(void) {
 }
 
 void phys_update_falling(void) {
-    if (gPlayerStatus.actionState != ACTION_STATE_LAND_ON_SWITCH && gPlayerStatus.actionState != ACTION_STATE_BOUNCE) {
+    if (gPlayerStatus.actionState != ACTION_STATE_LANDING_ON_SWITCH && gPlayerStatus.actionState != ACTION_STATE_BOUNCE) {
         s32* colliderID;
 
         gPlayerStatus.position.y = player_check_collision_below(func_800E34D8(), &colliderID);
@@ -333,8 +333,8 @@ void func_800E4F10(void) {
     playerStatus->position.x = x;
     playerStatus->position.z = z;
 
-    if (tempB != 0 && temp < 0 && playerStatus->actionState != ACTION_STATE_18 && playerStatus->currentSpeed != 0.0f) {
+    if (tempB != 0 && temp < 0 && playerStatus->actionState != ACTION_STATE_STEP_UP_PEACH && playerStatus->currentSpeed != 0.0f) {
-        set_action_state(ACTION_STATE_18);
+        set_action_state(ACTION_STATE_STEP_UP_PEACH);
     }
 }
 

src/80850_len_3060.c

@@ -950,7 +950,7 @@ s32 is_ability_active(s32 ability) {
             case ABILITY_FEELING_FINE:
                 abilityMoveID = 0x43;
                 break;
-            case ABILITY_ATTACK_F_X:
+            case ABILITY_ATTACK_FX:
                 if (badgeMoveID == 0x54) {
                     attackFXArray[attackFXIndex++] = 1;
                     ret = -1;

src/B4580.c

@@ -209,7 +209,7 @@ void reset_animator_list(void) {
 void delete_model_animator_node(AnimatorNode* node) {
     s32 i;
 
-    node->flags = 0;
+    node->flags = ANIMATOR_NODE_FLAGS_0;
 
     for (i = 0; i < ARRAY_COUNT(node->children); i++) {
         if (node->children[i] != NULL) {
@@ -268,7 +268,7 @@ s32 create_model_animator(s8* animPos) {
 
     ASSERT(animator != NULL);
 
-    animator->flags = 0x40 | 0x10 | 0x4 | 0x2 | 0x1;
+    animator->flags = MODEL_ANIMATOR_FLAGS_40 | MODEL_ANIMATOR_FLAGS_10 | MODEL_ANIMATOR_FLAGS_4 | MODEL_ANIMATOR_FLAGS_2 | MODEL_ANIMATOR_FLAGS_1;
     animator->renderMode = RENDER_MODE_ALPHATEST;
     animator->nextUpdateTime = 1.0f;
     animator->timeScale = 1.0f;
@@ -312,7 +312,7 @@ s32 create_mesh_animator(s32 animPos, s8* animBuffer) {
 
     ASSERT(animator != NULL);
 
-    animator->flags = 0x40 | 0x10 | 0x4 | 0x2 | 0x1;
+    animator->flags = MODEL_ANIMATOR_FLAGS_40 | MODEL_ANIMATOR_FLAGS_10 | MODEL_ANIMATOR_FLAGS_4 | MODEL_ANIMATOR_FLAGS_2 | MODEL_ANIMATOR_FLAGS_1;
     animator->renderMode = RENDER_MODE_ALPHATEST;
     animator->vertexArray = NULL;
     animator->fpRenderCallback = NULL;
@@ -345,7 +345,7 @@ AnimatorNode* add_anim_node(ModelAnimator* animator, s32 parentNodeID, AnimatorN
     ret = heap_malloc(sizeof(*ret));
     ASSERT(ret != NULL);
 
-    ret->flags = 0x10;
+    ret->flags = ANIMATOR_NODE_FLAGS_10;
     ret->displayList = nodeBP->displayList;
     ret->basePos.x = nodeBP->basePos.x;
     ret->basePos.y = nodeBP->basePos.y;
@@ -417,11 +417,11 @@ void update_model_animator(s32 animatorID) {
         if (animator != NULL && animator->flags != 0) {
             s32 temp = 0;
 
-            if (!(animator->flags & 0x40000)) {
+            if (!(animator->flags & MODEL_ANIMATOR_FLAGS_40000)) {
-                animator->flags &= ~0x40;
+                animator->flags &= ~MODEL_ANIMATOR_FLAGS_40;
                 animator->nextUpdateTime -= animator->timeScale;
                 if (animator->nextUpdateTime <= 0.0f) {
-                    if (!(animator->flags & 0x8000)) {
+                    if (!(animator->flags & MODEL_ANIMATOR_FLAGS_8000)) {
                         do {
                             temp = step_model_animator(animator);
                         } while (temp > 0);
@@ -474,11 +474,11 @@ void update_model_animator_with_transform(s32 animatorID, Mtx* mtx) {
         if (animator != NULL && animator->flags != 0) {
             s32 temp = 0;
 
-            if (!(animator->flags & 0x40000)) {
+            if (!(animator->flags & MODEL_ANIMATOR_FLAGS_40000)) {
-                animator->flags &= ~0x40;
+                animator->flags &= ~MODEL_ANIMATOR_FLAGS_40;
                 animator->nextUpdateTime -= animator->timeScale;
                 if (animator->nextUpdateTime <= 0.0f) {
-                    if (!(animator->flags & 0x8000)) {
+                    if (!(animator->flags & MODEL_ANIMATOR_FLAGS_8000)) {
                         do {
                             temp = step_model_animator(animator);
                         } while (temp > 0);
@@ -527,7 +527,7 @@ void animator_update_model_transforms(ModelAnimator* animator, Mtx* rootTransfor
     Matrix4f flipMtx;
 
     if (animator->rootNode != NULL) {
-        switch (animator->flags & 0x700) {
+        switch (animator->flags & (MODEL_ANIMATOR_FLAGS_100 | MODEL_ANIMATOR_FLAGS_200 | MODEL_ANIMATOR_FLAGS_400)) {
             case 0x100:
                 animator_make_mirrorZ(flipMtx);
                 break;
@@ -556,19 +556,19 @@ void animator_node_update_model_transform(ModelAnimator* animator, f32 (*flipMtx
     guMtxCatF(gAnimScaleMtx, gAnimRotMtx, gAnimRotScaleMtx);
     guMtxCatF(gAnimRotScaleMtx, gAnimTranslateMtx, sp10);
 
-    if (!(animator->flags & 0x20000)) {
+    if (!(animator->flags & MODEL_ANIMATOR_FLAGS_20000)) {
         guMtxCatF(sp10, flipMtx, sp10);
     }
 
     copy_matrix(sp10, node->mtx);
 
-    if (node->flags & 0x1000) {
+    if (node->flags & ANIMATOR_NODE_FLAGS_1000) {
         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 |= 0x1000;
+        model->flags |= MODEL_FLAGS_USES_TRANSFORM_MATRIX;
     }
 
     for (i = 0; i < ARRAY_COUNT(node->children); i++) {
@@ -587,8 +587,8 @@ void render_animated_model(s32 animatorID, Mtx* rootTransform) {
 
         animatorID &= ~0x800;
         animator = (*gCurrentAnimMeshListPtr)[animatorID];
-        if (animator != NULL && animator->flags != 0 && !(animator->flags & 0x40) &&
+        if (animator != NULL && animator->flags != 0 && !(animator->flags & MODEL_ANIMATOR_FLAGS_40) &&
-            animator->flags & (1 << gCurrentCamID) && !(animator->flags & 0x80))
+            animator->flags & (1 << gCurrentCamID) && !(animator->flags & MODEL_ANIMATOR_FLAGS_80))
         {
             animator->mtx = *rootTransform;
             animator->vertexArray = NULL;
@@ -610,8 +610,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 & 0x40) &&
+        if (animator != NULL && animator->flags != 0 && !(animator->flags & MODEL_ANIMATOR_FLAGS_40) &&
-            animator->flags & (1 << gCurrentCamID) && !(animator->flags & 0x80))
+            animator->flags & (1 << gCurrentCamID) && !(animator->flags & MODEL_ANIMATOR_FLAGS_80))
         {
             animator->mtx = *rootTransform;
             D_80153A60 = vtxSegment;
@@ -758,7 +758,7 @@ void load_model_animator_node(StaticAnimatorNode* node, ModelAnimator* animator,
 
         if (node->modelID != 0) {
             newNode->fcData.modelID = node->modelID - 1;
-            newNode->flags |= 0x1000;
+            newNode->flags |= ANIMATOR_NODE_FLAGS_1000;
         }
 
         i = 0;
@@ -825,7 +825,7 @@ void load_mesh_animator_tree(s32 index, StaticAnimatorNode** tree) {
         }
 
         load_mesh_animator_node(*gAnimTreeRoot, animator, 0, nodeIDs);
-        animator->flags |= 0x8000;
+        animator->flags |= MODEL_ANIMATOR_FLAGS_8000;
     }
 }
 

src/C50A0.c

@@ -108,20 +108,20 @@ ItemEntity* get_item_entity(s32 itemEntityIndex) {
 void item_entity_disable_shadow(ItemEntity* itemEntity) {
     Shadow* shadow;
 
-    itemEntity->flags |= 0x40;
+    itemEntity->flags |= ENTITY_FLAGS_CONTINUOUS_COLLISION;
     if (itemEntity->shadowIndex >= 0) {
         shadow = get_shadow_by_index(itemEntity->shadowIndex);
-        shadow->flags |= 1;
+        shadow->flags |= SHADOW_FLAGS_1;
     }
 }
 
 void item_entity_enable_shadow(ItemEntity* itemEntity) {
     Shadow* shadow;
 
-    itemEntity->flags &= ~0x40;
+    itemEntity->flags &= ~ENTITY_FLAGS_CONTINUOUS_COLLISION;
     if (itemEntity->shadowIndex >= 0) {
         shadow = get_shadow_by_index(itemEntity->shadowIndex);
-        shadow->flags &= ~1;
+        shadow->flags &= ~SHADOW_FLAGS_1;
     }
 }
 
@@ -250,12 +250,12 @@ void func_80133A94(s32 idx, s32 itemID) {
 
     item->itemID = itemID;
 
-    item->flags |= 0x4000;
+    item->flags |= ENTITY_FLAGS_4000;
-    item->flags &= ~0x40000;
+    item->flags &= ~ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2;
 
     if (gItemTable[itemID].typeFlags & 0x1000) {
-        item->flags |= 0x40000;
+        item->flags |= ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2;
-        item->flags &= ~0x4000;
+        item->flags &= ~ENTITY_FLAGS_4000;
     }
 
     item_entity_load(item);
@@ -270,7 +270,7 @@ void set_item_entity_flags(s32 index, s32 flags) {
     ItemEntity* itemEntity = D_801565A0[index];
 
     itemEntity->flags |= flags;
-    if (itemEntity->flags & 0x200000) {
+    if (itemEntity->flags & ENTITY_FLAGS_200000) {
         D_801565A8 = 1;
     }
 }
@@ -284,7 +284,7 @@ void clear_item_entity_flags(s32 index, s32 flags) {
 void func_801341B0(s32 index) {
     ItemEntity* itemEntity = D_801565A0[index];
     gOverrideFlags |= 0x40;
-    itemEntity->flags |= 0x100;
+    itemEntity->flags |= ENTITY_FLAGS_100;
 }
 
 /// @returns TRUE when "you got X" popup is on-screen

src/EF2680.c

@@ -232,7 +232,7 @@ ApiStatus func_8024299C_EF4FAC(Evt* script, s32 isInitialCall) {
         npc->duration = 0;
         npc->currentAnim.w = enemy->animList[0];
         npc->flags &= ~0x800;
-        enemy->flags |= 0x200000;
+        enemy->flags |= ENEMY_FLAGS_200000;
         npc->flags = (npc->flags & ~0x200) | 8;
         enemy->varTable[10] = 0;
         enemy->varTable[11] = -1;

src/a5dd0_len_114e0.c

@@ -758,33 +758,33 @@ void update_entities(void) {
         if (entity != NULL) {
             D_801512C0++;
 
-            if (!(entity->flags & 0x40000000)) {
+            if (!(entity->flags & ENTITY_FLAGS_SKIP_UPDATE)) {
-                if (entity->flags & 0x1000000) {
+                if (entity->flags & ENTITY_FLAGS_BOUND_SCRIPT_DIRTY) {
-                    entity->flags &= ~0x1000000;
+                    entity->flags &= ~ENTITY_FLAGS_BOUND_SCRIPT_DIRTY;
-                    if (!(entity->flags & 0x8000)) {
+                    if (!(entity->flags & ENTITY_FLAGS_8000)) {
-                        entity->flags |= 0x2000000;
+                        entity->flags |= ENTITY_FLAGS_2000000;
                     }
                     entity->boundScript = start_script(entity->boundScriptBytecode, 0xA, 0x20);
                 }
 
-                if (entity->flags & 0x2000000) {
+                if (entity->flags & ENTITY_FLAGS_2000000) {
                     if (does_script_exist(entity->boundScript->id)) {
-                        if (entity->flags & 8) {
+                        if (entity->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) {
                             update_model_animator(entity->virtualModelIndex);
                         } else {
                             exec_entity_model_commandlist(entity->virtualModelIndex);
                         }
 
-                        if (entity->flags & 0x2000) {
+                        if (entity->flags & ENTITY_FLAGS_ALWAYS_FACE_CAMERA) {
                             entity->rotation.y = -gCameras[gCurrentCameraID].currentYaw;
                         }
 
-                        if (!(entity->flags & 0x10)) {
+                        if (!(entity->flags & ENTITY_FLAGS_SKIP_UPDATE_TRANSFORM_MATRIX)) {
                             update_entity_transform_matrix(entity);
                         }
                         continue;
                     } else {
-                        entity->flags &= ~0x2000000;
+                        entity->flags &= ~ENTITY_FLAGS_2000000;
                     }
                 }
 
@@ -796,25 +796,25 @@ void update_entities(void) {
 
                         if (entityCallback != NULL && entityCallback(entity) != 0) {
                             entity->unk_07 = 0xA;
-                            entity->flags |= 0x10000;
+                            entity->flags |= ENTITY_FLAGS_DETECTED_COLLISION;
                         }
                     }
                 } else {
                     entity->unk_07--;
-                    if (entity->flags & 0x40) {
+                    if (entity->flags & ENTITY_FLAGS_CONTINUOUS_COLLISION) {
                         if (entity->unk_07 == 0) {
-                            entity->flags &= ~0x60;
+                            entity->flags &= ~(ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX | ENTITY_FLAGS_CONTINUOUS_COLLISION);
                         } else {
-                            entity->flags |= 0x20;
+                            entity->flags |= ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX;
                         }
                     } else if (entity->unk_07 == 0) {
-                        entity->flags &= ~0x10000;
+                        entity->flags &= ~ENTITY_FLAGS_DETECTED_COLLISION;
-                        entity->flags &= ~0x20000;
+                        entity->flags &= ~ENTITY_FLAGS_BLOCK_BEING_HIT;
                         entity->collisionFlags = 0;
                     }
                 }
 
-                if (entity->flags & 0x2000) {
+                if (entity->flags & ENTITY_FLAGS_ALWAYS_FACE_CAMERA) {
                     entity->rotation.y = -gCameras[gCurrentCameraID].currentYaw;
                 }
 
@@ -833,15 +833,15 @@ void update_entities(void) {
                     }
                 }
 
-                if (!(entity->flags & 0x10)) {
+                if (!(entity->flags & ENTITY_FLAGS_SKIP_UPDATE_TRANSFORM_MATRIX)) {
                     update_entity_transform_matrix(entity);
                 }
 
-                if (!(entity->flags & 0x20)) {
+                if (!(entity->flags & ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX)) {
                     update_entity_inverse_rotation_matrix(entity);
                 }
 
-                if (entity->flags & 8) {
+                if (entity->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) {
                     update_model_animator(entity->virtualModelIndex);
                 } else {
                     exec_entity_model_commandlist(entity->virtualModelIndex);
@@ -851,11 +851,11 @@ void update_entities(void) {
                     update_entity_shadow_position(entity);
                 }
 
-                if (entity->flags & 0x20000000) {
+                if (entity->flags & ENTITY_FLAGS_PENDING_INSTANCE_DELETE) {
                     delete_entity(entity->listIndex);
                 }
 
-                if (entity->flags & 0x4000000) {
+                if (entity->flags & ENTITY_FLAGS_PENDING_FULL_DELETE) {
                     delete_entity_and_unload_data(entity->listIndex);
                 }
             }
@@ -877,20 +877,20 @@ void update_shadows(void) {
         if (shadow != NULL) {
             D_80151324++;
 
-            if (!(shadow->flags & 0x40000000)) {
+            if (!(shadow->flags & SHADOW_FLAGS_40000000)) {
-                if (shadow->flags & 0x2000) {
+                if (shadow->flags & SHADOW_FLAGS_2000) {
                     shadow->rotation.y = -gCameras[gCurrentCameraID].currentYaw;
                 }
 
                 update_shadow_transform_matrix(shadow);
 
-                if (shadow->flags & 8) {
+                if (shadow->flags & SHADOW_FLAGS_8) {
                     update_model_animator(shadow->entityModelID);
                 } else {
                     exec_entity_model_commandlist(shadow->entityModelID);
                 }
 
-                if (shadow->flags & 0x20000000) {
+                if (shadow->flags & SHADOW_FLAGS_20000000) {
                     _delete_shadow(shadow->listIndex);
                 }
             }
@@ -949,7 +949,7 @@ s32 step_entity_commandlist(Entity* entity) {
             break;
         case 6:
             if (entity->boundScriptBytecode != NULL) {
-                entity->flags |= 0x1000000;
+                entity->flags |= ENTITY_FLAGS_BOUND_SCRIPT_DIRTY;
             }
             entity->scriptReadPos = args++;
             ret = TRUE;
@@ -1013,7 +1013,7 @@ void render_entities(void) {
         if (entity != NULL) {
             if (!gGameStatusPtr->isBattle) {
                 if (D_80151310 != 0 &&
-                    !(entity->flags & 0x80000) &&
+                    !(entity->flags & ENTITY_FLAGS_IGNORE_DISTANCE_CULLING) &&
                     dist2D(gPlayerStatusPtr->position.x,
                            gPlayerStatusPtr->position.z,
                            entity->position.x,
@@ -1023,18 +1023,18 @@ void render_entities(void) {
                 }
 
                 if (D_80151310 == 1) {
-                    if (!(entity->flags & 2)) {
+                    if (!(entity->flags & ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE1)) {
                         continue;
                     }
                 } else if (D_80151310 == 2) {
-                    if (!(entity->flags & 0x40000)) {
+                    if (!(entity->flags & ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2)) {
                         continue;
                     }
                 }
             }
 
-            if (!(entity->flags & 1)) {
+            if (!(entity->flags & ENTITY_FLAGS_HIDDEN)) {
-                if (entity->flags & 8) {
+                if (entity->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) {
                     if (D_8014AFB0 == 0xFF) {
                         if (entity->renderSetupFunc != NULL) {
                             set_animator_render_callback(entity->virtualModelIndex, entity->listIndex, entity->renderSetupFunc);
@@ -1087,14 +1087,14 @@ void render_shadows(void) {
         Shadow* shadow = get_shadow_by_index(i);
 
         if (shadow != NULL) {
-            if (shadow->flags & 1) {
+            if (shadow->flags & SHADOW_FLAGS_1) {
-                if (shadow->flags & 0x10000000) {
+                if (shadow->flags & SHADOW_FLAGS_10000000) {
                     shadow->unk_05 -= 20;
                     if (shadow->unk_05 <= 20) {
-                        shadow->flags |= 0x20000000;
+                        shadow->flags |= SHADOW_FLAGS_20000000;
                     }
                 }
-            } else if (shadow->flags & 8) {
+            } else if (shadow->flags & SHADOW_FLAGS_8) {
                 if (shadow->vertexArray == NULL) {
                     render_animated_model(shadow->entityModelID, &shadow->transformMatrix);
                 } else {
@@ -1104,10 +1104,10 @@ void render_shadows(void) {
                                   shadow->vertexArray);
                 }
             } else {
-                if (shadow->flags & 0x10000000) {
+                if (shadow->flags & SHADOW_FLAGS_10000000) {
                     shadow->unk_05 -= 20;
                     if (shadow->unk_05 <= 20) {
-                        shadow->flags |=  0x20000000;
+                        shadow->flags |=  SHADOW_FLAGS_20000000;
                     }
                 }
 
@@ -1164,7 +1164,7 @@ ShadowList* get_shadow_list(void) {
 
 s32 entity_start_script(Entity* entity) {
     if (entity->boundScriptBytecode != NULL) {
-        entity->flags |= 0x1000000;
+        entity->flags |= ENTITY_FLAGS_BOUND_SCRIPT_DIRTY;
         return 1;
     }
     return 0;
@@ -1187,7 +1187,7 @@ void delete_entity(s32 entityIndex) {
         heap_free(entity->dataBuf);
     }
 
-    if (!(entity->flags & 8)) {
+    if (!(entity->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL)) {
         free_entity_model_by_index(entity->virtualModelIndex);
     } else {
         delete_model_animator(get_animator_by_index(entity->virtualModelIndex));
@@ -1196,7 +1196,7 @@ void delete_entity(s32 entityIndex) {
     if (entity->shadowIndex >= 0) {
         Shadow* shadow = get_shadow_by_index(entity->shadowIndex);
 
-        shadow->flags |= 0x10000000;
+        shadow->flags |= SHADOW_FLAGS_10000000;
     }
 
     heap_free((*gCurrentEntityListPtr)[entityIndex]);
@@ -1210,7 +1210,7 @@ void delete_entity_and_unload_data(s32 entityIndex) {
         heap_free(entity->dataBuf);
     }
 
-    if (!(entity->flags & 8)) {
+    if (!(entity->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL)) {
         free_entity_model_by_index(entity->virtualModelIndex);
     } else {
         delete_model_animator(get_animator_by_index(entity->virtualModelIndex));
@@ -1221,7 +1221,7 @@ void delete_entity_and_unload_data(s32 entityIndex) {
     if (entity->shadowIndex >= 0) {
         Shadow* shadow = get_shadow_by_index(entity->shadowIndex);
 
-        shadow->flags |= 0x10000000;
+        shadow->flags |= SHADOW_FLAGS_10000000;
     }
 
     heap_free((*gCurrentEntityListPtr)[entityIndex]);
@@ -1241,9 +1241,9 @@ s32 entity_get_collision_flags(Entity* entity) {
     s32 ret = 0;
     u32 flag;
 
-    if (entity->flags & 0x20000) {
+    if (entity->flags & ENTITY_FLAGS_BLOCK_BEING_HIT) {
         ret = 0x80;
-        entity->flags &= ~0x20000;
+        entity->flags &= ~ENTITY_FLAGS_BLOCK_BEING_HIT;
     }
 
     flag = gCollisionStatus.currentFloor;
@@ -1309,14 +1309,14 @@ s32 is_player_action_state(s8 actionState) {
 }
 
 void entity_set_render_script(Entity* entity, u32* commandList) {
-    if (!(entity->flags & 8)) {
+    if (!(entity->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL)) {
         set_entity_model_render_command_list(entity->virtualModelIndex, commandList);
     }
 }
 
 void func_80110BF8(Entity* entity) {
     entity->unk_07 = 0;
-    entity->flags &= ~0x00010000;
+    entity->flags &= ~ENTITY_FLAGS_DETECTED_COLLISION;
 }
 
 #ifdef NON_MATCHING
@@ -1426,7 +1426,7 @@ s32 create_shadow_from_data(StaticShadowData* data, f32 x, f32 y, f32 z) {
     (*gCurrentShadowListPtr)[i] = shadow;
     mem_clear(shadow, sizeof(*shadow));
     shadow->listIndex = i;
-    shadow->flags = data->flags | 0x80000000;
+    shadow->flags = data->flags | SHADOW_FLAGS_80000000;
     shadow->unk_05 = 0x80;
     shadow->unk_06 = 0x80;
     shadow->position.x = x;
@@ -1437,7 +1437,7 @@ s32 create_shadow_from_data(StaticShadowData* data, f32 x, f32 y, f32 z) {
     shadow->scale.z = 1.0f;
 
     if (data->animModelNode != NULL) {
-        shadow->flags |= 8;
+        shadow->flags |= SHADOW_FLAGS_8;
         shadow->entityModelID = create_model_animator(data->unk_04);
         load_model_animator_tree(shadow->entityModelID, data->animModelNode);
     } else {
@@ -1499,11 +1499,11 @@ ApiStatus UseDynamicShadow(Evt* script, s32 isInitialCall) {
     if (evt_get_variable(script, *script->ptrReadPos)) {
         Shadow* shadow;
 
-        entity->flags |= 4;
+        entity->flags |= ENTITY_FLAGS_HAS_DYNAMIC_SHADOW;
         shadow = get_shadow_by_index(entity->shadowIndex);
-        shadow->flags |= 0x400000;
+        shadow->flags |= SHADOW_FLAGS_400000;
     } else {
-        entity->flags &= ~4;
+        entity->flags &= ~ENTITY_FLAGS_HAS_DYNAMIC_SHADOW;
     }
 
     return ApiStatus_DONE2;
@@ -1532,7 +1532,7 @@ ApiStatus AssignAreaFlag(Evt* script, s32 isInitialCall) {
         // TODO find proper struct for the dataBuf
         ((s16*)(entity->dataBuf))[16] = temp_s0;
         if (get_area_flag(temp_s0) != 0) {
-            entity->flags |= 0x20000000;
+            entity->flags |= ENTITY_FLAGS_PENDING_INSTANCE_DELETE;
         }
         return ApiStatus_DONE2;
     }
@@ -1672,7 +1672,7 @@ void update_entity_shadow_position(Entity* entity) {
         } else {
             u8 alphaTemp;
 
-            if (shadow->flags & 0x800000) {
+            if (shadow->flags & SHADOW_FLAGS_800000) {
                 alphaTemp = 160;
             } else {
                 alphaTemp = 128;
@@ -1680,9 +1680,9 @@ void update_entity_shadow_position(Entity* entity) {
             shadow->unk_05 = alphaTemp;
         }
 
-        if (!(entity->flags & 4)) {
+        if (!(entity->flags & ENTITY_FLAGS_HAS_DYNAMIC_SHADOW)) {
-            if (shadow->flags & 0x400000) {
+            if (shadow->flags & SHADOW_FLAGS_400000) {
-                shadow->flags &= ~0x400000;
+                shadow->flags &= ~SHADOW_FLAGS_400000;
             } else {
                 return;
             }
@@ -1698,7 +1698,7 @@ void update_entity_shadow_position(Entity* entity) {
 
         origHitLength = hitLength;
 
-        if (shadow->flags & 0x200) {
+        if (shadow->flags & SHADOW_FLAGS_200) {
             hitLength = 212.5f;
             shadow->scale.x = entity->aabb.x / hitLength;
             shadow->scale.z = entity->aabb.z / hitLength;
@@ -1717,15 +1717,15 @@ void update_entity_shadow_position(Entity* entity) {
         shadow->rotation.y = entity->rotation.y;
 
         if (entity->position.y < rayY) {
-            shadow->flags |= 0x40000000;
+            shadow->flags |= SHADOW_FLAGS_40000000;
             entity->position.y = rayY + 10.0f;
         } else {
-            shadow->flags &= ~0x40000000;
+            shadow->flags &= ~SHADOW_FLAGS_40000000;
         }
 
-        shadow->flags = (shadow->flags & ~1) | ((u16)entity->flags & 1);
+        shadow->flags = (shadow->flags & ~SHADOW_FLAGS_1) | ((u16)entity->flags & ENTITY_FLAGS_HIDDEN);
-        if (!(entity->flags & 0x400) && origHitLength == 0.0f) {
+        if (!(entity->flags & ENTITY_FLAGS_400) && origHitLength == 0.0f) {
-            shadow->flags |= 1;
+            shadow->flags |= SHADOW_FLAGS_1;
         }
     } else {
         entity->shadowPosY = 0.0f;
@@ -2201,7 +2201,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 |= 0x1000;
+            model->flags |= MODEL_FLAGS_USES_TRANSFORM_MATRIX;
         }
     }
 }
@@ -2284,7 +2284,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 & 2)) {
+                if (!(model->flags & MODEL_FLAGS_ENABLED)) {
                     appendGfx_model_group(model);
                 }
                 mdl_currentTransformGroupChildIndex++;
@@ -2316,7 +2316,7 @@ void render_transform_group_node(ModelNode* node) {
         }
 
         model = get_model_from_list_index(mdl_currentTransformGroupChildIndex);
-        if (!(model->flags & 2)) {
+        if (!(model->flags & MODEL_FLAGS_ENABLED)) {
             appendGfx_model(model);
         }
         mdl_currentTransformGroupChildIndex++;
@@ -2329,14 +2329,14 @@ void render_transform_group(ModelTransformGroup* group) {
     ModelTransformGroup* mtg = group;
     Gfx** gfx = &gMasterGfxPos;
 
-    if (!(mtg->flags & 4)) {
+    if (!(mtg->flags & MODEL_TRANSFORM_GROUP_FLAGS_4)) {
         mdl_currentTransformGroupChildIndex = mtg->minChildModelIndex;
-        if (!(mtg->flags & 0x2000)) {
+        if (!(mtg->flags & MODEL_TRANSFORM_GROUP_FLAGS_2000)) {
             gSPMatrix((*gfx)++, mtg->transformMtx, (G_MTX_PUSH | G_MTX_LOAD) | G_MTX_MODELVIEW);
         }
 
         render_transform_group_node(mtg->modelNode);
-        if (!(mtg->flags & 0x2000)) {
+        if (!(mtg->flags & MODEL_TRANSFORM_GROUP_FLAGS_2000)) {
             gSPPopMatrix((*gfx)++, G_MTX_MODELVIEW);
         }
         gDPPipeSync((*gfx)++);
@@ -2526,7 +2526,7 @@ void make_transform_group(u16 modelID) {
         }
 
         (*gCurrentTransformGroups)[i] = newMtg = heap_malloc(sizeof(ModelTransformGroup));
-        newMtg->flags = 1;
+        newMtg->flags = MODEL_TRANSFORM_GROUP_FLAGS_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);
@@ -2584,10 +2584,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 |= 0x8;
+        model->flags |= MODEL_FLAGS_TRANSFORM_GROUP_MEMBER;
 
         if (model->currentMatrix != NULL) {
-            model->flags |= 0x1000;
+            model->flags |= MODEL_FLAGS_USES_TRANSFORM_MATRIX;
         }
     }
 }
@@ -2596,15 +2596,15 @@ void disable_transform_group(u16 modelID) {
     ModelTransformGroup* group = get_transform_group(get_transform_group_index(modelID));
     s32 i;
 
-    group->flags |= 0x4;
+    group->flags |= MODEL_TRANSFORM_GROUP_FLAGS_4;
 
     for (i = group->minChildModelIndex; i <= group->maxChildModelIndex; i++) {
         Model* model = get_model_from_list_index(i);
 
-        model->flags &= ~0x8;
+        model->flags &= ~MODEL_FLAGS_TRANSFORM_GROUP_MEMBER;
 
         if (model->currentMatrix != NULL) {
-            model->flags |= 0x1000;
+            model->flags |= MODEL_FLAGS_USES_TRANSFORM_MATRIX;
         }
     }
 }
@@ -2636,7 +2636,7 @@ void func_8011BAE8(void) {
         Model* model = (*gCurrentModels)[i];
 
         if (model != NULL) {
-            model->flags &= ~0x0400;
+            model->flags &= ~MODEL_FLAGS_HAS_TRANSFORM_APPLIED;
         }
     }
 
@@ -2644,7 +2644,7 @@ void func_8011BAE8(void) {
         ModelTransformGroup* transformGroup = (*gCurrentTransformGroups)[i];
 
         if (transformGroup != NULL) {
-            transformGroup->flags &= ~0x0400;
+            transformGroup->flags &= ~MODEL_TRANSFORM_GROUP_FLAGS_400;
         }
     }
 }

src/battle/area_kkj/6DBDA0.c

@@ -87,7 +87,7 @@ ApiStatus func_8021849C_6DC23C(Evt* script, s32 isInitialCall) {
     playerStatus->actionState = ACTION_STATE_HAMMER;
     entity->staticData->unk_data_ptr2(entity);
     entity->unk_07 = 0xA;
-    entity->flags |= 0x10000;
+    entity->flags |= ENTITY_FLAGS_DETECTED_COLLISION;
     collisionStatus->lastWallHammered = -1;
 
     return ApiStatus_DONE2;

src/battle/area_kmr_part_1/actor/goomba.c

@@ -40,15 +40,15 @@ EvtSource N(init_802197AC);
 
 ActorPartDesc N(partsTable_802196C8)[] = {
     {
-        .flags = PART_FLAG_MULTI_TARGET,
+        .flags = ACTOR_PART_FLAG_MULTI_TARGET,
         .index = 1,
         .posOffset = { 0, 0, 0 },
         .targetOffset = { 0, 20 },
         .opacity = 255,
         .idleAnimations = N(idleAnimations_80219714),
         .defenseTable = N(defenseTable_80219610),
-        .eventFlags = 0,
+        .eventFlags = ACTOR_EVENT_FLAG_0,
-        .elementImmunityFlags = 0,
+        .elementImmunityFlags = ELEMENT_IMMUNITY_FLAGS_0,
         .unk_1C = 246,
     },
 };

src/battle/area_kmr_part_1/actor/paragoomba.c

@@ -76,51 +76,51 @@ EvtSource N(init_8021CDD8);
 
 ActorPartDesc N(partsTable_8021CC70)[] = {
     {
-        .flags = PART_FLAG_INVISIBLE | PART_FLAG_NO_TARGET,
+        .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET,
         .index = 1,
         .posOffset = { 0, 0, 0 },
         .targetOffset = { 0, 20 },
         .opacity = 255,
         .idleAnimations = N(idleAnimations_8021E4EC),
         .defenseTable = N(defenseTable_8021CB00),
-        .eventFlags = 0,
+        .eventFlags = ACTOR_EVENT_FLAG_0,
-        .elementImmunityFlags = 0,
+        .elementImmunityFlags = ELEMENT_IMMUNITY_FLAGS_0,
         .unk_1C = 246,
     },
     {
-        .flags = PART_FLAG_MULTI_TARGET,
+        .flags = ACTOR_PART_FLAG_MULTI_TARGET,
         .index = 2,
         .posOffset = { 0, 0, 0 },
         .targetOffset = { 0, 24 },
         .opacity = 255,
         .idleAnimations = N(idleAnimations_8021CD28),
         .defenseTable = N(defenseTable_8021CB0C),
-        .eventFlags = EVENT_FLAG_GROUNDABLE,
+        .eventFlags = ACTOR_EVENT_FLAG_GROUNDABLE,
-        .elementImmunityFlags = 0,
+        .elementImmunityFlags = ELEMENT_IMMUNITY_FLAGS_0,
         .unk_1C = 246,
     },
     {
-        .flags = PART_FLAG_INVISIBLE | PART_FLAG_NO_TARGET,
+        .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET,
         .index = 3,
         .posOffset = { 0, 0, 0 },
         .targetOffset = { -16, 24 },
         .opacity = 255,
         .idleAnimations = N(idleAnimations_8021CDC0),
         .defenseTable = N(defenseTable_8021CB00),
-        .eventFlags = 0,
+        .eventFlags = ACTOR_EVENT_FLAG_0,
-        .elementImmunityFlags = 0,
+        .elementImmunityFlags = ELEMENT_IMMUNITY_FLAGS_0,
         .unk_1C = 246,
     },
     {
-        .flags = PART_FLAG_INVISIBLE | PART_FLAG_NO_TARGET,
+        .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET,
         .index = 4,
         .posOffset = { 0, 0, 0 },
         .targetOffset = { -16, 24 },
         .opacity = 255,
         .idleAnimations = N(idleAnimations_8021CDCC),
         .defenseTable = N(defenseTable_8021CB00),
-        .eventFlags = 0,
+        .eventFlags = ACTOR_EVENT_FLAG_0,
-        .elementImmunityFlags = 0,
+        .elementImmunityFlags = ELEMENT_IMMUNITY_FLAGS_0,
         .unk_1C = 246,
     },
 };

src/battle/area_kmr_part_1/actor/spiked_goomba.c

@@ -40,15 +40,15 @@ EvtSource N(init_8021B16C);
 
 ActorPartDesc N(partsTable_8021B088)[] = {
     {
-        .flags = PART_FLAG_MULTI_TARGET,
+        .flags = ACTOR_PART_FLAG_MULTI_TARGET,
         .index = 1,
         .posOffset = { 0, 0, 0 },
         .targetOffset = { 0, 24 },
         .opacity = 255,
         .idleAnimations = N(idleAnimations_8021B0D4),
         .defenseTable = N(defenseTable_8021AFD0),
-        .eventFlags = EVENT_FLAG_SPIKY_TOP,
+        .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP,
-        .elementImmunityFlags = 0,
+        .elementImmunityFlags = ELEMENT_IMMUNITY_FLAGS_0,
         .unk_1C = 244,
     },
 };

src/battle/item/pow_block.c

@@ -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 |= 0x20000000;
+    entity->flags |= ENTITY_FLAGS_PENDING_INSTANCE_DELETE;
 
     return ApiStatus_DONE2;
 }

src/battle/item/repel_gel.c

@@ -9,7 +9,7 @@ ApiStatus N(func_802A123C_72DDAC)(Evt* script, s32 isInitialCall) {
 
     inflict_status(player, STATUS_E, script->varTable[0]);
     player->status = 0;
-    part->flags |= 0x100;
+    part->flags |= ACTOR_PART_FLAG_100;
 
     return ApiStatus_DONE2;
 }

src/battle/item/sleepy_sheep.c

@@ -180,7 +180,7 @@ ApiStatus N(func_802A1740_71ED90)(Evt* script, s32 isInitialCall) {
         Actor* targetActor = get_actor(target->actorID);
         ActorPart* targetPart = get_actor_part(targetActor, target->partID);
 
-        if ((targetActor->transStatus == 0) && !(targetPart->eventFlags & 0x20)) {
+        if ((targetActor->transStatus == 0) && !(targetPart->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY)) {
             targetActor->yaw += 33.0f;
             targetActor->yaw = clamp_angle(targetActor->yaw);
         }
@@ -213,7 +213,7 @@ ApiStatus N(func_802A1848_71EE98)(Evt* script, s32 isInitialCall) {
 
         if (targetActor != NULL) {
             ActorPart* targetPart = get_actor_part(targetActor, target->partID);
-            if ((targetActor->transStatus == 0) && !(targetPart->eventFlags & 0x20)) {
+            if ((targetActor->transStatus == 0) && !(targetPart->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY)) {
                 if (targetActor->yaw < 360.0f) {
                     targetActor->yaw += 33.0f;
                     if (targetActor->yaw >= 360.0f) {

src/battle/item/strange_cake.c

@@ -276,7 +276,7 @@ ApiStatus N(func_802A1B14_731E14)(Evt* script, s32 isInitialCall) {
 
     inflict_status(player, STATUS_E, 3);
     player->status = 0;
-    part->flags |= 0x100;
+    part->flags |= ACTOR_PART_FLAG_100;
 
     return ApiStatus_DONE2;
 }

src/battle/item/thunder_bolt.c

@@ -19,7 +19,7 @@ ApiStatus N(func_802A123C_722D7C)(Evt* script, s32 isInitialCall) {
         scaleX = (actor->size.x + (actor->size.x >> 2)) * actor->scalingFactor;
         scaleY = (actor->size.y - 2) * actor->scalingFactor;
 
-        if (actor->flags & 0x8000) {
+        if (actor->flags & ACTOR_FLAG_8000) {
             posY -= actor->size.y / 2;
         }
 

src/battle/item/thunder_rage.c

@@ -37,7 +37,7 @@ ApiStatus N(func_802A1354_71B4F4)(Evt* script, s32 isInitialCall) {
         scaleX = (actor->size.x + (actor->size.x >> 2)) * actor->scalingFactor;
         scaleY = (actor->size.y - 2) * actor->scalingFactor;
 
-        if (actor->flags & 0x8000) {
+        if (actor->flags & ACTOR_FLAG_8000) {
             posY -= actor->size.y / 2;
         }
 

src/battle/partner/bow.c

@@ -107,7 +107,7 @@ ApiStatus N(AverageTargetStatusChance)(Evt* script, s32 isInitialCall) {
             targetActorDescBaseStatusChance = 0;
         }
 
-        if (targetActorPart->eventFlags & 0x20) {
+        if (targetActorPart->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY) {
             targetActorDescBaseStatusChance = 0;
         }
 

src/battle/partner/goombario.c

@@ -287,8 +287,8 @@ ActorPartDesc N(partsTable_802392A4)[] = {
         .opacity = 255,
         .idleAnimations = N(idleAnimations_802391B0),
         .defenseTable = N(defenseTable_802391EC),
-        .eventFlags = 0,
+        .eventFlags = ACTOR_EVENT_FLAG_0,
-        .elementImmunityFlags = 0,
+        .elementImmunityFlags = ELEMENT_IMMUNITY_FLAGS_0,
     },
 };
 

src/battle/partner/kooper.c

@@ -58,7 +58,7 @@ ApiStatus N(AverageTargetDizzyChance)(Evt* script, s32 isInitialCall) {
             targetActorDescBaseStatusChance = 0;
         }
 
-        if (targetActorPart->eventFlags & 0x20) {
+        if (targetActorPart->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY) {
             targetActorDescBaseStatusChance = 0;
         }
 

src/battle/partner/parakarry.c

@@ -35,7 +35,7 @@ ApiStatus func_80238CE0_700A60(Evt* script, s32 isInitialCall) {
         airLiftChance = 0;
     }
 
-    if (targetActorPart->eventFlags & 0x20) {
+    if (targetActorPart->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY) {
         airLiftChance = 0;
     }
 

src/battle/partner/watt.c

@@ -105,7 +105,7 @@ ApiStatus func_80238784_704274(Evt* script, s32 isInitialCall) {
     if (targetActor->transStatus == 14) {
         statusChance = 0;
     }
-    if (targetActorPart->eventFlags & 0x20) {
+    if (targetActorPart->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY) {
         statusChance = 0;
     }
 
@@ -178,7 +178,7 @@ ApiStatus N(AverageTargetParalyzeChance)(Evt* script, s32 isInitialCall) {
             targetActorDescBaseStatusChance = 0;
         }
 
-        if (targetActorPart->eventFlags & 0x20) {
+        if (targetActorPart->eventFlags & ACTOR_EVENT_FLAG_ILLUSORY) {
             targetActorDescBaseStatusChance = 0;
         }
 

src/battle/star/chill_out/7900D0.c

@@ -35,13 +35,13 @@ ApiStatus func_802A163C_79070C(Evt* script, s32 isInitialCall) {
     Actor* actor = get_actor(script->owner1.actorID);
     Actor* target = get_actor(actor->targetActorID);
     ActorPart* part = get_actor_part(target, actor->targetPartIndex);
-    s32 flag1 = 0x400000; // these manual flag ones are necessary to match. once we figure out flags, we can add more
+    s32 flag1 = ACTOR_FLAG_NO_DMG_APPLY; // these manual flag ones are necessary to match. once we figure out flags, we can add more
-    s32 flag2 = 0x80000;
+    s32 flag2 = ACTOR_EVENT_FLAG_80000;
 
     script->varTable[0] = 0;
 
-    if ((target->flags & 0x4000) || (target->flags & flag1) || (target->flags & 0x2000) ||
+    if ((target->flags & ACTOR_FLAG_TARGET_ONLY) || (target->flags & flag1) || (target->flags & ACTOR_FLAG_2000) ||
-        (part->eventFlags & 0x40000) || (part->eventFlags & flag2)) {
+        (part->eventFlags & ACTOR_EVENT_FLAG_ENCHANTED) || (part->eventFlags & flag2)) {
         return ApiStatus_DONE2;
     }
 

src/battle/star/up_and_away/7952E0.c

@@ -48,7 +48,7 @@ ApiStatus func_802A1628_795908(Evt* script, s32 isInitialCall) {
 
     script->varTable[0] = 0;
 
-    if ((flags & 0x4000) == NULL && (flags & 0x400000) == NULL && (flags & 0x2000) == NULL && targetActor->staticActorData->upAndAwayChance != 0 && targetActor->staticActorData->upAndAwayChance >= rand_int(100)) {
+    if ((flags & ACTOR_FLAG_TARGET_ONLY) == NULL && (flags & ACTOR_FLAG_NO_DMG_APPLY) == NULL && (flags & ACTOR_FLAG_2000) == NULL && targetActor->staticActorData->upAndAwayChance != 0 && targetActor->staticActorData->upAndAwayChance >= rand_int(100)) {
         script->varTable[0] = 1;
     }
 

src/e0b30_len_b80.c

@@ -79,7 +79,7 @@ s32 _bgm_set_song(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s
 
         if (!gGameStatusPtr->musicEnabled) {
             func_800559C4(musicSetting->songName);
-            musicSetting->flags &= ~1;
+            musicSetting->flags &= ~MUSIC_SETTINGS_FLAGS_1;
 
             return 1;
         } else {
@@ -91,9 +91,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 & 4) {
+                if (musicSetting->flags & MUSIC_SETTINGS_FLAGS_4) {
                     func_80055B80(musicSetting->songName);
-                    musicSetting->flags &= ~4;
+                    musicSetting->flags &= ~MUSIC_SETTINGS_FLAGS_4;
                 }
 
                 return 2;
@@ -104,7 +104,7 @@ s32 _bgm_set_song(s32 playerIndex, s32 songID, s32 variation, s32 fadeOutTime, s
             musicSetting->variation = variation;
             musicSetting->fadeOutTime = fadeOutTime;
             musicSetting->unk_02 = 1;
-            musicSetting->flags &= ~2;
+            musicSetting->flags &= ~MUSIC_SETTINGS_FLAGS_2;
 
             return 1;
         }
@@ -128,7 +128,7 @@ s32 func_8014A964(s32 playerIndex, s32 songID, s32 variation, s32 fadeInTime, s1
 
         if (!gGameStatusPtr->musicEnabled) {
             func_800559C4(musicSetting->songName);
-            musicSetting->flags &= ~1;
+            musicSetting->flags &= ~MUSIC_SETTINGS_FLAGS_1;
 
             return 1;
         } else {
@@ -142,9 +142,9 @@ s32 func_8014A964(s32 playerIndex, s32 songID, s32 variation, s32 fadeInTime, s1
             musicSetting->unk_0E = arg5;
             musicSetting->songID = songID;
             musicSetting->variation = variation;
-            musicSetting->flags |= 0x20;
+            musicSetting->flags |= MUSIC_SETTINGS_FLAGS_20;
             musicSetting->unk_02 = 1;
-            musicSetting->flags &= ~2;
+            musicSetting->flags &= ~MUSIC_SETTINGS_FLAGS_2;
 
             return 1;
         }
@@ -155,11 +155,11 @@ s32 func_8014AA54(s32 playerIndex, s32 arg1, s16 arg2) {
     MusicSettings* musicSettings = gMusicSettings;
     MusicSettings* musicSetting = &musicSettings[playerIndex];
 
-    if (!(musicSetting->flags & 1)) {
+    if (!(musicSetting->flags & MUSIC_SETTINGS_FLAGS_1)) {
         return 0;
     }
 
-    if (!(musicSetting->flags & 2)) {
+    if (!(musicSetting->flags & MUSIC_SETTINGS_FLAGS_2)) {
         return 0;
     }
 
@@ -182,7 +182,7 @@ s32 func_8014AB0C(s32 playerIndex, s16 arg1) {
     MusicSettings* musicSettings = gMusicSettings;
     MusicSettings* musicSetting = &musicSettings[playerIndex];
 
-    if (!(musicSetting->flags & 1)) {
+    if (!(musicSetting->flags & MUSIC_SETTINGS_FLAGS_1)) {
         return 0;
     }
 
@@ -193,7 +193,7 @@ s32 func_8014AB60(s32 playerIndex, s16 arg1) {
     MusicSettings* musicSettings = gMusicSettings;
     MusicSettings* musicSetting = &musicSettings[playerIndex];
 
-    if (!(musicSetting->flags & 1)) {
+    if (!(musicSetting->flags & MUSIC_SETTINGS_FLAGS_1)) {
         return 0;
     }
 
@@ -204,7 +204,7 @@ s32 func_8014ABB4(s32 playerIndex, s16 arg1) {
     MusicSettings* musicSettings = gMusicSettings;
     MusicSettings* musicSetting = &musicSettings[playerIndex];
 
-    if (!(musicSetting->flags & 1)) {
+    if (!(musicSetting->flags & MUSIC_SETTINGS_FLAGS_1)) {
         return 0;
     }
 
@@ -268,7 +268,7 @@ void bgm_pop_song(void) {
     MusicSettings* musicSetting = &gMusicSettings[0];
 
     if (gGameStatusPtr->demoState == 0) {
-        musicSetting->flags |= 8;
+        musicSetting->flags |= MUSIC_SETTINGS_FLAGS_8;
         _bgm_set_song(0, musicSetting->unk_24, musicSetting->unk_28, 0, 8);
     }
 }
@@ -280,7 +280,7 @@ void bgm_push_song(s32 songID, s32 variation) {
         musicSetting->unk_24 = musicSetting->songID;
         musicSetting->unk_28 = musicSetting->variation;
         musicSetting->unk_2C = musicSetting->songName;
-        musicSetting->flags |= 4;
+        musicSetting->flags |= MUSIC_SETTINGS_FLAGS_4;
         bgm_set_song(0, songID, variation, 500, 8);
     }
 }
@@ -292,7 +292,7 @@ void bgm_pop_battle_song(void) {
         if (gOverrideFlags & 0x20000) {
             gOverrideFlags &= ~0x20000;
         } else {
-            musicSetting->flags |= 8;
+            musicSetting->flags |= MUSIC_SETTINGS_FLAGS_8;
             _bgm_set_song(0, musicSetting->unk_24, musicSetting->unk_28, 0, 8);
             func_80055590(0, 250);
         }
@@ -307,7 +307,7 @@ void bgm_push_battle_song(void) {
         musicSetting->unk_24 = musicSetting->songID;
         musicSetting->unk_28 = musicSetting->variation;
         musicSetting->unk_2C = musicSetting->songName;
-        musicSetting->flags |= 4;
+        musicSetting->flags |= MUSIC_SETTINGS_FLAGS_4;
         bgm_set_song(0, musicSetting->unk_1C, musicSetting->unk_20, 500, 8);
     }
 }

src/effects.c

@@ -329,8 +329,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_2)) {
+                if (!(effectGraphics->flags & FX_GRAPHICS_FLAGS_2)) {
-                    effectGraphics->flags |= FX_GRAPHICS_2;
+                    effectGraphics->flags |= FX_GRAPHICS_FLAGS_2;
                     effectGraphics->freeDelay = 3;
                 }
             }
@@ -339,18 +339,18 @@ void update_effects(void) {
         for (i = 0; i < ARRAY_COUNT(gEffectInstances); i++) {
             EffectInstance* effectInstance = gEffectInstances[i];
 
-            if (effectInstance != NULL && (effectInstance->flags & 1)) {
+            if (effectInstance != NULL && (effectInstance->flags & EFFECT_INSTANCE_FLAGS_1)) {
-                effectInstance->effect->flags &= ~0x2;
+                effectInstance->effect->flags &= ~FX_GRAPHICS_FLAGS_2;
 
                 if (gGameStatusPtr->isBattle) {
-                    if (effectInstance->flags & 4) {
+                    if (effectInstance->flags & EFFECT_INSTANCE_FLAGS_4) {
                         effectInstance->effect->update(effectInstance);
-                        effectInstance->flags |= 8;
+                        effectInstance->flags |= EFFECT_INSTANCE_FLAGS_8;
                     }
                 } else {
-                    if (!(effectInstance->flags & 4)) {
+                    if (!(effectInstance->flags & EFFECT_INSTANCE_FLAGS_4)) {
                         effectInstance->effect->update(effectInstance);
-                        effectInstance->flags |= 8;
+                        effectInstance->flags |= EFFECT_INSTANCE_FLAGS_8;
                     }
                 }
             }
@@ -358,7 +358,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_2) {
+                if (effectGraphics->flags & FX_GRAPHICS_FLAGS_2) {
                     if (effectGraphics->freeDelay != 0) {
                         effectGraphics->freeDelay--;
                     } else {
@@ -401,15 +401,15 @@ void render_effects_UI(void) {
         EffectInstance* effectInstance = gEffectInstances[i];
 
         if (effectInstance != NULL) {
-            if (effectInstance->flags & 1) {
+            if (effectInstance->flags & EFFECT_INSTANCE_FLAGS_1) {
-                if (effectInstance->flags & 8) {
+                if (effectInstance->flags & EFFECT_INSTANCE_FLAGS_8) {
                     void (*renderUI)(EffectInstance* effect);
 
-                    if (gGameStatusPtr->isBattle && !(effectInstance->flags & 4)) {
+                    if (gGameStatusPtr->isBattle && !(effectInstance->flags & EFFECT_INSTANCE_FLAGS_4)) {
                         continue;
                     }
 
-                    if (!gGameStatusPtr->isBattle && effectInstance->flags & 4) {
+                    if (!gGameStatusPtr->isBattle && effectInstance->flags & EFFECT_INSTANCE_FLAGS_4) {
                         continue;
                     }
 

src/encounter_api.c

@@ -131,7 +131,7 @@ void start_battle(Evt* script, s32 songID) {
     for (i = 0; i < encounter->count; i++) {
         enemy = encounter->enemy[i];
         if ((enemy != NULL && (
-            !(enemy->flags & 8) || enemy == currentEncounter->currentEnemy)
+            !(enemy->flags & ENEMY_FLAGS_8) || enemy == currentEncounter->currentEnemy)
             ) && enemy->hitBytecode != NULL) {
             Evt* hitEvtInstance;
             enemy->encountered = TRUE;
@@ -200,7 +200,7 @@ ApiStatus StartBossBattle(Evt* script, s32 isInitialCall) {
     for (i = 0; i < encounter->count; i++) {
         enemy = encounter->enemy[i];
         if ((enemy != NULL && (
-            !(enemy->flags & 8) || enemy == currentEncounter->currentEnemy)
+            !(enemy->flags & ENEMY_FLAGS_8) || enemy == currentEncounter->currentEnemy)
             ) && enemy->hitBytecode != NULL) {
             Evt* hitEvtInstance;
             enemy->encountered = TRUE;

src/entity.c

@@ -81,7 +81,7 @@ s32 load_entity_model(s32* cmdList) {
     }
     ASSERT(newEntityModel != NULL);
 
-    newEntityModel->flags = 0x17;
+    newEntityModel->flags = (ENTITY_MODEL_FLAGS_1 | ENTITY_MODEL_FLAGS_2 | ENTITY_MODEL_FLAGS_4 | ENTITY_MODEL_FLAGS_10);
     newEntityModel->renderMode = 1;
     newEntityModel->displayList = NULL;
     newEntityModel->cmdListReadPos = cmdList;
@@ -124,7 +124,7 @@ s32 ALT_load_entity_model(s32* cmdList) {
     newEntityModel->displayList = newDisplayList = heap_malloc(sizeof(Gfx) * 2);
     ASSERT(newDisplayList != NULL);
 
-    newEntityModel->flags = 0x417;
+    newEntityModel->flags = (ENTITY_MODEL_FLAGS_1 | ENTITY_MODEL_FLAGS_2 | ENTITY_MODEL_FLAGS_4 | ENTITY_MODEL_FLAGS_10 | ENTITY_MODEL_FLAGS_400);
     newEntityModel->renderMode = 1;
     newEntityModel->cmdListReadPos = cmdList;
     newEntityModel->nextFrameTime = 1.0f;
@@ -150,9 +150,9 @@ void exec_entity_model_commandlist(s32 idx) {
         idx &= ~0x800;
         entityModel = (*gCurrentEntityModelList)[idx];
         if (entityModel != NULL && (entityModel->flags)) {
-            if (!(entityModel->flags & 0x20)) {
+            if (!(entityModel->flags & ENTITY_MODEL_FLAGS_20)) {
-                if (!(entityModel->flags & 0x20000)) {
+                if (!(entityModel->flags & ENTITY_MODEL_FLAGS_20000)) {
-                    entityModel->flags &= ~0x100;
+                    entityModel->flags &= ~ENTITY_MODEL_FLAGS_100;
                     entityModel->nextFrameTime -= entityModel->timeScale;
                     if (entityModel->nextFrameTime <= 0.0f) {
                         while (step_entity_model_commandlist(entityModel));
@@ -252,7 +252,7 @@ void free_entity_model_by_index(s32 idx) {
     EntityModel* entityModel = (*gCurrentEntityModelList)[index];
 
     if (entityModel != NULL && entityModel->flags) {
-        if (entityModel->flags & 0x400) {
+        if (entityModel->flags & ENTITY_MODEL_FLAGS_400) {
             heap_free(entityModel->displayList);
         }
         {
@@ -310,7 +310,7 @@ void func_80122F8C(s32 idx, s32 newFlags) {
 void func_80122FB8(s32 idx, s32 newFlags) {
     EntityModel* entityModel = (*gCurrentEntityModelList)[idx & ~0x800];
 
-    entityModel->flags = (entityModel->flags & ~0xF) | newFlags;
+    entityModel->flags = (entityModel->flags & ~(ENTITY_MODEL_FLAGS_1 | ENTITY_MODEL_FLAGS_2 | ENTITY_MODEL_FLAGS_4 | ENTITY_MODEL_FLAGS_8)) | newFlags;
 }
 
 void enable_entity_fog(void) {
@@ -389,7 +389,7 @@ s32 create_generic_entity_world(void (*updateFunc)(void), void (*drawFunc)(void)
     (*gCurrentDynamicEntityListPtr)[i] = newDynEntity = heap_malloc(sizeof(DynamicEntity));
     ASSERT(newDynEntity != NULL);
 
-    newDynEntity->flags = 3;
+    newDynEntity->flags = ENTITY_FLAGS_HIDDEN | ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE1;
     newDynEntity->update = updateFunc;
     if (updateFunc == NULL) {
         newDynEntity->update = &stub_generic_entity_delegate;
@@ -420,7 +420,7 @@ s32 create_generic_entity_frontUI(void (*updateFunc)(void), void (*drawFunc)(voi
     (*gCurrentDynamicEntityListPtr)[i] = newDynEntity = heap_malloc(sizeof(DynamicEntity));
     ASSERT(newDynEntity != NULL);
 
-    newDynEntity->flags = 7;
+    newDynEntity->flags = ENTITY_FLAGS_HIDDEN | ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE1 | ENTITY_FLAGS_HAS_DYNAMIC_SHADOW;
     newDynEntity->update = updateFunc;
     if (updateFunc == NULL) {
         newDynEntity->update = &stub_generic_entity_delegate;
@@ -451,7 +451,7 @@ s32 create_generic_entity_backUI(void (*updateFunc)(void), void (*drawFunc)(void
     (*gCurrentDynamicEntityListPtr)[i] = newDynEntity = heap_malloc(sizeof(DynamicEntity));
     ASSERT(newDynEntity != NULL);
 
-    newDynEntity->flags = 0xB;
+    newDynEntity->flags = ENTITY_FLAGS_HIDDEN | ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE1 | ENTITY_FLAGS_HAS_ANIMATED_MODEL;
     newDynEntity->update = updateFunc;
     if (updateFunc == NULL) {
         newDynEntity->update = &stub_generic_entity_delegate;
@@ -473,7 +473,7 @@ void update_generic_entities(void) {
     for (i = 0; i < MAX_DYNAMIC_ENTITIES; i++) {
         DynamicEntity* entity = (*gCurrentDynamicEntityListPtr)[i];
         if (entity != NULL) {
-            entity->flags &= ~2;
+            entity->flags &= ~ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE1;
             entity->update();
         }
     }
@@ -484,8 +484,8 @@ void render_generic_entities_world(void) {
 
     for (i = 0; i < MAX_DYNAMIC_ENTITIES; i++) {
         DynamicEntity* entity = (*gCurrentDynamicEntityListPtr)[i];
-        if (entity != NULL && !(entity->flags & 2)) {
+        if (entity != NULL && !(entity->flags & ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE1)) {
-            if (!(entity->flags & 4)) {
+            if (!(entity->flags & ENTITY_FLAGS_HAS_DYNAMIC_SHADOW)) {
                 entity->draw();
             }
         }
@@ -497,8 +497,8 @@ void render_generic_entities_frontUI(void) {
 
     for (i = 0; i < MAX_DYNAMIC_ENTITIES; i++) {
         DynamicEntity* entity = (*gCurrentDynamicEntityListPtr)[i];
-        if (entity != NULL && !(entity->flags & 2)) {
+        if (entity != NULL && !(entity->flags & ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE1)) {
-            if (entity->flags & 4) {
+            if (entity->flags & ENTITY_FLAGS_HAS_DYNAMIC_SHADOW) {
                 entity->draw();
             }
         }
@@ -510,8 +510,8 @@ void render_generic_entities_backUI(void) {
 
     for (i = 0; i < MAX_DYNAMIC_ENTITIES; i++) {
         DynamicEntity* entity = (*gCurrentDynamicEntityListPtr)[i];
-        if (entity != NULL && !(entity->flags & 2)) {
+        if (entity != NULL && !(entity->flags & ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE1)) {
-            if (entity->flags & 8) {
+            if (entity->flags & ENTITY_FLAGS_HAS_ANIMATED_MODEL) {
                 entity->draw();
             }
         }

src/entity/Block.c

@@ -59,7 +59,7 @@ s32 entity_base_block_idle(Entity* entity) {
     s32 ret = 0;
 
     if (is_block_on_ground(entity) != 0) {
-        if (entity->flags & 0x200000) {
+        if (entity->flags & ENTITY_FLAGS_200000) {
             ret = 1;
             entity_base_block_update_slow_sinking(entity);
             if (temp->unk_10 != -1) {
@@ -79,7 +79,7 @@ void entity_base_block_init(Entity* entity) {
     temp->unk_10 = -1;
     temp->unk_14 = entity->position.y;
     temp->unk_0E = -1;
-    entity->flags &= ~0x200000;
+    entity->flags &= ~ENTITY_FLAGS_200000;
 }
 
 void entity_inactive_block_hit_init(Entity* entity) {
@@ -152,7 +152,7 @@ void entity_MulticoinBlock_spawn_coin(Entity* entity) {
         set_entity_commandlist(get_entity_by_index(create_entity(&D_802EA07C, entity->position.x, entity->position.y,
                                entity->position.z,
                                entity->rotation.y, 0x80000000)), &D_802E9E54);
-        entity->flags |= 0x20000020;
+        entity->flags |= (ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX | ENTITY_FLAGS_PENDING_INSTANCE_DELETE);
     }
 }
 
@@ -184,7 +184,7 @@ void entity_MulticoinBlock_idle(Entity* entity) {
     entity_base_block_idle(entity);
     if (temp->unk_03 != 0) {
         create_entity(&D_802EA07C, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, 0x80000000);
-        entity->flags |= 0x20000020;
+        entity->flags |= (ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX | ENTITY_FLAGS_PENDING_INSTANCE_DELETE);
     }
 }
 
@@ -196,7 +196,7 @@ void entity_MulticoinBlock_check_if_inactive(Entity* entity) {
     if (temp->unk_0A != 0xFFFF) {
         if (get_global_flag(temp->unk_0A) != 0) {
             create_entity(&D_802EA07C, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, 0x80000000);
-            entity->flags |= 0x20000020;
+            entity->flags |= (ENTITY_FLAGS_SKIP_UPDATE_INVERSE_ROTATION_MATRIX | ENTITY_FLAGS_PENDING_INSTANCE_DELETE);
         }
     }
 }
@@ -333,7 +333,7 @@ s32 entity_init_HammerBlock_small(Entity* entity) {
     temp->unk_10 = -1;
     temp->unk_14 = entity->position.y;
     temp->unk_0E = -1;
-    entity->flags &= ~0x200000;
+    entity->flags &= ~ENTITY_FLAGS_200000;
     entity->scale.x = 0.5f;
     entity->scale.y = 0.5f;
     entity->scale.z = 0.5f;

src/entity/Chest.c

@@ -63,7 +63,7 @@ INCLUDE_ASM(s32, "entity/Chest", entity_Chest_setupGfx);
 void entity_Chest_check_opened(Entity* entity) {
     Chest* data = (Chest*)entity->dataBuf;
     if ((data->unk_00 != 0xFFFF) && (get_global_flag(data->unk_00) != 0)) {
-        entity->flags |= 0x4000;
+        entity->flags |= ENTITY_FLAGS_4000;
         data->unk_10 = -1;
         data->unk_08 = -28.7f;
         set_entity_commandlist(entity, &D_802EAD7C);
@@ -81,19 +81,19 @@ void entity_Chest_idle(Entity* entity) {
     if ((!(playerStatus->animFlags & 1)) &&
         (!(entity->collisionFlags & 1)) &&
         ((angle <= 40.0f) || (angle >= 320.0f))) {
-        entity->flags |= 0x1000;
+        entity->flags |= ENTITY_FLAGS_SHOWS_INSPECT_PROMPT;
         if ((playerStatus->animFlags & 0x10) && (entity->collisionFlags & 8)) {
             exec_entity_commandlist(entity);
             data = (Chest*)entity->dataBuf;
             data->unk_04 = 0;
-            entity->flags &= ~0x1000;
+            entity->flags &= ~ENTITY_FLAGS_SHOWS_INSPECT_PROMPT;
             if (data->unk_10 != 0) {
                 disable_player_input();
             }
             func_800EF3E4();
         }
     } else {
-        entity->flags &= ~0x1000;
+        entity->flags &= ~ENTITY_FLAGS_SHOWS_INSPECT_PROMPT;
     }
 }
 
@@ -140,7 +140,7 @@ void entity_Chest_close(Entity* entity) {
             data->unk_06--;
             if (data->unk_06 == 0) {
                 data->unk_04++;
-                entity->flags |= 0x4000;
+                entity->flags |= ENTITY_FLAGS_4000;
             }
             break;
         case 4:

src/entity/HeartBlock.c

@@ -37,7 +37,7 @@ void entity_HeartBlockContent__reset(Entity* entity) {
     entity->renderSetupFunc = entity_HeartBlockContent_setupGfx;
     entity->alpha = 255;
     temp_s0 = (struct802E4B10*)entity->dataBuf;
-    entity->flags |= 0x2000;
+    entity->flags |= ENTITY_FLAGS_ALWAYS_FACE_CAMERA;
     someEntity = get_entity_by_index(temp_s0->unk_00);
 
     if (temp_s0->unk_09 == 0) {
@@ -135,7 +135,7 @@ void entity_HeartBlockContent__anim_heal(Entity* entity, s32 arg1) {
             data->unk_14 -= 1.0f;
             if (data->unk_14 <= 2.0f) {
                 data->unk_01++;
-                entity->flags &= ~0x2000;
+                entity->flags &= ~ENTITY_FLAGS_ALWAYS_FACE_CAMERA;
                 data->unk_54 = -10.0f;
                 entity_set_render_script(entity, &D_802EA744);
                 entity->renderSetupFunc = &entity_HeartBlockContent_setupGfx;

src/entity/ItemBlock.c

@@ -59,9 +59,9 @@ void entity_HitItemBlock_show_inactive(Entity* entity) {
     struct802E3F0C* temp = entity->dataBuf;
 
     someEntity = get_entity_by_index(temp->unk_12);
-    someEntity->flags &= ~1;
+    someEntity->flags &= ~ENTITY_FLAGS_HIDDEN;
     someShadow = get_shadow_by_index(someEntity->shadowIndex);
-    someShadow->flags &= ~1;
+    someShadow->flags &= ~SHADOW_FLAGS_1;
 }
 
 void entity_ItemBlock_check_if_inactive(Entity* entity) {
@@ -104,16 +104,16 @@ void entity_ItemBlock_replace_with_inactive(Entity* entity) {
     entityTemp = get_entity_by_index(entityIndex);
     entityTemp->flags |= 1;
 
-    if (entity->flags & 0x40000) {
+    if (entity->flags & ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2) {
-        entityTemp->flags |= 0x40000;
+        entityTemp->flags |= ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2;
     }
 
-    if (entity->flags & 4) {
+    if (entity->flags & ENTITY_FLAGS_HAS_DYNAMIC_SHADOW) {
-        entityTemp->flags |= 4;
+        entityTemp->flags |= ENTITY_FLAGS_HAS_DYNAMIC_SHADOW;
     }
 
     shadow = get_shadow_by_index(entityTemp->shadowIndex);
-    shadow->flags |= 0x400001;
+    shadow->flags |= (SHADOW_FLAGS_400000 |SHADOW_FLAGS_1);
     temp_s0 = is_block_on_ground(entity);
 
     entityType2 = get_entity_type(entity->listIndex);
@@ -127,37 +127,37 @@ void entity_ItemBlock_replace_with_inactive(Entity* entity) {
     entityTemp = get_entity_by_index(create_entity(entityData, entity->position.x, entity->position.y, entity->position.z,
                                      entity->rotation.y, 0x80000000));
     entityTemp->alpha = entity->alpha;
-    if ((entity->flags & 1) || (entity->alpha < 0xFF)) {
+    if ((entity->flags & ENTITY_FLAGS_HIDDEN) || (entity->alpha < 0xFF)) {
         entityTemp->alpha = 0x20;
     }
 
-    if (entity->flags & 0x40000) {
+    if (entity->flags & ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2) {
-        entityTemp->flags |= 0x40000;
+        entityTemp->flags |= ENTITY_FLAGS_DRAW_IF_CLOSE_HIDE_MODE2;
     }
 
     temp = entityTemp->dataBuf;
     temp->unk_12 = entityIndex;
 
-    if (entity->flags & 4) {
+    if (entity->flags & ENTITY_FLAGS_HAS_DYNAMIC_SHADOW) {
-        entityTemp->flags |= 4;
+        entityTemp->flags |= ENTITY_FLAGS_HAS_DYNAMIC_SHADOW;
     }
 
-    entity->flags &= ~0x100;
+    entity->flags &= ~ENTITY_FLAGS_100;
     shadow = get_shadow_by_index(entity->shadowIndex);
-    shadow->flags |= 0x10000001;
+    shadow->flags |= (SHADOW_FLAGS_10000000 | SHADOW_FLAGS_1);
     shadow = get_shadow_by_index(entityTemp->shadowIndex);
-    shadow->flags |= 0x400000;
+    shadow->flags |= SHADOW_FLAGS_400000;
 }
 
 void entity_HitItemBlock_hide(Entity* entity) {
-    entity->flags |= 1;
+    entity->flags |= ENTITY_FLAGS_HIDDEN;
-    entity->flags &= ~0x100;
+    entity->flags &= ~ENTITY_FLAGS_100;
     get_shadow_by_index(entity->shadowIndex)->flags |= 0x10000001;
 }
 
 s32 entity_TriggerBlock_start_bound_script(Entity* entity) {
     if (entity->boundScriptBytecode != NULL) {
-        entity->flags |= 0x1000000;
+        entity->flags |= ENTITY_FLAGS_BOUND_SCRIPT_DIRTY;
         return TRUE;
     }
     return FALSE;

src/entity/Signpost.c

@@ -6,12 +6,12 @@ void entity_Signpost_idle(Entity* entity) {
                     playerStatus->position.x, playerStatus->position.z)));
 
     if (!(playerStatus->animFlags & 1) && !(entity->collisionFlags & 1) && (val <= 40.0f || val >= 320.0f)) {
-        entity->flags |= 0x1000;
+        entity->flags |= ENTITY_FLAGS_SHOWS_INSPECT_PROMPT;
-        if ((playerStatus->animFlags & PLAYER_ANIM_FLAG_INTERACT_PROMPT) && (entity->collisionFlags & 8)) {
+        if ((playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_INTERACT_PROMPT_AVAILABLE) && (entity->collisionFlags & 8)) {
             entity_start_script(entity);
         }
     } else {
-        entity->flags &= ~0x1000;
+        entity->flags &= ~ENTITY_FLAGS_SHOWS_INSPECT_PROMPT;
         playerStatus->unk_C6 = -1;
     }
 }

src/entity/Switch.c

@@ -488,7 +488,7 @@ void entity_BlueSwitch_init(Entity* entity) {
     if (D_8015C7D0[0] == 1) {
         if (D_802EB3A0 != NULL) {
             temp->attachedEntity = D_802EB3A0;
-            entity->flags |= 1;
+            entity->flags |= ENTITY_FLAGS_HIDDEN;
             return;
         }
     } else {

src/entity/jan_iwa/E2D730.c

@@ -100,8 +100,8 @@ void func_802BB648_E2DF78(Entity* entity) {
     structE2D730* data = (structE2D730*)entity->dataBuf;
 
     if ((gPlayerStatus.animFlags & 0x10) && (entity->collisionFlags & 0x48)) {
-        if (entity->flags & 0x1000) {
+        if (entity->flags & ENTITY_FLAGS_SHOWS_INSPECT_PROMPT) {
-            entity->flags &= ~0x1000;
+            entity->flags &= ~ENTITY_FLAGS_SHOWS_INSPECT_PROMPT;
             temp_a1_2 = (structE2D730*)get_entity_by_index(data->unk_04)->dataBuf;
             if (temp_a1_2->unk_00 == 0) {
                 temp_a1_2->unk_00 = 1;

src/entity/sbk_omo/E307C0.c

@@ -87,7 +87,7 @@ void func_802BC558_E30EA8(Entity* entity) {
 INCLUDE_ASM(s32, "entity/sbk_omo/E307C0", func_802BC570_E30EC0);
 
 void func_802BC99C_E312EC(Entity* entity) {
-    if (!(entity->flags & 0x2000000)) {
+    if (!(entity->flags & ENTITY_FLAGS_2000000)) {
         exec_entity_commandlist(entity);
     }
 }

src/evt/evt.c

@@ -1001,7 +1001,7 @@ ApiStatus evt_handle_bind(Evt* script) {
     Bytecode triggerOut = *args++;
     TriggerDefinition def;
 
-    def.flags = eventType | 0x1000000;
+    def.flags = eventType | TRIGGER_DEFINITION_FLAGS_1000000;
     def.flagIndex = evt_get_variable(script, colliderIDVar);
     def.colliderIndex = evt_get_variable_index(script, colliderIDVar);
     def.inputArg3 = a3;
@@ -1120,7 +1120,7 @@ ApiStatus evt_handle_bind_lock(Evt* script) {
     s32 a5 = *args++;
     TriggerDefinition def;
 
-    def.flags = eventType | 0x1000000;
+    def.flags = eventType | TRIGGER_DEFINITION_FLAGS_1000000;
     def.flagIndex = evt_get_variable(script, colliderIDVar);
     def.colliderIndex = evt_get_variable_index(script, colliderIDVar);
     def.unk_1C = itemList;

src/evt/fa4c0_len_3bf0.c

@@ -224,7 +224,7 @@ ApiStatus AddKeyItem(Evt* script, s32 isInitialCall) {
     s32 itemID = evt_get_variable(script, value);
     s32 i;
 
-    if (itemID == ITEM_FORTRESS_KEY) {
+    if (itemID == ITEM_KOOPA_FORTRESS_KEY) {
         playerData->fortressKeyCount++;
         return ApiStatus_DONE2;
     }

src/evt/map_api.c

@@ -23,9 +23,9 @@ ApiStatus TranslateModel(Evt* script, s32 isInitialCall) {
     z = evt_get_float_variable(script, *args++);
     model = get_model_from_list_index(modelIndex);
 
-    if (!(model->flags & 0x400)) {
+    if (!(model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) {
         guTranslateF(model->transformMatrix, x, y, z);
-        model->flags |= 0x1400;
+        model->flags |= (MODEL_FLAGS_HAS_TRANSFORM_APPLIED | MODEL_FLAGS_USES_TRANSFORM_MATRIX);
     } else {
         Matrix4f mtx;
 
@@ -46,9 +46,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 & 0x400)) {
+    if (!(model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) {
         guRotateF(model->transformMatrix, a, x, y, z);
-        model->flags |= 0x1400;
+        model->flags |= (MODEL_FLAGS_HAS_TRANSFORM_APPLIED | MODEL_FLAGS_USES_TRANSFORM_MATRIX);
     } else {
         Matrix4f mtx;
 
@@ -73,9 +73,9 @@ ApiStatus ScaleModel(Evt* script, s32 isInitialCall) {
     z = evt_get_float_variable(script, *args++);
     model = get_model_from_list_index(modelIndex);
 
-    if (!(model->flags & 0x400)) {
+    if (!(model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED)) {
         guScaleF(model->transformMatrix, x, y, z);
-        model->flags |= 0x1400;
+        model->flags |= (MODEL_FLAGS_HAS_TRANSFORM_APPLIED | MODEL_FLAGS_USES_TRANSFORM_MATRIX);
     } else {
         Matrix4f mtx;
 
@@ -100,7 +100,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 &= ~0x400;
+    model->flags &= ~MODEL_FLAGS_HAS_TRANSFORM_APPLIED;
     return ApiStatus_DONE2;
 }
 
@@ -137,7 +137,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 |= 0x800;
+    model->flags |= MODEL_FLAGS_HAS_TEX_PANNER;
     return ApiStatus_DONE2;
 }
 
@@ -148,9 +148,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 |= 0x10;
+        model->flags |= MODEL_FLAGS_USES_CUSTOM_GFX;
     } else {
-        model->flags &= ~0x10;
+        model->flags &= ~MODEL_FLAGS_USES_CUSTOM_GFX;
     }
     return ApiStatus_DONE2;
 }
@@ -167,7 +167,7 @@ ApiStatus SetModelCustomGfx(Evt* script, s32 isInitialCall) {
 
     set_mdl_custom_gfx_set(model, var2, var3);
     if (var2 != -1) {
-        model->flags |= 0x10;
+        model->flags |= MODEL_FLAGS_USES_CUSTOM_GFX;
     }
     return ApiStatus_DONE2;
 }
@@ -188,9 +188,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 |= 0x800;
+        model->flags |= MODEL_FLAGS_HAS_TEX_PANNER;
     } else {
-        model->flags &= ~0x800;
+        model->flags &= ~MODEL_FLAGS_HAS_TEX_PANNER;
     }
     return ApiStatus_DONE2;
 }
@@ -202,9 +202,9 @@ ApiStatus EnableModel(Evt* script, s32 isInitialCall) {
     Model* model = get_model_from_list_index(listIndex);
 
     if (flag != 0) {
-        model->flags &= ~0x2;
+        model->flags &= ~MODEL_FLAGS_ENABLED;
     } else {
-        model->flags |= 0x2;
+        model->flags |= MODEL_FLAGS_ENABLED;
     }
     return ApiStatus_DONE2;
 }
@@ -318,10 +318,10 @@ ApiStatus TranslateGroup(Evt* script, s32 isInitialCall) {
 
     transformGroup = get_transform_group(index);
 
-    index = transformGroup->flags & 0x400; // TODO fix weird match
+    index = transformGroup->flags & MODEL_TRANSFORM_GROUP_FLAGS_400; // TODO fix weird match
     if (!index) {
         guTranslateF(transformGroup->matrixB, x, y, z);
-        transformGroup->flags |= 0x1400;
+        transformGroup->flags |= (MODEL_TRANSFORM_GROUP_FLAGS_400 | MODEL_TRANSFORM_GROUP_FLAGS_1000);
     } else {
         Matrix4f mtx;
 
@@ -352,9 +352,9 @@ ApiStatus RotateGroup(Evt* script, s32 isInitialCall) {
 
     transformGroup = get_transform_group(index);
 
-    if (!(transformGroup->flags & 0x400)) {
+    if (!(transformGroup->flags & MODEL_TRANSFORM_GROUP_FLAGS_400)) {
         guRotateF(transformGroup->matrixB, a, x, y, z);
-        transformGroup->flags |= 0x1400;
+        transformGroup->flags |= (MODEL_TRANSFORM_GROUP_FLAGS_400 | MODEL_TRANSFORM_GROUP_FLAGS_1000);
     } else {
         Matrix4f mtx;
 
@@ -385,10 +385,10 @@ ApiStatus ScaleGroup(Evt* script, s32 isInitialCall) {
 
     transformGroup = get_transform_group(index);
 
-    index = transformGroup->flags & 0x400; // TODO fix weird match
+    index = transformGroup->flags & MODEL_TRANSFORM_GROUP_FLAGS_400; // TODO fix weird match
     if (!(index)) {
         guScaleF(transformGroup->matrixB, x, y, z);
-        transformGroup->flags |= 0x1400;
+        transformGroup->flags |= (MODEL_TRANSFORM_GROUP_FLAGS_400 | MODEL_TRANSFORM_GROUP_FLAGS_1000);
     } else {
         Matrix4f mtx;
 
@@ -427,9 +427,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 &= ~0x2;
+            model->flags &= ~MODEL_FLAGS_ENABLED;
         } else {
-            model->flags |= 0x2;
+            model->flags |= MODEL_FLAGS_ENABLED;
         }
     }
 
@@ -608,10 +608,10 @@ void set_zone_enabled(s32 zoneID, s32 enabled) {
 
     switch (enabled) {
         case 0:
-            unkStruct->flags |= 0x10000;
+            unkStruct->flags |= TEMP_SET_ZONE_ENABLED_FLAGS_10000;
             break;
         case 1:
-            unkStruct->flags &= ~0x10000;
+            unkStruct->flags &= ~TEMP_SET_ZONE_ENABLED_FLAGS_10000;
             break;
     }
 }
@@ -628,10 +628,10 @@ ApiStatus SetZoneEnabled(Evt* script, s32 isInitialCall) {
 
     switch (enabled) {
         case FALSE:
-            unkStruct->flags |= 0x10000;
+            unkStruct->flags |= TEMP_SET_ZONE_ENABLED_FLAGS_10000;
             break;
         case TRUE:
-            unkStruct->flags &= ~0x10000;
+            unkStruct->flags &= ~TEMP_SET_ZONE_ENABLED_FLAGS_10000;
             break;
     }
 

src/evt/npc_api.c

@@ -33,7 +33,7 @@ ApiStatus CreateNpc(Evt* script, s32 isInitialCall) {
     NpcBlueprint blueprint;
     Npc *npc;
 
-    blueprint.flags = 0;
+    blueprint.flags = NPC_FLAG_0;
     blueprint.initialAnim = initialAnim;
     blueprint.onUpdate = NULL;
     blueprint.onRender = NULL;

src/evt/script_list.c

@@ -661,7 +661,7 @@ Trigger* bind_trigger(EvtSource* script, s32 flags, s32 triggerFlagIndex, s32 tr
     Trigger* trigger;
     TriggerDefinition def;
 
-    def.flags = flags | 0x1000000;
+    def.flags = flags | TRIGGER_DEFINITION_FLAGS_1000000;
     def.flagIndex = triggerFlagIndex;
     def.unk_14 = 0;
     def.function = evt_bound_script_trigger_handler;

src/npc.c

@@ -661,7 +661,7 @@ void enable_npc_shadow(Npc* npc) {
 
     if (!(npc->flags & NPC_FLAG_HAS_SHADOW)) {
         shadow = get_shadow_by_index(npc->shadowIndex);
-        shadow->flags &= ~1;
+        shadow->flags &= ~SHADOW_FLAGS_1;
         npc->flags = npc->flags | (NPC_FLAG_DIRTY_SHADOW | NPC_FLAG_HAS_SHADOW);
     }
 }
@@ -671,7 +671,7 @@ void disable_npc_shadow(Npc* npc) {
 
     if (npc->flags & NPC_FLAG_HAS_SHADOW) {
         shadow = get_shadow_by_index(npc->shadowIndex);
-        shadow->flags |= 1;
+        shadow->flags |= SHADOW_FLAGS_1;
         npc->flags &= ~NPC_FLAG_HAS_SHADOW;
         npc->flags &= ~NPC_FLAG_DIRTY_SHADOW;
     }
@@ -1493,7 +1493,7 @@ void init_encounter_status(void) {
         currentEncounter->encounterList[i] = 0;
     }
 
-    currentEncounter->flags = 0;
+    currentEncounter->flags = ENCOUNTER_STATUS_FLAGS_0;
     currentEncounter->numEncounters = 0;
     currentEncounter->eFirstStrike = 0;
     currentEncounter->hitType = 0;
@@ -1719,10 +1719,10 @@ void kill_enemy(Enemy* enemy) {
         }
     }
 
-    if (!(enemy->flags & 4)) {
+    if (!(enemy->flags & ENEMY_FLAGS_4)) {
-        if (!(enemy->flags & 8) || (enemy == encounterStatus->currentEnemy)) {
+        if (!(enemy->flags & ENEMY_FLAGS_8) || (enemy == encounterStatus->currentEnemy)) {
-            if (!(enemy->flags & 1)) {
+            if (!(enemy->flags & ENEMY_FLAGS_1)) {
-                if (!(enemy->flags & 0x10)) {
+                if (!(enemy->flags & ENEMY_FLAGS_10)) {
                     COPY_set_defeated((s8)encounterStatus->mapID, encounter->encounterID + i);
                 }
             }

src/pause/135EE0.c

@@ -40,7 +40,7 @@ void func_80242BAC(s32 windowID, s32 posX, s32 posY) {
                 Window* window = &gWindows[i];
                 s8 parent = window->parent;
 
-                if ((parent == -1 || parent == 0x16) && (window->flags & 8)) {
+                if ((parent == -1 || parent == 0x16) && (window->flags & WINDOW_FLAGS_8)) {
                     break;
                 }
             }
@@ -53,7 +53,7 @@ void func_80242BAC(s32 windowID, s32 posX, s32 posY) {
         gPauseMenuTargetPosY = posY;
         gPauseMenuCursorPosY = posY;
 
-    } else if ((window->flags & 8) == 0 && (window->parent == -1 || !(gWindows[window->parent].flags & 8))) {
+    } else if ((window->flags & WINDOW_FLAGS_88 == 0 && (window->parent == -1 || !(gWindows[window->parent].flags & 8))) {
         gPauseMenuTargetPosX = posX;
         gPauseMenuCursorPosX = posX;
         gPauseMenuTargetPosY = posY;
@@ -81,7 +81,7 @@ void func_80242D04(s32 windowID, s32 posX, s32 posY) {
                 Window* window = &gWindows[i];
                 s8 parent = window->parent;
 
-                if ((parent == -1 || parent == 0x16) && (window->flags & 8)) {
+                if ((parent == -1 || parent == 0x16) && (window->flags & WINDOW_FLAGS_8)) {
                     break;
                 }
             }
@@ -93,7 +93,7 @@ void func_80242D04(s32 windowID, s32 posX, s32 posY) {
         gPauseMenuCursorPosX = posX;
         gPauseMenuTargetPosY = posY;
         gPauseMenuCursorPosY = posY;
-    } else if ((window->flags & 8) == 0 && (window->parent == -1 || !(gWindows[window->parent].flags & 8))) {
+    } else if ((window->flags & WINDOW_FLAGS_8) == 0 && (window->parent == -1 || !(gWindows[window->parent].flags & 8))) {
         gPauseMenuTargetPosX = posX;
         gPauseMenuTargetPosY = posY;
     }

src/state_battle.c

@@ -101,7 +101,7 @@ void state_step_battle(void) {
             btl_save_world_cameras();
             load_battle_section();
             D_800A0904 = gPlayerStatusPtr->animFlags;
-            gPlayerStatusPtr->animFlags &= ~PLAYER_ANIM_FLAG_40;
+            gPlayerStatusPtr->animFlags &= ~PLAYER_STATUS_ANIM_FLAGS_40;
             D_800A0908 = get_time_freeze_mode();
             set_time_freeze_mode(TIME_FREEZE_NORMAL);
             gOverrideFlags &= ~0x8;

src/state_file_select.c

@@ -366,7 +366,7 @@ void state_step_exit_file_select(void) {
                 Window* window = &gWindows[i];
 
                 if (window->parent == 44 || window->parent == -1) {
-                    flagSum += window->flags & 8;
+                    flagSum += window->flags & WINDOW_FLAGS_8;
                 }
             }
 

src/trigger.c

@@ -65,7 +65,7 @@ Trigger* create_trigger(TriggerDefinition* def) {
 
     ASSERT(ret != NULL);
 
-    ret->flags.flags = def->flags | 1;
+    ret->flags.flags = def->flags | TRIGGER_DEFINITION_FLAGS_1;
     ret->params1 = def->colliderIndex;
     ret->params2 = def->flagIndex;
     ret->unk_28 = def->unk_1C;

src/world/action/hammer.c

@@ -80,7 +80,7 @@ void func_802B6048_E24F18(s32 arg0) {
     exec_ShakeCamX(0, 2, s2temp, phi_f24);
     playFX_1D(0, xTemp, yTemp, zTemp, phi_s1, phi_s3, 0, (s2temp + 3) * 3);
 
-    switch (is_ability_active(ABILITY_ATTACK_F_X)) {
+    switch (is_ability_active(ABILITY_ATTACK_FX)) {
         case 1:
             soundID = 0x372;
             break;

src/world/action/idle.c

@@ -21,7 +21,7 @@ void world_action_idle_update(void) {
     PlayerData* playerData = &gPlayerData;
     s32 wasMoving = FALSE;
 
-    if (playerStatus->animFlags & PLAYER_ANIM_FLAG_PEACH_PHYSICS) {
+    if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS) {
         func_802B61E4_E23444();
         return;
     }
@@ -40,9 +40,9 @@ void world_action_idle_update(void) {
         playerStatus->currentSpeed = 0.0f;
         playerStatus->unk_8C = 0.0f;
 
-        if (playerStatus->animFlags & PLAYER_ANIM_FLAG_8BIT_MARIO) {
+        if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO) {
             anim = 0x90002;
-        } else if (!(playerStatus->animFlags & PLAYER_ANIM_FLAG_HOLDING_ITEM)) {
+        } else if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT)) {
             anim = 0x10002;
         } else if ((s8)playerStatus->prevActionState == ACTION_STATE_IDLE) {
             anim = 0x60005;
@@ -52,7 +52,7 @@ void world_action_idle_update(void) {
         suggest_player_anim_clearUnkFlag(anim);
     }
 
-    if (playerStatus->animFlags & PLAYER_ANIM_FLAG_GET_STAR_SPIRIT) {
+    if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_GET_STAR_SPIRIT) {
         set_action_state(ACTION_STATE_GET_STAR_SPIRIT);
     } else {
         f32 angle;
@@ -96,7 +96,7 @@ void func_802B61E4_E23444(void) {
         playerStatus->currentSpeed = 0.0f;
         playerStatus->flags &= ~0xE;
 
-        if (!(playerStatus->animFlags & PLAYER_ANIM_FLAG_IN_DISGUISE)) {
+        if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_IN_DISGUISE)) {
             if (!(gGameStatusPtr->peachFlags & 0x10)) {
                 suggest_player_anim_clearUnkFlag(world_action_idle_peachAnims[gGameStatusPtr->peachAnimIdx]);
             } else {

src/world/action/jump.c

@@ -19,9 +19,9 @@ void func_802B6000_E24040(void) {
 
     phys_init_integrator_for_current_state();
 
-    if (playerStatus->animFlags & PLAYER_ANIM_FLAG_8BIT_MARIO) {
+    if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO) {
         temp_v1 = 0x90005;
-    } else if (!(playerStatus->animFlags & (PLAYER_ANIM_FLAG_HOLDING_ITEM | PLAYER_ANIM_FLAG_2))) {
+    } else if (!(playerStatus->animFlags & (PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT | PLAYER_STATUS_ANIM_FLAGS_2))) {
         temp_v1 = 0x10007;
     } else {
         temp_v1 = 0x60009;
@@ -47,7 +47,7 @@ void func_802B60B4_E240F4(void) {
         }
 
         if (playerStatus->actionState == ACTION_STATE_JUMP) {
-            if (playerStatus->animFlags & PLAYER_ANIM_FLAG_8BIT_MARIO) {
+            if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO) {
                 sfx_play_sound_at_player(SOUND_JUMP_8BIT_MARIO, 0);
             }
             else {
@@ -56,9 +56,9 @@ void func_802B60B4_E240F4(void) {
         }
     }
 
-    if (playerStatus->animFlags & PLAYER_ANIM_FLAG_8BIT_MARIO) {
+    if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO) {
         phi_a0 = 0x90005;
-    } else if (!(playerStatus->animFlags & (PLAYER_ANIM_FLAG_HOLDING_ITEM | PLAYER_ANIM_FLAG_2))) {
+    } else if (!(playerStatus->animFlags & (PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT | PLAYER_STATUS_ANIM_FLAGS_2))) {
         phi_a0 = 0x10007;
     } else {
         phi_a0 = 0x60009;
@@ -97,7 +97,7 @@ void func_802B6198_E241D8(void) {
         playerStatus->flags |= 4;
 
 
-        if (!(playerStatus->animFlags & (PLAYER_ANIM_FLAG_HOLDING_ITEM | PLAYER_ANIM_FLAG_2))) {
+        if (!(playerStatus->animFlags & (PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT | PLAYER_STATUS_ANIM_FLAGS_2))) {
             phi_a0 = 0x10008;
         } else {
             phi_a0 = 0x6000A;
@@ -114,7 +114,7 @@ void func_802B6198_E241D8(void) {
 void func_802B6294_E242D4(void) {
     PlayerStatus* playerStatus = &gPlayerStatus;
 
-    if (playerStatus->animFlags & PLAYER_ANIM_FLAG_PEACH_PHYSICS) {
+    if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS) {
         func_802B647C_E244BC();
         return;
     }
@@ -125,9 +125,9 @@ void func_802B6294_E242D4(void) {
         playerStatus->flags &= ~0x8000000A;
         playerStatus->flags |= 4;
 
-        if (playerStatus->animFlags & PLAYER_ANIM_FLAG_8BIT_MARIO) {
+        if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO) {
             phi_a0 = 0x90005;
-        } else  if (!(playerStatus->animFlags & (PLAYER_ANIM_FLAG_HOLDING_ITEM | PLAYER_ANIM_FLAG_2))) {
+        } else  if (!(playerStatus->animFlags & (PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT | PLAYER_STATUS_ANIM_FLAGS_2))) {
             phi_a0 = 0x10008;
         } else {
             phi_a0 = 0x6000A;
@@ -149,7 +149,7 @@ void func_802B6348_E24388(void) {
     f32 sp30;
     f32 sp34;
 
-    if (playerStatus->animFlags & PLAYER_ANIM_FLAG_PEACH_PHYSICS) {
+    if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS) {
         func_802B6508_E24548();
         return;
     }
@@ -185,7 +185,7 @@ void func_802B647C_E244BC(void) {
         playerStatus->flags &= ~0xA;
         playerStatus->flags |= 4;
 
-        if (!(playerStatus->animFlags & PLAYER_ANIM_FLAG_PEACH_PHYSICS)) {
+        if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS)) {
             temp_v1 = 0x10008;
         } else {
             temp_v1 = 0xA0006;
@@ -206,7 +206,7 @@ void func_802B6508_E24548(void) {
         playerStatus->flags |= 4;
         gCameras[0].moveFlags |= 1;
 
-        if (playerStatus->animFlags & PLAYER_ANIM_FLAG_PEACH_PHYSICS) {
+        if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS) {
             suggest_player_anim_clearUnkFlag(0xA0006);
         }
     }

src/world/action/super_boots.c

@@ -163,7 +163,7 @@ void func_802B6000_E26DE0(void) {
             }
             break;
         case 11:
-            set_action_state(ACTION_STATE_LAND_ON_SWITCH);
+            set_action_state(ACTION_STATE_LANDING_ON_SWITCH);
             playerStatus->fallState++;
             enable_player_input();
             break;

src/world/action/ultra_boots.c

@@ -158,7 +158,7 @@ void func_802B6000_E26710(void) {
             }
             break;
         case 11:
-            set_action_state(ACTION_STATE_LAND_ON_SWITCH);
+            set_action_state(ACTION_STATE_LANDING_ON_SWITCH);
             playerStatus->fallState++;
             enable_player_input();
             break;

src/world/action/use_spinning_flower.c

@@ -69,7 +69,7 @@ void func_802B60A4_E29514(void) {
         } else {
             D_802B6ED0 = -1;
         }
-        if (!(playerStatus->animFlags & (PLAYER_ANIM_FLAG_HOLDING_ITEM | PLAYER_ANIM_FLAG_2))) {
+        if (!(playerStatus->animFlags & (PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT | PLAYER_STATUS_ANIM_FLAGS_2))) {
             suggest_player_anim_clearUnkFlag(0x1002B);
         }
     }
@@ -122,7 +122,7 @@ void func_802B60A4_E29514(void) {
                 D_802B6EF0 = 1.6f;
                 playerStatus->flags |= 0x800000;
             }
-            if (gGameStatusPtr->pressedButtons & BUTTON_Z && !(playerStatus->animFlags & (PLAYER_ANIM_FLAG_HOLDING_ITEM | PLAYER_ANIM_FLAG_2))) {
+            if (gGameStatusPtr->pressedButtons & BUTTON_Z && !(playerStatus->animFlags & (PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT | PLAYER_STATUS_ANIM_FLAGS_2))) {
                 suggest_player_anim_setUnkFlag(0x10007);
                 playerStatus->fallState = 3;
                 playerStatus->framesOnGround = 30;

src/world/action/walk.c

@@ -20,7 +20,7 @@ void func_802B6288_E23968(void) {
     s32 phi_s3;
 
     phi_s3 = 0;
-    if (playerStatus->animFlags & PLAYER_ANIM_FLAG_PEACH_PHYSICS) {
+    if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_USING_PEACH_PHYSICS) {
         func_802B6738_E23E18();
         return;
     }
@@ -34,10 +34,10 @@ void func_802B6288_E23968(void) {
         if (!(playerStatus->flags & 0x00004000)) {
             playerStatus->currentSpeed = playerStatus->runSpeed;
         }
-        if (playerStatus->animFlags & PLAYER_ANIM_FLAG_8BIT_MARIO) {
+        if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_8BIT_MARIO) {
             phi_a0 = 0x90003;
         } else {
-            if (!(playerStatus->animFlags & PLAYER_ANIM_FLAG_HOLDING_ITEM)) {
+            if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_HOLDING_WATT)) {
                 phi_a0 = 0x10005;
             } else {
                 phi_a0 = 0x60002;
@@ -106,7 +106,7 @@ void func_802B6288_E23968(void) {
 }
 
 void func_802B6550_E23C30(void) {
-    if (!(gPlayerStatus.animFlags & PLAYER_ANIM_FLAG_IN_DISGUISE)) {
+    if (!(gPlayerStatus.animFlags & PLAYER_STATUS_ANIM_FLAGS_IN_DISGUISE)) {
         if (!(gGameStatusPtr->peachFlags & 0x10)) {
             suggest_player_anim_clearUnkFlag(D_802B6910_E23FF0[gGameStatusPtr->peachAnimIdx]);
             return;
@@ -166,7 +166,7 @@ void func_802B6738_E23E18(void) {
             playerStatus->currentSpeed = playerStatus->runSpeed;
         }
 
-        if (!(playerStatus->animFlags & PLAYER_ANIM_FLAG_IN_DISGUISE)) {
+        if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_IN_DISGUISE)) {
             gameStatus = gGameStatusPtr;
             if (!(gameStatus->peachFlags & 0x10)) {
                 if (!gameStatus->peachAnimIdx) {

src/world/area_arn/arn_02/events.c

@@ -100,7 +100,7 @@ StaticNpc N(npcGroup_802414CC) = {
     .pos = { -196.0f, 130.0f, 104.0f },
     .flags = NPC_FLAG_LOCK_ANIMS,
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = STANDARD_HEART_DROPS(3),
     .flowerDrops = STANDARD_FLOWER_DROPS(2),
     .minCoinBonus = 1,
@@ -133,7 +133,7 @@ StaticNpc N(npcGroup_802416BC) = {
     .pos = { 641.0f, 268.0f, 202.0f },
     .flags = NPC_FLAG_LOCK_ANIMS,
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = STANDARD_HEART_DROPS(3),
     .flowerDrops = STANDARD_FLOWER_DROPS(2),
     .minCoinBonus = 1,
@@ -166,7 +166,7 @@ StaticNpc N(npcGroup_802418AC) = {
     .pos = { 333.0f, 215.0f, 85.0f },
     .flags = NPC_FLAG_LOCK_ANIMS,
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 20,
     { ITEM_DRIED_SHROOM, 10, 0 },
     .heartDrops = STANDARD_HEART_DROPS(2),

src/world/area_arn/arn_03/events.c

@@ -146,9 +146,9 @@ ApiStatus N(func_80240B94_BDF924)(Evt* script, s32 isInitialCall) {
             script->functionTemp[0] = 99;
             script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
-        } else if (enemy->flags & 0x40000000) {
+        } else if (enemy->flags & ENEMY_FLAGS_40000000) {
             script->functionTemp[0] = 12;
-            enemy->flags &= ~0x40000000;
+            enemy->flags &= ~ENEMY_FLAGS_40000000;
         }
 
         posX = npc->pos.x;
@@ -463,7 +463,7 @@ EvtSource N(interact_8024254C) = SCRIPT({
             EVT_VAR(0) = 118;
             EVT_VAR(1) = 1;
             await N(80241C6C);
-            AddKeyItem(ITEM_PACKAGE);
+            AddKeyItem(ITEM_KOOT_PACKAGE);
             EVT_MAP_VAR(0) = 0;
             EVT_SAVE_FLAG(1015) = 1;
             EVT_SAVE_FLAG(1020) = 0;
@@ -720,7 +720,7 @@ StaticNpc N(npcGroup_80243378) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS,
     .init = &N(init_802424E0),
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .movement = { 2, 36, 10, 185, 56, 10, 185, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 479, 215, 198, 150 },
@@ -752,7 +752,7 @@ StaticNpc N(npcGroup_80243568) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS,
     .init = &N(init_802428A8),
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -783,7 +783,7 @@ StaticNpc N(npcGroup_80243758) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS,
     .init = &N(init_802431A4),
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .movement = { 2, 379, 10, 186, 399, 10, 186, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 479, 215, 198, 150 },
@@ -815,7 +815,7 @@ StaticNpc N(npcGroup_80243948) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS,
     .init = &N(init_80243328),
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -846,7 +846,7 @@ StaticNpc N(npcGroup_80243B38) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS,
     .init = &N(init_8024334C),
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -919,7 +919,7 @@ StaticNpc N(npcGroup_80243F80)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000,
         .init = &N(init_80243E90),
         .yaw = 90,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -948,7 +948,7 @@ StaticNpc N(npcGroup_80243F80)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000,
         .init = &N(init_80243ECC),
         .yaw = 90,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -977,7 +977,7 @@ StaticNpc N(npcGroup_80243F80)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000,
         .init = &N(init_80243F08),
         .yaw = 90,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -1006,7 +1006,7 @@ StaticNpc N(npcGroup_80243F80)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000,
         .init = &N(init_80243F44),
         .yaw = 90,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {

src/world/area_arn/arn_04/events.c

@@ -126,7 +126,7 @@ StaticNpc N(npcGroup_80243840) = {
     .pos = { -350.0f, 180.0f, 150.0f },
     .flags = NPC_FLAG_LOCK_ANIMS,
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 20,
     { ITEM_DRIED_SHROOM, 10, 0 },
     .heartDrops = STANDARD_HEART_DROPS(2),
@@ -160,7 +160,7 @@ StaticNpc N(npcGroup_80243A30) = {
     .pos = { 360.0f, 208.0f, 100.0f },
     .flags = NPC_FLAG_LOCK_ANIMS,
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 20,
     { ITEM_DRIED_SHROOM, 10, 0 },
     .heartDrops = STANDARD_HEART_DROPS(2),
@@ -194,7 +194,7 @@ StaticNpc N(npcGroup_80243C20) = {
     .pos = { 150.0f, 177.0f, 160.0f },
     .flags = NPC_FLAG_LOCK_ANIMS,
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = STANDARD_HEART_DROPS(3),
     .flowerDrops = STANDARD_FLOWER_DROPS(2),
     .minCoinBonus = 1,
@@ -227,7 +227,7 @@ StaticNpc N(npcGroup_80243E10) = {
     .pos = { 550.0f, 230.0f, 125.0f },
     .flags = NPC_FLAG_LOCK_ANIMS,
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = STANDARD_HEART_DROPS(3),
     .flowerDrops = STANDARD_FLOWER_DROPS(2),
     .minCoinBonus = 1,
@@ -377,9 +377,9 @@ ApiStatus N(func_80240B94_BE4344)(Evt* script, s32 isInitialCall) {
             script->functionTemp[0] = 99;
             script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
-        } else if (enemy->flags & 0x40000000) {
+        } else if (enemy->flags & ENEMY_FLAGS_40000000) {
             script->functionTemp[0] = 12;
-            enemy->flags &= ~0x40000000;
+            enemy->flags &= ~ENEMY_FLAGS_40000000;
         }
 
         posX = npc->pos.x;

src/world/area_arn/arn_05/events.c

@@ -329,7 +329,7 @@ StaticNpc N(npcGroup_8024223C)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
         .init = &N(init_80241FB8),
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .movement = { 2, 55, 10, 160, 75, 10, 160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 55, 195, 160, 50 },
@@ -360,7 +360,7 @@ StaticNpc N(npcGroup_8024223C)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
         .init = &N(init_80242008),
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -390,7 +390,7 @@ StaticNpc N(npcGroup_8024223C)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
         .init = &N(init_8024202C),
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -420,7 +420,7 @@ StaticNpc N(npcGroup_8024223C)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
         .init = &N(init_8024212C),
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -450,7 +450,7 @@ StaticNpc N(npcGroup_8024223C)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
         .init = &N(init_802421EC),
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .movement = { 2, 350, 10, 197, 330, 10, 197, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 350, 185, 197, 50 },
@@ -795,7 +795,7 @@ StaticNpc N(npcGroup_802443AC) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_80244358),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -869,7 +869,7 @@ StaticNpc N(npcGroup_802447E4)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000,
         .init = &N(init_80244704),
         .yaw = 90,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -898,7 +898,7 @@ StaticNpc N(npcGroup_802447E4)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000,
         .init = &N(init_8024473C),
         .yaw = 90,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -927,7 +927,7 @@ StaticNpc N(npcGroup_802447E4)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000,
         .init = &N(init_80244774),
         .yaw = 90,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -956,7 +956,7 @@ StaticNpc N(npcGroup_802447E4)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000,
         .init = &N(init_802447AC),
         .yaw = 90,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -1056,9 +1056,9 @@ ApiStatus N(func_80240B94_BE8774)(Evt* script, s32 isInitialCall) {
             script->functionTemp[0] = 99;
             script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
-        } else if (enemy->flags & 0x40000000) {
+        } else if (enemy->flags & ENEMY_FLAGS_40000000) {
             script->functionTemp[0] = 12;
-            enemy->flags &= ~0x40000000;
+            enemy->flags &= ~ENEMY_FLAGS_40000000;
         }
 
         posX = npc->pos.x;

src/world/area_arn/arn_07/events.c

@@ -696,7 +696,7 @@ StaticNpc N(npcGroup_80245D0C)[] = {
         .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_200000,
         .init = &N(init_80245090),
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -726,7 +726,7 @@ StaticNpc N(npcGroup_80245D0C)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_200000,
         .init = &N(init_80245058),
         .yaw = 90,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -758,7 +758,7 @@ StaticNpc N(npcGroup_802460EC)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000,
         .init = &N(init_80245104),
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -788,7 +788,7 @@ StaticNpc N(npcGroup_802460EC)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000,
         .init = &N(init_80245104),
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -818,7 +818,7 @@ StaticNpc N(npcGroup_802460EC)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000,
         .init = &N(init_80245104),
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -848,7 +848,7 @@ StaticNpc N(npcGroup_802460EC)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000,
         .init = &N(init_80245104),
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -878,7 +878,7 @@ StaticNpc N(npcGroup_802460EC)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000,
         .init = &N(init_80245104),
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -908,7 +908,7 @@ StaticNpc N(npcGroup_802460EC)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000,
         .init = &N(init_80245104),
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -940,7 +940,7 @@ StaticNpc N(npcGroup_80246C8C) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000,
     .init = &N(init_80245164),
     .yaw = 0,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -970,7 +970,7 @@ StaticNpc N(npcGroup_80246E7C) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000,
     .init = &N(init_8024519C),
     .yaw = 0,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -1009,7 +1009,7 @@ StaticNpc N(npcGroup_802470BC) = {
     .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_8024706C),
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 20,
     .itemDrops = {
         { ITEM_DRIED_SHROOM, 10, 0 },
@@ -1046,7 +1046,7 @@ StaticNpc N(npcGroup_802472AC) = {
     .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_8024706C),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 20,
     .itemDrops = {
         { ITEM_DRIED_SHROOM, 10, 0 },
@@ -1083,7 +1083,7 @@ StaticNpc N(npcGroup_8024749C) = {
     .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_8024706C),
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 20,
     .itemDrops = {
         { ITEM_DRIED_SHROOM, 10, 0 },
@@ -1120,7 +1120,7 @@ StaticNpc N(npcGroup_8024768C) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_80245C9C),
     .yaw = 0,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {

src/world/area_arn/arn_08/events.c

@@ -347,7 +347,7 @@ StaticNpc N(npcGroup_80241448) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_80241288),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -377,7 +377,7 @@ StaticNpc N(npcGroup_80241638) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_802413E8),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {

src/world/area_arn/arn_09/events.c

@@ -148,7 +148,7 @@ StaticNpc N(npcGroup_80240784) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_80240730),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {

src/world/area_arn/arn_10/events.c

@@ -166,7 +166,7 @@ StaticNpc N(npcGroup_802407D8) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_80240720),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -195,7 +195,7 @@ StaticNpc N(npcGroup_802409C8) = {
     .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_8024076C),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 20,
     { ITEM_DRIED_SHROOM, 10, 0 },
     .heartDrops = STANDARD_HEART_DROPS(2),

src/world/area_arn/arn_11/events.c

@@ -254,7 +254,7 @@ StaticNpc N(npcGroup_80240EEC) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000,
     .init = &N(init_80240E70),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {

src/world/area_arn/arn_12/events.c

@@ -166,7 +166,7 @@ StaticNpc N(npcGroup_802407DC) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_80240710),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -195,7 +195,7 @@ StaticNpc N(npcGroup_802409CC) = {
     .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_8024075C),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 20,
     { ITEM_DRIED_SHROOM, 10, 0 },
     .heartDrops = STANDARD_HEART_DROPS(2),

src/world/area_arn/arn_13/events.c

@@ -167,7 +167,7 @@ StaticNpc N(npcGroup_802407EC) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_80240720),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -196,7 +196,7 @@ StaticNpc N(npcGroup_802409DC) = {
     .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_8024076C),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 20,
     { ITEM_DRIED_SHROOM, 10, 0 },
     .heartDrops = STANDARD_HEART_DROPS(2),

src/world/area_dgb/dgb_00/BFA100.c

@@ -418,7 +418,7 @@ StaticNpc N(npcGroup_80241FE4) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_400000,
     .init = &N(init_80241F70),
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -449,7 +449,7 @@ StaticNpc N(npcGroup_802421D4) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS,
     .init = &N(init_80241F94),
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -479,7 +479,7 @@ StaticNpc N(npcGroup_802423C4) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS,
     .init = &N(init_80241FA4),
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -509,7 +509,7 @@ StaticNpc N(npcGroup_802425B4) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS,
     .init = &N(init_80241FB4),
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -539,7 +539,7 @@ StaticNpc N(npcGroup_802427A4) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS,
     .init = &N(init_80241FC4),
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -569,7 +569,7 @@ StaticNpc N(npcGroup_80242994) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS,
     .init = &N(init_80241FD4),
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -750,7 +750,7 @@ StaticNpc N(npcGroup_802434FC) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_400000,
     .init = &N(init_802434EC),
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {

src/world/area_dgb/dgb_01/BFD9A0.c

@@ -183,7 +183,7 @@ EvtSource N(enterDoubleDoor_80243A3C) = SCRIPT({
 });
 
 s32 N(itemList_80243C40)[] = {
-    ITEM_CASTLE_KEY1,
+    ITEM_TUBBA_CASTLE_KEY,
     ITEM_NONE,
 };
 
@@ -1287,9 +1287,9 @@ ApiStatus N(func_802430C0_C00940)(Evt* script, s32 isInitialCall) {
             script->functionTemp[0] = 99;
             script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
-        } else if (enemy->flags & 0x40000000) {
+        } else if (enemy->flags & ENEMY_FLAGS_40000000) {
             script->functionTemp[0] = 12;
-            enemy->flags &= ~0x40000000;
+            enemy->flags &= ~ENEMY_FLAGS_40000000;
         }
 
         posX = npc->pos.x;
@@ -1493,7 +1493,7 @@ StaticNpc N(npcGroup_80246090) = {
     .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_80245D80),
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .movement = { -180, 100, 230, 35, 0, -32767, 0, 0, 0, 0, 450, 1000, 1, 1 },
@@ -1524,7 +1524,7 @@ StaticNpc N(npcGroup_80246280) = {
     .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_80245E44),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .movement = { 180, 100, 230, 35, 0, -32767, 0, 0, 0, 0, 450, 1000, 1, 1 },
@@ -1555,7 +1555,7 @@ StaticNpc N(npcGroup_80246470) = {
     .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_80245F08),
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .movement = { -180, 100, -230, 35, 0, -32767, 0, 0, 0, 0, 450, 1000, 1, 1 },
@@ -1586,7 +1586,7 @@ StaticNpc N(npcGroup_80246660) = {
     .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_80245FCC),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .movement = { 180, 100, -230, 35, 0, -32767, 0, 0, 0, 0, 450, 1000, 1, 1 },
@@ -1632,7 +1632,7 @@ StaticNpc N(npcGroup_80246880) = {
     .flags = NPC_FLAG_200000,
     .init = &N(init_80245784),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -1663,7 +1663,7 @@ StaticNpc N(npcGroup_80246A70) = {
     .flags = NPC_FLAG_200000,
     .init = &N(init_80245814),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 5,
     .itemDrops = {
         { ITEM_SUPER_SHROOM, 10, 0 },
@@ -1702,7 +1702,7 @@ StaticNpc N(npcGroup_80246C60) = {
     .flags = NPC_FLAG_200000,
     .init = &N(init_80245CF0),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 5,
     .itemDrops = {
         { ITEM_SUPER_SHROOM, 10, 0 },

src/world/area_dgb/dgb_02/C2EBA0.c

@@ -275,7 +275,7 @@ StaticNpc N(npcGroup_80241E08)[] = {
         .pos = { -200.0f, 0.0f, 180.0f },
         .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .itemDropChance = 5,
         .itemDrops = {
             { ITEM_SUPER_SHROOM, 10, 0 },
@@ -312,7 +312,7 @@ StaticNpc N(npcGroup_80241E08)[] = {
         .pos = { 0.0f, -1000.0f, 0.0f },
         .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS,
         .yaw = 0,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -344,7 +344,7 @@ StaticNpc N(npcGroup_802421E8)[] = {
         .pos = { 375.0f, 0.0f, 100.0f },
         .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .itemDropChance = 5,
         .itemDrops = {
             { ITEM_SUPER_SHROOM, 10, 0 },
@@ -380,7 +380,7 @@ StaticNpc N(npcGroup_802421E8)[] = {
         .pos = { 0.0f, -1000.0f, 0.0f },
         .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS,
         .yaw = 0,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {

src/world/area_dgb/dgb_03/C31730.c

@@ -169,7 +169,7 @@ EvtSource N(enterDoubleDoor_80242D1C) = SCRIPT({
 });
 
 s32 N(itemList_80242F28)[] = {
-    ITEM_CASTLE_KEY1,
+    ITEM_TUBBA_CASTLE_KEY,
     ITEM_NONE,
 };
 
@@ -527,7 +527,7 @@ StaticNpc N(npcGroup_80243DE8)[] = {
         .pos = { 180.0f, 0.0f, -122.0f },
         .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .itemDropChance = 5,
         .itemDrops = {
             { ITEM_SUPER_SHROOM, 10, 0 },
@@ -563,7 +563,7 @@ StaticNpc N(npcGroup_80243DE8)[] = {
         .pos = { 0.0f, -1000.0f, 0.0f },
         .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS,
         .yaw = 0,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -595,7 +595,7 @@ StaticNpc N(npcGroup_802441C8)[] = {
         .pos = { -272.0f, 0.0f, -135.0f },
         .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .itemDropChance = 5,
         .itemDrops = {
             { ITEM_SUPER_SHROOM, 10, 0 },
@@ -631,7 +631,7 @@ StaticNpc N(npcGroup_802441C8)[] = {
         .pos = { 0.0f, -1000.0f, 0.0f },
         .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS,
         .yaw = 0,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -664,7 +664,7 @@ StaticNpc N(npcGroup_802445A8)[] = {
         .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
         .init = &N(init_80243D94),
         .yaw = 90,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .itemDropChance = 5,
         .itemDrops = {
             { ITEM_SUPER_SHROOM, 10, 0 },
@@ -700,7 +700,7 @@ StaticNpc N(npcGroup_802445A8)[] = {
         .pos = { 0.0f, -1000.0f, 0.0f },
         .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS,
         .yaw = 0,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -884,9 +884,9 @@ ApiStatus N(func_802416B4_C32B94)(Evt* script, s32 isInitialCall) {
             script->functionTemp[0] = 99;
             script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
-        } else if (enemy->flags & 0x40000000) {
+        } else if (enemy->flags & ENEMY_FLAGS_40000000) {
             script->functionTemp[0] = 12;
-            enemy->flags &= ~0x40000000;
+            enemy->flags &= ~ENEMY_FLAGS_40000000;
         }
 
         posX = npc->pos.x;

src/world/area_dgb/dgb_04/C36530.c

@@ -226,7 +226,7 @@ StaticNpc N(npcGroup_80243B28) = {
     .pos = { 70.0f, -220.0f, 186.0f },
     .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .movement = { 70, -220, 186, 15, 40, -32767, 1, 80, -220, 170, 80, 150, 1 },

src/world/area_dgb/dgb_05/C3AA10.c

@@ -197,7 +197,7 @@ StaticNpc N(npcGroup_80241B4C)[] = {
         .pos = { 132.0f, -110.0f, 238.0f },
         .flags = NPC_FLAG_LOCK_ANIMS,
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .itemDropChance = 5,
         .itemDrops = {
             { ITEM_SUPER_SHROOM, 10, 0 },
@@ -233,7 +233,7 @@ StaticNpc N(npcGroup_80241B4C)[] = {
         .pos = { 0.0f, -1000.0f, 0.0f },
         .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS,
         .yaw = 0,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -265,7 +265,7 @@ StaticNpc N(npcGroup_80241F2C)[] = {
         .pos = { 503.0f, -210.0f, 225.0f },
         .flags = NPC_FLAG_LOCK_ANIMS,
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .itemDropChance = 5,
         .itemDrops = {
             { ITEM_SUPER_SHROOM, 10, 0 },
@@ -301,7 +301,7 @@ StaticNpc N(npcGroup_80241F2C)[] = {
         .pos = { 0.0f, -1000.0f, 0.0f },
         .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS,
         .yaw = 0,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {

src/world/area_dgb/dgb_06/C3D080.c

@@ -162,7 +162,7 @@ StaticNpc N(npcGroup_80240954) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_LOCK_ANIMS,
     .init = &N(init_802408FC),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {

src/world/area_dgb/dgb_07/C3DBF0.c

@@ -184,7 +184,7 @@ StaticNpc N(npcGroup_80241A7C)[] = {
         .pos = { -500.0f, 0.0f, -240.0f },
         .flags = NPC_FLAG_NO_Y_MOVEMENT,
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .itemDropChance = 5,
         .itemDrops = {
             { ITEM_SUPER_SHROOM, 10, 0 },
@@ -221,7 +221,7 @@ StaticNpc N(npcGroup_80241A7C)[] = {
         .pos = { 0.0f, -1000.0f, 0.0f },
         .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS,
         .yaw = 0,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {

src/world/area_dgb/dgb_08/C3FDB0.c

@@ -490,7 +490,7 @@ StaticNpc N(npcGroup_802450A0) = {
     .flags = NPC_FLAG_4 | NPC_FLAG_40000 | NPC_FLAG_200000 | NPC_FLAG_NO_DROPS,
     .init = &N(init_80244E94),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 5,
     .itemDrops = {
         { ITEM_SUPER_SHROOM, 10, 0 },
@@ -528,7 +528,7 @@ StaticNpc N(npcGroup_80245290)[] = {
         .pos = { -250.0f, 0.0f, 135.0f },
         .flags = NPC_FLAG_LOCK_ANIMS,
         .yaw = 90,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .itemDropChance = 5,
         .itemDrops = {
             { ITEM_SUPER_SHROOM, 10, 0 },
@@ -565,7 +565,7 @@ StaticNpc N(npcGroup_80245290)[] = {
         .pos = { 0.0f, -1000.0f, 0.0f },
         .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS,
         .yaw = 0,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -597,7 +597,7 @@ StaticNpc N(npcGroup_80245670)[] = {
         .pos = { 220.0f, 0.0f, 155.0f },
         .flags = NPC_FLAG_LOCK_ANIMS,
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .itemDropChance = 5,
         .itemDrops = {
             { ITEM_SUPER_SHROOM, 10, 0 },
@@ -634,7 +634,7 @@ StaticNpc N(npcGroup_80245670)[] = {
         .pos = { 0.0f, -1000.0f, 0.0f },
         .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS,
         .yaw = 0,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -666,7 +666,7 @@ StaticNpc N(npcGroup_80245A50)[] = {
         .pos = { 825.0f, 100.0f, 200.0f },
         .flags = NPC_FLAG_LOCK_ANIMS,
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .itemDropChance = 5,
         .itemDrops = {
             { ITEM_SUPER_SHROOM, 10, 0 },
@@ -703,7 +703,7 @@ StaticNpc N(npcGroup_80245A50)[] = {
         .pos = { 0.0f, -1000.0f, 0.0f },
         .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS,
         .yaw = 0,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -734,7 +734,7 @@ StaticNpc N(npcGroup_80245E30) = {
     .pos = { 75.0f, 310.0f, 85.0f },
     .flags = NPC_FLAG_LOCK_ANIMS,
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .movement = { 75, 310, 85, 30, 0, -32767, 0, 75, 0, 85, 250, 55, 1, 1 },
@@ -764,7 +764,7 @@ StaticNpc N(npcGroup_80246020) = {
     .pos = { -451.0f, 310.0f, 81.0f },
     .flags = NPC_FLAG_LOCK_ANIMS,
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .movement = { -451, 310, 81, 30, 0, -32767, 0, -310, 0, 175, 250, 145, 1, 1 },
@@ -849,7 +849,7 @@ StaticNpc N(npcGroup_80246528) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_200000 | NPC_FLAG_400000,
     .init = &N(init_802464C4),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .movement = { 0, 0, 0, 0, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 },
@@ -891,7 +891,7 @@ StaticNpc N(npcGroup_80246768) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_LOCK_ANIMS,
     .init = &N(init_80246728),
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 5,
     .itemDrops = {
         { ITEM_SUPER_SHROOM, 10, 0 },
@@ -1006,9 +1006,9 @@ ApiStatus N(func_80240B94_C40944)(Evt* script, s32 isInitialCall) {
             script->functionTemp[0] = 99;
             script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
-        } else if (enemy->flags & 0x40000000) {
+        } else if (enemy->flags & ENEMY_FLAGS_40000000) {
             script->functionTemp[0] = 12;
-            enemy->flags &= ~0x40000000;
+            enemy->flags &= ~ENEMY_FLAGS_40000000;
         }
 
         posX = npc->pos.x;

src/world/area_dgb/dgb_09/C46BE0.c

@@ -417,7 +417,7 @@ StaticNpc N(npcGroup_80244920)[] = {
         .pos = { -350.0f, 0.0f, 180.0f },
         .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .itemDropChance = 5,
         .itemDrops = {
             { ITEM_SUPER_SHROOM, 10, 0 },
@@ -454,7 +454,7 @@ StaticNpc N(npcGroup_80244920)[] = {
         .pos = { 0.0f, -1000.0f, 0.0f },
         .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS,
         .yaw = 0,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -495,7 +495,7 @@ StaticNpc N(npcGroup_80244D6C)[] = {
         .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
         .init = &N(init_80244D00),
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .itemDropChance = 5,
         .itemDrops = {
             { ITEM_SUPER_SHROOM, 10, 0 },
@@ -532,7 +532,7 @@ StaticNpc N(npcGroup_80244D6C)[] = {
         .pos = { 0.0f, -1000.0f, 0.0f },
         .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS,
         .yaw = 0,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -563,7 +563,7 @@ StaticNpc N(npcGroup_8024514C) = {
     .pos = { -20.0f, 100.0f, 180.0f },
     .flags = NPC_FLAG_LOCK_ANIMS,
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .movement = { -20, 100, 180, 40, 0, -32767, 0, -20, 100, 180, 250, 0, 0, 1 },

src/world/area_dgb/dgb_15/C4F510.c

@@ -41,7 +41,7 @@ static s32 N(pad_19B4)[] = {
 };
 
 s32 N(itemList_802419C0)[] = {
-    ITEM_CASTLE_KEY1,
+    ITEM_TUBBA_CASTLE_KEY,
     ITEM_NONE,
 };
 
@@ -358,7 +358,7 @@ StaticNpc N(npcGroup_802428C0) = {
     .flags = NPC_FLAG_100 | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_200000 | NPC_FLAG_NO_DROPS,
     .init = &N(init_802427EC),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 5,
     .itemDrops = {
         { ITEM_SUPER_SHROOM, 10, 0 },
@@ -589,9 +589,9 @@ ApiStatus N(func_80241464_C50974)(Evt* script, s32 isInitialCall) {
             script->functionTemp[0] = 99;
             script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
-        } else if (enemy->flags & 0x40000000) {
+        } else if (enemy->flags & ENEMY_FLAGS_40000000) {
             script->functionTemp[0] = 12;
-            enemy->flags &= ~0x40000000;
+            enemy->flags &= ~ENEMY_FLAGS_40000000;
         }
 
         posX = npc->pos.x;

src/world/area_dgb/dgb_16/C52540.c

@@ -99,7 +99,7 @@ static s32 N(pad_1774)[] = {
 };
 
 EvtSource N(80241780) = SCRIPT({
-    MakeItemEntity(ITEM_CASTLE_KEY1, -235, 25, -165, 17, EVT_SAVE_FLAG(1069));
+    MakeItemEntity(ITEM_TUBBA_CASTLE_KEY, -235, 25, -165, 17, EVT_SAVE_FLAG(1069));
 });
 
 static s32 N(pad_17B4)[] = {
@@ -200,7 +200,7 @@ StaticNpc N(npcGroup_80241A4C)[] = {
         .pos = { -70.0f, 0.0f, -100.0f },
         .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .itemDropChance = 5,
         .itemDrops = {
             { ITEM_SUPER_SHROOM, 10, 0 },
@@ -237,7 +237,7 @@ StaticNpc N(npcGroup_80241A4C)[] = {
         .pos = { 0.0f, -1000.0f, 0.0f },
         .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS,
         .yaw = 0,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -269,7 +269,7 @@ StaticNpc N(npcGroup_80241E2C)[] = {
         .pos = { 0.0f, 0.0f, -235.0f },
         .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
         .yaw = 90,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .itemDropChance = 5,
         .itemDrops = {
             { ITEM_SUPER_SHROOM, 10, 0 },
@@ -305,7 +305,7 @@ StaticNpc N(npcGroup_80241E2C)[] = {
         .pos = { 0.0f, -1000.0f, 0.0f },
         .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS,
         .yaw = 0,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -337,7 +337,7 @@ StaticNpc N(npcGroup_8024220C)[] = {
         .pos = { 70.0f, 0.0f, -100.0f },
         .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
         .yaw = 90,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .itemDropChance = 5,
         .itemDrops = {
             { ITEM_SUPER_SHROOM, 10, 0 },
@@ -373,7 +373,7 @@ StaticNpc N(npcGroup_8024220C)[] = {
         .pos = { 0.0f, -1000.0f, 0.0f },
         .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS,
         .yaw = 0,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -405,7 +405,7 @@ StaticNpc N(npcGroup_802425EC)[] = {
         .pos = { 140.0f, 0.0f, -235.0f },
         .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .itemDropChance = 5,
         .itemDrops = {
             { ITEM_SUPER_SHROOM, 10, 0 },
@@ -441,7 +441,7 @@ StaticNpc N(npcGroup_802425EC)[] = {
         .pos = { 0.0f, -1000.0f, 0.0f },
         .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS,
         .yaw = 0,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -473,7 +473,7 @@ StaticNpc N(npcGroup_802429CC)[] = {
         .pos = { 210.0f, 0.0f, -100.0f },
         .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .itemDropChance = 5,
         .itemDrops = {
             { ITEM_SUPER_SHROOM, 10, 0 },
@@ -509,7 +509,7 @@ StaticNpc N(npcGroup_802429CC)[] = {
         .pos = { 0.0f, -1000.0f, 0.0f },
         .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS,
         .yaw = 0,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -541,7 +541,7 @@ StaticNpc N(npcGroup_80242DAC)[] = {
         .pos = { 280.0f, 0.0f, -235.0f },
         .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
         .yaw = 90,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .itemDropChance = 5,
         .itemDrops = {
             { ITEM_SUPER_SHROOM, 10, 0 },
@@ -577,7 +577,7 @@ StaticNpc N(npcGroup_80242DAC)[] = {
         .pos = { 0.0f, -1000.0f, 0.0f },
         .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_DROPS,
         .yaw = 0,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {

src/world/area_dgb/dgb_18/C55F40.c

@@ -575,7 +575,7 @@ StaticNpc N(npcGroup_802432D4) = {
     .flags = NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_40000 | NPC_FLAG_200000 | NPC_FLAG_NO_DROPS,
     .init = &N(init_80242924),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .movement = { 5, 0, 0, 240, 175, 0, 240, 350, 0, 240, 525, 0, 240, 700, 0, 240, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 300, 0, 240, 1000, 250, 1, 1 },
@@ -606,7 +606,7 @@ StaticNpc N(npcGroup_802434C4) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_8024329C),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -738,9 +738,9 @@ ApiStatus N(func_80240B94_C56AD4)(Evt* script, s32 isInitialCall) {
             script->functionTemp[0] = 99;
             script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
-        } else if (enemy->flags & 0x40000000) {
+        } else if (enemy->flags & ENEMY_FLAGS_40000000) {
             script->functionTemp[0] = 12;
-            enemy->flags &= ~0x40000000;
+            enemy->flags &= ~ENEMY_FLAGS_40000000;
         }
 
         posX = npc->pos.x;

src/world/area_dro/dro_01/95B7E0.c

@@ -1238,7 +1238,7 @@ NpcSettings N(npcSettings_80247788) = {
     .otherAI = &N(80247628),
     .onInteract = &N(8024769C),
     .aux = &N(8024771C),
-    .flags = 0x00000D01,
+    .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .level = 99,
 };
 
@@ -1250,7 +1250,7 @@ NpcSettings N(npcSettings_802477B4) = {
     .onInteract = &N(8024769C),
     .ai = &N(80247768),
     .aux = &N(8024771C),
-    .flags = 0x00000C01,
+    .flags = NPC_FLAG_PASSIVE | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .level = 99,
     .unk_2A = 16,
 };
@@ -1909,7 +1909,7 @@ StaticNpc N(npcGroup_80249B34)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_802481F8),
         .yaw = 90,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -1939,7 +1939,7 @@ StaticNpc N(npcGroup_80249B34)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_802483A8),
         .yaw = 90,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .movement = { -235, 0, 160, 30, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 },
@@ -1970,7 +1970,7 @@ StaticNpc N(npcGroup_80249B34)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_802484E0),
         .yaw = 61,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -2000,7 +2000,7 @@ StaticNpc N(npcGroup_80249B34)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_80248AE4),
         .yaw = 74,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -2030,7 +2030,7 @@ StaticNpc N(npcGroup_80249B34)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_80248CC8),
         .yaw = 257,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -2060,7 +2060,7 @@ StaticNpc N(npcGroup_80249B34)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_80249168),
         .yaw = 271,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -2090,7 +2090,7 @@ StaticNpc N(npcGroup_80249B34)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_8024981C),
         .yaw = 180,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -2120,7 +2120,7 @@ StaticNpc N(npcGroup_80249B34)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
         .unk_1C = { 00, 00, 00, 01, 00, 03, 02, 00},
         .yaw = 263,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -2150,7 +2150,7 @@ StaticNpc N(npcGroup_80249B34)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_80249ABC),
         .yaw = 257,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .movement = { -120, 0, 134, 40, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 },
@@ -2181,7 +2181,7 @@ StaticNpc N(npcGroup_80249B34)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_80249B10),
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .movement = { 2, 40, 0, 105, -30, 0, 125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, 0, 0, 0, 0, 0, 0, 1 },
@@ -2215,7 +2215,7 @@ StaticNpc N(npcGroup_8024AE94)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_802498C4),
         .yaw = 62,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -2245,7 +2245,7 @@ StaticNpc N(npcGroup_8024AE94)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_802498C4),
         .yaw = 63,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -2275,7 +2275,7 @@ StaticNpc N(npcGroup_8024AE94)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_802498C4),
         .yaw = 244,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -2400,7 +2400,7 @@ EvtSource N(8024B7B0) = {
         EVT_SET(EVT_VAR(0), 119)
         EVT_SET(EVT_VAR(1), 1)
         EVT_EXEC_WAIT(N(8024B5B4))
-        EVT_CALL(AddKeyItem, ITEM_RED_JAR)
+        EVT_CALL(AddKeyItem, ITEM_KOOT_RED_JAR)
         EVT_SET(EVT_SAVE_FLAG(758), 1)
         EVT_WAIT_FRAMES(20)
         EVT_CALL(func_802D2C14, 0)
@@ -2999,9 +2999,9 @@ ApiStatus N(func_80241174_95C374)(Evt* script, s32 isInitialCall) {
             script->functionTemp[0] = 99;
             script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
-        } else if (enemy->flags & 0x40000000) {
+        } else if (enemy->flags & ENEMY_FLAGS_40000000) {
             script->functionTemp[0] = 12;
-            enemy->flags &= ~0x40000000;
+            enemy->flags &= ~ENEMY_FLAGS_40000000;
         }
 
         posX = npc->pos.x;

src/world/area_dro/dro_02/9694C0.c

@@ -1084,7 +1084,7 @@ NpcSettings N(npcSettings_802473B0) = {
     .otherAI = &N(80247250),
     .onInteract = &N(802472C4),
     .aux = &N(80247344),
-    .flags = 0x00000D01,
+    .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .level = 99,
 };
 
@@ -1096,7 +1096,7 @@ NpcSettings N(npcSettings_802473DC) = {
     .onInteract = &N(802472C4),
     .ai = &N(80247390),
     .aux = &N(80247344),
-    .flags = 0x00000C01,
+    .flags = NPC_FLAG_PASSIVE | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .level = 99,
     .unk_2A = 0x10,
 };
@@ -2722,7 +2722,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_8024BA50),
         .yaw = 90,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .movement = { -303, 0, 22, 146, 38, -32767, 1, 0, 0, 0, 0, 0, 0, 1 },
@@ -2753,7 +2753,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_8024BBAC),
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .movement = { -20, 0, 40, 60, 0, -32767, 0, 0, 0, 0, 0, 0, 0, 1 },
@@ -2784,7 +2784,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_8024D04C),
         .yaw = 90,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -2814,7 +2814,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_8024D790),
         .yaw = 180,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -2844,7 +2844,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_80247A80),
         .yaw = 180,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -2874,7 +2874,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_8024D130),
         .yaw = 0,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -2904,7 +2904,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_8024BCD4),
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -2934,7 +2934,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_8024BD28),
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -2964,7 +2964,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_8024BF10),
         .yaw = 180,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -2994,7 +2994,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_8024C038),
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -3024,7 +3024,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_8024D3E8),
         .yaw = 90,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -3053,7 +3053,7 @@ StaticNpc N(npcGroup_8024D7B4)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .unk_1C = { 00, 00, 00, 01, 00, 03, 02, 01},
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {

src/world/area_flo/flo_00/C9DF60.c

@@ -1037,7 +1037,7 @@ StaticNpc N(npcGroup_80244E64) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_GRAVITY | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_80243474),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -1068,7 +1068,7 @@ StaticNpc N(npcGroup_80245054)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_80243B7C),
         .yaw = 90,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .movement = { 2, -59, 0, -40, -80, 0, -40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, -59, 0, -40, 100, 0, 0, 1 },
@@ -1099,7 +1099,7 @@ StaticNpc N(npcGroup_80245054)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_80243BB0),
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .movement = { 2, 67, 0, 85, 97, 0, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, -59, 0, -40, 100, 0, 0, 1 },
@@ -1130,7 +1130,7 @@ StaticNpc N(npcGroup_80245054)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_80243BE4),
         .yaw = 90,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .movement = { 2, 90, 0, 410, 120, 0, 410, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, -59, 0, -40, 100, 0, 0, 1 },
@@ -1161,7 +1161,7 @@ StaticNpc N(npcGroup_80245054)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
         .init = &N(init_80243C18),
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .movement = { 2, 200, 0, 430, 240, 0, 430, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -32767, -59, 0, -40, 100, 0, 0, 1 },
@@ -1194,7 +1194,7 @@ StaticNpc N(npcGroup_80245814) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000,
     .init = &N(init_8024414C),
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -1225,7 +1225,7 @@ StaticNpc N(npcGroup_80245A04) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_80244BF4),
     .yaw = 0,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -1255,7 +1255,7 @@ StaticNpc N(npcGroup_80245BF4) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_80244DD0),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -1375,7 +1375,7 @@ StaticNpc N(npcGroup_80246264)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT,
         .init = &N(init_80246170),
         .yaw = 90,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -1404,7 +1404,7 @@ StaticNpc N(npcGroup_80246264)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT,
         .init = &N(init_802461E4),
         .yaw = 270,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -1433,7 +1433,7 @@ StaticNpc N(npcGroup_80246264)[] = {
         .flags = NPC_FLAG_PASSIVE | NPC_FLAG_NO_Y_MOVEMENT,
         .init = &N(init_80246224),
         .yaw = 0,
-        .dropFlags = 0x80,
+        .dropFlags = NPC_DROP_FLAGS_80,
         .heartDrops = NO_DROPS,
         .flowerDrops = NO_DROPS,
         .animations = {
@@ -2135,9 +2135,9 @@ ApiStatus N(func_80240BD4_C9EAF4)(Evt* script, s32 isInitialCall) {
             script->functionTemp[0] = 99;
             script->functionTemp[1] = 0;
             enemy->unk_B0 &= ~4;
-        } else if (enemy->flags & 0x40000000) {
+        } else if (enemy->flags & ENEMY_FLAGS_40000000) {
             script->functionTemp[0] = 12;
-            enemy->flags &= ~0x40000000;
+            enemy->flags &= ~ENEMY_FLAGS_40000000;
         }
 
         posX = npc->pos.x;

src/world/area_flo/flo_03/CA72E0.c

@@ -884,7 +884,7 @@ StaticNpc N(npcGroup_8024388C) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_80241DA4),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -915,7 +915,7 @@ StaticNpc N(npcGroup_80243A7C) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_80241E10),
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -945,7 +945,7 @@ StaticNpc N(npcGroup_80243C6C) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_8024338C),
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -975,7 +975,7 @@ StaticNpc N(npcGroup_80243E5C) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_802434CC),
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -1005,7 +1005,7 @@ StaticNpc N(npcGroup_8024404C) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_8024360C),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -1035,7 +1035,7 @@ StaticNpc N(npcGroup_8024423C) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_8024374C),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {

src/world/area_flo/flo_07/CAC5D0.c

@@ -471,7 +471,7 @@ StaticNpc N(npcGroup_8024291C) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .init = &N(init_80242428),
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {

src/world/area_flo/flo_08/CAFAC0.c

@@ -579,7 +579,7 @@ StaticNpc N(npcGroup_80243C48) = {
     .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000,
     .init = &N(init_80243B20),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .heartDrops = NO_DROPS,
     .flowerDrops = NO_DROPS,
     .animations = {
@@ -609,7 +609,7 @@ StaticNpc N(npcGroup_80243E38) = {
     .pos = { 205.0f, 0.0f, -80.0f },
     .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 15,
     .itemDrops = {
         { ITEM_MAPLE_SYRUP, 6, 0 },
@@ -646,7 +646,7 @@ StaticNpc N(npcGroup_80244028) = {
     .pos = { 275.0f, 0.0f, -115.0f },
     .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT,
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 15,
     .itemDrops = {
         { ITEM_MAPLE_SYRUP, 6, 0 },
@@ -683,7 +683,7 @@ StaticNpc N(npcGroup_80244218) = {
     .pos = { -230.0f, 60.0f, -110.0f },
     .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 15,
     .itemDrops = {
         { ITEM_MAPLE_SYRUP, 6, 0 },
@@ -720,7 +720,7 @@ StaticNpc N(npcGroup_80244408) = {
     .pos = { -330.0f, 60.0f, -110.0f },
     .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 15,
     .itemDrops = {
         { ITEM_MAPLE_SYRUP, 6, 0 },
@@ -757,7 +757,7 @@ StaticNpc N(npcGroup_802445F8) = {
     .pos = { -430.0f, 60.0f, -110.0f },
     .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 15,
     .itemDrops = {
         { ITEM_MAPLE_SYRUP, 6, 0 },
@@ -794,7 +794,7 @@ StaticNpc N(npcGroup_802447E8) = {
     .pos = { -530.0f, 60.0f, -110.0f },
     .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 15,
     .itemDrops = {
         { ITEM_MAPLE_SYRUP, 6, 0 },
@@ -831,7 +831,7 @@ StaticNpc N(npcGroup_802449D8) = {
     .pos = { -630.0f, 60.0f, -110.0f },
     .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 15,
     .itemDrops = {
         { ITEM_MAPLE_SYRUP, 6, 0 },
@@ -888,7 +888,7 @@ StaticNpc N(npcGroup_80244CD4) = {
     .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
     .init = &N(init_80244BC8),
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 20,
     .itemDrops = {
         { ITEM_HONEY_SYRUP, 24, 0 },

src/world/area_flo/flo_09/CB50E0.c

@@ -516,7 +516,7 @@ StaticNpc N(npcGroup_8024398C) = {
     .pos = { -350.0f, 0.0f, 40.0f },
     .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 15,
     .itemDrops = {
         { ITEM_MAPLE_SYRUP, 6, 0 },
@@ -553,7 +553,7 @@ StaticNpc N(npcGroup_80243B7C) = {
     .pos = { 260.0f, 0.0f, 75.0f },
     .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
     .yaw = 270,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 15,
     .itemDrops = {
         { ITEM_MAPLE_SYRUP, 6, 0 },
@@ -590,7 +590,7 @@ StaticNpc N(npcGroup_80243D6C) = {
     .pos = { -50.0f, 55.0f, 90.0f },
     .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 15,
     .itemDrops = {
         { ITEM_MAPLE_SYRUP, 6, 0 },
@@ -629,7 +629,7 @@ StaticNpc N(npcGroup_80243F5C) = {
     .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_Y_MOVEMENT | NPC_FLAG_NO_PROJECT_SHADOW,
     .init = &N(init_80243954),
     .yaw = 90,
-    .dropFlags = 0x80,
+    .dropFlags = NPC_DROP_FLAGS_80,
     .itemDropChance = 15,
     .itemDrops = {
         { ITEM_MAPLE_SYRUP, 6, 0 },