Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs

include/global.h

@@ -25,14 +25,6 @@
 #define INCBIN_S32 {0}
 #endif // IDE support
 
-// Invalid / Out of Bound Placeholder values
-#define INVALID_U8 0xFF
-#define INVALID_U16 0xFFFF
-#define INVALID_U32 0xFFFFFFFF
-#define INVALID_S8 -1
-#define INVALID_S16 -1
-#define INVALID_S32 -1
-
 #define ARRAY_COUNT(array) (size_t)(sizeof(array) / sizeof((array)[0]))
 
 #define SWAP(a, b, temp)    \

src/apprentice.c

@@ -1079,7 +1079,7 @@ void ResetApprenticeStruct(struct Apprentice *apprentice)
     u8 i;
 
     for (i = 0; i < 6; i++)
-        apprentice->easyChatWords[i] |= INVALID_U16;
+        apprentice->easyChatWords[i] |= 0xFFFF;
 
     apprentice->playerName[0] = EOS;
     apprentice->id = 16;
@@ -1093,7 +1093,7 @@ void ResetAllApprenticeData(void)
     for (i = 0; i < 4; i++)
     {
         for (j = 0; j < 6; j++)
-            gSaveBlock2Ptr->apprentices[i].easyChatWords[j] |= INVALID_U16;
+            gSaveBlock2Ptr->apprentices[i].easyChatWords[j] |= 0xFFFF;
         gSaveBlock2Ptr->apprentices[i].id = 16;
         gSaveBlock2Ptr->apprentices[i].playerName[0] = EOS;
         gSaveBlock2Ptr->apprentices[i].lvlMode = 0;
@@ -1290,7 +1290,7 @@ static u16 sub_819FF98(u8 arg0)
     else
         level = 60;
 
-    for (j = 0; learnset[j] != INVALID_U16; j++)
+    for (j = 0; learnset[j] != 0xFFFF; j++)
     {
         if ((learnset[j] & 0xFE00) > (level << 9))
             break;
@@ -1393,7 +1393,7 @@ static void GetLatestLearnedMoves(u16 species, u16 *moves)
         level = 60;
 
     learnset = gLevelUpLearnsets[species];
-    for (i = 0; learnset[i] != INVALID_U16; i++)
+    for (i = 0; learnset[i] != 0xFFFF; i++)
     {
         if ((learnset[i] & 0xFE00) > (level << 9))
             break;
@@ -2236,7 +2236,7 @@ static void sub_81A1370(void)
     }
 
     r10 = 0xFFFF;
-    r9 = INVALID_S32;
+    r9 = -1;
     for (i = 1; i < 4; i++)
     {
         if (GetTrainerId(gSaveBlock2Ptr->apprentices[i].playerId) == GetTrainerId(gSaveBlock2Ptr->playerTrainerId)

src/bard_music.c

@@ -54,7 +54,7 @@ void GetWordPhonemes(struct BardSong *song, u16 word)
     for (i = 0; i < 6; i ++)
     {
         sound = &song->sound[i];
-        if (sound->var00 != INVALID_U8)
+        if (sound->var00 != 0xFF)
         {
             song->phonemes[i].length = sound->var01 + gBardSoundLengthTable[sound->var00];
             song->phonemes[i].pitch = CalcWordPitch(word + 30, i);

src/battle_ai_script_commands.c

@@ -276,7 +276,7 @@ static const u16 sDiscouragedPowerfulMoveEffects[] =
     EFFECT_SUPERPOWER,
     EFFECT_ERUPTION,
     EFFECT_OVERHEAT,
-    INVALID_U16
+    0xFFFF
 };
 
 // code
@@ -463,8 +463,8 @@ static u8 ChooseMoveOrAction_Doubles(void)
     {
         if (i == sBattler_AI || gBattleMons[i].hp == 0)
         {
-            actionOrMoveIndex[i] = INVALID_U8;
-            bestMovePointsForTarget[i] = INVALID_S16    ;
+            actionOrMoveIndex[i] = 0xFF;
+            bestMovePointsForTarget[i] = -1    ;
         }
         else
         {
@@ -530,7 +530,7 @@ static u8 ChooseMoveOrAction_Doubles(void)
                 // Don't use a move against ally if it has less than 100 points.
                 if (i == (sBattler_AI ^ BIT_FLANK) && bestMovePointsForTarget[i] < 100)
                 {
-                    bestMovePointsForTarget[i] = INVALID_S16;
+                    bestMovePointsForTarget[i] = -1;
                     mostViableMovesScores[0] = mostViableMovesScores[0]; // Needed to match.
                 }
             }
@@ -1003,7 +1003,7 @@ static void BattleAICmd_if_in_bytes(void)
 {
     const u8 *ptr = T1_READ_PTR(gAIScriptPtr + 1);
 
-    while (*ptr != INVALID_U8)
+    while (*ptr != 0xFF)
     {
         if (AI_THINKING_STRUCT->funcResult == *ptr)
         {
@@ -1019,7 +1019,7 @@ static void BattleAICmd_if_not_in_bytes(void)
 {
     const u8 *ptr = T1_READ_PTR(gAIScriptPtr + 1);
 
-    while (*ptr != INVALID_U8)
+    while (*ptr != 0xFF)
     {
         if (AI_THINKING_STRUCT->funcResult == *ptr)
         {
@@ -1035,7 +1035,7 @@ static void BattleAICmd_if_in_hwords(void)
 {
     const u16 *ptr = (const u16 *)T1_READ_PTR(gAIScriptPtr + 1);
 
-    while (*ptr != INVALID_U16)
+    while (*ptr != 0xFFFF)
     {
         if (AI_THINKING_STRUCT->funcResult == *ptr)
         {
@@ -1051,7 +1051,7 @@ static void BattleAICmd_if_not_in_hwords(void)
 {
     const u16 *ptr = (const u16 *)T1_READ_PTR(gAIScriptPtr + 1);
 
-    while (*ptr != INVALID_U16)
+    while (*ptr != 0xFFFF)
     {
         if (AI_THINKING_STRUCT->funcResult == *ptr)
         {
@@ -1167,14 +1167,14 @@ static void BattleAICmd_get_how_powerful_move_is(void)
     s32 i, checkedMove;
     s32 moveDmgs[4];
 
-    for (i = 0; sDiscouragedPowerfulMoveEffects[i] != INVALID_U16; i++)
+    for (i = 0; sDiscouragedPowerfulMoveEffects[i] != 0xFFFF; i++)
     {
         if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].effect == sDiscouragedPowerfulMoveEffects[i])
             break;
     }
 
     if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].power > 1
-        && sDiscouragedPowerfulMoveEffects[i] == INVALID_U16)
+        && sDiscouragedPowerfulMoveEffects[i] == 0xFFFF)
     {
         gDynamicBasePower = 0;
         *(&gBattleStruct->dynamicMoveType) = 0;
@@ -1184,14 +1184,14 @@ static void BattleAICmd_get_how_powerful_move_is(void)
 
         for (checkedMove = 0; checkedMove < 4; checkedMove++)
         {
-            for (i = 0; sDiscouragedPowerfulMoveEffects[i] != INVALID_U16; i++)
+            for (i = 0; sDiscouragedPowerfulMoveEffects[i] != 0xFFFF; i++)
             {
                 if (gBattleMoves[gBattleMons[sBattler_AI].moves[checkedMove]].effect == sDiscouragedPowerfulMoveEffects[i])
                     break;
             }
 
             if (gBattleMons[sBattler_AI].moves[checkedMove] != MOVE_NONE
-                && sDiscouragedPowerfulMoveEffects[i] == INVALID_U16
+                && sDiscouragedPowerfulMoveEffects[i] == 0xFFFF
                 && gBattleMoves[gBattleMons[sBattler_AI].moves[checkedMove]].power > 1)
             {
                 gCurrentMove = gBattleMons[sBattler_AI].moves[checkedMove];

src/battle_ai_switch_items.c

@@ -126,7 +126,7 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
         return FALSE;
     if (gLastLandedMoves[gActiveBattler] == 0)
         return FALSE;
-    if (gLastLandedMoves[gActiveBattler] == INVALID_U16)
+    if (gLastLandedMoves[gActiveBattler] == 0xFFFF)
         return FALSE;
     if (gBattleMoves[gLastLandedMoves[gActiveBattler]].power == 0)
         return FALSE;
@@ -221,7 +221,7 @@ static bool8 ShouldSwitchIfNaturalCure(void)
     if (gBattleMons[gActiveBattler].hp < gBattleMons[gActiveBattler].maxHP / 2)
         return FALSE;
 
-    if ((gLastLandedMoves[gActiveBattler] == 0 || gLastLandedMoves[gActiveBattler] == INVALID_U16) && Random() & 1)
+    if ((gLastLandedMoves[gActiveBattler] == 0 || gLastLandedMoves[gActiveBattler] == 0xFFFF) && Random() & 1)
     {
         *(gBattleStruct->AI_monToSwitchIntoId + gActiveBattler) = PARTY_SIZE;
         BtlController_EmitTwoReturnValues(1, B_ACTION_SWITCH, 0);
@@ -331,9 +331,9 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
 
     if (gLastLandedMoves[gActiveBattler] == 0)
         return FALSE;
-    if (gLastLandedMoves[gActiveBattler] == INVALID_U16)
+    if (gLastLandedMoves[gActiveBattler] == 0xFFFF)
         return FALSE;
-    if (gLastHitBy[gActiveBattler] == INVALID_U8)
+    if (gLastHitBy[gActiveBattler] == 0xFF)
         return FALSE;
     if (gBattleMoves[gLastLandedMoves[gActiveBattler]].power == 0)
         return FALSE;

src/battle_anim.c

@@ -1452,14 +1452,14 @@ void ClearBattleAnimationVars(void)
 
     // Clear index array.
     for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++)
-        sAnimSpriteIndexArray[i] |= INVALID_U16;
+        sAnimSpriteIndexArray[i] |= 0xFFFF;
 
     // Clear anim args.
     for (i = 0; i < ANIM_ARGS_COUNT; i++)
         gBattleAnimArgs[i] = 0;
 
-    sMonAnimTaskIdArray[0] = INVALID_U8;
-    sMonAnimTaskIdArray[1] = INVALID_U8;
+    sMonAnimTaskIdArray[0] = 0xFF;
+    sMonAnimTaskIdArray[1] = 0xFF;
     gAnimMoveTurn = 0;
     sAnimBackgroundFadeState = 0;
     sAnimMoveIndex = 0;
@@ -1505,19 +1505,19 @@ void LaunchBattleAnimation(const u8 *const animsTable[], u16 tableId, bool8 isMo
     for (i = 0; i < ANIM_ARGS_COUNT; i++)
         gBattleAnimArgs[i] = 0;
 
-    sMonAnimTaskIdArray[0] = INVALID_U8;
-    sMonAnimTaskIdArray[1] = INVALID_U8;
+    sMonAnimTaskIdArray[0] = 0xFF;
+    sMonAnimTaskIdArray[1] = 0xFF;
     sBattleAnimScriptPtr = animsTable[tableId];
     gAnimScriptActive = TRUE;
     gAnimFramesToWait = 0;
     gAnimScriptCallback = RunAnimScriptCommand;
 
     for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++)
-        sAnimSpriteIndexArray[i] |= INVALID_U16;
+        sAnimSpriteIndexArray[i] |= 0xFFFF;
 
     if (isMoveAnim)
     {
-        for (i = 0; gMovesWithQuietBGM[i] != INVALID_U16; i++)
+        for (i = 0; gMovesWithQuietBGM[i] != 0xFFFF; i++)
         {
             if (tableId == gMovesWithQuietBGM[i])
             {
@@ -1558,7 +1558,7 @@ static void AddSpriteIndex(u16 index)
 
     for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++)
     {
-        if (sAnimSpriteIndexArray[i] == INVALID_U16)
+        if (sAnimSpriteIndexArray[i] == 0xFFFF)
         {
             sAnimSpriteIndexArray[i] = index;
             return;
@@ -1574,7 +1574,7 @@ static void ClearSpriteIndex(u16 index)
     {
         if (sAnimSpriteIndexArray[i] == index)
         {
-            sAnimSpriteIndexArray[i] |= INVALID_U16;
+            sAnimSpriteIndexArray[i] |= 0xFFFF;
             return;
         }
     }
@@ -1712,7 +1712,7 @@ static void ScriptCmd_delay(void)
     sBattleAnimScriptPtr++;
     gAnimFramesToWait = sBattleAnimScriptPtr[0];
     if (gAnimFramesToWait == 0)
-        gAnimFramesToWait = INVALID_S8;
+        gAnimFramesToWait = -1;
     sBattleAnimScriptPtr++;
     gAnimScriptCallback = WaitAnimFrameCount;
 }
@@ -1746,7 +1746,7 @@ static void ScriptCmd_end(void)
 
     // Keep waiting as long as there are animations to be done.
     if (gAnimVisualTaskCount != 0 || gAnimSoundTaskCount != 0
-     || sMonAnimTaskIdArray[0] != INVALID_U8 || sMonAnimTaskIdArray[1] != INVALID_U8)
+     || sMonAnimTaskIdArray[0] != 0xFF || sMonAnimTaskIdArray[1] != 0xFF)
     {
         sSoundAnimFramesToWait = 0;
         gAnimFramesToWait = 1;
@@ -1773,11 +1773,11 @@ static void ScriptCmd_end(void)
 
     for (i = 0; i < ANIM_SPRITE_INDEX_COUNT; i++)
     {
-        if (sAnimSpriteIndexArray[i] != INVALID_U16)
+        if (sAnimSpriteIndexArray[i] != 0xFFFF)
         {
             FreeSpriteTilesByTag(gBattleAnimPicTable[sAnimSpriteIndexArray[i]].tag);
             FreeSpritePaletteByTag(gBattleAnimPicTable[sAnimSpriteIndexArray[i]].tag);
-            sAnimSpriteIndexArray[i] |= INVALID_U16; // set terminator.
+            sAnimSpriteIndexArray[i] |= 0xFFFF; // set terminator.
         }
     }
 
@@ -2122,9 +2122,9 @@ static void ScriptCmd_clearmonbg(void)
     else
         battlerId = gBattleAnimTarget;
 
-    if (sMonAnimTaskIdArray[0] != INVALID_U8)
+    if (sMonAnimTaskIdArray[0] != 0xFF)
         gSprites[gBattlerSpriteIds[battlerId]].invisible = FALSE;
-    if (animBattlerId > 1 && sMonAnimTaskIdArray[1] != INVALID_U8)
+    if (animBattlerId > 1 && sMonAnimTaskIdArray[1] != 0xFF)
         gSprites[gBattlerSpriteIds[battlerId ^ BIT_FLANK]].invisible = FALSE;
     else
         animBattlerId = 0;
@@ -2148,17 +2148,17 @@ static void sub_80A4980(u8 taskId)
         else
             to_BG2 = TRUE;
 
-        if (sMonAnimTaskIdArray[0] != INVALID_U8)
+        if (sMonAnimTaskIdArray[0] != 0xFF)
         {
             sub_80A477C(to_BG2);
             DestroyTask(sMonAnimTaskIdArray[0]);
-            sMonAnimTaskIdArray[0] = INVALID_U8;
+            sMonAnimTaskIdArray[0] = 0xFF;
         }
         if (gTasks[taskId].data[0] > 1)
         {
             sub_80A477C(to_BG2 ^ 1);
             DestroyTask(sMonAnimTaskIdArray[1]);
-            sMonAnimTaskIdArray[1] = INVALID_U8;
+            sMonAnimTaskIdArray[1] = 0xFF;
         }
         DestroyTask(taskId);
     }
@@ -2421,7 +2421,7 @@ static void Task_FadeToBg(u8 taskId)
     {
         s16 bgId = gTasks[taskId].tBackgroundId;
 
-        if (bgId == INVALID_S16)
+        if (bgId == -1)
             LoadDefaultBg();
         else
             LoadMoveBg(bgId);
@@ -2477,7 +2477,7 @@ static void ScriptCmd_restorebg(void)
 
     sBattleAnimScriptPtr++;
     taskId = CreateTask(Task_FadeToBg, 5);
-    gTasks[taskId].tBackgroundId = INVALID_S16;
+    gTasks[taskId].tBackgroundId = -1;
     sAnimBackgroundFadeState = 1;
 }
 
@@ -3001,7 +3001,7 @@ static void ScriptCmd_invisible(void)
     u8 spriteId;
 
     spriteId = GetAnimBattlerSpriteId(sBattleAnimScriptPtr[1]);
-    if (spriteId != INVALID_U8)
+    if (spriteId != 0xFF)
         gSprites[spriteId].invisible = TRUE;
 
     sBattleAnimScriptPtr += 2;
@@ -3012,7 +3012,7 @@ static void ScriptCmd_visible(void)
     u8 spriteId;
 
     spriteId = GetAnimBattlerSpriteId(sBattleAnimScriptPtr[1]);
-    if (spriteId != INVALID_U8)
+    if (spriteId != 0xFF)
         gSprites[spriteId].invisible = FALSE;
 
     sBattleAnimScriptPtr += 2;
@@ -3039,7 +3039,7 @@ static void ScriptCmd_doublebattle_2D(void)
             r4 = sub_80A8364(gBattleAnimTarget);
             spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
         }
-        if (spriteId != INVALID_U8)
+        if (spriteId != 0xFF)
         {
             gSprites[spriteId].invisible = FALSE;
             if (r4 == 2)
@@ -3075,7 +3075,7 @@ static void ScriptCmd_doublebattle_2E(void)
             spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
         }
 
-        if (spriteId != INVALID_U8 && r4 == 2)
+        if (spriteId != 0xFF && r4 == 2)
             gSprites[spriteId].oam.priority = 2;
     }
 }

src/battle_anim_80A5C6C.c

@@ -1590,7 +1590,7 @@ s16 duplicate_obj_of_side_rel2move_in_transparent_mode(u8 whichBattler)
             }
         }
     }
-    return INVALID_S16;
+    return -1;
 }
 
 void obj_delete_but_dont_free_vram(struct Sprite *sprite)

src/battle_anim_80A9C70.c

@@ -183,7 +183,7 @@ void sub_80A9EF4(u8 taskId)
     SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL);
     SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16));
     spriteId = CreateSprite(&gUnknown_0853EF48, x, y, 4);
-    if (GetSpriteTileStartByTag(ANIM_TAG_ICE_CUBE) == INVALID_U16)
+    if (GetSpriteTileStartByTag(ANIM_TAG_ICE_CUBE) == 0xFFFF)
         gSprites[spriteId].invisible = TRUE;
     SetSubspriteTables(&gSprites[spriteId], gUnknown_0853EF40);
     gTasks[taskId].data[15] = spriteId;
@@ -315,10 +315,10 @@ void AnimTask_StatsChange(u8 taskId)
     CASE(MINUS2, STAT_ACC):     goesDown = TRUE;   animStatId = 2;     sharply = TRUE;   break;
     CASE(MINUS2, STAT_EVASION): goesDown = TRUE;   animStatId = 4;     sharply = TRUE;   break;
 
-    case STAT_ANIM_MULTIPLE_PLUS1:  goesDown = FALSE;  animStatId = INVALID_U8;  sharply = FALSE;  break;
-    case STAT_ANIM_MULTIPLE_PLUS2:  goesDown = FALSE;  animStatId = INVALID_U8;  sharply = TRUE;   break;
-    case STAT_ANIM_MULTIPLE_MINUS1: goesDown = TRUE;   animStatId = INVALID_U8;  sharply = FALSE;  break;
-    case STAT_ANIM_MULTIPLE_MINUS2: goesDown = TRUE;   animStatId = INVALID_U8;  sharply = TRUE;   break;
+    case STAT_ANIM_MULTIPLE_PLUS1:  goesDown = FALSE;  animStatId = 0xFF;  sharply = FALSE;  break;
+    case STAT_ANIM_MULTIPLE_PLUS2:  goesDown = FALSE;  animStatId = 0xFF;  sharply = TRUE;   break;
+    case STAT_ANIM_MULTIPLE_MINUS1: goesDown = TRUE;   animStatId = 0xFF;  sharply = FALSE;  break;
+    case STAT_ANIM_MULTIPLE_MINUS2: goesDown = TRUE;   animStatId = 0xFF;  sharply = TRUE;   break;
 
     default:
         DestroyAnimVisualTask(taskId);

src/battle_anim_sound_tasks.c

@@ -214,7 +214,7 @@ void sub_8158E9C(u8 taskId)
 
     if (species != SPECIES_NONE)
     {
-        if (gBattleAnimArgs[1] == INVALID_U8)
+        if (gBattleAnimArgs[1] == 0xFF)
             PlayCry3(species, pan, 9);
         else
             PlayCry3(species, pan, 7);
@@ -238,7 +238,7 @@ static void sub_8158FF4(u8 taskId)
     }
     else
     {
-        if (gTasks[taskId].data[0] == INVALID_U8)
+        if (gTasks[taskId].data[0] == 0xFF)
         {
             if (!IsCryPlaying())
             {

src/battle_anim_utility_funcs.c

@@ -82,7 +82,7 @@ void sub_8116664(u8 taskId)
         animBattlers[1] = gBattleAnimTarget;
         break;
     case 5:
-        animBattlers[0] = INVALID_U8;
+        animBattlers[0] = 0xFF;
         break;
     case 6:
         selectedPalettes = 0;

src/battle_arena.c

@@ -449,7 +449,7 @@ static const union AnimCmd *const sSpriteAnimTable_8611F4C[] =
 static const struct SpriteTemplate sSpriteTemplate_JudgmentIcon =
 {
     .tileTag = 0x3E8,
-    .paletteTag = INVALID_U16,
+    .paletteTag = 0xFFFF,
     .oam = &sOamData_8611F24,
     .anims = sSpriteAnimTable_8611F4C,
     .images = NULL,

src/battle_controller_link_opponent.c

@@ -212,7 +212,7 @@ static void sub_8064470(void)
 
 static void sub_80644D8(void)
 {
-    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8)
+    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
         LinkOpponentBufferExecCompleted();
@@ -395,7 +395,7 @@ static void CompleteOnHealthbarDone(void)
 
     SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
-    if (hpValue != INVALID_S16)
+    if (hpValue != -1)
     {
         UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT);
     }

src/battle_controller_link_partner.c

@@ -203,7 +203,7 @@ static void sub_814AF54(void)
 
 static void sub_814AFBC(void)
 {
-    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8)
+    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
         LinkPartnerBufferExecCompleted();
@@ -279,7 +279,7 @@ static void CompleteOnHealthbarDone(void)
 
     SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
-    if (hpValue != INVALID_S16)
+    if (hpValue != -1)
     {
         UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT);
     }

src/battle_controller_opponent.c

@@ -220,7 +220,7 @@ static void sub_805F240(void)
 
 static void sub_805F2A8(void)
 {
-    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8)
+    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
         OpponentBufferExecCompleted();
@@ -389,7 +389,7 @@ static void CompleteOnHealthbarDone(void)
 {
     s16 hpValue = MoveBattleBar(gActiveBattler, gHealthboxSpriteIds[gActiveBattler], HEALTH_BAR, 0);
     SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
-    if (hpValue != INVALID_S16)
+    if (hpValue != -1)
     {
         UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT);
     }

src/battle_controller_player.c

@@ -635,7 +635,7 @@ u32 sub_8057FBC(void) // unused
         PlaySE(SE_SELECT);
         gBattle_BG0_X = 0;
         gBattle_BG0_Y = 0x140;
-        var = INVALID_U8;
+        var = 0xFF;
     }
     if (gMain.newKeys & DPAD_LEFT && gMoveSelectionCursor[gActiveBattler] & 1)
     {
@@ -936,7 +936,7 @@ static void sub_80588B4(void)
 
 static void sub_8058924(void)
 {
-    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8)
+    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
         PlayerBufferExecCompleted();
@@ -1119,7 +1119,7 @@ static void CompleteOnHealthbarDone(void)
 
     SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
-    if (hpValue != INVALID_S16)
+    if (hpValue != -1)
     {
         UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT);
     }
@@ -1221,7 +1221,7 @@ static void sub_8059400(u8 taskId)
 
         newExpPoints = MoveBattleBar(battlerId, gHealthboxSpriteIds[battlerId], EXP_BAR, 0);
         SetHealthboxSpriteVisible(gHealthboxSpriteIds[battlerId]);
-        if (newExpPoints == INVALID_S16) // The bar has been filled with given exp points.
+        if (newExpPoints == -1) // The bar has been filled with given exp points.
         {
             u8 level;
             s32 currExp;

src/battle_controller_player_partner.c

@@ -218,7 +218,7 @@ static void sub_81BAE98(void)
 
 static void sub_81BAF00(void)
 {
-    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8)
+    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
         PlayerPartnerBufferExecCompleted();
@@ -294,7 +294,7 @@ static void CompleteOnHealthbarDone(void)
 
     SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
-    if (hpValue != INVALID_S16)
+    if (hpValue != -1)
     {
         UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT);
     }
@@ -397,7 +397,7 @@ static void sub_81BB4E4(u8 taskId)
 
         r4 = MoveBattleBar(battlerId, gHealthboxSpriteIds[battlerId], EXP_BAR, 0);
         SetHealthboxSpriteVisible(gHealthboxSpriteIds[battlerId]);
-        if (r4 == INVALID_S16)
+        if (r4 == -1)
         {
             u8 level;
             s32 currExp;

src/battle_controller_recorded_opponent.c

@@ -213,7 +213,7 @@ static void sub_81865C8(void)
 
 static void sub_8186630(void)
 {
-    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8)
+    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
         RecordedOpponentBufferExecCompleted();
@@ -377,7 +377,7 @@ static void CompleteOnHealthbarDone(void)
 
     SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
-    if (hpValue != INVALID_S16)
+    if (hpValue != -1)
     {
         UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT);
     }

src/battle_controller_recorded_player.c

@@ -202,7 +202,7 @@ static void sub_81899F0(void)
 
 static void sub_8189A58(void)
 {
-    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8)
+    if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0;
         RecordedPlayerBufferExecCompleted();
@@ -360,7 +360,7 @@ static void CompleteOnHealthbarDone(void)
 
     SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
-    if (hpValue != INVALID_S16)
+    if (hpValue != -1)
     {
         UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT);
     }

src/battle_controller_wally.c

@@ -348,7 +348,7 @@ static void CompleteOnHealthbarDone(void)
 
     SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]);
 
-    if (hpValue != INVALID_S16)
+    if (hpValue != -1)
     {
         UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT);
     }

src/battle_controllers.c

@@ -51,7 +51,7 @@ void SetUpBattleVarsAndBirchZigzagoon(void)
     for (i = 0; i < MAX_BATTLERS_COUNT; i++)
     {
         gBattlerControllerFuncs[i] = nullsub_21;
-        gBattlerPositions[i] = INVALID_U8;
+        gBattlerPositions[i] = 0xFF;
         gActionSelectionCursor[i] = 0;
         gMoveSelectionCursor[i] = 0;
     }

src/battle_dome.c

@@ -3032,7 +3032,7 @@ static s32 GetTypeEffectivenessPoints(s32 move, s32 targetSpecies, s32 arg2)
     s32 i = 0;
     s32 typePower = TYPE_x1;
 
-    if (move == MOVE_NONE || move == INVALID_U16 || gBattleMoves[move].power == 0)
+    if (move == MOVE_NONE || move == 0xFFFF || gBattleMoves[move].power == 0)
         return 0;
 
     defType1 = gBaseStats[targetSpecies].type1;
@@ -3434,14 +3434,14 @@ static s32 TournamentIdOfOpponent(s32 roundId, s32 trainerId)
         if (j != val)
             return gUnknown_0860D14C[j];
         else
-            return INVALID_U8;
+            return 0xFF;
     }
     else
     {
         if (!gSaveBlock2Ptr->frontier.domeTrainers[sIdToOpponentId[i][roundId]].isEliminated)
             return sIdToOpponentId[i][roundId];
         else
-            return INVALID_U8;
+            return 0xFF;
     }
 }
 
@@ -3562,7 +3562,7 @@ static void sub_8190400(u8 taskId)
         SetVBlankCallback(VblankCb0_BattleDome);
         sBattleDomeStruct = AllocZeroed(sizeof(*sBattleDomeStruct));
         for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++)
-            sBattleDomeStruct->arr[i] |= INVALID_U8;
+            sBattleDomeStruct->arr[i] |= 0xFF;
         LoadMonIconPalettes();
         i = CreateTask(sub_8190CD4, 0);
         gTasks[i].data[0] = 0;
@@ -3624,7 +3624,7 @@ static void SpriteCb_TrainerIconCardScrollUp(struct Sprite *sprite)
     {
         if (sprite->pos1.y >= 192)
         {
-            sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8;
+            sBattleDomeStruct->arr[sprite->data[2]] = 0xFF;
             FreeAndDestroyTrainerPicSprite(sprite->data[3]);
         }
     }
@@ -3644,7 +3644,7 @@ static void SpriteCb_TrainerIconCardScrollDown(struct Sprite *sprite)
     {
         if (sprite->pos1.y <= -32)
         {
-            sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8;
+            sBattleDomeStruct->arr[sprite->data[2]] = 0xFF;
             FreeAndDestroyTrainerPicSprite(sprite->data[3]);
         }
     }
@@ -3664,7 +3664,7 @@ static void SpriteCb_TrainerIconCardScrollLeft(struct Sprite *sprite)
     {
         if (sprite->pos1.x >= 272)
         {
-            sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8;
+            sBattleDomeStruct->arr[sprite->data[2]] = 0xFF;
             FreeAndDestroyTrainerPicSprite(sprite->data[3]);
         }
     }
@@ -3684,7 +3684,7 @@ static void SpriteCb_TrainerIconCardScrollRight(struct Sprite *sprite)
     {
         if (sprite->pos1.x <= -32)
         {
-            sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8;
+            sBattleDomeStruct->arr[sprite->data[2]] = 0xFF;
             FreeAndDestroyTrainerPicSprite(sprite->data[3]);
         }
     }
@@ -3714,7 +3714,7 @@ static void SpriteCb_MonIconCardScrollUp(struct Sprite *sprite)
     {
         if (sprite->pos1.y >= 176)
         {
-            sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8;
+            sBattleDomeStruct->arr[sprite->data[2]] = 0xFF;
             sub_80D2EF8(sprite);
         }
     }
@@ -3736,7 +3736,7 @@ static void SpriteCb_MonIconCardScrollDown(struct Sprite *sprite)
     {
         if (sprite->pos1.y <= -16)
         {
-            sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8;
+            sBattleDomeStruct->arr[sprite->data[2]] = 0xFF;
             sub_80D2EF8(sprite);
         }
     }
@@ -3758,7 +3758,7 @@ static void SpriteCb_MonIconCardScrollLeft(struct Sprite *sprite)
     {
         if (sprite->pos1.x >= 256)
         {
-            sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8;
+            sBattleDomeStruct->arr[sprite->data[2]] = 0xFF;
             sub_80D2EF8(sprite);
         }
     }
@@ -3780,7 +3780,7 @@ static void SpriteCb_MonIconCardScrollRight(struct Sprite *sprite)
     {
         if (sprite->pos1.x <= -16)
         {
-            sBattleDomeStruct->arr[sprite->data[2]] = INVALID_U8;
+            sBattleDomeStruct->arr[sprite->data[2]] = 0xFF;
             sub_80D2EF8(sprite);
         }
     }
@@ -4005,7 +4005,7 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 2)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollUp;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1;
@@ -4016,7 +4016,7 @@ static void sub_8190CD4(u8 taskId)
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollUp;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1;
@@ -4029,7 +4029,7 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 10)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollUp;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2];
@@ -4040,7 +4040,7 @@ static void sub_8190CD4(u8 taskId)
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollUp;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2];
@@ -4121,7 +4121,7 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 2)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollDown;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1;
@@ -4132,7 +4132,7 @@ static void sub_8190CD4(u8 taskId)
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollDown;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1;
@@ -4145,7 +4145,7 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 10)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollDown;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2];
@@ -4156,7 +4156,7 @@ static void sub_8190CD4(u8 taskId)
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollDown;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2];
@@ -4204,7 +4204,7 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 2)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1;
@@ -4215,7 +4215,7 @@ static void sub_8190CD4(u8 taskId)
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1;
@@ -4228,7 +4228,7 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 10)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2];
@@ -4239,7 +4239,7 @@ static void sub_8190CD4(u8 taskId)
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2];
@@ -4287,7 +4287,7 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 2)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1;
@@ -4298,7 +4298,7 @@ static void sub_8190CD4(u8 taskId)
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1;
@@ -4311,7 +4311,7 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 10)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollLeft;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2];
@@ -4322,7 +4322,7 @@ static void sub_8190CD4(u8 taskId)
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollLeft;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2];
@@ -4368,7 +4368,7 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 2)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1;
@@ -4379,7 +4379,7 @@ static void sub_8190CD4(u8 taskId)
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1;
@@ -4392,7 +4392,7 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 10)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2];
@@ -4403,7 +4403,7 @@ static void sub_8190CD4(u8 taskId)
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2];
@@ -4451,7 +4451,7 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 2)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1;
@@ -4462,7 +4462,7 @@ static void sub_8190CD4(u8 taskId)
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2] ^ 1;
@@ -4475,7 +4475,7 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 10)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_TrainerIconCardScrollRight;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2];
@@ -4486,7 +4486,7 @@ static void sub_8190CD4(u8 taskId)
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                     {
                         gSprites[sBattleDomeStruct->arr[i]].callback = SpriteCb_MonIconCardScrollRight;
                         gSprites[sBattleDomeStruct->arr[i]].data[0] = gTasks[taskId].data[2];
@@ -4556,12 +4556,12 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 2)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                         FreeAndDestroyTrainerPicSprite(sBattleDomeStruct->arr[i]);
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                         sub_80D2EF8(&gSprites[sBattleDomeStruct->arr[i]]);
                 }
             }
@@ -4569,12 +4569,12 @@ static void sub_8190CD4(u8 taskId)
             {
                 if (i < 10)
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                         FreeAndDestroyTrainerPicSprite(sBattleDomeStruct->arr[i]);
                 }
                 else
                 {
-                    if (sBattleDomeStruct->arr[i] != INVALID_U8)
+                    if (sBattleDomeStruct->arr[i] != 0xFF)
                         sub_80D2EF8(&gSprites[sBattleDomeStruct->arr[i]]);
                 }
             }
@@ -5483,13 +5483,13 @@ static u8 sub_8193BDC(u8 taskId)
     }
     else
     {
-        if (gMain.newKeys == DPAD_UP && gUnknown_0860CBF1[spriteId][roundId][0] != INVALID_U8)
+        if (gMain.newKeys == DPAD_UP && gUnknown_0860CBF1[spriteId][roundId][0] != 0xFF)
             arrId = 0;
-        else if (gMain.newKeys == DPAD_DOWN && gUnknown_0860CBF1[spriteId][roundId][1] != INVALID_U8)
+        else if (gMain.newKeys == DPAD_DOWN && gUnknown_0860CBF1[spriteId][roundId][1] != 0xFF)
             arrId = 1;
-        else if (gMain.newKeys == DPAD_LEFT && gUnknown_0860CBF1[spriteId][roundId][2] != INVALID_U8)
+        else if (gMain.newKeys == DPAD_LEFT && gUnknown_0860CBF1[spriteId][roundId][2] != 0xFF)
             arrId = 2;
-        else if (gMain.newKeys == DPAD_RIGHT && gUnknown_0860CBF1[spriteId][roundId][3] != INVALID_U8)
+        else if (gMain.newKeys == DPAD_RIGHT && gUnknown_0860CBF1[spriteId][roundId][3] != 0xFF)
             arrId = 3;
     }
 
@@ -6314,21 +6314,21 @@ static void DecideRoundWinners(u8 roundId)
         tournamentId1 = i;
         tournamentId2 = TournamentIdOfOpponent(roundId, gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].trainerId);
         // Frontier Brain always wins, check tournamentId1.
-        if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId2 != INVALID_U8)
+        if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId2 != 0xFF)
         {
             gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].isEliminated = 1;
             gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].eliminatedAt = roundId;
             gSaveBlock2Ptr->frontier.field_EC0[tournamentId2] = GetWinningMove(tournamentId1, tournamentId2, roundId);
         }
         // Frontier Brain always wins, check tournamentId2.
-        else if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId1 != INVALID_U8)
+        else if (gSaveBlock2Ptr->frontier.domeTrainers[tournamentId2].trainerId == TRAINER_FRONTIER_BRAIN && tournamentId1 != 0xFF)
         {
             gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].isEliminated = 1;
             gSaveBlock2Ptr->frontier.domeTrainers[tournamentId1].eliminatedAt = roundId;
             gSaveBlock2Ptr->frontier.field_EC0[tournamentId1] = GetWinningMove(tournamentId2, tournamentId1, roundId);
         }
         // Decide which one of two trainers wins!
-        else if (tournamentId2 != INVALID_U8)
+        else if (tournamentId2 != 0xFF)
         {
             // BUG: points1 and points2 are not cleared at the beginning of the loop resulting in not fair results.
 

src/battle_factory.c

@@ -202,9 +202,9 @@ static void sub_81A5E94(void)
 
     gUnknown_03001288 = FALSE;
     for (i = 0; i < 6; i++)
-        gSaveBlock2Ptr->frontier.field_E70[i].monId |= INVALID_U16;
+        gSaveBlock2Ptr->frontier.field_E70[i].monId |= 0xFFFF;
     for (i = 0; i < 3; i++)
-        gUnknown_03006298[i] |= INVALID_U16;
+        gUnknown_03006298[i] |= 0xFFFF;
 
     saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
     gTrainerBattleOpponent_A = 0;

src/battle_gfx_sfx_util.c

@@ -122,7 +122,7 @@ void FreeBattleSpritesData(void)
 u16 ChooseMoveAndTargetInBattlePalace(void)
 {
     s32 i, var1, var2;
-    s32 chosenMoveId = INVALID_S32;
+    s32 chosenMoveId = -1;
     struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBattler][4]);
     u8 unusableMovesBits = CheckMoveLimitations(gActiveBattler, 0, 0xFF);
     s32 percent = Random() % 100;

