diff --git a/include/enums.h b/include/enums.h
index 9b395a89e8..e9dbfb1ea5 100644
--- a/include/enums.h
+++ b/include/enums.h
@@ -2176,11 +2176,36 @@ enum ItemTypeFlags {
     ITEM_TYPE_FLAG_ENTITY_FULLSIZE      = 0x1000,
 };
 
-enum ItemTargetFlags {
-    ITEM_TARGET_FLAG_ENEMY              = 0x0001,
-    ITEM_TARGET_FLAG_2                  = 0x0002,
-    ITEM_TARGET_FLAG_PLAYER             = 0x0008,
-    ITEM_TARGET_FLAG_8000               = 0x8000
+enum TargetFlags {
+    TARGET_FLAG_ENEMY              = 0x00000001,
+    TARGET_FLAG_2                  = 0x00000002,
+    TARGET_FLAG_4                  = 0x00000004,
+    TARGET_FLAG_PLAYER             = 0x00000008,
+    TARGET_FLAG_10                 = 0x00000010,
+    TARGET_FLAG_20                 = 0x00000020,
+    TARGET_FLAG_40                 = 0x00000040,
+    TARGET_FLAG_80                 = 0x00000080,
+    TARGET_FLAG_100                = 0x00000100,
+    TARGET_FLAG_400                = 0x00000400,
+    TARGET_FLAG_800                = 0x00000800,
+    TARGET_FLAG_1000               = 0x00001000,
+    TARGET_FLAG_2000               = 0x00002000,
+    TARGET_FLAG_4000               = 0x00004000,
+    TARGET_FLAG_8000               = 0x00008000,
+    TARGET_FLAG_10000              = 0x00010000,
+    TARGET_FLAG_20000              = 0x00020000,
+    TARGET_FLAG_40000              = 0x00040000,
+    TARGET_FLAG_100000             = 0x00100000,
+    TARGET_FLAG_200000             = 0x00200000,
+    TARGET_FLAG_400000             = 0x00400000,
+    TARGET_FLAG_800000             = 0x00800000,
+    TARGET_FLAG_80000000           = 0x80000000,
+};
+
+enum ActorPartTargetFlags {
+    ACTOR_PART_TARGET_FLAG_1    = 0x01,
+    ACTOR_PART_TARGET_FLAG_2    = 0x02,
+    ACTOR_PART_TARGET_FLAG_4    = 0x04,
 };
 
 enum PlayerSprites {
@@ -5597,41 +5622,6 @@ enum BtlCameraPreset {
     BTL_CAM_PRESET_73,
 };
 
-enum MoveDataFlags {
-    MOVE_DATA_FLAG_SINGLE_TARGET     = 0x00000001,
-    MOVE_DATA_FLAG_2                 = 0x00000002,
-    MOVE_DATA_FLAG_4                 = 0x00000004,
-    MOVE_DATA_FLAG_TARGET_PLAYER     = 0x00000008,
-    MOVE_DATA_FLAG_10                = 0x00000010,
-    MOVE_DATA_FLAG_20                = 0x00000020,
-    MOVE_DATA_FLAG_40                = 0x00000040,
-    MOVE_DATA_FLAG_80                = 0x00000080,
-    MOVE_DATA_FLAG_100               = 0x00000100,
-    MOVE_DATA_FLAG_200               = 0x00000200,
-    MOVE_DATA_FLAG_400               = 0x00000400,
-    MOVE_DATA_FLAG_800               = 0x00000800,
-    MOVE_DATA_FLAG_1000              = 0x00001000,
-    MOVE_DATA_FLAG_2000              = 0x00002000,
-    MOVE_DATA_FLAG_4000              = 0x00004000,
-    MOVE_DATA_FLAG_8000              = 0x00008000,
-    MOVE_DATA_FLAG_10000             = 0x00010000,
-    MOVE_DATA_FLAG_20000             = 0x00020000,
-    MOVE_DATA_FLAG_40000             = 0x00040000,
-    MOVE_DATA_FLAG_80000             = 0x00080000,
-    MOVE_DATA_FLAG_100000            = 0x00100000,
-    MOVE_DATA_FLAG_200000            = 0x00200000,
-    MOVE_DATA_FLAG_400000            = 0x00400000,
-    MOVE_DATA_FLAG_800000            = 0x00800000,
-    MOVE_DATA_FLAG_1000000           = 0x01000000,
-    MOVE_DATA_FLAG_2000000           = 0x02000000,
-    MOVE_DATA_FLAG_4000000           = 0x04000000,
-    MOVE_DATA_FLAG_8000000           = 0x08000000,
-    MOVE_DATA_FLAG_10000000          = 0x10000000,
-    MOVE_DATA_FLAG_20000000          = 0x20000000,
-    MOVE_DATA_FLAG_40000000          = 0x40000000,
-    MOVE_DATA_FLAG_80000000          = 0x80000000,
-};
-
 enum MoveActionTips {
     MOVE_ACTION_TIP_NONE            = -1,
     MOVE_ACTION_TIP_0               = 0,
diff --git a/src/17FEB0.c b/src/17FEB0.c
index d964a1e0d4..aeca2ef5a0 100644
--- a/src/17FEB0.c
+++ b/src/17FEB0.c
@@ -180,7 +180,7 @@ HitResult calc_item_damage_enemy(void) {
 
         if (!(targetPart->flags & ACTOR_PART_FLAG_2000)
             && !partImmuneToElement
-            && !(targetPart->targetFlags & ACTOR_PART_FLAG_4)
+            && !(targetPart->targetFlags & ACTOR_PART_TARGET_FLAG_4)
         ) {
             target->currentHP -= attackDamage;
             if (target->currentHP <= 0) {
@@ -199,7 +199,7 @@ HitResult calc_item_damage_enemy(void) {
         sfx_play_sound_at_position(SOUND_IMMUNE, SOUND_SPACE_MODE_0, state->goalPos.x, state->goalPos.y, state->goalPos.z);
         return HIT_RESULT_NO_DAMAGE;
     }
-    
+
     if (battleStatus->currentAttackElement & DAMAGE_TYPE_DEATH) {
         battleStatus->lastAttackDamage = 0;
         dispatchEvent = EVENT_DEATH;
@@ -443,7 +443,7 @@ HitResult calc_item_damage_enemy(void) {
             } else {
                 func_802664DC(state->goalPos.x, state->goalPos.y, state->goalPos.z, battleStatus->lastAttackDamage, 0);
             }
-            if (!(targetPart->targetFlags & 4)) {
+            if (!(targetPart->targetFlags & ACTOR_PART_TARGET_FLAG_4)) {
                 func_802666E4(target, state->goalPos.x, state->goalPos.y, state->goalPos.z, battleStatus->lastAttackDamage);
             }
         }
diff --git a/src/190B20.c b/src/190B20.c
index 2c0e6a056a..2c6e8be85f 100644
--- a/src/190B20.c
+++ b/src/190B20.c
@@ -57,72 +57,66 @@ extern PartnerDMAData bPartnerDmaTable[];
 
 s32 func_80265CE8(AnimID*, s32);
 
-// WIP work from Unnunu + a permuter do-while I added
-#ifdef NON_MATCHING
-// TOOD remove gotos
 void create_target_list(Actor* actor, s32 arg1) {
+    s32 numTargets = 0;
     BattleStatus* battleStatus = &gBattleStatus;
+    SelectableTarget* targetDataList = actor->targetData;
     Actor* playerActor = battleStatus->playerActor;
     Actor* partnerActor = battleStatus->partnerActor;
-    s32 s5 = 0;
-    SelectableTarget* targetData = actor->targetData;
-    SelectableTarget* s0;
-    SelectableTarget* target;
+    SelectableTarget* targetData;
+    SelectableTarget* otherTarget;
     Actor* targetActor;
     ActorPart* targetPart;
     s8* targetIndexList;
     s32 numParts;
     s32 i, j;
-    f32 f6, f8, f10;
+    f32 targetX, targetY, targetZ;
     f32 f2, f12, f14;
-    u8 sp10;
-    f32 sp14;
+    f32 f61;
+    u8 overlayType;
+    f32 overlayZoom;
     s32 sp18 = FALSE;
-    s32 sp1C;
-    s32 fp;
-    s32 a02;
-    ActorPartBlueprint* partBlueprint;
-    s32 index1;
-    s32 index2;
-    s32 a22;
+    s32 col;
+    s32 row;
 
-    if (battleStatus->currentTargetListFlags & 0x80000000) {
+    s32 skip;
+
+    if (battleStatus->currentTargetListFlags & TARGET_FLAG_80000000) {
         actor->targetListLength = -1;
         return;
     }
-
-    if (battleStatus->currentTargetListFlags & 0x8) {
-        targetData->actorID = ACTOR_PLAYER;
-        targetData->partID = 1;
+    if (battleStatus->currentTargetListFlags & TARGET_FLAG_PLAYER) {
+        targetDataList->actorID = ACTOR_PLAYER;
+        targetDataList->partID = 1;
         if (!arg1) {
-            targetData->pos.x = playerActor->currentPos.x + playerActor->size.x * 0.3 * playerActor->scalingFactor;
-            targetData->pos.y = playerActor->currentPos.y + playerActor->size.y * 0.9 * playerActor->scalingFactor;
-            targetData->pos.z = playerActor->currentPos.z;
+            targetDataList->pos.x = playerActor->currentPos.x + playerActor->size.x * 0.3 * playerActor->scalingFactor;
+            targetDataList->pos.y = playerActor->currentPos.y + playerActor->size.y * 0.9 * playerActor->scalingFactor;
+            targetDataList->pos.z = playerActor->currentPos.z;
         } else {
-            targetData->pos.x = playerActor->homePos.x + playerActor->size.x * 0.3 * playerActor->scalingFactor;
-            targetData->pos.y = playerActor->homePos.y + playerActor->size.y * 0.9 * playerActor->scalingFactor;
-            targetData->pos.z = playerActor->homePos.z;
+            targetDataList->pos.x = playerActor->homePos.x + playerActor->size.x * 0.3 * playerActor->scalingFactor;
+            targetDataList->pos.y = playerActor->homePos.y + playerActor->size.y * 0.9 * playerActor->scalingFactor;
+            targetDataList->pos.z = playerActor->homePos.z;
         }
-        targetData->unk_10 = -100;
-        s5++;
-        targetData++;
+        targetDataList->unk_10 = -100;
+        numTargets += 1;
+        targetDataList++;
     }
 
-    if ((battleStatus->currentTargetListFlags & 0x100) && partnerActor != NULL) {
-        targetData->actorID = ACTOR_PARTNER;
-        targetData->partID = 1;
+    if ((battleStatus->currentTargetListFlags & TARGET_FLAG_100) && partnerActor != NULL) {
+        targetDataList->actorID = ACTOR_PARTNER;
+        targetDataList->partID = 1;
         if (!arg1) {
-            targetData->pos.x = partnerActor->currentPos.x + partnerActor->size.x * 0.1 * partnerActor->scalingFactor;
-            targetData->pos.y = partnerActor->currentPos.y + partnerActor->size.y * 0.8 * partnerActor->scalingFactor;
-            targetData->pos.z = partnerActor->currentPos.z;
+            targetDataList->pos.x = partnerActor->currentPos.x + partnerActor->size.x * 0.1 * partnerActor->scalingFactor;
+            targetDataList->pos.y = partnerActor->currentPos.y + partnerActor->size.y * 0.8 * partnerActor->scalingFactor;
+            targetDataList->pos.z = partnerActor->currentPos.z;
         } else {
-            targetData->pos.x = partnerActor->homePos.x + partnerActor->size.x * 0.1 * partnerActor->scalingFactor;
-            targetData->pos.y = partnerActor->homePos.y + partnerActor->size.y * 0.8 * partnerActor->scalingFactor;
-            targetData->pos.z = partnerActor->homePos.z;
+            targetDataList->pos.x = partnerActor->homePos.x + partnerActor->size.x * 0.1 * partnerActor->scalingFactor;
+            targetDataList->pos.y = partnerActor->homePos.y + partnerActor->size.y * 0.8 * partnerActor->scalingFactor;
+            targetDataList->pos.z = partnerActor->homePos.z;
         }
-        targetData->unk_10 = -50;
-        s5++;
-        targetData++;
+        targetDataList->unk_10 = -50;
+        numTargets += 1;
+        targetDataList++;
     }
 
     for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) {
@@ -130,297 +124,335 @@ void create_target_list(Actor* actor, s32 arg1) {
         if (targetActor == NULL) {
             continue;
         }
-        if ((battleStatus->currentTargetListFlags & 0x100) || (battleStatus->currentTargetListFlags & 0x8)) {
+        if ((battleStatus->currentTargetListFlags & TARGET_FLAG_100) || (battleStatus->currentTargetListFlags & TARGET_FLAG_PLAYER)) {
             break;
         }
         targetPart = targetActor->partsTable;
         numParts = targetActor->numParts;
         for (j = 0; j < numParts; targetPart = targetPart->nextPart, j++) {
-            if (!(targetPart->flags & 0x20000)) {
-                partBlueprint = targetPart->staticData;
-                if (!(targetPart->flags & 0x100000)) {
-                    fp = !arg1; // TODO ??????
-                    if (fp) {
-                        f6 = targetActor->currentPos.x;
-                        f8 = targetActor->currentPos.y;
-                        f10 = targetActor->currentPos.z;
+            if (!(targetPart->flags & ACTOR_PART_FLAG_NO_TARGET)) {
+                ActorPartBlueprint* partBlueprint = targetPart->staticData;
+                s8 partIndex;
+                if (!(targetPart->flags & ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION)) {
+                    row = !arg1; // required to match
+                    if (row) {
+                        targetX = targetActor->currentPos.x;
+                        targetY = targetActor->currentPos.y;
+                        targetZ = targetActor->currentPos.z;
                     } else {
-                        f6 = targetActor->homePos.x;
-                        f8 = targetActor->homePos.y;
-                        f10 = targetActor->homePos.z;
+                        targetX = targetActor->homePos.x;
+                        targetY = targetActor->homePos.y;
+                        targetZ = targetActor->homePos.z;
                     }
-                    f6 += targetPart->partOffset.x * targetActor->scalingFactor;
-                    if (!(targetActor->flags & 0x800)) {
-                        f8 += targetPart->partOffset.y * targetActor->scalingFactor;
+                    targetX += targetPart->partOffset.x * targetActor->scalingFactor;
+                    if (!(targetActor->flags & ACTOR_FLAG_UPSIDE_DOWN)) {
+                        targetY += targetPart->partOffset.y * targetActor->scalingFactor;
                     }
-                    f10 += targetPart->partOffset.z * targetActor->scalingFactor;
-                    f12 = f6;
-                    f6 = targetActor->scalingFactor;
-                    f6 = f12 + targetPart->targetOffset.x * f6;
-                    f2 = f8;
-                    f14 = f10 + 5.0f;
-                    if (!(targetActor->flags & 0x800)) {
-                        f8 = f2 + targetPart->targetOffset.y * targetActor->scalingFactor;
+                    targetZ += targetPart->partOffset.z * targetActor->scalingFactor;
+                    f12 = targetX;
+                    targetX = targetActor->scalingFactor;
+                    targetX = f12 + targetPart->targetOffset.x * targetX;
+                    f2 = targetY;
+                    f14 = targetZ + 5.0f;
+                    if (!(targetActor->flags & ACTOR_FLAG_UPSIDE_DOWN)) {
+                        targetY = f2 + targetPart->targetOffset.y * targetActor->scalingFactor;
                     }
                 } else {
-                    f8 = targetPart->absolutePosition.y;
-                    f10 = targetPart->absolutePosition.z;
+                    targetY = targetPart->absolutePosition.y;
+                    targetZ = targetPart->absolutePosition.z;
                     f12 = targetPart->absolutePosition.x;
-                    f2 = f8;
-                    f14 = f10 + 5.0f;
-                    f6 = f12 + targetPart->targetOffset.x;
-                    if (!(targetActor->flags & 0x800)) {
-                        f8 = f2 + targetPart->targetOffset.y;
+                    f2 = targetY;
+                    f14 = targetZ + 5.0f;
+                    targetX = f12 + targetPart->targetOffset.x;
+                    if (!(targetActor->flags & ACTOR_FLAG_UPSIDE_DOWN)) {
+                        targetY = f2 + targetPart->targetOffset.y;
                     }
                 }
 
-                targetData->actorID = ACTOR_CLASS_ENEMY | i;
-                targetData->partID = partBlueprint->index;
-                targetData->pos.x = f6;
-                targetData->pos.y = f8;
-                targetData->pos.z = f10;
-                targetData->unk_10 = 0;
+                targetDataList->actorID = ACTOR_CLASS_ENEMY | i;
+                partIndex = partBlueprint->index;
+                targetDataList->pos.x = targetX;
+                targetDataList->pos.y = targetY;
+                targetDataList->pos.z = targetZ;
+                targetDataList->unk_10 = 0;
+                targetDataList->partID = partIndex;
 
-                if ((targetActor->flags & 0x4000) && !(targetActor->flags & 0x10)) {
-                    targetData->unk_10 = 100;
+                if ((targetActor->flags & ACTOR_FLAG_TARGET_ONLY) && !(targetActor->flags & ACTOR_FLAG_10)) {
+                    targetDataList->unk_10 = 100;
                 }
-                targetData->unk_10 += targetPart->unk_70;
-                targetData->unk_0A = f12 + targetData->unk_10 * 100;
-                targetData->unk_0C = f2;
-                targetData->unk_0E = f14;
+                targetDataList->unk_10 += targetPart->unk_70;
+                targetDataList->unk_0A = f12 + targetDataList->unk_10 * 100;
+                targetDataList->unk_0C = f2;
+                targetDataList->unk_0E = f14;
 
-                if (targetData->unk_0C < 40) {
-                    targetData->homeRow = 0;
-                } else if (targetData->unk_0C < 85) {
-                    targetData->homeRow = 1;
-                } else if (targetData->unk_0C < 100) {
-                    targetData->homeRow = 2;
+                if (targetDataList->unk_0C < 40) {
+                    targetDataList->homeRow = 0;
+                } else if (targetDataList->unk_0C < 85) {
+                    targetDataList->homeRow = 1;
+                } else if (targetDataList->unk_0C < 100) {
+                    targetDataList->homeRow = 2;
                 } else {
-                    targetData->homeRow = 3;
+                    do {
+                        do {
+                            targetDataList->homeRow = 3;
+                        } while (0);
+                    } while (0);
                 }
 
-                if (targetData->unk_0A < 25) {
-                    targetData->homeCol = 0;
-                } else if (targetData->unk_0A < 65) {
-                    targetData->homeCol = 1;
-                } else if (targetData->unk_0A < 105) {
-                    targetData->homeCol = 2;
+                if (targetDataList->unk_0A < 25) {
+                    targetDataList->homeCol = 0;
+                } else if (targetDataList->unk_0A < 65) {
+                    targetDataList->homeCol = 1;
+                } else if (targetDataList->unk_0A < 105) {
+                    targetDataList->homeCol = 2;
                 } else {
-                    targetData->homeCol = 3;
+                    do {
+                        targetDataList->homeCol = 3;
+                    } while (0);
                 }
 
-                if (targetData->unk_0E < -30) {
-                    targetData->layer = 0;
+                if (targetDataList->unk_0E < -30) {
+                    targetDataList->layer = 0;
                 } else {
-                    targetData->layer = 1;
+                    targetDataList->layer = 1;
                 }
-                s5++;
-                targetData++;
+                numTargets++;
+                targetDataList++;
             }
         }
     }
-
-    actor->selectedTargetIndex = 0;
-    actor->targetListLength = s5;
-
     do {
+        actor->selectedTargetIndex = 0;
+    } while (0);
+    actor->targetListLength = numTargets;
 
     // @bug this should be % 4
-    sp1C = battleStatus->targetHomeIndex & 4;
-    fp = battleStatus->targetHomeIndex / 4;
+    col = battleStatus->targetHomeIndex & 4;
+    row = battleStatus->targetHomeIndex / 4;
 
-    targetData = actor->targetData;
-    s5 = actor->targetListLength;
+    targetDataList = actor->targetData;
+    numTargets = actor->targetListLength;
 
-    for (i = 0; i < s5; i++) {
-        s0 = &targetData[i];
-        targetActor = get_actor(s0->actorID);
-        targetPart = get_actor_part(targetActor, s0->partID);
-        if (s0->actorID == ACTOR_PLAYER || s0->actorID == ACTOR_PARTNER) {
+    for (i = 0; i < numTargets; i++) {
+        targetData = &targetDataList[i];
+        targetActor = get_actor(targetData->actorID);
+        targetPart = get_actor_part(targetActor, targetData->partID);
+        if (targetData->actorID == ACTOR_PLAYER || targetData->actorID == ACTOR_PARTNER) {
             continue;
         }
-        if (battleStatus->currentTargetListFlags & 0x80000000) {
-            a02 = 1;
+        if (battleStatus->currentTargetListFlags & TARGET_FLAG_80000000) {
+            skip = TRUE;
             goto END2;
         }
-        if (!(gBattleStatus.flags2 & 0x4000) && battleStatus->darknessMode > 0) {
-            get_screen_overlay_params(1, &sp10, &sp14);
-            if (sp14 >= 215.0f) {
-                a02 = 1;
+        if (!(gBattleStatus.flags2 & BS_FLAGS2_4000) && battleStatus->darknessMode > 0) {
+            get_screen_overlay_params(1, &overlayType, &overlayZoom);
+            if (overlayZoom >= 215.0f) {
+                skip = TRUE;
                 sp18 = 1;
                 goto END2;
             }
         }
-        if (battleStatus->currentTargetListFlags & 0x8000) {
-            if (!(targetPart->flags & 0x800000) || (targetActor->flags & 0x40) || (targetPart->flags & 0x40)) {
-                a02 = 1;
-            } else {
-                a02 = 0;
+        if (battleStatus->currentTargetListFlags & TARGET_FLAG_8000) {
+            if (!(targetPart->flags & ACTOR_PART_FLAG_MULTI_TARGET) ||
+                 (targetActor->flags & ACTOR_FLAG_40) ||
+                 (targetPart->flags & ACTOR_PART_FLAG_40))
+            {
+                skip = TRUE;
+                goto END2;
             }
-        } else {
-            a02 = 0;
         }
+        skip = 0;
 END2:
-        if (a02) {
-            for (j = i; j < s5 - 1; j++) {
+        if (skip) {
+            for (j = i; j < numTargets - 1; j++) {
                 actor->targetData[j] = actor->targetData[j + 1];
             }
-            s5--;
+            numTargets--;
             i--;
         }
     }
 
-    for (i = 0; i < s5; i++) {
-        s0 = &targetData[i];
-        targetActor = get_actor(s0->actorID);
-        targetPart = get_actor_part(targetActor, s0->partID);
-        if (s0->actorID == ACTOR_PLAYER || s0->actorID == ACTOR_PARTNER) {
+    for (i = 0; i < numTargets; i++) {
+        targetData = &targetDataList[i];
+        targetActor = get_actor(targetData->actorID);
+        targetPart = get_actor_part(targetActor, targetData->partID);
+        if (targetData->actorID == ACTOR_PLAYER || targetData->actorID == ACTOR_PARTNER) {
             continue;
         }
+        do {
+            if ((battleStatus->currentTargetListFlags & TARGET_FLAG_800) && (targetPart->targetFlags & ACTOR_PART_TARGET_FLAG_1)) {
+                skip = TRUE;
+                goto END;
+            }
+        } while (0);
+        do {
+            if ((battleStatus->currentTargetListFlags & TARGET_FLAG_1000) && (targetPart->targetFlags & ACTOR_PART_TARGET_FLAG_2)) {
+                skip = TRUE;
+                goto END;
+            }
+        } while (0);
+        do {
+            if ((battleStatus->currentTargetListFlags & TARGET_FLAG_20000) && ((targetActor->flags & ACTOR_FLAG_80) || (targetPart->flags & ACTOR_PART_FLAG_80))) {
+                skip = TRUE;
+                goto END;
+            }
+        } while (0);
+        if ((battleStatus->currentTargetListFlags & TARGET_FLAG_400) && (targetActor->flags & ACTOR_FLAG_UPSIDE_DOWN)) {
+            skip = TRUE;
+            goto END;
+        }
+        if (!(battleStatus->currentTargetListFlags & TARGET_FLAG_10000) && (targetActor->flags & ACTOR_FLAG_TARGET_ONLY)) {
+            skip = TRUE;
+            goto END;
+        }
+        if ((battleStatus->currentTargetListFlags & TARGET_FLAG_40000) && (targetActor->flags & ACTOR_FLAG_UPSIDE_DOWN)) {
+            skip = TRUE;
+            goto END;
+        }
+        if ((battleStatus->currentTargetListFlags & TARGET_FLAG_4) && targetData->homeRow != 0) {
+            skip = TRUE;
+            goto END;
+        }
+        if ((battleStatus->currentTargetListFlags & TARGET_FLAG_10) && targetData->homeRow >= 2) {
+            skip = TRUE;
+            goto END;
+        }
+        if ((battleStatus->currentTargetListFlags & TARGET_FLAG_40) && targetData->homeRow <= 0) {
+            skip = TRUE;
+            goto END;
+        }
+        if ((battleStatus->currentTargetListFlags & TARGET_FLAG_4000) && !(targetPart->flags & ACTOR_PART_FLAG_20)) {
+            s32 cond = FALSE;
+            do {
+                for (j = 0; j < numTargets; j++) {
+                    otherTarget = &targetDataList[j];
+                    if (targetData != otherTarget) {
+                        if (targetData->layer == otherTarget->layer &&
+                            targetData->homeCol == otherTarget->homeCol &&
+                            targetData->homeRow < otherTarget->homeRow) {
+                            cond = TRUE;
+                            break;
+                        }
+                    }
+                }
+            } while (0);
+            if (cond) {
+                skip = TRUE;
+                goto END;
+            }
+        }
+        if (battleStatus->currentTargetListFlags & TARGET_FLAG_2000) {
+            s32 cond = FALSE;
 
-        if ((battleStatus->currentTargetListFlags & 0x800) && (targetPart->targetFlags & 0x1)) {
-            a02 = 1;
-            goto END;
-        }
-        if ((battleStatus->currentTargetListFlags & 0x1000) && (targetPart->targetFlags & 0x2)) {
-            a02 = 1;
-            goto END;
-        }
-        if ((battleStatus->currentTargetListFlags & 0x20000) && ((targetActor->flags & 0x80) || (targetPart->flags & 0x80))) {
-            a02 = 1;
-            goto END;
-        }
-        if ((battleStatus->currentTargetListFlags & 0x400) && (targetActor->flags & 0x800)) {
-            a02 = 1;
-            goto END;
-        }
-        if (!(battleStatus->currentTargetListFlags & 0x10000) && (targetActor->flags & 0x4000)) {
-            a02 = 1;
-            goto END;
-        }
-        if ((battleStatus->currentTargetListFlags & 0x40000) && (targetActor->flags & 0x800)) {
-            a02 = 1;
-            goto END;
-        }
-        if ((battleStatus->currentTargetListFlags & 0x4) && s0->homeRow != 0) {
-            a02 = 1;
-            goto END;
-        }
-        if ((battleStatus->currentTargetListFlags & 0x10) && s0->homeRow >= 2) {
-            a02 = 1;
-            goto END;
-        }
-        if ((battleStatus->currentTargetListFlags & 0x40) && s0->homeRow <= 0) {
-            a02 = 1;
-            goto END;
-        }
-        if ((battleStatus->currentTargetListFlags & 0x4000) && !(targetPart->flags & 0x20)) {
-            a22 = 0;
-
-            for (j = 0; j < s5; j++) {
-                target = &targetData[j];
-                if (s0 != target) {
-                    if (s0->layer == target->layer &&
-                        s0->homeCol == target->homeCol &&
-                        s0->homeRow < target->homeRow) {
-                        a22 = 1;
+            for (j = 0; j < numTargets; j++) {
+                otherTarget = &targetDataList[j];
+                if (targetData != otherTarget) {
+                    if (targetData->layer == otherTarget->layer &&
+                        targetData->homeRow == otherTarget->homeRow &&
+                        targetData->homeCol > otherTarget->homeCol) {
+                        cond = TRUE;
                         break;
                     }
                 }
             }
 
-            if (a22) {
-                a02 = 1;
+            if (cond) {
+                skip = TRUE;
                 goto END;
             }
         }
-
-        if (battleStatus->currentTargetListFlags & 0x2000) {
-            a22 = 0;
-
-            for (j = 0; j < s5; j++) {
-                target = &targetData[j];
-                if (s0 != target) {
-                    if (s0->layer == target->layer &&
-                        s0->homeRow == target->homeRow &&
-                        s0->homeCol > target->homeCol) {
-                        a22 = 1;
-                        break;
-                    }
-                }
-            }
-
-            if (a22) {
-                a02 = 1;
+        do {
+            if ((battleStatus->currentTargetListFlags & TARGET_FLAG_20) && (targetActor->flags & ACTOR_FLAG_FLYING)) {
+                skip = TRUE;
                 goto END;
             }
-        }
-
-        if ((battleStatus->currentTargetListFlags & 0x20) && (targetActor->flags & 0x200)) {
-            a02 = 1;
-        } else if ((battleStatus->currentTargetListFlags & 0x100000) && s0->homeRow == fp + 1) {
-            a02 = 1;
-        } else if ((battleStatus->currentTargetListFlags & 0x200000) && s0->homeRow == fp - 1) {
-            a02 = 1;
-        } else if ((battleStatus->currentTargetListFlags & 0x400000) && s0->homeCol == sp1C - 1) {
-            a02 = 1;
-        } else if ((battleStatus->currentTargetListFlags & 0x800000) && s0->homeCol == sp1C + 1) {
-            a02 = 1;
-        } else if ((battleStatus->currentTargetListFlags & 0x100000) && s0->homeRow < fp) {
-            a02 = 1;
-        } else if ((battleStatus->currentTargetListFlags & 0x200000) && s0->homeRow > fp) {
-            a02 = 1;
-        } else if ((battleStatus->currentTargetListFlags & 0x400000) && s0->homeCol > sp1C) {
-            a02 = 1;
-        } else if ((battleStatus->currentTargetListFlags & 0x800000) && s0->homeCol < sp1C) {
-            a02 = 1;
-        } else {
-            a02 = 0;
-        }
+        } while (0);
+        do {
+            if ((battleStatus->currentTargetListFlags & TARGET_FLAG_100000) && targetData->homeRow == row + 1) {
+                skip = TRUE;
+                goto END;
+            }
+        } while (0);
+        do {
+            if ((battleStatus->currentTargetListFlags & TARGET_FLAG_200000) && targetData->homeRow == row - 1) {
+                skip = TRUE;
+                goto END;
+            }
+        } while (0);
+        do {
+            if ((battleStatus->currentTargetListFlags & TARGET_FLAG_400000) && targetData->homeCol == col - 1) {
+                skip = TRUE;
+                goto END;
+            }
+        } while (0);
+        do {
+            if ((battleStatus->currentTargetListFlags & TARGET_FLAG_800000) && targetData->homeCol == col + 1) {
+                skip = TRUE;
+                goto END;
+            }
+        } while (0);
+        do {
+            if ((battleStatus->currentTargetListFlags & TARGET_FLAG_100000) && targetData->homeRow < row) {
+                skip = TRUE;
+                goto END;
+            }
+        } while (0);
+        do {
+            if ((battleStatus->currentTargetListFlags & TARGET_FLAG_200000) && targetData->homeRow > row) {
+                skip = TRUE;
+                goto END;
+            }
+        } while (0);
+        do {
+            if ((battleStatus->currentTargetListFlags & TARGET_FLAG_400000) && targetData->homeCol > col) {
+                skip = TRUE;
+                goto END;
+            }
+        } while (0);
+        do {
+            if ((battleStatus->currentTargetListFlags & TARGET_FLAG_800000) && targetData->homeCol < col) {
+                skip = TRUE;
+                goto END;
+            }
+        } while (0);
+        skip = FALSE;
 END:
-        if (a02) {
-            for (j = i; j < s5 - 1; j++) {
+        if (skip) {
+            for (j = i; j < numTargets - 1; j++) {
                 actor->targetData[j] = actor->targetData[j + 1];
             }
-            s5--;
+            numTargets--;
             i--;
         }
     }
 
-    } while (0); // TODO required to match
-
-    actor->targetListLength = s5;
-    if (s5 == 0 && sp18) {
-        gBattleStatus.flags2 |= 0x1000;
+    actor->targetListLength = numTargets;
+    if (numTargets == 0 && sp18) {
+        gBattleStatus.flags2 |= BS_FLAGS2_NO_TARGET_AVAILABLE;
     } else {
-        gBattleStatus.flags2 &= ~0x1000;
+        gBattleStatus.flags2 &= ~BS_FLAGS2_NO_TARGET_AVAILABLE;
     }
 
-    targetIndexList = actor->targetIndexList;
-    targetData = actor->targetData;
+    targetDataList = actor->targetData;
 
-    s5 = actor->targetListLength;
-    for (i = 0; i < s5; i++) {
+    numTargets = actor->targetListLength;
+    targetIndexList = actor->targetIndexList;
+    for (i = 0; i < numTargets; i++) {
         targetIndexList[i] = i;
     }
-
-    for (i = 0; i < s5 - 1; i++) {
-        for (j = i + 1; j < s5; j++) {
-            index1 = targetIndexList[i];
-            index2 = targetIndexList[j];
-            s0 = &targetData[index1];
-            target = &targetData[index2];
-            if (s0->pos.x + s0->unk_10 * 10 > target->pos.x + target->unk_10 * 10) {
+    for (i = 0; i < numTargets - 1; i++) {
+        for (j = i + 1; j < numTargets; j++) {
+            s32 index1 = targetIndexList[i];
+            s32 index2 = targetIndexList[j];
+            targetData = &targetDataList[index1];
+            otherTarget = &targetDataList[index2];
+            if (targetData->pos.x + targetData->unk_10 * 10 > otherTarget->pos.x + otherTarget->unk_10 * 10) {
                 targetIndexList[i] = targetIndexList[j];
                 targetIndexList[j] = index1;
             }
         }
     }
 }
-#else
-void create_target_list(Actor* actor, s32 arg1);
-INCLUDE_ASM(s32, "190B20", create_target_list);
-#endif
 
 void func_80266DAC(Actor* actor, s32 arg1);
 
diff --git a/src/19FAF0.c b/src/19FAF0.c
index 3be4f6b304..aa9c0e75ee 100644
--- a/src/19FAF0.c
+++ b/src/19FAF0.c
@@ -614,7 +614,7 @@ HitResult calc_player_damage_enemy(void) {
             if (!(targetPart->flags & ACTOR_PART_FLAG_2000)
                 && !(gBattleStatus.flags1 & BS_FLAGS1_TUTORIAL_BATTLE)
                 && !partImmuneToElement
-                && !(targetPart->targetFlags & ACTOR_PART_FLAG_4)
+                && !(targetPart->targetFlags & ACTOR_PART_TARGET_FLAG_4)
             ) {
                 target->currentHP -= currentAttackDamage;
 
@@ -832,7 +832,7 @@ HitResult calc_player_damage_enemy(void) {
             && dispatchEvent != EVENT_DEATH
             && dispatchEvent != EVENT_SPIN_SMASH_DEATH
             && dispatchEvent != EVENT_EXPLODE_TRIGGER
-            && !(targetPart->targetFlags & ACTOR_PART_FLAG_4)
+            && !(targetPart->targetFlags & ACTOR_PART_TARGET_FLAG_4)
         ) {
             #define INFLICT_STATUS(STATUS_TYPE) \
                 if ((battleStatus->currentAttackStatus & STATUS_FLAG_##STATUS_TYPE) && \
@@ -882,7 +882,7 @@ HitResult calc_player_damage_enemy(void) {
                 func_802664DC(state->goalPos.x, state->goalPos.y, state->goalPos.z, battleStatus->lastAttackDamage, 0);
             }
 
-            if (!(targetPart->targetFlags & 4)) {
+            if (!(targetPart->targetFlags & ACTOR_PART_TARGET_FLAG_4)) {
                 func_802666E4(target, state->goalPos.x, state->goalPos.y, state->goalPos.z, battleStatus->lastAttackDamage);
             }
         }
diff --git a/src/1AC760.c b/src/1AC760.c
index 326d5c0a15..9d71da162a 100644
--- a/src/1AC760.c
+++ b/src/1AC760.c
@@ -457,7 +457,7 @@ HitResult calc_partner_damage_enemy(void) {
             if (!(targetPart->flags & ACTOR_PART_FLAG_2000)
                 && !(gBattleStatus.flags1 & BS_FLAGS1_TUTORIAL_BATTLE)
                 && !partImmuneToElement
-                && !(targetPart->targetFlags & ACTOR_PART_FLAG_4)
+                && !(targetPart->targetFlags & ACTOR_PART_TARGET_FLAG_4)
             ) {
                 target->currentHP -= damageDealt;
 
@@ -638,7 +638,7 @@ HitResult calc_partner_damage_enemy(void) {
                 && dispatchEvent != EVENT_DEATH
                 && dispatchEvent != EVENT_SPIN_SMASH_DEATH
                 && dispatchEvent != EVENT_EXPLODE_TRIGGER
-                && !(targetPart->targetFlags & ACTOR_PART_FLAG_4)
+                && !(targetPart->targetFlags & ACTOR_PART_TARGET_FLAG_4)
             ) {
                 #define INFLICT_STATUS(STATUS_TYPE) \
                     if ((battleStatus->currentAttackStatus & STATUS_FLAG_##STATUS_TYPE) && \
@@ -750,7 +750,7 @@ HitResult calc_partner_damage_enemy(void) {
                 func_802664DC(state->goalPos.x, state->goalPos.y, state->goalPos.z, battleStatus->lastAttackDamage, 0);
             }
 
-            if (!(targetPart->targetFlags & ACTOR_PART_FLAG_4)) {
+            if (!(targetPart->targetFlags & ACTOR_PART_TARGET_FLAG_4)) {
                 func_802666E4(target, state->goalPos.x, state->goalPos.y, state->goalPos.z, battleStatus->lastAttackDamage);
             }
         }
diff --git a/src/1AF120.c b/src/1AF120.c
index 4de4ae1c11..b0a0face1a 100644
--- a/src/1AF120.c
+++ b/src/1AF120.c
@@ -1079,7 +1079,7 @@ EvtScript D_80298948 = {
 
 EvtScript ForceNextTarget = {
     EVT_CALL(GetOwnerID, LVarA)
-    EVT_CALL(EnemyCreateTargetList, 32770)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -1093,7 +1093,7 @@ EvtScript ForceNextTarget = {
     EVT_IF_NE(LVar0, -1)
         EVT_GOTO(0)
     EVT_END_IF
-    EVT_CALL(EnemyCreateTargetList, 32770)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(1)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -1107,7 +1107,7 @@ EvtScript ForceNextTarget = {
     EVT_IF_NE(LVar0, -1)
         EVT_GOTO(1)
     EVT_END_IF
-    EVT_CALL(EnemyCreateTargetList, 32770)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(2)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -1730,7 +1730,7 @@ EvtScript DoScareAway = {
 };
 
 EvtScript D_8029B494 = {
-    EVT_CALL(PlayerCreateTargetList, 65540)
+    EVT_CALL(PlayerCreateTargetList, TARGET_FLAG_4 | TARGET_FLAG_10000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerID, LVar1)
diff --git a/src/415D90.c b/src/415D90.c
index 4a5a361be5..5f62057617 100644
--- a/src/415D90.c
+++ b/src/415D90.c
@@ -2943,7 +2943,7 @@ void btl_state_update_player_menu(void) {
                     battleStatus->unk_1AA = popup->userIndex[popup->result - 1];
                     battleStatus->moveCategory = BTL_MENU_TYPE_ITEMS;
                     battleStatus->moveArgument = battleStatus->unk_1AA;
-                    battleStatus->currentTargetListFlags = gItemTable[battleStatus->moveArgument].targetFlags | ITEM_TARGET_FLAG_8000;
+                    battleStatus->currentTargetListFlags = gItemTable[battleStatus->moveArgument].targetFlags | TARGET_FLAG_8000;
                     battleStatus->currentAttackElement = 0;
                     battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_DIP] = popup->result - 1;
                     hide_popup_menu();
@@ -3041,7 +3041,7 @@ void btl_state_update_player_menu(void) {
                     battleStatus->moveCategory = BTL_MENU_TYPE_ITEMS;
                     battleStatus->moveArgument = battleStatus->unk_1AA;
                     battleStatus->selectedMoveID = MOVE_ITEMS;
-                    battleStatus->currentTargetListFlags = gItemTable[battleStatus->moveArgument].targetFlags | ITEM_TARGET_FLAG_8000;
+                    battleStatus->currentTargetListFlags = gItemTable[battleStatus->moveArgument].targetFlags | TARGET_FLAG_8000;
                     battleStatus->currentAttackElement = 0;
                     battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_DIP] = popup->result - 1;
                     hide_popup_menu();
@@ -3249,7 +3249,7 @@ void btl_state_update_player_menu(void) {
                     battleStatus->unk_1AA = popup->userIndex[popup->result - 1];
                     battleStatus->moveCategory = BTL_MENU_TYPE_ITEMS;
                     battleStatus->moveArgument = battleStatus->unk_1AA;
-                    battleStatus->currentTargetListFlags = gItemTable[battleStatus->moveArgument].targetFlags | ITEM_TARGET_FLAG_8000;
+                    battleStatus->currentTargetListFlags = gItemTable[battleStatus->moveArgument].targetFlags | TARGET_FLAG_8000;
                     battleStatus->currentAttackElement = 0;
                     battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_DIP] = popup->result - 1;
                     hide_popup_menu();
@@ -3503,7 +3503,7 @@ void btl_state_update_player_menu(void) {
                     battleStatus->unk_1AC = popup->userIndex[popup->result - 1];
                     battleStatus->moveCategory = BTL_MENU_TYPE_CHANGE_PARTNER;
                     battleStatus->selectedMoveID = MOVE_UNUSED_37;
-                    battleStatus->currentTargetListFlags = ITEM_TARGET_FLAG_2;
+                    battleStatus->currentTargetListFlags = TARGET_FLAG_2;
                     battleStatus->moveArgument = battleStatus->unk_1AC;
                     battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_PARTNER] = popup->result - 1;
                     hide_popup_menu();
@@ -4016,7 +4016,7 @@ void btl_state_update_partner_menu(void) {
                 battleStatus->unk_1AA = popupMenu->userIndex[popupMenu->result - 1];
                 battleStatus->moveCategory = BTL_MENU_TYPE_ITEMS;
                 battleStatus->moveArgument = battleStatus->unk_1AA;
-                battleStatus->currentTargetListFlags = gItemTable[battleStatus->moveArgument].targetFlags | ITEM_TARGET_FLAG_8000;
+                battleStatus->currentTargetListFlags = gItemTable[battleStatus->moveArgument].targetFlags | TARGET_FLAG_8000;
                 battleStatus->currentAttackElement = 0;
                 battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_PARTNER_ITEM] = popupMenu->result - 1;
                 hide_popup_menu();
@@ -4096,7 +4096,7 @@ void btl_state_update_partner_menu(void) {
                 battleStatus->unk_1AC = popupMenu->userIndex[popupMenu->result - 1];
                 battleStatus->moveCategory = BTL_MENU_TYPE_CHANGE_PARTNER;
                 battleStatus->selectedMoveID = MOVE_UNUSED_37;
-                battleStatus->currentTargetListFlags = ITEM_TARGET_FLAG_2;
+                battleStatus->currentTargetListFlags = TARGET_FLAG_2;
                 battleStatus->moveArgument = battleStatus->unk_1AC;
                 battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_PARTNER] = popupMenu->result - 1;
                 hide_popup_menu();
@@ -4368,7 +4368,7 @@ void btl_state_update_partner_menu(void) {
                 battleStatus->unk_1AC = popupMenu->userIndex[popupMenu->result - 1];
                 battleStatus->moveCategory = BTL_MENU_TYPE_CHANGE_PARTNER;
                 battleStatus->selectedMoveID = MOVE_UNUSED_37;
-                battleStatus->currentTargetListFlags = ITEM_TARGET_FLAG_2;
+                battleStatus->currentTargetListFlags = TARGET_FLAG_2;
                 battleStatus->moveArgument = battleStatus->unk_1AC;
                 battleStatus->lastPartnerMenuSelection[BTL_MENU_IDX_PARTNER] = popupMenu->result - 1;
                 hide_popup_menu();
@@ -4896,7 +4896,7 @@ void btl_state_update_select_target(void) {
             }
             player_create_target_list(actor);
             targetListLength = actor->targetListLength;
-            if (battleStatus->currentTargetListFlags & 1) {
+            if (battleStatus->currentTargetListFlags & TARGET_FLAG_ENEMY) {
                 targetIndexList = actor->targetIndexList;
                 for (i = 0; i < targetListLength; i++) {
                     target = &actor->targetData[targetIndexList[i]];
@@ -4907,7 +4907,7 @@ void btl_state_update_select_target(void) {
                 }
             }
 
-            if (battleStatus->currentTargetListFlags & 0x80000000) {
+            if (battleStatus->currentTargetListFlags & TARGET_FLAG_80000000) {
                 if (!(gBattleStatus.flags1 & BS_FLAGS1_PARTNER_ACTING)) {
                     gBattleSubState = battleStatus->acceptTargetMenuSubstate;
                     if (gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE) {
@@ -4985,7 +4985,7 @@ void btl_state_update_select_target(void) {
                 break;
             }
 
-            if (battleStatus->currentTargetListFlags & 1) {
+            if (battleStatus->currentTargetListFlags & TARGET_FLAG_ENEMY) {
                 s32 oldSelectedTargetIndex = selectedTargetIndex;
 
                 if (battleStatus->currentButtonsHeld & BUTTON_STICK_LEFT) {
@@ -5115,7 +5115,7 @@ void btl_state_draw_select_target(void) {
     tmpPtr = &D_802ACC68;
 
     if (targetListLength != 0) {
-        if (battleStatus->currentTargetListFlags & 1) {
+        if (battleStatus->currentTargetListFlags & TARGET_FLAG_ENEMY) {
             target = &actor->targetData[targetIndexList[selectedTargetIndex]];
             anotherActor = get_actor(target->actorID);
             id = D_802ACC70[0];
@@ -5176,7 +5176,7 @@ void btl_state_draw_select_target(void) {
             currentPartner = PARTNER_TWINK;
         }
 
-        if ((battleStatus->currentTargetListFlags & 1) || targetListLength == 1) {
+        if ((battleStatus->currentTargetListFlags & TARGET_FLAG_ENEMY) || targetListLength == 1) {
             actorID = target->actorID;
             if (actorID == ACTOR_PLAYER) {
                 msgWidth = get_msg_width(MSG_Menus_Battle_TargetMario, 0) + 10;
@@ -5208,7 +5208,7 @@ void btl_state_draw_select_target(void) {
 
         screenX += 4;
         screenY += 2;
-        if ((battleStatus->currentTargetListFlags & 1) || targetListLength == 1) {
+        if ((battleStatus->currentTargetListFlags & TARGET_FLAG_ENEMY) || targetListLength == 1) {
             actorID = target->actorID;
             if (actorID == ACTOR_PLAYER) {
                 draw_msg(MSG_Menus_Battle_TargetMario, screenX + D_802ACC68, screenY, 255, MSG_PAL_36, 0);
diff --git a/src/battle/area/arn/actor/tubbas_heart.c b/src/battle/area/arn/actor/tubbas_heart.c
index e9d66f5e1a..fc39369514 100644
--- a/src/battle/area/arn/actor/tubbas_heart.c
+++ b/src/battle/area/arn/actor/tubbas_heart.c
@@ -137,7 +137,7 @@ EvtScript N(init_80223DA0) = {
     EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_802245C8)))
     EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_80223E98)))
     EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80224038)))
-    EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, 2, 2, TRUE)
+    EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, 2, ACTOR_PART_TARGET_FLAG_2, TRUE)
     EVT_RETURN
     EVT_END
 };
diff --git a/src/battle/area/dig/script/dig_04.c b/src/battle/area/dig/script/dig_04.c
index 72c7e008e6..d31afac824 100644
--- a/src/battle/area/dig/script/dig_04.c
+++ b/src/battle/area/dig/script/dig_04.c
@@ -16,7 +16,7 @@ API_CALLABLE(N(SetupDemoPlayerMove)) {
     battleStatus->selectedMoveID = 0;
     battleStatus->currentAttackElement = 0;
     playerData->invItems[0] = selectedItemID;
-    battleStatus->currentTargetListFlags = gItemTable[playerData->invItems[0]].targetFlags | ITEM_TARGET_FLAG_8000;
+    battleStatus->currentTargetListFlags = gItemTable[playerData->invItems[0]].targetFlags | TARGET_FLAG_8000;
 
     player_create_target_list(player);
     player->selectedTargetIndex = 0;
diff --git a/src/battle/area/flo/actor/lakitu.c b/src/battle/area/flo/actor/lakitu.c
index d381f5bf5f..17682b19b9 100644
--- a/src/battle/area/flo/actor/lakitu.c
+++ b/src/battle/area/flo/actor/lakitu.c
@@ -500,7 +500,7 @@ EvtScript N(summonSpiny) = {
 };
 
 EvtScript N(findPlacesForSummon) = {
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar5)
@@ -543,7 +543,7 @@ EvtScript N(findPlacesForSummon) = {
 
 EvtScript N(calcSummonChance) = {
     EVT_SET(LVar9, 0)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
diff --git a/src/battle/area/hos/actor/magikoopa.c b/src/battle/area/hos/actor/magikoopa.c
index 536d8cc50a..654ee1dd42 100644
--- a/src/battle/area/hos/actor/magikoopa.c
+++ b/src/battle/area/hos/actor/magikoopa.c
@@ -870,7 +870,7 @@ EvtScript N(healAll) = {
         EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Anim01)
     EVT_END_IF
     EVT_WAIT(5)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_SET(LocalFlag(0), 0)
@@ -1128,7 +1128,7 @@ EvtScript N(shapeSpell) = {
 };
 
 EvtScript N(80221144) = {
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -1351,7 +1351,7 @@ Formation N(specialFormation_802216E4) = {
 };
 
 EvtScript N(makeCopy) = {
-    EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0)
+    EVT_CALL(CountPlayerTargets, ACTOR_SELF, TARGET_FLAG_2 | TARGET_FLAG_8000, LVar0)
     EVT_IF_EQ(LVar0, 1)
         EVT_EXEC_WAIT(N(runAway))
         EVT_RETURN
@@ -1450,7 +1450,7 @@ EvtScript N(makeCopy) = {
 EvtScript N(boostAttack) = {
     EVT_SET(LocalFlag(0), 0)
     EVT_LABEL(10)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -1476,7 +1476,7 @@ EvtScript N(boostAttack) = {
         EVT_CALL(SetBattleVar, 2, -1)
         EVT_GOTO(10)
     EVT_END_IF
-    EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0)
+    EVT_CALL(CountPlayerTargets, ACTOR_SELF, TARGET_FLAG_2 | TARGET_FLAG_8000, LVar0)
     EVT_IF_EQ(LVar0, 1)
         EVT_EXEC_WAIT(N(runAway))
         EVT_RETURN
@@ -1562,7 +1562,7 @@ EvtScript N(boostAttack) = {
 EvtScript N(boostDefense) = {
     EVT_SET(LocalFlag(0), 0)
     EVT_LABEL(10)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -1588,7 +1588,7 @@ EvtScript N(boostDefense) = {
         EVT_CALL(SetBattleVar, 2, -1)
         EVT_GOTO(10)
     EVT_END_IF
-    EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0)
+    EVT_CALL(CountPlayerTargets, ACTOR_SELF, TARGET_FLAG_2 | TARGET_FLAG_8000, LVar0)
     EVT_IF_EQ(LVar0, 1)
         EVT_EXEC_WAIT(N(runAway))
         EVT_RETURN
@@ -1674,7 +1674,7 @@ EvtScript N(boostDefense) = {
 EvtScript N(electrify) = {
     EVT_SET(LocalFlag(0), 0)
     EVT_LABEL(10)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -1700,7 +1700,7 @@ EvtScript N(electrify) = {
         EVT_CALL(SetBattleVar, 2, -1)
         EVT_GOTO(10)
     EVT_END_IF
-    EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0)
+    EVT_CALL(CountPlayerTargets, ACTOR_SELF, TARGET_FLAG_2 | TARGET_FLAG_8000, LVar0)
     EVT_IF_EQ(LVar0, 1)
         EVT_EXEC_WAIT(N(runAway))
         EVT_RETURN
@@ -1791,7 +1791,7 @@ EvtScript N(electrify) = {
 EvtScript N(vanish) = {
     EVT_SET(LocalFlag(0), 0)
     EVT_LABEL(10)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -1817,7 +1817,7 @@ EvtScript N(vanish) = {
         EVT_CALL(SetBattleVar, 2, -1)
         EVT_GOTO(10)
     EVT_END_IF
-    EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0)
+    EVT_CALL(CountPlayerTargets, ACTOR_SELF, TARGET_FLAG_2 | TARGET_FLAG_8000, LVar0)
     EVT_IF_EQ(LVar0, 1)
         EVT_EXEC_WAIT(N(runAway))
         EVT_RETURN
@@ -1911,7 +1911,7 @@ EvtScript N(takeTurn_80223B24) = {
         EVT_GOTO(20)
     EVT_END_IF
     EVT_SET(LVarA, 0)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_SET(LocalFlag(0), 0)
@@ -1945,7 +1945,7 @@ EvtScript N(takeTurn_80223B24) = {
         EVT_GOTO(10)
     EVT_END_IF
     EVT_SET(LVarA, 0)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(1)
     EVT_SET(LocalFlag(0), 0)
@@ -1979,7 +1979,7 @@ EvtScript N(takeTurn_80223B24) = {
         EVT_GOTO(10)
     EVT_END_IF
     EVT_SET(LVarA, 0)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(2)
     EVT_SET(LocalFlag(0), 0)
@@ -2014,7 +2014,7 @@ EvtScript N(takeTurn_80223B24) = {
     EVT_END_IF
     EVT_GOTO(20)
     EVT_LABEL(10)
-    EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0)
+    EVT_CALL(CountPlayerTargets, ACTOR_SELF, TARGET_FLAG_2 | TARGET_FLAG_8000, LVar0)
     EVT_IF_EQ(LVar0, 1)
         EVT_EXEC_WAIT(N(runAway))
         EVT_RETURN
@@ -2049,7 +2049,7 @@ EvtScript N(takeTurn_80223B24) = {
             EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0)
             EVT_IF_LT(LVar0, 0)
                 EVT_SETF(LVar9, EVT_FLOAT(100.0))
-                EVT_CALL(EnemyCreateTargetList, 0x00008002)
+                EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
                 EVT_CALL(InitTargetIterator)
                 EVT_LABEL(11)
                 EVT_SET(LocalFlag(0), 0)
diff --git a/src/battle/area/isk_part_1/actor/pokey_mummy.c b/src/battle/area/isk_part_1/actor/pokey_mummy.c
index 48bf57c2d2..822c3547f3 100644
--- a/src/battle/area/isk_part_1/actor/pokey_mummy.c
+++ b/src/battle/area/isk_part_1/actor/pokey_mummy.c
@@ -860,7 +860,7 @@ EvtScript N(8021B998) = {
         EVT_WAIT(4)
         EVT_EXEC_WAIT(N(8021B6AC))
     EVT_END_CHILD_THREAD
-    EVT_CALL(EnemyCreateTargetList, 0x00018004)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_4 | TARGET_FLAG_8000 | TARGET_FLAG_10000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerID, LVar1)
diff --git a/src/battle/area/jan/actor/jungle_fuzzy.c b/src/battle/area/jan/actor/jungle_fuzzy.c
index cb6821005e..a47d6c5c14 100644
--- a/src/battle/area/jan/actor/jungle_fuzzy.c
+++ b/src/battle/area/jan/actor/jungle_fuzzy.c
@@ -685,7 +685,7 @@ EvtScript N(802210E0) = {
     EVT_SET(LocalFlag(2), 0)
     EVT_SET(LocalFlag(3), 0)
     EVT_SET(LocalFlag(4), 0)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar5)
@@ -752,7 +752,7 @@ EvtScript N(802210E0) = {
 
 EvtScript N(80221468) = {
     EVT_SET(LVar9, 0)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
diff --git a/src/battle/area/jan/actor/spear_guy.c b/src/battle/area/jan/actor/spear_guy.c
index b29e1fbe79..fcb7dbc326 100644
--- a/src/battle/area/jan/actor/spear_guy.c
+++ b/src/battle/area/jan/actor/spear_guy.c
@@ -634,7 +634,7 @@ EvtScript N(summonBackup) = {
     EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim0E)
     EVT_WAIT(20)
     EVT_CALL(GetOriginalActorType, ACTOR_SELF, LVar0)
-    EVT_CALL(EnemyCreateTargetList, 0x00008004)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_4 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar1, LVar2)
@@ -657,7 +657,7 @@ EvtScript N(summonBackup) = {
         EVT_GOTO(0)
     EVT_END_IF
     EVT_SET(LocalFlag(0), 0)
-    EVT_CALL(EnemyCreateTargetList, 0x00008004)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_4 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(1)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -925,7 +925,7 @@ EvtScript N(spearThrow) = {
 };
 
 EvtScript N(8021B770) = {
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar5)
@@ -968,7 +968,7 @@ EvtScript N(8021B770) = {
 
 EvtScript N(8021B96C) = {
     EVT_SET(LVar9, 0)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -1002,7 +1002,7 @@ EvtScript N(8021B96C) = {
 EvtScript N(8021BB18) = {
     EVT_CALL(GetIndexFromHome, ACTOR_SELF, LVarA)
     EVT_SET(LocalFlag(0), 0)
-    EVT_CALL(EnemyCreateTargetList, 0x00008004)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_4 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -1073,7 +1073,7 @@ EvtScript N(takeTurn_8021BCB4) = {
             EVT_EXEC_WAIT(N(8021BB18))
         EVT_END_CASE_GROUP
         EVT_CASE_EQ(2)
-            EVT_CALL(EnemyCreateTargetList, 0x00008002)
+            EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
             EVT_CALL(GetTargetListLength, LVar0)
             EVT_IF_EQ(LVar0, 1)
                 EVT_EXEC_WAIT(N(spearThrow))
diff --git a/src/battle/area/kmr_part_2/actor/goomnut_tree.c b/src/battle/area/kmr_part_2/actor/goomnut_tree.c
index d9cd8bcb5b..ab3441dfda 100644
--- a/src/battle/area/kmr_part_2/actor/goomnut_tree.c
+++ b/src/battle/area/kmr_part_2/actor/goomnut_tree.c
@@ -158,7 +158,7 @@ EvtScript N(init_80223488) = {
     EVT_CALL(SetPartScale, ACTOR_SELF, 3, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(1.0))
     EVT_CALL(SetPartScale, ACTOR_SELF, 4, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(1.0))
     EVT_CALL(SetPartScale, ACTOR_SELF, 5, EVT_FLOAT(0.5), EVT_FLOAT(0.5), EVT_FLOAT(1.0))
-    EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, 1, 4, TRUE)
+    EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, 1, ACTOR_PART_TARGET_FLAG_4, TRUE)
     EVT_RETURN
     EVT_END
 };
diff --git a/src/battle/area/kpa/actor/dry_bones.c b/src/battle/area/kpa/actor/dry_bones.c
index 002346bf83..4540ce7354 100644
--- a/src/battle/area/kpa/actor/dry_bones.c
+++ b/src/battle/area/kpa/actor/dry_bones.c
@@ -160,7 +160,7 @@ EvtScript N(init) = {
 
 EvtScript N(nextTurn) = {
     EVT_CALL(GetOriginalActorType, ACTOR_SELF, LVarA)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -175,7 +175,7 @@ EvtScript N(nextTurn) = {
     EVT_IF_NE(LVar0, -1)
         EVT_GOTO(0)
     EVT_END_IF
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(1)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -187,7 +187,7 @@ EvtScript N(nextTurn) = {
     EVT_IF_NE(LVar0, -1)
         EVT_GOTO(1)
     EVT_END_IF
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(2)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -245,7 +245,7 @@ EvtScript N(reassemble) = {
     EVT_ADD(LVar0, 2)
     EVT_CALL(SetActorVar, ACTOR_SELF, 0, LVar0)
     EVT_CALL(GetOriginalActorType, ACTOR_SELF, LVarA)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -257,7 +257,7 @@ EvtScript N(reassemble) = {
     EVT_IF_NE(LVar0, -1)
         EVT_GOTO(0)
     EVT_END_IF
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(1)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -269,7 +269,7 @@ EvtScript N(reassemble) = {
     EVT_IF_NE(LVar0, -1)
         EVT_GOTO(1)
     EVT_END_IF
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(2)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
diff --git a/src/battle/area/mim/actor/forest_fuzzy.c b/src/battle/area/mim/actor/forest_fuzzy.c
index ae7fcac327..9a39ca51b0 100644
--- a/src/battle/area/mim/actor/forest_fuzzy.c
+++ b/src/battle/area/mim/actor/forest_fuzzy.c
@@ -512,7 +512,7 @@ EvtScript N(8021A0D4) = {
     EVT_SET(LocalFlag(2), 0)
     EVT_SET(LocalFlag(3), 0)
     EVT_SET(LocalFlag(4), 0)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar5)
@@ -579,7 +579,7 @@ EvtScript N(8021A0D4) = {
 
 EvtScript N(8021A45C) = {
     EVT_SET(LVar9, 0)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
diff --git a/src/battle/area/omo/actor/groove_guy.c b/src/battle/area/omo/actor/groove_guy.c
index 291145b876..0c0e59e972 100644
--- a/src/battle/area/omo/actor/groove_guy.c
+++ b/src/battle/area/omo/actor/groove_guy.c
@@ -450,7 +450,7 @@ EvtScript N(getFirstOpenColumn) = {
     EVT_SET(LocalFlag(2), 0)
     EVT_SET(LocalFlag(3), 0)
     EVT_SET(LocalFlag(4), 0)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar5)
@@ -493,7 +493,7 @@ EvtScript N(getFirstOpenColumn) = {
 
 EvtScript N(countActiveSummoners) = {
     EVT_SET(LVar9, 0)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
diff --git a/src/battle/area/omo/actor/sky_guy.c b/src/battle/area/omo/actor/sky_guy.c
index 05efd4c3d1..ba2da128c4 100644
--- a/src/battle/area/omo/actor/sky_guy.c
+++ b/src/battle/area/omo/actor/sky_guy.c
@@ -259,7 +259,7 @@ EvtScript N(init_8022987C) = {
     EVT_SUB(LVar1, 5)
     EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2)
     EVT_CALL(HPBarToHome, ACTOR_SELF)
-    EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, PT_3, 4, TRUE)
+    EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, PT_3, ACTOR_PART_TARGET_FLAG_4, TRUE)
     EVT_RETURN
     EVT_END
 };
diff --git a/src/battle/area/omo2/actor/toy_tank.c b/src/battle/area/omo2/actor/toy_tank.c
index fcada7e9ce..f0a8f228f3 100644
--- a/src/battle/area/omo2/actor/toy_tank.c
+++ b/src/battle/area/omo2/actor/toy_tank.c
@@ -178,7 +178,7 @@ EvtScript N(init) = {
     EVT_CALL(PlayModelAnimation, 0, EVT_PTR(toy_tank_as_idle))
     EVT_CALL(EnableModel, 62, FALSE)
     EVT_CALL(SetAnimatedModelRootPosition, 0, 200, 0, 0)
-    EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, 3, 1, TRUE)
+    EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, 3, ACTOR_PART_TARGET_FLAG_1, TRUE)
     EVT_CALL(GetModelCenter, 39)
     EVT_PLAY_EFFECT(EFFECT_BULB_GLOW, 2, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), LVar5, 0)
     EVT_CALL(SetActorVar, ACTOR_SELF, 5, LVar5)
diff --git a/src/battle/area/omo2_2/actor/stilt_guy.c b/src/battle/area/omo2_2/actor/stilt_guy.c
index d8c814e5da..8156c571dd 100644
--- a/src/battle/area/omo2_2/actor/stilt_guy.c
+++ b/src/battle/area/omo2_2/actor/stilt_guy.c
@@ -241,7 +241,7 @@ EvtScript N(init) = {
     EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent)))
     EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0)
     EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0)
-    EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, 4, 1, TRUE)
+    EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, 4, ACTOR_PART_TARGET_FLAG_1, TRUE)
     EVT_CALL(SetPartSize, ACTOR_SELF, 1, 24, 30)
     EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
     EVT_CALL(EnableIdleScript, ACTOR_SELF, 0)
@@ -830,7 +830,7 @@ EvtScript N(shy_guy_on_spin_smash) = {
     EVT_EXEC_GET_TID(N(shy_guy_rotate), LVarE)
     EVT_CALL(GetPartEventFlags, ACTOR_SELF, LVar0, LVarA)
     EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
-    EVT_CALL(PlayerCreateTargetList, 0x00010004)
+    EVT_CALL(PlayerCreateTargetList, TARGET_FLAG_4 | TARGET_FLAG_10000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerID, LVar1)
diff --git a/src/battle/area/omo2_3/actor/shy_stack.c b/src/battle/area/omo2_3/actor/shy_stack.c
index e73392bb3c..75294fb301 100644
--- a/src/battle/area/omo2_3/actor/shy_stack.c
+++ b/src/battle/area/omo2_3/actor/shy_stack.c
@@ -882,7 +882,7 @@ EvtScript N(doSpinSmashHitLastGuy) = {
     EVT_EXEC_GET_TID(N(rotate), LVarE)
     EVT_CALL(GetPartEventFlags, ACTOR_SELF, LVar0, LVarA)
     EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
-    EVT_CALL(PlayerCreateTargetList, 0x00010004)
+    EVT_CALL(PlayerCreateTargetList, TARGET_FLAG_4 | TARGET_FLAG_10000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerID, LVar1)
@@ -1075,7 +1075,7 @@ EvtScript N(doSpinSmashHit) = {
     EVT_CALL(GetActorVar, ACTOR_SELF, 3, LVar1)
     EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
     EVT_EXEC_WAIT(N(lower_actor_pos))
-    EVT_CALL(PlayerCreateTargetList, 0x00018004)
+    EVT_CALL(PlayerCreateTargetList, TARGET_FLAG_4 | TARGET_FLAG_8000 | TARGET_FLAG_10000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerID, LVar1)
diff --git a/src/battle/area/pra2/actor/crystal_king.c b/src/battle/area/pra2/actor/crystal_king.c
index 6358a79a05..ebddd8afea 100644
--- a/src/battle/area/pra2/actor/crystal_king.c
+++ b/src/battle/area/pra2/actor/crystal_king.c
@@ -770,7 +770,7 @@ EvtScript N(handleEvent) = {
             EVT_SET_CONST(LVar0, 1)
             EVT_SET_CONST(LVar1, ANIM_CrystalKing_Anim09)
             EVT_EXEC_WAIT(DoRecover)
-            EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0)
+            EVT_CALL(CountPlayerTargets, ACTOR_SELF, TARGET_FLAG_2 | TARGET_FLAG_8000, LVar0)
             EVT_IF_LE(LVar0, 1)
                 EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_CrystalKing_Anim0E)
                 EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0))
@@ -851,7 +851,7 @@ EvtScript N(takeTurn) = {
     EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_PHASE), LVar0)
     EVT_SWITCH(LVar0)
         EVT_CASE_EQ(N(PHASE_BEGIN))
-            EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0)
+            EVT_CALL(CountPlayerTargets, ACTOR_SELF, TARGET_FLAG_2 | TARGET_FLAG_8000, LVar0)
             EVT_IF_LE(LVar0, 1)
                 EVT_EXEC_WAIT(N(SummonCrystalBits))
                 EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_PHASE), N(PHASE_SUMMONED_BITS))
@@ -863,7 +863,7 @@ EvtScript N(takeTurn) = {
             EVT_EXEC_WAIT(N(SummonCrystalBits))
             EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_PHASE), N(PHASE_SUMMONED_BITS))
         EVT_CASE_EQ(N(PHASE_SUMMONED_BITS))
-            EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0)
+            EVT_CALL(CountPlayerTargets, ACTOR_SELF, TARGET_FLAG_2 | TARGET_FLAG_8000, LVar0)
             EVT_IF_LE(LVar0, 1)
                 EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0)
                 EVT_IF_FLAG(LVar0, STATUS_FLAG_FROZEN)
@@ -899,7 +899,7 @@ EvtScript N(takeTurn) = {
                 EVT_CALL(SetActorVar, ACTOR_ENEMY0, N(VAR_FLAGS), LVar0)
             EVT_END_IF
         EVT_CASE_EQ(N(PHASE_SUMMONED_CLONES))
-            EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0)
+            EVT_CALL(CountPlayerTargets, ACTOR_SELF, TARGET_FLAG_2 | TARGET_FLAG_8000, LVar0)
             EVT_IF_LE(LVar0, 1)
                 EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0)
                 EVT_IF_FLAG(LVar0, STATUS_FLAG_FROZEN)
@@ -913,7 +913,7 @@ EvtScript N(takeTurn) = {
                 EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_PHASE), N(PHASE_ATTACKED_WITH_CLONES))
             EVT_END_IF
         EVT_CASE_EQ(N(PHASE_ATTACKED_WITH_CLONES))
-            EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0)
+            EVT_CALL(CountPlayerTargets, ACTOR_SELF, TARGET_FLAG_2 | TARGET_FLAG_8000, LVar0)
             EVT_IF_GT(LVar0, 1)
                 EVT_EXEC_WAIT(N(AttackIcyBreathWithClones))
                 EVT_RETURN
diff --git a/src/battle/area/sam/actor/gulpit.c b/src/battle/area/sam/actor/gulpit.c
index 68e2ac820e..50cb9689b4 100644
--- a/src/battle/area/sam/actor/gulpit.c
+++ b/src/battle/area/sam/actor/gulpit.c
@@ -437,7 +437,7 @@ EvtScript N(takeTurn) = {
         EVT_RETURN
     EVT_END_IF
     EVT_SET(LVarA, 0)
-    EVT_CALL(EnemyCreateTargetList, 0x00010002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_10000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
diff --git a/src/battle/area/trd_part_2/actor/fake_bowser.c b/src/battle/area/trd_part_2/actor/fake_bowser.c
index e04e33e62d..b6cf90a552 100644
--- a/src/battle/area/trd_part_2/actor/fake_bowser.c
+++ b/src/battle/area/trd_part_2/actor/fake_bowser.c
@@ -252,7 +252,7 @@ EvtScript N(init_8021A968) = {
     EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
     EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2)
     EVT_CALL(HPBarToHome, ACTOR_SELF)
-    EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, 2, 4, TRUE)
+    EVT_CALL(SetPartTargetFlagBits, ACTOR_SELF, 2, ACTOR_PART_TARGET_FLAG_4, TRUE)
     EVT_RETURN
     EVT_END
 };
@@ -2340,7 +2340,7 @@ EvtScript N(80221DB4) = {
 
 EvtScript N(80222C44) = {
     EVT_SET(LVarA, 0)
-    EVT_CALL(PlayerCreateTargetList, 0x00008002)
+    EVT_CALL(PlayerCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -2371,7 +2371,7 @@ EvtScript N(80222C44) = {
     EVT_SET(LocalFlag(0), 0)
     EVT_SET(LVarB, LVarA)
     EVT_SUB(LVarB, 1)
-    EVT_CALL(PlayerCreateTargetList, 0x00008002)
+    EVT_CALL(PlayerCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(1)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -2417,7 +2417,7 @@ EvtScript N(80222C44) = {
 
 EvtScript N(802230E8) = {
     EVT_SET(LVarA, 0)
-    EVT_CALL(PlayerCreateTargetList, 0x00008002)
+    EVT_CALL(PlayerCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -2457,7 +2457,7 @@ EvtScript N(802230E8) = {
         EVT_ADD(LVar0, 1)
     EVT_END_LOOP
     EVT_SET(LVar2, 0)
-    EVT_CALL(PlayerCreateTargetList, 0x00008002)
+    EVT_CALL(PlayerCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(1)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
diff --git a/src/battle/common/actor/ember.inc.c b/src/battle/common/actor/ember.inc.c
index 012da3fab6..ba0643d6da 100644
--- a/src/battle/common/actor/ember.inc.c
+++ b/src/battle/common/actor/ember.inc.c
@@ -235,7 +235,7 @@ EvtScript N(8021B2FC) = {
 };
 
 EvtScript N(8021B398) = {
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar5)
diff --git a/src/battle/common/actor/gray_magikoopa.inc.c b/src/battle/common/actor/gray_magikoopa.inc.c
index 7ce4e6e280..9a64c7d5cb 100644
--- a/src/battle/common/actor/gray_magikoopa.inc.c
+++ b/src/battle/common/actor/gray_magikoopa.inc.c
@@ -782,7 +782,7 @@ EvtScript N(init_flying) = {
 EvtScript N(takeTurn) = {
     EVT_SET(LocalFlag(0), 0)
     EVT_LABEL(10)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -808,7 +808,7 @@ EvtScript N(takeTurn) = {
         EVT_CALL(SetBattleVar, 2, -1)
         EVT_GOTO(10)
     EVT_END_IF
-    EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0)
+    EVT_CALL(CountPlayerTargets, ACTOR_SELF, TARGET_FLAG_2 | TARGET_FLAG_8000, LVar0)
     EVT_IF_EQ(LVar0, 1)
         EVT_EXEC_WAIT(N(flee))
         EVT_RETURN
diff --git a/src/battle/common/actor/green_magikoopa.inc.c b/src/battle/common/actor/green_magikoopa.inc.c
index 6e3aa19b4f..4980b034fb 100644
--- a/src/battle/common/actor/green_magikoopa.inc.c
+++ b/src/battle/common/actor/green_magikoopa.inc.c
@@ -784,7 +784,7 @@ EvtScript N(init_flying) = {
 EvtScript N(takeTurn) = {
     EVT_SET(LocalFlag(0), 0)
     EVT_LABEL(10)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -810,7 +810,7 @@ EvtScript N(takeTurn) = {
         EVT_CALL(SetBattleVar, 2, -1)
         EVT_GOTO(10)
     EVT_END_IF
-    EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0)
+    EVT_CALL(CountPlayerTargets, ACTOR_SELF, TARGET_FLAG_2 | TARGET_FLAG_8000, LVar0)
     EVT_IF_EQ(LVar0, 1)
         EVT_EXEC_WAIT(N(flee))
         EVT_RETURN
diff --git a/src/battle/common/actor/koopatrol.inc.c b/src/battle/common/actor/koopatrol.inc.c
index b57f7b27b5..28aca58485 100644
--- a/src/battle/common/actor/koopatrol.inc.c
+++ b/src/battle/common/actor/koopatrol.inc.c
@@ -981,7 +981,7 @@ EvtScript N(attackShellMissile) = {
 };
 
 EvtScript N(findTarget) = {
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(1)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -1001,7 +1001,7 @@ EvtScript N(findTarget) = {
     EVT_SET(LocalFlag(2), 0)
     EVT_SET(LocalFlag(3), 0)
     EVT_SET(LocalFlag(4), 0)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -1135,7 +1135,7 @@ EvtScript N(summonFriend) = {
 
 EvtScript N(findPlacesToSummon) = {
     EVT_SET(LVar9, 0)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
diff --git a/src/battle/common/actor/magikoopa.inc.c b/src/battle/common/actor/magikoopa.inc.c
index 822aba7d02..e6e4230d80 100644
--- a/src/battle/common/actor/magikoopa.inc.c
+++ b/src/battle/common/actor/magikoopa.inc.c
@@ -918,7 +918,7 @@ EvtScript N(healAll) = {
         EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_Anim01)
     EVT_END_IF
     EVT_WAIT(5)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_SET(LocalFlag(0), 0)
@@ -1176,7 +1176,7 @@ EvtScript N(attackMagicBlast) = {
 };
 
 EvtScript N(findPlaceForClone) = {
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -1399,7 +1399,7 @@ Formation N(formation_clone_flying) = {
 };
 
 EvtScript N(makeClone) = {
-    EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0)
+    EVT_CALL(CountPlayerTargets, ACTOR_SELF, TARGET_FLAG_2 | TARGET_FLAG_8000, LVar0)
     EVT_IF_EQ(LVar0, 1)
         EVT_EXEC_WAIT(N(flee))
         EVT_RETURN
@@ -1498,7 +1498,7 @@ EvtScript N(makeClone) = {
 EvtScript N(boostAttack) = {
     EVT_SET(LocalFlag(0), 0)
     EVT_LABEL(10)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -1524,7 +1524,7 @@ EvtScript N(boostAttack) = {
         EVT_CALL(SetBattleVar, 2, -1)
         EVT_GOTO(10)
     EVT_END_IF
-    EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0)
+    EVT_CALL(CountPlayerTargets, ACTOR_SELF, TARGET_FLAG_2 | TARGET_FLAG_8000, LVar0)
     EVT_IF_EQ(LVar0, 1)
         EVT_EXEC_WAIT(N(flee))
         EVT_RETURN
@@ -1610,7 +1610,7 @@ EvtScript N(boostAttack) = {
 EvtScript N(boostDefense) = {
     EVT_SET(LocalFlag(0), 0)
     EVT_LABEL(10)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -1636,7 +1636,7 @@ EvtScript N(boostDefense) = {
         EVT_CALL(SetBattleVar, 2, -1)
         EVT_GOTO(10)
     EVT_END_IF
-    EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0)
+    EVT_CALL(CountPlayerTargets, ACTOR_SELF, TARGET_FLAG_2 | TARGET_FLAG_8000, LVar0)
     EVT_IF_EQ(LVar0, 1)
         EVT_EXEC_WAIT(N(flee))
         EVT_RETURN
@@ -1722,7 +1722,7 @@ EvtScript N(boostDefense) = {
 EvtScript N(electrify) = {
     EVT_SET(LocalFlag(0), 0)
     EVT_LABEL(10)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -1748,7 +1748,7 @@ EvtScript N(electrify) = {
         EVT_CALL(SetBattleVar, 2, -1)
         EVT_GOTO(10)
     EVT_END_IF
-    EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0)
+    EVT_CALL(CountPlayerTargets, ACTOR_SELF, TARGET_FLAG_2 | TARGET_FLAG_8000, LVar0)
     EVT_IF_EQ(LVar0, 1)
         EVT_EXEC_WAIT(N(flee))
         EVT_RETURN
@@ -1839,7 +1839,7 @@ EvtScript N(electrify) = {
 EvtScript N(makeTransparent) = {
     EVT_SET(LocalFlag(0), 0)
     EVT_LABEL(10)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -1865,7 +1865,7 @@ EvtScript N(makeTransparent) = {
         EVT_CALL(SetBattleVar, 2, -1)
         EVT_GOTO(10)
     EVT_END_IF
-    EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0)
+    EVT_CALL(CountPlayerTargets, ACTOR_SELF, TARGET_FLAG_2 | TARGET_FLAG_8000, LVar0)
     EVT_IF_EQ(LVar0, 1)
         EVT_EXEC_WAIT(N(flee))
         EVT_RETURN
@@ -1959,7 +1959,7 @@ EvtScript N(takeTurn) = {
         EVT_GOTO(20)
     EVT_END_IF
     EVT_SET(LVarA, 0)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_SET(LocalFlag(0), 0)
@@ -1993,7 +1993,7 @@ EvtScript N(takeTurn) = {
         EVT_GOTO(10)
     EVT_END_IF
     EVT_SET(LVarA, 0)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(1)
     EVT_SET(LocalFlag(0), 0)
@@ -2027,7 +2027,7 @@ EvtScript N(takeTurn) = {
         EVT_GOTO(10)
     EVT_END_IF
     EVT_SET(LVarA, 0)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(2)
     EVT_SET(LocalFlag(0), 0)
@@ -2062,7 +2062,7 @@ EvtScript N(takeTurn) = {
     EVT_END_IF
     EVT_GOTO(20)
     EVT_LABEL(10)
-    EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0)
+    EVT_CALL(CountPlayerTargets, ACTOR_SELF, TARGET_FLAG_2 | TARGET_FLAG_8000, LVar0)
     EVT_IF_EQ(LVar0, 1)
         EVT_EXEC_WAIT(N(flee))
         EVT_RETURN
@@ -2097,7 +2097,7 @@ EvtScript N(takeTurn) = {
             EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_HEAL_ONE_COUNTER), LVar0)
             EVT_IF_LT(LVar0, 2)
                 EVT_SETF(LVar9, EVT_FLOAT(100.0))
-                EVT_CALL(EnemyCreateTargetList, 0x00008002)
+                EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
                 EVT_CALL(InitTargetIterator)
                 EVT_LABEL(11)
                 EVT_SET(LocalFlag(0), 0)
diff --git a/src/battle/common/actor/medi_guy.inc.c b/src/battle/common/actor/medi_guy.inc.c
index 7fdbb53eee..2c790bf3bf 100644
--- a/src/battle/common/actor/medi_guy.inc.c
+++ b/src/battle/common/actor/medi_guy.inc.c
@@ -398,7 +398,7 @@ EvtScript N(healOneAlly) = {
 };
 
 EvtScript N(findTargetsToHeal) = {
-    EVT_CALL(EnemyCreateTargetList, 2)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
diff --git a/src/battle/common/actor/pokey.inc.c b/src/battle/common/actor/pokey.inc.c
index c76ce29108..b4547a1325 100644
--- a/src/battle/common/actor/pokey.inc.c
+++ b/src/battle/common/actor/pokey.inc.c
@@ -629,7 +629,7 @@ EvtScript N(timberAttack) = {
 
 EvtScript N(calcSummonChance) = {
     EVT_SET(LVar9, 0)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -833,7 +833,7 @@ EvtScript N(findPlaceForSummon) = {
     EVT_SET(LocalFlag(2), 0)
     EVT_SET(LocalFlag(3), 0)
     EVT_SET(LocalFlag(4), 0)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar5)
@@ -1274,7 +1274,7 @@ EvtScript N(doSpinSmashHit) = {
         EVT_WAIT(4)
         EVT_EXEC_WAIT(N(bounceOnHit))
     EVT_END_CHILD_THREAD
-    EVT_CALL(EnemyCreateTargetList, 0x00018004)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_4 | TARGET_FLAG_8000 | TARGET_FLAG_10000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerID, LVar1)
diff --git a/src/battle/common/actor/red_magikoopa.inc.c b/src/battle/common/actor/red_magikoopa.inc.c
index a54d64bf57..176228594a 100644
--- a/src/battle/common/actor/red_magikoopa.inc.c
+++ b/src/battle/common/actor/red_magikoopa.inc.c
@@ -782,7 +782,7 @@ EvtScript N(init_flying) = {
 EvtScript N(takeTurn) = {
     EVT_SET(LocalFlag(0), 0)
     EVT_LABEL(10)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -808,7 +808,7 @@ EvtScript N(takeTurn) = {
         EVT_CALL(SetBattleVar, 2, -1)
         EVT_GOTO(10)
     EVT_END_IF
-    EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0)
+    EVT_CALL(CountPlayerTargets, ACTOR_SELF, TARGET_FLAG_2 | TARGET_FLAG_8000, LVar0)
     EVT_IF_EQ(LVar0, 1)
         EVT_EXEC_WAIT(N(flee))
         EVT_RETURN
diff --git a/src/battle/common/actor/white_magikoopa.inc.c b/src/battle/common/actor/white_magikoopa.inc.c
index e1d8429a9c..41515369e8 100644
--- a/src/battle/common/actor/white_magikoopa.inc.c
+++ b/src/battle/common/actor/white_magikoopa.inc.c
@@ -779,7 +779,7 @@ EvtScript N(init_80225FBC) = {
 EvtScript N(healOne) = {
     EVT_SET(LVar8, 0)
     EVT_SET(LVar9, 9999)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -820,7 +820,7 @@ EvtScript N(healOne) = {
     EVT_END_IF
     EVT_SET(LVar8, 0)
     EVT_SET(LVar9, 9999)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(1)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -869,7 +869,7 @@ EvtScript N(healOne) = {
     EVT_IF_NE(LVar8, ACTOR_PLAYER)
         EVT_GOTO(100)
     EVT_END_IF
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(2)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -902,7 +902,7 @@ EvtScript N(healOne) = {
         EVT_SET(LVar8, -127)
         EVT_GOTO(100)
     EVT_END_IF
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(3)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -1072,7 +1072,7 @@ EvtScript N(healAll) = {
         EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_FlyingMagikoopa_White_Anim01)
     EVT_END_IF
     EVT_WAIT(5)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_SET(LocalFlag(0), 0)
@@ -1114,14 +1114,14 @@ EvtScript N(healAll) = {
 };
 
 EvtScript N(takeTurn_802274E4) = {
-    EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0)
+    EVT_CALL(CountPlayerTargets, ACTOR_SELF, TARGET_FLAG_2 | TARGET_FLAG_8000, LVar0)
     EVT_IF_EQ(LVar0, 1)
         EVT_EXEC_WAIT(N(run_away))
         EVT_RETURN
     EVT_END_IF
     EVT_SET(LVarA, 0)
     EVT_SET(LVarB, 0)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_SET(LocalFlag(0), 0)
diff --git a/src/battle/common/actor/yellow_magikoopa.inc.c b/src/battle/common/actor/yellow_magikoopa.inc.c
index 771d18d3d2..a023e47de0 100644
--- a/src/battle/common/actor/yellow_magikoopa.inc.c
+++ b/src/battle/common/actor/yellow_magikoopa.inc.c
@@ -781,7 +781,7 @@ EvtScript N(init_flying) = {
 EvtScript N(takeTurn) = {
     EVT_SET(LocalFlag(0), 0)
     EVT_LABEL(10)
-    EVT_CALL(EnemyCreateTargetList, 0x00008002)
+    EVT_CALL(EnemyCreateTargetList, TARGET_FLAG_2 | TARGET_FLAG_8000)
     EVT_CALL(InitTargetIterator)
     EVT_LABEL(0)
     EVT_CALL(GetOwnerTarget, LVar0, LVar1)
@@ -807,7 +807,7 @@ EvtScript N(takeTurn) = {
         EVT_CALL(SetBattleVar, 2, -1)
         EVT_GOTO(10)
     EVT_END_IF
-    EVT_CALL(CountPlayerTargets, ACTOR_SELF, 0x00008002, LVar0)
+    EVT_CALL(CountPlayerTargets, ACTOR_SELF, TARGET_FLAG_2 | TARGET_FLAG_8000, LVar0)
     EVT_IF_EQ(LVar0, 1)
         EVT_EXEC_WAIT(N(flee))
         EVT_RETURN
diff --git a/src/battle/use_items.c b/src/battle/use_items.c
index 5af22fdeed..60f1e2f6a2 100644
--- a/src/battle/use_items.c
+++ b/src/battle/use_items.c
@@ -170,7 +170,7 @@ API_CALLABLE(LoadMysteryItemScript) {
     s32* itemPtr;
     s32 i;
 
-    battleStatus->currentTargetListFlags = item->targetFlags | ITEM_TARGET_FLAG_8000;
+    battleStatus->currentTargetListFlags = item->targetFlags | TARGET_FLAG_8000;
     battleStatus->currentAttackElement = 0;
 
     player_create_target_list(actor);
diff --git a/src/item_table.inc.c b/src/item_table.inc.c
index cac5ac1dd1..f6c33298bb 100644
--- a/src/item_table.inc.c
+++ b/src/item_table.inc.c
@@ -13,7 +13,7 @@ ItemData gItemTable[] = {
     .sellValue = 0,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Present),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -26,7 +26,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Jump),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_GEAR | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -39,7 +39,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_SpinJump),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_2,
+    .targetFlags = TARGET_FLAG_2,
     .typeFlags = ITEM_TYPE_FLAG_GEAR | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -52,7 +52,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_TornadoJump),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY,
+    .targetFlags = TARGET_FLAG_ENEMY,
     .typeFlags = ITEM_TYPE_FLAG_GEAR | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -65,7 +65,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Hammer),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_GEAR | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -78,7 +78,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_SuperHammer),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY,
+    .targetFlags = TARGET_FLAG_ENEMY,
     .typeFlags = ITEM_TYPE_FLAG_GEAR | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -91,7 +91,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_UltraHammer),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_2,
+    .targetFlags = TARGET_FLAG_2,
     .typeFlags = ITEM_TYPE_FLAG_GEAR | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -104,7 +104,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_LuckyStar),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_2,
+    .targetFlags = TARGET_FLAG_2,
     .typeFlags = ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -117,7 +117,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Present),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_2,
+    .targetFlags = TARGET_FLAG_2,
     .typeFlags = ITEM_TYPE_FLAG_GEAR | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -130,7 +130,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Present),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_2,
+    .targetFlags = TARGET_FLAG_2,
     .typeFlags = ITEM_TYPE_FLAG_GEAR | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -143,7 +143,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_FirstDegreeCard),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_2,
+    .targetFlags = TARGET_FLAG_2,
     .typeFlags = ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -156,7 +156,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_SecondDegreeCard),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_2,
+    .targetFlags = TARGET_FLAG_2,
     .typeFlags = ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -169,7 +169,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_ThirdDegreeCard),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_2,
+    .targetFlags = TARGET_FLAG_2,
     .typeFlags = ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -182,7 +182,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_FourthDegreeCard),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_2,
+    .targetFlags = TARGET_FLAG_2,
     .typeFlags = ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -195,7 +195,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Diploma),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_2,
+    .targetFlags = TARGET_FLAG_2,
     .typeFlags = ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -208,7 +208,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_UltraStone),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_2,
+    .targetFlags = TARGET_FLAG_2,
     .typeFlags = ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -221,7 +221,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_KoopaFortressKey),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -234,7 +234,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_RuinsKey),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -247,7 +247,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_PulseStone),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -260,7 +260,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_TubbaCastleKey),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -273,7 +273,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_CrystalPalaceKey),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -286,7 +286,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_LunarStone),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -299,7 +299,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_PyramidStone),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -312,7 +312,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_DiamondStone),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -325,7 +325,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_VolcanoVase),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -338,7 +338,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_KooperShell),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -351,7 +351,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_BowserCastleKey),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -364,7 +364,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_ForestPass),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -377,7 +377,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_BooWeight),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -390,7 +390,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_BooPortrait),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -403,7 +403,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_CrystalBerry),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -416,7 +416,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_MysticalKey),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -429,7 +429,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_IronKey),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -442,7 +442,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_ToyTrain),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -455,7 +455,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_BooRecord),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -468,7 +468,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_FryingPan),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -481,7 +481,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Dictionary),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -494,7 +494,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_MysteryNote),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -507,7 +507,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_SuspiciousNote),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -520,7 +520,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_CrystalBall),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -533,7 +533,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Screwdriver),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -546,7 +546,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Cookbook),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -559,7 +559,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_JadeRaven),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -572,7 +572,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_MagicalSeed1),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -585,7 +585,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_MagicalSeed2),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -598,7 +598,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_MagicalSeed3),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -611,7 +611,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_MagicalSeed4),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -624,7 +624,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_ToadDoll),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -637,7 +637,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Calculator),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -650,7 +650,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_SnowmanBucket),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -663,7 +663,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_SnowmanScarf),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -676,7 +676,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_RedKey),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -689,7 +689,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_BlueKey),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -702,7 +702,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -715,7 +715,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -728,7 +728,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -741,7 +741,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -754,7 +754,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -767,7 +767,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -780,7 +780,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -793,7 +793,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -806,7 +806,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -819,7 +819,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -832,7 +832,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -845,7 +845,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -858,7 +858,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -871,7 +871,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -884,7 +884,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -897,7 +897,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -910,7 +910,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -923,7 +923,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -936,7 +936,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -949,7 +949,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -962,7 +962,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -975,7 +975,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -988,7 +988,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1001,7 +1001,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1014,7 +1014,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1027,7 +1027,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1040,7 +1040,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1053,7 +1053,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1066,7 +1066,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1079,7 +1079,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1092,7 +1092,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Artifact),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1105,7 +1105,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1118,7 +1118,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Letter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1131,7 +1131,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Dolly),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1144,7 +1144,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_WaterStone),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1157,7 +1157,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_MagicalBean),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1170,7 +1170,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_FertileSoil),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1183,7 +1183,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_MiracleWater),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1196,7 +1196,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_VolcanoVase),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1209,7 +1209,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_KootTheTape),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1222,7 +1222,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_BakingSugar),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1235,7 +1235,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_BakingSalt),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1248,7 +1248,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_BakingEgg),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1261,7 +1261,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_BakingCream),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1274,7 +1274,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_BakingStrawberry),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1287,7 +1287,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_BakingButter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1300,7 +1300,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_BakingCleanser),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1313,7 +1313,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_BakingWater),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1326,7 +1326,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_BakingFlour),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1339,7 +1339,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_BakingMilk),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1352,7 +1352,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Lyrics),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1365,7 +1365,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Melody),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1378,7 +1378,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Mailbag),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1391,7 +1391,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_PeachKey),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1404,7 +1404,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_IronKey),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1417,7 +1417,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_StarStone),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1430,7 +1430,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_SneakyParasol),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1443,7 +1443,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_KootKoopaLegends),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1456,7 +1456,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_KootLuigiAutograph),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1469,7 +1469,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_KootEmptyWallet),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1482,7 +1482,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_KootMerluvleeAutograph),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1495,7 +1495,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_KootShell),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1508,7 +1508,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_KootPhoto),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1521,7 +1521,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_KootGlasses),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1534,7 +1534,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_KootPhoto),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1547,7 +1547,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_KootPackage),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1560,7 +1560,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_KootRedJar),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1573,7 +1573,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_PeachKey),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1586,7 +1586,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_IronKey),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1599,7 +1599,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_IronKey),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1612,7 +1612,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_SilverCredit),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1625,7 +1625,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_GoldCredit),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1638,7 +1638,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_PeachKey),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1651,7 +1651,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_PeachKey),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1664,7 +1664,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_PeachKey),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_KEY | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1677,7 +1677,7 @@ ItemData gItemTable[] = {
     .sellValue = 4,
     .hudElemID = ITEM_HS_INDEX(HES_Item_FireFlower),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_2 | ITEM_TARGET_FLAG_8000,
+    .targetFlags = TARGET_FLAG_2 | TARGET_FLAG_8000,
     .typeFlags = ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 3,
@@ -1690,7 +1690,7 @@ ItemData gItemTable[] = {
     .sellValue = 6,
     .hudElemID = ITEM_HS_INDEX(HES_Item_SnowmanDoll),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_2 | ITEM_TARGET_FLAG_8000,
+    .targetFlags = TARGET_FLAG_2 | TARGET_FLAG_8000,
     .typeFlags = ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 4,
@@ -1703,7 +1703,7 @@ ItemData gItemTable[] = {
     .sellValue = 8,
     .hudElemID = ITEM_HS_INDEX(HES_Item_ThunderRage),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_2 | ITEM_TARGET_FLAG_8000,
+    .targetFlags = TARGET_FLAG_2 | TARGET_FLAG_8000,
     .typeFlags = ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 5,
@@ -1716,7 +1716,7 @@ ItemData gItemTable[] = {
     .sellValue = 15,
     .hudElemID = ITEM_HS_INDEX(HES_Item_ShootingStar),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_2 | ITEM_TARGET_FLAG_8000,
+    .targetFlags = TARGET_FLAG_2 | TARGET_FLAG_8000,
     .typeFlags = ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 6,
@@ -1729,7 +1729,7 @@ ItemData gItemTable[] = {
     .sellValue = 4,
     .hudElemID = ITEM_HS_INDEX(HES_Item_ThunderBolt),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_2 | ITEM_TARGET_FLAG_8000,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_2 | TARGET_FLAG_8000,
     .typeFlags = ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 5,
@@ -1742,7 +1742,7 @@ ItemData gItemTable[] = {
     .sellValue = 1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Pebble),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_2 | ITEM_TARGET_FLAG_8000,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_2 | TARGET_FLAG_8000,
     .typeFlags = ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 1,
@@ -1755,7 +1755,7 @@ ItemData gItemTable[] = {
     .sellValue = 1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_DustyHammer),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_2 | ITEM_TARGET_FLAG_8000,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_2 | TARGET_FLAG_8000,
     .typeFlags = ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 1,
@@ -1768,7 +1768,7 @@ ItemData gItemTable[] = {
     .sellValue = 1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_InsecticideHerb),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_2 | ITEM_TARGET_FLAG_8000,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_2 | TARGET_FLAG_8000,
     .typeFlags = ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1781,7 +1781,7 @@ ItemData gItemTable[] = {
     .sellValue = 15,
     .hudElemID = ITEM_HS_INDEX(HES_Item_StoneCap),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 3,
@@ -1794,7 +1794,7 @@ ItemData gItemTable[] = {
     .sellValue = 1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_TastyTonic),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_USE_DRINK_ANIMATION | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1807,7 +1807,7 @@ ItemData gItemTable[] = {
     .sellValue = 2,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Mushroom),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 5,
@@ -1820,7 +1820,7 @@ ItemData gItemTable[] = {
     .sellValue = 7,
     .hudElemID = ITEM_HS_INDEX(HES_Item_VoltShroom),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 4,
@@ -1833,7 +1833,7 @@ ItemData gItemTable[] = {
     .sellValue = 7,
     .hudElemID = ITEM_HS_INDEX(HES_Item_SuperShroom),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 10,
@@ -1846,7 +1846,7 @@ ItemData gItemTable[] = {
     .sellValue = 1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_DriedShroom),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 1,
@@ -1859,7 +1859,7 @@ ItemData gItemTable[] = {
     .sellValue = 50,
     .hudElemID = ITEM_HS_INDEX(HES_Item_UltraShroom),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 50,
@@ -1872,7 +1872,7 @@ ItemData gItemTable[] = {
     .sellValue = 4,
     .hudElemID = ITEM_HS_INDEX(HES_Item_SleepySheep),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_2 | ITEM_TARGET_FLAG_8000,
+    .targetFlags = TARGET_FLAG_2 | TARGET_FLAG_8000,
     .typeFlags = ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 3,
@@ -1885,7 +1885,7 @@ ItemData gItemTable[] = {
     .sellValue = 3,
     .hudElemID = ITEM_HS_INDEX(HES_Item_POWBlock),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_2 | ITEM_TARGET_FLAG_8000,
+    .targetFlags = TARGET_FLAG_2 | TARGET_FLAG_8000,
     .typeFlags = ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 2,
@@ -1898,7 +1898,7 @@ ItemData gItemTable[] = {
     .sellValue = 10,
     .hudElemID = ITEM_HS_INDEX(HES_Item_HustleDrink),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_USE_DRINK_ANIMATION | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 2,
@@ -1911,7 +1911,7 @@ ItemData gItemTable[] = {
     .sellValue = 10,
     .hudElemID = ITEM_HS_INDEX(HES_Item_StopWatch),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_2 | ITEM_TARGET_FLAG_8000,
+    .targetFlags = TARGET_FLAG_2 | TARGET_FLAG_8000,
     .typeFlags = ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 4,
@@ -1924,7 +1924,7 @@ ItemData gItemTable[] = {
     .sellValue = 30,
     .hudElemID = ITEM_HS_INDEX(HES_Item_WhackasBump),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 25,
@@ -1937,7 +1937,7 @@ ItemData gItemTable[] = {
     .sellValue = 2,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Apple),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 5,
@@ -1950,7 +1950,7 @@ ItemData gItemTable[] = {
     .sellValue = 20,
     .hudElemID = ITEM_HS_INDEX(HES_Item_LifeShroom),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 10,
@@ -1963,7 +1963,7 @@ ItemData gItemTable[] = {
     .sellValue = 1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Mystery),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -1976,7 +1976,7 @@ ItemData gItemTable[] = {
     .sellValue = 15,
     .hudElemID = ITEM_HS_INDEX(HES_Item_RepelGel),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 2,
@@ -1989,7 +1989,7 @@ ItemData gItemTable[] = {
     .sellValue = 3,
     .hudElemID = ITEM_HS_INDEX(HES_Item_FrightJar),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_2 | ITEM_TARGET_FLAG_8000,
+    .targetFlags = TARGET_FLAG_2 | TARGET_FLAG_8000,
     .typeFlags = ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -2002,7 +2002,7 @@ ItemData gItemTable[] = {
     .sellValue = 5,
     .hudElemID = ITEM_HS_INDEX(HES_Item_PleaseComeBack),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -2015,7 +2015,7 @@ ItemData gItemTable[] = {
     .sellValue = 6,
     .hudElemID = ITEM_HS_INDEX(HES_Item_DizzyDial),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_2 | ITEM_TARGET_FLAG_8000,
+    .targetFlags = TARGET_FLAG_2 | TARGET_FLAG_8000,
     .typeFlags = ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 3,
@@ -2028,7 +2028,7 @@ ItemData gItemTable[] = {
     .sellValue = 3,
     .hudElemID = ITEM_HS_INDEX(HES_Item_SuperSoda),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_USE_DRINK_ANIMATION | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -2041,7 +2041,7 @@ ItemData gItemTable[] = {
     .sellValue = 1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Lemon),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 1,
@@ -2054,7 +2054,7 @@ ItemData gItemTable[] = {
     .sellValue = 1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Lime),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -2067,7 +2067,7 @@ ItemData gItemTable[] = {
     .sellValue = 2,
     .hudElemID = ITEM_HS_INDEX(HES_Item_BlueBerry),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -2080,7 +2080,7 @@ ItemData gItemTable[] = {
     .sellValue = 2,
     .hudElemID = ITEM_HS_INDEX(HES_Item_RedBerry),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 5,
@@ -2093,7 +2093,7 @@ ItemData gItemTable[] = {
     .sellValue = 2,
     .hudElemID = ITEM_HS_INDEX(HES_Item_YellowBerry),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 3,
@@ -2106,7 +2106,7 @@ ItemData gItemTable[] = {
     .sellValue = 3,
     .hudElemID = ITEM_HS_INDEX(HES_Item_BubbleBerry),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 5,
@@ -2119,7 +2119,7 @@ ItemData gItemTable[] = {
     .sellValue = 50,
     .hudElemID = ITEM_HS_INDEX(HES_Item_JamminJelly),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -2132,7 +2132,7 @@ ItemData gItemTable[] = {
     .sellValue = 10,
     .hudElemID = ITEM_HS_INDEX(HES_Item_MapleSyrup),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_USE_DRINK_ANIMATION | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -2145,7 +2145,7 @@ ItemData gItemTable[] = {
     .sellValue = 3,
     .hudElemID = ITEM_HS_INDEX(HES_Item_HoneySyrup),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_USE_DRINK_ANIMATION | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -2158,7 +2158,7 @@ ItemData gItemTable[] = {
     .sellValue = 2,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Goomnut),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -2171,7 +2171,7 @@ ItemData gItemTable[] = {
     .sellValue = 1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_KoopaLeaf),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -2184,7 +2184,7 @@ ItemData gItemTable[] = {
     .sellValue = 4,
     .hudElemID = ITEM_HS_INDEX(HES_Item_DriedPasta),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 3,
@@ -2197,7 +2197,7 @@ ItemData gItemTable[] = {
     .sellValue = 5,
     .hudElemID = ITEM_HS_INDEX(HES_Item_DriedFruit),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 15,
@@ -2210,7 +2210,7 @@ ItemData gItemTable[] = {
     .sellValue = 2,
     .hudElemID = ITEM_HS_INDEX(HES_Item_StrangeLeaf),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -2223,7 +2223,7 @@ ItemData gItemTable[] = {
     .sellValue = 3,
     .hudElemID = ITEM_HS_INDEX(HES_Item_CakeMix),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -2236,7 +2236,7 @@ ItemData gItemTable[] = {
     .sellValue = 2,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Egg),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 5,
@@ -2249,7 +2249,7 @@ ItemData gItemTable[] = {
     .sellValue = 1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Coconut),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_2 | ITEM_TARGET_FLAG_8000,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_2 | TARGET_FLAG_8000,
     .typeFlags = ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 3,
@@ -2262,7 +2262,7 @@ ItemData gItemTable[] = {
     .sellValue = 7,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Melon),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 15,
@@ -2275,7 +2275,7 @@ ItemData gItemTable[] = {
     .sellValue = 1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_StinkyHerb),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -2288,7 +2288,7 @@ ItemData gItemTable[] = {
     .sellValue = 3,
     .hudElemID = ITEM_HS_INDEX(HES_Item_IcedPotato),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 5,
@@ -2301,7 +2301,7 @@ ItemData gItemTable[] = {
     .sellValue = 10,
     .hudElemID = ITEM_HS_INDEX(HES_Item_SpicySoup),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_USE_DRINK_ANIMATION | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 4,
@@ -2314,7 +2314,7 @@ ItemData gItemTable[] = {
     .sellValue = 10,
     .hudElemID = ITEM_HS_INDEX(HES_Item_ApplePie),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 5,
@@ -2327,7 +2327,7 @@ ItemData gItemTable[] = {
     .sellValue = 75,
     .hudElemID = ITEM_HS_INDEX(HES_Item_HoneyUltra),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 50,
@@ -2340,7 +2340,7 @@ ItemData gItemTable[] = {
     .sellValue = 100,
     .hudElemID = ITEM_HS_INDEX(HES_Item_MapleUltra),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 50,
@@ -2353,7 +2353,7 @@ ItemData gItemTable[] = {
     .sellValue = 150,
     .hudElemID = ITEM_HS_INDEX(HES_Item_JellyUltra),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 50,
@@ -2366,7 +2366,7 @@ ItemData gItemTable[] = {
     .sellValue = 10,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Koopasta),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 7,
@@ -2379,7 +2379,7 @@ ItemData gItemTable[] = {
     .sellValue = 5,
     .hudElemID = ITEM_HS_INDEX(HES_Item_FriedShroom),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 6,
@@ -2392,7 +2392,7 @@ ItemData gItemTable[] = {
     .sellValue = 20,
     .hudElemID = ITEM_HS_INDEX(HES_Item_ShroomCake),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 10,
@@ -2405,7 +2405,7 @@ ItemData gItemTable[] = {
     .sellValue = 45,
     .hudElemID = ITEM_HS_INDEX(HES_Item_ShroomSteak),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 30,
@@ -2418,7 +2418,7 @@ ItemData gItemTable[] = {
     .sellValue = 15,
     .hudElemID = ITEM_HS_INDEX(HES_Item_HotShroom),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 15,
@@ -2431,7 +2431,7 @@ ItemData gItemTable[] = {
     .sellValue = 50,
     .hudElemID = ITEM_HS_INDEX(HES_Item_SweetShroom),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 30,
@@ -2444,7 +2444,7 @@ ItemData gItemTable[] = {
     .sellValue = 15,
     .hudElemID = ITEM_HS_INDEX(HES_Item_YummyMeal),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 20,
@@ -2457,7 +2457,7 @@ ItemData gItemTable[] = {
     .sellValue = 25,
     .hudElemID = ITEM_HS_INDEX(HES_Item_HealthyJuice),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_USE_DRINK_ANIMATION | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -2470,7 +2470,7 @@ ItemData gItemTable[] = {
     .sellValue = 10,
     .hudElemID = ITEM_HS_INDEX(HES_Item_BlandMeal),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 10,
@@ -2483,7 +2483,7 @@ ItemData gItemTable[] = {
     .sellValue = 60,
     .hudElemID = ITEM_HS_INDEX(HES_Item_DeluxeFeast),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 40,
@@ -2496,7 +2496,7 @@ ItemData gItemTable[] = {
     .sellValue = 10,
     .hudElemID = ITEM_HS_INDEX(HES_Item_SpecialShake),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_USE_DRINK_ANIMATION | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -2509,7 +2509,7 @@ ItemData gItemTable[] = {
     .sellValue = 10,
     .hudElemID = ITEM_HS_INDEX(HES_Item_BigCookie),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -2522,7 +2522,7 @@ ItemData gItemTable[] = {
     .sellValue = 10,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Cake),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -2535,7 +2535,7 @@ ItemData gItemTable[] = {
     .sellValue = 1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Mistake),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 1,
@@ -2548,7 +2548,7 @@ ItemData gItemTable[] = {
     .sellValue = 3,
     .hudElemID = ITEM_HS_INDEX(HES_Item_KoopaTea),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_USE_DRINK_ANIMATION | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -2561,7 +2561,7 @@ ItemData gItemTable[] = {
     .sellValue = 20,
     .hudElemID = ITEM_HS_INDEX(HES_Item_HoneySuper),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 10,
@@ -2574,7 +2574,7 @@ ItemData gItemTable[] = {
     .sellValue = 35,
     .hudElemID = ITEM_HS_INDEX(HES_Item_MapleSuper),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 10,
@@ -2587,7 +2587,7 @@ ItemData gItemTable[] = {
     .sellValue = 100,
     .hudElemID = ITEM_HS_INDEX(HES_Item_JellySuper),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 10,
@@ -2600,7 +2600,7 @@ ItemData gItemTable[] = {
     .sellValue = 7,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Spaghetti),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 6,
@@ -2613,7 +2613,7 @@ ItemData gItemTable[] = {
     .sellValue = 10,
     .hudElemID = ITEM_HS_INDEX(HES_Item_EggMissile),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_2 | ITEM_TARGET_FLAG_8000,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_2 | TARGET_FLAG_8000,
     .typeFlags = ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 6,
@@ -2626,7 +2626,7 @@ ItemData gItemTable[] = {
     .sellValue = 7,
     .hudElemID = ITEM_HS_INDEX(HES_Item_FriedEgg),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 10,
@@ -2639,7 +2639,7 @@ ItemData gItemTable[] = {
     .sellValue = 10,
     .hudElemID = ITEM_HS_INDEX(HES_Item_HoneyShroom),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 5,
@@ -2652,7 +2652,7 @@ ItemData gItemTable[] = {
     .sellValue = 15,
     .hudElemID = ITEM_HS_INDEX(HES_Item_HoneyCandy),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -2665,7 +2665,7 @@ ItemData gItemTable[] = {
     .sellValue = 25,
     .hudElemID = ITEM_HS_INDEX(HES_Item_ElectroPop),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -2678,7 +2678,7 @@ ItemData gItemTable[] = {
     .sellValue = 20,
     .hudElemID = ITEM_HS_INDEX(HES_Item_FirePop),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = -1,
@@ -2691,7 +2691,7 @@ ItemData gItemTable[] = {
     .sellValue = 15,
     .hudElemID = ITEM_HS_INDEX(HES_Item_LimeCandy),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -2704,7 +2704,7 @@ ItemData gItemTable[] = {
     .sellValue = 12,
     .hudElemID = ITEM_HS_INDEX(HES_Item_CocoPop),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 3,
@@ -2717,7 +2717,7 @@ ItemData gItemTable[] = {
     .sellValue = 15,
     .hudElemID = ITEM_HS_INDEX(HES_Item_LemonCandy),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 5,
@@ -2730,7 +2730,7 @@ ItemData gItemTable[] = {
     .sellValue = 100,
     .hudElemID = ITEM_HS_INDEX(HES_Item_JellyPop),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -2743,7 +2743,7 @@ ItemData gItemTable[] = {
     .sellValue = 10,
     .hudElemID = ITEM_HS_INDEX(HES_Item_StrangeCake),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -2756,7 +2756,7 @@ ItemData gItemTable[] = {
     .sellValue = 12,
     .hudElemID = ITEM_HS_INDEX(HES_Item_KookyCookie),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -2769,7 +2769,7 @@ ItemData gItemTable[] = {
     .sellValue = 15,
     .hudElemID = ITEM_HS_INDEX(HES_Item_FrozenFries),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 15,
@@ -2782,7 +2782,7 @@ ItemData gItemTable[] = {
     .sellValue = 6,
     .hudElemID = ITEM_HS_INDEX(HES_Item_PotatoSalad),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 10,
@@ -2795,7 +2795,7 @@ ItemData gItemTable[] = {
     .sellValue = 6,
     .hudElemID = ITEM_HS_INDEX(HES_Item_NuttyCake),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -2808,7 +2808,7 @@ ItemData gItemTable[] = {
     .sellValue = 25,
     .hudElemID = ITEM_HS_INDEX(HES_Item_MapleShroom),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 5,
@@ -2821,7 +2821,7 @@ ItemData gItemTable[] = {
     .sellValue = 10,
     .hudElemID = ITEM_HS_INDEX(HES_Item_BoiledEgg),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 8,
@@ -2834,7 +2834,7 @@ ItemData gItemTable[] = {
     .sellValue = 20,
     .hudElemID = ITEM_HS_INDEX(HES_Item_YoshiCookie),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 15,
@@ -2847,7 +2847,7 @@ ItemData gItemTable[] = {
     .sellValue = 75,
     .hudElemID = ITEM_HS_INDEX(HES_Item_JellyShroom),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 5,
@@ -2860,7 +2860,7 @@ ItemData gItemTable[] = {
     .sellValue = 75,
     .hudElemID = ITEM_HS_INDEX(HES_Item_JellyShroom),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 5,
@@ -2873,7 +2873,7 @@ ItemData gItemTable[] = {
     .sellValue = 75,
     .hudElemID = ITEM_HS_INDEX(HES_Item_JellyShroom),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 5,
@@ -2886,7 +2886,7 @@ ItemData gItemTable[] = {
     .sellValue = 75,
     .hudElemID = ITEM_HS_INDEX(HES_Item_JellyShroom),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 5,
@@ -2899,7 +2899,7 @@ ItemData gItemTable[] = {
     .sellValue = 75,
     .hudElemID = ITEM_HS_INDEX(HES_Item_JellyShroom),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 5,
@@ -2912,7 +2912,7 @@ ItemData gItemTable[] = {
     .sellValue = 75,
     .hudElemID = ITEM_HS_INDEX(HES_Item_JellyShroom),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_ENEMY | ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_ENEMY | TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_WORLD_USABLE | ITEM_TYPE_FLAG_BATTLE_USABLE | ITEM_TYPE_FLAG_CONSUMABLE | ITEM_TYPE_FLAG_FOOD_OR_DRINK | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 5,
@@ -4446,7 +4446,7 @@ ItemData gItemTable[] = {
     .sellValue = 1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_PartnerAttack),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_BADGE | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -4459,7 +4459,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Heart),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = 0,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -4472,7 +4472,7 @@ ItemData gItemTable[] = {
     .sellValue = 1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Coin),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_ENTITY_COLLECTIBLE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -4485,7 +4485,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_HeartPiece),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_ENTITY_COLLECTIBLE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -4498,7 +4498,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_StarPoint),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_ENTITY_COLLECTIBLE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -4511,7 +4511,7 @@ ItemData gItemTable[] = {
     .sellValue = -1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_HeartPoint),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_ENTITY_COLLECTIBLE | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -4524,7 +4524,7 @@ ItemData gItemTable[] = {
     .sellValue = 1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_FlowerPoint),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_ENTITY_COLLECTIBLE | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -4537,7 +4537,7 @@ ItemData gItemTable[] = {
     .sellValue = 1,
     .hudElemID = ITEM_HS_INDEX(HES_Item_StarPiece),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_ENTITY_COLLECTIBLE | ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -4550,7 +4550,7 @@ ItemData gItemTable[] = {
     .sellValue = 0,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Present),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -4563,7 +4563,7 @@ ItemData gItemTable[] = {
     .sellValue = 0,
     .hudElemID = ITEM_HS_INDEX(HES_Item_CakeDone),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -4576,7 +4576,7 @@ ItemData gItemTable[] = {
     .sellValue = 0,
     .hudElemID = ITEM_HS_INDEX(HES_Item_CakeBare),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -4589,7 +4589,7 @@ ItemData gItemTable[] = {
     .sellValue = 0,
     .hudElemID = ITEM_HS_INDEX(HES_Item_CakePan),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -4602,7 +4602,7 @@ ItemData gItemTable[] = {
     .sellValue = 0,
     .hudElemID = ITEM_HS_INDEX(HES_Item_CakeBatter),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -4615,7 +4615,7 @@ ItemData gItemTable[] = {
     .sellValue = 0,
     .hudElemID = ITEM_HS_INDEX(HES_Item_CakeBowl),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -4628,7 +4628,7 @@ ItemData gItemTable[] = {
     .sellValue = 0,
     .hudElemID = ITEM_HS_INDEX(HES_Item_CakeMixed),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -4641,7 +4641,7 @@ ItemData gItemTable[] = {
     .sellValue = 0,
     .hudElemID = ITEM_HS_INDEX(HES_Item_CakeWithIcing),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -4654,7 +4654,7 @@ ItemData gItemTable[] = {
     .sellValue = 0,
     .hudElemID = ITEM_HS_INDEX(HES_Item_CakeWithBerries),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -4667,7 +4667,7 @@ ItemData gItemTable[] = {
     .sellValue = 0,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Hammer1Icon),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -4680,7 +4680,7 @@ ItemData gItemTable[] = {
     .sellValue = 0,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Hammer2Icon),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -4693,7 +4693,7 @@ ItemData gItemTable[] = {
     .sellValue = 0,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Hammer3Icon),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -4706,7 +4706,7 @@ ItemData gItemTable[] = {
     .sellValue = 0,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Boots1Icon),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -4719,7 +4719,7 @@ ItemData gItemTable[] = {
     .sellValue = 0,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Boots2Icon),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -4732,7 +4732,7 @@ ItemData gItemTable[] = {
     .sellValue = 0,
     .hudElemID = ITEM_HS_INDEX(HES_Item_Boots3Icon),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
@@ -4745,7 +4745,7 @@ ItemData gItemTable[] = {
     .sellValue = 0,
     .hudElemID = ITEM_HS_INDEX(HES_Item_ItemsIcon),
     .sortValue = 0,
-    .targetFlags = ITEM_TARGET_FLAG_PLAYER,
+    .targetFlags = TARGET_FLAG_PLAYER,
     .typeFlags = ITEM_TYPE_FLAG_ENTITY_FULLSIZE,
     .moveID = MOVE_NONE,
     .potencyA = 0,
diff --git a/src/move_table.inc.c b/src/move_table.inc.c
index c12c9126a2..59b256bbc6 100644
--- a/src/move_table.inc.c
+++ b/src/move_table.inc.c
@@ -13,7 +13,7 @@ MoveData gMoveTable[] = {
     .nameMsg = 0,
     .fullDescMsg = 0,
     .shortDescMsg = 0,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -23,7 +23,7 @@ MoveData gMoveTable[] = {
     .nameMsg = 0,
     .fullDescMsg = 0,
     .shortDescMsg = 0,
-    .flags = MOVE_DATA_FLAG_TARGET_PLAYER,
+    .flags = TARGET_FLAG_PLAYER,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -33,7 +33,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_Hammer,
     .fullDescMsg = 0,
     .shortDescMsg = MSG_ItemShortDesc_Hammer,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_1000 | MOVE_DATA_FLAG_2000 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_1000 | TARGET_FLAG_2000 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_HAMMER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 0,
@@ -43,7 +43,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_Hammer,
     .fullDescMsg = MSG_ItemShortDesc_SuperHammer,
     .shortDescMsg = MSG_ItemShortDesc_SuperHammer,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_1000 | MOVE_DATA_FLAG_2000 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_1000 | TARGET_FLAG_2000 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_HAMMER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 0,
@@ -53,7 +53,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_Hammer,
     .fullDescMsg = MSG_ItemShortDesc_UltraHammer,
     .shortDescMsg = MSG_ItemShortDesc_UltraHammer,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_1000 | MOVE_DATA_FLAG_2000 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_1000 | TARGET_FLAG_2000 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_HAMMER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 0,
@@ -63,7 +63,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_Hammer,
     .fullDescMsg = 0,
     .shortDescMsg = 0,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_1000 | MOVE_DATA_FLAG_2000 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_1000 | TARGET_FLAG_2000 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_HAMMER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 0,
@@ -73,7 +73,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_MoveName_Berserker,
     .fullDescMsg = MSG_ItemFullDesc_Berserker,
     .shortDescMsg = MSG_ItemShortDesc_Berserker,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_1000 | MOVE_DATA_FLAG_2000 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_1000 | TARGET_FLAG_2000 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_HAMMER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 0,
@@ -83,7 +83,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PlayerMoveName_SpinSmash,
     .fullDescMsg = MSG_ItemFullDesc_SpinSmash,
     .shortDescMsg = MSG_ItemShortDesc_SpinSmash,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_1000 | MOVE_DATA_FLAG_2000 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_1000 | TARGET_FLAG_2000 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_HAMMER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 2,
@@ -93,7 +93,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PlayerMoveName_QuakeHammer,
     .fullDescMsg = MSG_ItemFullDesc_QuakeHammer,
     .shortDescMsg = MSG_ItemShortDesc_QuakeHammer,
-    .flags = MOVE_DATA_FLAG_20 | MOVE_DATA_FLAG_8000,
+    .flags = TARGET_FLAG_20 | TARGET_FLAG_8000,
     .category = MOVE_TYPE_HAMMER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 2,
@@ -103,7 +103,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PlayerMoveName_DDownPound,
     .fullDescMsg = MSG_ItemFullDesc_DDownPound,
     .shortDescMsg = MSG_ItemShortDesc_DDownPound,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_1000 | MOVE_DATA_FLAG_2000 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_1000 | TARGET_FLAG_2000 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_HAMMER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 2,
@@ -113,7 +113,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_MoveName_SmashCharge0,
     .fullDescMsg = MSG_ItemFullDesc_SmashCharge0,
     .shortDescMsg = MSG_ItemShortDesc_SmashCharge0,
-    .flags = MOVE_DATA_FLAG_TARGET_PLAYER,
+    .flags = TARGET_FLAG_PLAYER,
     .category = MOVE_TYPE_HAMMER,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 1,
@@ -123,7 +123,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_Hammer,
     .fullDescMsg = MSG_ItemFullDesc_SmashCharge0,
     .shortDescMsg = MSG_ItemShortDesc_SmashCharge0,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_1000 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_1000 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_HAMMER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 0,
@@ -133,7 +133,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PlayerMoveName_HammerThrow,
     .fullDescMsg = MSG_ItemFullDesc_HammerThrow,
     .shortDescMsg = MSG_ItemShortDesc_HammerThrow,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_2,
     .category = MOVE_TYPE_HAMMER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 2,
@@ -143,7 +143,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PlayerMoveName_MegaQuake,
     .fullDescMsg = MSG_ItemFullDesc_MegaQuake,
     .shortDescMsg = MSG_ItemShortDesc_MegaQuake,
-    .flags = MOVE_DATA_FLAG_20 | MOVE_DATA_FLAG_8000,
+    .flags = TARGET_FLAG_20 | TARGET_FLAG_8000,
     .category = MOVE_TYPE_HAMMER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 7,
@@ -153,7 +153,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PlayerMoveName_SmashCharge,
     .fullDescMsg = MSG_ItemFullDesc_SmashCharge,
     .shortDescMsg = MSG_ItemShortDesc_SmashCharge,
-    .flags = MOVE_DATA_FLAG_TARGET_PLAYER,
+    .flags = TARGET_FLAG_PLAYER,
     .category = MOVE_TYPE_HAMMER,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 1,
@@ -163,7 +163,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_Hammer,
     .fullDescMsg = MSG_ItemFullDesc_SmashCharge,
     .shortDescMsg = MSG_ItemShortDesc_SmashCharge,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_HAMMER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 0,
@@ -173,7 +173,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PlayerMoveName_SuperSmashCharge,
     .fullDescMsg = MSG_ItemFullDesc_SSmashChg,
     .shortDescMsg = MSG_ItemShortDesc_SSmashChg,
-    .flags = MOVE_DATA_FLAG_TARGET_PLAYER,
+    .flags = TARGET_FLAG_PLAYER,
     .category = MOVE_TYPE_HAMMER,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 4,
@@ -183,7 +183,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_Hammer,
     .fullDescMsg = MSG_ItemFullDesc_SSmashChg,
     .shortDescMsg = MSG_ItemShortDesc_SSmashChg,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_1000 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_1000 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_HAMMER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 0,
@@ -193,7 +193,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_MoveName_AutoSmash,
     .fullDescMsg = MSG_ItemFullDesc_AutoSmash,
     .shortDescMsg = MSG_ItemShortDesc_AutoSmash,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_1000 | MOVE_DATA_FLAG_2000 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_1000 | TARGET_FLAG_2000 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_HAMMER,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 2,
@@ -203,7 +203,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PlayerMoveName_PowerQuake,
     .fullDescMsg = MSG_ItemFullDesc_PowerQuake,
     .shortDescMsg = MSG_ItemShortDesc_PowerQuake,
-    .flags = MOVE_DATA_FLAG_20 | MOVE_DATA_FLAG_8000,
+    .flags = TARGET_FLAG_20 | TARGET_FLAG_8000,
     .category = MOVE_TYPE_HAMMER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 4,
@@ -213,7 +213,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PlayerMoveName_PowerSmash,
     .fullDescMsg = MSG_ItemFullDesc_PowerSmash,
     .shortDescMsg = MSG_ItemShortDesc_PowerSmash,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_1000 | MOVE_DATA_FLAG_2000 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_1000 | TARGET_FLAG_2000 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_HAMMER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 2,
@@ -223,7 +223,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_MoveName_SuperSmash,
     .fullDescMsg = MSG_ItemFullDesc_SuperSmash,
     .shortDescMsg = MSG_ItemShortDesc_SuperSmash,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_1000 | MOVE_DATA_FLAG_2000 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_1000 | TARGET_FLAG_2000 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_HAMMER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 4,
@@ -233,7 +233,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PlayerMoveName_MegaSmash,
     .fullDescMsg = MSG_ItemFullDesc_MegaSmash,
     .shortDescMsg = MSG_ItemShortDesc_MegaSmash,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_1000 | MOVE_DATA_FLAG_2000 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_1000 | TARGET_FLAG_2000 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_HAMMER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 6,
@@ -243,7 +243,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PlayerMoveName_ShrinkSmash,
     .fullDescMsg = MSG_ItemFullDesc_ShrinkSmash,
     .shortDescMsg = MSG_ItemShortDesc_ShrinkSmash,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_1000 | MOVE_DATA_FLAG_2000 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_1000 | TARGET_FLAG_2000 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_HAMMER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 2,
@@ -253,7 +253,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_ShellCrack,
     .fullDescMsg = MSG_ItemFullDesc_ShellCrack,
     .shortDescMsg = MSG_ItemShortDesc_ShellCrack,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_1000 | MOVE_DATA_FLAG_2000 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_1000 | TARGET_FLAG_2000 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_HAMMER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 6,
@@ -263,7 +263,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_Jump,
     .fullDescMsg = MSG_ItemShortDesc_Jump,
     .shortDescMsg = MSG_ItemShortDesc_Jump,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_JUMP,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 0,
@@ -273,7 +273,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_Jump,
     .fullDescMsg = MSG_ItemShortDesc_SpinJump,
     .shortDescMsg = MSG_ItemShortDesc_SpinJump,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_JUMP,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 0,
@@ -283,7 +283,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_Jump,
     .fullDescMsg = MSG_ItemShortDesc_TornadoJump,
     .shortDescMsg = MSG_ItemShortDesc_TornadoJump,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_JUMP,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 0,
@@ -293,7 +293,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_Jump,
     .fullDescMsg = 0,
     .shortDescMsg = 0,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_JUMP,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 0,
@@ -303,7 +303,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_Jump,
     .fullDescMsg = MSG_ItemFullDesc_Berserker,
     .shortDescMsg = MSG_ItemShortDesc_Berserker,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_JUMP,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 0,
@@ -313,7 +313,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PlayerMoveName_Multibounce,
     .fullDescMsg = MSG_ItemFullDesc_Multibounce,
     .shortDescMsg = MSG_ItemShortDesc_Multibounce,
-    .flags = MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_8000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_8000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_JUMP,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 2,
@@ -323,7 +323,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PlayerMoveName_PowerBounce,
     .fullDescMsg = MSG_ItemFullDesc_PowerBounce,
     .shortDescMsg = MSG_ItemShortDesc_PowerBounce,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_JUMP,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 3,
@@ -333,7 +333,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PlayerMoveName_SleepStomp,
     .fullDescMsg = MSG_ItemFullDesc_SleepStomp,
     .shortDescMsg = MSG_ItemShortDesc_SleepStomp,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_JUMP,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 2,
@@ -343,7 +343,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PlayerMoveName_DizzyStomp,
     .fullDescMsg = MSG_ItemFullDesc_DizzyStomp,
     .shortDescMsg = MSG_ItemShortDesc_DizzyStomp,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_JUMP,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 2,
@@ -353,7 +353,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_MoveName_JumpCharge0,
     .fullDescMsg = MSG_ItemFullDesc_JumpCharge0,
     .shortDescMsg = MSG_ItemShortDesc_JumpCharge0,
-    .flags = MOVE_DATA_FLAG_TARGET_PLAYER | MOVE_DATA_FLAG_800,
+    .flags = TARGET_FLAG_PLAYER | TARGET_FLAG_800,
     .category = MOVE_TYPE_JUMP,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 1,
@@ -363,7 +363,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_Jump,
     .fullDescMsg = MSG_ItemFullDesc_JumpCharge0,
     .shortDescMsg = MSG_ItemShortDesc_JumpCharge0,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_JUMP,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 1,
@@ -373,7 +373,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PlayerMoveName_JumpCharge,
     .fullDescMsg = MSG_ItemFullDesc_JumpCharge,
     .shortDescMsg = MSG_ItemShortDesc_JumpCharge,
-    .flags = MOVE_DATA_FLAG_TARGET_PLAYER | MOVE_DATA_FLAG_800,
+    .flags = TARGET_FLAG_PLAYER | TARGET_FLAG_800,
     .category = MOVE_TYPE_JUMP,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 1,
@@ -383,7 +383,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_Jump,
     .fullDescMsg = MSG_ItemFullDesc_JumpCharge,
     .shortDescMsg = MSG_ItemShortDesc_JumpCharge,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_JUMP,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 0,
@@ -393,7 +393,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PlayerMoveName_SuperJumpCharge,
     .fullDescMsg = MSG_ItemFullDesc_SJumpChg,
     .shortDescMsg = MSG_ItemShortDesc_SJumpChg,
-    .flags = MOVE_DATA_FLAG_TARGET_PLAYER | MOVE_DATA_FLAG_800,
+    .flags = TARGET_FLAG_PLAYER | TARGET_FLAG_800,
     .category = MOVE_TYPE_JUMP,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 4,
@@ -403,7 +403,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_Jump,
     .fullDescMsg = MSG_ItemFullDesc_SJumpChg,
     .shortDescMsg = MSG_ItemShortDesc_SJumpChg,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_JUMP,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 0,
@@ -413,7 +413,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_MoveName_AutoJump,
     .fullDescMsg = MSG_ItemFullDesc_AutoJump,
     .shortDescMsg = MSG_ItemShortDesc_AutoJump,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_JUMP,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 2,
@@ -423,7 +423,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_MoveName_AutoMultibounce,
     .fullDescMsg = MSG_ItemFullDesc_AutoMultibounce,
     .shortDescMsg = MSG_ItemShortDesc_AutoMultibounce,
-    .flags = MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_8000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_8000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_JUMP,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 5,
@@ -433,7 +433,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PlayerMoveName_PowerJump,
     .fullDescMsg = MSG_ItemFullDesc_PowerJump,
     .shortDescMsg = MSG_ItemShortDesc_PowerJump,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_JUMP,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 2,
@@ -443,7 +443,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_MoveName_SuperJump,
     .fullDescMsg = MSG_ItemFullDesc_SuperJump,
     .shortDescMsg = MSG_ItemShortDesc_SuperJump,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_JUMP,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 4,
@@ -453,7 +453,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PlayerMoveName_MegaJump,
     .fullDescMsg = MSG_ItemFullDesc_MegaJump,
     .shortDescMsg = MSG_ItemShortDesc_MegaJump,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_JUMP,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 6,
@@ -463,7 +463,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PlayerMoveName_DDownJump,
     .fullDescMsg = MSG_ItemFullDesc_DDownJump,
     .shortDescMsg = MSG_ItemShortDesc_DDownJump,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_JUMP,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 2,
@@ -473,7 +473,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PlayerMoveName_ShrinkStomp,
     .fullDescMsg = MSG_ItemFullDesc_ShrinkStomp,
     .shortDescMsg = MSG_ItemShortDesc_ShrinkStomp,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_JUMP,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 2,
@@ -483,7 +483,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_MoveName_EarthquakeJump,
     .fullDescMsg = MSG_ItemFullDesc_EarthquakeJump,
     .shortDescMsg = MSG_ItemShortDesc_EarthquakeJump,
-    .flags = MOVE_DATA_FLAG_20 | MOVE_DATA_FLAG_8000,
+    .flags = TARGET_FLAG_20 | TARGET_FLAG_8000,
     .category = MOVE_TYPE_JUMP,
     .actionTip = MOVE_ACTION_TIP_20,
     .costFP = 2,
@@ -493,7 +493,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_MoveName_DefendPlus,
     .fullDescMsg = MSG_ItemFullDesc_DefendPlus,
     .shortDescMsg = MSG_ItemShortDesc_DefendPlus,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_3,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -503,7 +503,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_MoveName_32,
     .fullDescMsg = MSG_FullDesc_32,
     .shortDescMsg = MSG_ShortDesc_32,
-    .flags = MOVE_DATA_FLAG_TARGET_PLAYER,
+    .flags = TARGET_FLAG_PLAYER,
     .category = MOVE_TYPE_3,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -513,7 +513,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_DamageDodge,
     .fullDescMsg = MSG_ItemFullDesc_DamageDodge,
     .shortDescMsg = MSG_ItemShortDesc_DamageDodge,
-    .flags = MOVE_DATA_FLAG_TARGET_PLAYER,
+    .flags = TARGET_FLAG_PLAYER,
     .category = MOVE_TYPE_3,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -523,7 +523,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_Items,
     .fullDescMsg = 0,
     .shortDescMsg = MSG_Menus_Action_UseItem,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_ITEMS,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -573,7 +573,7 @@ MoveData gMoveTable[] = {
     .nameMsg = (s32) "つうじょう",
     .fullDescMsg = 0,
     .shortDescMsg = 0,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_6,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -633,7 +633,7 @@ MoveData gMoveTable[] = {
     .nameMsg = (s32) "つうじょう",
     .fullDescMsg = 0,
     .shortDescMsg = 0,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_DEFENSE_UP,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -813,7 +813,7 @@ MoveData gMoveTable[] = {
     .nameMsg = (s32) "つうじょう",
     .fullDescMsg = 0,
     .shortDescMsg = 0,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -823,7 +823,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_HPPlus,
     .fullDescMsg = MSG_ItemFullDesc_HPPlus,
     .shortDescMsg = MSG_ItemShortDesc_HPPlus,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -833,7 +833,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_MysteryScroll,
     .fullDescMsg = MSG_ItemFullDesc_MysteryScroll,
     .shortDescMsg = MSG_ItemShortDesc_MysteryScroll,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -843,7 +843,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_AttackFXA,
     .fullDescMsg = MSG_ItemFullDesc_AttackFXA,
     .shortDescMsg = MSG_ItemShortDesc_AttackFXA,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -853,7 +853,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_AttackFXD,
     .fullDescMsg = MSG_ItemFullDesc_AttackFXD,
     .shortDescMsg = MSG_ItemShortDesc_AttackFXD,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -863,7 +863,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_AttackFXB,
     .fullDescMsg = MSG_ItemFullDesc_AttackFXB,
     .shortDescMsg = MSG_ItemShortDesc_AttackFXB,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -873,7 +873,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_AttackFXE,
     .fullDescMsg = MSG_ItemFullDesc_AttackFXE,
     .shortDescMsg = MSG_ItemShortDesc_AttackFXE,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -883,7 +883,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_AttackFXC,
     .fullDescMsg = MSG_ItemFullDesc_AttackFXC,
     .shortDescMsg = MSG_ItemShortDesc_AttackFXC,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -893,7 +893,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_AttackFXF,
     .fullDescMsg = MSG_ItemFullDesc_AttackFXF,
     .shortDescMsg = MSG_ItemShortDesc_AttackFXF,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -903,7 +903,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_HPDrain,
     .fullDescMsg = MSG_ItemFullDesc_HPDrain,
     .shortDescMsg = MSG_ItemShortDesc_HPDrain,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -913,7 +913,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_FPPlus,
     .fullDescMsg = MSG_ItemFullDesc_FPPlus,
     .shortDescMsg = MSG_ItemShortDesc_FPPlus,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -923,7 +923,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_MoneyMoney,
     .fullDescMsg = MSG_ItemFullDesc_MoneyMoney,
     .shortDescMsg = MSG_ItemShortDesc_MoneyMoney,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -933,7 +933,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_ChillOut,
     .fullDescMsg = MSG_ItemFullDesc_ChillOut,
     .shortDescMsg = MSG_ItemShortDesc_ChillOut,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -943,7 +943,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_HappyHeart,
     .fullDescMsg = MSG_ItemFullDesc_HappyHeart,
     .shortDescMsg = MSG_ItemShortDesc_HappyHeart,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -953,7 +953,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_MegaRush,
     .fullDescMsg = MSG_ItemFullDesc_MegaRush,
     .shortDescMsg = MSG_ItemShortDesc_MegaRush,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -963,7 +963,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_Berserker,
     .fullDescMsg = MSG_ItemFullDesc_Berserker,
     .shortDescMsg = MSG_ItemShortDesc_Berserker,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -973,7 +973,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_RunawayPay,
     .fullDescMsg = MSG_ItemFullDesc_RunawayPay,
     .shortDescMsg = MSG_ItemShortDesc_RunawayPay,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -983,7 +983,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_FlowerSaver,
     .fullDescMsg = MSG_ItemFullDesc_FlowerSaver,
     .shortDescMsg = MSG_ItemShortDesc_FlowerSaver,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -993,7 +993,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_PayOff,
     .fullDescMsg = MSG_ItemFullDesc_PayOff,
     .shortDescMsg = MSG_ItemShortDesc_PayOff,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1003,7 +1003,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_MoveName_PowerRush,
     .fullDescMsg = MSG_ItemFullDesc_PowerRush,
     .shortDescMsg = MSG_ItemShortDesc_PowerRush,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1013,7 +1013,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_MoveName_CrazyHeart,
     .fullDescMsg = MSG_ItemFullDesc_CrazyHeart,
     .shortDescMsg = MSG_ItemShortDesc_CrazyHeart,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1023,7 +1023,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_MoveName_MegaHPDrain,
     .fullDescMsg = MSG_ItemFullDesc_MegaHPDrain,
     .shortDescMsg = MSG_ItemShortDesc_MegaHPDrain,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1033,7 +1033,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_MoveName_FlowerFanatic,
     .fullDescMsg = MSG_ItemFullDesc_FlowerFanatic,
     .shortDescMsg = MSG_ItemShortDesc_FlowerFanatic,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1043,7 +1043,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_MoveName_HeartFinder,
     .fullDescMsg = MSG_ItemFullDesc_HeartFinder,
     .shortDescMsg = MSG_ItemShortDesc_HeartFinder,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1053,7 +1053,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_MoveName_FlowerFinder,
     .fullDescMsg = MSG_ItemFullDesc_FlowerFinder,
     .shortDescMsg = MSG_ItemShortDesc_FlowerFinder,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1063,7 +1063,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_MoveName_SpinAttack,
     .fullDescMsg = MSG_ItemFullDesc_SpinAttack,
     .shortDescMsg = MSG_ItemShortDesc_SpinAttack,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1073,7 +1073,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_MoveName_DizzyAttack,
     .fullDescMsg = MSG_ItemFullDesc_DizzyAttack,
     .shortDescMsg = MSG_ItemShortDesc_DizzyAttack,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1083,7 +1083,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_MoveName_ISpy,
     .fullDescMsg = MSG_ItemFullDesc_ISpy,
     .shortDescMsg = MSG_ItemShortDesc_ISpy,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1093,7 +1093,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_MoveName_SpeedySpin,
     .fullDescMsg = MSG_ItemFullDesc_SpeedySpin,
     .shortDescMsg = MSG_ItemShortDesc_SpeedySpin,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1103,7 +1103,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_Refund,
     .fullDescMsg = MSG_ItemFullDesc_Refund,
     .shortDescMsg = MSG_ItemShortDesc_Refund,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1113,7 +1113,7 @@ MoveData gMoveTable[] = {
     .nameMsg = (s32) "ファイナルクリジイ",
     .fullDescMsg = 0,
     .shortDescMsg = 0,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1123,7 +1123,7 @@ MoveData gMoveTable[] = {
     .nameMsg = (s32) "ファイナルボムヘイ",
     .fullDescMsg = 0,
     .shortDescMsg = 0,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1133,7 +1133,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_DeepFocus,
     .fullDescMsg = MSG_ItemFullDesc_DeepFocus,
     .shortDescMsg = MSG_ItemShortDesc_DeepFocus,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1143,7 +1143,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_SuperFocus,
     .fullDescMsg = MSG_ItemFullDesc_SuperFocus,
     .shortDescMsg = MSG_ItemShortDesc_SuperFocus,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1153,7 +1153,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_Kaiden,
     .fullDescMsg = MSG_ItemFullDesc_Kaiden,
     .shortDescMsg = MSG_ItemShortDesc_Kaiden,
-    .flags = MOVE_DATA_FLAG_80000000,
+    .flags = TARGET_FLAG_80000000,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1163,7 +1163,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_HappyFlower,
     .fullDescMsg = MSG_ItemFullDesc_HappyFlower,
     .shortDescMsg = MSG_ItemShortDesc_HappyFlower,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1173,7 +1173,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_GroupFocus,
     .fullDescMsg = MSG_ItemFullDesc_GroupFocus,
     .shortDescMsg = MSG_ItemShortDesc_GroupFocus,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1183,7 +1183,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_ItemName_Peekaboo,
     .fullDescMsg = MSG_ItemFullDesc_Peekaboo,
     .shortDescMsg = MSG_ItemShortDesc_Peekaboo,
-    .flags = MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_2,
     .category = MOVE_TYPE_NONE,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1193,7 +1193,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_StarPower_Focus,
     .fullDescMsg = 0,
     .shortDescMsg = MSG_Menus_StarPowerDesc_Focus,
-    .flags = MOVE_DATA_FLAG_80000000,
+    .flags = TARGET_FLAG_80000000,
     .category = MOVE_TYPE_STAR_POWER,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1203,7 +1203,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_StarPower_Refresh,
     .fullDescMsg = 0,
     .shortDescMsg = MSG_Menus_StarPowerDesc_Refresh,
-    .flags = MOVE_DATA_FLAG_TARGET_PLAYER,
+    .flags = TARGET_FLAG_PLAYER,
     .category = MOVE_TYPE_STAR_POWER,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 1,
@@ -1213,7 +1213,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_StarPower_Lullaby,
     .fullDescMsg = 0,
     .shortDescMsg = MSG_Menus_StarPowerDesc_Lullaby,
-    .flags = MOVE_DATA_FLAG_2 | MOVE_DATA_FLAG_8000,
+    .flags = TARGET_FLAG_2 | TARGET_FLAG_8000,
     .category = MOVE_TYPE_STAR_POWER,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 1,
@@ -1223,7 +1223,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_StarPower_StarStorm,
     .fullDescMsg = 0,
     .shortDescMsg = MSG_Menus_StarPowerDesc_StarStorm,
-    .flags = MOVE_DATA_FLAG_2 | MOVE_DATA_FLAG_8000,
+    .flags = TARGET_FLAG_2 | TARGET_FLAG_8000,
     .category = MOVE_TYPE_STAR_POWER,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 2,
@@ -1233,7 +1233,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_StarPower_ChillOut,
     .fullDescMsg = 0,
     .shortDescMsg = MSG_Menus_StarPowerDesc_ChillOut,
-    .flags = MOVE_DATA_FLAG_2 | MOVE_DATA_FLAG_8000,
+    .flags = TARGET_FLAG_2 | TARGET_FLAG_8000,
     .category = MOVE_TYPE_STAR_POWER,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 2,
@@ -1243,7 +1243,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_StarPower_Smooch,
     .fullDescMsg = 0,
     .shortDescMsg = MSG_Menus_StarPowerDesc_Smooch,
-    .flags = MOVE_DATA_FLAG_TARGET_PLAYER,
+    .flags = TARGET_FLAG_PLAYER,
     .category = MOVE_TYPE_STAR_POWER,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 3,
@@ -1253,7 +1253,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_StarPower_TimeOut,
     .fullDescMsg = 0,
     .shortDescMsg = MSG_Menus_StarPowerDesc_TimeOut,
-    .flags = MOVE_DATA_FLAG_2 | MOVE_DATA_FLAG_8000,
+    .flags = TARGET_FLAG_2 | TARGET_FLAG_8000,
     .category = MOVE_TYPE_STAR_POWER,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 2,
@@ -1263,7 +1263,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_StarPower_UpAndAway,
     .fullDescMsg = 0,
     .shortDescMsg = MSG_Menus_StarPowerDesc_UpAndAway,
-    .flags = MOVE_DATA_FLAG_2 | MOVE_DATA_FLAG_8000,
+    .flags = TARGET_FLAG_2 | TARGET_FLAG_8000,
     .category = MOVE_TYPE_STAR_POWER,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 2,
@@ -1273,7 +1273,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_StarPower_StarBeam,
     .fullDescMsg = 0,
     .shortDescMsg = MSG_Menus_StarPowerDesc_StarBeam,
-    .flags = MOVE_DATA_FLAG_2 | MOVE_DATA_FLAG_8000,
+    .flags = TARGET_FLAG_2 | TARGET_FLAG_8000,
     .category = MOVE_TYPE_STAR_POWER,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1283,7 +1283,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_StarPower_PeachBeam,
     .fullDescMsg = 0,
     .shortDescMsg = MSG_Menus_StarPowerDesc_PeachBeam,
-    .flags = MOVE_DATA_FLAG_2 | MOVE_DATA_FLAG_8000,
+    .flags = TARGET_FLAG_2 | TARGET_FLAG_8000,
     .category = MOVE_TYPE_STAR_POWER,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1293,7 +1293,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_StarPower_Peach_Focus,
     .fullDescMsg = 0,
     .shortDescMsg = MSG_Menus_StarPowerDesc_Focus,
-    .flags = MOVE_DATA_FLAG_100,
+    .flags = TARGET_FLAG_100,
     .category = MOVE_TYPE_STAR_POWER,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1303,7 +1303,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_Menus_StarPower_Twink_Dash,
     .fullDescMsg = 0,
     .shortDescMsg = MSG_Menus_StarPowerDesc_Focus,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_2 | MOVE_DATA_FLAG_8000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_2 | TARGET_FLAG_8000,
     .category = MOVE_TYPE_STAR_POWER,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1313,7 +1313,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_Headbonk1,
     .fullDescMsg = MSG_PartnerDesc_Goombario_Pause_Headbonk1,
     .shortDescMsg = MSG_PartnerDesc_Goombario_Battle_Headbonk,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_2,
     .costFP = 0,
@@ -1323,7 +1323,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_Headbonk2,
     .fullDescMsg = MSG_PartnerDesc_Goombario_Pause_Headbonk2,
     .shortDescMsg = MSG_PartnerDesc_Goombario_Battle_Headbonk,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_2,
     .costFP = 0,
@@ -1333,7 +1333,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_Headbonk3,
     .fullDescMsg = MSG_PartnerDesc_Goombario_Pause_Headbonk3,
     .shortDescMsg = MSG_PartnerDesc_Goombario_Battle_Headbonk,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_2,
     .costFP = 0,
@@ -1343,7 +1343,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_Tattle,
     .fullDescMsg = MSG_PartnerDesc_Goombario_Pause_Tattle,
     .shortDescMsg = MSG_PartnerDesc_Goombario_Battle_Tattle,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_2 | MOVE_DATA_FLAG_8000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_20000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_2 | TARGET_FLAG_8000 | TARGET_FLAG_10000 | TARGET_FLAG_20000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 0,
@@ -1353,7 +1353,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_Charge,
     .fullDescMsg = MSG_PartnerDesc_Goombario_Pause_Charge,
     .shortDescMsg = MSG_PartnerDesc_Goombario_Battle_Charge,
-    .flags = MOVE_DATA_FLAG_100,
+    .flags = TARGET_FLAG_100,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 1,
@@ -1363,7 +1363,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_Multibonk,
     .fullDescMsg = MSG_PartnerDesc_Goombario_Pause_Multibonk,
     .shortDescMsg = MSG_PartnerDesc_Goombario_Battle_Multibonk,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_2,
     .costFP = 3,
@@ -1373,7 +1373,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_ShellToss1,
     .fullDescMsg = MSG_PartnerDesc_Kooper_Pause_ShellToss1,
     .shortDescMsg = MSG_PartnerDesc_Kooper_Battle_ShellToss,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_2000 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_2000 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 0,
@@ -1383,7 +1383,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_ShellToss2,
     .fullDescMsg = MSG_PartnerDesc_Kooper_Pause_ShellToss2,
     .shortDescMsg = MSG_PartnerDesc_Kooper_Battle_ShellToss,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_2000 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_2000 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 0,
@@ -1393,7 +1393,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_ShellToss3,
     .fullDescMsg = MSG_PartnerDesc_Kooper_Pause_ShellToss3,
     .shortDescMsg = MSG_PartnerDesc_Kooper_Battle_ShellToss,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_2000 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_2000 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 0,
@@ -1403,7 +1403,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_PowerShell,
     .fullDescMsg = MSG_PartnerDesc_Kooper_Pause_PowerShell,
     .shortDescMsg = MSG_PartnerDesc_Kooper_Battle_PowerShell,
-    .flags = MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_8000,
+    .flags = TARGET_FLAG_4 | TARGET_FLAG_8000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 3,
@@ -1413,7 +1413,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_DizzyShell,
     .fullDescMsg = MSG_PartnerDesc_Kooper_Pause_DizzyShell,
     .shortDescMsg = MSG_PartnerDesc_Kooper_Battle_DizzyShell,
-    .flags = MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_8000,
+    .flags = TARGET_FLAG_4 | TARGET_FLAG_8000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_3,
     .costFP = 4,
@@ -1423,7 +1423,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_FireShell,
     .fullDescMsg = MSG_PartnerDesc_Kooper_Pause_FireShell,
     .shortDescMsg = MSG_PartnerDesc_Kooper_Battle_FireShell,
-    .flags = MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_8000,
+    .flags = TARGET_FLAG_4 | TARGET_FLAG_8000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_4,
     .costFP = 5,
@@ -1433,7 +1433,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_BodySlam1,
     .fullDescMsg = MSG_PartnerDesc_Bombette_Pause_BodySlam1,
     .shortDescMsg = MSG_PartnerDesc_Bombette_Battle_BodySlam,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_2000 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_2000 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_15,
     .costFP = 0,
@@ -1443,7 +1443,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_BodySlam2,
     .fullDescMsg = MSG_PartnerDesc_Bombette_Pause_BodySlam2,
     .shortDescMsg = MSG_PartnerDesc_Bombette_Battle_BodySlam,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_2000 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_2000 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_15,
     .costFP = 0,
@@ -1453,7 +1453,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_BodySlam3,
     .fullDescMsg = MSG_PartnerDesc_Bombette_Pause_BodySlam3,
     .shortDescMsg = MSG_PartnerDesc_Bombette_Battle_BodySlam,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_2000 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_2000 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_15,
     .costFP = 0,
@@ -1463,7 +1463,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_Bomb,
     .fullDescMsg = MSG_PartnerDesc_Bombette_Pause_Bomb,
     .shortDescMsg = MSG_PartnerDesc_Bombette_Battle_Bomb,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_2000 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_4 | TARGET_FLAG_2000 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_3,
     .costFP = 3,
@@ -1473,7 +1473,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_PowerBomb,
     .fullDescMsg = MSG_PartnerDesc_Bombette_Pause_PowerBomb,
     .shortDescMsg = MSG_PartnerDesc_Bombette_Battle_PowerBomb,
-    .flags = MOVE_DATA_FLAG_4 | MOVE_DATA_FLAG_8000,
+    .flags = TARGET_FLAG_4 | TARGET_FLAG_8000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_3,
     .costFP = 6,
@@ -1483,7 +1483,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_MegaBomb,
     .fullDescMsg = MSG_PartnerDesc_Bombette_Pause_MegaBomb,
     .shortDescMsg = MSG_PartnerDesc_Bombette_Battle_MegaBomb,
-    .flags = MOVE_DATA_FLAG_2 | MOVE_DATA_FLAG_8000,
+    .flags = TARGET_FLAG_2 | TARGET_FLAG_8000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_3,
     .costFP = 8,
@@ -1493,7 +1493,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_SkyDive1,
     .fullDescMsg = MSG_PartnerDesc_Parakarry_Pause_SkyDive1,
     .shortDescMsg = MSG_PartnerDesc_Parakarry_Battle_SkyDive,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_2 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_2 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 0,
@@ -1503,7 +1503,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_SkyDive2,
     .fullDescMsg = MSG_PartnerDesc_Parakarry_Pause_SkyDive2,
     .shortDescMsg = MSG_PartnerDesc_Parakarry_Battle_SkyDive,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_2 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_2 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 0,
@@ -1513,7 +1513,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_SkyDive3,
     .fullDescMsg = MSG_PartnerDesc_Parakarry_Pause_SkyDive3,
     .shortDescMsg = MSG_PartnerDesc_Parakarry_Battle_SkyDive,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_2 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_2 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 0,
@@ -1523,7 +1523,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_ShellShot,
     .fullDescMsg = MSG_PartnerDesc_Parakarry_Pause_ShellShot,
     .shortDescMsg = MSG_PartnerDesc_Parakarry_Battle_ShellShot,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_2 | MOVE_DATA_FLAG_10000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_2 | TARGET_FLAG_10000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_5,
     .costFP = 3,
@@ -1533,7 +1533,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_AirLift,
     .fullDescMsg = MSG_PartnerDesc_Parakarry_Pause_AirLift,
     .shortDescMsg = MSG_PartnerDesc_Parakarry_Battle_AirLift,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_2 | MOVE_DATA_FLAG_400 | MOVE_DATA_FLAG_8000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_2 | TARGET_FLAG_400 | TARGET_FLAG_8000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_3,
     .costFP = 3,
@@ -1543,7 +1543,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_AirRaid,
     .fullDescMsg = MSG_PartnerDesc_Parakarry_Pause_AirRaid,
     .shortDescMsg = MSG_PartnerDesc_Parakarry_Battle_AirRaid,
-    .flags = MOVE_DATA_FLAG_2 | MOVE_DATA_FLAG_8000,
+    .flags = TARGET_FLAG_2 | TARGET_FLAG_8000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_4,
     .costFP = 6,
@@ -1553,7 +1553,7 @@ MoveData gMoveTable[] = {
     .nameMsg = (s32) "ひとりぼけ",
     .fullDescMsg = 0,
     .shortDescMsg = 0,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_2,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 0,
@@ -1563,7 +1563,7 @@ MoveData gMoveTable[] = {
     .nameMsg = (s32) "ひとりぼけ",
     .fullDescMsg = 0,
     .shortDescMsg = 0,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_2,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 0,
@@ -1573,7 +1573,7 @@ MoveData gMoveTable[] = {
     .nameMsg = (s32) "ひとりぼけ",
     .fullDescMsg = 0,
     .shortDescMsg = 0,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_2,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 0,
@@ -1583,7 +1583,7 @@ MoveData gMoveTable[] = {
     .nameMsg = (s32) "むにゃむにゃ",
     .fullDescMsg = 0,
     .shortDescMsg = 0,
-    .flags = MOVE_DATA_FLAG_4,
+    .flags = TARGET_FLAG_4,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 0,
@@ -1593,7 +1593,7 @@ MoveData gMoveTable[] = {
     .nameMsg = (s32) "せっきょう",
     .fullDescMsg = 0,
     .shortDescMsg = 0,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_2,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 0,
@@ -1603,7 +1603,7 @@ MoveData gMoveTable[] = {
     .nameMsg = (s32) "かくせい",
     .fullDescMsg = 0,
     .shortDescMsg = 0,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_2,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_0,
     .costFP = 0,
@@ -1613,7 +1613,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_ElectroDash1,
     .fullDescMsg = MSG_PartnerDesc_Watt_Pause_ElectroDash1,
     .shortDescMsg = MSG_PartnerDesc_Watt_Battle_ElectroDash,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_2,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_15,
     .costFP = 0,
@@ -1623,7 +1623,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_ElectroDash2,
     .fullDescMsg = MSG_PartnerDesc_Watt_Pause_ElectroDash2,
     .shortDescMsg = MSG_PartnerDesc_Watt_Battle_ElectroDash,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_2,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_15,
     .costFP = 0,
@@ -1633,7 +1633,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_ElectroDash3,
     .fullDescMsg = MSG_PartnerDesc_Watt_Pause_ElectroDash3,
     .shortDescMsg = MSG_PartnerDesc_Watt_Battle_ElectroDash,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_2,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_15,
     .costFP = 0,
@@ -1643,7 +1643,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_PowerShock,
     .fullDescMsg = MSG_PartnerDesc_Watt_Pause_PowerShock,
     .shortDescMsg = MSG_PartnerDesc_Watt_Battle_PowerShock,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_2,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_3,
     .costFP = 2,
@@ -1653,7 +1653,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_TurboCharge,
     .fullDescMsg = MSG_PartnerDesc_Watt_Pause_TurboCharge,
     .shortDescMsg = MSG_PartnerDesc_Watt_Battle_TurboCharge,
-    .flags = MOVE_DATA_FLAG_TARGET_PLAYER,
+    .flags = TARGET_FLAG_PLAYER,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_10,
     .costFP = 3,
@@ -1663,7 +1663,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_MegaShock,
     .fullDescMsg = MSG_PartnerDesc_Watt_Pause_MegaShock,
     .shortDescMsg = MSG_PartnerDesc_Watt_Battle_MegaShock,
-    .flags = MOVE_DATA_FLAG_2 | MOVE_DATA_FLAG_8000,
+    .flags = TARGET_FLAG_2 | TARGET_FLAG_8000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_12,
     .costFP = 5,
@@ -1673,7 +1673,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_BellyFlop1,
     .fullDescMsg = MSG_PartnerDesc_Sushie_Pause_BellyFlop1,
     .shortDescMsg = MSG_PartnerDesc_Sushie_Battle_BellyFlop,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 0,
@@ -1683,7 +1683,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_BellyFlop2,
     .fullDescMsg = MSG_PartnerDesc_Sushie_Pause_BellyFlop2,
     .shortDescMsg = MSG_PartnerDesc_Sushie_Battle_BellyFlop,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 0,
@@ -1693,7 +1693,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_BellyFlop3,
     .fullDescMsg = MSG_PartnerDesc_Sushie_Pause_BellyFlop3,
     .shortDescMsg = MSG_PartnerDesc_Sushie_Battle_BellyFlop,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_80 | MOVE_DATA_FLAG_800 | MOVE_DATA_FLAG_4000 | MOVE_DATA_FLAG_10000 | MOVE_DATA_FLAG_40000,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_80 | TARGET_FLAG_800 | TARGET_FLAG_4000 | TARGET_FLAG_10000 | TARGET_FLAG_40000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_1,
     .costFP = 0,
@@ -1703,7 +1703,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_Squirt,
     .fullDescMsg = MSG_PartnerDesc_Sushie_Pause_Squirt,
     .shortDescMsg = MSG_PartnerDesc_Sushie_Battle_Squirt,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_2,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_14,
     .costFP = 3,
@@ -1713,7 +1713,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_WaterBlock,
     .fullDescMsg = MSG_PartnerDesc_Sushie_Pause_WaterBlock,
     .shortDescMsg = MSG_PartnerDesc_Sushie_Battle_WaterBlock,
-    .flags = MOVE_DATA_FLAG_TARGET_PLAYER,
+    .flags = TARGET_FLAG_PLAYER,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_10,
     .costFP = 3,
@@ -1723,7 +1723,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_TidalWave,
     .fullDescMsg = MSG_PartnerDesc_Sushie_Pause_TidalWave,
     .shortDescMsg = MSG_PartnerDesc_Sushie_Battle_TidalWave,
-    .flags = MOVE_DATA_FLAG_2 | MOVE_DATA_FLAG_8000,
+    .flags = TARGET_FLAG_2 | TARGET_FLAG_8000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_8,
     .costFP = 6,
@@ -1733,7 +1733,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_SpinyFlip1,
     .fullDescMsg = MSG_PartnerDesc_Lakilester_Pause_SpinyFlip1,
     .shortDescMsg = MSG_PartnerDesc_Lakilester_Battle_SpinyFlip,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_2,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_16,
     .costFP = 0,
@@ -1743,7 +1743,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_SpinyFlip2,
     .fullDescMsg = MSG_PartnerDesc_Lakilester_Pause_SpinyFlip2,
     .shortDescMsg = MSG_PartnerDesc_Lakilester_Battle_SpinyFlip,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_2,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_16,
     .costFP = 0,
@@ -1753,7 +1753,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_SpinyFlip3,
     .fullDescMsg = MSG_PartnerDesc_Lakilester_Pause_SpinyFlip3,
     .shortDescMsg = MSG_PartnerDesc_Lakilester_Battle_SpinyFlip,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_2,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_16,
     .costFP = 0,
@@ -1763,7 +1763,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_SpinySurge,
     .fullDescMsg = MSG_PartnerDesc_Lakilester_Pause_SpinySurge,
     .shortDescMsg = MSG_PartnerDesc_Lakilester_Battle_SpinySurge,
-    .flags = MOVE_DATA_FLAG_2 | MOVE_DATA_FLAG_8000,
+    .flags = TARGET_FLAG_2 | TARGET_FLAG_8000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_4,
     .costFP = 4,
@@ -1773,7 +1773,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_CloudNine,
     .fullDescMsg = MSG_PartnerDesc_Lakilester_Pause_CloudNine,
     .shortDescMsg = MSG_PartnerDesc_Lakilester_Battle_CloudNine,
-    .flags = MOVE_DATA_FLAG_TARGET_PLAYER,
+    .flags = TARGET_FLAG_PLAYER,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_10,
     .costFP = 4,
@@ -1783,7 +1783,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_Hurricane,
     .fullDescMsg = MSG_PartnerDesc_Lakilester_Pause_Hurricane,
     .shortDescMsg = MSG_PartnerDesc_Lakilester_Battle_Hurricane,
-    .flags = MOVE_DATA_FLAG_2 | MOVE_DATA_FLAG_8000,
+    .flags = TARGET_FLAG_2 | TARGET_FLAG_8000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_12,
     .costFP = 5,
@@ -1793,7 +1793,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_Smack1,
     .fullDescMsg = MSG_PartnerDesc_Bow_Pause_Smack1,
     .shortDescMsg = MSG_PartnerDesc_Bow_Battle_Smack,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_2,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_4,
     .costFP = 0,
@@ -1803,7 +1803,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_Smack2,
     .fullDescMsg = MSG_PartnerDesc_Bow_Pause_Smack2,
     .shortDescMsg = MSG_PartnerDesc_Bow_Battle_Smack,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_2,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_4,
     .costFP = 0,
@@ -1813,7 +1813,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_Smack3,
     .fullDescMsg = MSG_PartnerDesc_Bow_Pause_Smack3,
     .shortDescMsg = MSG_PartnerDesc_Bow_Battle_Smack,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_2,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_4,
     .costFP = 0,
@@ -1823,7 +1823,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_OuttaSight,
     .fullDescMsg = MSG_PartnerDesc_Bow_Pause_OuttaSight,
     .shortDescMsg = MSG_PartnerDesc_Bow_Battle_OuttaSight,
-    .flags = MOVE_DATA_FLAG_TARGET_PLAYER,
+    .flags = TARGET_FLAG_PLAYER,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_NONE,
     .costFP = 2,
@@ -1833,7 +1833,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_Spook,
     .fullDescMsg = MSG_PartnerDesc_Bow_Pause_Spook,
     .shortDescMsg = MSG_PartnerDesc_Bow_Battle_Spook,
-    .flags = MOVE_DATA_FLAG_2 | MOVE_DATA_FLAG_8000,
+    .flags = TARGET_FLAG_2 | TARGET_FLAG_8000,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_4,
     .costFP = 3,
@@ -1843,7 +1843,7 @@ MoveData gMoveTable[] = {
     .nameMsg = MSG_PartnerMoveName_FanSmack,
     .fullDescMsg = MSG_PartnerDesc_Bow_Pause_FanSmack,
     .shortDescMsg = MSG_PartnerDesc_Bow_Battle_FanSmack,
-    .flags = MOVE_DATA_FLAG_SINGLE_TARGET | MOVE_DATA_FLAG_2,
+    .flags = TARGET_FLAG_ENEMY | TARGET_FLAG_2,
     .category = MOVE_TYPE_PARTNER,
     .actionTip = MOVE_ACTION_TIP_4,
     .costFP = 5,
diff --git a/ver/us/asm/nonmatchings/190B20/create_target_list.s b/ver/us/asm/nonmatchings/190B20/create_target_list.s
deleted file mode 100644
index 0c84d5102e..0000000000
--- a/ver/us/asm/nonmatchings/190B20/create_target_list.s
+++ /dev/null
@@ -1,1000 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel D_8029D5A0
-.double 0.3
-
-dlabel D_8029D5A8
-.double 0.9
-
-dlabel D_8029D5B0
-.double 0.3
-
-dlabel D_8029D5B8
-.double 0.9
-
-dlabel D_8029D5C0
-.double 0.1
-
-dlabel D_8029D5C8
-.double 0.8
-
-dlabel D_8029D5D0
-.double 0.1
-
-dlabel D_8029D5D8
-.double 0.8
-
-.section .text
-
-glabel create_target_list
-/* 190B20 80262240 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* 190B24 80262244 0080582D */  daddu     $t3, $a0, $zero
-/* 190B28 80262248 AFB5003C */  sw        $s5, 0x3c($sp)
-/* 190B2C 8026224C 0000A82D */  daddu     $s5, $zero, $zero
-/* 190B30 80262250 AFB70044 */  sw        $s7, 0x44($sp)
-/* 190B34 80262254 AFB60040 */  sw        $s6, 0x40($sp)
-/* 190B38 80262258 3C16800E */  lui       $s6, %hi(gBattleStatus)
-/* 190B3C 8026225C 26D6C070 */  addiu     $s6, $s6, %lo(gBattleStatus)
-/* 190B40 80262260 AFBF004C */  sw        $ra, 0x4c($sp)
-/* 190B44 80262264 AFBE0048 */  sw        $fp, 0x48($sp)
-/* 190B48 80262268 AFB40038 */  sw        $s4, 0x38($sp)
-/* 190B4C 8026226C AFB30034 */  sw        $s3, 0x34($sp)
-/* 190B50 80262270 AFB20030 */  sw        $s2, 0x30($sp)
-/* 190B54 80262274 AFB1002C */  sw        $s1, 0x2c($sp)
-/* 190B58 80262278 AFB00028 */  sw        $s0, 0x28($sp)
-/* 190B5C 8026227C AFA00018 */  sw        $zero, 0x18($sp)
-/* 190B60 80262280 8EC300D8 */  lw        $v1, 0xd8($s6)
-/* 190B64 80262284 8EC20184 */  lw        $v0, 0x184($s6)
-/* 190B68 80262288 8EC400DC */  lw        $a0, 0xdc($s6)
-/* 190B6C 8026228C 04410004 */  bgez      $v0, .L802622A0
-/* 190B70 80262290 2577022C */   addiu    $s7, $t3, 0x22c
-/* 190B74 80262294 2402FFFF */  addiu     $v0, $zero, -1
-/* 190B78 80262298 08098BFF */  j         .L80262FFC
-/* 190B7C 8026229C A162040C */   sb       $v0, 0x40c($t3)
-.L802622A0:
-/* 190B80 802622A0 30420008 */  andi      $v0, $v0, 8
-/* 190B84 802622A4 1040005B */  beqz      $v0, .L80262414
-/* 190B88 802622A8 24020001 */   addiu    $v0, $zero, 1
-/* 190B8C 802622AC A560022C */  sh        $zero, 0x22c($t3)
-/* 190B90 802622B0 14A00029 */  bnez      $a1, .L80262358
-/* 190B94 802622B4 A562022E */   sh       $v0, 0x22e($t3)
-/* 190B98 802622B8 90620190 */  lbu       $v0, 0x190($v1)
-/* 190B9C 802622BC 3C01802A */  lui       $at, %hi(D_8029D5A0)
-/* 190BA0 802622C0 D420D5A0 */  ldc1      $f0, %lo(D_8029D5A0)($at)
-/* 190BA4 802622C4 44821000 */  mtc1      $v0, $f2
-/* 190BA8 802622C8 00000000 */  nop
-/* 190BAC 802622CC 468010A1 */  cvt.d.w   $f2, $f2
-/* 190BB0 802622D0 46201082 */  mul.d     $f2, $f2, $f0
-/* 190BB4 802622D4 00000000 */  nop
-/* 190BB8 802622D8 C4600188 */  lwc1      $f0, 0x188($v1)
-/* 190BBC 802622DC 46000021 */  cvt.d.s   $f0, $f0
-/* 190BC0 802622E0 46201082 */  mul.d     $f2, $f2, $f0
-/* 190BC4 802622E4 00000000 */  nop
-/* 190BC8 802622E8 C4600144 */  lwc1      $f0, 0x144($v1)
-/* 190BCC 802622EC 46000021 */  cvt.d.s   $f0, $f0
-/* 190BD0 802622F0 46220000 */  add.d     $f0, $f0, $f2
-/* 190BD4 802622F4 4620048D */  trunc.w.d $f18, $f0
-/* 190BD8 802622F8 44029000 */  mfc1      $v0, $f18
-/* 190BDC 802622FC 00000000 */  nop
-/* 190BE0 80262300 A5620230 */  sh        $v0, 0x230($t3)
-/* 190BE4 80262304 90620191 */  lbu       $v0, 0x191($v1)
-/* 190BE8 80262308 3C01802A */  lui       $at, %hi(D_8029D5A8)
-/* 190BEC 8026230C D420D5A8 */  ldc1      $f0, %lo(D_8029D5A8)($at)
-/* 190BF0 80262310 44821000 */  mtc1      $v0, $f2
-/* 190BF4 80262314 00000000 */  nop
-/* 190BF8 80262318 468010A1 */  cvt.d.w   $f2, $f2
-/* 190BFC 8026231C 46201082 */  mul.d     $f2, $f2, $f0
-/* 190C00 80262320 00000000 */  nop
-/* 190C04 80262324 C4600188 */  lwc1      $f0, 0x188($v1)
-/* 190C08 80262328 46000021 */  cvt.d.s   $f0, $f0
-/* 190C0C 8026232C 46201082 */  mul.d     $f2, $f2, $f0
-/* 190C10 80262330 00000000 */  nop
-/* 190C14 80262334 C4600148 */  lwc1      $f0, 0x148($v1)
-/* 190C18 80262338 46000021 */  cvt.d.s   $f0, $f0
-/* 190C1C 8026233C 46220000 */  add.d     $f0, $f0, $f2
-/* 190C20 80262340 4620048D */  trunc.w.d $f18, $f0
-/* 190C24 80262344 44029000 */  mfc1      $v0, $f18
-/* 190C28 80262348 00000000 */  nop
-/* 190C2C 8026234C A5620232 */  sh        $v0, 0x232($t3)
-/* 190C30 80262350 080988FD */  j         .L802623F4
-/* 190C34 80262354 C460014C */   lwc1     $f0, 0x14c($v1)
-.L80262358:
-/* 190C38 80262358 90620190 */  lbu       $v0, 0x190($v1)
-/* 190C3C 8026235C 3C01802A */  lui       $at, %hi(D_8029D5B0)
-/* 190C40 80262360 D420D5B0 */  ldc1      $f0, %lo(D_8029D5B0)($at)
-/* 190C44 80262364 44821000 */  mtc1      $v0, $f2
-/* 190C48 80262368 00000000 */  nop
-/* 190C4C 8026236C 468010A1 */  cvt.d.w   $f2, $f2
-/* 190C50 80262370 46201082 */  mul.d     $f2, $f2, $f0
-/* 190C54 80262374 00000000 */  nop
-/* 190C58 80262378 C4600188 */  lwc1      $f0, 0x188($v1)
-/* 190C5C 8026237C 46000021 */  cvt.d.s   $f0, $f0
-/* 190C60 80262380 46201082 */  mul.d     $f2, $f2, $f0
-/* 190C64 80262384 00000000 */  nop
-/* 190C68 80262388 C4600138 */  lwc1      $f0, 0x138($v1)
-/* 190C6C 8026238C 46000021 */  cvt.d.s   $f0, $f0
-/* 190C70 80262390 46220000 */  add.d     $f0, $f0, $f2
-/* 190C74 80262394 4620048D */  trunc.w.d $f18, $f0
-/* 190C78 80262398 44029000 */  mfc1      $v0, $f18
-/* 190C7C 8026239C 00000000 */  nop
-/* 190C80 802623A0 A5620230 */  sh        $v0, 0x230($t3)
-/* 190C84 802623A4 90620191 */  lbu       $v0, 0x191($v1)
-/* 190C88 802623A8 3C01802A */  lui       $at, %hi(D_8029D5B8)
-/* 190C8C 802623AC D420D5B8 */  ldc1      $f0, %lo(D_8029D5B8)($at)
-/* 190C90 802623B0 44821000 */  mtc1      $v0, $f2
-/* 190C94 802623B4 00000000 */  nop
-/* 190C98 802623B8 468010A1 */  cvt.d.w   $f2, $f2
-/* 190C9C 802623BC 46201082 */  mul.d     $f2, $f2, $f0
-/* 190CA0 802623C0 00000000 */  nop
-/* 190CA4 802623C4 C4600188 */  lwc1      $f0, 0x188($v1)
-/* 190CA8 802623C8 46000021 */  cvt.d.s   $f0, $f0
-/* 190CAC 802623CC 46201082 */  mul.d     $f2, $f2, $f0
-/* 190CB0 802623D0 00000000 */  nop
-/* 190CB4 802623D4 C460013C */  lwc1      $f0, 0x13c($v1)
-/* 190CB8 802623D8 46000021 */  cvt.d.s   $f0, $f0
-/* 190CBC 802623DC 46220000 */  add.d     $f0, $f0, $f2
-/* 190CC0 802623E0 4620048D */  trunc.w.d $f18, $f0
-/* 190CC4 802623E4 44029000 */  mfc1      $v0, $f18
-/* 190CC8 802623E8 00000000 */  nop
-/* 190CCC 802623EC A5620232 */  sh        $v0, 0x232($t3)
-/* 190CD0 802623F0 C4600140 */  lwc1      $f0, 0x140($v1)
-.L802623F4:
-/* 190CD4 802623F4 4600048D */  trunc.w.s $f18, $f0
-/* 190CD8 802623F8 44029000 */  mfc1      $v0, $f18
-/* 190CDC 802623FC 00000000 */  nop
-/* 190CE0 80262400 A5620234 */  sh        $v0, 0x234($t3)
-/* 190CE4 80262404 2402FF9C */  addiu     $v0, $zero, -0x64
-/* 190CE8 80262408 A2E20010 */  sb        $v0, 0x10($s7)
-/* 190CEC 8026240C 26B50001 */  addiu     $s5, $s5, 1
-/* 190CF0 80262410 26F70014 */  addiu     $s7, $s7, 0x14
-.L80262414:
-/* 190CF4 80262414 8EC20184 */  lw        $v0, 0x184($s6)
-/* 190CF8 80262418 30420100 */  andi      $v0, $v0, 0x100
-/* 190CFC 8026241C 1040005F */  beqz      $v0, .L8026259C
-/* 190D00 80262420 0000982D */   daddu    $s3, $zero, $zero
-/* 190D04 80262424 1080005D */  beqz      $a0, .L8026259C
-/* 190D08 80262428 24020100 */   addiu    $v0, $zero, 0x100
-/* 190D0C 8026242C A6E20000 */  sh        $v0, ($s7)
-/* 190D10 80262430 24020001 */  addiu     $v0, $zero, 1
-/* 190D14 80262434 14A00029 */  bnez      $a1, .L802624DC
-/* 190D18 80262438 A6E20002 */   sh       $v0, 2($s7)
-/* 190D1C 8026243C 90820190 */  lbu       $v0, 0x190($a0)
-/* 190D20 80262440 3C01802A */  lui       $at, %hi(D_8029D5C0)
-/* 190D24 80262444 D420D5C0 */  ldc1      $f0, %lo(D_8029D5C0)($at)
-/* 190D28 80262448 44821000 */  mtc1      $v0, $f2
-/* 190D2C 8026244C 00000000 */  nop
-/* 190D30 80262450 468010A1 */  cvt.d.w   $f2, $f2
-/* 190D34 80262454 46201082 */  mul.d     $f2, $f2, $f0
-/* 190D38 80262458 00000000 */  nop
-/* 190D3C 8026245C C4800188 */  lwc1      $f0, 0x188($a0)
-/* 190D40 80262460 46000021 */  cvt.d.s   $f0, $f0
-/* 190D44 80262464 46201082 */  mul.d     $f2, $f2, $f0
-/* 190D48 80262468 00000000 */  nop
-/* 190D4C 8026246C C4800144 */  lwc1      $f0, 0x144($a0)
-/* 190D50 80262470 46000021 */  cvt.d.s   $f0, $f0
-/* 190D54 80262474 46220000 */  add.d     $f0, $f0, $f2
-/* 190D58 80262478 4620048D */  trunc.w.d $f18, $f0
-/* 190D5C 8026247C 44029000 */  mfc1      $v0, $f18
-/* 190D60 80262480 00000000 */  nop
-/* 190D64 80262484 A6E20004 */  sh        $v0, 4($s7)
-/* 190D68 80262488 90820191 */  lbu       $v0, 0x191($a0)
-/* 190D6C 8026248C 3C01802A */  lui       $at, %hi(D_8029D5C8)
-/* 190D70 80262490 D420D5C8 */  ldc1      $f0, %lo(D_8029D5C8)($at)
-/* 190D74 80262494 44821000 */  mtc1      $v0, $f2
-/* 190D78 80262498 00000000 */  nop
-/* 190D7C 8026249C 468010A1 */  cvt.d.w   $f2, $f2
-/* 190D80 802624A0 46201082 */  mul.d     $f2, $f2, $f0
-/* 190D84 802624A4 00000000 */  nop
-/* 190D88 802624A8 C4800188 */  lwc1      $f0, 0x188($a0)
-/* 190D8C 802624AC 46000021 */  cvt.d.s   $f0, $f0
-/* 190D90 802624B0 46201082 */  mul.d     $f2, $f2, $f0
-/* 190D94 802624B4 00000000 */  nop
-/* 190D98 802624B8 C4800148 */  lwc1      $f0, 0x148($a0)
-/* 190D9C 802624BC 46000021 */  cvt.d.s   $f0, $f0
-/* 190DA0 802624C0 46220000 */  add.d     $f0, $f0, $f2
-/* 190DA4 802624C4 4620048D */  trunc.w.d $f18, $f0
-/* 190DA8 802624C8 44029000 */  mfc1      $v0, $f18
-/* 190DAC 802624CC 00000000 */  nop
-/* 190DB0 802624D0 A6E20006 */  sh        $v0, 6($s7)
-/* 190DB4 802624D4 0809895E */  j         .L80262578
-/* 190DB8 802624D8 C480014C */   lwc1     $f0, 0x14c($a0)
-.L802624DC:
-/* 190DBC 802624DC 90820190 */  lbu       $v0, 0x190($a0)
-/* 190DC0 802624E0 3C01802A */  lui       $at, %hi(D_8029D5D0)
-/* 190DC4 802624E4 D420D5D0 */  ldc1      $f0, %lo(D_8029D5D0)($at)
-/* 190DC8 802624E8 44821000 */  mtc1      $v0, $f2
-/* 190DCC 802624EC 00000000 */  nop
-/* 190DD0 802624F0 468010A1 */  cvt.d.w   $f2, $f2
-/* 190DD4 802624F4 46201082 */  mul.d     $f2, $f2, $f0
-/* 190DD8 802624F8 00000000 */  nop
-/* 190DDC 802624FC C4800188 */  lwc1      $f0, 0x188($a0)
-/* 190DE0 80262500 46000021 */  cvt.d.s   $f0, $f0
-/* 190DE4 80262504 46201082 */  mul.d     $f2, $f2, $f0
-/* 190DE8 80262508 00000000 */  nop
-/* 190DEC 8026250C C4800138 */  lwc1      $f0, 0x138($a0)
-/* 190DF0 80262510 46000021 */  cvt.d.s   $f0, $f0
-/* 190DF4 80262514 46220000 */  add.d     $f0, $f0, $f2
-/* 190DF8 80262518 4620048D */  trunc.w.d $f18, $f0
-/* 190DFC 8026251C 44029000 */  mfc1      $v0, $f18
-/* 190E00 80262520 00000000 */  nop
-/* 190E04 80262524 A6E20004 */  sh        $v0, 4($s7)
-/* 190E08 80262528 90820191 */  lbu       $v0, 0x191($a0)
-/* 190E0C 8026252C 3C01802A */  lui       $at, %hi(D_8029D5D8)
-/* 190E10 80262530 D420D5D8 */  ldc1      $f0, %lo(D_8029D5D8)($at)
-/* 190E14 80262534 44821000 */  mtc1      $v0, $f2
-/* 190E18 80262538 00000000 */  nop
-/* 190E1C 8026253C 468010A1 */  cvt.d.w   $f2, $f2
-/* 190E20 80262540 46201082 */  mul.d     $f2, $f2, $f0
-/* 190E24 80262544 00000000 */  nop
-/* 190E28 80262548 C4800188 */  lwc1      $f0, 0x188($a0)
-/* 190E2C 8026254C 46000021 */  cvt.d.s   $f0, $f0
-/* 190E30 80262550 46201082 */  mul.d     $f2, $f2, $f0
-/* 190E34 80262554 00000000 */  nop
-/* 190E38 80262558 C480013C */  lwc1      $f0, 0x13c($a0)
-/* 190E3C 8026255C 46000021 */  cvt.d.s   $f0, $f0
-/* 190E40 80262560 46220000 */  add.d     $f0, $f0, $f2
-/* 190E44 80262564 4620048D */  trunc.w.d $f18, $f0
-/* 190E48 80262568 44029000 */  mfc1      $v0, $f18
-/* 190E4C 8026256C 00000000 */  nop
-/* 190E50 80262570 A6E20006 */  sh        $v0, 6($s7)
-/* 190E54 80262574 C4800140 */  lwc1      $f0, 0x140($a0)
-.L80262578:
-/* 190E58 80262578 4600048D */  trunc.w.s $f18, $f0
-/* 190E5C 8026257C 44029000 */  mfc1      $v0, $f18
-/* 190E60 80262580 00000000 */  nop
-/* 190E64 80262584 A6E20008 */  sh        $v0, 8($s7)
-/* 190E68 80262588 2402FFCE */  addiu     $v0, $zero, -0x32
-/* 190E6C 8026258C A2E20010 */  sb        $v0, 0x10($s7)
-/* 190E70 80262590 26B50001 */  addiu     $s5, $s5, 1
-/* 190E74 80262594 26F70014 */  addiu     $s7, $s7, 0x14
-/* 190E78 80262598 0000982D */  daddu     $s3, $zero, $zero
-.L8026259C:
-/* 190E7C 8026259C 3C0140A0 */  lui       $at, 0x40a0
-/* 190E80 802625A0 44818000 */  mtc1      $at, $f16
-/* 190E84 802625A4 240A0001 */  addiu     $t2, $zero, 1
-/* 190E88 802625A8 240D0002 */  addiu     $t5, $zero, 2
-/* 190E8C 802625AC 24090003 */  addiu     $t1, $zero, 3
-/* 190E90 802625B0 02C0602D */  daddu     $t4, $s6, $zero
-.L802625B4:
-/* 190E94 802625B4 8D9200E0 */  lw        $s2, 0xe0($t4)
-/* 190E98 802625B8 524000B6 */  beql      $s2, $zero, .L80262894
-/* 190E9C 802625BC 26730001 */   addiu    $s3, $s3, 1
-/* 190EA0 802625C0 8EC20184 */  lw        $v0, 0x184($s6)
-/* 190EA4 802625C4 30420108 */  andi      $v0, $v0, 0x108
-/* 190EA8 802625C8 544000B6 */  bnel      $v0, $zero, .L802628A4
-/* 190EAC 802625CC A1600425 */   sb       $zero, 0x425($t3)
-/* 190EB0 802625D0 824801F3 */  lb        $t0, 0x1f3($s2)
-/* 190EB4 802625D4 8E5101F4 */  lw        $s1, 0x1f4($s2)
-/* 190EB8 802625D8 190000AD */  blez      $t0, .L80262890
-/* 190EBC 802625DC 0000382D */   daddu    $a3, $zero, $zero
-/* 190EC0 802625E0 26E60013 */  addiu     $a2, $s7, 0x13
-.L802625E4:
-/* 190EC4 802625E4 8E230000 */  lw        $v1, ($s1)
-/* 190EC8 802625E8 3C020002 */  lui       $v0, 2
-/* 190ECC 802625EC 00621024 */  and       $v0, $v1, $v0
-/* 190ED0 802625F0 144000A2 */  bnez      $v0, .L8026287C
-/* 190ED4 802625F4 3C020010 */   lui      $v0, 0x10
-/* 190ED8 802625F8 8E240008 */  lw        $a0, 8($s1)
-/* 190EDC 802625FC 00621024 */  and       $v0, $v1, $v0
-/* 190EE0 80262600 14400036 */  bnez      $v0, .L802626DC
-/* 190EE4 80262604 00000000 */   nop
-/* 190EE8 80262608 14A00005 */  bnez      $a1, .L80262620
-/* 190EEC 8026260C 00000000 */   nop
-/* 190EF0 80262610 C6460144 */  lwc1      $f6, 0x144($s2)
-/* 190EF4 80262614 C6480148 */  lwc1      $f8, 0x148($s2)
-/* 190EF8 80262618 0809898B */  j         .L8026262C
-/* 190EFC 8026261C C64A014C */   lwc1     $f10, 0x14c($s2)
-.L80262620:
-/* 190F00 80262620 C6460138 */  lwc1      $f6, 0x138($s2)
-/* 190F04 80262624 C648013C */  lwc1      $f8, 0x13c($s2)
-/* 190F08 80262628 C64A0140 */  lwc1      $f10, 0x140($s2)
-.L8026262C:
-/* 190F0C 8026262C 86220014 */  lh        $v0, 0x14($s1)
-/* 190F10 80262630 C6440188 */  lwc1      $f4, 0x188($s2)
-/* 190F14 80262634 44820000 */  mtc1      $v0, $f0
-/* 190F18 80262638 00000000 */  nop
-/* 190F1C 8026263C 46800020 */  cvt.s.w   $f0, $f0
-/* 190F20 80262640 46040002 */  mul.s     $f0, $f0, $f4
-/* 190F24 80262644 00000000 */  nop
-/* 190F28 80262648 8E420000 */  lw        $v0, ($s2)
-/* 190F2C 8026264C 30430800 */  andi      $v1, $v0, 0x800
-/* 190F30 80262650 14600008 */  bnez      $v1, .L80262674
-/* 190F34 80262654 46003180 */   add.s    $f6, $f6, $f0
-/* 190F38 80262658 86220016 */  lh        $v0, 0x16($s1)
-/* 190F3C 8026265C 44820000 */  mtc1      $v0, $f0
-/* 190F40 80262660 00000000 */  nop
-/* 190F44 80262664 46800020 */  cvt.s.w   $f0, $f0
-/* 190F48 80262668 46040002 */  mul.s     $f0, $f0, $f4
-/* 190F4C 8026266C 00000000 */  nop
-/* 190F50 80262670 46004200 */  add.s     $f8, $f8, $f0
-.L80262674:
-/* 190F54 80262674 86220018 */  lh        $v0, 0x18($s1)
-/* 190F58 80262678 44821000 */  mtc1      $v0, $f2
-/* 190F5C 8026267C 00000000 */  nop
-/* 190F60 80262680 468010A0 */  cvt.s.w   $f2, $f2
-/* 190F64 80262684 46041082 */  mul.s     $f2, $f2, $f4
-/* 190F68 80262688 00000000 */  nop
-/* 190F6C 8026268C 8622006C */  lh        $v0, 0x6c($s1)
-/* 190F70 80262690 44820000 */  mtc1      $v0, $f0
-/* 190F74 80262694 00000000 */  nop
-/* 190F78 80262698 46800020 */  cvt.s.w   $f0, $f0
-/* 190F7C 8026269C 46040002 */  mul.s     $f0, $f0, $f4
-/* 190F80 802626A0 00000000 */  nop
-/* 190F84 802626A4 46025280 */  add.s     $f10, $f10, $f2
-/* 190F88 802626A8 46003306 */  mov.s     $f12, $f6
-/* 190F8C 802626AC 46006180 */  add.s     $f6, $f12, $f0
-/* 190F90 802626B0 46004086 */  mov.s     $f2, $f8
-/* 190F94 802626B4 1460001B */  bnez      $v1, .L80262724
-/* 190F98 802626B8 46105380 */   add.s    $f14, $f10, $f16
-/* 190F9C 802626BC 8622006E */  lh        $v0, 0x6e($s1)
-/* 190FA0 802626C0 44820000 */  mtc1      $v0, $f0
-/* 190FA4 802626C4 00000000 */  nop
-/* 190FA8 802626C8 46800020 */  cvt.s.w   $f0, $f0
-/* 190FAC 802626CC 46040002 */  mul.s     $f0, $f0, $f4
-/* 190FB0 802626D0 00000000 */  nop
-/* 190FB4 802626D4 080989C9 */  j         .L80262724
-/* 190FB8 802626D8 46001200 */   add.s    $f8, $f2, $f0
-.L802626DC:
-/* 190FBC 802626DC C6280030 */  lwc1      $f8, 0x30($s1)
-/* 190FC0 802626E0 C62A0034 */  lwc1      $f10, 0x34($s1)
-/* 190FC4 802626E4 C62C002C */  lwc1      $f12, 0x2c($s1)
-/* 190FC8 802626E8 8622006C */  lh        $v0, 0x6c($s1)
-/* 190FCC 802626EC 46004086 */  mov.s     $f2, $f8
-/* 190FD0 802626F0 46105380 */  add.s     $f14, $f10, $f16
-/* 190FD4 802626F4 44820000 */  mtc1      $v0, $f0
-/* 190FD8 802626F8 00000000 */  nop
-/* 190FDC 802626FC 46800020 */  cvt.s.w   $f0, $f0
-/* 190FE0 80262700 8E420000 */  lw        $v0, ($s2)
-/* 190FE4 80262704 30420800 */  andi      $v0, $v0, 0x800
-/* 190FE8 80262708 14400006 */  bnez      $v0, .L80262724
-/* 190FEC 8026270C 46006180 */   add.s    $f6, $f12, $f0
-/* 190FF0 80262710 8622006E */  lh        $v0, 0x6e($s1)
-/* 190FF4 80262714 44820000 */  mtc1      $v0, $f0
-/* 190FF8 80262718 00000000 */  nop
-/* 190FFC 8026271C 46800020 */  cvt.s.w   $f0, $f0
-/* 191000 80262720 46001200 */  add.s     $f8, $f2, $f0
-.L80262724:
-/* 191004 80262724 36620200 */  ori       $v0, $s3, 0x200
-/* 191008 80262728 A6E20000 */  sh        $v0, ($s7)
-/* 19100C 8026272C 90830004 */  lbu       $v1, 4($a0)
-/* 191010 80262730 4600348D */  trunc.w.s $f18, $f6
-/* 191014 80262734 44029000 */  mfc1      $v0, $f18
-/* 191018 80262738 00000000 */  nop
-/* 19101C 8026273C A4C2FFF1 */  sh        $v0, -0xf($a2)
-/* 191020 80262740 4600448D */  trunc.w.s $f18, $f8
-/* 191024 80262744 44029000 */  mfc1      $v0, $f18
-/* 191028 80262748 00000000 */  nop
-/* 19102C 8026274C A4C2FFF3 */  sh        $v0, -0xd($a2)
-/* 191030 80262750 4600548D */  trunc.w.s $f18, $f10
-/* 191034 80262754 44029000 */  mfc1      $v0, $f18
-/* 191038 80262758 00000000 */  nop
-/* 19103C 8026275C A4C2FFF5 */  sh        $v0, -0xb($a2)
-/* 191040 80262760 A0C0FFFD */  sb        $zero, -3($a2)
-/* 191044 80262764 00031E00 */  sll       $v1, $v1, 0x18
-/* 191048 80262768 00031E03 */  sra       $v1, $v1, 0x18
-/* 19104C 8026276C A4C3FFEF */  sh        $v1, -0x11($a2)
-/* 191050 80262770 8E420000 */  lw        $v0, ($s2)
-/* 191054 80262774 24034000 */  addiu     $v1, $zero, 0x4000
-/* 191058 80262778 30424010 */  andi      $v0, $v0, 0x4010
-/* 19105C 8026277C 14430002 */  bne       $v0, $v1, .L80262788
-/* 191060 80262780 24020064 */   addiu    $v0, $zero, 0x64
-/* 191064 80262784 A0C2FFFD */  sb        $v0, -3($a2)
-.L80262788:
-/* 191068 80262788 92230071 */  lbu       $v1, 0x71($s1)
-/* 19106C 8026278C 90C4FFFD */  lbu       $a0, -3($a2)
-/* 191070 80262790 4600148D */  trunc.w.s $f18, $f2
-/* 191074 80262794 44029000 */  mfc1      $v0, $f18
-/* 191078 80262798 00000000 */  nop
-/* 19107C 8026279C A4C2FFF9 */  sh        $v0, -7($a2)
-/* 191080 802627A0 4600748D */  trunc.w.s $f18, $f14
-/* 191084 802627A4 44029000 */  mfc1      $v0, $f18
-/* 191088 802627A8 00000000 */  nop
-/* 19108C 802627AC A4C2FFFB */  sh        $v0, -5($a2)
-/* 191090 802627B0 00832021 */  addu      $a0, $a0, $v1
-/* 191094 802627B4 00041E00 */  sll       $v1, $a0, 0x18
-/* 191098 802627B8 00031E03 */  sra       $v1, $v1, 0x18
-/* 19109C 802627BC 00031040 */  sll       $v0, $v1, 1
-/* 1910A0 802627C0 00431021 */  addu      $v0, $v0, $v1
-/* 1910A4 802627C4 000210C0 */  sll       $v0, $v0, 3
-/* 1910A8 802627C8 00431021 */  addu      $v0, $v0, $v1
-/* 1910AC 802627CC 00021080 */  sll       $v0, $v0, 2
-/* 1910B0 802627D0 44820000 */  mtc1      $v0, $f0
-/* 1910B4 802627D4 00000000 */  nop
-/* 1910B8 802627D8 46800020 */  cvt.s.w   $f0, $f0
-/* 1910BC 802627DC 46006000 */  add.s     $f0, $f12, $f0
-/* 1910C0 802627E0 84C3FFF9 */  lh        $v1, -7($a2)
-/* 1910C4 802627E4 A0C4FFFD */  sb        $a0, -3($a2)
-/* 1910C8 802627E8 4600048D */  trunc.w.s $f18, $f0
-/* 1910CC 802627EC 44029000 */  mfc1      $v0, $f18
-/* 1910D0 802627F0 00000000 */  nop
-/* 1910D4 802627F4 A4C2FFF7 */  sh        $v0, -9($a2)
-/* 1910D8 802627F8 28620028 */  slti      $v0, $v1, 0x28
-/* 1910DC 802627FC 10400003 */  beqz      $v0, .L8026280C
-/* 1910E0 80262800 28620055 */   slti     $v0, $v1, 0x55
-/* 1910E4 80262804 08098A0A */  j         .L80262828
-/* 1910E8 80262808 A0C0FFFF */   sb       $zero, -1($a2)
-.L8026280C:
-/* 1910EC 8026280C 10400003 */  beqz      $v0, .L8026281C
-/* 1910F0 80262810 28620064 */   slti     $v0, $v1, 0x64
-/* 1910F4 80262814 08098A0A */  j         .L80262828
-/* 1910F8 80262818 A0CAFFFF */   sb       $t2, -1($a2)
-.L8026281C:
-/* 1910FC 8026281C 50400002 */  beql      $v0, $zero, .L80262828
-/* 191100 80262820 A0C9FFFF */   sb       $t1, -1($a2)
-/* 191104 80262824 A0CDFFFF */  sb        $t5, -1($a2)
-.L80262828:
-/* 191108 80262828 84C3FFF7 */  lh        $v1, -9($a2)
-/* 19110C 8026282C 28620019 */  slti      $v0, $v1, 0x19
-/* 191110 80262830 10400003 */  beqz      $v0, .L80262840
-/* 191114 80262834 28620041 */   slti     $v0, $v1, 0x41
-/* 191118 80262838 08098A17 */  j         .L8026285C
-/* 19111C 8026283C A0C0FFFE */   sb       $zero, -2($a2)
-.L80262840:
-/* 191120 80262840 10400003 */  beqz      $v0, .L80262850
-/* 191124 80262844 28620069 */   slti     $v0, $v1, 0x69
-/* 191128 80262848 08098A17 */  j         .L8026285C
-/* 19112C 8026284C A0CAFFFE */   sb       $t2, -2($a2)
-.L80262850:
-/* 191130 80262850 50400002 */  beql      $v0, $zero, .L8026285C
-/* 191134 80262854 A0C9FFFE */   sb       $t1, -2($a2)
-/* 191138 80262858 A0CDFFFE */  sb        $t5, -2($a2)
-.L8026285C:
-/* 19113C 8026285C 84C2FFFB */  lh        $v0, -5($a2)
-/* 191140 80262860 2842FFE2 */  slti      $v0, $v0, -0x1e
-/* 191144 80262864 50400002 */  beql      $v0, $zero, .L80262870
-/* 191148 80262868 A0CA0000 */   sb       $t2, ($a2)
-/* 19114C 8026286C A0C00000 */  sb        $zero, ($a2)
-.L80262870:
-/* 191150 80262870 26B50001 */  addiu     $s5, $s5, 1
-/* 191154 80262874 24C60014 */  addiu     $a2, $a2, 0x14
-/* 191158 80262878 26F70014 */  addiu     $s7, $s7, 0x14
-.L8026287C:
-/* 19115C 8026287C 8E31000C */  lw        $s1, 0xc($s1)
-/* 191160 80262880 24E70001 */  addiu     $a3, $a3, 1
-/* 191164 80262884 00E8102A */  slt       $v0, $a3, $t0
-/* 191168 80262888 1440FF56 */  bnez      $v0, .L802625E4
-/* 19116C 8026288C 00000000 */   nop
-.L80262890:
-/* 191170 80262890 26730001 */  addiu     $s3, $s3, 1
-.L80262894:
-/* 191174 80262894 2A620018 */  slti      $v0, $s3, 0x18
-/* 191178 80262898 1440FF46 */  bnez      $v0, .L802625B4
-/* 19117C 8026289C 258C0004 */   addiu    $t4, $t4, 4
-/* 191180 802628A0 A1600425 */  sb        $zero, 0x425($t3)
-.L802628A4:
-/* 191184 802628A4 A175040C */  sb        $s5, 0x40c($t3)
-/* 191188 802628A8 92C30197 */  lbu       $v1, 0x197($s6)
-/* 19118C 802628AC 00031600 */  sll       $v0, $v1, 0x18
-/* 191190 802628B0 00022603 */  sra       $a0, $v0, 0x18
-/* 191194 802628B4 30630004 */  andi      $v1, $v1, 4
-/* 191198 802628B8 04810002 */  bgez      $a0, .L802628C4
-/* 19119C 802628BC AFA3001C */   sw       $v1, 0x1c($sp)
-/* 1911A0 802628C0 24840003 */  addiu     $a0, $a0, 3
-.L802628C4:
-/* 1911A4 802628C4 2577022C */  addiu     $s7, $t3, 0x22c
-/* 1911A8 802628C8 00151600 */  sll       $v0, $s5, 0x18
-/* 1911AC 802628CC 0002AE03 */  sra       $s5, $v0, 0x18
-/* 1911B0 802628D0 0000982D */  daddu     $s3, $zero, $zero
-/* 1911B4 802628D4 1AA0006A */  blez      $s5, .L80262A80
-/* 1911B8 802628D8 0004F083 */   sra      $fp, $a0, 2
-/* 1911BC 802628DC 0260A02D */  daddu     $s4, $s3, $zero
-.L802628E0:
-/* 1911C0 802628E0 02F48021 */  addu      $s0, $s7, $s4
-/* 1911C4 802628E4 86040000 */  lh        $a0, ($s0)
-/* 1911C8 802628E8 0C09A75B */  jal       get_actor
-/* 1911CC 802628EC AFAB0020 */   sw       $t3, 0x20($sp)
-/* 1911D0 802628F0 0040902D */  daddu     $s2, $v0, $zero
-/* 1911D4 802628F4 86050002 */  lh        $a1, 2($s0)
-/* 1911D8 802628F8 0C099117 */  jal       get_actor_part
-/* 1911DC 802628FC 0240202D */   daddu    $a0, $s2, $zero
-/* 1911E0 80262900 86030000 */  lh        $v1, ($s0)
-/* 1911E4 80262904 8FAB0020 */  lw        $t3, 0x20($sp)
-/* 1911E8 80262908 10600059 */  beqz      $v1, .L80262A70
-/* 1911EC 8026290C 0040882D */   daddu    $s1, $v0, $zero
-/* 1911F0 80262910 24020100 */  addiu     $v0, $zero, 0x100
-/* 1911F4 80262914 50620057 */  beql      $v1, $v0, .L80262A74
-/* 1911F8 80262918 26730001 */   addiu    $s3, $s3, 1
-/* 1911FC 8026291C 8EC20184 */  lw        $v0, 0x184($s6)
-/* 191200 80262920 04420029 */  bltzl     $v0, .L802629C8
-/* 191204 80262924 24040001 */   addiu    $a0, $zero, 1
-/* 191208 80262928 3C02800E */  lui       $v0, %hi(gBattleStatus+0x4)
-/* 19120C 8026292C 8C42C074 */  lw        $v0, %lo(gBattleStatus+0x4)($v0)
-/* 191210 80262930 30424000 */  andi      $v0, $v0, 0x4000
-/* 191214 80262934 14400013 */  bnez      $v0, .L80262984
-/* 191218 80262938 00000000 */   nop
-/* 19121C 8026293C 82C20432 */  lb        $v0, 0x432($s6)
-/* 191220 80262940 18400010 */  blez      $v0, .L80262984
-/* 191224 80262944 24040001 */   addiu    $a0, $zero, 1
-/* 191228 80262948 27A50010 */  addiu     $a1, $sp, 0x10
-/* 19122C 8026294C 27A60014 */  addiu     $a2, $sp, 0x14
-/* 191230 80262950 0C04DF70 */  jal       get_screen_overlay_params
-/* 191234 80262954 AFAB0020 */   sw       $t3, 0x20($sp)
-/* 191238 80262958 C7A20014 */  lwc1      $f2, 0x14($sp)
-/* 19123C 8026295C 3C014357 */  lui       $at, 0x4357
-/* 191240 80262960 44810000 */  mtc1      $at, $f0
-/* 191244 80262964 8FAB0020 */  lw        $t3, 0x20($sp)
-/* 191248 80262968 4602003E */  c.le.s    $f0, $f2
-/* 19124C 8026296C 00000000 */  nop
-/* 191250 80262970 45000004 */  bc1f      .L80262984
-/* 191254 80262974 24040001 */   addiu    $a0, $zero, 1
-/* 191258 80262978 0080782D */  daddu     $t7, $a0, $zero
-/* 19125C 8026297C 08098A72 */  j         .L802629C8
-/* 191260 80262980 AFAF0018 */   sw       $t7, 0x18($sp)
-.L80262984:
-/* 191264 80262984 8EC20184 */  lw        $v0, 0x184($s6)
-/* 191268 80262988 30428000 */  andi      $v0, $v0, 0x8000
-/* 19126C 8026298C 1040000D */  beqz      $v0, .L802629C4
-/* 191270 80262990 3C020080 */   lui      $v0, 0x80
-/* 191274 80262994 8E230000 */  lw        $v1, ($s1)
-/* 191278 80262998 00621024 */  and       $v0, $v1, $v0
-/* 19127C 8026299C 1040000A */  beqz      $v0, .L802629C8
-/* 191280 802629A0 24040001 */   addiu    $a0, $zero, 1
-/* 191284 802629A4 8E420000 */  lw        $v0, ($s2)
-/* 191288 802629A8 30420040 */  andi      $v0, $v0, 0x40
-/* 19128C 802629AC 14400006 */  bnez      $v0, .L802629C8
-/* 191290 802629B0 30620040 */   andi     $v0, $v1, 0x40
-/* 191294 802629B4 50400004 */  beql      $v0, $zero, .L802629C8
-/* 191298 802629B8 0000202D */   daddu    $a0, $zero, $zero
-/* 19129C 802629BC 08098A72 */  j         .L802629C8
-/* 1912A0 802629C0 00000000 */   nop
-.L802629C4:
-/* 1912A4 802629C4 0000202D */  daddu     $a0, $zero, $zero
-.L802629C8:
-/* 1912A8 802629C8 5080002A */  beql      $a0, $zero, .L80262A74
-/* 1912AC 802629CC 26730001 */   addiu    $s3, $s3, 1
-/* 1912B0 802629D0 26A5FFFF */  addiu     $a1, $s5, -1
-/* 1912B4 802629D4 0265102A */  slt       $v0, $s3, $a1
-/* 1912B8 802629D8 10400022 */  beqz      $v0, .L80262A64
-/* 1912BC 802629DC 0260382D */   daddu    $a3, $s3, $zero
-/* 1912C0 802629E0 00071880 */  sll       $v1, $a3, 2
-.L802629E4:
-/* 1912C4 802629E4 00671821 */  addu      $v1, $v1, $a3
-/* 1912C8 802629E8 00031880 */  sll       $v1, $v1, 2
-/* 1912CC 802629EC 01631821 */  addu      $v1, $t3, $v1
-/* 1912D0 802629F0 24E40001 */  addiu     $a0, $a3, 1
-/* 1912D4 802629F4 00041080 */  sll       $v0, $a0, 2
-/* 1912D8 802629F8 00441021 */  addu      $v0, $v0, $a0
-/* 1912DC 802629FC 00021080 */  sll       $v0, $v0, 2
-/* 1912E0 80262A00 01621021 */  addu      $v0, $t3, $v0
-/* 1912E4 80262A04 8858022C */  lwl       $t8, 0x22c($v0)
-/* 1912E8 80262A08 9858022F */  lwr       $t8, 0x22f($v0)
-/* 1912EC 80262A0C 88590230 */  lwl       $t9, 0x230($v0)
-/* 1912F0 80262A10 98590233 */  lwr       $t9, 0x233($v0)
-/* 1912F4 80262A14 884E0234 */  lwl       $t6, 0x234($v0)
-/* 1912F8 80262A18 984E0237 */  lwr       $t6, 0x237($v0)
-/* 1912FC 80262A1C 884F0238 */  lwl       $t7, 0x238($v0)
-/* 191300 80262A20 984F023B */  lwr       $t7, 0x23b($v0)
-/* 191304 80262A24 A878022C */  swl       $t8, 0x22c($v1)
-/* 191308 80262A28 B878022F */  swr       $t8, 0x22f($v1)
-/* 19130C 80262A2C A8790230 */  swl       $t9, 0x230($v1)
-/* 191310 80262A30 B8790233 */  swr       $t9, 0x233($v1)
-/* 191314 80262A34 A86E0234 */  swl       $t6, 0x234($v1)
-/* 191318 80262A38 B86E0237 */  swr       $t6, 0x237($v1)
-/* 19131C 80262A3C A86F0238 */  swl       $t7, 0x238($v1)
-/* 191320 80262A40 B86F023B */  swr       $t7, 0x23b($v1)
-/* 191324 80262A44 8858023C */  lwl       $t8, 0x23c($v0)
-/* 191328 80262A48 9858023F */  lwr       $t8, 0x23f($v0)
-/* 19132C 80262A4C A878023C */  swl       $t8, 0x23c($v1)
-/* 191330 80262A50 B878023F */  swr       $t8, 0x23f($v1)
-/* 191334 80262A54 0080382D */  daddu     $a3, $a0, $zero
-/* 191338 80262A58 00E5102A */  slt       $v0, $a3, $a1
-/* 19133C 80262A5C 1440FFE1 */  bnez      $v0, .L802629E4
-/* 191340 80262A60 00071880 */   sll      $v1, $a3, 2
-.L80262A64:
-/* 191344 80262A64 26B5FFFF */  addiu     $s5, $s5, -1
-/* 191348 80262A68 2694FFEC */  addiu     $s4, $s4, -0x14
-/* 19134C 80262A6C 2673FFFF */  addiu     $s3, $s3, -1
-.L80262A70:
-/* 191350 80262A70 26730001 */  addiu     $s3, $s3, 1
-.L80262A74:
-/* 191354 80262A74 0275102A */  slt       $v0, $s3, $s5
-/* 191358 80262A78 1440FF99 */  bnez      $v0, .L802628E0
-/* 19135C 80262A7C 26940014 */   addiu    $s4, $s4, 0x14
-.L80262A80:
-/* 191360 80262A80 1AA00115 */  blez      $s5, .L80262ED8
-/* 191364 80262A84 0000982D */   daddu    $s3, $zero, $zero
-/* 191368 80262A88 00131080 */  sll       $v0, $s3, 2
-.L80262A8C:
-/* 19136C 80262A8C 00531021 */  addu      $v0, $v0, $s3
-/* 191370 80262A90 00021080 */  sll       $v0, $v0, 2
-/* 191374 80262A94 02E28021 */  addu      $s0, $s7, $v0
-/* 191378 80262A98 86040000 */  lh        $a0, ($s0)
-/* 19137C 80262A9C 0C09A75B */  jal       get_actor
-/* 191380 80262AA0 AFAB0020 */   sw       $t3, 0x20($sp)
-/* 191384 80262AA4 0040902D */  daddu     $s2, $v0, $zero
-/* 191388 80262AA8 86050002 */  lh        $a1, 2($s0)
-/* 19138C 80262AAC 0C099117 */  jal       get_actor_part
-/* 191390 80262AB0 0240202D */   daddu    $a0, $s2, $zero
-/* 191394 80262AB4 86030000 */  lh        $v1, ($s0)
-/* 191398 80262AB8 8FAB0020 */  lw        $t3, 0x20($sp)
-/* 19139C 80262ABC 10600102 */  beqz      $v1, .L80262EC8
-/* 1913A0 80262AC0 0040882D */   daddu    $s1, $v0, $zero
-/* 1913A4 80262AC4 24020100 */  addiu     $v0, $zero, 0x100
-/* 1913A8 80262AC8 50620100 */  beql      $v1, $v0, .L80262ECC
-/* 1913AC 80262ACC 26730001 */   addiu    $s3, $s3, 1
-/* 1913B0 80262AD0 8EC20184 */  lw        $v0, 0x184($s6)
-/* 1913B4 80262AD4 30420800 */  andi      $v0, $v0, 0x800
-/* 1913B8 80262AD8 10400005 */  beqz      $v0, .L80262AF0
-/* 1913BC 80262ADC 00000000 */   nop
-/* 1913C0 80262AE0 8E220004 */  lw        $v0, 4($s1)
-/* 1913C4 80262AE4 30420001 */  andi      $v0, $v0, 1
-/* 1913C8 80262AE8 544000CE */  bnel      $v0, $zero, .L80262E24
-/* 1913CC 80262AEC 24040001 */   addiu    $a0, $zero, 1
-.L80262AF0:
-/* 1913D0 80262AF0 8EC20184 */  lw        $v0, 0x184($s6)
-/* 1913D4 80262AF4 30421000 */  andi      $v0, $v0, 0x1000
-/* 1913D8 80262AF8 10400005 */  beqz      $v0, .L80262B10
-/* 1913DC 80262AFC 00000000 */   nop
-/* 1913E0 80262B00 8E220004 */  lw        $v0, 4($s1)
-/* 1913E4 80262B04 30420002 */  andi      $v0, $v0, 2
-/* 1913E8 80262B08 544000C6 */  bnel      $v0, $zero, .L80262E24
-/* 1913EC 80262B0C 24040001 */   addiu    $a0, $zero, 1
-.L80262B10:
-/* 1913F0 80262B10 8EC20184 */  lw        $v0, 0x184($s6)
-/* 1913F4 80262B14 3C030002 */  lui       $v1, 2
-/* 1913F8 80262B18 00431024 */  and       $v0, $v0, $v1
-/* 1913FC 80262B1C 10400009 */  beqz      $v0, .L80262B44
-/* 191400 80262B20 00000000 */   nop
-/* 191404 80262B24 8E420000 */  lw        $v0, ($s2)
-/* 191408 80262B28 30420080 */  andi      $v0, $v0, 0x80
-/* 19140C 80262B2C 544000BD */  bnel      $v0, $zero, .L80262E24
-/* 191410 80262B30 24040001 */   addiu    $a0, $zero, 1
-/* 191414 80262B34 8E220000 */  lw        $v0, ($s1)
-/* 191418 80262B38 30420080 */  andi      $v0, $v0, 0x80
-/* 19141C 80262B3C 544000B9 */  bnel      $v0, $zero, .L80262E24
-/* 191420 80262B40 24040001 */   addiu    $a0, $zero, 1
-.L80262B44:
-/* 191424 80262B44 8EC20184 */  lw        $v0, 0x184($s6)
-/* 191428 80262B48 30420400 */  andi      $v0, $v0, 0x400
-/* 19142C 80262B4C 10400005 */  beqz      $v0, .L80262B64
-/* 191430 80262B50 00000000 */   nop
-/* 191434 80262B54 8E420000 */  lw        $v0, ($s2)
-/* 191438 80262B58 30420800 */  andi      $v0, $v0, 0x800
-/* 19143C 80262B5C 544000B1 */  bnel      $v0, $zero, .L80262E24
-/* 191440 80262B60 24040001 */   addiu    $a0, $zero, 1
-.L80262B64:
-/* 191444 80262B64 8EC20184 */  lw        $v0, 0x184($s6)
-/* 191448 80262B68 3C030001 */  lui       $v1, 1
-/* 19144C 80262B6C 00431024 */  and       $v0, $v0, $v1
-/* 191450 80262B70 14400005 */  bnez      $v0, .L80262B88
-/* 191454 80262B74 00000000 */   nop
-/* 191458 80262B78 8E420000 */  lw        $v0, ($s2)
-/* 19145C 80262B7C 30424000 */  andi      $v0, $v0, 0x4000
-/* 191460 80262B80 544000A8 */  bnel      $v0, $zero, .L80262E24
-/* 191464 80262B84 24040001 */   addiu    $a0, $zero, 1
-.L80262B88:
-/* 191468 80262B88 8EC20184 */  lw        $v0, 0x184($s6)
-/* 19146C 80262B8C 3C030004 */  lui       $v1, 4
-/* 191470 80262B90 00431024 */  and       $v0, $v0, $v1
-/* 191474 80262B94 10400005 */  beqz      $v0, .L80262BAC
-/* 191478 80262B98 00000000 */   nop
-/* 19147C 80262B9C 8E420000 */  lw        $v0, ($s2)
-/* 191480 80262BA0 30420800 */  andi      $v0, $v0, 0x800
-/* 191484 80262BA4 5440009F */  bnel      $v0, $zero, .L80262E24
-/* 191488 80262BA8 24040001 */   addiu    $a0, $zero, 1
-.L80262BAC:
-/* 19148C 80262BAC 8EC20184 */  lw        $v0, 0x184($s6)
-/* 191490 80262BB0 30420004 */  andi      $v0, $v0, 4
-/* 191494 80262BB4 10400004 */  beqz      $v0, .L80262BC8
-/* 191498 80262BB8 00000000 */   nop
-/* 19149C 80262BBC 82020012 */  lb        $v0, 0x12($s0)
-/* 1914A0 80262BC0 54400098 */  bnel      $v0, $zero, .L80262E24
-/* 1914A4 80262BC4 24040001 */   addiu    $a0, $zero, 1
-.L80262BC8:
-/* 1914A8 80262BC8 8EC20184 */  lw        $v0, 0x184($s6)
-/* 1914AC 80262BCC 30420010 */  andi      $v0, $v0, 0x10
-/* 1914B0 80262BD0 10400005 */  beqz      $v0, .L80262BE8
-/* 1914B4 80262BD4 00000000 */   nop
-/* 1914B8 80262BD8 82020012 */  lb        $v0, 0x12($s0)
-/* 1914BC 80262BDC 28420002 */  slti      $v0, $v0, 2
-/* 1914C0 80262BE0 50400090 */  beql      $v0, $zero, .L80262E24
-/* 1914C4 80262BE4 24040001 */   addiu    $a0, $zero, 1
-.L80262BE8:
-/* 1914C8 80262BE8 8EC20184 */  lw        $v0, 0x184($s6)
-/* 1914CC 80262BEC 30420040 */  andi      $v0, $v0, 0x40
-/* 1914D0 80262BF0 10400004 */  beqz      $v0, .L80262C04
-/* 1914D4 80262BF4 00000000 */   nop
-/* 1914D8 80262BF8 82020012 */  lb        $v0, 0x12($s0)
-/* 1914DC 80262BFC 18400089 */  blez      $v0, .L80262E24
-/* 1914E0 80262C00 24040001 */   addiu    $a0, $zero, 1
-.L80262C04:
-/* 1914E4 80262C04 8EC20184 */  lw        $v0, 0x184($s6)
-/* 1914E8 80262C08 30424000 */  andi      $v0, $v0, 0x4000
-/* 1914EC 80262C0C 1040001D */  beqz      $v0, .L80262C84
-/* 1914F0 80262C10 00000000 */   nop
-/* 1914F4 80262C14 8E220000 */  lw        $v0, ($s1)
-/* 1914F8 80262C18 30420020 */  andi      $v0, $v0, 0x20
-/* 1914FC 80262C1C 14400019 */  bnez      $v0, .L80262C84
-/* 191500 80262C20 0000302D */   daddu    $a2, $zero, $zero
-/* 191504 80262C24 1AA00015 */  blez      $s5, .L80262C7C
-/* 191508 80262C28 00C0382D */   daddu    $a3, $a2, $zero
-/* 19150C 80262C2C 02E0202D */  daddu     $a0, $s7, $zero
-.L80262C30:
-/* 191510 80262C30 0080282D */  daddu     $a1, $a0, $zero
-/* 191514 80262C34 5205000E */  beql      $s0, $a1, .L80262C70
-/* 191518 80262C38 24E70001 */   addiu    $a3, $a3, 1
-/* 19151C 80262C3C 82030013 */  lb        $v1, 0x13($s0)
-/* 191520 80262C40 80A20013 */  lb        $v0, 0x13($a1)
-/* 191524 80262C44 1462000A */  bne       $v1, $v0, .L80262C70
-/* 191528 80262C48 24E70001 */   addiu    $a3, $a3, 1
-/* 19152C 80262C4C 82030011 */  lb        $v1, 0x11($s0)
-/* 191530 80262C50 80A20011 */  lb        $v0, 0x11($a1)
-/* 191534 80262C54 14620006 */  bne       $v1, $v0, .L80262C70
-/* 191538 80262C58 00000000 */   nop
-/* 19153C 80262C5C 82030012 */  lb        $v1, 0x12($s0)
-/* 191540 80262C60 80A20012 */  lb        $v0, 0x12($a1)
-/* 191544 80262C64 0062182A */  slt       $v1, $v1, $v0
-/* 191548 80262C68 54600004 */  bnel      $v1, $zero, .L80262C7C
-/* 19154C 80262C6C 24060001 */   addiu    $a2, $zero, 1
-.L80262C70:
-/* 191550 80262C70 00F5102A */  slt       $v0, $a3, $s5
-/* 191554 80262C74 1440FFEE */  bnez      $v0, .L80262C30
-/* 191558 80262C78 24840014 */   addiu    $a0, $a0, 0x14
-.L80262C7C:
-/* 19155C 80262C7C 14C00069 */  bnez      $a2, .L80262E24
-/* 191560 80262C80 24040001 */   addiu    $a0, $zero, 1
-.L80262C84:
-/* 191564 80262C84 8EC20184 */  lw        $v0, 0x184($s6)
-/* 191568 80262C88 30422000 */  andi      $v0, $v0, 0x2000
-/* 19156C 80262C8C 10400015 */  beqz      $v0, .L80262CE4
-/* 191570 80262C90 0000302D */   daddu    $a2, $zero, $zero
-/* 191574 80262C94 1AA00011 */  blez      $s5, .L80262CDC
-/* 191578 80262C98 00C0382D */   daddu    $a3, $a2, $zero
-/* 19157C 80262C9C 02E0202D */  daddu     $a0, $s7, $zero
-.L80262CA0:
-/* 191580 80262CA0 0080282D */  daddu     $a1, $a0, $zero
-/* 191584 80262CA4 1205000A */  beq       $s0, $a1, .L80262CD0
-/* 191588 80262CA8 24E70001 */   addiu    $a3, $a3, 1
-/* 19158C 80262CAC 96030012 */  lhu       $v1, 0x12($s0)
-/* 191590 80262CB0 94A20012 */  lhu       $v0, 0x12($a1)
-/* 191594 80262CB4 14620006 */  bne       $v1, $v0, .L80262CD0
-/* 191598 80262CB8 00000000 */   nop
-/* 19159C 80262CBC 82030011 */  lb        $v1, 0x11($s0)
-/* 1915A0 80262CC0 80A20011 */  lb        $v0, 0x11($a1)
-/* 1915A4 80262CC4 0043102A */  slt       $v0, $v0, $v1
-/* 1915A8 80262CC8 54400004 */  bnel      $v0, $zero, .L80262CDC
-/* 1915AC 80262CCC 24060001 */   addiu    $a2, $zero, 1
-.L80262CD0:
-/* 1915B0 80262CD0 00F5102A */  slt       $v0, $a3, $s5
-/* 1915B4 80262CD4 1440FFF2 */  bnez      $v0, .L80262CA0
-/* 1915B8 80262CD8 24840014 */   addiu    $a0, $a0, 0x14
-.L80262CDC:
-/* 1915BC 80262CDC 54C00051 */  bnel      $a2, $zero, .L80262E24
-/* 1915C0 80262CE0 24040001 */   addiu    $a0, $zero, 1
-.L80262CE4:
-/* 1915C4 80262CE4 8EC20184 */  lw        $v0, 0x184($s6)
-/* 1915C8 80262CE8 30420020 */  andi      $v0, $v0, 0x20
-/* 1915CC 80262CEC 10400005 */  beqz      $v0, .L80262D04
-/* 1915D0 80262CF0 00000000 */   nop
-/* 1915D4 80262CF4 8E420000 */  lw        $v0, ($s2)
-/* 1915D8 80262CF8 30420200 */  andi      $v0, $v0, 0x200
-/* 1915DC 80262CFC 54400049 */  bnel      $v0, $zero, .L80262E24
-/* 1915E0 80262D00 24040001 */   addiu    $a0, $zero, 1
-.L80262D04:
-/* 1915E4 80262D04 8EC20184 */  lw        $v0, 0x184($s6)
-/* 1915E8 80262D08 3C030010 */  lui       $v1, 0x10
-/* 1915EC 80262D0C 00431024 */  and       $v0, $v0, $v1
-/* 1915F0 80262D10 10400004 */  beqz      $v0, .L80262D24
-/* 1915F4 80262D14 27C20001 */   addiu    $v0, $fp, 1
-/* 1915F8 80262D18 82030012 */  lb        $v1, 0x12($s0)
-/* 1915FC 80262D1C 50620041 */  beql      $v1, $v0, .L80262E24
-/* 191600 80262D20 24040001 */   addiu    $a0, $zero, 1
-.L80262D24:
-/* 191604 80262D24 8EC20184 */  lw        $v0, 0x184($s6)
-/* 191608 80262D28 3C030020 */  lui       $v1, 0x20
-/* 19160C 80262D2C 00431024 */  and       $v0, $v0, $v1
-/* 191610 80262D30 10400004 */  beqz      $v0, .L80262D44
-/* 191614 80262D34 27C2FFFF */   addiu    $v0, $fp, -1
-/* 191618 80262D38 82030012 */  lb        $v1, 0x12($s0)
-/* 19161C 80262D3C 50620039 */  beql      $v1, $v0, .L80262E24
-/* 191620 80262D40 24040001 */   addiu    $a0, $zero, 1
-.L80262D44:
-/* 191624 80262D44 8EC20184 */  lw        $v0, 0x184($s6)
-/* 191628 80262D48 3C030040 */  lui       $v1, 0x40
-/* 19162C 80262D4C 00431024 */  and       $v0, $v0, $v1
-/* 191630 80262D50 10400006 */  beqz      $v0, .L80262D6C
-/* 191634 80262D54 00000000 */   nop
-/* 191638 80262D58 8FB8001C */  lw        $t8, 0x1c($sp)
-/* 19163C 80262D5C 82030011 */  lb        $v1, 0x11($s0)
-/* 191640 80262D60 2702FFFF */  addiu     $v0, $t8, -1
-/* 191644 80262D64 5062002F */  beql      $v1, $v0, .L80262E24
-/* 191648 80262D68 24040001 */   addiu    $a0, $zero, 1
-.L80262D6C:
-/* 19164C 80262D6C 8EC20184 */  lw        $v0, 0x184($s6)
-/* 191650 80262D70 3C030080 */  lui       $v1, 0x80
-/* 191654 80262D74 00431024 */  and       $v0, $v0, $v1
-/* 191658 80262D78 10400006 */  beqz      $v0, .L80262D94
-/* 19165C 80262D7C 00000000 */   nop
-/* 191660 80262D80 8FB9001C */  lw        $t9, 0x1c($sp)
-/* 191664 80262D84 82030011 */  lb        $v1, 0x11($s0)
-/* 191668 80262D88 27220001 */  addiu     $v0, $t9, 1
-/* 19166C 80262D8C 50620025 */  beql      $v1, $v0, .L80262E24
-/* 191670 80262D90 24040001 */   addiu    $a0, $zero, 1
-.L80262D94:
-/* 191674 80262D94 8EC20184 */  lw        $v0, 0x184($s6)
-/* 191678 80262D98 3C030010 */  lui       $v1, 0x10
-/* 19167C 80262D9C 00431024 */  and       $v0, $v0, $v1
-/* 191680 80262DA0 10400005 */  beqz      $v0, .L80262DB8
-/* 191684 80262DA4 00000000 */   nop
-/* 191688 80262DA8 82020012 */  lb        $v0, 0x12($s0)
-/* 19168C 80262DAC 005E102A */  slt       $v0, $v0, $fp
-/* 191690 80262DB0 5440001C */  bnel      $v0, $zero, .L80262E24
-/* 191694 80262DB4 24040001 */   addiu    $a0, $zero, 1
-.L80262DB8:
-/* 191698 80262DB8 8EC20184 */  lw        $v0, 0x184($s6)
-/* 19169C 80262DBC 3C030020 */  lui       $v1, 0x20
-/* 1916A0 80262DC0 00431024 */  and       $v0, $v0, $v1
-/* 1916A4 80262DC4 10400005 */  beqz      $v0, .L80262DDC
-/* 1916A8 80262DC8 00000000 */   nop
-/* 1916AC 80262DCC 82020012 */  lb        $v0, 0x12($s0)
-/* 1916B0 80262DD0 03C2102A */  slt       $v0, $fp, $v0
-/* 1916B4 80262DD4 54400013 */  bnel      $v0, $zero, .L80262E24
-/* 1916B8 80262DD8 24040001 */   addiu    $a0, $zero, 1
-.L80262DDC:
-/* 1916BC 80262DDC 8EC20184 */  lw        $v0, 0x184($s6)
-/* 1916C0 80262DE0 3C030040 */  lui       $v1, 0x40
-/* 1916C4 80262DE4 00431024 */  and       $v0, $v0, $v1
-/* 1916C8 80262DE8 10400006 */  beqz      $v0, .L80262E04
-/* 1916CC 80262DEC 00000000 */   nop
-/* 1916D0 80262DF0 82020011 */  lb        $v0, 0x11($s0)
-/* 1916D4 80262DF4 8FAE001C */  lw        $t6, 0x1c($sp)
-/* 1916D8 80262DF8 01C2102A */  slt       $v0, $t6, $v0
-/* 1916DC 80262DFC 14400009 */  bnez      $v0, .L80262E24
-/* 1916E0 80262E00 24040001 */   addiu    $a0, $zero, 1
-.L80262E04:
-/* 1916E4 80262E04 8EC20184 */  lw        $v0, 0x184($s6)
-/* 1916E8 80262E08 3C030080 */  lui       $v1, 0x80
-/* 1916EC 80262E0C 00431024 */  and       $v0, $v0, $v1
-/* 1916F0 80262E10 10400004 */  beqz      $v0, .L80262E24
-/* 1916F4 80262E14 0000202D */   daddu    $a0, $zero, $zero
-/* 1916F8 80262E18 82020011 */  lb        $v0, 0x11($s0)
-/* 1916FC 80262E1C 8FAF001C */  lw        $t7, 0x1c($sp)
-/* 191700 80262E20 004F202A */  slt       $a0, $v0, $t7
-.L80262E24:
-/* 191704 80262E24 50800029 */  beql      $a0, $zero, .L80262ECC
-/* 191708 80262E28 26730001 */   addiu    $s3, $s3, 1
-/* 19170C 80262E2C 26A5FFFF */  addiu     $a1, $s5, -1
-/* 191710 80262E30 0265102A */  slt       $v0, $s3, $a1
-/* 191714 80262E34 10400022 */  beqz      $v0, .L80262EC0
-/* 191718 80262E38 0260382D */   daddu    $a3, $s3, $zero
-/* 19171C 80262E3C 00071880 */  sll       $v1, $a3, 2
-.L80262E40:
-/* 191720 80262E40 00671821 */  addu      $v1, $v1, $a3
-/* 191724 80262E44 00031880 */  sll       $v1, $v1, 2
-/* 191728 80262E48 01631821 */  addu      $v1, $t3, $v1
-/* 19172C 80262E4C 24E40001 */  addiu     $a0, $a3, 1
-/* 191730 80262E50 00041080 */  sll       $v0, $a0, 2
-/* 191734 80262E54 00441021 */  addu      $v0, $v0, $a0
-/* 191738 80262E58 00021080 */  sll       $v0, $v0, 2
-/* 19173C 80262E5C 01621021 */  addu      $v0, $t3, $v0
-/* 191740 80262E60 8858022C */  lwl       $t8, 0x22c($v0)
-/* 191744 80262E64 9858022F */  lwr       $t8, 0x22f($v0)
-/* 191748 80262E68 88590230 */  lwl       $t9, 0x230($v0)
-/* 19174C 80262E6C 98590233 */  lwr       $t9, 0x233($v0)
-/* 191750 80262E70 884E0234 */  lwl       $t6, 0x234($v0)
-/* 191754 80262E74 984E0237 */  lwr       $t6, 0x237($v0)
-/* 191758 80262E78 884F0238 */  lwl       $t7, 0x238($v0)
-/* 19175C 80262E7C 984F023B */  lwr       $t7, 0x23b($v0)
-/* 191760 80262E80 A878022C */  swl       $t8, 0x22c($v1)
-/* 191764 80262E84 B878022F */  swr       $t8, 0x22f($v1)
-/* 191768 80262E88 A8790230 */  swl       $t9, 0x230($v1)
-/* 19176C 80262E8C B8790233 */  swr       $t9, 0x233($v1)
-/* 191770 80262E90 A86E0234 */  swl       $t6, 0x234($v1)
-/* 191774 80262E94 B86E0237 */  swr       $t6, 0x237($v1)
-/* 191778 80262E98 A86F0238 */  swl       $t7, 0x238($v1)
-/* 19177C 80262E9C B86F023B */  swr       $t7, 0x23b($v1)
-/* 191780 80262EA0 8858023C */  lwl       $t8, 0x23c($v0)
-/* 191784 80262EA4 9858023F */  lwr       $t8, 0x23f($v0)
-/* 191788 80262EA8 A878023C */  swl       $t8, 0x23c($v1)
-/* 19178C 80262EAC B878023F */  swr       $t8, 0x23f($v1)
-/* 191790 80262EB0 0080382D */  daddu     $a3, $a0, $zero
-/* 191794 80262EB4 00E5102A */  slt       $v0, $a3, $a1
-/* 191798 80262EB8 1440FFE1 */  bnez      $v0, .L80262E40
-/* 19179C 80262EBC 00071880 */   sll      $v1, $a3, 2
-.L80262EC0:
-/* 1917A0 80262EC0 26B5FFFF */  addiu     $s5, $s5, -1
-/* 1917A4 80262EC4 2673FFFF */  addiu     $s3, $s3, -1
-.L80262EC8:
-/* 1917A8 80262EC8 26730001 */  addiu     $s3, $s3, 1
-.L80262ECC:
-/* 1917AC 80262ECC 0275102A */  slt       $v0, $s3, $s5
-/* 1917B0 80262ED0 1440FEEE */  bnez      $v0, .L80262A8C
-/* 1917B4 80262ED4 00131080 */   sll      $v0, $s3, 2
-.L80262ED8:
-/* 1917B8 80262ED8 16A0000A */  bnez      $s5, .L80262F04
-/* 1917BC 80262EDC A175040C */   sb       $s5, 0x40c($t3)
-/* 1917C0 80262EE0 8FB80018 */  lw        $t8, 0x18($sp)
-/* 1917C4 80262EE4 13000007 */  beqz      $t8, .L80262F04
-/* 1917C8 80262EE8 00000000 */   nop
-/* 1917CC 80262EEC 3C03800E */  lui       $v1, %hi(gBattleStatus)
-/* 1917D0 80262EF0 2463C070 */  addiu     $v1, $v1, %lo(gBattleStatus)
-/* 1917D4 80262EF4 8C620004 */  lw        $v0, 4($v1)
-/* 1917D8 80262EF8 34421000 */  ori       $v0, $v0, 0x1000
-/* 1917DC 80262EFC 08098BC7 */  j         .L80262F1C
-/* 1917E0 80262F00 AC620004 */   sw       $v0, 4($v1)
-.L80262F04:
-/* 1917E4 80262F04 3C02800E */  lui       $v0, %hi(gBattleStatus)
-/* 1917E8 80262F08 2442C070 */  addiu     $v0, $v0, %lo(gBattleStatus)
-/* 1917EC 80262F0C 8C430004 */  lw        $v1, 4($v0)
-/* 1917F0 80262F10 2404EFFF */  addiu     $a0, $zero, -0x1001
-/* 1917F4 80262F14 00641824 */  and       $v1, $v1, $a0
-/* 1917F8 80262F18 AC430004 */  sw        $v1, 4($v0)
-.L80262F1C:
-/* 1917FC 80262F1C 2577022C */  addiu     $s7, $t3, 0x22c
-/* 191800 80262F20 8175040C */  lb        $s5, 0x40c($t3)
-/* 191804 80262F24 0000982D */  daddu     $s3, $zero, $zero
-/* 191808 80262F28 1AA00007 */  blez      $s5, .L80262F48
-/* 19180C 80262F2C 256A040D */   addiu    $t2, $t3, 0x40d
-/* 191810 80262F30 01531021 */  addu      $v0, $t2, $s3
-.L80262F34:
-/* 191814 80262F34 A0530000 */  sb        $s3, ($v0)
-/* 191818 80262F38 26730001 */  addiu     $s3, $s3, 1
-/* 19181C 80262F3C 0275102A */  slt       $v0, $s3, $s5
-/* 191820 80262F40 1440FFFC */  bnez      $v0, .L80262F34
-/* 191824 80262F44 01531021 */   addu     $v0, $t2, $s3
-.L80262F48:
-/* 191828 80262F48 26A2FFFF */  addiu     $v0, $s5, -1
-/* 19182C 80262F4C 1840002B */  blez      $v0, .L80262FFC
-/* 191830 80262F50 0000982D */   daddu    $s3, $zero, $zero
-/* 191834 80262F54 0040582D */  daddu     $t3, $v0, $zero
-/* 191838 80262F58 26670001 */  addiu     $a3, $s3, 1
-.L80262F5C:
-/* 19183C 80262F5C 00F5102A */  slt       $v0, $a3, $s5
-/* 191840 80262F60 50400023 */  beql      $v0, $zero, .L80262FF0
-/* 191844 80262F64 26730001 */   addiu    $s3, $s3, 1
-/* 191848 80262F68 01534821 */  addu      $t1, $t2, $s3
-/* 19184C 80262F6C 01474021 */  addu      $t0, $t2, $a3
-.L80262F70:
-/* 191850 80262F70 81260000 */  lb        $a2, ($t1)
-/* 191854 80262F74 81030000 */  lb        $v1, ($t0)
-/* 191858 80262F78 00061080 */  sll       $v0, $a2, 2
-/* 19185C 80262F7C 00461021 */  addu      $v0, $v0, $a2
-/* 191860 80262F80 00021080 */  sll       $v0, $v0, 2
-/* 191864 80262F84 02E28021 */  addu      $s0, $s7, $v0
-/* 191868 80262F88 00031080 */  sll       $v0, $v1, 2
-/* 19186C 80262F8C 00431021 */  addu      $v0, $v0, $v1
-/* 191870 80262F90 00021080 */  sll       $v0, $v0, 2
-/* 191874 80262F94 02E22821 */  addu      $a1, $s7, $v0
-/* 191878 80262F98 82030010 */  lb        $v1, 0x10($s0)
-/* 19187C 80262F9C 86040004 */  lh        $a0, 4($s0)
-/* 191880 80262FA0 00031080 */  sll       $v0, $v1, 2
-/* 191884 80262FA4 00431021 */  addu      $v0, $v0, $v1
-/* 191888 80262FA8 00021040 */  sll       $v0, $v0, 1
-/* 19188C 80262FAC 80A30010 */  lb        $v1, 0x10($a1)
-/* 191890 80262FB0 00822021 */  addu      $a0, $a0, $v0
-/* 191894 80262FB4 00031080 */  sll       $v0, $v1, 2
-/* 191898 80262FB8 00431021 */  addu      $v0, $v0, $v1
-/* 19189C 80262FBC 84A30004 */  lh        $v1, 4($a1)
-/* 1918A0 80262FC0 00021040 */  sll       $v0, $v0, 1
-/* 1918A4 80262FC4 00621821 */  addu      $v1, $v1, $v0
-/* 1918A8 80262FC8 0064182A */  slt       $v1, $v1, $a0
-/* 1918AC 80262FCC 91020000 */  lbu       $v0, ($t0)
-/* 1918B0 80262FD0 10600003 */  beqz      $v1, .L80262FE0
-/* 1918B4 80262FD4 24E70001 */   addiu    $a3, $a3, 1
-/* 1918B8 80262FD8 A1220000 */  sb        $v0, ($t1)
-/* 1918BC 80262FDC A1060000 */  sb        $a2, ($t0)
-.L80262FE0:
-/* 1918C0 80262FE0 00F5102A */  slt       $v0, $a3, $s5
-/* 1918C4 80262FE4 1440FFE2 */  bnez      $v0, .L80262F70
-/* 1918C8 80262FE8 01474021 */   addu     $t0, $t2, $a3
-/* 1918CC 80262FEC 26730001 */  addiu     $s3, $s3, 1
-.L80262FF0:
-/* 1918D0 80262FF0 026B102A */  slt       $v0, $s3, $t3
-/* 1918D4 80262FF4 5440FFD9 */  bnel      $v0, $zero, .L80262F5C
-/* 1918D8 80262FF8 26670001 */   addiu    $a3, $s3, 1
-.L80262FFC:
-/* 1918DC 80262FFC 8FBF004C */  lw        $ra, 0x4c($sp)
-/* 1918E0 80263000 8FBE0048 */  lw        $fp, 0x48($sp)
-/* 1918E4 80263004 8FB70044 */  lw        $s7, 0x44($sp)
-/* 1918E8 80263008 8FB60040 */  lw        $s6, 0x40($sp)
-/* 1918EC 8026300C 8FB5003C */  lw        $s5, 0x3c($sp)
-/* 1918F0 80263010 8FB40038 */  lw        $s4, 0x38($sp)
-/* 1918F4 80263014 8FB30034 */  lw        $s3, 0x34($sp)
-/* 1918F8 80263018 8FB20030 */  lw        $s2, 0x30($sp)
-/* 1918FC 8026301C 8FB1002C */  lw        $s1, 0x2c($sp)
-/* 191900 80263020 8FB00028 */  lw        $s0, 0x28($sp)
-/* 191904 80263024 03E00008 */  jr        $ra
-/* 191908 80263028 27BD0050 */   addiu    $sp, $sp, 0x50