src/battle_interface.c

@@ -543,11 +543,11 @@ enum
 
 static const u16 sStatusIconColors[] =
 {
-    RGB(24, 12, 24), // PAL_STATUS_PSN
-    RGB(23, 23, 3), // PAL_STATUS_PAR
-    RGB(20, 20, 17), // PAL_STATUS_SLP
-    RGB(17, 22, 28), // PAL_STATUS_FRZ
-    RGB(28, 14, 10) // PAL_STATUS_BRN
+    [PAL_STATUS_PSN] = RGB(24, 12, 24),
+    [PAL_STATUS_PAR] = RGB(23, 23, 3),
+    [PAL_STATUS_SLP] = RGB(20, 20, 17),
+    [PAL_STATUS_FRZ] = RGB(17, 22, 28),
+    [PAL_STATUS_BRN] = RGB(28, 14, 10),
 };
 
 static const struct WindowTemplate sHealthboxWindowTemplate = {0, 0, 0, 8, 2, 0, 0}; // width = 8, height = 2
@@ -589,17 +589,17 @@ static void sub_8072308(s16 arg0, u16 *arg1, u8 arg2)
 
     for (; i > -1; i--)
     {
-        array[i] = INVALID_U8;
+        array[i] = 0xFF;
     }
 
-    if (arrayPtr[3] == INVALID_U8)
+    if (arrayPtr[3] == 0xFF)
         arrayPtr[3] = 0;
 
     if (arg2 == 0)
     {
         for (i = 0, j = 0; i < 4; i++)
         {
-            if (array[j] == INVALID_U8)
+            if (array[j] == 0xFF)
             {
                 arg1[j] &= 0xFC00;
                 arg1[j] |= 0x1E;
@@ -622,7 +622,7 @@ static void sub_8072308(s16 arg0, u16 *arg1, u8 arg2)
     {
         for (i = 0; i < 4; i++)
         {
-            if (array[i] == INVALID_U8)
+            if (array[i] == 0xFF)
             {
                 arg1[i] &= 0xFC00;
                 arg1[i] |= 0x1E;
@@ -1580,7 +1580,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo,
         {
             for (i = 0; i < PARTY_SIZE; i++)
             {
-                if (partyInfo[i].hp == INVALID_U16) // empty slot or an egg
+                if (partyInfo[i].hp == 0xFFFF) // empty slot or an egg
                 {
                     gSprites[ballIconSpritesIds[i]].oam.tileNum += 1;
                     gSprites[ballIconSpritesIds[i]].data[7] = 1;
@@ -1599,7 +1599,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo,
         {
             for (i = 0, var = 5, j = 0; j < PARTY_SIZE; j++)
             {
-                if (partyInfo[j].hp == INVALID_U16) // empty slot or an egg
+                if (partyInfo[j].hp == 0xFFFF) // empty slot or an egg
                 {
                     gSprites[ballIconSpritesIds[var]].oam.tileNum += 1;
                     gSprites[ballIconSpritesIds[var]].data[7] = 1;
@@ -1628,7 +1628,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo,
         {
             for (var = 5, i = 0; i < PARTY_SIZE; i++)
             {
-                if (partyInfo[i].hp == INVALID_U16) // empty slot or an egg
+                if (partyInfo[i].hp == 0xFFFF) // empty slot or an egg
                 {
                     gSprites[ballIconSpritesIds[var]].oam.tileNum += 1;
                     gSprites[ballIconSpritesIds[var]].data[7] = 1;
@@ -1648,7 +1648,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo,
         {
             for (var = 0, i = 0, j = 0; j < PARTY_SIZE; j++)
             {
-                if (partyInfo[j].hp == INVALID_U16) // empty slot or an egg
+                if (partyInfo[j].hp == 0xFFFF) // empty slot or an egg
                 {
                     gSprites[ballIconSpritesIds[i]].oam.tileNum += 1;
                     gSprites[ballIconSpritesIds[i]].data[7] = 1;
@@ -1765,7 +1765,7 @@ static void sub_8073E64(u8 taskId)
     s32 i;
 
     u8 battlerId = gTasks[taskId].tBattler;
-    if (--gTasks[taskId].tData15 == INVALID_S16)
+    if (--gTasks[taskId].tData15 == -1)
     {
         u8 summaryBarSpriteId = gTasks[taskId].tSummaryBarSpriteId;
 
@@ -1808,7 +1808,7 @@ static void sub_8073F98(u8 taskId)
     {
         SetGpuReg(REG_OFFSET_BLDALPHA, (gTasks[taskId].tData15) | ((16 - gTasks[taskId].tData15) << 8));
     }
-    else if (gTasks[taskId].tData15 == INVALID_S16)
+    else if (gTasks[taskId].tData15 == -1)
     {
         u8 summaryBarSpriteId = gTasks[taskId].tSummaryBarSpriteId;
 
@@ -2289,7 +2289,7 @@ s32 MoveBattleBar(u8 battlerId, u8 healthboxSpriteId, u8 whichBar, u8 unused)
     if (whichBar == EXP_BAR || (whichBar == HEALTH_BAR && !gBattleSpritesDataPtr->battlerData[battlerId].hpNumbersNoBars))
         MoveBattleBarGraphically(battlerId, whichBar);
 
-    if (currentBarValue == INVALID_S32)
+    if (currentBarValue == -1)
         gBattleSpritesDataPtr->battleBars[battlerId].currValue = 0;
 
     return currentBarValue;
@@ -2376,12 +2376,12 @@ static s32 CalcNewBarValue(s32 maxValue, s32 oldValue, s32 receivedValue, s32 *c
     if (maxValue < scale)
     {
         if (newValue == Q_24_8_TO_INT(*currValue) && (*currValue & 0xFF) == 0)
-            return INVALID_S32;
+            return -1;
     }
     else
     {
         if (newValue == *currValue) // we're done, the bar's value has been updated
-            return INVALID_S32;
+            return -1;
     }
 
     if (maxValue < scale) // handle cases of max var having less pixels than the whole bar
@@ -2403,7 +2403,7 @@ static s32 CalcNewBarValue(s32 maxValue, s32 oldValue, s32 receivedValue, s32 *c
             *currValue -= toAdd;
             ret = Q_24_8_TO_INT(*currValue);
             // try round up
-            if ((*currValue & INVALID_U8) > 0)
+            if ((*currValue & 0xFF) > 0)
                 ret++;
             if (ret <= newValue)
             {

src/battle_main.c

@@ -500,7 +500,7 @@ const struct TrainerMoney gTrainerMoneyTable[] =
     {TRAINER_CLASS_HIKER, 10},
     {TRAINER_CLASS_YOUNG_COUPLE, 8},
     {TRAINER_CLASS_WINSTRATE, 10},
-    {INVALID_U8, 5},
+    {0xFF, 5},
 };
 
 #include "data/text/abilities.h"
@@ -2251,7 +2251,7 @@ static void sub_8038F34(void)
         ShowBg(0);
         ShowBg(1);
         ShowBg(2);
-        gBattleCommunication[1] = INVALID_U8;
+        gBattleCommunication[1] = 0xFF;
         gBattleCommunication[MULTIUSE_STATE]++;
         break;
     case 1:
@@ -2993,7 +2993,7 @@ static void BattleStartClearSetData(void)
         gLastLandedMoves[i] = 0;
         gLastHitByType[i] = 0;
         gLastResultingMoves[i] = 0;
-        gLastHitBy[i] = INVALID_U8;
+        gLastHitBy[i] = 0xFF;
         gLockedMoves[i] = 0;
         gLastPrintedMoves[i] = 0;
         gBattleResources->flags->flags[i] = 0;
@@ -3161,7 +3161,7 @@ void SwitchInClearSetData(void)
     gLastHitByType[gActiveBattler] = 0;
     gLastResultingMoves[gActiveBattler] = 0;
     gLastPrintedMoves[gActiveBattler] = 0;
-    gLastHitBy[gActiveBattler] = INVALID_U8;
+    gLastHitBy[gActiveBattler] = 0xFF;
 
     *(gBattleStruct->lastTakenMove + gActiveBattler * 2 + 0) = 0;
     *(gBattleStruct->lastTakenMove + gActiveBattler * 2 + 1) = 0;
@@ -3192,7 +3192,7 @@ void SwitchInClearSetData(void)
 
     gBattleResources->flags->flags[gActiveBattler] = 0;
     gCurrentMove = 0;
-    gBattleStruct->field_DA = INVALID_U8;
+    gBattleStruct->field_DA = 0xFF;
 
     ClearBattlerMoveHistory(gActiveBattler);
     ClearBattlerAbilityHistory(gActiveBattler);
@@ -3253,7 +3253,7 @@ void FaintClearSetData(void)
     gLastHitByType[gActiveBattler] = 0;
     gLastResultingMoves[gActiveBattler] = 0;
     gLastPrintedMoves[gActiveBattler] = 0;
-    gLastHitBy[gActiveBattler] = INVALID_U8;
+    gLastHitBy[gActiveBattler] = 0xFF;
 
     *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBattler]) + 0) = 0;
     *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBattler]) + 1) = 0;
@@ -3440,7 +3440,7 @@ static void BattleIntroDrawPartySummaryScreens(void)
             if (GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_NONE
              || GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_EGG)
             {
-                hpStatus[i].hp = INVALID_U16;
+                hpStatus[i].hp = 0xFFFF;
                 hpStatus[i].status = 0;
             }
             else
@@ -3458,7 +3458,7 @@ static void BattleIntroDrawPartySummaryScreens(void)
             if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_NONE
              || GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_EGG)
             {
-                hpStatus[i].hp = INVALID_U16;
+                hpStatus[i].hp = 0xFFFF;
                 hpStatus[i].status = 0;
             }
             else
@@ -3484,7 +3484,7 @@ static void BattleIntroDrawPartySummaryScreens(void)
             if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_NONE
              || GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_EGG)
             {
-                hpStatus[i].hp = INVALID_U16;
+                hpStatus[i].hp = 0xFFFF;
                 hpStatus[i].status = 0;
             }
             else
@@ -3991,7 +3991,7 @@ void BattleTurnPassed(void)
         return;
     }
 
-    if (gBattleResults.battleTurnCounter < INVALID_U8)
+    if (gBattleResults.battleTurnCounter < 0xFF)
     {
         gBattleResults.battleTurnCounter++;
         gBattleStruct->field_DA++;
@@ -4375,7 +4375,7 @@ static void HandleTurnActionSelectionState(void)
                         return;
                     default:
                         sub_818603C(2);
-                        if ((gBattleBufferB[gActiveBattler][2] | (gBattleBufferB[gActiveBattler][3] << 8)) == INVALID_U16)
+                        if ((gBattleBufferB[gActiveBattler][2] | (gBattleBufferB[gActiveBattler][3] << 8)) == 0xFFFF)
                         {
                             gBattleCommunication[gActiveBattler] = STATE_BEFORE_ACTION_CHOSEN;
                             RecordedBattle_ClearBattlerAction(gActiveBattler, 1);
@@ -5740,7 +5740,7 @@ static void HandleAction_ThrowPokeblock(void)
     gBattleCommunication[MULTISTRING_CHOOSER] = gBattleBufferB[gBattlerAttacker][1] - 1;
     gLastUsedItem = gBattleBufferB[gBattlerAttacker][2];
 
-    if (gBattleResults.pokeblockThrows < INVALID_U8)
+    if (gBattleResults.pokeblockThrows < 0xFF)
         gBattleResults.pokeblockThrows++;
     if (gBattleStruct->safariPkblThrowCounter < 3)
         gBattleStruct->safariPkblThrowCounter++;

src/battle_message.c

@@ -1156,7 +1156,7 @@ const u16 gCaughtMonStringIds[] =
 
 const u16 gTrappingMoves[] =
 {
-    MOVE_BIND, MOVE_WRAP, MOVE_FIRE_SPIN, MOVE_CLAMP, MOVE_WHIRLPOOL, MOVE_SAND_TOMB, INVALID_U16
+    MOVE_BIND, MOVE_WRAP, MOVE_FIRE_SPIN, MOVE_CLAMP, MOVE_WHIRLPOOL, MOVE_SAND_TOMB, 0xFFFF
 };
 
 const u8 gText_PkmnIsEvolving[] = _("What?\n{STR_VAR_1} is evolving!");
@@ -2967,7 +2967,7 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId)
     printerTemplate.bgColor = textInfo[windowId].bgColor;
     printerTemplate.shadowColor = textInfo[windowId].shadowColor;
 
-    if (printerTemplate.x == INVALID_U8)
+    if (printerTemplate.x == 0xFF)
     {
         u32 width = sub_80397C4(gBattleScripting.windowsType, windowId);
         s32 alignX = GetStringCenterAlignXOffsetWithLetterSpacing(printerTemplate.fontId, printerTemplate.currentChar, width, printerTemplate.letterSpacing);

src/battle_pike.c

@@ -1228,7 +1228,7 @@ static void sub_81A7E60(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4)
 
 static bool8 sub_81A7EC4(void)
 {
-    if (FindTaskIdByFunc(sub_81A7D54) == INVALID_U8)
+    if (FindTaskIdByFunc(sub_81A7D54) == 0xFF)
         return TRUE;
     else
         return FALSE;
@@ -1448,7 +1448,7 @@ static void sub_81A84B4(void)
     u8 i;
 
     for (i = 0; i < 14; i++)
-        gSaveBlock2Ptr->frontier.field_CB4[i] |= INVALID_U16;
+        gSaveBlock2Ptr->frontier.field_CB4[i] |= 0xFFFF;
 }
 
 static void sub_81A84EC(void)

src/battle_pyramid.c

@@ -1541,7 +1541,7 @@ void sub_81AA1D8(void)
     u8 var0, var1;
 
     for (i = 0; i < 8; i++)
-        gSaveBlock2Ptr->frontier.field_CB4[i] |= INVALID_U16;
+        gSaveBlock2Ptr->frontier.field_CB4[i] |= 0xFFFF;
 
     id = sub_81AA9E4();
     sub_81AA33C(&var0, &var1);

src/battle_pyramid_bag.c

@@ -388,11 +388,11 @@ void sub_81C4F98(u8 a0, void (*callback)(void))
         gPyramidBagCursorData.callback = callback;
 
     gPyramidBagResources->callback2 = NULL;
-    gPyramidBagResources->unk814 = INVALID_U8;
-    gPyramidBagResources->scrollIndicatorsTaskId = INVALID_U8;
+    gPyramidBagResources->unk814 = 0xFF;
+    gPyramidBagResources->scrollIndicatorsTaskId = 0xFF;
 
-    memset(gPyramidBagResources->itemsSpriteIds, INVALID_U8, sizeof(gPyramidBagResources->itemsSpriteIds));
-    memset(gPyramidBagResources->windowIds, INVALID_U8, sizeof(gPyramidBagResources->windowIds));
+    memset(gPyramidBagResources->itemsSpriteIds, 0xFF, sizeof(gPyramidBagResources->itemsSpriteIds));
+    memset(gPyramidBagResources->windowIds, 0xFF, sizeof(gPyramidBagResources->windowIds));
 
     SetMainCallback2(sub_81C504C);
 }
@@ -604,7 +604,7 @@ static void PyramidBagMoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMen
         PlaySE(SE_SELECT);
         sub_81C6F20();
     }
-    if (gPyramidBagResources->unk814 == INVALID_U8)
+    if (gPyramidBagResources->unk814 == 0xFF)
     {
         sub_81C6FF8(gPyramidBagResources->unk815 ^ 1);
         if (itemIndex != LIST_B_PRESSED)
@@ -622,7 +622,7 @@ static void PrintItemQuantity(u8 windowId, s32 itemIndex, u8 y)
     if (itemIndex == LIST_B_PRESSED)
         return;
 
-    if (gPyramidBagResources->unk814 != INVALID_U8)
+    if (gPyramidBagResources->unk814 != 0xFF)
     {
         if (gPyramidBagResources->unk814 == (u8)(itemIndex))
             sub_81C5AB8(y, 1);
@@ -657,16 +657,16 @@ static void PrintItemDescription(s32 listMenuId)
 
 static void AddScrollArrow(void)
 {
-    if (gPyramidBagResources->scrollIndicatorsTaskId == INVALID_U8)
+    if (gPyramidBagResources->scrollIndicatorsTaskId == 0xFF)
         gPyramidBagResources->scrollIndicatorsTaskId = AddScrollIndicatorArrowPairParameterized(2, 172, 12, 148, gPyramidBagResources->listMenuCount - gPyramidBagResources->listMenuMaxShown, 0xB5E, 0xB5E, &gPyramidBagCursorData.scrollPosition);
 }
 
 static void RemoveScrollArrow(void)
 {
-    if (gPyramidBagResources->scrollIndicatorsTaskId != INVALID_U8)
+    if (gPyramidBagResources->scrollIndicatorsTaskId != 0xFF)
     {
         RemoveScrollIndicatorArrowPair(gPyramidBagResources->scrollIndicatorsTaskId);
-        gPyramidBagResources->scrollIndicatorsTaskId = INVALID_U8;
+        gPyramidBagResources->scrollIndicatorsTaskId = 0xFF;
     }
 }
 
@@ -803,7 +803,7 @@ static void sub_81C5A98(u8 listMenuTaskId, u8 arg1)
 
 static void sub_81C5AB8(u8 y, u8 arg1)
 {
-    if (arg1 == INVALID_U8)
+    if (arg1 == 0xFF)
         FillWindowPixelRect(0, 0, 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1));
     else
         PrintOnWindow_Font1(0, gText_SelectorArrow2, 0, y, 0, 0, 0, arg1);
@@ -1323,7 +1323,7 @@ static void PerformItemSwap(u8 taskId)
     else
     {
         MovePyramidBagItemSlotInList(data[1], var);
-        gPyramidBagResources->unk814 = INVALID_U8;
+        gPyramidBagResources->unk814 = 0xFF;
         sub_81C7028(TRUE);
         DestroyListMenuTask(data[0], scrollOffset, selectedRow);
         if (data[1] < var)
@@ -1340,7 +1340,7 @@ static void sub_81C6A14(u8 taskId)
     u16 *scrollOffset = &gPyramidBagCursorData.scrollPosition;
     u16 *selectedRow = &gPyramidBagCursorData.cursorPosition;
 
-    gPyramidBagResources->unk814 = INVALID_U8;
+    gPyramidBagResources->unk814 = 0xFF;
     sub_81C7028(TRUE);
     DestroyListMenuTask(data[0], scrollOffset, selectedRow);
     if (data[1] < *scrollOffset + *selectedRow)
@@ -1427,7 +1427,7 @@ static u8 sub_81C6D08(u8 windowArrayId)
 static u8 sub_81C6D24(u8 windowArrayId)
 {
     u8 *windowId = &gPyramidBagResources->windowIds[windowArrayId];
-    if (*windowId == INVALID_U8)
+    if (*windowId == 0xFF)
     {
         *windowId = AddWindow(&gUnknown_0861F350[windowArrayId]);
         SetWindowBorderStyle(*windowId, FALSE, 1, 0xE);
@@ -1439,13 +1439,13 @@ static u8 sub_81C6D24(u8 windowArrayId)
 static void sub_81C6D6C(u8 windowArrayId)
 {
     u8 *windowId = &gPyramidBagResources->windowIds[windowArrayId];
-    if (*windowId != INVALID_U8)
+    if (*windowId != 0xFF)
     {
         sub_8198070(*windowId, FALSE);
         ClearWindowTilemap(*windowId);
         RemoveWindow(*windowId);
         schedule_bg_copy_tilemap_to_vram(1);
-        *windowId = INVALID_U8;
+        *windowId = 0xFF;
     }
 }
 
@@ -1473,13 +1473,13 @@ static void sub_81C6E1C(void)
 static void sub_81C6E38(u8 itemSpriteArrayId)
 {
     u8 *spriteId = &gPyramidBagResources->itemsSpriteIds[itemSpriteArrayId];
-    if (*spriteId != INVALID_U8)
+    if (*spriteId != 0xFF)
     {
         FreeSpriteTilesByTag(ITEM_IMAGE_TAG + itemSpriteArrayId);
         FreeSpritePaletteByTag(ITEM_IMAGE_TAG + itemSpriteArrayId);
         FreeSpriteOamMatrix(&gSprites[*spriteId]);
         DestroySprite(&gSprites[*spriteId]);
-        *spriteId = INVALID_U8;
+        *spriteId = 0xFF;
     }
 }
 
@@ -1524,7 +1524,7 @@ static void ShowItemImage(u16 itemId, u8 itemSpriteArrayId)
 {
     u8 itemSpriteId;
     u8 *spriteId = &gPyramidBagResources->itemsSpriteIds[itemSpriteArrayId + 1];
-    if (*spriteId == INVALID_U8)
+    if (*spriteId == 0xFF)
     {
         FreeSpriteTilesByTag(ITEM_IMAGE_TAG + 1 + itemSpriteArrayId);
         FreeSpritePaletteByTag(ITEM_IMAGE_TAG + 1 + itemSpriteArrayId);

src/battle_script_commands.c

@@ -763,8 +763,8 @@ static const struct SpriteTemplate sSpriteTemplate_MonIconOnLvlUpBox =
 static const u16 sProtectSuccessRates[] = {USHRT_MAX, USHRT_MAX / 2, USHRT_MAX / 4, USHRT_MAX / 8};
 
 #define MIMIC_FORBIDDEN_END             0xFFFE
-#define METRONOME_FORBIDDEN_END         INVALID_U16
-#define ASSIST_FORBIDDEN_END            INVALID_U16
+#define METRONOME_FORBIDDEN_END         0xFFFF
+#define ASSIST_FORBIDDEN_END            0xFFFF
 
 static const u16 sMovesForbiddenToCopy[] =
 {
@@ -822,7 +822,7 @@ static const u16 sWeightToDamageTable[] =
     500, 60,
     1000, 80,
     2000, 100,
-    INVALID_U16, INVALID_U16
+    0xFFFF, 0xFFFF
 };
 
 static const u16 sPickupItems[] =
@@ -1976,7 +1976,7 @@ static void atk0C_datahpupdate(void)
     {
         gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
         if (gSpecialStatuses[gActiveBattler].dmg == 0)
-            gSpecialStatuses[gActiveBattler].dmg = INVALID_U16;
+            gSpecialStatuses[gActiveBattler].dmg = 0xFFFF;
     }
     gBattlescriptCurrInstr += 2;
 }
@@ -2579,7 +2579,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
                     u16 PayDay = gPaydayMoney;
                     gPaydayMoney += (gBattleMons[gBattlerAttacker].level * 5);
                     if (PayDay > gPaydayMoney)
-                        gPaydayMoney = INVALID_U16;
+                        gPaydayMoney = 0xFFFF;
                 }
                 BattleScriptPush(gBattlescriptCurrInstr + 1);
                 gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]];
@@ -4520,7 +4520,7 @@ static void atk49_moveend(void)
     u8 arg1, arg2;
     u16 originallyUsedMove;
 
-    if (gChosenMove == INVALID_U16)
+    if (gChosenMove == 0xFFFF)
         originallyUsedMove = 0;
     else
         originallyUsedMove = gChosenMove;
@@ -4593,7 +4593,7 @@ static void atk49_moveend(void)
             break;
         case ATK49_CHOICE_MOVE: // update choice band move
             if (!(gHitMarker & HITMARKER_OBEYS) || holdEffectAtk != HOLD_EFFECT_CHOICE_BAND
-                || gChosenMove == MOVE_STRUGGLE || (*choicedMoveAtk != 0 && *choicedMoveAtk != INVALID_U16))
+                || gChosenMove == MOVE_STRUGGLE || (*choicedMoveAtk != 0 && *choicedMoveAtk != 0xFFFF))
                     goto LOOP;
             if (gChosenMove == MOVE_BATON_PASS && !(gMoveResultFlags & MOVE_RESULT_FAILED))
             {
@@ -4708,8 +4708,8 @@ static void atk49_moveend(void)
                 }
                 else
                 {
-                    gLastMoves[gBattlerAttacker] = INVALID_U16;
-                    gLastResultingMoves[gBattlerAttacker] = INVALID_U16;
+                    gLastMoves[gBattlerAttacker] = 0xFFFF;
+                    gLastResultingMoves[gBattlerAttacker] = 0xFFFF;
                 }
 
                 if (!(gHitMarker & HITMARKER_FAINTED(gBattlerTarget)))
@@ -4717,7 +4717,7 @@ static void atk49_moveend(void)
 
                 if (gHitMarker & HITMARKER_OBEYS && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
                 {
-                    if (gChosenMove == INVALID_U16)
+                    if (gChosenMove == 0xFFFF)
                     {
                         gLastLandedMoves[gBattlerTarget] = gChosenMove;
                     }
@@ -4729,7 +4729,7 @@ static void atk49_moveend(void)
                 }
                 else
                 {
-                    gLastLandedMoves[gBattlerTarget] = INVALID_U16;
+                    gLastLandedMoves[gBattlerTarget] = 0xFFFF;
                 }
             }
             gBattleScripting.atk49_state++;
@@ -5662,7 +5662,7 @@ static void atk59_handlelearnnewmove(void)
     {
         gBattlescriptCurrInstr = jumpPtr2;
     }
-    else if (ret == INVALID_U16)
+    else if (ret == 0xFFFF)
     {
         gBattlescriptCurrInstr += 10;
     }
@@ -6015,7 +6015,7 @@ static void atk61_drawpartystatussummary(void)
         if (GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_NONE
             || GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_EGG)
         {
-            hpStatuses[i].hp = INVALID_U16;
+            hpStatuses[i].hp = 0xFFFF;
             hpStatuses[i].status = 0;
         }
         else
@@ -6930,7 +6930,7 @@ static void atk7C_trymirrormove(void)
             move = *(i * 2 + gBattlerAttacker * 8 + (u8*)(gBattleStruct->lastTakenMoveFrom) + 0)
                 | (*(i * 2 + gBattlerAttacker * 8 + (u8*)(gBattleStruct->lastTakenMoveFrom) + 1) << 8);
 
-            if (move != 0 && move != INVALID_U16)
+            if (move != 0 && move != 0xFFFF)
             {
                 movesArray[validMovesCount] = move;
                 validMovesCount++;
@@ -6941,7 +6941,7 @@ static void atk7C_trymirrormove(void)
     move = *(gBattleStruct->lastTakenMove + gBattlerAttacker * 2 + 0)
         | (*(gBattleStruct->lastTakenMove + gBattlerAttacker * 2 + 1) << 8);
 
-    if (move != 0 && move != INVALID_U16)
+    if (move != 0 && move != 0xFFFF)
     {
         gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
         gCurrentMove = move;
@@ -7094,7 +7094,7 @@ bool8 UproarWakeUpCheck(u8 battlerId)
 
         gBattleScripting.battler = i;
 
-        if (gBattlerTarget == INVALID_U8)
+        if (gBattlerTarget == 0xFF)
             gBattlerTarget = i;
         else if (gBattlerTarget == i)
             gBattleCommunication[MULTISTRING_CHOOSER] = 0;
@@ -8008,7 +8008,7 @@ static void atk9A_setfocusenergy(void)
 
 static void atk9B_transformdataexecution(void)
 {
-    gChosenMove = INVALID_U16;
+    gChosenMove = 0xFFFF;
     gBattlescriptCurrInstr++;
     if (gBattleMons[gBattlerTarget].status2 & STATUS2_TRANSFORMED
         || gStatuses3[gBattlerTarget] & STATUS3_SEMI_INVULNERABLE)
@@ -8088,12 +8088,12 @@ static bool8 IsMoveUncopyableByMimic(u16 move)
 
 static void atk9D_mimicattackcopy(void)
 {
-    gChosenMove = INVALID_U16;
+    gChosenMove = 0xFFFF;
 
     if (IsMoveUncopyableByMimic(gLastMoves[gBattlerTarget])
         || gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED
         || gLastMoves[gBattlerTarget] == 0
-        || gLastMoves[gBattlerTarget] == INVALID_U16)
+        || gLastMoves[gBattlerTarget] == 0xFFFF)
     {
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
     }
@@ -8296,7 +8296,7 @@ static void atkA5_painsplitdmgcalc(void)
         storeLoc[3] = (painSplitHp & 0xFF000000) >> 24;
 
         gBattleMoveDamage = gBattleMons[gBattlerAttacker].hp - hpDiff;
-        gSpecialStatuses[gBattlerTarget].dmg = INVALID_U16;
+        gSpecialStatuses[gBattlerTarget].dmg = 0xFFFF;
 
         gBattlescriptCurrInstr += 5;
     }
@@ -8309,7 +8309,7 @@ static void atkA5_painsplitdmgcalc(void)
 static void atkA6_settypetorandomresistance(void) // conversion 2
 {
     if (gLastLandedMoves[gBattlerAttacker] == 0
-        || gLastLandedMoves[gBattlerAttacker] == INVALID_U16)
+        || gLastLandedMoves[gBattlerAttacker] == 0xFFFF)
     {
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
     }
@@ -8376,12 +8376,12 @@ static void atkA7_setalwayshitflag(void)
 
 static void atkA8_copymovepermanently(void) // sketch
 {
-    gChosenMove = INVALID_U16;
+    gChosenMove = 0xFFFF;
 
     if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED)
         && gLastPrintedMoves[gBattlerTarget] != MOVE_STRUGGLE
         && gLastPrintedMoves[gBattlerTarget] != 0
-        && gLastPrintedMoves[gBattlerTarget] != INVALID_U16
+        && gLastPrintedMoves[gBattlerTarget] != 0xFFFF
         && gLastPrintedMoves[gBattlerTarget] != MOVE_SKETCH)
     {
         s32 i;
@@ -8550,7 +8550,7 @@ static void atkAC_remaininghptopower(void)
 static void atkAD_tryspiteppreduce(void)
 {
     if (gLastMoves[gBattlerTarget] != 0
-        && gLastMoves[gBattlerTarget] != INVALID_U16)
+        && gLastMoves[gBattlerTarget] != 0xFFFF)
     {
         s32 i;
 
@@ -9671,13 +9671,13 @@ static void atkDC_trysetgrudge(void)
 static void atkDD_weightdamagecalculation(void)
 {
     s32 i;
-    for (i = 0; sWeightToDamageTable[i] != INVALID_U16; i += 2)
+    for (i = 0; sWeightToDamageTable[i] != 0xFFFF; i += 2)
     {
         if (sWeightToDamageTable[i] > GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[gBattlerTarget].species), 1))
             break;
     }
 
-    if (sWeightToDamageTable[i] != INVALID_U16)
+    if (sWeightToDamageTable[i] != 0xFFFF)
         gDynamicBasePower = sWeightToDamageTable[i + 1];
     else
         gDynamicBasePower = 120;

src/battle_setup.c

@@ -1530,7 +1530,7 @@ static s32 FirstBattleTrainerIdToRematchTableId(const struct RematchTrainer *tab
             return i;
     }
 
-    return INVALID_S32;
+    return -1;
 }
 
 static s32 TrainerIdToRematchTableId(const struct RematchTrainer *table, u16 trainerId)
@@ -1548,7 +1548,7 @@ static s32 TrainerIdToRematchTableId(const struct RematchTrainer *table, u16 tra
         }
     }
 
-    return INVALID_S32;
+    return -1;
 }
 
 static bool32 sub_80B1D94(s32 rematchTableId)
@@ -1640,7 +1640,7 @@ static bool8 IsFirstTrainerIdReadyForRematch(const struct RematchTrainer *table,
 {
     s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId);
 
-    if (tableId == INVALID_S32)
+    if (tableId == -1)
         return FALSE;
     if (tableId >= 100)
         return FALSE;
@@ -1654,7 +1654,7 @@ static bool8 IsTrainerReadyForRematch_(const struct RematchTrainer *table, u16 t
 {
     s32 tableId = TrainerIdToRematchTableId(table, trainerId);
 
-    if (tableId == INVALID_S32)
+    if (tableId == -1)
         return FALSE;
     if (tableId >= 100)
         return FALSE;
@@ -1670,7 +1670,7 @@ static u16 GetRematchTrainerIdFromTable(const struct RematchTrainer *table, u16
     s32 i;
     s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId);
 
-    if (tableId == INVALID_S32)
+    if (tableId == -1)
         return FALSE;
 
     trainerEntry = &table[tableId];
@@ -1691,7 +1691,7 @@ static u16 GetLastBeatenRematchTrainerIdFromTable(const struct RematchTrainer *t
     s32 i;
     s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId);
 
-    if (tableId == INVALID_S32)
+    if (tableId == -1)
         return FALSE;
 
     trainerEntry = &table[tableId];
@@ -1710,7 +1710,7 @@ static void ClearTrainerWantRematchState(const struct RematchTrainer *table, u16
 {
     s32 tableId = TrainerIdToRematchTableId(table, firstBattleTrainerId);
 
-    if (tableId != INVALID_S32)
+    if (tableId != -1)
         gSaveBlock1Ptr->trainerRematches[tableId] = 0;
 }
 
@@ -1724,7 +1724,7 @@ static u32 GetTrainerMatchCallFlag(u32 trainerId)
             return FLAG_MATCH_CALL_REGISTERED + i;
     }
 
-    return INVALID_U16;
+    return 0xFFFF;
 }
 
 static void RegisterTrainerInMatchCall(void)
@@ -1732,7 +1732,7 @@ static void RegisterTrainerInMatchCall(void)
     if (FlagGet(FLAG_HAS_MATCH_CALL))
     {
         u32 matchCallFlagId = GetTrainerMatchCallFlag(gTrainerBattleOpponent_A);
-        if (matchCallFlagId != INVALID_U16)
+        if (matchCallFlagId != 0xFFFF)
             FlagSet(matchCallFlagId);
     }
 }
@@ -1741,7 +1741,7 @@ static bool8 WasSecondRematchWon(const struct RematchTrainer *table, u16 firstBa
 {
     s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId);
 
-    if (tableId == INVALID_S32)
+    if (tableId == -1)
         return FALSE;
     if (!HasTrainerBeenFought(table[tableId].trainerIds[1]))
         return FALSE;

src/battle_tent.c

@@ -364,7 +364,7 @@ static void sub_81BA040(void)
         } while (i != gSaveBlock2Ptr->frontier.curChallengeBattleNum);
 
         gTrainerBattleOpponent_A = trainerId;
-        while (gFacilityTrainers[gTrainerBattleOpponent_A].monSets[setsCount] != INVALID_U16)
+        while (gFacilityTrainers[gTrainerBattleOpponent_A].monSets[setsCount] != 0xFFFF)
             setsCount++;
         if (setsCount > 8)
             break;

src/battle_tower.c

@@ -973,7 +973,7 @@ static void FillTrainerParty(u16 trainerId, u8 firstMonId, u8 monCount)
     // Attempt to fill the trainer's party with random Pokemon until 3 have been
     // successfully chosen. The trainer's party may not have duplicate pokemon species
     // or duplicate held items.
-    for (bfMonCount = 0; monSets[bfMonCount] != INVALID_U16; bfMonCount++)
+    for (bfMonCount = 0; monSets[bfMonCount] != 0xFFFF; bfMonCount++)
         ;
     i = 0;
     otID = Random32();
@@ -1081,11 +1081,11 @@ u16 RandomizeFacilityTrainerMonSet(u16 trainerId)
     u8 bfMonCount = 0;
     u32 monSetId = monSets[bfMonCount];
 
-    while (monSetId != INVALID_U16)
+    while (monSetId != 0xFFFF)
     {
         bfMonCount++;
         monSetId = monSets[bfMonCount];
-        if (monSetId == INVALID_U16)
+        if (monSetId == 0xFFFF)
             break;
     }
 
@@ -2641,11 +2641,11 @@ static void FillTentTrainerParty_(u16 trainerId, u8 firstMonId, u8 monCount)
 
     bfMonCount = 0;
     monSetId = monSets[bfMonCount];
-    while (monSetId != INVALID_U16)
+    while (monSetId != 0xFFFF)
     {
         bfMonCount++;
         monSetId = monSets[bfMonCount];
-        if (monSetId == INVALID_U16)
+        if (monSetId == 0xFFFF)
             break;
     }
 

src/battle_transition.c

@@ -749,7 +749,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_85C8E60[] =
 
 static const struct SpriteTemplate gUnknown_085C8E68 =
 {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 4105,
     .oam = &gEventObjectBaseOam_32x32,
     .anims = sSpriteAnimTable_85C8E3C,
@@ -798,7 +798,7 @@ static const union AnimCmd *const sSpriteAnimTable_85C8EA0[] =
 
 static const struct SpriteTemplate sSpriteTemplate_85C8EA4 =
 {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 4106,
     .oam = &gOamData_85C8E80,
     .anims = sSpriteAnimTable_85C8EA0,
@@ -809,7 +809,7 @@ static const struct SpriteTemplate sSpriteTemplate_85C8EA4 =
 
 static const struct SpriteTemplate sSpriteTemplate_85C8EBC =
 {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 4106,
     .oam = &gOamData_85C8E80,
     .anims = sSpriteAnimTable_85C8EA0,
@@ -998,7 +998,7 @@ static bool8 Transition_Phase1(struct Task *task)
 
 static bool8 Transition_WaitForPhase1(struct Task *task)
 {
-    if (FindTaskIdByFunc(sPhase1_Tasks[task->tTransitionId]) == INVALID_U8)
+    if (FindTaskIdByFunc(sPhase1_Tasks[task->tTransitionId]) == 0xFF)
     {
         task->tState++;
         return TRUE;
@@ -1019,7 +1019,7 @@ static bool8 Transition_Phase2(struct Task *task)
 static bool8 Transition_WaitForPhase2(struct Task *task)
 {
     task->tTransitionDone = FALSE;
-    if (FindTaskIdByFunc(sPhase2_Tasks[task->tTransitionId]) == INVALID_U8)
+    if (FindTaskIdByFunc(sPhase2_Tasks[task->tTransitionId]) == 0xFF)
         task->tTransitionDone = TRUE;
     return FALSE;
 }
@@ -3605,7 +3605,7 @@ static void CreatePhase1Task(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4)
 
 static bool8 IsPhase1Done(void)
 {
-    if (FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == INVALID_U8)
+    if (FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == 0xFF)
         return TRUE;
     else
         return FALSE;

src/battle_tv.c

@@ -26,9 +26,9 @@ static const u16 sVariableDmgMoves[] =
     MOVE_WATER_SPOUT, MOVE_DREAM_EATER, MOVE_WEATHER_BALL,
     MOVE_SNORE, MOVE_PAIN_SPLIT, MOVE_GUILLOTINE,
     MOVE_FRUSTRATION, MOVE_RETURN, MOVE_ENDEAVOR,
-    MOVE_PRESENT, MOVE_REVENGE, INVALID_U16,
+    MOVE_PRESENT, MOVE_REVENGE, 0xFFFF,
     // those are handled by the function itself
-    MOVE_MAGNITUDE, MOVE_PSYWAVE, INVALID_U16
+    MOVE_MAGNITUDE, MOVE_PSYWAVE, 0xFFFF
 };
 
 static const u16 sUnknown_0860A4E0[] =
@@ -199,7 +199,7 @@ static const u16 sUnknown_0860A8A4[] =
     STRINGID_PKMNAFFLICTEDBYCURSE, STRINGID_PKMNSAPPEDBYLEECHSEED, STRINGID_PKMNLOCKEDINNIGHTMARE,
     STRINGID_PKMNHURTBY, STRINGID_PKMNHURTBYBURN, STRINGID_PKMNHURTBYPOISON,
     STRINGID_PKMNHURTBYSPIKES, STRINGID_ATTACKERFAINTED, STRINGID_TARGETFAINTED,
-    STRINGID_PKMNHITWITHRECOIL, STRINGID_PKMNCRASHED, INVALID_U16
+    STRINGID_PKMNHITWITHRECOIL, STRINGID_PKMNCRASHED, 0xFFFF
 };
 
 // code
@@ -625,9 +625,9 @@ static bool8 sub_817E0B8(u16 stringId)
         if (sUnknown_0860A8A4[i] == stringId)
             break;
         i++;
-    } while (sUnknown_0860A8A4[i] != INVALID_U16);
+    } while (sUnknown_0860A8A4[i] != 0xFFFF);
 
-    if (sUnknown_0860A8A4[i] == INVALID_U16)
+    if (sUnknown_0860A8A4[i] == 0xFFFF)
         return TRUE;
     else
         return FALSE;
@@ -1164,7 +1164,7 @@ static void AddMovePoints(u8 caseId, u16 arg1, u8 arg2, u8 arg3)
                 break;
             }
             i += 2;
-        } while (ptr[i] != INVALID_U16);
+        } while (ptr[i] != 0xFFFF);
         break;
     case 19:
         tvPtr->side[arg2 ^ 1].faintCause = 0;
@@ -1415,9 +1415,9 @@ static void TrySetBattleSeminarShow(void)
         if (currMoveSaved == sVariableDmgMoves[i])
             break;
         i++;
-    } while (sVariableDmgMoves[i] != INVALID_U16);
+    } while (sVariableDmgMoves[i] != 0xFFFF);
 
-    if (sVariableDmgMoves[i] != INVALID_U16)
+    if (sVariableDmgMoves[i] != 0xFFFF)
         return;
 
     dmgByMove[gMoveSelectionCursor[gBattlerAttacker]] = gBattleMoveDamage;
@@ -1490,9 +1490,9 @@ static bool8 ShouldCalculateDamage(u16 moveId, s32 *dmg, u16 *powerOverride)
             if (moveId == sVariableDmgMoves[i])
                 break;
             i++;
-        } while (sVariableDmgMoves[i] != INVALID_U16);
+        } while (sVariableDmgMoves[i] != 0xFFFF);
 
-        if (sVariableDmgMoves[i] != INVALID_U16)
+        if (sVariableDmgMoves[i] != 0xFFFF)
         {
             *dmg = 0;
             return FALSE;

src/battle_util.c

@@ -29,7 +29,7 @@ extern u8 weather_get_current(void);
 static const u16 sSoundMovesTable[] =
 {
     MOVE_GROWL, MOVE_ROAR, MOVE_SING, MOVE_SUPERSONIC, MOVE_SCREECH, MOVE_SNORE,
-    MOVE_UPROAR, MOVE_METAL_SOUND, MOVE_GRASS_WHISTLE, MOVE_HYPER_VOICE, INVALID_U16
+    MOVE_UPROAR, MOVE_METAL_SOUND, MOVE_GRASS_WHISTLE, MOVE_HYPER_VOICE, 0xFFFF
 };
 
 u8 GetBattlerForBattleScript(u8 caseId)
@@ -382,7 +382,7 @@ u8 TrySetCantSelectMoveBattleScript(void)
 
     gPotentialItemEffectBattler = gActiveBattler;
 
-    if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != INVALID_U16 && *choicedMove != move)
+    if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != move)
     {
         gCurrentMove = *choicedMove;
         gLastUsedItem = gBattleMons[gActiveBattler].item;
@@ -442,7 +442,7 @@ u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check)
             unusableMoves |= gBitTable[i];
         if (gDisableStructs[battlerId].encoreTimer && gDisableStructs[battlerId].encoredMove != gBattleMons[battlerId].moves[i])
             unusableMoves |= gBitTable[i];
-        if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != INVALID_U16 && *choicedMove != gBattleMons[battlerId].moves[i])
+        if (holdEffect == HOLD_EFFECT_CHOICE_BAND && *choicedMove != 0 && *choicedMove != 0xFFFF && *choicedMove != gBattleMons[battlerId].moves[i])
             unusableMoves |= gBitTable[i];
     }
     return unusableMoves;
@@ -451,7 +451,7 @@ u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check)
 bool8 AreAllMovesUnusable(void)
 {
     u8 unusable;
-    unusable = CheckMoveLimitations(gActiveBattler, 0, INVALID_U8);
+    unusable = CheckMoveLimitations(gActiveBattler, 0, 0xFF);
 
     if (unusable == 0xF) // All moves are unusable.
     {
@@ -1137,7 +1137,7 @@ bool8 HandleWishPerishSongOnTurnEnd(void)
                 gBattlerTarget = gActiveBattler;
                 gBattlerAttacker = gWishFutureKnock.futureSightAttacker[gActiveBattler];
                 gBattleMoveDamage = gWishFutureKnock.futureSightDmg[gActiveBattler];
-                gSpecialStatuses[gBattlerTarget].dmg = INVALID_U16;
+                gSpecialStatuses[gBattlerTarget].dmg = 0xFFFF;
                 BattleScriptExecute(BattleScript_MonTookFutureAttack);
 
                 if (gWishFutureKnock.futureSightCounter[gActiveBattler] == 0
@@ -1996,12 +1996,12 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
         case ABILITYEFFECT_MOVES_BLOCK: // 2
             if (gLastUsedAbility == ABILITY_SOUNDPROOF)
             {
-                for (i = 0; sSoundMovesTable[i] != INVALID_U16; i++)
+                for (i = 0; sSoundMovesTable[i] != 0xFFFF; i++)
                 {
                     if (sSoundMovesTable[i] == move)
                         break;
                 }
-                if (sSoundMovesTable[i] != INVALID_U16)
+                if (sSoundMovesTable[i] != 0xFFFF)
                 {
                     if (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS)
                         gHitMarker |= HITMARKER_NO_PPDEDUCT;
@@ -2527,7 +2527,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
             break;
         }
 
-        if (effect && caseID < ABILITYEFFECT_CHECK_OTHER_SIDE && gLastUsedAbility != INVALID_U8)
+        if (effect && caseID < ABILITYEFFECT_CHECK_OTHER_SIDE && gLastUsedAbility != 0xFF)
             RecordAbilityBattle(battler, gLastUsedAbility);
     }
 
@@ -3213,7 +3213,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
             case HOLD_EFFECT_SHELL_BELL:
                 if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
                     && gSpecialStatuses[gBattlerTarget].dmg != 0
-                    && gSpecialStatuses[gBattlerTarget].dmg != INVALID_U16
+                    && gSpecialStatuses[gBattlerTarget].dmg != 0xFFFF
                     && gBattlerAttacker != gBattlerTarget
                     && gBattleMons[gBattlerAttacker].hp != gBattleMons[gBattlerAttacker].maxHP
                     && gBattleMons[gBattlerAttacker].hp != 0)
@@ -3394,7 +3394,7 @@ u8 IsMonDisobedient(void)
     calc = (gBattleMons[gBattlerAttacker].level + obedienceLevel) * rnd >> 8;
     if (calc < obedienceLevel)
     {
-        calc = CheckMoveLimitations(gBattlerAttacker, gBitTable[gCurrMovePos], INVALID_U8);
+        calc = CheckMoveLimitations(gBattlerAttacker, gBitTable[gCurrMovePos], 0xFF);
         if (calc == 0xF) // all moves cannot be used
         {
             gBattleCommunication[MULTISTRING_CHOOSER] = Random() & 3;

src/berry_blender.c

@@ -1455,7 +1455,7 @@ static void sub_808074C(void)
 
     for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
     {
-        sBerryBlenderData->field_96[i] = INVALID_U8;
+        sBerryBlenderData->field_96[i] = 0xFF;
         sBerryBlenderData->field_8E[i] = sUnknown_083399D0[sBerryBlenderData->playersNo - 2][i];
     }
     for (j = 0; j < BLENDER_MAX_PLAYERS; j++)
@@ -1479,7 +1479,7 @@ static void Blender_PrintPlayerNames(void)
 
     for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
     {
-        if (sBerryBlenderData->field_8E[i] != INVALID_U8)
+        if (sBerryBlenderData->field_8E[i] != 0xFF)
         {
             sBerryBlenderData->syncArrowSpriteIds[sBerryBlenderData->field_8E[i]] = sBerryBlenderData->syncArrowSprite2Ids[i];
             StartSpriteAnim(&gSprites[sBerryBlenderData->syncArrowSpriteIds[sBerryBlenderData->field_8E[i]]], i);

src/bg.c

@@ -87,37 +87,37 @@ void SetBgControlAttributes(u8 bg, u8 charBaseIndex, u8 mapBaseIndex, u8 screenS
 {
     if (IsInvalidBg(bg) == FALSE)
     {
-        if (charBaseIndex != INVALID_U8)
+        if (charBaseIndex != 0xFF)
         {
             sGpuBgConfigs.configs[bg].charBaseIndex = charBaseIndex & 0x3;
         }
 
-        if (mapBaseIndex != INVALID_U8)
+        if (mapBaseIndex != 0xFF)
         {
             sGpuBgConfigs.configs[bg].mapBaseIndex = mapBaseIndex & 0x1F;
         }
 
-        if (screenSize != INVALID_U8)
+        if (screenSize != 0xFF)
         {
             sGpuBgConfigs.configs[bg].screenSize = screenSize & 0x3;
         }
 
-        if (paletteMode != INVALID_U8)
+        if (paletteMode != 0xFF)
         {
             sGpuBgConfigs.configs[bg].paletteMode = paletteMode;
         }
 
-        if (priority != INVALID_U8)
+        if (priority != 0xFF)
         {
             sGpuBgConfigs.configs[bg].priority = priority & 0x3;
         }
 
-        if (mosaic != INVALID_U8)
+        if (mosaic != 0xFF)
         {
             sGpuBgConfigs.configs[bg].mosaic = mosaic & 0x1;
         }
 
-        if (wraparound != INVALID_U8)
+        if (wraparound != 0xFF)
         {
             sGpuBgConfigs.configs[bg].wraparound = wraparound;
         }
@@ -154,7 +154,7 @@ u16 GetBgControlAttribute(u8 bg, u8 attributeId)
         }
     }
 
-    return INVALID_U8;
+    return 0xFF;
 }
 
 u8 LoadBgVram(u8 bg, const void *src, u16 size, u16 destOffset, u8 mode)
@@ -379,7 +379,7 @@ u16 LoadBgTiles(u8 bg, const void* src, u16 size, u16 destOffset)
 
     cursor = LoadBgVram(bg, src, size, tileOffset, DISPCNT_MODE_1);
 
-    if (cursor == INVALID_U8)
+    if (cursor == 0xFF)
     {
         return -1;
     }
@@ -400,7 +400,7 @@ u16 LoadBgTilemap(u8 bg, const void *src, u16 size, u16 destOffset)
 
     cursor = LoadBgVram(bg, src, size, destOffset * 2, DISPCNT_MODE_2);
 
-    if (cursor == INVALID_U8)
+    if (cursor == 0xFF)
     {
         return -1;
     }
@@ -480,25 +480,25 @@ void SetBgAttribute(u8 bg, u8 attributeId, u8 value)
     switch (attributeId)
     {
     case 1:
-        SetBgControlAttributes(bg, value, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8);
+        SetBgControlAttributes(bg, value, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF);
         break;
     case 2:
-        SetBgControlAttributes(bg, INVALID_U8, value, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8);
+        SetBgControlAttributes(bg, 0xFF, value, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF);
         break;
     case 3:
-        SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, value, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8);
+        SetBgControlAttributes(bg, 0xFF, 0xFF, value, 0xFF, 0xFF, 0xFF, 0xFF);
         break;
     case 4:
-        SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, INVALID_U8, value, INVALID_U8, INVALID_U8, INVALID_U8);
+        SetBgControlAttributes(bg, 0xFF, 0xFF, 0xFF, value, 0xFF, 0xFF, 0xFF);
         break;
     case 7:
-        SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, value, INVALID_U8, INVALID_U8);
+        SetBgControlAttributes(bg, 0xFF, 0xFF, 0xFF, 0xFF, value, 0xFF, 0xFF);
         break;
     case 5:
-        SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, value, INVALID_U8);
+        SetBgControlAttributes(bg, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, value, 0xFF);
         break;
     case 6:
-        SetBgControlAttributes(bg, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, INVALID_U8, value);
+        SetBgControlAttributes(bg, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, value);
         break;
     }
 }
@@ -1284,7 +1284,7 @@ u32 GetBgType(u8 bg)
         break;
     }
 
-    return INVALID_U16;
+    return 0xFFFF;
 }
 
 bool32 IsInvalidBg32(u8 bg)

src/blit.c

@@ -3,7 +3,7 @@
 
 void BlitBitmapRect4BitWithoutColorKey(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height)
 {
-    BlitBitmapRect4Bit(src, dst, srcX, srcY, dstX, dstY, width, height, INVALID_U8);
+    BlitBitmapRect4Bit(src, dst, srcX, srcY, dstX, dstY, width, height, 0xFF);
 }
 
 void BlitBitmapRect4Bit(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height, u8 colorKey)
@@ -33,7 +33,7 @@ void BlitBitmapRect4Bit(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 sr
     multiplierSrcY = (src->width + (src->width & 7)) >> 3;
     multiplierDstY = (dst->width + (dst->width & 7)) >> 3;
 
-    if (colorKey == INVALID_U8)
+    if (colorKey == 0xFF)
     {
         for (loopSrcY = srcY, loopDstY = dstY; loopSrcY < yEnd; loopSrcY++, loopDstY++)
         {
@@ -132,7 +132,7 @@ void BlitBitmapRect4BitTo8Bit(struct Bitmap *src, struct Bitmap *dst, u16 srcX,
     multiplierSrcY = (src->width + (src->width & 7)) >> 3;
     multiplierDstY = (dst->width + (dst->width & 7)) >> 3;
 
-    if (colorKey == INVALID_U8)
+    if (colorKey == 0xFF)
     {
         for (loopSrcY = srcY, loopDstY = dstY; loopSrcY < yEnd; loopSrcY++, loopDstY++)
         {

src/braille_puzzles.c

@@ -465,7 +465,7 @@ bool8 ShouldDoBrailleRegicePuzzle(void)
                 }
 
                 varValue = VarGet(0x403B);
-                if (varValue != INVALID_U16 || VarGet(0x403C) != varValue || VarGet(0x403D) != 0xF)
+                if (varValue != 0xFFFF || VarGet(0x403C) != varValue || VarGet(0x403D) != 0xF)
                     return FALSE;
 
                 if (gSaveBlock1Ptr->pos.x == 8 && gSaveBlock1Ptr->pos.y == 21)

src/cable_club.c

@@ -70,7 +70,7 @@ static void sub_80B3220(u8 taskId);
 
 static void sub_80B236C(u8 arg0, u8 arg1)
 {
-    if (FindTaskIdByFunc(sub_80B2634) == INVALID_U8)
+    if (FindTaskIdByFunc(sub_80B2634) == 0xFF)
     {
         u8 taskId1;
 
@@ -604,7 +604,7 @@ void sub_80B2EA8(void)
 {
     u32 taskId = FindTaskIdByFunc(sub_80B2EE4);
 
-    if (taskId == INVALID_U8)
+    if (taskId == 0xFF)
     {
         taskId = CreateTask(sub_80B2EE4, 80);
         gTasks[taskId].data[0] = 0;
@@ -702,7 +702,7 @@ void sub_80B3028(void)
 u8 sub_80B3050(void)
 {
     if (FuncIsActiveTask(sub_80B3144) != FALSE)
-        return INVALID_U8;
+        return 0xFF;
 
     switch (gSpecialVar_0x8004)
     {

src/contest.c

@@ -324,7 +324,7 @@ void sub_80D787C(void)
     *gContestResources->field_0 = (struct Contest){};
     for (i = 0; i < 4; i++)
     {
-        gContestResources->field_0->unk19206[i] = INVALID_U8;
+        gContestResources->field_0->unk19206[i] = 0xFF;
     }
     for (i = 0; i < 4; i++)
     {
@@ -344,7 +344,7 @@ void sub_80D787C(void)
         sub_80DCE58(0);
     for (i = 0; i < 4; i++)
     {
-        gContestResources->field_4[i].nextTurnOrder = INVALID_U8;
+        gContestResources->field_4[i].nextTurnOrder = 0xFF;
         gContestResources->field_0->unk19218[i] = gUnknown_02039F26[i];
     }
     sub_80DD590();
@@ -2097,7 +2097,7 @@ void sub_80DAB8C(u8 contestType, u8 rank)
                 opponents[opponentsCount++] = i;
         }
     }
-    opponents[opponentsCount] = INVALID_U8;
+    opponents[opponentsCount] = 0xFF;
 
     // Choose three random opponents from the list
     for (i = 0; i < 3; i++)
@@ -2106,7 +2106,7 @@ void sub_80DAB8C(u8 contestType, u8 rank)
         s32 j;
 
         gContestMons[i] = gContestOpponents[opponents[rnd]];
-        for (j = rnd; opponents[j] != INVALID_U8; j++)
+        for (j = rnd; opponents[j] != 0xFF; j++)
             opponents[j] = opponents[j + 1];
         opponentsCount--;
     }
@@ -2151,7 +2151,7 @@ void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame)
         else if (contestType == CONTEST_CATEGORY_TOUGH && gContestOpponents[i].aiPool_Tough)
             opponents[opponentsCount++] = i;
     }
-    opponents[opponentsCount] = INVALID_U8;
+    opponents[opponentsCount] = 0xFF;
     for (i = 0; i < 4 - gUnknown_02039F30; i++)
     {
         u16 rnd = sub_80F903C() % opponentsCount;
@@ -2160,7 +2160,7 @@ void sub_80DACBC(u8 contestType, u8 rank, bool32 isPostgame)
         gContestMons[gUnknown_02039F30 + i] = gContestOpponents[opponents[rnd]];
         sub_80DF9D4(gContestMons[gUnknown_02039F30 + i].trainerName);
         sub_80DF9E0(gContestMons[gUnknown_02039F30 + i].nickname, GAME_LANGUAGE);
-        for (j = rnd; opponents[j] != INVALID_U8; j++)
+        for (j = rnd; opponents[j] != 0xFF; j++)
             opponents[j] = opponents[j + 1];
         opponentsCount--;
     }
@@ -2591,7 +2591,7 @@ void prints_contest_move_description(u16 a)
     ContestBG_FillBoxWithIncrementingTile(0, categoryTile,        0x0b, 0x1f, 0x05, 0x01, 0x11, 0x01);
     ContestBG_FillBoxWithIncrementingTile(0, categoryTile + 0x10, 0x0b, 0x20, 0x05, 0x01, 0x11, 0x01);
 
-    if (gContestEffects[gContestMoves[a].effect].appeal == INVALID_U8)
+    if (gContestEffects[gContestMoves[a].effect].appeal == 0xFF)
         numHearts = 0;
     else
         numHearts = gContestEffects[gContestMoves[a].effect].appeal / 10;
@@ -2600,7 +2600,7 @@ void prints_contest_move_description(u16 a)
     ContestBG_FillBoxWithTile(0, 0x5035, 0x15, 0x1f, 0x08,      0x01, 0x11);
     ContestBG_FillBoxWithTile(0, 0x5012, 0x15, 0x1f, numHearts, 0x01, 0x11);
 
-    if (gContestEffects[gContestMoves[a].effect].jam == INVALID_U8)
+    if (gContestEffects[gContestMoves[a].effect].jam == 0xFF)
         numHearts = 0;
     else
         numHearts = gContestEffects[gContestMoves[a].effect].jam / 10;

src/contest_effect.c

@@ -144,7 +144,7 @@ static void ContestEffect_StartleFrontMon(void)
                 break;
         }
         shared192D0.jamQueue[0] = i;
-        shared192D0.jamQueue[1] = INVALID_U8;
+        shared192D0.jamQueue[1] = 0xFF;
         idx = WasAtLeastOneOpponentJammed();
     }
     if (idx == 0)
@@ -168,7 +168,7 @@ static void ContestEffect_StartlePrevMons(void)
                 shared192D0.jamQueue[j++] = i;
         }
 
-        shared192D0.jamQueue[j] = INVALID_U8;
+        shared192D0.jamQueue[j] = 0xFF;
         idx = WasAtLeastOneOpponentJammed();
     }
     if (idx == 0)
@@ -211,7 +211,7 @@ static void ContestEffect_StartlePrevMons2(void)
                 u8 rval, jam;
 
                 shared192D0.jamQueue[0] = i;
-                shared192D0.jamQueue[1] = INVALID_U8;
+                shared192D0.jamQueue[1] = 0xFF;
                 rval = Random() % 10;
 
                 if (rval == 0)
@@ -288,7 +288,7 @@ static void ContestEffect_StartleMonWithJudgesAttention(void)
                 else
                     shared192D0.jam = 10;
                 shared192D0.jamQueue[0] = i;
-                shared192D0.jamQueue[1] = INVALID_U8;
+                shared192D0.jamQueue[1] = 0xFF;
                 if (WasAtLeastOneOpponentJammed())
                     numStartled++;
             }
@@ -393,7 +393,7 @@ static void ContestEffect_MakeFollowingMonsNervous(void)
     s16 oddsMod[4];
     s16 odds[4];
 
-    memset(contestantIds, INVALID_U8, ARRAY_COUNT(contestantIds));
+    memset(contestantIds, 0xFF, ARRAY_COUNT(contestantIds));
     for (i = 0, numAfter = 0; i < 4; i++)
     {
         if (shared192D0.turnOrder[shared192D0.contestant] < shared192D0.turnOrder[i] &&
@@ -431,7 +431,7 @@ static void ContestEffect_MakeFollowingMonsNervous(void)
     }
     if (odds[0] != 0)
     {
-        for (i = 0; contestantIds[i] != INVALID_U8; i++)
+        for (i = 0; contestantIds[i] != 0xFF; i++)
         {
             if (Random() % 100 < odds[i] + oddsMod[contestantIds[i]])
             {
@@ -504,7 +504,7 @@ static void ContestEffect_BadlyStartlesMonsInGoodCondition(void)
             else
                 shared192D0.jam = 10;
             shared192D0.jamQueue[0] = i;
-            shared192D0.jamQueue[1] = INVALID_U8;
+            shared192D0.jamQueue[1] = 0xFF;
             if (WasAtLeastOneOpponentJammed())
                 numHit++;
         }
@@ -755,7 +755,7 @@ static void ContestEffect_NextAppealEarlier(void)
         for (i = 0; i < 4; i++)
             turnOrder[i] = sContestantStatus[i].nextTurnOrder;
 
-        turnOrder[shared192D0.contestant] = INVALID_U8;
+        turnOrder[shared192D0.contestant] = 0xFF;
 
         for (i = 0; i < 4; i++)
         {
@@ -797,7 +797,7 @@ static void ContestEffect_NextAppealLater(void)
         for (i = 0; i < 4; i++)
             turnOrder[i] = sContestantStatus[i].nextTurnOrder;
 
-        turnOrder[shared192D0.contestant] = INVALID_U8;
+        turnOrder[shared192D0.contestant] = 0xFF;
 
         for (i = 3; i > -1; i--)
         {
@@ -855,12 +855,12 @@ static void ContestEffect_ScrambleNextTurnOrder(void)
 
             for (j = 0; j < 4; j++)
             {
-                if (unselectedContestants[j] != INVALID_U8)
+                if (unselectedContestants[j] != 0xFF)
                 {
                     if (rval == 0)
                     {
                         turnOrder[j] = i;
-                        unselectedContestants[j] = INVALID_U8;
+                        unselectedContestants[j] = 0xFF;
                         break;
                     }
                     else
@@ -906,7 +906,7 @@ static void ContestEffect_BadlyStartleMonsWithGoodAppeals(void)
             else
                 shared192D0.jam = 10;
             shared192D0.jamQueue[0] = i;
-            shared192D0.jamQueue[1] = INVALID_U8;
+            shared192D0.jamQueue[1] = 0xFF;
             if (WasAtLeastOneOpponentJammed())
                 numJammed++;
         }
@@ -974,7 +974,7 @@ static void JamByMoveCategory(u8 category)
             else
                 shared192D0.jam = 10;
             shared192D0.jamQueue[0] = i;
-            shared192D0.jamQueue[1] = INVALID_U8;
+            shared192D0.jamQueue[1] = 0xFF;
             if (WasAtLeastOneOpponentJammed())
                 numJammed++;
         }
@@ -1013,7 +1013,7 @@ static bool8 WasAtLeastOneOpponentJammed(void)
     s16 jamBuffer[4] = {0};
     int i;
 
-    for (i = 0; shared192D0.jamQueue[i] != INVALID_U8; i++)
+    for (i = 0; shared192D0.jamQueue[i] != 0xFF; i++)
     {
         u8 contestant = shared192D0.jamQueue[i];
         if (CanUnnerveContestant(contestant))

src/data/contest_moves.h

@@ -2836,54 +2836,294 @@ const struct ContestMove gContestMoves[MOVES_COUNT] =
 
 const struct ContestEffect gContestEffects[] =
 {
-    {0, 40,  0}, // CONTEST_EFFECT_HIGHLY_APPEALING
-    {0, 60,  0}, // CONTEST_EFFECT_USER_MORE_EASILY_STARTLED
-    {0, 80,  0}, // CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES
-    {0, 30,  0}, // CONTEST_EFFECT_REPETITION_NOT_BORING
-    {1, 20,  0}, // CONTEST_EFFECT_AVOID_STARTLE_ONCE
-    {1, 10,  0}, // CONTEST_EFFECT_AVOID_STARTLE
-    {1, 30,  0}, // CONTEST_EFFECT_AVOID_STARTLE_SLIGHTLY
-    {1, 30,  0}, // CONTEST_EFFECT_USER_LESS_EASILY_STARTLED
-    {2, 30, 20}, // CONTEST_EFFECT_STARTLE_FRONT_MON
-    {3, 30, 10}, // CONTEST_EFFECT_SLIGHTLY_STARTLE_PREV_MONS
-    {2, 20, 30}, // CONTEST_EFFECT_STARTLE_PREV_MON
-    {3, 20, 20}, // CONTEST_EFFECT_STARTLE_PREV_MONS
-    {2, 10, 40}, // CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON
-    {3, 10, 30}, // CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-    {2, 30, 20}, // CONTEST_EFFECT_STARTLE_PREV_MON_2
-    {3, 30, 10}, // CONTEST_EFFECT_STARTLE_PREV_MONS_2
-    {4, 30,  0}, // CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION
-    {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION
-    {3, 40, 40}, // CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN
-    {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL
-    {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MONS_COOL_APPEAL
-    {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MONS_BEAUTY_APPEAL
-    {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MONS_CUTE_APPEAL
-    {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MONS_SMART_APPEAL
-    {3, 20, 10}, // CONTEST_EFFECT_STARTLE_MONS_TOUGH_APPEAL
-    {4, 20,  0}, // CONTEST_EFFECT_MAKE_FOLLOWING_MON_NERVOUS
-    {4, 20,  0}, // CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS
-    {4, 30,  0}, // CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS
-    {3, 30, 10}, // CONTEST_EFFECT_BADLY_STARTLES_MONS_IN_GOOD_CONDITION
-    {5, 20,  0}, // CONTEST_EFFECT_BETTER_IF_FIRST
-    {5, 20,  0}, // CONTEST_EFFECT_BETTER_IF_LAST
-    {5, 10,  0}, // CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES
-    {5, 10,  0}, // CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE
-    {5, 10,  0}, // CONTEST_EFFECT_BETTER_WHEN_LATER
-    {5, 10,  0}, // CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING
-    {5, 20,  0}, // CONTEST_EFFECT_BETTER_IF_SAME_TYPE
-    {5, 20,  0}, // CONTEST_EFFECT_BETTER_IF_DIFF_TYPE
-    {5, 30,  0}, // CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL
-    {5, 10,  0}, // CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS
-    {5, 10,  0}, // CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION
-    {6, 30,  0}, // CONTEST_EFFECT_NEXT_APPEAL_EARLIER
-    {6, 30,  0}, // CONTEST_EFFECT_NEXT_APPEAL_LATER
-    {6, 30,  0}, // CONTEST_EFFECT_MAKE_SCRAMBLING_TURN_ORDER_EASIER
-    {6, 30,  0}, // CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER
-    {5, 10,  0}, // CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST
-    {3, 20, 10}, // CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS
-    {5, 10,  0}, // CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED
-    {4, 30,  0}  // CONTEST_EFFECT_DONT_EXCITE_AUDIENCE
+    [CONTEST_EFFECT_HIGHLY_APPEALING] =
+    {
+        .effectType = 0,
+        .appeal = 40,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_USER_MORE_EASILY_STARTLED] =
+    {
+        .effectType = 0,
+        .appeal = 60,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES] =
+    {
+        .effectType = 0,
+        .appeal = 80,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_REPETITION_NOT_BORING] =
+    {
+        .effectType = 0,
+        .appeal = 30,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_AVOID_STARTLE_ONCE] =
+    {
+        .effectType = 1,
+        .appeal = 20,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_AVOID_STARTLE] =
+    {
+        .effectType = 1,
+        .appeal = 10,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_AVOID_STARTLE_SLIGHTLY] =
+    {
+        .effectType = 1,
+        .appeal = 30,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_USER_LESS_EASILY_STARTLED] =
+    {
+        .effectType = 1,
+        .appeal = 30,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_STARTLE_FRONT_MON] =
+    {
+        .effectType = 2,
+        .appeal = 30,
+        .jam = 20,
+    },
+    [CONTEST_EFFECT_SLIGHTLY_STARTLE_PREV_MONS] =
+    {
+        .effectType = 3,
+        .appeal = 30,
+        .jam = 10,
+    },
+    [CONTEST_EFFECT_STARTLE_PREV_MON] =
+    {
+        .effectType = 2,
+        .appeal = 20,
+        .jam = 30,
+    },
+    [CONTEST_EFFECT_STARTLE_PREV_MONS] =
+    {
+        .effectType = 3,
+        .appeal = 20,
+        .jam = 20,
+    },
+    [CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON] =
+    {
+        .effectType = 2,
+        .appeal = 10,
+        .jam = 40,
+    },
+    [CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS] =
+    {
+        .effectType = 3,
+        .appeal = 10,
+        .jam = 30,
+    },
+    [CONTEST_EFFECT_STARTLE_PREV_MON_2] =
+    {
+        .effectType = 2,
+        .appeal = 30,
+        .jam = 20,
+    },
+    [CONTEST_EFFECT_STARTLE_PREV_MONS_2] =
+    {
+        .effectType = 3,
+        .appeal = 30,
+        .jam = 10,
+    },
+    [CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION] =
+    {
+        .effectType = 4,
+        .appeal = 30,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION] =
+    {
+        .effectType = 3,
+        .appeal = 20,
+        .jam = 10,
+    },
+    [CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN] =
+    {
+        .effectType = 3,
+        .appeal = 40,
+        .jam = 40,
+    },
+    [CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL] =
+    {
+        .effectType = 3,
+        .appeal = 20,
+        .jam = 10,
+    },
+    [CONTEST_EFFECT_STARTLE_MONS_COOL_APPEAL] =
+    {
+        .effectType = 3,
+        .appeal = 20,
+        .jam = 10,
+    },
+    [CONTEST_EFFECT_STARTLE_MONS_BEAUTY_APPEAL] =
+    {
+        .effectType = 3,
+        .appeal = 20,
+        .jam = 10,
+    },
+    [CONTEST_EFFECT_STARTLE_MONS_CUTE_APPEAL] =
+    {
+        .effectType = 3,
+        .appeal = 20,
+        .jam = 10,
+    },
+    [CONTEST_EFFECT_STARTLE_MONS_SMART_APPEAL] =
+    {
+        .effectType = 3,
+        .appeal = 20,
+        .jam = 10,
+    },
+    [CONTEST_EFFECT_STARTLE_MONS_TOUGH_APPEAL] =
+    {
+        .effectType = 3,
+        .appeal = 20,
+        .jam = 10,
+    },
+    [CONTEST_EFFECT_MAKE_FOLLOWING_MON_NERVOUS] =
+    {
+        .effectType = 4,
+        .appeal = 20,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS] =
+    {
+        .effectType = 4,
+        .appeal = 20,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS] =
+    {
+        .effectType = 4,
+        .appeal = 30,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_BADLY_STARTLES_MONS_IN_GOOD_CONDITION] =
+    {
+        .effectType = 3,
+        .appeal = 30,
+        .jam = 10,
+    },
+    [CONTEST_EFFECT_BETTER_IF_FIRST] =
+    {
+        .effectType = 5,
+        .appeal = 20,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_BETTER_IF_LAST] =
+    {
+        .effectType = 5,
+        .appeal = 20,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES] =
+    {
+        .effectType = 5,
+        .appeal = 10,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE] =
+    {
+        .effectType = 5,
+        .appeal = 10,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_BETTER_WHEN_LATER] =
+    {
+        .effectType = 5,
+        .appeal = 10,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING] =
+    {
+        .effectType = 5,
+        .appeal = 10,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_BETTER_IF_SAME_TYPE] =
+    {
+        .effectType = 5,
+        .appeal = 20,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_BETTER_IF_DIFF_TYPE] =
+    {
+        .effectType = 5,
+        .appeal = 20,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL] =
+    {
+        .effectType = 5,
+        .appeal = 30,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS] =
+    {
+        .effectType = 5,
+        .appeal = 10,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION] =
+    {
+        .effectType = 5,
+        .appeal = 10,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_NEXT_APPEAL_EARLIER] =
+    {
+        .effectType = 6,
+        .appeal = 30,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_NEXT_APPEAL_LATER] =
+    {
+        .effectType = 6,
+        .appeal = 30,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_MAKE_SCRAMBLING_TURN_ORDER_EASIER] =
+    {
+        .effectType = 6,
+        .appeal = 30,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER] =
+    {
+        .effectType = 6,
+        .appeal = 30,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST] =
+    {
+        .effectType = 5,
+        .appeal = 10,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS] =
+    {
+        .effectType = 3,
+        .appeal = 20,
+        .jam = 10,
+    },
+    [CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED] =
+    {
+        .effectType = 5,
+        .appeal = 10,
+        .jam = 0,
+    },
+    [CONTEST_EFFECT_DONT_EXCITE_AUDIENCE] =
+    {
+        .effectType = 4,
+        .appeal = 30,
+        .jam = 0,
+    },
 };
 
 // A lookup table with TRUE for each combo starter ID and FALSE for ID 0,

src/data/field_event_obj/movement_action_func_tables.h

@@ -422,164 +422,164 @@ u8 (*const gMovementActionFuncs_FlyUp[])(struct EventObject *, struct Sprite *);
 u8 (*const gMovementActionFuncs_FlyDown[])(struct EventObject *, struct Sprite *);
 
 u8 (*const *const gMovementActionFuncs[])(struct EventObject *, struct Sprite *) = {
-	gMovementActionFuncs_FaceDown,                // MOVEMENT_ACTION_FACE_DOWN
-	gMovementActionFuncs_FaceUp,                  // MOVEMENT_ACTION_FACE_UP
-	gMovementActionFuncs_FaceLeft,                // MOVEMENT_ACTION_FACE_LEFT
-	gMovementActionFuncs_FaceRight,               // MOVEMENT_ACTION_FACE_RIGHT
-	gMovementActionFuncs_WalkSlowDown,            // MOVEMENT_ACTION_WALK_SLOW_DOWN
-	gMovementActionFuncs_WalkSlowUp,              // MOVEMENT_ACTION_WALK_SLOW_UP
-	gMovementActionFuncs_WalkSlowLeft,            // MOVEMENT_ACTION_WALK_SLOW_LEFT
-	gMovementActionFuncs_WalkSlowRight,           // MOVEMENT_ACTION_WALK_SLOW_RIGHT
-	gMovementActionFuncs_WalkNormalDown,          // MOVEMENT_ACTION_WALK_NORMAL_DOWN
-	gMovementActionFuncs_WalkNormalUp,            // MOVEMENT_ACTION_WALK_NORMAL_UP
-	gMovementActionFuncs_WalkNormalLeft,          // MOVEMENT_ACTION_WALK_NORMAL_LEFT
-	gMovementActionFuncs_WalkNormalRight,         // MOVEMENT_ACTION_WALK_NORMAL_RIGHT
-	gMovementActionFuncs_Jump2Down,               // MOVEMENT_ACTION_JUMP_2_DOWN
-	gMovementActionFuncs_Jump2Up,                 // MOVEMENT_ACTION_JUMP_2_UP
-	gMovementActionFuncs_Jump2Left,               // MOVEMENT_ACTION_JUMP_2_LEFT
-	gMovementActionFuncs_Jump2Right,              // MOVEMENT_ACTION_JUMP_2_RIGHT
-	gMovementActionFuncs_Delay1,                  // MOVEMENT_ACTION_DELAY_1
-	gMovementActionFuncs_Delay2,                  // MOVEMENT_ACTION_DELAY_2
-	gMovementActionFuncs_Delay4,                  // MOVEMENT_ACTION_DELAY_4
-	gMovementActionFuncs_Delay8,                  // MOVEMENT_ACTION_DELAY_8
-	gMovementActionFuncs_Delay16,                 // MOVEMENT_ACTION_DELAY_16
-	gMovementActionFuncs_WalkFastDown,            // MOVEMENT_ACTION_WALK_FAST_DOWN
-	gMovementActionFuncs_WalkFastUp,              // MOVEMENT_ACTION_WALK_FAST_UP
-	gMovementActionFuncs_WalkFastLeft,            // MOVEMENT_ACTION_WALK_FAST_LEFT
-	gMovementActionFuncs_WalkFastRight,           // MOVEMENT_ACTION_WALK_FAST_RIGHT
-	gMovementActionFuncs_WalkInPlaceSlowDown,     // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN
-	gMovementActionFuncs_WalkInPlaceSlowUp,       // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP
-	gMovementActionFuncs_WalkInPlaceSlowLeft,     // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT
-	gMovementActionFuncs_WalkInPlaceSlowRight,    // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT
-	gMovementActionFuncs_WalkInPlaceNormalDown,   // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN
-	gMovementActionFuncs_WalkInPlaceNormalUp,     // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP
-	gMovementActionFuncs_WalkInPlaceNormalLeft,   // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT
-	gMovementActionFuncs_WalkInPlaceNormalRight,  // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT
-	gMovementActionFuncs_WalkInPlaceFastDown,     // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN
-	gMovementActionFuncs_WalkInPlaceFastUp,       // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP
-	gMovementActionFuncs_WalkInPlaceFastLeft,     // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT
-	gMovementActionFuncs_WalkInPlaceFastRight,    // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT
-	gMovementActionFuncs_WalkInPlaceFastestDown,  // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN
-	gMovementActionFuncs_WalkInPlaceFastestUp,    // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP
-	gMovementActionFuncs_WalkInPlaceFastestLeft,  // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT
-	gMovementActionFuncs_WalkInPlaceFastestRight, // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT
-	gMovementActionFuncs_RideWaterCurrentDown,    // MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN
-	gMovementActionFuncs_RideWaterCurrentUp,      // MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP
-	gMovementActionFuncs_RideWaterCurrentLeft,    // MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT
-	gMovementActionFuncs_RideWaterCurrentRight,   // MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT
-	gMovementActionFuncs_WalkFastestDown,         // MOVEMENT_ACTION_WALK_FASTEST_DOWN
-	gMovementActionFuncs_WalkFastestUp,           // MOVEMENT_ACTION_WALK_FASTEST_UP
-	gMovementActionFuncs_WalkFastestLeft,         // MOVEMENT_ACTION_WALK_FASTEST_LEFT
-	gMovementActionFuncs_WalkFastestRight,        // MOVEMENT_ACTION_WALK_FASTEST_RIGHT
-	gMovementActionFuncs_SlideDown,               // MOVEMENT_ACTION_SLIDE_DOWN
-	gMovementActionFuncs_SlideUp,                 // MOVEMENT_ACTION_SLIDE_UP
-	gMovementActionFuncs_SlideLeft,               // MOVEMENT_ACTION_SLIDE_LEFT
-	gMovementActionFuncs_SlideRight,              // MOVEMENT_ACTION_SLIDE_RIGHT
-	gMovementActionFuncs_PlayerRunDown,           // MOVEMENT_ACTION_PLAYER_RUN_DOWN
-	gMovementActionFuncs_PlayerRunUp,             // MOVEMENT_ACTION_PLAYER_RUN_UP
-	gMovementActionFuncs_PlayerRunLeft,           // MOVEMENT_ACTION_PLAYER_RUN_LEFT
-	gMovementActionFuncs_PlayerRunRight,          // MOVEMENT_ACTION_PLAYER_RUN_RIGHT
-	gMovementActionFuncs_StartAnimInDirection,    // MOVEMENT_ACTION_START_ANIM_IN_DIRECTION
-	gMovementActionFuncs_JumpSpecialDown,         // MOVEMENT_ACTION_JUMP_SPECIAL_DOWN
-	gMovementActionFuncs_JumpSpecialUp,           // MOVEMENT_ACTION_JUMP_SPECIAL_UP
-	gMovementActionFuncs_JumpSpecialLeft,         // MOVEMENT_ACTION_JUMP_SPECIAL_LEFT
-	gMovementActionFuncs_JumpSpecialRight,        // MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT
-	gMovementActionFuncs_FacePlayer,              // MOVEMENT_ACTION_FACE_PLAYER
-	gMovementActionFuncs_FaceAwayPlayer,          // MOVEMENT_ACTION_FACE_AWAY_PLAYER
-	gMovementActionFuncs_LockFacingDirection,     // MOVEMENT_ACTION_LOCK_FACING_DIRECTION
-	gMovementActionFuncs_UnlockFacingDirection,   // MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION
-	gMovementActionFuncs_JumpDown,                // MOVEMENT_ACTION_JUMP_DOWN
-	gMovementActionFuncs_JumpUp,                  // MOVEMENT_ACTION_JUMP_UP
-	gMovementActionFuncs_JumpLeft,                // MOVEMENT_ACTION_JUMP_LEFT
-	gMovementActionFuncs_JumpRight,               // MOVEMENT_ACTION_JUMP_RIGHT
-	gMovementActionFuncs_JumpInPlaceDown,         // MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN
-	gMovementActionFuncs_JumpInPlaceUp,           // MOVEMENT_ACTION_JUMP_IN_PLACE_UP
-	gMovementActionFuncs_JumpInPlaceLeft,         // MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT
-	gMovementActionFuncs_JumpInPlaceRight,        // MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT
-	gMovementActionFuncs_JumpInPlaceDownUp,       // MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP
-	gMovementActionFuncs_JumpInPlaceUpDown,       // MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN
-	gMovementActionFuncs_JumpInPlaceLeftRight,    // MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT
-	gMovementActionFuncs_JumpInPlaceRightLeft,    // MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT
-	gMovementActionFuncs_FaceOriginalDirection,   // MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION
-	gMovementActionFuncs_NurseJoyBowDown,         // MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN
-	gMovementActionFuncs_EnableJumpLandingGroundEffect,  // MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT
-	gMovementActionFuncs_DisableJumpLandingGroundEffect, // MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT
-	gMovementActionFuncs_DisableAnimation,        // MOVEMENT_ACTION_DISABLE_ANIMATION
-	gMovementActionFuncs_RestoreAnimation,        // MOVEMENT_ACTION_RESTORE_ANIMATION
-	gMovementActionFuncs_SetInvisible,            // MOVEMENT_ACTION_SET_INVISIBLE
-	gMovementActionFuncs_SetVisible,              // MOVEMENT_ACTION_SET_VISIBLE
-	gMovementActionFuncs_EmoteExclamationMark,    // MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK
-	gMovementActionFuncs_EmoteQuestionMark,       // MOVEMENT_ACTION_EMOTE_QUESTION_MARK
-	gMovementActionFuncs_EmoteHeart,              // MOVEMENT_ACTION_EMOTE_HEART
-	gMovementActionFuncs_RevealTrainer,           // MOVEMENT_ACTION_REVEAL_TRAINER
-	gMovementActionFuncs_RockSmashBreak,          // MOVEMENT_ACTION_ROCK_SMASH_BREAK
-	gMovementActionFuncs_CutTree,                 // MOVEMENT_ACTION_CUT_TREE
-	gMovementActionFuncs_SetFixedPriority,        // MOVEMENT_ACTION_SET_FIXED_PRIORITY
-	gMovementActionFuncs_ClearFixedPriority,      // MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY
-	gMovementActionFuncs_InitAffineAnim,          // MOVEMENT_ACTION_INIT_AFFINE_ANIM
-	gMovementActionFuncs_ClearAffineAnim,         // MOVEMENT_ACTION_CLEAR_AFFINE_ANIM
-	gMovementActionFuncs_Unknown1,                // MOVEMENT_ACTION_UNKNOWN1
-	gMovementActionFuncs_Unknown2,                // MOVEMENT_ACTION_UNKNOWN2
-	gMovementActionFuncs_WalkDownStartAffine,     // MOVEMENT_ACTION_WALK_DOWN_START_AFFINE
-	gMovementActionFuncs_WalkDownAffine,          // MOVEMENT_ACTION_WALK_DOWN_AFFINE
-	gMovementActionFuncs_AcroWheelieFaceDown,     // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN
-	gMovementActionFuncs_AcroWheelieFaceUp,       // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP
-	gMovementActionFuncs_AcroWheelieFaceLeft,     // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT
-	gMovementActionFuncs_AcroWheelieFaceRight,    // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT
-	gMovementActionFuncs_AcroPopWheelieDown,      // MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN
-	gMovementActionFuncs_AcroPopWheelieUp,        // MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP
-	gMovementActionFuncs_AcroPopWheelieLeft,      // MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT
-	gMovementActionFuncs_AcroPopWheelieRight,     // MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT
-	gMovementActionFuncs_AcroEndWheelieFaceDown,  // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN
-	gMovementActionFuncs_AcroEndWheelieFaceUp,    // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP
-	gMovementActionFuncs_AcroEndWheelieFaceLeft,  // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT
-	gMovementActionFuncs_AcroEndWheelieFaceRight, // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT
-	gMovementActionFuncs_AcroWheelieHopFaceDown,  // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN
-	gMovementActionFuncs_AcroWheelieHopFaceUp,    // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP
-	gMovementActionFuncs_AcroWheelieHopFaceLeft,  // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT
-	gMovementActionFuncs_AcroWheelieHopFaceRight, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT
-	gMovementActionFuncs_AcroWheelieHopDown,      // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN
-	gMovementActionFuncs_AcroWheelieHopUp,        // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP
-	gMovementActionFuncs_AcroWheelieHopLeft,      // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT
-	gMovementActionFuncs_AcroWheelieHopRight,     // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT
-	gMovementActionFuncs_AcroWheelieJumpDown,     // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN
-	gMovementActionFuncs_AcroWheelieJumpUp,       // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP
-	gMovementActionFuncs_AcroWheelieJumpLeft,     // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT
-	gMovementActionFuncs_AcroWheelieJumpRight,    // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT
-	gMovementActionFuncs_AcroWheelieInPlaceDown,  // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN
-	gMovementActionFuncs_AcroWheelieInPlaceUp,    // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP
-	gMovementActionFuncs_AcroWheelieInPlaceLeft,  // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT
-	gMovementActionFuncs_AcroWheelieInPlaceRight, // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT
-	gMovementActionFuncs_AcroPopWheelieMoveDown,  // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN
-	gMovementActionFuncs_AcroPopWheelieMoveUp,    // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP
-	gMovementActionFuncs_AcroPopWheelieMoveLeft,  // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT
-	gMovementActionFuncs_AcroPopWheelieMoveRight, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT
-	gMovementActionFuncs_AcroWheelieMoveDown,     // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN
-	gMovementActionFuncs_AcroWheelieMoveUp,       // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP
-	gMovementActionFuncs_AcroWheelieMoveLeft,     // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT
-	gMovementActionFuncs_AcroWheelieMoveRight,    // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT
-	gMovementActionFuncs_AcroEndWheelieMoveDown,  // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN
-	gMovementActionFuncs_AcroEndWheelieMoveUp,    // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP
-	gMovementActionFuncs_AcroEndWheelieMoveLeft,  // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT
-	gMovementActionFuncs_AcroEndWheelieMoveRight, // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT
-	gMovementActionFuncs_WalkNormalDiagonalUpLeft,    // MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT
-	gMovementActionFuncs_WalkNormalDiagonalUpRight,   // MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT
-	gMovementActionFuncs_WalkNormalDiagonalDownLeft,  // MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT
-	gMovementActionFuncs_WalkNormalDiagonalDownRight, // MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT
-	gMovementActionFuncs_WalkSlowDiagonalUpLeft,      // MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT
-	gMovementActionFuncs_WalkSlowDiagonalUpRight,     // MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT
-	gMovementActionFuncs_WalkSlowDiagonalDownLeft,    // MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT
-	gMovementActionFuncs_WalkSlowDiagonalDownRight,   // MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT
-	gMovementActionFuncs_StoreAndLockAnim,            // MOVEMENT_ACTION_STORE_AND_LOCK_ANIM
-	gMovementActionFuncs_FreeAndUnlockAnim,           // MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM
-	gMovementActionFuncs_WalkLeftAffine,              // MOVEMENT_ACTION_WALK_LEFT_AFFINE
-	gMovementActionFuncs_WalkRightAffine,             // MOVEMENT_ACTION_WALK_RIGHT_AFFINE
-	gMovementActionFuncs_Levitate,                    // MOVEMENT_ACTION_LEVITATE
-	gMovementActionFuncs_StopLevitate,                // MOVEMENT_ACTION_STOP_LEVITATE
-	gMovementActionFuncs_DestroyExtraTaskIfAtTop,     // MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP
-	gMovementActionFuncs_Figure8,                     // MOVEMENT_ACTION_FIGURE_8
-	gMovementActionFuncs_FlyUp,                       // MOVEMENT_ACTION_FLY_UP
-	gMovementActionFuncs_FlyDown,                     // MOVEMENT_ACTION_FLY_DOWN
+    [MOVEMENT_ACTION_FACE_DOWN] = gMovementActionFuncs_FaceDown,
+    [MOVEMENT_ACTION_FACE_UP] = gMovementActionFuncs_FaceUp,
+    [MOVEMENT_ACTION_FACE_LEFT] = gMovementActionFuncs_FaceLeft,
+    [MOVEMENT_ACTION_FACE_RIGHT] = gMovementActionFuncs_FaceRight,
+    [MOVEMENT_ACTION_WALK_SLOW_DOWN] = gMovementActionFuncs_WalkSlowDown,
+    [MOVEMENT_ACTION_WALK_SLOW_UP] = gMovementActionFuncs_WalkSlowUp,
+    [MOVEMENT_ACTION_WALK_SLOW_LEFT] = gMovementActionFuncs_WalkSlowLeft,
+    [MOVEMENT_ACTION_WALK_SLOW_RIGHT] = gMovementActionFuncs_WalkSlowRight,
+    [MOVEMENT_ACTION_WALK_NORMAL_DOWN] = gMovementActionFuncs_WalkNormalDown,
+    [MOVEMENT_ACTION_WALK_NORMAL_UP] = gMovementActionFuncs_WalkNormalUp,
+    [MOVEMENT_ACTION_WALK_NORMAL_LEFT] = gMovementActionFuncs_WalkNormalLeft,
+    [MOVEMENT_ACTION_WALK_NORMAL_RIGHT] = gMovementActionFuncs_WalkNormalRight,
+    [MOVEMENT_ACTION_JUMP_2_DOWN] = gMovementActionFuncs_Jump2Down,
+    [MOVEMENT_ACTION_JUMP_2_UP] = gMovementActionFuncs_Jump2Up,
+    [MOVEMENT_ACTION_JUMP_2_LEFT] = gMovementActionFuncs_Jump2Left,
+    [MOVEMENT_ACTION_JUMP_2_RIGHT] = gMovementActionFuncs_Jump2Right,
+    [MOVEMENT_ACTION_DELAY_1] = gMovementActionFuncs_Delay1,
+    [MOVEMENT_ACTION_DELAY_2] = gMovementActionFuncs_Delay2,
+    [MOVEMENT_ACTION_DELAY_4] = gMovementActionFuncs_Delay4,
+    [MOVEMENT_ACTION_DELAY_8] = gMovementActionFuncs_Delay8,
+    [MOVEMENT_ACTION_DELAY_16] = gMovementActionFuncs_Delay16,
+    [MOVEMENT_ACTION_WALK_FAST_DOWN] = gMovementActionFuncs_WalkFastDown,
+    [MOVEMENT_ACTION_WALK_FAST_UP] = gMovementActionFuncs_WalkFastUp,
+    [MOVEMENT_ACTION_WALK_FAST_LEFT] = gMovementActionFuncs_WalkFastLeft,
+    [MOVEMENT_ACTION_WALK_FAST_RIGHT] = gMovementActionFuncs_WalkFastRight,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN] = gMovementActionFuncs_WalkInPlaceSlowDown,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP] = gMovementActionFuncs_WalkInPlaceSlowUp,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT] = gMovementActionFuncs_WalkInPlaceSlowLeft,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT] = gMovementActionFuncs_WalkInPlaceSlowRight,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN] = gMovementActionFuncs_WalkInPlaceNormalDown,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP] = gMovementActionFuncs_WalkInPlaceNormalUp,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT] = gMovementActionFuncs_WalkInPlaceNormalLeft,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT] = gMovementActionFuncs_WalkInPlaceNormalRight,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN] = gMovementActionFuncs_WalkInPlaceFastDown,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP] = gMovementActionFuncs_WalkInPlaceFastUp,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT] = gMovementActionFuncs_WalkInPlaceFastLeft,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT] = gMovementActionFuncs_WalkInPlaceFastRight,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN] = gMovementActionFuncs_WalkInPlaceFastestDown,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP] = gMovementActionFuncs_WalkInPlaceFastestUp,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT] = gMovementActionFuncs_WalkInPlaceFastestLeft,
+    [MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT] = gMovementActionFuncs_WalkInPlaceFastestRight,
+    [MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN] = gMovementActionFuncs_RideWaterCurrentDown,
+    [MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP] = gMovementActionFuncs_RideWaterCurrentUp,
+    [MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT] = gMovementActionFuncs_RideWaterCurrentLeft,
+    [MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT] = gMovementActionFuncs_RideWaterCurrentRight,
+    [MOVEMENT_ACTION_WALK_FASTEST_DOWN] = gMovementActionFuncs_WalkFastestDown,
+    [MOVEMENT_ACTION_WALK_FASTEST_UP] = gMovementActionFuncs_WalkFastestUp,
+    [MOVEMENT_ACTION_WALK_FASTEST_LEFT] = gMovementActionFuncs_WalkFastestLeft,
+    [MOVEMENT_ACTION_WALK_FASTEST_RIGHT] = gMovementActionFuncs_WalkFastestRight,
+    [MOVEMENT_ACTION_SLIDE_DOWN] = gMovementActionFuncs_SlideDown,
+    [MOVEMENT_ACTION_SLIDE_UP] = gMovementActionFuncs_SlideUp,
+    [MOVEMENT_ACTION_SLIDE_LEFT] = gMovementActionFuncs_SlideLeft,
+    [MOVEMENT_ACTION_SLIDE_RIGHT] = gMovementActionFuncs_SlideRight,
+    [MOVEMENT_ACTION_PLAYER_RUN_DOWN] = gMovementActionFuncs_PlayerRunDown,
+    [MOVEMENT_ACTION_PLAYER_RUN_UP] = gMovementActionFuncs_PlayerRunUp,
+    [MOVEMENT_ACTION_PLAYER_RUN_LEFT] = gMovementActionFuncs_PlayerRunLeft,
+    [MOVEMENT_ACTION_PLAYER_RUN_RIGHT] = gMovementActionFuncs_PlayerRunRight,
+    [MOVEMENT_ACTION_START_ANIM_IN_DIRECTION] = gMovementActionFuncs_StartAnimInDirection,
+    [MOVEMENT_ACTION_JUMP_SPECIAL_DOWN] = gMovementActionFuncs_JumpSpecialDown,
+    [MOVEMENT_ACTION_JUMP_SPECIAL_UP] = gMovementActionFuncs_JumpSpecialUp,
+    [MOVEMENT_ACTION_JUMP_SPECIAL_LEFT] = gMovementActionFuncs_JumpSpecialLeft,
+    [MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT] = gMovementActionFuncs_JumpSpecialRight,
+    [MOVEMENT_ACTION_FACE_PLAYER] = gMovementActionFuncs_FacePlayer,
+    [MOVEMENT_ACTION_FACE_AWAY_PLAYER] = gMovementActionFuncs_FaceAwayPlayer,
+    [MOVEMENT_ACTION_LOCK_FACING_DIRECTION] = gMovementActionFuncs_LockFacingDirection,
+    [MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION] = gMovementActionFuncs_UnlockFacingDirection,
+    [MOVEMENT_ACTION_JUMP_DOWN] = gMovementActionFuncs_JumpDown,
+    [MOVEMENT_ACTION_JUMP_UP] = gMovementActionFuncs_JumpUp,
+    [MOVEMENT_ACTION_JUMP_LEFT] = gMovementActionFuncs_JumpLeft,
+    [MOVEMENT_ACTION_JUMP_RIGHT] = gMovementActionFuncs_JumpRight,
+    [MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN] = gMovementActionFuncs_JumpInPlaceDown,
+    [MOVEMENT_ACTION_JUMP_IN_PLACE_UP] = gMovementActionFuncs_JumpInPlaceUp,
+    [MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT] = gMovementActionFuncs_JumpInPlaceLeft,
+    [MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT] = gMovementActionFuncs_JumpInPlaceRight,
+    [MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP] = gMovementActionFuncs_JumpInPlaceDownUp,
+    [MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN] = gMovementActionFuncs_JumpInPlaceUpDown,
+    [MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT] = gMovementActionFuncs_JumpInPlaceLeftRight,
+    [MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT] = gMovementActionFuncs_JumpInPlaceRightLeft,
+    [MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION] = gMovementActionFuncs_FaceOriginalDirection,
+    [MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN] = gMovementActionFuncs_NurseJoyBowDown,
+    [MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT] = gMovementActionFuncs_EnableJumpLandingGroundEffect,
+    [MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT] = gMovementActionFuncs_DisableJumpLandingGroundEffect,
+    [MOVEMENT_ACTION_DISABLE_ANIMATION] = gMovementActionFuncs_DisableAnimation,
+    [MOVEMENT_ACTION_RESTORE_ANIMATION] = gMovementActionFuncs_RestoreAnimation,
+    [MOVEMENT_ACTION_SET_INVISIBLE] = gMovementActionFuncs_SetInvisible,
+    [MOVEMENT_ACTION_SET_VISIBLE] = gMovementActionFuncs_SetVisible,
+    [MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK] = gMovementActionFuncs_EmoteExclamationMark,
+    [MOVEMENT_ACTION_EMOTE_QUESTION_MARK] = gMovementActionFuncs_EmoteQuestionMark,
+    [MOVEMENT_ACTION_EMOTE_HEART] = gMovementActionFuncs_EmoteHeart,
+    [MOVEMENT_ACTION_REVEAL_TRAINER] = gMovementActionFuncs_RevealTrainer,
+    [MOVEMENT_ACTION_ROCK_SMASH_BREAK] = gMovementActionFuncs_RockSmashBreak,
+    [MOVEMENT_ACTION_CUT_TREE] = gMovementActionFuncs_CutTree,
+    [MOVEMENT_ACTION_SET_FIXED_PRIORITY] = gMovementActionFuncs_SetFixedPriority,
+    [MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY] = gMovementActionFuncs_ClearFixedPriority,
+    [MOVEMENT_ACTION_INIT_AFFINE_ANIM] = gMovementActionFuncs_InitAffineAnim,
+    [MOVEMENT_ACTION_CLEAR_AFFINE_ANIM] = gMovementActionFuncs_ClearAffineAnim,
+    [MOVEMENT_ACTION_UNKNOWN1] = gMovementActionFuncs_Unknown1,
+    [MOVEMENT_ACTION_UNKNOWN2] = gMovementActionFuncs_Unknown2,
+    [MOVEMENT_ACTION_WALK_DOWN_START_AFFINE] = gMovementActionFuncs_WalkDownStartAffine,
+    [MOVEMENT_ACTION_WALK_DOWN_AFFINE] = gMovementActionFuncs_WalkDownAffine,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN] = gMovementActionFuncs_AcroWheelieFaceDown,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP] = gMovementActionFuncs_AcroWheelieFaceUp,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT] = gMovementActionFuncs_AcroWheelieFaceLeft,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT] = gMovementActionFuncs_AcroWheelieFaceRight,
+    [MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN] = gMovementActionFuncs_AcroPopWheelieDown,
+    [MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP] = gMovementActionFuncs_AcroPopWheelieUp,
+    [MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT] = gMovementActionFuncs_AcroPopWheelieLeft,
+    [MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT] = gMovementActionFuncs_AcroPopWheelieRight,
+    [MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN] = gMovementActionFuncs_AcroEndWheelieFaceDown,
+    [MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP] = gMovementActionFuncs_AcroEndWheelieFaceUp,
+    [MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT] = gMovementActionFuncs_AcroEndWheelieFaceLeft,
+    [MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT] = gMovementActionFuncs_AcroEndWheelieFaceRight,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN] = gMovementActionFuncs_AcroWheelieHopFaceDown,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP] = gMovementActionFuncs_AcroWheelieHopFaceUp,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT] = gMovementActionFuncs_AcroWheelieHopFaceLeft,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT] = gMovementActionFuncs_AcroWheelieHopFaceRight,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN] = gMovementActionFuncs_AcroWheelieHopDown,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP] = gMovementActionFuncs_AcroWheelieHopUp,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT] = gMovementActionFuncs_AcroWheelieHopLeft,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT] = gMovementActionFuncs_AcroWheelieHopRight,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN] = gMovementActionFuncs_AcroWheelieJumpDown,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP] = gMovementActionFuncs_AcroWheelieJumpUp,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT] = gMovementActionFuncs_AcroWheelieJumpLeft,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT] = gMovementActionFuncs_AcroWheelieJumpRight,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN] = gMovementActionFuncs_AcroWheelieInPlaceDown,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP] = gMovementActionFuncs_AcroWheelieInPlaceUp,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT] = gMovementActionFuncs_AcroWheelieInPlaceLeft,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT] = gMovementActionFuncs_AcroWheelieInPlaceRight,
+    [MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN] = gMovementActionFuncs_AcroPopWheelieMoveDown,
+    [MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP] = gMovementActionFuncs_AcroPopWheelieMoveUp,
+    [MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT] = gMovementActionFuncs_AcroPopWheelieMoveLeft,
+    [MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT] = gMovementActionFuncs_AcroPopWheelieMoveRight,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN] = gMovementActionFuncs_AcroWheelieMoveDown,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP] = gMovementActionFuncs_AcroWheelieMoveUp,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT] = gMovementActionFuncs_AcroWheelieMoveLeft,
+    [MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT] = gMovementActionFuncs_AcroWheelieMoveRight,
+    [MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN] = gMovementActionFuncs_AcroEndWheelieMoveDown,
+    [MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP] = gMovementActionFuncs_AcroEndWheelieMoveUp,
+    [MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT] = gMovementActionFuncs_AcroEndWheelieMoveLeft,
+    [MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT] = gMovementActionFuncs_AcroEndWheelieMoveRight,
+    [MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT] = gMovementActionFuncs_WalkNormalDiagonalUpLeft,
+    [MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT] = gMovementActionFuncs_WalkNormalDiagonalUpRight,
+    [MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT] = gMovementActionFuncs_WalkNormalDiagonalDownLeft,
+    [MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT] = gMovementActionFuncs_WalkNormalDiagonalDownRight,
+    [MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT] = gMovementActionFuncs_WalkSlowDiagonalUpLeft,
+    [MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT] = gMovementActionFuncs_WalkSlowDiagonalUpRight,
+    [MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT] = gMovementActionFuncs_WalkSlowDiagonalDownLeft,
+    [MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT] = gMovementActionFuncs_WalkSlowDiagonalDownRight,
+    [MOVEMENT_ACTION_STORE_AND_LOCK_ANIM] = gMovementActionFuncs_StoreAndLockAnim,
+    [MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM] = gMovementActionFuncs_FreeAndUnlockAnim,
+    [MOVEMENT_ACTION_WALK_LEFT_AFFINE] = gMovementActionFuncs_WalkLeftAffine,
+    [MOVEMENT_ACTION_WALK_RIGHT_AFFINE] = gMovementActionFuncs_WalkRightAffine,
+    [MOVEMENT_ACTION_LEVITATE] = gMovementActionFuncs_Levitate,
+    [MOVEMENT_ACTION_STOP_LEVITATE] = gMovementActionFuncs_StopLevitate,
+    [MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP] = gMovementActionFuncs_DestroyExtraTaskIfAtTop,
+    [MOVEMENT_ACTION_FIGURE_8] = gMovementActionFuncs_Figure8,
+    [MOVEMENT_ACTION_FLY_UP] = gMovementActionFuncs_FlyUp,
+    [MOVEMENT_ACTION_FLY_DOWN] = gMovementActionFuncs_FlyDown,
 };
 
 u8 (*const gMovementActionFuncs_FaceDown[])(struct EventObject *, struct Sprite *) = {

src/data/pokemon_graphics/enemy_mon_elevation.h

@@ -1,417 +1,419 @@
+#include "constants/species.h"
+
 // This determines how much higher above the usual position the enemy Pokémon
 // is during battle. Species that float or fly have nonzero values.
 const u8 gEnemyMonElevation[] =
 {
-    0, // 0
-    0, // SPECIES_BULBASAUR
-    0, // SPECIES_IVYSAUR
-    0, // SPECIES_VENUSAUR
-    0, // SPECIES_CHARMANDER
-    0, // SPECIES_CHARMELEON
-    0, // SPECIES_CHARIZARD
-    0, // SPECIES_SQUIRTLE
-    0, // SPECIES_WARTORTLE
-    0, // SPECIES_BLASTOISE
-    0, // SPECIES_CATERPIE
-    0, // SPECIES_METAPOD
-    8, // SPECIES_BUTTERFREE
-    0, // SPECIES_WEEDLE
-    0, // SPECIES_KAKUNA
-    8, // SPECIES_BEEDRILL
-    16, // SPECIES_PIDGEY
-    0, // SPECIES_PIDGEOTTO
-    4, // SPECIES_PIDGEOT
-    0, // SPECIES_RATTATA
-    0, // SPECIES_RATICATE
-    0, // SPECIES_SPEAROW
-    6, // SPECIES_FEAROW
-    0, // SPECIES_EKANS
-    0, // SPECIES_ARBOK
-    0, // SPECIES_PIKACHU
-    0, // SPECIES_RAICHU
-    0, // SPECIES_SANDSHREW
-    0, // SPECIES_SANDSLASH
-    0, // SPECIES_NIDORAN_F
-    0, // SPECIES_NIDORINA
-    0, // SPECIES_NIDOQUEEN
-    0, // SPECIES_NIDORAN_M
-    0, // SPECIES_NIDORINO
-    0, // SPECIES_NIDOKING
-    0, // SPECIES_CLEFAIRY
-    0, // SPECIES_CLEFABLE
-    0, // SPECIES_VULPIX
-    0, // SPECIES_NINETALES
-    0, // SPECIES_JIGGLYPUFF
-    0, // SPECIES_WIGGLYTUFF
-    8, // SPECIES_ZUBAT
-    8, // SPECIES_GOLBAT
-    0, // SPECIES_ODDISH
-    0, // SPECIES_GLOOM
-    0, // SPECIES_VILEPLUME
-    0, // SPECIES_PARAS
-    0, // SPECIES_PARASECT
-    0, // SPECIES_VENONAT
-    8, // SPECIES_VENOMOTH
-    0, // SPECIES_DIGLETT
-    0, // SPECIES_DUGTRIO
-    0, // SPECIES_MEOWTH
-    0, // SPECIES_PERSIAN
-    0, // SPECIES_PSYDUCK
-    0, // SPECIES_GOLDUCK
-    0, // SPECIES_MANKEY
-    0, // SPECIES_PRIMEAPE
-    0, // SPECIES_GROWLITHE
-    0, // SPECIES_ARCANINE
-    0, // SPECIES_POLIWAG
-    0, // SPECIES_POLIWHIRL
-    0, // SPECIES_POLIWRATH
-    0, // SPECIES_ABRA
-    0, // SPECIES_KADABRA
-    0, // SPECIES_ALAKAZAM
-    0, // SPECIES_MACHOP
-    0, // SPECIES_MACHOKE
-    0, // SPECIES_MACHAMP
-    0, // SPECIES_BELLSPROUT
-    0, // SPECIES_WEEPINBELL
-    0, // SPECIES_VICTREEBEL
-    0, // SPECIES_TENTACOOL
-    0, // SPECIES_TENTACRUEL
-    16, // SPECIES_GEODUDE
-    0, // SPECIES_GRAVELER
-    0, // SPECIES_GOLEM
-    0, // SPECIES_PONYTA
-    0, // SPECIES_RAPIDASH
-    0, // SPECIES_SLOWPOKE
-    0, // SPECIES_SLOWBRO
-    16, // SPECIES_MAGNEMITE
-    8, // SPECIES_MAGNETON
-    0, // SPECIES_FARFETCHD
-    0, // SPECIES_DODUO
-    0, // SPECIES_DODRIO
-    0, // SPECIES_SEEL
-    0, // SPECIES_DEWGONG
-    0, // SPECIES_GRIMER
-    0, // SPECIES_MUK
-    0, // SPECIES_SHELLDER
-    0, // SPECIES_CLOYSTER
-    4, // SPECIES_GASTLY
-    4, // SPECIES_HAUNTER
-    0, // SPECIES_GENGAR
-    0, // SPECIES_ONIX
-    0, // SPECIES_DROWZEE
-    0, // SPECIES_HYPNO
-    0, // SPECIES_KRABBY
-    0, // SPECIES_KINGLER
-    10, // SPECIES_VOLTORB
-    12, // SPECIES_ELECTRODE
-    0, // SPECIES_EXEGGCUTE
-    0, // SPECIES_EXEGGUTOR
-    0, // SPECIES_CUBONE
-    0, // SPECIES_MAROWAK
-    0, // SPECIES_HITMONLEE
-    0, // SPECIES_HITMONCHAN
-    0, // SPECIES_LICKITUNG
-    8, // SPECIES_KOFFING
-    6, // SPECIES_WEEZING
-    0, // SPECIES_RHYHORN
-    0, // SPECIES_RHYDON
-    0, // SPECIES_CHANSEY
-    0, // SPECIES_TANGELA
-    0, // SPECIES_KANGASKHAN
-    0, // SPECIES_HORSEA
-    0, // SPECIES_SEADRA
-    0, // SPECIES_GOLDEEN
-    0, // SPECIES_SEAKING
-    0, // SPECIES_STARYU
-    0, // SPECIES_STARMIE
-    0, // SPECIES_MR_MIME
-    0, // SPECIES_SCYTHER
-    0, // SPECIES_JYNX
-    0, // SPECIES_ELECTABUZZ
-    0, // SPECIES_MAGMAR
-    0, // SPECIES_PINSIR
-    0, // SPECIES_TAUROS
-    0, // SPECIES_MAGIKARP
-    0, // SPECIES_GYARADOS
-    0, // SPECIES_LAPRAS
-    0, // SPECIES_DITTO
-    0, // SPECIES_EEVEE
-    0, // SPECIES_VAPOREON
-    0, // SPECIES_JOLTEON
-    0, // SPECIES_FLAREON
-    0, // SPECIES_PORYGON
-    0, // SPECIES_OMANYTE
-    0, // SPECIES_OMASTAR
-    0, // SPECIES_KABUTO
-    0, // SPECIES_KABUTOPS
-    7, // SPECIES_AERODACTYL
-    0, // SPECIES_SNORLAX
-    6, // SPECIES_ARTICUNO
-    8, // SPECIES_ZAPDOS
-    5, // SPECIES_MOLTRES
-    0, // SPECIES_DRATINI
-    0, // SPECIES_DRAGONAIR
-    6, // SPECIES_DRAGONITE
-    0, // SPECIES_MEWTWO
-    8, // SPECIES_MEW
-    0, // SPECIES_CHIKORITA
-    0, // SPECIES_BAYLEEF
-    0, // SPECIES_MEGANIUM
-    0, // SPECIES_CYNDAQUIL
-    0, // SPECIES_QUILAVA
-    0, // SPECIES_TYPHLOSION
-    0, // SPECIES_TOTODILE
-    0, // SPECIES_CROCONAW
-    0, // SPECIES_FERALIGATR
-    0, // SPECIES_SENTRET
-    0, // SPECIES_FURRET
-    0, // SPECIES_HOOTHOOT
-    0, // SPECIES_NOCTOWL
-    0, // SPECIES_LEDYBA
-    8, // SPECIES_LEDIAN
-    0, // SPECIES_SPINARAK
-    0, // SPECIES_ARIADOS
-    6, // SPECIES_CROBAT
-    0, // SPECIES_CHINCHOU
-    0, // SPECIES_LANTURN
-    0, // SPECIES_PICHU
-    0, // SPECIES_CLEFFA
-    0, // SPECIES_IGGLYBUFF
-    0, // SPECIES_TOGEPI
-    0, // SPECIES_TOGETIC
-    0, // SPECIES_NATU
-    0, // SPECIES_XATU
-    0, // SPECIES_MAREEP
-    0, // SPECIES_FLAAFFY
-    0, // SPECIES_AMPHAROS
-    0, // SPECIES_BELLOSSOM
-    0, // SPECIES_MARILL
-    0, // SPECIES_AZUMARILL
-    0, // SPECIES_SUDOWOODO
-    0, // SPECIES_POLITOED
-    11, // SPECIES_HOPPIP
-    12, // SPECIES_SKIPLOOM
-    9, // SPECIES_JUMPLUFF
-    0, // SPECIES_AIPOM
-    0, // SPECIES_SUNKERN
-    0, // SPECIES_SUNFLORA
-    8, // SPECIES_YANMA
-    0, // SPECIES_WOOPER
-    0, // SPECIES_QUAGSIRE
-    0, // SPECIES_ESPEON
-    0, // SPECIES_UMBREON
-    0, // SPECIES_MURKROW
-    0, // SPECIES_SLOWKING
-    8, // SPECIES_MISDREAVUS
-    8, // SPECIES_UNOWN
-    0, // SPECIES_WOBBUFFET
-    0, // SPECIES_GIRAFARIG
-    0, // SPECIES_PINECO
-    0, // SPECIES_FORRETRESS
-    0, // SPECIES_DUNSPARCE
-    6, // SPECIES_GLIGAR
-    0, // SPECIES_STEELIX
-    0, // SPECIES_SNUBBULL
-    0, // SPECIES_GRANBULL
-    0, // SPECIES_QWILFISH
-    0, // SPECIES_SCIZOR
-    0, // SPECIES_SHUCKLE
-    0, // SPECIES_HERACROSS
-    0, // SPECIES_SNEASEL
-    0, // SPECIES_TEDDIURSA
-    0, // SPECIES_URSARING
-    0, // SPECIES_SLUGMA
-    0, // SPECIES_MAGCARGO
-    0, // SPECIES_SWINUB
-    0, // SPECIES_PILOSWINE
-    0, // SPECIES_CORSOLA
-    0, // SPECIES_REMORAID
-    0, // SPECIES_OCTILLERY
-    0, // SPECIES_DELIBIRD
-    0, // SPECIES_MANTINE
-    0, // SPECIES_SKARMORY
-    0, // SPECIES_HOUNDOUR
-    0, // SPECIES_HOUNDOOM
-    0, // SPECIES_KINGDRA
-    0, // SPECIES_PHANPY
-    0, // SPECIES_DONPHAN
-    0, // SPECIES_PORYGON2
-    0, // SPECIES_STANTLER
-    0, // SPECIES_SMEARGLE
-    0, // SPECIES_TYROGUE
-    0, // SPECIES_HITMONTOP
-    0, // SPECIES_SMOOCHUM
-    0, // SPECIES_ELEKID
-    0, // SPECIES_MAGBY
-    0, // SPECIES_MILTANK
-    0, // SPECIES_BLISSEY
-    0, // SPECIES_RAIKOU
-    0, // SPECIES_ENTEI
-    0, // SPECIES_SUICUNE
-    0, // SPECIES_LARVITAR
-    0, // SPECIES_PUPITAR
-    0, // SPECIES_TYRANITAR
-    6, // SPECIES_LUGIA
-    6, // SPECIES_HO_OH
-    15, // SPECIES_CELEBI
-    0, // 252
-    0, // 253
-    0, // 254
-    0, // 255
-    0, // 256
-    0, // 257
-    0, // 258
-    0, // 259
-    0, // 260
-    0, // 261
-    0, // 262
-    0, // 263
-    0, // 264
-    0, // 265
-    0, // 266
-    0, // 267
-    0, // 268
-    0, // 269
-    0, // 270
-    0, // 271
-    0, // 272
-    0, // 273
-    0, // 274
-    0, // 275
-    0, // 276
-    0, // SPECIES_TREECKO
-    0, // SPECIES_GROVYLE
-    0, // SPECIES_SCEPTILE
-    0, // SPECIES_TORCHIC
-    0, // SPECIES_COMBUSKEN
-    0, // SPECIES_BLAZIKEN
-    0, // SPECIES_MUDKIP
-    0, // SPECIES_MARSHTOMP
-    0, // SPECIES_SWAMPERT
-    0, // SPECIES_POOCHYENA
-    0, // SPECIES_MIGHTYENA
-    0, // SPECIES_ZIGZAGOON
-    0, // SPECIES_LINOONE
-    0, // SPECIES_WURMPLE
-    0, // SPECIES_SILCOON
-    8, // SPECIES_BEAUTIFLY
-    0, // SPECIES_CASCOON
-    10, // SPECIES_DUSTOX
-    0, // SPECIES_LOTAD
-    0, // SPECIES_LOMBRE
-    0, // SPECIES_LUDICOLO
-    0, // SPECIES_SEEDOT
-    0, // SPECIES_NUZLEAF
-    0, // SPECIES_SHIFTRY
-    0, // SPECIES_NINCADA
-    10, // SPECIES_NINJASK
-    8, // SPECIES_SHEDINJA
-    0, // SPECIES_TAILLOW
-    0, // SPECIES_SWELLOW
-    0, // SPECIES_SHROOMISH
-    0, // SPECIES_BRELOOM
-    0, // SPECIES_SPINDA
-    16, // SPECIES_WINGULL
-    8, // SPECIES_PELIPPER
-    0, // SPECIES_SURSKIT
-    10, // SPECIES_MASQUERAIN
-    0, // SPECIES_WAILMER
-    0, // SPECIES_WAILORD
-    0, // SPECIES_SKITTY
-    0, // SPECIES_DELCATTY
-    0, // SPECIES_KECLEON
-    4, // SPECIES_BALTOY
-    10, // SPECIES_CLAYDOL
-    0, // SPECIES_NOSEPASS
-    0, // SPECIES_TORKOAL
-    0, // SPECIES_SABLEYE
-    0, // SPECIES_BARBOACH
-    0, // SPECIES_WHISCASH
-    0, // SPECIES_LUVDISC
-    0, // SPECIES_CORPHISH
-    0, // SPECIES_CRAWDAUNT
-    0, // SPECIES_FEEBAS
-    0, // SPECIES_MILOTIC
-    0, // SPECIES_CARVANHA
-    0, // SPECIES_SHARPEDO
-    0, // SPECIES_TRAPINCH
-    0, // SPECIES_VIBRAVA
-    7, // SPECIES_FLYGON
-    0, // SPECIES_MAKUHITA
-    0, // SPECIES_HARIYAMA
-    0, // SPECIES_ELECTRIKE
-    0, // SPECIES_MANECTRIC
-    0, // SPECIES_NUMEL
-    0, // SPECIES_CAMERUPT
-    0, // SPECIES_SPHEAL
-    0, // SPECIES_SEALEO
-    0, // SPECIES_WALREIN
-    0, // SPECIES_CACNEA
-    0, // SPECIES_CACTURNE
-    0, // SPECIES_SNORUNT
-    12, // SPECIES_GLALIE
-    13, // SPECIES_LUNATONE
-    4, // SPECIES_SOLROCK
-    0, // SPECIES_AZURILL
-    0, // SPECIES_SPOINK
-    0, // SPECIES_GRUMPIG
-    0, // SPECIES_PLUSLE
-    0, // SPECIES_MINUN
-    0, // SPECIES_MAWILE
-    0, // SPECIES_MEDITITE
-    0, // SPECIES_MEDICHAM
-    12, // SPECIES_SWABLU
-    8, // SPECIES_ALTARIA
-    0, // SPECIES_WYNAUT
-    9, // SPECIES_DUSKULL
-    0, // SPECIES_DUSCLOPS
-    0, // SPECIES_ROSELIA
-    0, // SPECIES_SLAKOTH
-    0, // SPECIES_VIGOROTH
-    0, // SPECIES_SLAKING
-    0, // SPECIES_GULPIN
-    0, // SPECIES_SWALOT
-    0, // SPECIES_TROPIUS
-    0, // SPECIES_WHISMUR
-    0, // SPECIES_LOUDRED
-    0, // SPECIES_EXPLOUD
-    0, // SPECIES_CLAMPERL
-    0, // SPECIES_HUNTAIL
-    0, // SPECIES_GOREBYSS
-    0, // SPECIES_ABSOL
-    12, // SPECIES_SHUPPET
-    8, // SPECIES_BANETTE
-    0, // SPECIES_SEVIPER
-    0, // SPECIES_ZANGOOSE
-    0, // SPECIES_RELICANTH
-    0, // SPECIES_ARON
-    0, // SPECIES_LAIRON
-    0, // SPECIES_AGGRON
-    16, // SPECIES_CASTFORM
-    0, // SPECIES_VOLBEAT
-    0, // SPECIES_ILLUMISE
-    0, // SPECIES_LILEEP
-    0, // SPECIES_CRADILY
-    0, // SPECIES_ANORITH
-    0, // SPECIES_ARMALDO
-    0, // SPECIES_RALTS
-    0, // SPECIES_KIRLIA
-    0, // SPECIES_GARDEVOIR
-    0, // SPECIES_BAGON
-    0, // SPECIES_SHELGON
-    0, // SPECIES_SALAMENCE
-    8, // SPECIES_BELDUM
-    0, // SPECIES_METANG
-    0, // SPECIES_METAGROSS
-    0, // SPECIES_REGIROCK
-    0, // SPECIES_REGICE
-    0, // SPECIES_REGISTEEL
-    0, // SPECIES_KYOGRE
-    0, // SPECIES_GROUDON
-    6, // SPECIES_RAYQUAZA
-    6, // SPECIES_LATIAS
-    6, // SPECIES_LATIOS
-    12, // SPECIES_JIRACHI
-    8, // SPECIES_DEOXYS
-    12, // SPECIES_CHIMECHO
+    [SPECIES_NONE] = 0,
+    [SPECIES_BULBASAUR] = 0,
+    [SPECIES_IVYSAUR] = 0,
+    [SPECIES_VENUSAUR] = 0,
+    [SPECIES_CHARMANDER] = 0,
+    [SPECIES_CHARMELEON] = 0,
+    [SPECIES_CHARIZARD] = 0,
+    [SPECIES_SQUIRTLE] = 0,
+    [SPECIES_WARTORTLE] = 0,
+    [SPECIES_BLASTOISE] = 0,
+    [SPECIES_CATERPIE] = 0,
+    [SPECIES_METAPOD] = 0,
+    [SPECIES_BUTTERFREE] = 8,
+    [SPECIES_WEEDLE] = 0,
+    [SPECIES_KAKUNA] = 0,
+    [SPECIES_BEEDRILL] = 8,
+    [SPECIES_PIDGEY] = 16,
+    [SPECIES_PIDGEOTTO] = 0,
+    [SPECIES_PIDGEOT] = 4,
+    [SPECIES_RATTATA] = 0,
+    [SPECIES_RATICATE] = 0,
+    [SPECIES_SPEAROW] = 0,
+    [SPECIES_FEAROW] = 6,
+    [SPECIES_EKANS] = 0,
+    [SPECIES_ARBOK] = 0,
+    [SPECIES_PIKACHU] = 0,
+    [SPECIES_RAICHU] = 0,
+    [SPECIES_SANDSHREW] = 0,
+    [SPECIES_SANDSLASH] = 0,
+    [SPECIES_NIDORAN_F] = 0,
+    [SPECIES_NIDORINA] = 0,
+    [SPECIES_NIDOQUEEN] = 0,
+    [SPECIES_NIDORAN_M] = 0,
+    [SPECIES_NIDORINO] = 0,
+    [SPECIES_NIDOKING] = 0,
+    [SPECIES_CLEFAIRY] = 0,
+    [SPECIES_CLEFABLE] = 0,
+    [SPECIES_VULPIX] = 0,
+    [SPECIES_NINETALES] = 0,
+    [SPECIES_JIGGLYPUFF] = 0,
+    [SPECIES_WIGGLYTUFF] = 0,
+    [SPECIES_ZUBAT] = 8,
+    [SPECIES_GOLBAT] = 8,
+    [SPECIES_ODDISH] = 0,
+    [SPECIES_GLOOM] = 0,
+    [SPECIES_VILEPLUME] = 0,
+    [SPECIES_PARAS] = 0,
+    [SPECIES_PARASECT] = 0,
+    [SPECIES_VENONAT] = 0,
+    [SPECIES_VENOMOTH] = 8,
+    [SPECIES_DIGLETT] = 0,
+    [SPECIES_DUGTRIO] = 0,
+    [SPECIES_MEOWTH] = 0,
+    [SPECIES_PERSIAN] = 0,
+    [SPECIES_PSYDUCK] = 0,
+    [SPECIES_GOLDUCK] = 0,
+    [SPECIES_MANKEY] = 0,
+    [SPECIES_PRIMEAPE] = 0,
+    [SPECIES_GROWLITHE] = 0,
+    [SPECIES_ARCANINE] = 0,
+    [SPECIES_POLIWAG] = 0,
+    [SPECIES_POLIWHIRL] = 0,
+    [SPECIES_POLIWRATH] = 0,
+    [SPECIES_ABRA] = 0,
+    [SPECIES_KADABRA] = 0,
+    [SPECIES_ALAKAZAM] = 0,
+    [SPECIES_MACHOP] = 0,
+    [SPECIES_MACHOKE] = 0,
+    [SPECIES_MACHAMP] = 0,
+    [SPECIES_BELLSPROUT] = 0,
+    [SPECIES_WEEPINBELL] = 0,
+    [SPECIES_VICTREEBEL] = 0,
+    [SPECIES_TENTACOOL] = 0,
+    [SPECIES_TENTACRUEL] = 0,
+    [SPECIES_GEODUDE] = 16,
+    [SPECIES_GRAVELER] = 0,
+    [SPECIES_GOLEM] = 0,
+    [SPECIES_PONYTA] = 0,
+    [SPECIES_RAPIDASH] = 0,
+    [SPECIES_SLOWPOKE] = 0,
+    [SPECIES_SLOWBRO] = 0,
+    [SPECIES_MAGNEMITE] = 16,
+    [SPECIES_MAGNETON] = 8,
+    [SPECIES_FARFETCHD] = 0,
+    [SPECIES_DODUO] = 0,
+    [SPECIES_DODRIO] = 0,
+    [SPECIES_SEEL] = 0,
+    [SPECIES_DEWGONG] = 0,
+    [SPECIES_GRIMER] = 0,
+    [SPECIES_MUK] = 0,
+    [SPECIES_SHELLDER] = 0,
+    [SPECIES_CLOYSTER] = 0,
+    [SPECIES_GASTLY] = 4,
+    [SPECIES_HAUNTER] = 4,
+    [SPECIES_GENGAR] = 0,
+    [SPECIES_ONIX] = 0,
+    [SPECIES_DROWZEE] = 0,
+    [SPECIES_HYPNO] = 0,
+    [SPECIES_KRABBY] = 0,
+    [SPECIES_KINGLER] = 0,
+    [SPECIES_VOLTORB] = 10,
+    [SPECIES_ELECTRODE] = 12,
+    [SPECIES_EXEGGCUTE] = 0,
+    [SPECIES_EXEGGUTOR] = 0,
+    [SPECIES_CUBONE] = 0,
+    [SPECIES_MAROWAK] = 0,
+    [SPECIES_HITMONLEE] = 0,
+    [SPECIES_HITMONCHAN] = 0,
+    [SPECIES_LICKITUNG] = 0,
+    [SPECIES_KOFFING] = 8,
+    [SPECIES_WEEZING] = 6,
+    [SPECIES_RHYHORN] = 0,
+    [SPECIES_RHYDON] = 0,
+    [SPECIES_CHANSEY] = 0,
+    [SPECIES_TANGELA] = 0,
+    [SPECIES_KANGASKHAN] = 0,
+    [SPECIES_HORSEA] = 0,
+    [SPECIES_SEADRA] = 0,
+    [SPECIES_GOLDEEN] = 0,
+    [SPECIES_SEAKING] = 0,
+    [SPECIES_STARYU] = 0,
+    [SPECIES_STARMIE] = 0,
+    [SPECIES_MR_MIME] = 0,
+    [SPECIES_SCYTHER] = 0,
+    [SPECIES_JYNX] = 0,
+    [SPECIES_ELECTABUZZ] = 0,
+    [SPECIES_MAGMAR] = 0,
+    [SPECIES_PINSIR] = 0,
+    [SPECIES_TAUROS] = 0,
+    [SPECIES_MAGIKARP] = 0,
+    [SPECIES_GYARADOS] = 0,
+    [SPECIES_LAPRAS] = 0,
+    [SPECIES_DITTO] = 0,
+    [SPECIES_EEVEE] = 0,
+    [SPECIES_VAPOREON] = 0,
+    [SPECIES_JOLTEON] = 0,
+    [SPECIES_FLAREON] = 0,
+    [SPECIES_PORYGON] = 0,
+    [SPECIES_OMANYTE] = 0,
+    [SPECIES_OMASTAR] = 0,
+    [SPECIES_KABUTO] = 0,
+    [SPECIES_KABUTOPS] = 0,
+    [SPECIES_AERODACTYL] = 7,
+    [SPECIES_SNORLAX] = 0,
+    [SPECIES_ARTICUNO] = 6,
+    [SPECIES_ZAPDOS] = 8,
+    [SPECIES_MOLTRES] = 5,
+    [SPECIES_DRATINI] = 0,
+    [SPECIES_DRAGONAIR] = 0,
+    [SPECIES_DRAGONITE] = 6,
+    [SPECIES_MEWTWO] = 0,
+    [SPECIES_MEW] = 8,
+    [SPECIES_CHIKORITA] = 0,
+    [SPECIES_BAYLEEF] = 0,
+    [SPECIES_MEGANIUM] = 0,
+    [SPECIES_CYNDAQUIL] = 0,
+    [SPECIES_QUILAVA] = 0,
+    [SPECIES_TYPHLOSION] = 0,
+    [SPECIES_TOTODILE] = 0,
+    [SPECIES_CROCONAW] = 0,
+    [SPECIES_FERALIGATR] = 0,
+    [SPECIES_SENTRET] = 0,
+    [SPECIES_FURRET] = 0,
+    [SPECIES_HOOTHOOT] = 0,
+    [SPECIES_NOCTOWL] = 0,
+    [SPECIES_LEDYBA] = 0,
+    [SPECIES_LEDIAN] = 8,
+    [SPECIES_SPINARAK] = 0,
+    [SPECIES_ARIADOS] = 0,
+    [SPECIES_CROBAT] = 6,
+    [SPECIES_CHINCHOU] = 0,
+    [SPECIES_LANTURN] = 0,
+    [SPECIES_PICHU] = 0,
+    [SPECIES_CLEFFA] = 0,
+    [SPECIES_IGGLYBUFF] = 0,
+    [SPECIES_TOGEPI] = 0,
+    [SPECIES_TOGETIC] = 0,
+    [SPECIES_NATU] = 0,
+    [SPECIES_XATU] = 0,
+    [SPECIES_MAREEP] = 0,
+    [SPECIES_FLAAFFY] = 0,
+    [SPECIES_AMPHAROS] = 0,
+    [SPECIES_BELLOSSOM] = 0,
+    [SPECIES_MARILL] = 0,
+    [SPECIES_AZUMARILL] = 0,
+    [SPECIES_SUDOWOODO] = 0,
+    [SPECIES_POLITOED] = 0,
+    [SPECIES_HOPPIP] = 11,
+    [SPECIES_SKIPLOOM] = 12,
+    [SPECIES_JUMPLUFF] = 9,
+    [SPECIES_AIPOM] = 0,
+    [SPECIES_SUNKERN] = 0,
+    [SPECIES_SUNFLORA] = 0,
+    [SPECIES_YANMA] = 8,
+    [SPECIES_WOOPER] = 0,
+    [SPECIES_QUAGSIRE] = 0,
+    [SPECIES_ESPEON] = 0,
+    [SPECIES_UMBREON] = 0,
+    [SPECIES_MURKROW] = 0,
+    [SPECIES_SLOWKING] = 0,
+    [SPECIES_MISDREAVUS] = 8,
+    [SPECIES_UNOWN] = 8,
+    [SPECIES_WOBBUFFET] = 0,
+    [SPECIES_GIRAFARIG] = 0,
+    [SPECIES_PINECO] = 0,
+    [SPECIES_FORRETRESS] = 0,
+    [SPECIES_DUNSPARCE] = 0,
+    [SPECIES_GLIGAR] = 6,
+    [SPECIES_STEELIX] = 0,
+    [SPECIES_SNUBBULL] = 0,
+    [SPECIES_GRANBULL] = 0,
+    [SPECIES_QWILFISH] = 0,
+    [SPECIES_SCIZOR] = 0,
+    [SPECIES_SHUCKLE] = 0,
+    [SPECIES_HERACROSS] = 0,
+    [SPECIES_SNEASEL] = 0,
+    [SPECIES_TEDDIURSA] = 0,
+    [SPECIES_URSARING] = 0,
+    [SPECIES_SLUGMA] = 0,
+    [SPECIES_MAGCARGO] = 0,
+    [SPECIES_SWINUB] = 0,
+    [SPECIES_PILOSWINE] = 0,
+    [SPECIES_CORSOLA] = 0,
+    [SPECIES_REMORAID] = 0,
+    [SPECIES_OCTILLERY] = 0,
+    [SPECIES_DELIBIRD] = 0,
+    [SPECIES_MANTINE] = 0,
+    [SPECIES_SKARMORY] = 0,
+    [SPECIES_HOUNDOUR] = 0,
+    [SPECIES_HOUNDOOM] = 0,
+    [SPECIES_KINGDRA] = 0,
+    [SPECIES_PHANPY] = 0,
+    [SPECIES_DONPHAN] = 0,
+    [SPECIES_PORYGON2] = 0,
+    [SPECIES_STANTLER] = 0,
+    [SPECIES_SMEARGLE] = 0,
+    [SPECIES_TYROGUE] = 0,
+    [SPECIES_HITMONTOP] = 0,
+    [SPECIES_SMOOCHUM] = 0,
+    [SPECIES_ELEKID] = 0,
+    [SPECIES_MAGBY] = 0,
+    [SPECIES_MILTANK] = 0,
+    [SPECIES_BLISSEY] = 0,
+    [SPECIES_RAIKOU] = 0,
+    [SPECIES_ENTEI] = 0,
+    [SPECIES_SUICUNE] = 0,
+    [SPECIES_LARVITAR] = 0,
+    [SPECIES_PUPITAR] = 0,
+    [SPECIES_TYRANITAR] = 0,
+    [SPECIES_LUGIA] = 6,
+    [SPECIES_HO_OH] = 6,
+    [SPECIES_CELEBI] = 15,
+    [252] = 0,
+    [253] = 0,
+    [254] = 0,
+    [255] = 0,
+    [256] = 0,
+    [257] = 0,
+    [258] = 0,
+    [259] = 0,
+    [260] = 0,
+    [261] = 0,
+    [262] = 0,
+    [263] = 0,
+    [264] = 0,
+    [265] = 0,
+    [266] = 0,
+    [267] = 0,
+    [268] = 0,
+    [269] = 0,
+    [270] = 0,
+    [271] = 0,
+    [272] = 0,
+    [273] = 0,
+    [274] = 0,
+    [275] = 0,
+    [276] = 0,
+    [SPECIES_TREECKO] = 0,
+    [SPECIES_GROVYLE] = 0,
+    [SPECIES_SCEPTILE] = 0,
+    [SPECIES_TORCHIC] = 0,
+    [SPECIES_COMBUSKEN] = 0,
+    [SPECIES_BLAZIKEN] = 0,
+    [SPECIES_MUDKIP] = 0,
+    [SPECIES_MARSHTOMP] = 0,
+    [SPECIES_SWAMPERT] = 0,
+    [SPECIES_POOCHYENA] = 0,
+    [SPECIES_MIGHTYENA] = 0,
+    [SPECIES_ZIGZAGOON] = 0,
+    [SPECIES_LINOONE] = 0,
+    [SPECIES_WURMPLE] = 0,
+    [SPECIES_SILCOON] = 0,
+    [SPECIES_BEAUTIFLY] = 8,
+    [SPECIES_CASCOON] = 0,
+    [SPECIES_DUSTOX] = 10,
+    [SPECIES_LOTAD] = 0,
+    [SPECIES_LOMBRE] = 0,
+    [SPECIES_LUDICOLO] = 0,
+    [SPECIES_SEEDOT] = 0,
+    [SPECIES_NUZLEAF] = 0,
+    [SPECIES_SHIFTRY] = 0,
+    [SPECIES_NINCADA] = 0,
+    [SPECIES_NINJASK] = 10,
+    [SPECIES_SHEDINJA] = 8,
+    [SPECIES_TAILLOW] = 0,
+    [SPECIES_SWELLOW] = 0,
+    [SPECIES_SHROOMISH] = 0,
+    [SPECIES_BRELOOM] = 0,
+    [SPECIES_SPINDA] = 0,
+    [SPECIES_WINGULL] = 16,
+    [SPECIES_PELIPPER] = 8,
+    [SPECIES_SURSKIT] = 0,
+    [SPECIES_MASQUERAIN] = 10,
+    [SPECIES_WAILMER] = 0,
+    [SPECIES_WAILORD] = 0,
+    [SPECIES_SKITTY] = 0,
+    [SPECIES_DELCATTY] = 0,
+    [SPECIES_KECLEON] = 0,
+    [SPECIES_BALTOY] = 4,
+    [SPECIES_CLAYDOL] = 10,
+    [SPECIES_NOSEPASS] = 0,
+    [SPECIES_TORKOAL] = 0,
+    [SPECIES_SABLEYE] = 0,
+    [SPECIES_BARBOACH] = 0,
+    [SPECIES_WHISCASH] = 0,
+    [SPECIES_LUVDISC] = 0,
+    [SPECIES_CORPHISH] = 0,
+    [SPECIES_CRAWDAUNT] = 0,
+    [SPECIES_FEEBAS] = 0,
+    [SPECIES_MILOTIC] = 0,
+    [SPECIES_CARVANHA] = 0,
+    [SPECIES_SHARPEDO] = 0,
+    [SPECIES_TRAPINCH] = 0,
+    [SPECIES_VIBRAVA] = 0,
+    [SPECIES_FLYGON] = 7,
+    [SPECIES_MAKUHITA] = 0,
+    [SPECIES_HARIYAMA] = 0,
+    [SPECIES_ELECTRIKE] = 0,
+    [SPECIES_MANECTRIC] = 0,
+    [SPECIES_NUMEL] = 0,
+    [SPECIES_CAMERUPT] = 0,
+    [SPECIES_SPHEAL] = 0,
+    [SPECIES_SEALEO] = 0,
+    [SPECIES_WALREIN] = 0,
+    [SPECIES_CACNEA] = 0,
+    [SPECIES_CACTURNE] = 0,
+    [SPECIES_SNORUNT] = 0,
+    [SPECIES_GLALIE] = 12,
+    [SPECIES_LUNATONE] = 13,
+    [SPECIES_SOLROCK] = 4,
+    [SPECIES_AZURILL] = 0,
+    [SPECIES_SPOINK] = 0,
+    [SPECIES_GRUMPIG] = 0,
+    [SPECIES_PLUSLE] = 0,
+    [SPECIES_MINUN] = 0,
+    [SPECIES_MAWILE] = 0,
+    [SPECIES_MEDITITE] = 0,
+    [SPECIES_MEDICHAM] = 0,
+    [SPECIES_SWABLU] = 12,
+    [SPECIES_ALTARIA] = 8,
+    [SPECIES_WYNAUT] = 0,
+    [SPECIES_DUSKULL] = 9,
+    [SPECIES_DUSCLOPS] = 0,
+    [SPECIES_ROSELIA] = 0,
+    [SPECIES_SLAKOTH] = 0,
+    [SPECIES_VIGOROTH] = 0,
+    [SPECIES_SLAKING] = 0,
+    [SPECIES_GULPIN] = 0,
+    [SPECIES_SWALOT] = 0,
+    [SPECIES_TROPIUS] = 0,
+    [SPECIES_WHISMUR] = 0,
+    [SPECIES_LOUDRED] = 0,
+    [SPECIES_EXPLOUD] = 0,
+    [SPECIES_CLAMPERL] = 0,
+    [SPECIES_HUNTAIL] = 0,
+    [SPECIES_GOREBYSS] = 0,
+    [SPECIES_ABSOL] = 0,
+    [SPECIES_SHUPPET] = 12,
+    [SPECIES_BANETTE] = 8,
+    [SPECIES_SEVIPER] = 0,
+    [SPECIES_ZANGOOSE] = 0,
+    [SPECIES_RELICANTH] = 0,
+    [SPECIES_ARON] = 0,
+    [SPECIES_LAIRON] = 0,
+    [SPECIES_AGGRON] = 0,
+    [SPECIES_CASTFORM] = 16,
+    [SPECIES_VOLBEAT] = 0,
+    [SPECIES_ILLUMISE] = 0,
+    [SPECIES_LILEEP] = 0,
+    [SPECIES_CRADILY] = 0,
+    [SPECIES_ANORITH] = 0,
+    [SPECIES_ARMALDO] = 0,
+    [SPECIES_RALTS] = 0,
+    [SPECIES_KIRLIA] = 0,
+    [SPECIES_GARDEVOIR] = 0,
+    [SPECIES_BAGON] = 0,
+    [SPECIES_SHELGON] = 0,
+    [SPECIES_SALAMENCE] = 0,
+    [SPECIES_BELDUM] = 8,
+    [SPECIES_METANG] = 0,
+    [SPECIES_METAGROSS] = 0,
+    [SPECIES_REGIROCK] = 0,
+    [SPECIES_REGICE] = 0,
+    [SPECIES_REGISTEEL] = 0,
+    [SPECIES_KYOGRE] = 0,
+    [SPECIES_GROUDON] = 0,
+    [SPECIES_RAYQUAZA] = 6,
+    [SPECIES_LATIAS] = 6,
+    [SPECIES_LATIOS] = 6,
+    [SPECIES_JIRACHI] = 12,
+    [SPECIES_DEOXYS] = 8,
+    [SPECIES_CHIMECHO] = 12,
 };

src/daycare.c

@@ -251,7 +251,7 @@ static void ApplyDaycareExperience(struct Pokemon *mon)
             while ((learnedMove = MonTryLearningNewMove(mon, firstMove)) != 0)
             {
                 firstMove = FALSE;
-                if (learnedMove == INVALID_U16)
+                if (learnedMove == 0xFFFF)
                 {
                     // Mon already knows 4 moves.
                     DeleteFirstMoveAndGiveMoveToMon(mon, gMoveToLearn);
@@ -535,7 +535,7 @@ static void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv)
     s32 i, j;
     u8 temp[NUM_STATS];
 
-    ivs[selectedIv] = INVALID_U8;
+    ivs[selectedIv] = 0xFF;
     for (i = 0; i < NUM_STATS; i++)
     {
         temp[i] = ivs[i];
@@ -544,7 +544,7 @@ static void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv)
     j = 0;
     for (i = 0; i < NUM_STATS; i++)
     {
-        if (temp[i] != INVALID_U8)
+        if (temp[i] != 0xFF)
             ivs[j++] = temp[i];
     }
 }
@@ -684,7 +684,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru
             {
                 if (sHatchedEggFatherMoves[i] == sHatchedEggEggMoves[j])
                 {
-                    if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == INVALID_U16)
+                    if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xFFFF)
                         DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]);
                     break;
                 }
@@ -703,7 +703,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru
             {
                 if (sHatchedEggFatherMoves[i] == ItemIdToBattleMoveId(ITEM_TM01_FOCUS_PUNCH + j) && CanMonLearnTMHM(egg, j))
                 {
-                    if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == INVALID_U16)
+                    if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xFFFF)
                         DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]);
                 }
             }
@@ -728,7 +728,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru
         {
             if (sHatchedEggLevelUpMoves[j] != MOVE_NONE && sHatchedEggFinalMoves[i] == sHatchedEggLevelUpMoves[j])
             {
-                if (GiveMoveToMon(egg, sHatchedEggFinalMoves[i]) == INVALID_U16)
+                if (GiveMoveToMon(egg, sHatchedEggFinalMoves[i]) == 0xFFFF)
                     DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFinalMoves[i]);
                 break;
             }
@@ -773,7 +773,7 @@ static void GiveVoltTackleIfLightBall(struct Pokemon *mon, struct DayCare *dayca
 
     if (motherItem == ITEM_LIGHT_BALL || fatherItem == ITEM_LIGHT_BALL)
     {
-        if (GiveMoveToMon(mon, MOVE_VOLT_TACKLE) == INVALID_U16)
+        if (GiveMoveToMon(mon, MOVE_VOLT_TACKLE) == 0xFFFF)
             DeleteFirstMoveAndGiveMoveToMon(mon, MOVE_VOLT_TACKLE);
     }
 }
@@ -909,7 +909,7 @@ static bool8 _DoEggActions_CheckHatch(struct DayCare *daycare)
     }
 
     // try to trigger poke sex
-    if (daycare->offspringPersonality == 0 && validEggs == 2 && (daycare->mons[1].steps & 0xFF) == INVALID_U8)
+    if (daycare->offspringPersonality == 0 && validEggs == 2 && (daycare->mons[1].steps & 0xFF) == 0xFF)
     {
         u8 loveScore = GetDaycareCompatibilityScore(daycare);
         if (loveScore > (Random() * 100u) / USHRT_MAX)

src/decoration.c

@@ -312,7 +312,7 @@ const struct SpriteFrameImage sDecorSelectorSpriteFrameImages = {
 };
 
 const struct SpriteTemplate sDecorSelectorSpriteTemplate = {
-    INVALID_U16,
+    0xFFFF,
     OVERWORLD_PLACE_DECOR_SELECTOR_PAL_TAG,
     &sDecorSelectorOam,
     sDecorSelectorAnims,
@@ -409,7 +409,7 @@ const struct SpriteFrameImage Unknown_085A73FC = {
 };
 
 const struct SpriteTemplate gUnknown_085A7404 = {
-    INVALID_U16,
+    0xFFFF,
     OVERWORLD_PLACE_DECOR_PLAYER_PAL_TAG,
     &Unknown_085A73E8,
     Unknown_085A73F8,
@@ -881,7 +881,7 @@ void sub_81274A0(u8 a0, s32 a1, u8 a2)
 
 void sub_8127500(void)
 {
-    if (sDecorPCBuffer->unk_522 == INVALID_U8)
+    if (sDecorPCBuffer->unk_522 == 0xFF)
     {
         sDecorPCBuffer->unk_522 = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0x3c, 0x0c, 0x94, sDecorPCBuffer->unk_520 - sDecorPCBuffer->unk_521, 0x6e, 0x6e, &sSecretBasePCSelectDecorPageNo);
     }
@@ -889,10 +889,10 @@ void sub_8127500(void)
 
 void sub_8127554(void)
 {
-    if (sDecorPCBuffer->unk_522 != INVALID_U8)
+    if (sDecorPCBuffer->unk_522 != 0xFF)
     {
         RemoveScrollIndicatorArrowPair(sDecorPCBuffer->unk_522);
-        sDecorPCBuffer->unk_522 = INVALID_U8;
+        sDecorPCBuffer->unk_522 = 0xFF;
     }
 }
 
@@ -910,7 +910,7 @@ void sub_812759C(u8 taskId)
     sub_81269D4(3);
     sub_8127718(sCurDecorationCategory);
     sDecorPCBuffer = calloc(1, sizeof(struct DecorPCBuffer));
-    sDecorPCBuffer->unk_522 = INVALID_U8;
+    sDecorPCBuffer->unk_522 = 0xFF;
     sub_8127284();
     sub_81272C8();
     sub_81272F8();
@@ -1188,7 +1188,7 @@ void sub_8127B90(u16 mapX, u16 mapY, u8 decWidth, u8 decHeight, u16 decor)
                 v0 = 0;
             }
             v1 = sub_8127B54(gDecorations[decor].id, i * decWidth + j);
-            if (v1 != INVALID_U16)
+            if (v1 != 0xFFFF)
             {
                 MapGridSetMetatileEntryAt(decLeft, decBottom, (gDecorations[decor].tiles[i * decWidth + j] + (0x200 | v0)) | flags | v1);
             }

src/evolution_scene.c

@@ -748,7 +748,7 @@ static void Task_EvolutionScene(u8 taskID)
                 GetMonData(mon, MON_DATA_NICKNAME, text);
                 StringCopy10(gBattleTextBuff1, text);
 
-                if (var == INVALID_U16) // no place to learn it
+                if (var == 0xFFFF) // no place to learn it
                     gTasks[taskID].tState = 22;
                 else if (var == 0xFFFE) // it already knows that move
                     break;
@@ -1105,7 +1105,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
                 GetMonData(mon, MON_DATA_NICKNAME, text);
                 StringCopy10(gBattleTextBuff1, text);
 
-                if (var == INVALID_U16)
+                if (var == 0xFFFF)
                     gTasks[taskID].tState = 20;
                 else if (var == 0xFFFE)
                     break;

src/field_control_avatar.c

@@ -266,7 +266,7 @@ const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatil
     else
         eventObjectId = GetEventObjectIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height);
 
-    if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == INVALID_U8)
+    if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == 0xFF)
         return NULL;
 
     for (i = 0; i < 4; i++)
@@ -287,14 +287,14 @@ static const u8 *GetInteractedEventObjectScript(struct MapPosition *position, u8
     const u8 *script;
 
     eventObjectId = GetEventObjectIdByXYZ(position->x, position->y, position->height);
-    if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == INVALID_U8)
+    if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == 0xFF)
     {
         if (MetatileBehavior_IsCounter(metatileBehavior) != TRUE)
             return NULL;
 
         // Look for an event object on the other side of the counter.
         eventObjectId = GetEventObjectIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height);
-        if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == INVALID_U8)
+        if (eventObjectId == 16 || gEventObjects[eventObjectId].localId == 0xFF)
             return NULL;
     }
 

src/field_door.c

@@ -695,7 +695,7 @@ static void DrawClosedDoorTiles(const struct DoorGraphics *gfx, u32 x, u32 y)
 
 static void DrawDoor(const struct DoorGraphics *gfx, const struct DoorAnimFrame *frame, u32 x, u32 y)
 {
-    if (frame->offset == INVALID_U16)
+    if (frame->offset == 0xFFFF)
     {
         DrawClosedDoorTiles(gfx, x, y);
         if (sub_808A964())

src/field_effect.c

@@ -305,7 +305,7 @@ const union AnimCmd *const gNewGameBirchImageAnimTable[] = {
 };
 
 const struct SpriteTemplate gNewGameBirchObjectTemplate = {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 4102,
     .oam = &gNewGameBirchOamAttributes,
     .anims = gNewGameBirchImageAnimTable,
@@ -383,7 +383,7 @@ const union AnimCmd *const gSpriteAnimTable_855C300[] = {
 };
 
 const struct SpriteTemplate gSpriteTemplate_855C304 = {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 4103,
     .oam = &gOamData_855C218,
     .anims = gSpriteAnimTable_855C2F8,
@@ -393,7 +393,7 @@ const struct SpriteTemplate gSpriteTemplate_855C304 = {
 };
 
 const struct SpriteTemplate gSpriteTemplate_855C31C = {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 4100,
     .oam = &gOamData_855C220,
     .anims = gSpriteAnimTable_855C2F8,
@@ -403,7 +403,7 @@ const struct SpriteTemplate gSpriteTemplate_855C31C = {
 };
 
 const struct SpriteTemplate gSpriteTemplate_855C334 = {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 4112,
     .oam = &gOamData_855C220,
     .anims = gSpriteAnimTable_855C300,
@@ -413,7 +413,7 @@ const struct SpriteTemplate gSpriteTemplate_855C334 = {
 };
 
 const struct SpriteTemplate gSpriteTemplate_855C34C = {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 4112,
     .oam = &gOamData_855C26C,
     .anims = gSpriteAnimTable_855C300,
@@ -618,7 +618,7 @@ u32 FieldEffectScript_ReadWord(u8 **script)
 void FieldEffectScript_LoadTiles(u8 **script)
 {
     struct SpriteSheet *sheet = (struct SpriteSheet *)FieldEffectScript_ReadWord(script);
-    if (GetSpriteTileStartByTag(sheet->tag) == INVALID_U16)
+    if (GetSpriteTileStartByTag(sheet->tag) == 0xFFFF)
         LoadSpriteSheet(sheet);
     (*script) += 4;
 }
@@ -665,7 +665,7 @@ void FieldEffectFreeTilesIfUnused(u16 tileStart)
     u8 i;
     u16 tag = GetSpriteTileTagByTileStart(tileStart);
 
-    if (tag != INVALID_U16)
+    if (tag != 0xFFFF)
     {
         for (i = 0; i < MAX_SPRITES; i++)
             if (gSprites[i].inUse && gSprites[i].usingSheet && tileStart == gSprites[i].sheetTileStart)
@@ -679,7 +679,7 @@ void FieldEffectFreePaletteIfUnused(u8 paletteNum)
     u8 i;
     u16 tag = GetSpritePaletteTagByPaletteNum(paletteNum);
 
-    if (tag != INVALID_U16)
+    if (tag != 0xFFFF)
     {
         for (i = 0; i < MAX_SPRITES; i++)
             if (gSprites[i].inUse && gSprites[i].oam.paletteNum == paletteNum)
@@ -761,7 +761,7 @@ u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority)
 {
     s32 spriteId = CreateMonPicSprite_HandleDeoxys(species, 0, 0x8000, 1, x, y, 0, gMonPaletteTable[species].tag);
     PreservePaletteInWeather(IndexOfSpritePaletteTag(gMonPaletteTable[species].tag) + 0x10);
-    if (spriteId == INVALID_U16)
+    if (spriteId == 0xFFFF)
         return MAX_SPRITES;
     else
         return spriteId;
@@ -772,7 +772,7 @@ u8 CreateMonSprite_FieldMove(u16 species, u32 d, u32 g, s16 x, s16 y, u8 subprio
     const struct CompressedSpritePalette *spritePalette = GetMonSpritePalStructFromOtIdPersonality(species, d, g);
     u16 spriteId = CreateMonPicSprite_HandleDeoxys(species, d, g, 1, x, y, 0, spritePalette->tag);
     PreservePaletteInWeather(IndexOfSpritePaletteTag(spritePalette->tag) + 0x10);
-    if (spriteId == INVALID_U16)
+    if (spriteId == 0xFFFF)
         return MAX_SPRITES;
     else
         return spriteId;
@@ -3591,7 +3591,7 @@ const union AnimCmd *const gSpriteAnimTable_855C5DC[] = {
 };
 
 const struct SpriteTemplate gUnknown_0855C5EC = {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 4378,
     .oam = &gOamData_855C218,
     .anims = gSpriteAnimTable_855C5DC,

src/field_effect_helpers.c

@@ -1007,15 +1007,15 @@ void UpdateSurfBlobFieldEffect(struct Sprite *sprite)
 static void SynchroniseSurfAnim(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 surfBlobDirectionAnims[] = {
-        0, // DIR_NONE
-        0, // DIR_SOUTH
-        1, // DIR_NORTH
-        2, // DIR_WEST
-        3, // DIR_EAST
-        0,
-        0,
-        1,
-        1,
+        [DIR_NONE] = 0,
+        [DIR_SOUTH] = 0,
+        [DIR_NORTH] = 1,
+        [DIR_WEST] = 2,
+        [DIR_EAST] = 3,
+        [DIR_SOUTHWEST] = 0,
+        [DIR_SOUTHEAST] = 0,
+        [DIR_NORTHWEST] = 1,
+        [DIR_NORTHEAST] = 1,
     };
 
     if (sub_8155640(sprite) == 0)

src/field_message_box.c

@@ -53,7 +53,7 @@ void task_add_textbox(void)
 void task_del_textbox(void)
 {
     u8 taskId = FindTaskIdByFunc(sub_8098154);
-    if (taskId != INVALID_U8)
+    if (taskId != 0xFF)
         DestroyTask(taskId);
 }
 

src/field_player_avatar.c

@@ -1389,7 +1389,7 @@ void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender)
     u8 eventObjectId;
     struct EventObject *eventObject;
 
-    playerEventObjTemplate.localId = INVALID_U8;
+    playerEventObjTemplate.localId = 0xFF;
     playerEventObjTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gender);
     playerEventObjTemplate.x = x - 7;
     playerEventObjTemplate.y = y - 7;

src/field_specials.c

@@ -1957,12 +1957,12 @@ void sub_8139D98(void)
 
 bool32 warp0_in_pokecenter(void)
 {
-    static const u16 gUnknown_085B2C2A[] = { 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a, 0x1a35, 0x193c, INVALID_U16 };
+    static const u16 gUnknown_085B2C2A[] = { 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a, 0x1a35, 0x193c, 0xFFFF };
 
     int i;
     u16 map = (gLastUsedWarp.mapGroup << 8) + gLastUsedWarp.mapNum;
 
-    for (i = 0; gUnknown_085B2C2A[i] != INVALID_U16; i++)
+    for (i = 0; gUnknown_085B2C2A[i] != 0xFFFF; i++)
     {
         if (gUnknown_085B2C2A[i] == map)
             return TRUE;
@@ -2946,10 +2946,10 @@ void sub_813AA44(void)
 
 static void sub_813AA60(u16 a0, u16 a1)
 {
-    static const u16 gUnknown_085B312C[] = { 0x004b, 0x0067, 0x0057, 0x004f, 0x0054, 0x0055, 0x0056, 0x0050, 0x0051, 0x0052, INVALID_U16 };
-    static const u16 gUnknown_085B3142[] = { 0x0071, 0x006f, 0x0072, 0x0073, 0x0074, INVALID_U16 };
-    static const u16 gUnknown_085B314E[] = { 0x0040, 0x0043, 0x0041, 0x0046, 0x0042, 0x003f, INVALID_U16 };
-    static const u16 gUnknown_085B315C[] = { 0x00c8, 0x00b4, 0x00b7, 0x00b9, 0x00b3, 0x00ba, 0x00bb, 0x00c4, 0x00c6, INVALID_U16 };
+    static const u16 gUnknown_085B312C[] = { 0x004b, 0x0067, 0x0057, 0x004f, 0x0054, 0x0055, 0x0056, 0x0050, 0x0051, 0x0052, 0xFFFF };
+    static const u16 gUnknown_085B3142[] = { 0x0071, 0x006f, 0x0072, 0x0073, 0x0074, 0xFFFF };
+    static const u16 gUnknown_085B314E[] = { 0x0040, 0x0043, 0x0041, 0x0046, 0x0042, 0x003f, 0xFFFF };
+    static const u16 gUnknown_085B315C[] = { 0x00c8, 0x00b4, 0x00b7, 0x00b9, 0x00b3, 0x00ba, 0x00bb, 0x00c4, 0x00c6, 0xFFFF };
 
     static const u8 *const gUnknown_085B3170[] = {
         BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA,
@@ -3004,7 +3004,7 @@ static void sub_813AA60(u16 a0, u16 a1)
         {
             case 3:
                 AddTextPrinterParameterized2(0, 1, gUnknown_085B3170[a1], 0, NULL, 2, 1, 3);
-                if (gUnknown_085B312C[a1] == INVALID_U16)
+                if (gUnknown_085B312C[a1] == 0xFFFF)
                 {
                     sub_813ABD4(gUnknown_085B312C[a1]);
                 }
@@ -3017,7 +3017,7 @@ static void sub_813AA60(u16 a0, u16 a1)
                 break;
             case 4:
                 AddTextPrinterParameterized2(0, 1, gUnknown_085B319C[a1], 0, NULL, 2, 1, 3);
-                if (gUnknown_085B3142[a1] == INVALID_U16)
+                if (gUnknown_085B3142[a1] == 0xFFFF)
                 {
                     sub_813ABD4(gUnknown_085B3142[a1]);
                 }
@@ -3841,13 +3841,13 @@ bool32 sub_813B9C0(void)
         MAP_TRADE_CENTER,
         MAP_RECORD_CORNER,
         MAP_DOUBLE_BATTLE_COLOSSEUM,
-        INVALID_U16
+        0xFFFF
     };
 
     int i;
     u16 map = (gSaveBlock1Ptr->location.mapGroup << 8) + gSaveBlock1Ptr->location.mapNum;
 
-    for (i = 0; gUnknown_085B3444[i] != INVALID_U16; i++)
+    for (i = 0; gUnknown_085B3444[i] != 0xFFFF; i++)
     {
         if (gUnknown_085B3444[i] == map)
         {

src/fieldmap.c

@@ -496,7 +496,7 @@ u16 GetBehaviorByMetatileId(u16 metatile)
     }
     else
     {
-        return INVALID_U8;
+        return 0xFF;
     }
 }
 
@@ -922,7 +922,7 @@ void sub_8088B94(int x, int y, int a2)
 
 bool8 sub_8088BF0(u16* a0, u16 a1, u8 a2)
 {
-    if (a2 == INVALID_U8)
+    if (a2 == 0xFF)
         return FALSE;
 
     if (a2 == 0)

src/fldeff_cut.c

@@ -164,7 +164,7 @@ const struct SpritePalette gFieldEffectObjectPaletteInfo6 = {gFieldEffectObjectP
 
 static const struct SpriteTemplate sSpriteTemplate_CutGrass =
 {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 0x1000,
     .oam = &sOamData_CutGrass,
     .anims = sSpriteAnimTable_CutGrass,

src/fldeff_groundshake.c

@@ -236,7 +236,7 @@ static void sub_81BE968(void)
     u8 taskId;
 
     taskId = FindTaskIdByFunc(sub_81BE9C0);
-    if(taskId != INVALID_U8)
+    if(taskId != 0xFF)
         gTasks[taskId].data[0]++;
 }
 

src/fossil_specials.c

@@ -302,7 +302,7 @@ static void sub_81BED50(u8 taskId)
     case 4:
         UnsetBgTilemapBuffer(0);
         anotherTaskId = FindTaskIdByFunc(sub_81BEBB4);
-        if (anotherTaskId != INVALID_U8)
+        if (anotherTaskId != 0xFF)
             DestroyTask(anotherTaskId);
         sUnknown_0203CF14[1] = sUnknown_0203CF14[0] = 0;
         sub_81BEB90();

src/frontier_util.c

@@ -681,7 +681,7 @@ static const u8 sFacilityToBrainEventObjGfx[][2] =
 const u16 gFrontierBannedSpecies[] =
 {
     SPECIES_MEW, SPECIES_MEWTWO, SPECIES_HO_OH, SPECIES_LUGIA, SPECIES_CELEBI,
-    SPECIES_KYOGRE, SPECIES_GROUDON, SPECIES_RAYQUAZA, SPECIES_JIRACHI, SPECIES_DEOXYS, INVALID_U16
+    SPECIES_KYOGRE, SPECIES_GROUDON, SPECIES_RAYQUAZA, SPECIES_JIRACHI, SPECIES_DEOXYS, 0xFFFF
 };
 
 static const u8 *const gUnknown_08611CB0[][2] =
@@ -1829,7 +1829,7 @@ void sub_81A3ACC(void)
     s32 i;
 
     for (i = 0; i < 20; i++)
-        gSaveBlock2Ptr->frontier.field_CB4[i] |= INVALID_U16;
+        gSaveBlock2Ptr->frontier.field_CB4[i] |= 0xFFFF;
 }
 
 static void sub_81A3B00(void)
@@ -1974,10 +1974,10 @@ static void AppendIfValid(u16 species, u16 heldItem, u16 hp, u8 lvlMode, u8 monL
     if (species == SPECIES_EGG || species == SPECIES_NONE)
         return;
 
-    for (i = 0; gFrontierBannedSpecies[i] != INVALID_U16 && gFrontierBannedSpecies[i] != species; i++)
+    for (i = 0; gFrontierBannedSpecies[i] != 0xFFFF && gFrontierBannedSpecies[i] != species; i++)
         ;
 
-    if (gFrontierBannedSpecies[i] != INVALID_U16)
+    if (gFrontierBannedSpecies[i] != 0xFFFF)
         return;
     if (lvlMode == FRONTIER_LVL_50 && monLevel > 50)
         return;
@@ -2060,7 +2060,7 @@ static void sub_81A3FD4(void)
         s32 i;
         s32 caughtBannedMons = 0;
         s32 species = gFrontierBannedSpecies[0];
-        for (i = 0; species != INVALID_U16; i++, species = gFrontierBannedSpecies[i])
+        for (i = 0; species != 0xFFFF; i++, species = gFrontierBannedSpecies[i])
         {
             if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_CAUGHT))
                 caughtBannedMons++;
@@ -2068,7 +2068,7 @@ static void sub_81A3FD4(void)
         gStringVar1[0] = EOS;
         gSpecialVar_0x8004 = 1;
         count = 0;
-        for (i = 0; gFrontierBannedSpecies[i] != INVALID_U16; i++)
+        for (i = 0; gFrontierBannedSpecies[i] != 0xFFFF; i++)
             count = sub_81A3DD0(gFrontierBannedSpecies[i], count, caughtBannedMons);
 
         if (count == 0)

src/ground.c

@@ -588,7 +588,7 @@ void sub_81152DC(u8 taskId)
         break;
     default:
         task->data[9] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
-        if (task->data[9] == INVALID_U8)
+        if (task->data[9] == 0xFF)
         {
             DestroyAnimVisualTask(taskId);
         }

src/hall_of_fame.c

@@ -467,11 +467,11 @@ static void Task_Hof_InitMonData(u8 taskId)
 
     sUnknown_0203BCD4 = 0;
     gTasks[taskId].tDisplayedMonId = 0;
-    gTasks[taskId].tPlayerSpriteID = INVALID_U8;
+    gTasks[taskId].tPlayerSpriteID = 0xFF;
 
     for (i = 0; i < PARTY_SIZE; i++)
     {
-        gTasks[taskId].tMonSpriteId(i) = INVALID_U8;
+        gTasks[taskId].tMonSpriteId(i) = 0xFF;
     }
 
     if (gTasks[taskId].tDontSaveData)
@@ -522,7 +522,7 @@ static void Task_Hof_InitTeamSaveData(u8 taskId)
 static void Task_Hof_TrySaveData(u8 taskId)
 {
     gGameContinueCallback = CB2_DoHallOfFameScreenDontSaveData;
-    if (TrySavingData(SAVE_HALL_OF_FAME) == INVALID_U8 && gDamagedSaveSectors != 0)
+    if (TrySavingData(SAVE_HALL_OF_FAME) == 0xFF && gDamagedSaveSectors != 0)
     {
         UnsetBgTilemapBuffer(1);
         UnsetBgTilemapBuffer(3);
@@ -645,7 +645,7 @@ static void Task_Hof_PaletteFadeAndPrintWelcomeText(u8 taskId)
     BeginNormalPaletteFade(0xFFFF0000, 0, 0, 0, RGB_BLACK);
     for (i = 0; i < PARTY_SIZE; i++)
     {
-        if (gTasks[taskId].tMonSpriteId(i) != INVALID_U8)
+        if (gTasks[taskId].tMonSpriteId(i) != 0xFF)
             gSprites[gTasks[taskId].tMonSpriteId(i)].oam.priority = 0;
     }
 
@@ -668,7 +668,7 @@ static void sub_8173DC0(u8 taskId)
         u16 i;
         for (i = 0; i < PARTY_SIZE; i++)
         {
-            if (gTasks[taskId].tMonSpriteId(i) != INVALID_U8)
+            if (gTasks[taskId].tMonSpriteId(i) != 0xFF)
                 gSprites[gTasks[taskId].tMonSpriteId(i)].oam.priority = 1;
         }
         BeginNormalPaletteFade(sUnknown_0203BCD4, 0, 12, 12, RGB(16, 29, 24));
@@ -752,7 +752,7 @@ static void Task_Hof_HandleExit(u8 taskId)
         for (i = 0; i < PARTY_SIZE; i++)
         {
             u8 spriteId = gTasks[taskId].tMonSpriteId(i);
-            if (spriteId != INVALID_U8)
+            if (spriteId != 0xFF)
             {
                 FreeOamMatrix(gSprites[spriteId].oam.matrixNum);
                 FreeAndDestroyMonPicSprite(spriteId);
@@ -847,7 +847,7 @@ void CB2_DoHallOfFamePC(void)
 
             for (i = 0; i < PARTY_SIZE; i++)
             {
-                gTasks[taskId].tMonSpriteId(i) = INVALID_U8;
+                gTasks[taskId].tMonSpriteId(i) = 0xFF;
             }
 
             sHofMonPtr = AllocZeroed(0x2000);
@@ -937,7 +937,7 @@ static void Task_HofPC_DrawSpritesPrintText(u8 taskId)
         }
         else
         {
-            gTasks[taskId].tMonSpriteId(i) = INVALID_U8;
+            gTasks[taskId].tMonSpriteId(i) = 0xFF;
         }
     }
 
@@ -967,7 +967,7 @@ static void Task_HofPC_PrintMonInfo(u8 taskId)
     for (i = 0; i < PARTY_SIZE; i++)
     {
         u16 spriteId = gTasks[taskId].tMonSpriteId(i);
-        if (spriteId != INVALID_U8)
+        if (spriteId != 0xFF)
             gSprites[spriteId].oam.priority = 1;
     }
 
@@ -999,10 +999,10 @@ static void Task_HofPC_HandleInput(u8 taskId)
             for (i = 0; i < 6; i++)
             {
                 u8 spriteId = gTasks[taskId].tMonSpriteId(i);
-                if (spriteId != INVALID_U8)
+                if (spriteId != 0xFF)
                 {
                     FreeAndDestroyMonPicSprite(spriteId);
-                    gTasks[taskId].tMonSpriteId(i) = INVALID_U8;
+                    gTasks[taskId].tMonSpriteId(i) = 0xFF;
                 }
             }
             if (gTasks[taskId].tCurrPageNo != 0)
@@ -1060,10 +1060,10 @@ static void Task_HofPC_HandleExit(u8 taskId)
         for (i = 0; i < PARTY_SIZE; i++)
         {
             u16 spriteId = gTasks[taskId].tMonSpriteId(i);
-            if (spriteId != INVALID_U8)
+            if (spriteId != 0xFF)
             {
                 FreeAndDestroyMonPicSprite(spriteId);
-                gTasks[taskId].tMonSpriteId(i) = INVALID_U8;
+                gTasks[taskId].tMonSpriteId(i) = 0xFF;
             }
         }
 
@@ -1130,7 +1130,7 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u
     {
         stringPtr = StringCopy(text, gText_Number);
         dexNumber = SpeciesToPokedexNum(currMon->species);
-        if (dexNumber != INVALID_U16)
+        if (dexNumber != 0xFFFF)
         {
             stringPtr[0] = (dexNumber / 100) + CHAR_0;
             stringPtr++;
@@ -1417,7 +1417,7 @@ void sub_8175280(void)
 
     gSpecialVar_0x8004 = 180;
     taskId = CreateTask(sub_8175364, 0);
-    if (taskId != INVALID_U8)
+    if (taskId != 0xFF)
     {
         gTasks[taskId].data[1] = gSpecialVar_0x8004;
         gSpecialVar_0x8005 = taskId;
@@ -1428,7 +1428,7 @@ static void sub_81752C0(void)
 {
     u8 taskId;
 
-    if ((taskId = FindTaskIdByFunc(sub_8175364)) != INVALID_U8)
+    if ((taskId = FindTaskIdByFunc(sub_8175364)) != 0xFF)
         DestroyTask(taskId);
 
     sub_8152254();
@@ -1473,7 +1473,7 @@ static void sub_8175364(u8 taskId)
         {
             DestroyTask(taskId);
             gSpecialVar_0x8004 = var;
-            gSpecialVar_0x8005 = INVALID_U16;
+            gSpecialVar_0x8005 = 0xFFFF;
         }
         LoadCompressedObjectPic(sHallOfFame_ConfettiSpriteSheet);
         LoadCompressedObjectPalette(sHallOfFame_ConfettiSpritePalette);
@@ -1483,7 +1483,7 @@ static void sub_8175364(u8 taskId)
         if (data[1] != 0 && data[1] % 3 == 0)
         {
             var = sub_81524C4(&sOamData_85E53FC, 0x3E9, 0x3E9, Random() % 240, -(Random() % 8), Random() % 0x11, var);
-            if (var != INVALID_U8)
+            if (var != 0xFF)
             {
                 sub_8152438(var, sub_81752F4);
                 if ((Random() & 3) == 0)
@@ -1496,12 +1496,12 @@ static void sub_8175364(u8 taskId)
         if (data[1] != 0)
             data[1]--;
         else if (data[15] == 0)
-            data[0] = INVALID_U8;
+            data[0] = 0xFF;
         break;
-    case INVALID_U8:
+    case 0xFF:
         sub_81752C0();
         gSpecialVar_0x8004 = var;
-        gSpecialVar_0x8005 = INVALID_U16;
+        gSpecialVar_0x8005 = 0xFFFF;
         break;
     }
 }

src/intro_credits_graphics.c

@@ -58,7 +58,7 @@ static void sub_817B7C4(struct Sprite *sprite);
 static void nullsub_66(struct Sprite *sprite);
 
 static const struct SpriteTemplate gUnknown_085F504C = {
-    2000, INVALID_U16, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817B62C
+    2000, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817B62C
 };
 
 static const struct CompressedSpriteSheet gUnknown_085F5064[] = {

src/item_icon.c

@@ -161,7 +161,7 @@ u8 AddCustomItemIconSprite(struct SpriteTemplate *customSpriteTemplate, u16 tile
 
 const void *GetItemIconPicOrPalette(u16 itemId, u8 which)
 {
-    if (itemId == INVALID_U16)
+    if (itemId == 0xFFFF)
         itemId = ITEM_FIELD_ARROW;
     else if (itemId >= ITEMS_COUNT)
         itemId = 0;

src/item_menu.c

@@ -532,11 +532,11 @@ void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)
         if (temp <= 1)
             gUnknown_0203CE54->unk81B = 1;
         gUnknown_0203CE54->unk0 = 0;
-        gUnknown_0203CE54->unk81A = INVALID_U8;
+        gUnknown_0203CE54->unk81A = 0xFF;
         gUnknown_0203CE54->unk81E = -1;
         gUnknown_0203CE54->unk81F = -1;
-        memset(gUnknown_0203CE54->unk804, INVALID_U8, sizeof(gUnknown_0203CE54->unk804));
-        memset(gUnknown_0203CE54->unk810, INVALID_U8, 10);
+        memset(gUnknown_0203CE54->unk804, 0xFF, sizeof(gUnknown_0203CE54->unk804));
+        memset(gUnknown_0203CE54->unk810, 0xFF, 10);
         SetMainCallback2(CB2_Bag);
     }
 }
@@ -819,7 +819,7 @@ void bag_menu_change_item_callback(s32 a, bool8 b, struct ListMenu *unused)
         PlaySE(SE_SELECT);
         ShakeBagVisual();
     }
-    if (gUnknown_0203CE54->unk81A == INVALID_U8)
+    if (gUnknown_0203CE54->unk81A == 0xFF)
     {
         RemoveBagItemIconSprite(1 ^ gUnknown_0203CE54->unk81B_1);
         if (a != -2)
@@ -840,7 +840,7 @@ void sub_81AB520(u8 rboxId, int item_index_in_pocket, u8 a)
     int offset;
     if (item_index_in_pocket != -2)
     {
-        if (gUnknown_0203CE54->unk81A != INVALID_U8)
+        if (gUnknown_0203CE54->unk81A != 0xFF)
         {
             if (gUnknown_0203CE54->unk81A == (u8)item_index_in_pocket)
                 bag_menu_print_cursor(a, 2);
@@ -897,7 +897,7 @@ void bag_menu_print_cursor_(u8 a, u8 b)
 
 void bag_menu_print_cursor(u8 a, u8 b)
 {
-    if (b == INVALID_U8)
+    if (b == 0xFF)
         FillWindowPixelRect(0, 0, 0, a, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1));
     else
         bag_menu_print(0, 1, gText_SelectorArrow2, 0, a, 0, 0, 0, b);
@@ -906,32 +906,32 @@ void bag_menu_print_cursor(u8 a, u8 b)
 
 void bag_menu_add_pocket_scroll_arrow_indicators_maybe(void)
 {
-    if (gUnknown_0203CE54->unk81E == INVALID_U8)
+    if (gUnknown_0203CE54->unk81E == 0xFF)
         gUnknown_0203CE54->unk81E = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xAC, 12, 0x94, gUnknown_0203CE54->unk829[gUnknown_0203CE58.pocket] - gUnknown_0203CE54->unk82E[gUnknown_0203CE58.pocket], 0x6E, 0x6E, &gUnknown_0203CE58.scrollPosition[gUnknown_0203CE58.pocket]);
 }
 
 void sub_81AB824(void)
 {
-    if (gUnknown_0203CE54->unk81E != INVALID_U8)
+    if (gUnknown_0203CE54->unk81E != 0xFF)
     {
         RemoveScrollIndicatorArrowPair(gUnknown_0203CE54->unk81E);
-        gUnknown_0203CE54->unk81E = INVALID_U8;
+        gUnknown_0203CE54->unk81E = 0xFF;
     }
     sub_81AB89C();
 }
 
 void bag_menu_add_list_scroll_arrow_indicators_maybe(void)
 {
-    if (gUnknown_0203CE54->unk81B != 1 && gUnknown_0203CE54->unk81F == INVALID_U8)
+    if (gUnknown_0203CE54->unk81B != 1 && gUnknown_0203CE54->unk81F == 0xFF)
         gUnknown_0203CE54->unk81F = AddScrollIndicatorArrowPair(&gUnknown_08614094, &gUnknown_0203CE58.unk6);
 }
 
 void sub_81AB89C(void)
 {
-    if (gUnknown_0203CE54->unk81F != INVALID_U8)
+    if (gUnknown_0203CE54->unk81F != 0xFF)
     {
         RemoveScrollIndicatorArrowPair(gUnknown_0203CE54->unk81F);
-        gUnknown_0203CE54->unk81F = INVALID_U8;
+        gUnknown_0203CE54->unk81F = 0xFF;
     }
 }
 
@@ -2303,7 +2303,7 @@ u8 sub_81AE124(u8 a)
 u8 bag_menu_add_window(u8 a)
 {
     u8 *ptr = &gUnknown_0203CE54->unk810[a];
-    if (*ptr == INVALID_U8)
+    if (*ptr == 0xFF)
     {
         *ptr = AddWindow(&gUnknown_086141AC[a]);
         SetWindowBorderStyle(*ptr, 0, 1, 14);
@@ -2315,20 +2315,20 @@ u8 bag_menu_add_window(u8 a)
 void bag_menu_remove_window(u8 a)
 {
     u8 *ptr = &gUnknown_0203CE54->unk810[a];
-    if (*ptr != INVALID_U8)
+    if (*ptr != 0xFF)
     {
         sub_8198070(*ptr, 0);
         ClearWindowTilemap(*ptr);
         RemoveWindow(*ptr);
         schedule_bg_copy_tilemap_to_vram(1);
-        *ptr = INVALID_U8;
+        *ptr = 0xFF;
     }
 }
 
 u8 AddItemMessageWindow(u8 a)
 {
     u8 *ptr = &gUnknown_0203CE54->unk810[a];
-    if (*ptr == INVALID_U8)
+    if (*ptr == 0xFF)
         *ptr = AddWindow(&gUnknown_086141AC[a]);
     return *ptr;
 }
@@ -2336,13 +2336,13 @@ u8 AddItemMessageWindow(u8 a)
 void bag_menu_RemoveBagItem_message_window(u8 a)
 {
     u8 *ptr = &gUnknown_0203CE54->unk810[a];
-    if (*ptr != INVALID_U8)
+    if (*ptr != 0xFF)
     {
         sub_8197DF8(*ptr, 0);
         ClearWindowTilemap(*ptr);
         RemoveWindow(*ptr);
         schedule_bg_copy_tilemap_to_vram(1);
-        *ptr = INVALID_U8;
+        *ptr = 0xFF;
     }
 }
 

src/item_menu_icons.c

@@ -301,7 +301,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_857FC74[] =
 
 static const struct SpriteTemplate gUnknown_0857FC7C =
 {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 0x7544,
     .oam = &sOamData_857FBD0,
     .anims = sSpriteAnimTable_857FBE0,
@@ -410,13 +410,13 @@ static const struct SpriteTemplate gUnknown_0857FE10 =
 void RemoveBagSprite(u8 id)
 {
     u8 *spriteId = &gUnknown_0203CE54->unk804[id];
-    if (*spriteId != INVALID_U8)
+    if (*spriteId != 0xFF)
     {
         FreeSpriteTilesByTag(id + 100);
         FreeSpritePaletteByTag(id + 100);
         FreeSpriteOamMatrix(&gSprites[*spriteId]);
         DestroySprite(&gSprites[*spriteId]);
-        *spriteId = INVALID_U8;
+        *spriteId = 0xFF;
     }
 }
 
@@ -516,7 +516,7 @@ static void SpriteCB_SwitchPocketRotatingBallContinue(struct Sprite *sprite)
 void AddBagItemIconSprite(u16 itemId, u8 id)
 {
     u8 *spriteId = &gUnknown_0203CE54->unk804[id + 2];
-    if (*spriteId == INVALID_U8)
+    if (*spriteId == 0xFF)
     {
         u8 iconSpriteId;
 

src/learn_move.c

@@ -381,7 +381,7 @@ static void LearnMoveMain(void)
 
             if (selection == 0)
             {
-                if (GiveMoveToMon(&gPlayerParty[sLearnMoveStruct->partyMon], GetCurrentItemId()) != INVALID_U16)
+                if (GiveMoveToMon(&gPlayerParty[sLearnMoveStruct->partyMon], GetCurrentItemId()) != 0xFFFF)
                 {
                     sub_816084C(gText_PkmnLearnedMove4);
                     gSpecialVar_0x8004 = 1;
@@ -727,12 +727,12 @@ static void CreateHearts(void)
 
 static void AddScrollArrows(void)
 {
-    if (sLearnMoveStruct->scrollArrowTaskId2 == INVALID_U8)
+    if (sLearnMoveStruct->scrollArrowTaskId2 == 0xFF)
     {
         sLearnMoveStruct->scrollArrowTaskId2 = AddScrollIndicatorArrowPair(&gUnknown_085CEBC0, &sLearnMoveStruct->scrollOffset);
     }
 
-    if (sLearnMoveStruct->scrollArrowTaskId1 == INVALID_U8)
+    if (sLearnMoveStruct->scrollArrowTaskId1 == 0xFF)
     {
         gTempScrollArrowTemplate = gUnknown_085CEBD0;
         gTempScrollArrowTemplate.fullyDownThreshold = sLearnMoveStruct->numMenuChoices - sLearnMoveStruct->numToShowAtOnce;
@@ -742,16 +742,16 @@ static void AddScrollArrows(void)
 
 static void RemoveScrollArrows(void)
 {
-    if (sLearnMoveStruct->scrollArrowTaskId2 != INVALID_U8)
+    if (sLearnMoveStruct->scrollArrowTaskId2 != 0xFF)
     {
         RemoveScrollIndicatorArrowPair(sLearnMoveStruct->scrollArrowTaskId2);
-        sLearnMoveStruct->scrollArrowTaskId2 = INVALID_U8;
+        sLearnMoveStruct->scrollArrowTaskId2 = 0xFF;
     }
 
-    if (sLearnMoveStruct->scrollArrowTaskId1 != INVALID_U8)
+    if (sLearnMoveStruct->scrollArrowTaskId1 != 0xFF)
     {
         RemoveScrollIndicatorArrowPair(sLearnMoveStruct->scrollArrowTaskId1);
-        sLearnMoveStruct->scrollArrowTaskId1 = INVALID_U8;
+        sLearnMoveStruct->scrollArrowTaskId1 = 0xFF;
     }
 }
 
@@ -792,7 +792,7 @@ void ShowHideHearts(s32 item)
     {
         numHearts = (u8)(gContestEffects[gContestMoves[item].effect].appeal / 10);
         
-        if (numHearts == INVALID_U8)
+        if (numHearts == 0xFF)
         {
             numHearts = 0;
         }
@@ -812,7 +812,7 @@ void ShowHideHearts(s32 item)
 
         numHearts = (u8)(gContestEffects[gContestMoves[item].effect].jam / 10);
         
-        if (numHearts == INVALID_U8)
+        if (numHearts == 0xFF)
         {
             numHearts = 0;
         }

src/librfu_rfu.c

@@ -64,7 +64,7 @@
     v12 = (u16*)((u32)&sub_82E53F4 & ~1);
     v13 = (u16*)gUnknown_03007898->unk_8;
         
-    for (i = 47; i != INVALID_U16; i--)
+    for (i = 47; i != 0xFFFF; i--)
     {
         *v13 = *v12;
         ++v12;

src/librfu_stwi.c

@@ -116,7 +116,7 @@ u16 STWI_read_status(u8 index)
     case 3:
         return gRfuState->activeCommand;
     default:
-        return INVALID_U16;
+        return 0xFFFF;
     }
 }
 

src/link.c

@@ -2250,7 +2250,7 @@ static bool8 DoHandshake(void)
     u16 minRecv;
 
     playerCount = 0;
-    minRecv = INVALID_U16;
+    minRecv = 0xFFFF;
     if (gLink.handshakeAsMaster == TRUE)
     {
         REG_SIOMLT_SEND = MASTER_HANDSHAKE;
@@ -2274,7 +2274,7 @@ static bool8 DoHandshake(void)
         }
         else
         {
-            if (gLink.tempRecvBuffer[i] != INVALID_U16)
+            if (gLink.tempRecvBuffer[i] != 0xFFFF)
             {
                 playerCount = 0;
             }

src/link_rfu.c

@@ -276,7 +276,7 @@ const struct {
     { gBlockSendBuffer,  40 }
 };
 const u16 gUnknown_082ED6E0[] = {
-    0x0002, 0x7f7d, 0x0000, INVALID_U16
+    0x0002, 0x7f7d, 0x0000, 0xFFFF
 };
 
 const char sUnref_082ED6E8[][15] = {
@@ -436,7 +436,7 @@ u8 sub_800C054(u8 r5, u16 r7, u16 r8, const u16 *r6)
     }
     for (i = 0, buffer = r6; i < 16; i++)
     {
-        if (*buffer++ == INVALID_U16)
+        if (*buffer++ == 0xFFFF)
         {
             break;
         }
@@ -754,7 +754,7 @@ void sub_800C54C(u32 a0)
                 switch (gUnknown_03004140.unk_04)
                 {
                     case 23:
-                        r2 = sub_800BEC0() == 0x8001 ? 0x44 : INVALID_U8;
+                        r2 = sub_800BEC0() == 0x8001 ? 0x44 : 0xFF;
                         gUnknown_03004140.unk_04 = gUnknown_03004140.unk_05 = 0;
                         sub_800D30C(r2, 0);
                         break;
@@ -1168,7 +1168,7 @@ static void sub_800C7B4(u16 r8, u16 r6)
                 gUnknown_03004140.unk_00 &= ~gUnknown_03004140.unk_14;
                 if (gUnknown_03004140.unk_07)
                 {
-                    if (gUnknown_03007890->unk_00 == INVALID_U8)
+                    if (gUnknown_03007890->unk_00 == 0xFF)
                     {
                         if (gUnknown_03004140.unk_07 == 8)
                         {
@@ -1183,7 +1183,7 @@ static void sub_800C7B4(u16 r8, u16 r6)
                         }
                     }
                 }
-                if (gUnknown_03007890->unk_00 == INVALID_U8)
+                if (gUnknown_03007890->unk_00 == 0xFF)
                 {
                     if (gUnknown_03004140.unk_04 == 0)
                     {
@@ -1198,7 +1198,7 @@ static void sub_800C7B4(u16 r8, u16 r6)
             break;
         case 38:
             sub_800D20C();
-            if (gUnknown_03007890->unk_00 != INVALID_U8)
+            if (gUnknown_03007890->unk_00 != 0xFF)
             {
                 sub_800D30C(0x50, 0x00);
             }
@@ -1241,7 +1241,7 @@ static void sub_800C7B4(u16 r8, u16 r6)
             sub_800D610();
         }
     }
-    if (r8 == INVALID_U8)
+    if (r8 == 0xFF)
     {
         sub_800D30C(0xf2, 0x00);
         sub_800D610();
@@ -1322,7 +1322,7 @@ static void sub_800CF34(void)
                     if (gUnknown_03007880[i]->unk_61 == 1)
                     {
                         r5 = 0x02;
-                        for (ptr = gUnknown_03004140.unk_20; *ptr != INVALID_U16; ptr++)
+                        for (ptr = gUnknown_03004140.unk_20; *ptr != 0xFFFF; ptr++)
                         {
                             if (gUnknown_03007890->unk_14[i].unk_04 == *ptr)
                             {
@@ -1469,7 +1469,7 @@ static u8 sub_800D294(void)
 
     for (i = 0; i < gUnknown_03007890->unk_08; i++)
     {
-        for (ptr = gUnknown_03004140.unk_20; *ptr != INVALID_U16; ptr++)
+        for (ptr = gUnknown_03004140.unk_20; *ptr != 0xFFFF; ptr++)
         {
             if (gUnknown_03007890->unk_14[i].unk_04 == *ptr)
             {
@@ -2242,12 +2242,12 @@ void sub_800E084(void)
 
 void sub_800E0E8(void)
 {
-    if (GetSpriteTileStartByTag(sWirelessStatusIndicatorSpriteSheet.tag) == INVALID_U16)
+    if (GetSpriteTileStartByTag(sWirelessStatusIndicatorSpriteSheet.tag) == 0xFFFF)
     {
         LoadCompressedObjectPic(&sWirelessStatusIndicatorSpriteSheet);
     }
     LoadSpritePalette(&sWirelessStatusIndicatorSpritePalette);
-    gWirelessStatusIndicatorSpriteId = INVALID_U8;
+    gWirelessStatusIndicatorSpriteId = 0xFF;
 }
 
 u8 sub_800E124(void)
@@ -2277,7 +2277,7 @@ void sub_800E15C(struct Sprite *sprite, s32 signalStrengthAnimNum)
 
 void sub_800E174(void)
 {
-    if (gWirelessStatusIndicatorSpriteId != INVALID_U8 && gSprites[gWirelessStatusIndicatorSpriteId].data[7] == 0x1234)
+    if (gWirelessStatusIndicatorSpriteId != 0xFF && gSprites[gWirelessStatusIndicatorSpriteId].data[7] == 0x1234)
     {
         struct Sprite *sprite = &gSprites[gWirelessStatusIndicatorSpriteId];
         u8 signalStrength = 255;
@@ -2461,7 +2461,7 @@ void sub_800E604(void)
     u8 unk_ee_bak = gUnknown_03005000.unk_ee;
     CpuFill16(0, &gUnknown_03005000, sizeof gUnknown_03005000);
     gUnknown_03005000.unk_ee = unk_ee_bak;
-    gUnknown_03005000.unk_0c = INVALID_U8;
+    gUnknown_03005000.unk_0c = 0xFF;
     if (gUnknown_03005000.unk_ee != 4)
     {
         gUnknown_03005000.unk_ee = 0;
@@ -3077,7 +3077,7 @@ bool32 sub_800F1E0(void)
                 {
                     if (gUnknown_03005000.unk_14[i][1])
                     {
-                        if (gUnknown_03005000.unk_cee[i] != INVALID_U8 && (gUnknown_03005000.unk_14[i][0] >> 5) != ((gUnknown_03005000.unk_cee[i] + 1) & 7))
+                        if (gUnknown_03005000.unk_cee[i] != 0xFF && (gUnknown_03005000.unk_14[i][0] >> 5) != ((gUnknown_03005000.unk_cee[i] + 1) & 7))
                         {
                             if (++gUnknown_03005000.unk_cea[i] > 4)
                                 sub_8011170(0x8100);
@@ -3778,7 +3778,7 @@ bool32 sub_8010454(u32 a0)
     s32 i;
     for (i = 0; gUnknown_082ED6E0[i] != a0; i++)
     {
-        if (gUnknown_082ED6E0[i] == INVALID_U16)
+        if (gUnknown_082ED6E0[i] == 0xFFFF)
             return FALSE;
     }
     return TRUE;
@@ -3881,7 +3881,7 @@ bool32 sub_80105EC(void)
 bool32 sub_801064C(u16 a0, const u8 *a1)
 {
     u8 r1 = sub_8011CE4(a1, a0);
-    if (r1 == INVALID_U8)
+    if (r1 == 0xFF)
         return TRUE;
     if (gUnknown_03005000.unk_cd1[r1] == 9)
         return TRUE;
@@ -3906,7 +3906,7 @@ void sub_80106D4(void)
 u32 sub_8010714(u16 a0, const u8 *a1)
 {
     u8 r0 = sub_8011CE4(a1, a0);
-    if (r0 == INVALID_U8)
+    if (r0 == 0xFF)
         return 2;
     if (gUnknown_03007880[r0]->unk_0 == 0)
         return 1;

src/list_menu.c

@@ -392,7 +392,7 @@ u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenu
     s32 i;
 
     u8 taskId = ListMenuInitInternal(listMenuTemplate, scrollOffset, selectedRow);
-    for (i = 0; rect[i].palNum != INVALID_U8; i++)
+    for (i = 0; rect[i].palNum != 0xFF; i++)
     {
         PutWindowRectTilemapOverridePalette(listMenuTemplate->windowId,
                                             rect[i].x,
@@ -465,7 +465,7 @@ s32 ListMenuHandleInputGetItemId(u8 listTaskId)
     }
 }
 
-#define TASK_NONE INVALID_U8
+#define TASK_NONE 0xFF
 
 void DestroyListMenuTask(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow)
 {
@@ -1143,7 +1143,7 @@ static void Task_ScrollIndicatorArrowPair(u8 taskId)
     struct ScrollIndicatorPair *data = (void*) gTasks[taskId].data;
     u16 currItem = (*data->scrollOffset);
 
-    if (currItem == data->fullyUpThreshold && currItem != INVALID_U16)
+    if (currItem == data->fullyUpThreshold && currItem != 0xFFFF)
         gSprites[data->topSpriteId].invisible = TRUE;
     else
         gSprites[data->topSpriteId].invisible = FALSE;

src/mail_data.c

@@ -20,7 +20,7 @@ void ClearMailStruct(struct MailStruct *mail)
     s32 i;
 
     for (i = 0; i < MAIL_WORDS_COUNT; i++)
-        mail->words[i] = INVALID_U16;
+        mail->words[i] = 0xFFFF;
 
     for (i = 0; i < PLAYER_NAME_LENGTH + 1; i++)
         mail->playerName[i] = EOS;
@@ -35,7 +35,7 @@ void ClearMailStruct(struct MailStruct *mail)
 bool8 MonHasMail(struct Pokemon *mon)
 {
     u16 heldItem = GetMonData(mon, MON_DATA_HELD_ITEM);
-    if (ItemIsMail(heldItem) && GetMonData(mon, MON_DATA_MAIL) != INVALID_U8)
+    if (ItemIsMail(heldItem) && GetMonData(mon, MON_DATA_MAIL) != 0xFF)
         return TRUE;
     else
         return FALSE;
@@ -56,7 +56,7 @@ u8 GiveMailToMon(struct Pokemon *mon, u16 itemId)
         if (gSaveBlock1Ptr->mail[id].itemId == 0)
         {
             for (i = 0; i < MAIL_WORDS_COUNT; i++)
-                gSaveBlock1Ptr->mail[id].words[i] = INVALID_U16;
+                gSaveBlock1Ptr->mail[id].words[i] = 0xFFFF;
 
             for (i = 0; i < PLAYER_NAME_LENGTH + 1 - 1; i++)
                 gSaveBlock1Ptr->mail[id].playerName[i] = gSaveBlock2Ptr->playerName[i];
@@ -76,7 +76,7 @@ u8 GiveMailToMon(struct Pokemon *mon, u16 itemId)
         }
     }
 
-    return INVALID_U8;
+    return 0xFF;
 }
 
 u16 SpeciesToMailSpecies(u16 species, u32 personality)
@@ -113,8 +113,8 @@ u8 GiveMailToMon2(struct Pokemon *mon, struct MailStruct *mail)
     u16 itemId = mail->itemId;
     u8 mailId = GiveMailToMon(mon, itemId);
 
-    if (mailId == INVALID_U8)
-        return INVALID_U8;
+    if (mailId == 0xFF)
+        return 0xFF;
 
     gSaveBlock1Ptr->mail[mailId] = *mail;
 
@@ -142,7 +142,7 @@ void TakeMailFromMon(struct Pokemon *mon)
     {
         mailId = GetMonData(mon, MON_DATA_MAIL);
         gSaveBlock1Ptr->mail[mailId].itemId = ITEM_NONE;
-        mailId = INVALID_U8;
+        mailId = 0xFF;
         heldItem[0] = ITEM_NONE;
         heldItem[1] = ITEM_NONE << 8;
         SetMonData(mon, MON_DATA_MAIL, &mailId);
@@ -163,7 +163,7 @@ u8 TakeMailFromMon2(struct Pokemon *mon)
 
     newHeldItem[0] = ITEM_NONE;
     newHeldItem[1] = ITEM_NONE << 8;
-    newMailId = INVALID_U8;
+    newMailId = 0xFF;
 
     for (i = PARTY_SIZE; i < MAIL_COUNT; i++)
     {
@@ -177,7 +177,7 @@ u8 TakeMailFromMon2(struct Pokemon *mon)
         }
     }
 
-    return INVALID_U8;
+    return 0xFF;
 }
 
 bool8 ItemIsMail(u16 itemId)

src/mauville_old_man.c

@@ -250,7 +250,7 @@ void ScrSpecial_HipsterTeachWord(void)
 {
     u16 var = sub_811F01C();
 
-    if (var == INVALID_U16)
+    if (var == 0xFFFF)
     {
         gSpecialVar_Result = FALSE;
     }
@@ -283,7 +283,7 @@ void ScrSpecial_GenerateGiddyLine(void)
     if (giddy->taleCounter == 0)
         InitGiddyTaleList();
 
-    if (giddy->randomWords[giddy->taleCounter] != INVALID_U16) // is not the last element of the array?
+    if (giddy->randomWords[giddy->taleCounter] != 0xFFFF) // is not the last element of the array?
     {
         u8 *stringPtr;
         u32 adjective = Random();
@@ -348,7 +348,7 @@ static void InitGiddyTaleList(void)
         r1 = Random() % 10;
         if (r1 < 3 && r7 < 8)
         {
-            giddy->randomWords[i] = INVALID_U16;
+            giddy->randomWords[i] = 0xFFFF;
             r7++;
         }
         else

src/menu.c

@@ -140,8 +140,8 @@ extern void task_free_buf_after_copying_tile_data_to_vram(u8 taskId);
 void sub_81971D0(void)
 {
     InitWindows(gUnknown_0860F098);
-    gStartMenuWindowId = INVALID_U8;
-    gUnknown_0203CD8D = INVALID_U8;
+    gStartMenuWindowId = 0xFF;
+    gUnknown_0203CD8D = 0xFF;
 }
 
 void sub_81971F4(void)
@@ -486,7 +486,7 @@ u8 GetPlayerTextSpeedDelay(void)
 
 u8 sub_81979C4(u8 a1)
 {
-    if (gStartMenuWindowId == INVALID_U8)
+    if (gStartMenuWindowId == 0xFF)
         gStartMenuWindowId = sub_8198AA4(0, 0x16, 1, 7, (a1 * 2) + 2, 0xF, 0x139);
     return gStartMenuWindowId;
 }
@@ -498,10 +498,10 @@ u8 GetStartMenuWindowId(void)
 
 void RemoveStartMenuWindow(void)
 {
-    if (gStartMenuWindowId != INVALID_U8)
+    if (gStartMenuWindowId != 0xFF)
     {
         RemoveWindow(gStartMenuWindowId);
-        gStartMenuWindowId = INVALID_U8;
+        gStartMenuWindowId = 0xFF;
     }
 }
 
@@ -517,7 +517,7 @@ u16 sub_8197A38(void)
 
 u8 AddMapNamePopUpWindow(void)
 {
-    if (gUnknown_0203CD8D == INVALID_U8)
+    if (gUnknown_0203CD8D == 0xFF)
         gUnknown_0203CD8D = sub_8198AA4(0, 1, 1, 10, 3, 14, 0x107);
     return gUnknown_0203CD8D;
 }
@@ -529,10 +529,10 @@ u8 GetMapNamePopUpWindowId(void)
 
 void RemoveMapNamePopUpWindow(void)
 {
-    if (gUnknown_0203CD8D != INVALID_U8)
+    if (gUnknown_0203CD8D != 0xFF)
     {
         RemoveWindow(gUnknown_0203CD8D);
-        gUnknown_0203CD8D = INVALID_U8;
+        gUnknown_0203CD8D = 0xFF;
     }
 }
 
@@ -808,7 +808,7 @@ void sub_8198180(const u8 *string, u8 a2, bool8 copyToVram)
 {
     u16 width = 0;
 
-    if (gUnknown_0203CDA0 != INVALID_U8)
+    if (gUnknown_0203CDA0 != 0xFF)
     {
         PutWindowTilemap(gUnknown_0203CDA0);
         FillWindowPixelBuffer(gUnknown_0203CDA0, 0xFF);
@@ -830,7 +830,7 @@ void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyTo
     u8 color[3];
     u16 width = 0;
 
-    if (gUnknown_0203CDA0 != INVALID_U8)
+    if (gUnknown_0203CDA0 != 0xFF)
     {
         if (a3 != 0)
         {
@@ -865,13 +865,13 @@ void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyTo
 
 void sub_81982D8(void)
 {
-    if (gUnknown_0203CDA0 != INVALID_U8)
+    if (gUnknown_0203CDA0 != 0xFF)
         CopyWindowToVram(gUnknown_0203CDA0, 3);
 }
 
 void sub_81982F0(void)
 {
-    if (gUnknown_0203CDA0 != INVALID_U8)
+    if (gUnknown_0203CDA0 != 0xFF)
     {
         FillWindowPixelBuffer(gUnknown_0203CDA0, 0xFF);
         CopyWindowToVram(gUnknown_0203CDA0, 3);
@@ -880,13 +880,13 @@ void sub_81982F0(void)
 
 void sub_8198314(void)
 {
-    if (gUnknown_0203CDA0 != INVALID_U8)
+    if (gUnknown_0203CDA0 != 0xFF)
     {
         FillWindowPixelBuffer(gUnknown_0203CDA0, 0);
         ClearWindowTilemap(gUnknown_0203CDA0);
         CopyWindowToVram(gUnknown_0203CDA0, 3);
         RemoveWindow(gUnknown_0203CDA0);
-        gUnknown_0203CDA0 = INVALID_U8;
+        gUnknown_0203CDA0 = 0xFF;
     }
 }
 

src/metatile_behavior.c

@@ -10,246 +10,246 @@
 // wonder what the third flag is supposed to do
 static const u8 sTileBitAttributes[] =
 {
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_NORMAL
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_WALL
-    TILE_ATTRIBUTES(TRUE, FALSE, TRUE),   // MB_TALL_GRASS
-    TILE_ATTRIBUTES(TRUE, FALSE, TRUE),   // MB_LONG_GRASS
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_04
-    TILE_ATTRIBUTES(FALSE, FALSE, TRUE),  // MB_UNUSED_05
-    TILE_ATTRIBUTES(TRUE, FALSE, TRUE),   // MB_DEEP_SAND
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SHORT_GRASS
-    TILE_ATTRIBUTES(TRUE, FALSE, TRUE),   // MB_UNUSED_CAVE
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_LONG_GRASS_SOUTH_EDGE
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_NO_RUNNING
-    TILE_ATTRIBUTES(TRUE, FALSE, TRUE),   // MB_INDOOR_ENCOUNTER
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_MOUNTAIN_TOP
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_BATTLE_PYRAMID_WARP
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_MOSSDEEP_GYM_WARP
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_MT_PYRE_HOLE
-    TILE_ATTRIBUTES(TRUE, TRUE, TRUE),    // MB_POND_WATER
-    TILE_ATTRIBUTES(TRUE, TRUE, TRUE),    // MB_SEMI_DEEP_WATER
-    TILE_ATTRIBUTES(TRUE, TRUE, TRUE),    // MB_DEEP_WATER
-    TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_WATERFALL
-    TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_SOOTOPOLIS_DEEP_WATER
-    TILE_ATTRIBUTES(TRUE, TRUE, TRUE),    // MB_OCEAN_WATER
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_PUDDLE
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SHALLOW_WATER
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_SOOTOPOLIS_DEEP_WATER
-    TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_NO_SURFACING
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_SOOTOPOLIS_DEEP_WATER_2
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_STAIRS_OUTSIDE_ABANDONED_SHIP
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SHOAL_CAVE_ENTRANCE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_1D
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_1E
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_1F
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ICE
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SAND
-    TILE_ATTRIBUTES(TRUE, TRUE, TRUE),    // MB_SEAWEED
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_UNUSED_23
-    TILE_ATTRIBUTES(TRUE, FALSE, TRUE),   // MB_ASHGRASS
-    TILE_ATTRIBUTES(TRUE, FALSE, TRUE),   // MB_FOOTPRINTS
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_THIN_ICE
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_CRACKED_ICE
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_HOT_SPRINGS
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_LAVARIDGE_GYM_B1F_WARP
-    TILE_ATTRIBUTES(TRUE, TRUE, TRUE),    // MB_SEAWEED_NO_SURFACING
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_REFLECTION_UNDER_BRIDGE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_2C
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_2D
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_2E
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_2F
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_IMPASSABLE_EAST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_IMPASSABLE_WEST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_IMPASSABLE_NORTH
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_IMPASSABLE_SOUTH
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_IMPASSABLE_NORTHEAST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_IMPASSABLE_NORTHWEST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_IMPASSABLE_SOUTHEAST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_IMPASSABLE_SOUTHWEST
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_JUMP_EAST
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_JUMP_WEST
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_JUMP_NORTH
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_JUMP_SOUTH
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_JUMP_NORTHEAST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_JUMP_NORTHWEST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_JUMP_SOUTHEAST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_JUMP_SOUTHWEST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_WALK_EAST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_WALK_WEST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_WALK_NORTH
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_WALK_SOUTH
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SLIDE_EAST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SLIDE_WEST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SLIDE_NORTH
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SLIDE_SOUTH
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_TRICK_HOUSE_PUZZLE_8_FLOOR
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_UNUSED_49
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_UNUSED_4A
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4B
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4C
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4D
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4E
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4F
-    TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_EASTWARD_CURRENT
-    TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_WESTWARD_CURRENT
-    TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_NORTHWARD_CURRENT
-    TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_SOUTHWARD_CURRENT
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_54
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_55
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_56
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_57
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_58
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_59
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5A
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5B
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5C
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5D
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5E
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5F
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_NON_ANIMATED_DOOR
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_LADDER
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_EAST_ARROW_WARP
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_WEST_ARROW_WARP
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_NORTH_ARROW_WARP
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SOUTH_ARROW_WARP
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_CRACKED_FLOOR_HOLE
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_AQUA_HIDEOUT_WARP
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_LAVARIDGE_GYM_1F_WARP
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ANIMATED_DOOR
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_UP_ESCALATOR
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_DOWN_ESCALATOR
-    TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_WATER_DOOR
-    TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_WATER_SOUTH_ARROW_WARP
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_DEEP_SOUTH_WARP
-    TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_UNUSED_6F
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_WARP_OR_BRIDGE
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_UNUSED_71
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ROUTE120_NORTH_BRIDGE_1
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ROUTE120_NORTH_BRIDGE_2
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_PACIFIDLOG_VERTICAL_LOG_1
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_PACIFIDLOG_VERTICAL_LOG_2
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_PACIFIDLOG_HORIZONTAL_LOG_1
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_PACIFIDLOG_HORIZONTAL_LOG_2
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_FORTREE_BRIDGE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_79
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ROUTE120_SOUTH_BRIDGE_1
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ROUTE120_SOUTH_BRIDGE_2
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ROUTE120_NORTH_BRIDGE_3
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ROUTE120_NORTH_BRIDGE_4
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_UNUSED_7E
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ROUTE110_BRIDGE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_COUNTER
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_81
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_82
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_PC
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_CABLE_BOX_RESULTS_1
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_REGION_MAP
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_TELEVISION
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_POKEBLOCK_FEEDER
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_88
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SLOT_MACHINE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_ROULETTE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_CLOSED_SOOTOPOLIS_DOOR
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_TRICK_HOUSE_PUZZLE_DOOR
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_PETALBURG_GYM_DOOR
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_RUNNING_SHOES_INSTRUCTION
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_QUESTIONNAIRE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_RED_CAVE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_RED_CAVE_OPEN
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_BROWN_CAVE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_BROWN_CAVE_OPEN
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_YELLOW_CAVE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_YELLOW_CAVE_OPEN
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_TREE_LEFT
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_TREE_LEFT_OPEN
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_SHRUB
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_SHRUB_OPEN
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_BLUE_CAVE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_BLUE_CAVE_OPEN
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_TREE_RIGHT
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_TREE_RIGHT_OPEN
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_9E
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_9F
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_BERRY_TREE_SOIL
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A1
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A2
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A3
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A4
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A5
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A6
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A7
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A8
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A9
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AA
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AB
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AC
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AD
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AF
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_PC
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_REGISTER_PC
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_UNUSED
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_BLOCK_DECORATION
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_DECORATION
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_LARGE_MAT_EDGE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_B6
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_NORTH_WALL
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_BALLOON
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_IMPASSABLE
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_GLITTER_MAT
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_JUMP_MAT
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_SPIN_MAT
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_SOUND_MAT
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_BREAKABLE_DOOR
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SAND_ORNAMENT
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_IMPASSABLE_SOUTH_AND_NORTH
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_IMPASSABLE_WEST_AND_EAST
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_HOLE
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_LARGE_MAT_CENTER
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_TV_SHIELD
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_PLAYER_ROOM_PC_ON
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_C6
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_POSTER
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_C8
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_C9
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CA
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CB
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CC
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CD
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CF
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_MUDDY_SLOPE
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_BUMPY_SLOPE
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_CRACKED_FLOOR
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ISOLATED_VERTICAL_RAIL
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ISOLATED_HORIZONTAL_RAIL
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_VERTICAL_RAIL
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_HORIZONTAL_RAIL
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_D7
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_D8
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_D9
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DA
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DB
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DC
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DD
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DF
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_PICTURE_BOOK_SHELF
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_BOOKSHELF
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_POKEMON_CENTER_BOOKSHELF
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_VASE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_TRASH_CAN
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SHOP_SHELF
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_BLUEPRINT
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_CABLE_BOX_RESULTS_2
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_WIRELESS_BOX_RESULTS
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_TRAINER_HILL_TIMER
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNKNOWN_CLOSED_DOOR
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_EB
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_EC
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_ED
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_EE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_EF
+    [MB_NORMAL] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SECRET_BASE_WALL] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_TALL_GRASS] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE),
+    [MB_LONG_GRASS] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE),
+    [MB_UNUSED_04] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_05] = TILE_ATTRIBUTES(FALSE, FALSE, TRUE),
+    [MB_DEEP_SAND] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE),
+    [MB_SHORT_GRASS] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UNUSED_CAVE] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE),
+    [MB_LONG_GRASS_SOUTH_EDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_NO_RUNNING] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_INDOOR_ENCOUNTER] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE),
+    [MB_MOUNTAIN_TOP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_BATTLE_PYRAMID_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_MOSSDEEP_GYM_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_MT_PYRE_HOLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_POND_WATER] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE),
+    [MB_SEMI_DEEP_WATER] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE),
+    [MB_DEEP_WATER] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE),
+    [MB_WATERFALL] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
+    [MB_SOOTOPOLIS_DEEP_WATER] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
+    [MB_OCEAN_WATER] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE),
+    [MB_PUDDLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SHALLOW_WATER] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UNUSED_SOOTOPOLIS_DEEP_WATER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_NO_SURFACING] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
+    [MB_UNUSED_SOOTOPOLIS_DEEP_WATER_2] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_STAIRS_OUTSIDE_ABANDONED_SHIP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SHOAL_CAVE_ENTRANCE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UNUSED_1D] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_1E] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_1F] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_ICE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SAND] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SEAWEED] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE),
+    [MB_UNUSED_23] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_ASHGRASS] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE),
+    [MB_FOOTPRINTS] = TILE_ATTRIBUTES(TRUE, FALSE, TRUE),
+    [MB_THIN_ICE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_CRACKED_ICE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_HOT_SPRINGS] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_LAVARIDGE_GYM_B1F_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SEAWEED_NO_SURFACING] = TILE_ATTRIBUTES(TRUE, TRUE, TRUE),
+    [MB_REFLECTION_UNDER_BRIDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UNUSED_2C] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_2D] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_2E] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_2F] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_IMPASSABLE_EAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_IMPASSABLE_WEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_IMPASSABLE_NORTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_IMPASSABLE_SOUTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_IMPASSABLE_NORTHEAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_IMPASSABLE_NORTHWEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_IMPASSABLE_SOUTHEAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_IMPASSABLE_SOUTHWEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_JUMP_EAST] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_JUMP_WEST] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_JUMP_NORTH] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_JUMP_SOUTH] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_JUMP_NORTHEAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_JUMP_NORTHWEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_JUMP_SOUTHEAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_JUMP_SOUTHWEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_WALK_EAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_WALK_WEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_WALK_NORTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_WALK_SOUTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SLIDE_EAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SLIDE_WEST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SLIDE_NORTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SLIDE_SOUTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_TRICK_HOUSE_PUZZLE_8_FLOOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UNUSED_49] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UNUSED_4A] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UNUSED_4B] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_4C] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_4D] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_4E] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_4F] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_EASTWARD_CURRENT] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
+    [MB_WESTWARD_CURRENT] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
+    [MB_NORTHWARD_CURRENT] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
+    [MB_SOUTHWARD_CURRENT] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
+    [MB_UNUSED_54] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_55] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_56] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_57] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_58] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_59] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_5A] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_5B] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_5C] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_5D] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_5E] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_5F] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_NON_ANIMATED_DOOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_LADDER] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_EAST_ARROW_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_WEST_ARROW_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_NORTH_ARROW_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SOUTH_ARROW_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_CRACKED_FLOOR_HOLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_AQUA_HIDEOUT_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_LAVARIDGE_GYM_1F_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_ANIMATED_DOOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UP_ESCALATOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_DOWN_ESCALATOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_WATER_DOOR] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
+    [MB_WATER_SOUTH_ARROW_WARP] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
+    [MB_DEEP_SOUTH_WARP] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UNUSED_6F] = TILE_ATTRIBUTES(TRUE, TRUE, FALSE),
+    [MB_WARP_OR_BRIDGE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_71] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_ROUTE120_NORTH_BRIDGE_1] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_ROUTE120_NORTH_BRIDGE_2] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_PACIFIDLOG_VERTICAL_LOG_1] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_PACIFIDLOG_VERTICAL_LOG_2] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_PACIFIDLOG_HORIZONTAL_LOG_1] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_PACIFIDLOG_HORIZONTAL_LOG_2] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_FORTREE_BRIDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UNUSED_79] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_ROUTE120_SOUTH_BRIDGE_1] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_ROUTE120_SOUTH_BRIDGE_2] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_ROUTE120_NORTH_BRIDGE_3] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_ROUTE120_NORTH_BRIDGE_4] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UNUSED_7E] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_ROUTE110_BRIDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_COUNTER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_81] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_82] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_PC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_CABLE_BOX_RESULTS_1] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_REGION_MAP] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_TELEVISION] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_POKEBLOCK_FEEDER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_88] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SLOT_MACHINE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_ROULETTE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_CLOSED_SOOTOPOLIS_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_TRICK_HOUSE_PUZZLE_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_PETALBURG_GYM_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_RUNNING_SHOES_INSTRUCTION] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_QUESTIONNAIRE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_RED_CAVE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_RED_CAVE_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_BROWN_CAVE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_BROWN_CAVE_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_YELLOW_CAVE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_YELLOW_CAVE_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_TREE_LEFT] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_TREE_LEFT_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_SHRUB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_SHRUB_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_BLUE_CAVE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_BLUE_CAVE_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_TREE_RIGHT] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPOT_TREE_RIGHT_OPEN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_9E] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_9F] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_BERRY_TREE_SOIL] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_A1] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_A2] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_A3] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_A4] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_A5] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_A6] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_A7] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_A8] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_A9] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_AA] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_AB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_AC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_AD] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_AE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_AF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_PC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_REGISTER_PC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_UNUSED] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_BLOCK_DECORATION] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SECRET_BASE_DECORATION] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_LARGE_MAT_EDGE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UNUSED_B6] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_NORTH_WALL] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_BALLOON] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SECRET_BASE_IMPASSABLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SECRET_BASE_GLITTER_MAT] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SECRET_BASE_JUMP_MAT] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SECRET_BASE_SPIN_MAT] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SECRET_BASE_SOUND_MAT] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SECRET_BASE_BREAKABLE_DOOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SECRET_BASE_SAND_ORNAMENT] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_IMPASSABLE_SOUTH_AND_NORTH] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_IMPASSABLE_WEST_AND_EAST] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SECRET_BASE_HOLE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_LARGE_MAT_CENTER] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_SECRET_BASE_TV_SHIELD] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_PLAYER_ROOM_PC_ON] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_C6] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SECRET_BASE_POSTER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_C8] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_C9] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_CA] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_CB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_CC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_CD] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_CE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_CF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_MUDDY_SLOPE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_BUMPY_SLOPE] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_CRACKED_FLOOR] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_ISOLATED_VERTICAL_RAIL] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_ISOLATED_HORIZONTAL_RAIL] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_VERTICAL_RAIL] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_HORIZONTAL_RAIL] = TILE_ATTRIBUTES(TRUE, FALSE, FALSE),
+    [MB_UNUSED_D7] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_D8] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_D9] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_DA] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_DB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_DC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_DD] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_DE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_DF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_PICTURE_BOOK_SHELF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_BOOKSHELF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_POKEMON_CENTER_BOOKSHELF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_VASE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_TRASH_CAN] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_SHOP_SHELF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_BLUEPRINT] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_CABLE_BOX_RESULTS_2] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_WIRELESS_BOX_RESULTS] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_TRAINER_HILL_TIMER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNKNOWN_CLOSED_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_EB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_EC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_ED] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_EE] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
+    [MB_UNUSED_EF] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
 };
 
 bool8 MetatileBehavior_IsATile(u8 metatileBehavior)

src/naming_screen.c

@@ -2141,7 +2141,7 @@ static const struct SpriteTemplate sSpriteTemplate_Underscore =
 
 static const struct SpriteTemplate gUnknown_0858C180 =
 {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 0x0000,
     .oam = &gOamData_858BFEC,
     .anims = gSpriteAnimTable_858C0BC,

src/overworld.c

@@ -296,15 +296,51 @@ static const u8 sUnusedData[] =
 
 const struct UCoords32 gDirectionToVectors[] =
 {
-    { 0,  0}, // DIR_NONE
-    { 0,  1}, // DIR_SOUTH
-    { 0, -1}, // DIR_NORTH
-    {-1,  0}, // DIR_WEST
-    { 1,  0}, // DIR_EAST
-    {-1,  1}, // DIR_SOUTHWEST
-    { 1,  1}, // DIR_SOUTHEAST
-    {-1, -1}, // DIR_NORTHWEST
-    { 1, -1}, // DIR_NORTHEAST
+    [DIR_NONE] =
+    {
+        .x =  0,
+        .y =  0,
+    },
+    [DIR_SOUTH] =
+    {
+        .x =  0,
+        .y =  1,
+    },
+    [DIR_NORTH] =
+    {
+        .x =  0,
+        .y = -1,
+    },
+    [DIR_WEST] =
+    {
+        .x = -1,
+        .y =  0,
+    },
+    [DIR_EAST] =
+    {
+        .x =  1,
+        .y =  0,
+    },
+    [DIR_SOUTHWEST] =
+    {
+        .x = -1,
+        .y =  1,
+    },
+    [DIR_SOUTHEAST] =
+    {
+        .x =  1,
+        .y =  1,
+    },
+    [DIR_NORTHWEST] =
+    {
+        .x = -1,
+        .y = -1,
+    },
+    [DIR_NORTHEAST] =
+    {
+        .x =  1,
+        .y = -1,
+    },
 };
 
 static const struct BgTemplate gUnknown_08339DAC[] =
@@ -1110,7 +1146,7 @@ static bool16 IsInflitratedSpaceCenter(struct WarpData *warp)
 u16 GetLocationMusic(struct WarpData *warp)
 {
     if (NoMusicInSotopolisWithLegendaries(warp) == TRUE)
-        return INVALID_U16;
+        return 0xFFFF;
     else if (ShouldLegendaryMusicPlayAtLocation(warp) == TRUE)
         return MUS_OOAME;
     else if (IsInflitratedSpaceCenter(warp) == TRUE)
@@ -1171,7 +1207,7 @@ void Overworld_PlaySpecialMapMusic(void)
 {
     u16 music = GetCurrLocationDefaultMusic();
 
-    if (music != MUS_OOAME && music != INVALID_U16)
+    if (music != MUS_OOAME && music != 0xFFFF)
     {
         if (gSaveBlock1Ptr->savedMusic)
             music = gSaveBlock1Ptr->savedMusic;
@@ -1201,7 +1237,7 @@ static void sub_8085810(void)
     {
         u16 newMusic = GetWarpDestinationMusic();
         u16 currentMusic = GetCurrentMapMusic();
-        if (newMusic != MUS_OOAME && newMusic != INVALID_U16)
+        if (newMusic != MUS_OOAME && newMusic != 0xFFFF)
         {
             if (currentMusic == MUS_DEEPDEEP || currentMusic == MUS_NAMINORI)
                 return;

src/palette.c

@@ -63,7 +63,7 @@ static EWRAM_DATA u32 sPlttBufferTransferPending = 0;
 EWRAM_DATA u8 gPaletteDecompressionBuffer[PLTT_DECOMP_BUFFER_SIZE] = {0};
 
 static const struct PaletteStructTemplate gDummyPaletteStructTemplate = {
-    .uid = INVALID_U16,
+    .uid = 0xFFFF,
     .pst_field_B_5 = 1
 };
 

src/pokeblock.c

@@ -435,7 +435,7 @@ void OpenPokeblockCase(u8 caseId, void (*callback)(void))
     sPokeblockMenu = Alloc(sizeof(*sPokeblockMenu));
     sPokeblockMenu->caseId = caseId;
     sPokeblockMenu->callbackOnUse = NULL;
-    sPokeblockMenu->unkTaskId = INVALID_U8;
+    sPokeblockMenu->unkTaskId = 0xFF;
     sPokeblockMenu->isSwapping = FALSE;
     sSavedPokeblockData.callback = callback;
 
@@ -901,7 +901,7 @@ static void sub_8136344(void)
 
 static void sub_81363BC(void)
 {
-    if (sPokeblockMenu->unkTaskId == INVALID_U8)
+    if (sPokeblockMenu->unkTaskId == 0xFF)
     {
         sPokeblockMenu->unkTaskId = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xB0, 8, 0x98, sPokeblockMenu->itemsNo - sPokeblockMenu->maxShowed,
                                                                             0x456, 0x456, &sSavedPokeblockData.lastItemPage);
@@ -910,10 +910,10 @@ static void sub_81363BC(void)
 
 static void sub_8136418(void)
 {
-    if (sPokeblockMenu->unkTaskId != INVALID_U8)
+    if (sPokeblockMenu->unkTaskId != 0xFF)
     {
         RemoveScrollIndicatorArrowPair(sPokeblockMenu->unkTaskId);
-        sPokeblockMenu->unkTaskId = INVALID_U8;
+        sPokeblockMenu->unkTaskId = 0xFF;
     }
 }
 
@@ -1016,7 +1016,7 @@ static void Task_HandlePokeblockMenuInput(u8 taskId)
                 break;
             case LIST_B_PRESSED:
                 PlaySE(SE_SELECT);
-                gSpecialVar_Result = INVALID_U16;
+                gSpecialVar_Result = 0xFFFF;
                 gSpecialVar_ItemId = 0;
                 FadePaletteAndSetTaskToClosePokeblockCase(taskId);
                 break;

src/pokeblock_feed.c

@@ -88,31 +88,31 @@ EWRAM_DATA static struct CompressedSpritePalette sPokeblockSpritePal = {0};
 // const rom data
 static const u8 sNatureToMonPokeblockAnim[][2] =
 {
-    {  0, 0 }, // HARDY
-    {  3, 0 }, // LONELY
-    {  4, 1 }, // BRAVE
-    {  5, 0 }, // ADAMANT
-    { 10, 0 }, // NAUGHTY
-    { 13, 0 }, // BOLD
-    { 15, 0 }, // DOCILE
-    { 16, 2 }, // RELAXED
-    { 18, 0 }, // IMPISH
-    { 19, 0 }, // LAX
-    { 20, 0 }, // TIMID
-    { 25, 0 }, // HASTY
-    { 27, 3 }, // SERIOUS
-    { 28, 0 }, // JOLLY
-    { 29, 0 }, // NAIVE
-    { 33, 4 }, // MODEST
-    { 36, 0 }, // MILD
-    { 37, 0 }, // QUIET
-    { 39, 0 }, // BASHFUL
-    { 42, 0 }, // RASH
-    { 45, 0 }, // CALM
-    { 46, 5 }, // GENTLE
-    { 47, 6 }, // SASSY
-    { 48, 0 }, // CAREFUL
-    { 53, 0 }, // QUIRKY
+    [NATURE_HARDY] = {  0, 0 },
+    [NATURE_LONELY] = {  3, 0 },
+    [NATURE_BRAVE] = {  4, 1 },
+    [NATURE_ADAMANT] = {  5, 0 },
+    [NATURE_NAUGHTY] = { 10, 0 },
+    [NATURE_BOLD] = { 13, 0 },
+    [NATURE_DOCILE] = { 15, 0 },
+    [NATURE_RELAXED] = { 16, 2 },
+    [NATURE_IMPISH] = { 18, 0 },
+    [NATURE_LAX] = { 19, 0 },
+    [NATURE_TIMID] = { 20, 0 },
+    [NATURE_HASTY] = { 25, 0 },
+    [NATURE_SERIOUS] = { 27, 3 },
+    [NATURE_JOLLY] = { 28, 0 },
+    [NATURE_NAIVE] = { 29, 0 },
+    [NATURE_MODEST] = { 33, 4 },
+    [NATURE_MILD] = { 36, 0 },
+    [NATURE_QUIET] = { 37, 0 },
+    [NATURE_BASHFUL] = { 39, 0 },
+    [NATURE_RASH] = { 42, 0 },
+    [NATURE_CALM] = { 45, 0 },
+    [NATURE_GENTLE] = { 46, 5 },
+    [NATURE_SASSY] = { 47, 6 },
+    [NATURE_CAREFUL] = { 48, 0 },
+    [NATURE_QUIRKY] = { 53, 0 },
 };
 
 static const s16 sMonPokeblockAnims[][10] =

src/pokedex.c

@@ -1271,7 +1271,7 @@ static void ResetPokedexView(struct PokedexView *pokedexView)
     pokedexView->seenCount = 0;
     pokedexView->ownCount = 0;
     for (i = 0; i <= 3; i++)
-        pokedexView->unk61E[i] |= INVALID_U16;
+        pokedexView->unk61E[i] |= 0xFFFF;
     pokedexView->unk628 = 0;
     pokedexView->unk62A = 0;
     pokedexView->unk62C = 0;
@@ -2459,7 +2459,7 @@ u32 sub_80BDACC(u16 num, s16 x, s16 y)
             return spriteId;
         }
     }
-    return INVALID_U16;
+    return 0xFFFF;
 }
 
 static void CreateInterfaceSprites(u8 a)
@@ -2717,8 +2717,8 @@ void sub_80BE4E0(struct Sprite *sprite)
 
         sprite->pos2.y = gSineTable[(u8)sprite->data[5]] * 76 / 256;
         var = 0x10000 / gSineTable[sprite->data[5] + 0x40];
-        if (var > INVALID_U16)
-            var = INVALID_U16;
+        if (var > 0xFFFF)
+            var = 0xFFFF;
         SetOamMatrix(sprite->data[1] + 1, 0x100, 0, 0, var);
         sprite->oam.matrixNum = data1 + 1;
 
@@ -4627,12 +4627,12 @@ u32 sub_80C0E68(u16 a)
 u16 sub_80C0E9C(u16 num, s16 x, s16 y, u16 paletteSlot)
 {
     num = NationalPokedexNumToSpecies(num);
-    return CreateMonPicSprite_HandleDeoxys(num, 8, sub_80C0E68(num), TRUE, x, y, paletteSlot, INVALID_U16);
+    return CreateMonPicSprite_HandleDeoxys(num, 8, sub_80C0E68(num), TRUE, x, y, paletteSlot, 0xFFFF);
 }
 
 u16 sub_80C0EF8(u16 species, s16 x, s16 y, s8 paletteSlot)
 {
-    return CreateTrainerPicSprite(species, TRUE, x, y, paletteSlot, INVALID_U16);
+    return CreateTrainerPicSprite(species, TRUE, x, y, paletteSlot, 0xFFFF);
 }
 
 int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8 type2)
@@ -4655,7 +4655,7 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8
     sPokedexView->pokemonListCount = resultsCount;
 
     // Search by name
-    if (abcGroup != INVALID_U8)
+    if (abcGroup != 0xFF)
     {
         for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++)
         {
@@ -4674,7 +4674,7 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8
     }
 
     // Search by body color
-    if (bodyColor != INVALID_U8)
+    if (bodyColor != 0xFF)
     {
         for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++)
         {
@@ -4690,15 +4690,15 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8
     }
 
     // Search by type
-    if (type1 != INVALID_U8 || type2 != INVALID_U8)
+    if (type1 != 0xFF || type2 != 0xFF)
     {
-        if (type1 == INVALID_U8)
+        if (type1 == 0xFF)
         {
             type1 = type2;
-            type2 = INVALID_U8;
+            type2 = 0xFF;
         }
 
-        if (type2 == INVALID_U8)
+        if (type2 == 0xFF)
         {
             for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++)
             {
@@ -4744,7 +4744,6 @@ int sub_80C0F30(u8 dexMode, u8 sortMode, u8 abcGroup, u8 bodyColor, u8 type1, u8
             sPokedexView->pokedexList[i].dexNum = 0xFFFF;
             sPokedexView->pokedexList[i].seen = FALSE;
             sPokedexView->pokedexList[i].owned = FALSE;
-
         }
     }
 
@@ -4987,7 +4986,7 @@ void sub_80C170C(u8 taskId)
         return;
     }
 
-    if ((gMain.newKeys & DPAD_LEFT) && r6[gTasks[taskId].data[1]][0] != INVALID_U8)
+    if ((gMain.newKeys & DPAD_LEFT) && r6[gTasks[taskId].data[1]][0] != 0xFF)
     {
         PlaySE(SE_SELECT);
         gTasks[taskId].data[1] = r6[gTasks[taskId].data[1]][0];
@@ -4995,7 +4994,7 @@ void sub_80C170C(u8 taskId)
         CopyWindowToVram(0, 2);
         CopyBgTilemapBufferToVram(3);
     }
-    if ((gMain.newKeys & DPAD_RIGHT) && r6[gTasks[taskId].data[1]][1] != INVALID_U8)
+    if ((gMain.newKeys & DPAD_RIGHT) && r6[gTasks[taskId].data[1]][1] != 0xFF)
     {
         PlaySE(SE_SELECT);
         gTasks[taskId].data[1] = r6[gTasks[taskId].data[1]][1];
@@ -5003,7 +5002,7 @@ void sub_80C170C(u8 taskId)
         CopyWindowToVram(0, 2);
         CopyBgTilemapBufferToVram(3);
     }
-    if ((gMain.newKeys & DPAD_UP) && r6[gTasks[taskId].data[1]][2] != INVALID_U8)
+    if ((gMain.newKeys & DPAD_UP) && r6[gTasks[taskId].data[1]][2] != 0xFF)
     {
         PlaySE(SE_SELECT);
         gTasks[taskId].data[1] = r6[gTasks[taskId].data[1]][2];
@@ -5011,7 +5010,7 @@ void sub_80C170C(u8 taskId)
         CopyWindowToVram(0, 2);
         CopyBgTilemapBufferToVram(3);
     }
-    if ((gMain.newKeys & DPAD_DOWN) && r6[gTasks[taskId].data[1]][3] != INVALID_U8)
+    if ((gMain.newKeys & DPAD_DOWN) && r6[gTasks[taskId].data[1]][3] != 0xFF)
     {
         PlaySE(SE_SELECT);
         gTasks[taskId].data[1] = r6[gTasks[taskId].data[1]][3];
@@ -5475,12 +5474,12 @@ u8 sub_80C2318(u8 taskId, u8 b)
             return gUnknown_0856EFAE[r2];
         case 0:
             if (r2 == 0)
-                return INVALID_U8;
+                return 0xFF;
             else
                 return r2;
         case 1:
             if (r2 == 0)
-                return INVALID_U8;
+                return 0xFF;
             else
                 return r2 - 1;
         case 2:

src/pokedex_area_screen.c

@@ -4,7 +4,7 @@
 #include "gpu_regs.h"
 #include "graphics.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "menu.h"
 #include "overworld.h"
 #include "palette.h"

src/pokemon.c

@@ -2300,7 +2300,7 @@ static const u8 sHoldEffectToType[][2] =
 const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] =
 {
     {   // B_POSITION_PLAYER_LEFT
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = 0,
         .oam = &gUnknown_0831ACB0,
         .anims = NULL,
@@ -2309,7 +2309,7 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] =
         .callback = sub_8039BB4,
     },
     {   // B_POSITION_OPPONENT_LEFT
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = 0,
         .oam = &gUnknown_0831ACA8,
         .anims = NULL,
@@ -2318,7 +2318,7 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] =
         .callback = oac_poke_opponent,
     },
     {   // B_POSITION_PLAYER_RIGHT
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = 0,
         .oam = &gUnknown_0831ACB0,
         .anims = NULL,
@@ -2327,7 +2327,7 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] =
         .callback = sub_8039BB4,
     },
     {   // B_POSITION_OPPONENT_RIGHT
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = 0,
         .oam = &gUnknown_0831ACA8,
         .anims = NULL,
@@ -2340,7 +2340,7 @@ const struct SpriteTemplate gUnknown_08329D98[MAX_BATTLERS_COUNT] =
 static const struct SpriteTemplate gUnknown_08329DF8[] =
 {
     {
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = 0,
         .oam = &gUnknown_0831ACB0,
         .anims = NULL,
@@ -2349,7 +2349,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
         .callback = sub_8039BB4,
     },
     {
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = 0,
         .oam = &gUnknown_0831ACB0,
         .anims = NULL,
@@ -2358,7 +2358,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
         .callback = sub_8039BB4,
     },
     {
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = 0,
         .oam = &gUnknown_0831ACB0,
         .anims = NULL,
@@ -2367,7 +2367,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
         .callback = sub_8039BB4,
     },
     {
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = 0,
         .oam = &gUnknown_0831ACB0,
         .anims = NULL,
@@ -2376,7 +2376,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
         .callback = sub_8039BB4,
     },
     {
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = 0,
         .oam = &gUnknown_0831ACB0,
         .anims = NULL,
@@ -2385,7 +2385,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
         .callback = sub_8039BB4,
     },
     {
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = 0,
         .oam = &gUnknown_0831ACB0,
         .anims = NULL,
@@ -2394,7 +2394,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
         .callback = sub_8039BB4,
     },
     {
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = 0,
         .oam = &gUnknown_0831ACB0,
         .anims = NULL,
@@ -2403,7 +2403,7 @@ static const struct SpriteTemplate gUnknown_08329DF8[] =
         .callback = sub_8039BB4,
     },
     {
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = 0,
         .oam = &gUnknown_0831ACB0,
         .anims = NULL,
@@ -2450,7 +2450,7 @@ static const s8 gUnknown_08329ECE[][3] =
 static const u16 sHMMoves[] =
 {
     MOVE_CUT, MOVE_FLY, MOVE_SURF, MOVE_STRENGTH, MOVE_FLASH,
-    MOVE_ROCK_SMASH, MOVE_WATERFALL, MOVE_DIVE, INVALID_U16
+    MOVE_ROCK_SMASH, MOVE_WATERFALL, MOVE_DIVE, 0xFFFF
 };
 
 static const struct SpeciesItem sAlteringCaveWildMonHeldItems[] =
@@ -2485,8 +2485,8 @@ static const struct OamData sOamData_8329F20 =
 
 static const struct SpriteTemplate gUnknown_08329F28 =
 {
-    .tileTag = INVALID_U16,
-    .paletteTag = INVALID_U16,
+    .tileTag = 0xFFFF,
+    .paletteTag = 0xFFFF,
     .oam = &sOamData_8329F20,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
@@ -3286,7 +3286,7 @@ u16 GiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move)
         if (existingMove == move)
             return -2;
     }
-    return INVALID_U16;
+    return 0xFFFF;
 }
 
 u16 GiveMoveToBattleMon(struct BattlePokemon *mon, u16 move)
@@ -3303,7 +3303,7 @@ u16 GiveMoveToBattleMon(struct BattlePokemon *mon, u16 move)
         }
     }
 
-    return INVALID_U16;
+    return 0xFFFF;
 }
 
 void SetMonMoveSlot(struct Pokemon *mon, u16 move, u8 slot)
@@ -3341,7 +3341,7 @@ void GiveBoxMonInitialMoveset(struct BoxPokemon *boxMon)
 
         move = (gLevelUpLearnsets[species][i] & 0x1FF);
 
-        if (GiveMoveToBoxMon(boxMon, move) == INVALID_U16)
+        if (GiveMoveToBoxMon(boxMon, move) == 0xFFFF)
             DeleteFirstMoveAndGiveMoveToBoxMon(boxMon, move);
     }
 }
@@ -6495,7 +6495,7 @@ u8 GetMoveRelearnerMoves(struct Pokemon *mon, u16 *moves)
     {
         u16 moveLevel;
 
-        if (gLevelUpLearnsets[species][i] == INVALID_U16)
+        if (gLevelUpLearnsets[species][i] == 0xFFFF)
             break;
 
         moveLevel = gLevelUpLearnsets[species][i] & 0xFE00;
@@ -6524,7 +6524,7 @@ u8 GetLevelUpMovesBySpecies(u16 species, u16 *moves)
     u8 numMoves = 0;
     int i;
 
-    for (i = 0; i < 20 && gLevelUpLearnsets[species][i] != INVALID_U16; i++)
+    for (i = 0; i < 20 && gLevelUpLearnsets[species][i] != 0xFFFF; i++)
          moves[numMoves++] = gLevelUpLearnsets[species][i] & 0x1FF;
 
      return numMoves;
@@ -6549,7 +6549,7 @@ u8 GetNumberOfRelearnableMoves(struct Pokemon *mon)
     {
         u16 moveLevel;
 
-        if (gLevelUpLearnsets[species][i] == INVALID_U16)
+        if (gLevelUpLearnsets[species][i] == 0xFFFF)
             break;
 
         moveLevel = gLevelUpLearnsets[species][i] & 0xFE00;
@@ -6584,7 +6584,7 @@ u16 SpeciesToPokedexNum(u16 species)
         species = SpeciesToHoennPokedexNum(species);
         if (species <= 202)
             return species;
-        return INVALID_U16;
+        return 0xFFFF;
     }
 }
 
@@ -6747,7 +6747,7 @@ const struct CompressedSpritePalette *GetMonSpritePalStructFromOtIdPersonality(u
 bool32 IsHMMove2(u16 move)
 {
     int i = 0;
-    while (sHMMoves[i] != INVALID_U16)
+    while (sHMMoves[i] != 0xFFFF)
     {
         if (sHMMoves[i++] == move)
             return TRUE;

src/pokemon_animation.c

@@ -588,7 +588,7 @@ static const u8 sUnknown_0860AA64[][2] =
     {0, 2},
     {1, 2},
     {0, 2},
-    {0, INVALID_U8}
+    {0, 0xFF}
 };
 
 static const u8 sUnknown_0860AA80[][2] =
@@ -1666,7 +1666,7 @@ static void sub_818031C(struct Sprite *sprite)
     else
         amplitude = 0;
 
-    if (var5 == INVALID_U8)
+    if (var5 == 0xFF)
     {
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
         sprite->pos2.y = 0;
@@ -2570,7 +2570,7 @@ static void pokemonanimfunc_2C(struct Sprite *sprite)
         sprite->data[4] = 0;
     }
 
-    if (sUnknown_0860AA64[sprite->data[6]][1] == INVALID_U8)
+    if (sUnknown_0860AA64[sprite->data[6]][1] == 0xFF)
     {
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
     }
@@ -4157,17 +4157,17 @@ static void sub_8183574(struct Sprite *sprite)
     u8 var9 = sprite->data[6];
     u8 var5 = sUnknown_0860AA80[sprite->data[5]][0];
     u8 var2 = var5;
-    if (var5 != INVALID_U8)
+    if (var5 != 0xFF)
         var5 = sprite->data[7];
     else
-        var5 = INVALID_U8; // needed to match
+        var5 = 0xFF; // needed to match
 
     var6 = sUnknown_0860AA80[sprite->data[5]][1];
     var7 = 0;
     if (var2 != 0xFE)
         var7 = (var6 - var9) * var5 / var6;
 
-    if (var5 == INVALID_U8)
+    if (var5 == 0xFF)
     {
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;
         sprite->pos2.y = 0;
@@ -5278,7 +5278,7 @@ static const struct YellowBlendStruct sUnknown_0860ADCC[] =
     {0, 1},
     {1, 1},
     {0, 1},
-    {0, INVALID_U8}
+    {0, 0xFF}
 };
 
 static const struct YellowBlendStruct sUnknown_0860AE1C[] =
@@ -5296,7 +5296,7 @@ static const struct YellowBlendStruct sUnknown_0860AE1C[] =
     {0, 2},
     {1, 2},
     {0, 2},
-    {0, INVALID_U8}
+    {0, 0xFF}
 };
 
 static const struct YellowBlendStruct sUnknown_0860AE54[] =
@@ -5310,7 +5310,7 @@ static const struct YellowBlendStruct sUnknown_0860AE54[] =
     {0, 20},
     {1, 1},
     {0, 1},
-    {0, INVALID_U8}
+    {0, 0xFF}
 };
 
 static const struct YellowBlendStruct *const sUnknown_0860AE7C[] =
@@ -5324,7 +5324,7 @@ static void BackAnimBlendYellow(struct Sprite *sprite)
 {
     const struct YellowBlendStruct *array = sUnknown_0860AE7C[sprite->data[3]];
     sub_8184770(sprite);
-    if (array[sprite->data[6]].field_1 == INVALID_U8)
+    if (array[sprite->data[6]].field_1 == 0xFF)
     {
         sprite->pos2.x = 0;
         sprite->callback = SpriteCB_SetDummyOnAnimEnd;

src/pokemon_icon.c

@@ -1153,14 +1153,14 @@ void SafeLoadMonIconPalette(u16 species)
     if (species > SPECIES_EGG)
         species = 260;
     palIndex = gMonIconPaletteIndices[species];
-    if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == INVALID_U8)
+    if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == 0xFF)
         LoadSpritePalette(&gMonIconPaletteTable[palIndex]);
 }
 
 void LoadMonIconPalette(u16 species)
 {
     u8 palIndex = gMonIconPaletteIndices[species];
-    if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == INVALID_U8)
+    if (IndexOfSpritePaletteTag(gMonIconPaletteTable[palIndex].tag) == 0xFF)
         LoadSpritePalette(&gMonIconPaletteTable[palIndex]);
 }
 
@@ -1287,7 +1287,7 @@ static u8 CreateMonIconSprite(struct MonIconSpriteTemplate *iconTemplate, s16 x,
 
     struct SpriteTemplate spriteTemplate =
     {
-        .tileTag = INVALID_U16,
+        .tileTag = 0xFFFF,
         .paletteTag = iconTemplate->paletteTag,
         .oam = iconTemplate->oam,
         .anims = iconTemplate->anims,

src/pokemon_size_record.c

@@ -109,7 +109,7 @@ static void FormatMonSizeRecord(u8 *string, u32 size)
 
 static u8 CompareMonSize(u16 species, u16 *sizeRecord)
 {
-    if (gSpecialVar_Result == INVALID_U8)
+    if (gSpecialVar_Result == 0xFF)
     {
         return 0;
     }

src/pokemon_storage_system.c

@@ -134,7 +134,7 @@ s16 GetFirstFreeBoxSpot(u8 boxId)
             return i;
     }
 
-    return INVALID_S16; // all spots are taken
+    return -1; // all spots are taken
 }
 
 u8 CountPartyNonEggMons(void)
@@ -426,7 +426,7 @@ s16 StorageSystemGetNextMonIndex(struct BoxPokemon *box, s8 startIdx, u8 stopIdx
                 return i;
         }
     }
-    return INVALID_S16;
+    return -1;
 }
 
 void ResetPokemonStorageSystem(void)

src/pokemon_summary_screen.c

@@ -1152,7 +1152,7 @@ static bool8 SummaryScreen_LoadGraphics(void)
         break;
     case 17:
         pssData->spriteIds[0] = sub_81C45F4(&pssData->currentMon, &pssData->unk40F0);
-        if (pssData->spriteIds[0] != INVALID_U8)
+        if (pssData->spriteIds[0] != 0xFF)
         {
             pssData->unk40F0 = 0;
             gMain.state++;
@@ -1509,7 +1509,7 @@ static void sub_81C0604(u8 taskId, s8 a)
             r4_2 = sub_81C08F8(a);
         }
 
-        if (r4_2 != INVALID_S8)
+        if (r4_2 != -1)
         {
             PlaySE(SE_SELECT);
             if (pssData->summary.unk7 != 0)
@@ -1564,7 +1564,7 @@ static void sub_81C0704(u8 taskId)
         break;
     case 8:
         pssData->spriteIds[0] = sub_81C45F4(&pssData->currentMon, &data[1]);
-        if (pssData->spriteIds[0] == INVALID_U8)
+        if (pssData->spriteIds[0] == 0xFF)
             return;
         gSprites[pssData->spriteIds[0]].data[2] = 1;
         sub_81C0E24();
@@ -1601,9 +1601,9 @@ static s8 sub_81C08F8(s8 a)
     if (pssData->currPageIndex == PSS_PAGE_INFO)
     {
         if (a == -1 && pssData->curMonIndex == 0)
-            return INVALID_S8;
+            return -1;
         else if (a == 1 && pssData->curMonIndex >= pssData->maxMonIndex)
-            return INVALID_S8;
+            return -1;
         else
             return pssData->curMonIndex + a;
     }
@@ -1615,7 +1615,7 @@ static s8 sub_81C08F8(s8 a)
         {
             index += a;
             if (index < 0 || index > pssData->maxMonIndex)
-                return INVALID_S8;
+                return -1;
         } while (GetMonData(&mon[index], MON_DATA_IS_EGG) != 0);
         return index;
     }
@@ -1643,7 +1643,7 @@ static s8 sub_81C09B4(s8 a)
 
         r5 += a;
         if (r5 < 0 || r5 >= 6)
-            return INVALID_S8;
+            return -1;
         b = c[r5];
         if (sub_81C0A50(&mon[b]) == TRUE)
             return b;
@@ -2341,7 +2341,7 @@ static void sub_81C1DA4(u16 a, s16 b)
     else
     {
         u8 taskId = FindTaskIdByFunc(sub_81C1E20);
-        if (taskId == INVALID_U8)
+        if (taskId == 0xFF)
         {
             taskId = CreateTask(sub_81C1E20, 8);
         }
@@ -2392,7 +2392,7 @@ static void sub_81C1EFC(u16 a, s16 b, u16 move)
     else
     {
         u8 taskId = FindTaskIdByFunc(sub_81C1F80);
-        if (taskId == INVALID_U8)
+        if (taskId == 0xFF)
             taskId = CreateTask(sub_81C1F80, 8);
         gTasks[taskId].data[0] = b;
         gTasks[taskId].data[1] = a;
@@ -2580,12 +2580,12 @@ static void sub_81C240C(u16 move)
     {
         effectValue = gContestEffects[gContestMoves[move].effect].appeal;
 
-        if (effectValue != INVALID_U8)
+        if (effectValue != 0xFF)
             effectValue /= 10;
 
         for (i = 0; i < 8; i++)
         {
-            if (effectValue != INVALID_U8 && i < effectValue)
+            if (effectValue != 0xFF && i < effectValue)
             {
                 tilemap[(i / 4 * 32) + (i & 3) + 0x1E6] = 0x103A;
             }
@@ -2597,12 +2597,12 @@ static void sub_81C240C(u16 move)
 
         effectValue = gContestEffects[gContestMoves[move].effect].jam;
 
-        if (effectValue != INVALID_U8)
+        if (effectValue != 0xFF)
             effectValue /= 10;
 
         for (i = 0; i < 8; i++)
         {
-            if (effectValue != INVALID_U8 && i < effectValue)
+            if (effectValue != 0xFF && i < effectValue)
             {
                 tilemap[(i / 4 * 32) + (i & 3) + 0x226] = 0x103C;
             }
@@ -2634,7 +2634,7 @@ static void sub_81C2554(void)
     }
     for (i = 0; i < 8; i++)
     {
-        pssData->windowIds[i] = INVALID_U8;
+        pssData->windowIds[i] = 0xFF;
     }
 }
 
@@ -2661,7 +2661,7 @@ static void sub_81C2628(void)
     struct Pokemon *mon = &pssData->currentMon;
     struct PokeSummary *summary = &pssData->summary;
     u16 dexNum = SpeciesToPokedexNum(summary->species);
-    if (dexNum != INVALID_U16)
+    if (dexNum != 0xFFFF)
     {
         StringCopy(gStringVar1, &gText_UnkCtrlF908Clear01[0]);
         ConvertIntToDecimalStringN(gStringVar2, dexNum, 2, 3);
@@ -2895,7 +2895,7 @@ static void sub_81C2C38(u8 a)
 static u8 AddWindowFromTemplateList(const struct WindowTemplate *template, u8 templateId)
 {
     u8 *windowIdPtr = &(pssData->windowIds[templateId]);
-    if (*windowIdPtr == INVALID_U8)
+    if (*windowIdPtr == 0xFF)
     {
         *windowIdPtr = AddWindow(&template[templateId]);
         FillWindowPixelBuffer(*windowIdPtr, 0);
@@ -2906,11 +2906,11 @@ static u8 AddWindowFromTemplateList(const struct WindowTemplate *template, u8 te
 static void SummaryScreen_RemoveWindowByIndex(u8 windowIndex)
 {
     u8 *windowIdPtr = &(pssData->windowIds[windowIndex]);
-    if (*windowIdPtr != INVALID_U8)
+    if (*windowIdPtr != 0xFF)
     {
         ClearWindowTilemap(*windowIdPtr);
         RemoveWindow(*windowIdPtr);
-        *windowIdPtr = INVALID_U8;
+        *windowIdPtr = 0xFF;
     }
 }
 
@@ -2919,7 +2919,7 @@ static void sub_81C2D9C(u8 pageIndex)
     u16 i;
     for (i = 0; i < 8; i++)
     {
-        if (pssData->windowIds[i] != INVALID_U8)
+        if (pssData->windowIds[i] != 0xFF)
             FillWindowPixelBuffer(pssData->windowIds[i], 0);
     }
     gUnknown_0861CE54[pageIndex]();
@@ -3651,16 +3651,16 @@ static void sub_81C4190(void)
 
     for (i = 0; i < 28; i++)
     {
-        pssData->spriteIds[i] = INVALID_U8;
+        pssData->spriteIds[i] = 0xFF;
     }
 }
 
 static void DestroySpriteInArray(u8 spriteArrayId)
 {
-    if (pssData->spriteIds[spriteArrayId] != INVALID_U8)
+    if (pssData->spriteIds[spriteArrayId] != 0xFF)
     {
         DestroySprite(&gSprites[pssData->spriteIds[spriteArrayId]]);
-        pssData->spriteIds[spriteArrayId] = INVALID_U8;
+        pssData->spriteIds[spriteArrayId] = 0xFF;
     }
 }
 
@@ -3675,7 +3675,7 @@ static void sub_81C424C(void)
 
     for (i = 3; i < 28; i++)
     {
-        if (pssData->spriteIds[i] != INVALID_U8)
+        if (pssData->spriteIds[i] != 0xFF)
             sub_81C4204(i, TRUE);
     }
 }
@@ -3704,7 +3704,7 @@ static void sub_81C42C8(void)
 
     for (i = 3; i < 8; i++)
     {
-        if (pssData->spriteIds[i] == INVALID_U8)
+        if (pssData->spriteIds[i] == 0xFF)
             pssData->spriteIds[i] = CreateSprite(&sSpriteTemplate_MoveTypes, 0, 0, 2);
 
         sub_81C4204(i, TRUE);
@@ -3851,13 +3851,13 @@ static u8 sub_81C45F4(struct Pokemon *mon, s16 *a1)
                 }
             }
             (*a1)++;
-            return INVALID_S8;
+            return -1;
         case 1:
             pal = GetMonSpritePalStructFromOtIdPersonality(summary->species2, summary->OTID, summary->pid);
             LoadCompressedObjectPalette(pal);
             SetMultiuseSpriteTemplateToPokemon(pal->tag, 1);
             (*a1)++;
-            return INVALID_S8;
+            return -1;
     }
 }
 
@@ -3921,10 +3921,10 @@ void SummaryScreen_SetUnknownTaskId(u8 a0)
 
 void SummaryScreen_DestroyUnknownTask(void)
 {
-    if (sUnknownTaskId != INVALID_U8)
+    if (sUnknownTaskId != 0xFF)
     {
         DestroyTask(sUnknownTaskId);
-        sUnknownTaskId = INVALID_U8;
+        sUnknownTaskId = 0xFF;
     }
 }
 
@@ -3994,7 +3994,7 @@ static void CreateSetStatusSprite(void)
     u8 *spriteId = &pssData->spriteIds[2];
     u8 anim;
 
-    if (*spriteId == INVALID_U8)
+    if (*spriteId == 0xFF)
     {
         *spriteId = CreateSprite(&sSpriteTemplate_StatusCondition, 64, 152, 0);
     }

src/rayquaza_scene.c

@@ -89,13 +89,13 @@ static void sub_81D9868(struct Sprite *sprite, u8 animNum, s16 x, s16 y);
 // const rom data
 static const TaskFunc sTasksForAnimations[] =
 {
-    Task_DuoFightAnim, // RAY_ANIM_DUO_FIGHT_PRE
-    Task_DuoFightAnim, // RAY_ANIM_DUO_FIGHT
-    Task_RayTakesFlightAnim, // RAY_ANIM_TAKES_FLIGHT
-    Task_RayDescendsAnim, // RAY_ANIM_DESCENDS
-    Task_RayChargesAnim, // RAY_ANIM_CHARGES
-    Task_RayChasesAwayAnim, // RAY_ANIM_CHACES_AWAY
-    Task_EndAfterFadeScreen // RAY_ANIM_END
+    [RAY_ANIM_DUO_FIGHT_PRE] = Task_DuoFightAnim,
+    [RAY_ANIM_DUO_FIGHT] = Task_DuoFightAnim,
+    [RAY_ANIM_TAKES_FLIGHT] = Task_RayTakesFlightAnim,
+    [RAY_ANIM_DESCENDS] = Task_RayDescendsAnim,
+    [RAY_ANIM_CHARGES] = Task_RayChargesAnim,
+    [RAY_ANIM_CHACES_AWAY] = Task_RayChasesAwayAnim,
+    [RAY_ANIM_END] = Task_EndAfterFadeScreen,
 };
 
 static const struct OamData sOamData_862A6BC =

src/record_mixing.c

@@ -1763,7 +1763,7 @@ static void sub_80E8880(struct RankingHall1P *arg0, struct RankingHall1P *arg1)
     for (i = 0; i < 3; i++)
     {
         s32 highestWinStreak = 0;
-        s32 highestId = INVALID_S32;
+        s32 highestId = -1;
         for (j = 0; j < 6; j++)
         {
             if (arg1[j].winStreak > highestWinStreak)
@@ -1788,7 +1788,7 @@ static void sub_80E88CC(struct RankingHall2P *arg0, struct RankingHall2P *arg1)
     for (i = 0; i < 3; i++)
     {
         s32 highestWinStreak = 0;
-        s32 highestId = INVALID_S32;
+        s32 highestId = -1;
         for (j = 0; j < 6; j++)
         {
             if (arg1[j].winStreak > highestWinStreak)

src/recorded_battle.c

@@ -221,7 +221,7 @@ u8 RecordedBattle_GetBattlerAction(u8 battlerId)
         ResetPaletteFadeControl();
         BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
         SetMainCallback2(CB2_QuitRecordedBattle);
-        return INVALID_U8;
+        return 0xFF;
     }
     else
     {

src/reset_rtc_screen.c

@@ -160,7 +160,7 @@ static const union AnimCmd *const sSpriteAnimTable_85104E4[] =
 
 static const struct SpriteTemplate sSpriteTemplate_85104F0 =
 {
-    .tileTag = INVALID_U16,
+    .tileTag = 0xFFFF,
     .paletteTag = 0x1000,
     .oam = &sOamData_08510464,
     .anims = sSpriteAnimTable_85104E4,

src/rock.c

@@ -738,7 +738,7 @@ void sub_811131C(struct Sprite *sprite)
     if (TranslateAnimArc(sprite))
     {
         u8 taskId = FindTaskIdByFunc(sub_81110A4);
-        if (taskId != INVALID_U8)
+        if (taskId != 0xFF)
             gTasks[taskId].data[11]--;
 
         DestroySprite(sprite);

src/rom_8011DC0.c

@@ -961,7 +961,7 @@ u8 sub_80132D4(struct UnkStruct_Main0 *arg0)
         if (var == 1)
         {
             id = sub_80176E4(&data->field_0->arr[i], data->field_4->arr);
-            if (id != INVALID_U8)
+            if (id != 0xFF)
             {
                 data->field_0->arr[i].unk = data->field_4->arr[id].unk0;
                 data->field_0->arr[i].field_18 = var;
@@ -1382,7 +1382,7 @@ void sub_8013C7C(u8 taskId)
     case 3:
         if (sub_8013E44() == 1)
             PlaySE(SE_PC_LOGIN);
-        if (gTasks[taskId].data[15] == INVALID_U8)
+        if (gTasks[taskId].data[15] == 0xFF)
             data->state = 10;
         break;
     case 10:
@@ -1401,14 +1401,14 @@ void sub_8013C7C(u8 taskId)
 
 bool32 sub_8013D88(u32 arg0, u32 id)
 {
-    if (id == INVALID_U8)
+    if (id == 0xFF)
         return TRUE;
 
     if (id <= ARRAY_COUNT(gUnknown_082F04D8)) // UB: <= may access data outside the array
     {
         const u8 *bytes = gUnknown_082F04D8[id];
 
-        while ((*(bytes) != INVALID_U8))
+        while ((*(bytes) != 0xFF))
         {
             if ((*bytes) == arg0)
                 return TRUE;
@@ -1454,7 +1454,7 @@ u8 sub_8013E44(void)
         if (data->field_0->arr[i].field_1A_0 != 0)
         {
             id = sub_80176E4(&data->field_0->arr[i], data->field_4->arr);
-            if (id != INVALID_U8)
+            if (id != 0xFF)
             {
                 if (data->field_0->arr[i].field_1A_0 == 1)
                 {
@@ -1500,7 +1500,7 @@ u8 sub_8013E44(void)
 
     for (id = 0; id < 4; id++)
     {
-        if (sub_8017734(data->field_0->arr, &data->field_4->arr[id].unk0, 16) != INVALID_U8)
+        if (sub_8017734(data->field_0->arr, &data->field_4->arr[id].unk0, 16) != 0xFF)
             ret = 1;
     }
 
@@ -2178,7 +2178,7 @@ void sub_8014F48(u8 taskId)
             break;
         case 0:
             id = ListMenuHandleInputGetItemId(data->listTaskId);
-            if (gMain.newKeys & A_BUTTON && id != INVALID_S32)
+            if (gMain.newKeys & A_BUTTON && id != -1)
             {
                 // this unused variable along with the assignment is needed to match
                 u32 unusedVar;
@@ -2732,7 +2732,7 @@ void sub_80156E0(u8 taskId)
         break;
     case 6:
         var5 = sub_8017178(&data->textState, &data->field_1B, &data->field_1C, &gUnknown_082F021C, &gUnknown_082F0244);
-        if (var5 != INVALID_S32)
+        if (var5 != -1)
         {
             if (gReceivedRemoteLinkPlayers == 0)
             {

src/rom_8034C54.c

@@ -255,7 +255,7 @@ static void sub_8035164(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2)
     u32 r5 = arg0->field_14;
     gUnknown_03000DD4 = arg0->firstOamId;
     gUnknown_03000DD8 = 0;
-    gUnknown_03000DDC = INVALID_S32;
+    gUnknown_03000DDC = -1;
 
     while (r5 != 0)
     {
@@ -263,12 +263,12 @@ static void sub_8035164(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2)
         arg1 -= (r4 * r5);
         r5 /= 10;
 
-        if (r4 != 0 || gUnknown_03000DDC != INVALID_S32 || r5 == 0)
+        if (r4 != 0 || gUnknown_03000DDC != -1 || r5 == 0)
         {
             gMain.oamBuffer[gUnknown_03000DD4].tileNum = (r4 * arg0->field_9) + arg0->tileStart;
             gMain.oamBuffer[gUnknown_03000DD4].affineMode = 0;
 
-            if (gUnknown_03000DDC == INVALID_S32)
+            if (gUnknown_03000DDC == -1)
                 gUnknown_03000DDC = gUnknown_03000DD8;
         }
         else