Merge pull request #429 from nullableVoidPtr/master

Various fixes and cleanups

include/alloc.h

@@ -1,5 +1,5 @@
-#ifndef GUARD_MALLOC_H
+#ifndef GUARD_ALLOC_H
-#define GUARD_MALLOC_H
+#define GUARD_ALLOC_H
 
 #define HEAP_SIZE 0x1C000
 #define malloc Alloc
@@ -19,4 +19,4 @@ void *AllocZeroed(u32 size);
 void Free(void *pointer);
 void InitHeap(void *pointer, u32 size);
 
-#endif // GUARD_MALLOC_H
+#endif // GUARD_ALLOC_H

ld_script.txt

@@ -43,7 +43,7 @@ SECTIONS {
     {
         asm/crt0.o(.text);
         src/main.o(.text);
-        src/malloc.o(.text);
+        src/alloc.o(.text);
         src/dma3_manager.o(.text);
         src/gpu_regs.o(.text);
         src/bg.o(.text);

src/alloc.c

@@ -0,0 +1,210 @@
+#include "global.h"
+
+static void *sHeapStart;
+static u32 sHeapSize;
+static u32 malloc_c_unused_0300000c; // needed to align dma3_manager.o(.bss)
+
+#define MALLOC_SYSTEM_ID 0xA3A3
+
+struct MemBlock {
+    // Whether this block is currently allocated.
+    bool16 flag;
+
+    // Magic number used for error checking. Should equal MALLOC_SYSTEM_ID.
+    u16 magic;
+
+    // Size of the block (not including this header struct).
+    u32 size;
+
+    // Previous block pointer. Equals sHeapStart if this is the first block.
+    struct MemBlock *prev;
+
+    // Next block pointer. Equals sHeapStart if this is the last block.
+    struct MemBlock *next;
+
+    // Data in the memory block. (Arrays of length 0 are a GNU extension.)
+    u8 data[0];
+};
+
+void PutMemBlockHeader(void *block, struct MemBlock *prev, struct MemBlock *next, u32 size)
+{
+    struct MemBlock *header = (struct MemBlock *)block;
+
+    header->flag = FALSE;
+    header->magic = MALLOC_SYSTEM_ID;
+    header->size = size;
+    header->prev = prev;
+    header->next = next;
+}
+
+void PutFirstMemBlockHeader(void *block, u32 size)
+{
+    PutMemBlockHeader(block, (struct MemBlock *)block, (struct MemBlock *)block, size - sizeof(struct MemBlock));
+}
+
+void *AllocInternal(void *heapStart, u32 size)
+{
+    struct MemBlock *pos = (struct MemBlock *)heapStart;
+    struct MemBlock *head = pos;
+    struct MemBlock *splitBlock;
+    u32 foundBlockSize;
+
+    // Alignment
+    if (size & 3)
+        size = 4 * ((size / 4) + 1);
+
+    for (;;) {
+        // Loop through the blocks looking for unused block that's big enough.
+
+        if (!pos->flag) {
+            foundBlockSize = pos->size;
+
+            if (foundBlockSize >= size) {
+                if (foundBlockSize - size < 2 * sizeof(struct MemBlock)) {
+                    // The block isn't much bigger than the requested size,
+                    // so just use it.
+                    pos->flag = TRUE;
+                } else {
+                    // The block is significantly bigger than the requested
+                    // size, so split the rest into a separate block.
+                    foundBlockSize -= sizeof(struct MemBlock);
+                    foundBlockSize -= size;
+
+                    splitBlock = (struct MemBlock *)(pos->data + size);
+
+                    pos->flag = TRUE;
+                    pos->size = size;
+
+                    PutMemBlockHeader(splitBlock, pos, pos->next, foundBlockSize);
+
+                    pos->next = splitBlock;
+
+                    if (splitBlock->next != head)
+                        splitBlock->next->prev = splitBlock;
+                }
+
+                return pos->data;
+            }
+        }
+
+        if (pos->next == head)
+            return NULL;
+
+        pos = pos->next;
+    }
+}
+
+void FreeInternal(void *heapStart, void *pointer)
+{
+    if (pointer) {
+        struct MemBlock *head = (struct MemBlock *)heapStart;
+        struct MemBlock *block = (struct MemBlock *)((u8 *)pointer - sizeof(struct MemBlock));
+        block->flag = FALSE;
+
+        // If the freed block isn't the last one, merge with the next block
+        // if it's not in use.
+        if (block->next != head) {
+            if (!block->next->flag) {
+                block->size += sizeof(struct MemBlock) + block->next->size;
+                block->next->magic = 0;
+                block->next = block->next->next;
+                if (block->next != head)
+                    block->next->prev = block;
+            }
+        }
+
+        // If the freed block isn't the first one, merge with the previous block
+        // if it's not in use.
+        if (block != head) {
+            if (!block->prev->flag) {
+                block->prev->next = block->next;
+
+                if (block->next != head)
+                    block->next->prev = block->prev;
+
+                block->magic = 0;
+                block->prev->size += sizeof(struct MemBlock) + block->size;
+            }
+        }
+    }
+}
+
+void *AllocZeroedInternal(void *heapStart, u32 size)
+{
+    void *mem = AllocInternal(heapStart, size);
+
+    if (mem != NULL) {
+        if (size & 3)
+            size = 4 * ((size / 4) + 1);
+
+        CpuFill32(0, mem, size);
+    }
+
+    return mem;
+}
+
+bool32 CheckMemBlockInternal(void *heapStart, void *pointer)
+{
+    struct MemBlock *head = (struct MemBlock *)heapStart;
+    struct MemBlock *block = (struct MemBlock *)((u8 *)pointer - sizeof(struct MemBlock));
+
+    if (block->magic != MALLOC_SYSTEM_ID)
+        return FALSE;
+
+    if (block->next->magic != MALLOC_SYSTEM_ID)
+        return FALSE;
+
+    if (block->next != head && block->next->prev != block)
+        return FALSE;
+
+    if (block->prev->magic != MALLOC_SYSTEM_ID)
+        return FALSE;
+
+    if (block->prev != head && block->prev->next != block)
+        return FALSE;
+
+    if (block->next != head && block->next != (struct MemBlock *)(block->data + block->size))
+        return FALSE;
+
+    return TRUE;
+}
+
+void InitHeap(void *heapStart, u32 heapSize)
+{
+    sHeapStart = heapStart;
+    sHeapSize = heapSize;
+    PutFirstMemBlockHeader(heapStart, heapSize);
+}
+
+void *Alloc(u32 size)
+{
+    AllocInternal(sHeapStart, size);
+}
+
+void *AllocZeroed(u32 size)
+{
+    AllocZeroedInternal(sHeapStart, size);
+}
+
+void Free(void *pointer)
+{
+    FreeInternal(sHeapStart, pointer);
+}
+
+bool32 CheckMemBlock(void *pointer)
+{
+    return CheckMemBlockInternal(sHeapStart, pointer);
+}
+
+bool32 CheckHeap()
+{
+    struct MemBlock *pos = (struct MemBlock *)sHeapStart;
+
+    do {
+        if (!CheckMemBlockInternal(sHeapStart, pos->data))
+            return FALSE;
+        pos = pos->next;
+    } while (pos != (struct MemBlock *)sHeapStart);
+
+    return TRUE;
+}

src/apprentice.c

@@ -9,7 +9,7 @@
 #include "item.h"
 #include "item_menu.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "menu.h"
 #include "new_game.h"
 #include "party_menu.h"

src/battle_ai_script_commands.c

@@ -463,7 +463,7 @@ static u8 ChooseMoveOrAction_Doubles(void)
     {
         if (i == sBattler_AI || gBattleMons[i].hp == 0)
         {
-            actionOrMoveIndex[i] = -1;
+            actionOrMoveIndex[i] = 0xFF;
             bestMovePointsForTarget[i] = -1;
         }
         else

src/battle_anim_80A5C6C.c

@@ -7,7 +7,7 @@
 #include "decompress.h"
 #include "dma3.h"
 #include "gpu_regs.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "palette.h"
 #include "pokemon_icon.h"
 #include "sprite.h"

src/battle_anim_utility_funcs.c

@@ -3,7 +3,7 @@
 #include "contest.h"
 #include "gpu_regs.h"
 #include "graphics.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "palette.h"
 #include "sound.h"
 #include "sprite.h"

src/battle_dome.c

@@ -8,7 +8,7 @@
 #include "event_data.h"
 #include "overworld.h"
 #include "util.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "string_util.h"
 #include "random.h"
 #include "task.h"

src/battle_factory_screen.c

@@ -10,7 +10,7 @@
 #include "palette.h"
 #include "task.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "bg.h"
 #include "gpu_regs.h"
 #include "string_util.h"

src/battle_gfx_sfx_util.c

@@ -6,7 +6,7 @@
 #include "constants/battle_anim.h"
 #include "battle_interface.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "graphics.h"
 #include "random.h"
 #include "util.h"

src/battle_interface.c

@@ -543,11 +543,11 @@ enum
 
 static const u16 sStatusIconColors[] =
 {
-    RGB(24, 12, 24), // PAL_STATUS_PSN
+    [PAL_STATUS_PSN] = RGB(24, 12, 24),
-    RGB(23, 23, 3), // PAL_STATUS_PAR
+    [PAL_STATUS_PAR] = RGB(23, 23, 3),
-    RGB(20, 20, 17), // PAL_STATUS_SLP
+    [PAL_STATUS_SLP] = RGB(20, 20, 17),
-    RGB(17, 22, 28), // PAL_STATUS_FRZ
+    [PAL_STATUS_FRZ] = RGB(17, 22, 28),
-    RGB(28, 14, 10) // PAL_STATUS_BRN
+    [PAL_STATUS_BRN] = RGB(28, 14, 10),
 };
 
 static const struct WindowTemplate sHealthboxWindowTemplate = {0, 0, 0, 8, 2, 0, 0}; // width = 8, height = 2

src/battle_main.c

@@ -23,7 +23,7 @@
 #include "link_rfu.h"
 #include "load_save.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "m4a.h"
 #include "palette.h"
 #include "party_menu.h"
@@ -507,35 +507,35 @@ const struct TrainerMoney gTrainerMoneyTable[] =
 
 static void (* const sTurnActionsFuncsTable[])(void) =
 {
-    HandleAction_UseMove,               // B_ACTION_USE_MOVE
+    [B_ACTION_USE_MOVE] = HandleAction_UseMove,
-    HandleAction_UseItem,               // B_ACTION_USE_ITEM
+    [B_ACTION_USE_ITEM] = HandleAction_UseItem,
-    HandleAction_Switch,                // B_ACTION_SWITCH
+    [B_ACTION_SWITCH] = HandleAction_Switch,
-    HandleAction_Run,                   // B_ACTION_RUN
+    [B_ACTION_RUN] = HandleAction_Run,
-    HandleAction_WatchesCarefully,      // B_ACTION_SAFARI_WATCH_CAREFULLY
+    [B_ACTION_SAFARI_WATCH_CAREFULLY] = HandleAction_WatchesCarefully,
-    HandleAction_SafariZoneBallThrow,   // B_ACTION_SAFARI_BALL
+    [B_ACTION_SAFARI_BALL] = HandleAction_SafariZoneBallThrow,
-    HandleAction_ThrowPokeblock,        // B_ACTION_SAFARI_POKEBLOCK
+    [B_ACTION_SAFARI_POKEBLOCK] = HandleAction_ThrowPokeblock,
-    HandleAction_GoNear,                // B_ACTION_SAFARI_GO_NEAR
+    [B_ACTION_SAFARI_GO_NEAR] = HandleAction_GoNear,
-    HandleAction_SafariZoneRun,         // B_ACTION_SAFARI_RUN
+    [B_ACTION_SAFARI_RUN] = HandleAction_SafariZoneRun,
-    HandleAction_WallyBallThrow,        // B_ACTION_WALLY_THROW
+    [B_ACTION_WALLY_THROW] = HandleAction_WallyBallThrow,
-    HandleAction_RunBattleScript,       // B_ACTION_EXEC_SCRIPT
+    [B_ACTION_EXEC_SCRIPT] = HandleAction_RunBattleScript,
-    HandleAction_Action11,              // not sure about this one
+    [11] = HandleAction_Action11, // not sure about this one
-    HandleAction_ActionFinished,        // B_ACTION_FINISHED
+    [B_ACTION_FINISHED] = HandleAction_ActionFinished,
-    HandleAction_NothingIsFainted,      // B_ACTION_NOTHING_FAINTED
+    [B_ACTION_NOTHING_FAINTED] = HandleAction_NothingIsFainted,
 };
 
 static void (* const sEndTurnFuncsTable[])(void) =
 {
-    HandleEndTurn_ContinueBattle,       // battle outcome 0
+    [0] = HandleEndTurn_ContinueBattle, //B_OUTCOME_NONE?
-    HandleEndTurn_BattleWon,            // B_OUTCOME_WON
+    [B_OUTCOME_WON] = HandleEndTurn_BattleWon,
-    HandleEndTurn_BattleLost,           // B_OUTCOME_LOST
+    [B_OUTCOME_LOST] = HandleEndTurn_BattleLost,
-    HandleEndTurn_BattleLost,           // B_OUTCOME_DREW
+    [B_OUTCOME_DREW] = HandleEndTurn_BattleLost,
-    HandleEndTurn_RanFromBattle,        // B_OUTCOME_RAN
+    [B_OUTCOME_RAN] = HandleEndTurn_RanFromBattle,
-    HandleEndTurn_FinishBattle,         // B_OUTCOME_PLAYER_TELEPORTED
+    [B_OUTCOME_PLAYER_TELEPORTED] = HandleEndTurn_FinishBattle,
-    HandleEndTurn_MonFled,              // B_OUTCOME_MON_FLED
+    [B_OUTCOME_MON_FLED] = HandleEndTurn_MonFled,
-    HandleEndTurn_FinishBattle,         // B_OUTCOME_CAUGHT
+    [B_OUTCOME_CAUGHT] = HandleEndTurn_FinishBattle,
-    HandleEndTurn_FinishBattle,         // B_OUTCOME_NO_SAFARI_BALLS
+    [B_OUTCOME_NO_SAFARI_BALLS] = HandleEndTurn_FinishBattle,
-    HandleEndTurn_FinishBattle,         // B_OUTCOME_FORFEITED
+    [B_OUTCOME_FORFEITED] = HandleEndTurn_FinishBattle,
-    HandleEndTurn_FinishBattle,         // B_OUTCOME_MON_TELEPORTED
+    [B_OUTCOME_MON_TELEPORTED] = HandleEndTurn_FinishBattle,
 };
 
 const u8 gStatusConditionString_PoisonJpn[8] = _("どく$$$$$");
@@ -5594,7 +5594,7 @@ bool8 TryRunFromBattle(u8 battler)
 
     if (holdEffect == HOLD_EFFECT_CAN_ALWAYS_RUN)
     {
-        gLastUsedItem = gBattleMons[battler].item ;
+        gLastUsedItem = gBattleMons[battler].item;
         gProtectStructs[battler].fleeFlag = 1;
         effect++;
     }

src/battle_message.c

@@ -521,375 +521,375 @@ static const u8 sText_Trainer2LoseText[];
 
 const u8 * const gBattleStringsTable[BATTLESTRINGS_COUNT] =
 {
-    sText_Trainer1LoseText, // 12
+    [STRINGID_TRAINER1LOSETEXT - 12] = sText_Trainer1LoseText,
-    sText_PkmnGainedEXP, // 13
+    [STRINGID_PKMNGAINEDEXP - 12] = sText_PkmnGainedEXP,
-    sText_PkmnGrewToLv, // 14
+    [STRINGID_PKMNGREWTOLV - 12] = sText_PkmnGrewToLv,
-    sText_PkmnLearnedMove, // 15
+    [STRINGID_PKMNLEARNEDMOVE - 12] = sText_PkmnLearnedMove,
-    sText_TryToLearnMove1, // 16
+    [STRINGID_TRYTOLEARNMOVE1 - 12] = sText_TryToLearnMove1,
-    sText_TryToLearnMove2, // 17
+    [STRINGID_TRYTOLEARNMOVE2 - 12] = sText_TryToLearnMove2,
-    sText_TryToLearnMove3, // 18
+    [STRINGID_TRYTOLEARNMOVE3 - 12] = sText_TryToLearnMove3,
-    sText_PkmnForgotMove, // 19
+    [STRINGID_PKMNFORGOTMOVE - 12] = sText_PkmnForgotMove,
-    sText_StopLearningMove, // 20
+    [STRINGID_STOPLEARNINGMOVE - 12] = sText_StopLearningMove,
-    sText_DidNotLearnMove, // 21
+    [STRINGID_DIDNOTLEARNMOVE - 12] = sText_DidNotLearnMove,
-    sText_PkmnLearnedMove2, // 22
+    [STRINGID_PKMNLEARNEDMOVE2 - 12] = sText_PkmnLearnedMove2,
-    sText_AttackMissed, // 23
+    [STRINGID_ATTACKMISSED - 12] = sText_AttackMissed,
-    sText_PkmnProtectedItself, // 24
+    [STRINGID_PKMNPROTECTEDITSELF - 12] = sText_PkmnProtectedItself,
-    sText_StatsWontIncrease2, // 25
+    [STRINGID_STATSWONTINCREASE2 - 12] = sText_StatsWontIncrease2,
-    sText_AvoidedDamage, // 26
+    [STRINGID_AVOIDEDDAMAGE - 12] = sText_AvoidedDamage,
-    sText_ItDoesntAffect, // 27
+    [STRINGID_ITDOESNTAFFECT - 12] = sText_ItDoesntAffect,
-    sText_AttackerFainted, // 28
+    [STRINGID_ATTACKERFAINTED - 12] = sText_AttackerFainted,
-    sText_TargetFainted, // 29
+    [STRINGID_TARGETFAINTED - 12] = sText_TargetFainted,
-    sText_PlayerGotMoney, // 30
+    [STRINGID_PLAYERGOTMONEY - 12] = sText_PlayerGotMoney,
-    sText_PlayerWhiteout, // 31
+    [STRINGID_PLAYERWHITEOUT - 12] = sText_PlayerWhiteout,
-    sText_PlayerWhiteout2, // 32
+    [STRINGID_PLAYERWHITEOUT2 - 12] = sText_PlayerWhiteout2,
-    sText_PreventsEscape, // 33
+    [STRINGID_PREVENTSESCAPE - 12] = sText_PreventsEscape,
-    sText_HitXTimes, // 34
+    [STRINGID_HITXTIMES - 12] = sText_HitXTimes,
-    sText_PkmnFellAsleep, // 35
+    [STRINGID_PKMNFELLASLEEP - 12] = sText_PkmnFellAsleep,
-    sText_PkmnMadeSleep, // 36
+    [STRINGID_PKMNMADESLEEP - 12] = sText_PkmnMadeSleep,
-    sText_PkmnAlreadyAsleep, // 37
+    [STRINGID_PKMNALREADYASLEEP - 12] = sText_PkmnAlreadyAsleep,
-    sText_PkmnAlreadyAsleep2, // 38
+    [STRINGID_PKMNALREADYASLEEP2 - 12] = sText_PkmnAlreadyAsleep2,
-    sText_PkmnWasntAffected, // 39
+    [STRINGID_PKMNWASNTAFFECTED - 12] = sText_PkmnWasntAffected,
-    sText_PkmnWasPoisoned, // 40
+    [STRINGID_PKMNWASPOISONED - 12] = sText_PkmnWasPoisoned,
-    sText_PkmnPoisonedBy, // 41
+    [STRINGID_PKMNPOISONEDBY - 12] = sText_PkmnPoisonedBy,
-    sText_PkmnHurtByPoison, // 42
+    [STRINGID_PKMNHURTBYPOISON - 12] = sText_PkmnHurtByPoison,
-    sText_PkmnAlreadyPoisoned, // 43
+    [STRINGID_PKMNALREADYPOISONED - 12] = sText_PkmnAlreadyPoisoned,
-    sText_PkmnBadlyPoisoned, // 44
+    [STRINGID_PKMNBADLYPOISONED - 12] = sText_PkmnBadlyPoisoned,
-    sText_PkmnEnergyDrained, // 45
+    [STRINGID_PKMNENERGYDRAINED - 12] = sText_PkmnEnergyDrained,
-    sText_PkmnWasBurned, // 46
+    [STRINGID_PKMNWASBURNED - 12] = sText_PkmnWasBurned,
-    sText_PkmnBurnedBy, // 47
+    [STRINGID_PKMNBURNEDBY - 12] = sText_PkmnBurnedBy,
-    sText_PkmnHurtByBurn, // 48
+    [STRINGID_PKMNHURTBYBURN - 12] = sText_PkmnHurtByBurn,
-    sText_PkmnWasFrozen, // 49
+    [STRINGID_PKMNWASFROZEN - 12] = sText_PkmnWasFrozen,
-    sText_PkmnFrozenBy, // 50
+    [STRINGID_PKMNFROZENBY - 12] = sText_PkmnFrozenBy,
-    sText_PkmnIsFrozen, // 51
+    [STRINGID_PKMNISFROZEN - 12] = sText_PkmnIsFrozen,
-    sText_PkmnWasDefrosted, // 52
+    [STRINGID_PKMNWASDEFROSTED - 12] = sText_PkmnWasDefrosted,
-    sText_PkmnWasDefrosted2, // 53
+    [STRINGID_PKMNWASDEFROSTED2 - 12] = sText_PkmnWasDefrosted2,
-    sText_PkmnWasDefrostedBy, // 54
+    [STRINGID_PKMNWASDEFROSTEDBY - 12] = sText_PkmnWasDefrostedBy,
-    sText_PkmnWasParalyzed, // 55
+    [STRINGID_PKMNWASPARALYZED - 12] = sText_PkmnWasParalyzed,
-    sText_PkmnWasParalyzedBy, // 56
+    [STRINGID_PKMNWASPARALYZEDBY - 12] = sText_PkmnWasParalyzedBy,
-    sText_PkmnIsParalyzed, // 57
+    [STRINGID_PKMNISPARALYZED - 12] = sText_PkmnIsParalyzed,
-    sText_PkmnIsAlreadyParalyzed, // 58
+    [STRINGID_PKMNISALREADYPARALYZED - 12] = sText_PkmnIsAlreadyParalyzed,
-    sText_PkmnHealedParalysis, // 59
+    [STRINGID_PKMNHEALEDPARALYSIS - 12] = sText_PkmnHealedParalysis,
-    sText_PkmnDreamEaten, // 60
+    [STRINGID_PKMNDREAMEATEN - 12] = sText_PkmnDreamEaten,
-    sText_StatsWontIncrease, // 61
+    [STRINGID_STATSWONTINCREASE - 12] = sText_StatsWontIncrease,
-    sText_StatsWontDecrease, // 62
+    [STRINGID_STATSWONTDECREASE - 12] = sText_StatsWontDecrease,
-    sText_TeamStoppedWorking, // 63
+    [STRINGID_TEAMSTOPPEDWORKING - 12] = sText_TeamStoppedWorking,
-    sText_FoeStoppedWorking, // 64
+    [STRINGID_FOESTOPPEDWORKING - 12] = sText_FoeStoppedWorking,
-    sText_PkmnIsConfused, // 65
+    [STRINGID_PKMNISCONFUSED - 12] = sText_PkmnIsConfused,
-    sText_PkmnHealedConfusion, // 66
+    [STRINGID_PKMNHEALEDCONFUSION - 12] = sText_PkmnHealedConfusion,
-    sText_PkmnWasConfused, // 67
+    [STRINGID_PKMNWASCONFUSED - 12] = sText_PkmnWasConfused,
-    sText_PkmnAlreadyConfused, // 68
+    [STRINGID_PKMNALREADYCONFUSED - 12] = sText_PkmnAlreadyConfused,
-    sText_PkmnFellInLove, // 69
+    [STRINGID_PKMNFELLINLOVE - 12] = sText_PkmnFellInLove,
-    sText_PkmnInLove, // 70
+    [STRINGID_PKMNINLOVE - 12] = sText_PkmnInLove,
-    sText_PkmnImmobilizedByLove, // 71
+    [STRINGID_PKMNIMMOBILIZEDBYLOVE - 12] = sText_PkmnImmobilizedByLove,
-    sText_PkmnBlownAway, // 72
+    [STRINGID_PKMNBLOWNAWAY - 12] = sText_PkmnBlownAway,
-    sText_PkmnChangedType, // 73
+    [STRINGID_PKMNCHANGEDTYPE - 12] = sText_PkmnChangedType,
-    sText_PkmnFlinched, // 74
+    [STRINGID_PKMNFLINCHED - 12] = sText_PkmnFlinched,
-    sText_PkmnRegainedHealth, // 75
+    [STRINGID_PKMNREGAINEDHEALTH - 12] = sText_PkmnRegainedHealth,
-    sText_PkmnHPFull, // 76
+    [STRINGID_PKMNHPFULL - 12] = sText_PkmnHPFull,
-    sText_PkmnRaisedSpDef, // 77
+    [STRINGID_PKMNRAISEDSPDEF - 12] = sText_PkmnRaisedSpDef,
-    sText_PkmnRaisedDef, // 78
+    [STRINGID_PKMNRAISEDDEF - 12] = sText_PkmnRaisedDef,
-    sText_PkmnCoveredByVeil, // 79
+    [STRINGID_PKMNCOVEREDBYVEIL - 12] = sText_PkmnCoveredByVeil,
-    sText_PkmnUsedSafeguard, // 80
+    [STRINGID_PKMNUSEDSAFEGUARD - 12] = sText_PkmnUsedSafeguard,
-    sText_PkmnSafeguardExpired, // 81
+    [STRINGID_PKMNSAFEGUARDEXPIRED - 12] = sText_PkmnSafeguardExpired,
-    sText_PkmnWentToSleep, // 82
+    [STRINGID_PKMNWENTTOSLEEP - 12] = sText_PkmnWentToSleep,
-    sText_PkmnSleptHealthy, // 83
+    [STRINGID_PKMNSLEPTHEALTHY - 12] = sText_PkmnSleptHealthy,
-    sText_PkmnWhippedWhirlwind, // 84
+    [STRINGID_PKMNWHIPPEDWHIRLWIND - 12] = sText_PkmnWhippedWhirlwind,
-    sText_PkmnTookSunlight, // 85
+    [STRINGID_PKMNTOOKSUNLIGHT - 12] = sText_PkmnTookSunlight,
-    sText_PkmnLoweredHead, // 86
+    [STRINGID_PKMNLOWEREDHEAD - 12] = sText_PkmnLoweredHead,
-    sText_PkmnIsGlowing, // 87
+    [STRINGID_PKMNISGLOWING - 12] = sText_PkmnIsGlowing,
-    sText_PkmnFlewHigh, // 88
+    [STRINGID_PKMNFLEWHIGH - 12] = sText_PkmnFlewHigh,
-    sText_PkmnDugHole, // 89
+    [STRINGID_PKMNDUGHOLE - 12] = sText_PkmnDugHole,
-    sText_PkmnSqueezedByBind, // 90
+    [STRINGID_PKMNSQUEEZEDBYBIND - 12] = sText_PkmnSqueezedByBind,
-    sText_PkmnTrappedInVortex, // 91
+    [STRINGID_PKMNTRAPPEDINVORTEX - 12] = sText_PkmnTrappedInVortex,
-    sText_PkmnWrappedBy, // 92
+    [STRINGID_PKMNWRAPPEDBY - 12] = sText_PkmnWrappedBy,
-    sText_PkmnClamped, // 93
+    [STRINGID_PKMNCLAMPED - 12] = sText_PkmnClamped,
-    sText_PkmnHurtBy, // 94
+    [STRINGID_PKMNHURTBY - 12] = sText_PkmnHurtBy,
-    sText_PkmnFreedFrom, // 95
+    [STRINGID_PKMNFREEDFROM - 12] = sText_PkmnFreedFrom,
-    sText_PkmnCrashed, // 96
+    [STRINGID_PKMNCRASHED - 12] = sText_PkmnCrashed,
-    gText_PkmnShroudedInMist, // 97
+    [STRINGID_PKMNSHROUDEDINMIST - 12] = gText_PkmnShroudedInMist,
-    sText_PkmnProtectedByMist, // 98
+    [STRINGID_PKMNPROTECTEDBYMIST - 12] = sText_PkmnProtectedByMist,
-    gText_PkmnGettingPumped, // 99
+    [STRINGID_PKMNGETTINGPUMPED - 12] = gText_PkmnGettingPumped,
-    sText_PkmnHitWithRecoil, // 100
+    [STRINGID_PKMNHITWITHRECOIL - 12] = sText_PkmnHitWithRecoil,
-    sText_PkmnProtectedItself2, // 101
+    [STRINGID_PKMNPROTECTEDITSELF2 - 12] = sText_PkmnProtectedItself2,
-    sText_PkmnBuffetedBySandstorm, // 102
+    [STRINGID_PKMNBUFFETEDBYSANDSTORM - 12] = sText_PkmnBuffetedBySandstorm,
-    sText_PkmnPeltedByHail, // 103
+    [STRINGID_PKMNPELTEDBYHAIL - 12] = sText_PkmnPeltedByHail,
-    sText_PkmnSeeded, // 104
+    [STRINGID_PKMNSEEDED - 12] = sText_PkmnSeeded,
-    sText_PkmnEvadedAttack, // 105
+    [STRINGID_PKMNEVADEDATTACK - 12] = sText_PkmnEvadedAttack,
-    sText_PkmnSappedByLeechSeed, // 106
+    [STRINGID_PKMNSAPPEDBYLEECHSEED - 12] = sText_PkmnSappedByLeechSeed,
-    sText_PkmnFastAsleep, // 107
+    [STRINGID_PKMNFASTASLEEP - 12] = sText_PkmnFastAsleep,
-    sText_PkmnWokeUp, // 108
+    [STRINGID_PKMNWOKEUP - 12] = sText_PkmnWokeUp,
-    sText_PkmnUproarKeptAwake, // 109
+    [STRINGID_PKMNUPROARKEPTAWAKE - 12] = sText_PkmnUproarKeptAwake,
-    sText_PkmnWokeUpInUproar, // 110
+    [STRINGID_PKMNWOKEUPINUPROAR - 12] = sText_PkmnWokeUpInUproar,
-    sText_PkmnCausedUproar, // 111
+    [STRINGID_PKMNCAUSEDUPROAR - 12] = sText_PkmnCausedUproar,
-    sText_PkmnMakingUproar, // 112
+    [STRINGID_PKMNMAKINGUPROAR - 12] = sText_PkmnMakingUproar,
-    sText_PkmnCalmedDown, // 113
+    [STRINGID_PKMNCALMEDDOWN - 12] = sText_PkmnCalmedDown,
-    sText_PkmnCantSleepInUproar, // 114
+    [STRINGID_PKMNCANTSLEEPINUPROAR - 12] = sText_PkmnCantSleepInUproar,
-    sText_PkmnStockpiled, // 115
+    [STRINGID_PKMNSTOCKPILED - 12] = sText_PkmnStockpiled,
-    sText_PkmnCantStockpile, // 116
+    [STRINGID_PKMNCANTSTOCKPILE - 12] = sText_PkmnCantStockpile,
-    sText_PkmnCantSleepInUproar2, // 117
+    [STRINGID_PKMNCANTSLEEPINUPROAR2 - 12] = sText_PkmnCantSleepInUproar2,
-    sText_UproarKeptPkmnAwake, // 118
+    [STRINGID_UPROARKEPTPKMNAWAKE - 12] = sText_UproarKeptPkmnAwake,
-    sText_PkmnStayedAwakeUsing, // 119
+    [STRINGID_PKMNSTAYEDAWAKEUSING - 12] = sText_PkmnStayedAwakeUsing,
-    sText_PkmnStoringEnergy, // 120
+    [STRINGID_PKMNSTORINGENERGY - 12] = sText_PkmnStoringEnergy,
-    sText_PkmnUnleashedEnergy, // 121
+    [STRINGID_PKMNUNLEASHEDENERGY - 12] = sText_PkmnUnleashedEnergy,
-    sText_PkmnFatigueConfusion, // 122
+    [STRINGID_PKMNFATIGUECONFUSION - 12] = sText_PkmnFatigueConfusion,
-    sText_PkmnPickedUpItem, // 123
+    [STRINGID_PKMNPICKEDUPITEM - 12] = sText_PkmnPickedUpItem,
-    sText_PkmnUnaffected, // 124
+    [STRINGID_PKMNUNAFFECTED - 12] = sText_PkmnUnaffected,
-    sText_PkmnTransformedInto, // 125
+    [STRINGID_PKMNTRANSFORMEDINTO - 12] = sText_PkmnTransformedInto,
-    sText_PkmnMadeSubstitute, // 126
+    [STRINGID_PKMNMADESUBSTITUTE - 12] = sText_PkmnMadeSubstitute,
-    sText_PkmnHasSubstitute, // 127
+    [STRINGID_PKMNHASSUBSTITUTE - 12] = sText_PkmnHasSubstitute,
-    sText_SubstituteDamaged, // 128
+    [STRINGID_SUBSTITUTEDAMAGED - 12] = sText_SubstituteDamaged,
-    sText_PkmnSubstituteFaded, // 129
+    [STRINGID_PKMNSUBSTITUTEFADED - 12] = sText_PkmnSubstituteFaded,
-    sText_PkmnMustRecharge, // 130
+    [STRINGID_PKMNMUSTRECHARGE - 12] = sText_PkmnMustRecharge,
-    sText_PkmnRageBuilding, // 131
+    [STRINGID_PKMNRAGEBUILDING - 12] = sText_PkmnRageBuilding,
-    sText_PkmnMoveWasDisabled, // 132
+    [STRINGID_PKMNMOVEWASDISABLED - 12] = sText_PkmnMoveWasDisabled,
-    sText_PkmnMoveIsDisabled, // 133
+    [STRINGID_PKMNMOVEISDISABLED - 12] = sText_PkmnMoveIsDisabled,
-    sText_PkmnMoveDisabledNoMore, // 134
+    [STRINGID_PKMNMOVEDISABLEDNOMORE - 12] = sText_PkmnMoveDisabledNoMore,
-    sText_PkmnGotEncore, // 135
+    [STRINGID_PKMNGOTENCORE - 12] = sText_PkmnGotEncore,
-    sText_PkmnEncoreEnded, // 136
+    [STRINGID_PKMNENCOREENDED - 12] = sText_PkmnEncoreEnded,
-    sText_PkmnTookAim, // 137
+    [STRINGID_PKMNTOOKAIM - 12] = sText_PkmnTookAim,
-    sText_PkmnSketchedMove, // 138
+    [STRINGID_PKMNSKETCHEDMOVE - 12] = sText_PkmnSketchedMove,
-    sText_PkmnTryingToTakeFoe, // 139
+    [STRINGID_PKMNTRYINGTOTAKEFOE - 12] = sText_PkmnTryingToTakeFoe,
-    sText_PkmnTookFoe, // 140
+    [STRINGID_PKMNTOOKFOE - 12] = sText_PkmnTookFoe,
-    sText_PkmnReducedPP, // 141
+    [STRINGID_PKMNREDUCEDPP - 12] = sText_PkmnReducedPP,
-    sText_PkmnStoleItem, // 142
+    [STRINGID_PKMNSTOLEITEM - 12] = sText_PkmnStoleItem,
-    sText_TargetCantEscapeNow, // 143
+    [STRINGID_TARGETCANTESCAPENOW - 12] = sText_TargetCantEscapeNow,
-    sText_PkmnFellIntoNightmare, // 144
+    [STRINGID_PKMNFELLINTONIGHTMARE - 12] = sText_PkmnFellIntoNightmare,
-    sText_PkmnLockedInNightmare, // 145
+    [STRINGID_PKMNLOCKEDINNIGHTMARE - 12] = sText_PkmnLockedInNightmare,
-    sText_PkmnLaidCurse, // 146
+    [STRINGID_PKMNLAIDCURSE - 12] = sText_PkmnLaidCurse,
-    sText_PkmnAfflictedByCurse, // 147
+    [STRINGID_PKMNAFFLICTEDBYCURSE - 12] = sText_PkmnAfflictedByCurse,
-    sText_SpikesScattered, // 148
+    [STRINGID_SPIKESSCATTERED - 12] = sText_SpikesScattered,
-    sText_PkmnHurtBySpikes, // 149
+    [STRINGID_PKMNHURTBYSPIKES - 12] = sText_PkmnHurtBySpikes,
-    sText_PkmnIdentified, // 150
+    [STRINGID_PKMNIDENTIFIED - 12] = sText_PkmnIdentified,
-    sText_PkmnPerishCountFell, // 151
+    [STRINGID_PKMNPERISHCOUNTFELL - 12] = sText_PkmnPerishCountFell,
-    sText_PkmnBracedItself, // 152
+    [STRINGID_PKMNBRACEDITSELF - 12] = sText_PkmnBracedItself,
-    sText_PkmnEnduredHit, // 153
+    [STRINGID_PKMNENDUREDHIT - 12] = sText_PkmnEnduredHit,
-    sText_MagnitudeStrength, // 154
+    [STRINGID_MAGNITUDESTRENGTH - 12] = sText_MagnitudeStrength,
-    sText_PkmnCutHPMaxedAttack, // 155
+    [STRINGID_PKMNCUTHPMAXEDATTACK - 12] = sText_PkmnCutHPMaxedAttack,
-    sText_PkmnCopiedStatChanges, // 156
+    [STRINGID_PKMNCOPIEDSTATCHANGES - 12] = sText_PkmnCopiedStatChanges,
-    sText_PkmnGotFree, // 157
+    [STRINGID_PKMNGOTFREE - 12] = sText_PkmnGotFree,
-    sText_PkmnShedLeechSeed, // 158
+    [STRINGID_PKMNSHEDLEECHSEED - 12] = sText_PkmnShedLeechSeed,
-    sText_PkmnBlewAwaySpikes, // 159
+    [STRINGID_PKMNBLEWAWAYSPIKES - 12] = sText_PkmnBlewAwaySpikes,
-    sText_PkmnFledFromBattle, // 160
+    [STRINGID_PKMNFLEDFROMBATTLE - 12] = sText_PkmnFledFromBattle,
-    sText_PkmnForesawAttack, // 161
+    [STRINGID_PKMNFORESAWATTACK - 12] = sText_PkmnForesawAttack,
-    sText_PkmnTookAttack, // 162
+    [STRINGID_PKMNTOOKATTACK - 12] = sText_PkmnTookAttack,
-    sText_PkmnAttack, // 163
+    [STRINGID_PKMNATTACK - 12] = sText_PkmnAttack,
-    sText_PkmnCenterAttention, // 164
+    [STRINGID_PKMNCENTERATTENTION - 12] = sText_PkmnCenterAttention,
-    sText_PkmnChargingPower, // 165
+    [STRINGID_PKMNCHARGINGPOWER - 12] = sText_PkmnChargingPower,
-    sText_NaturePowerTurnedInto, // 166
+    [STRINGID_NATUREPOWERTURNEDINTO - 12] = sText_NaturePowerTurnedInto,
-    sText_PkmnStatusNormal, // 167
+    [STRINGID_PKMNSTATUSNORMAL - 12] = sText_PkmnStatusNormal,
-    sText_PkmnHasNoMovesLeft, // 168
+    [STRINGID_PKMNHASNOMOVESLEFT - 12] = sText_PkmnHasNoMovesLeft,
-    sText_PkmnSubjectedToTorment, // 169
+    [STRINGID_PKMNSUBJECTEDTOTORMENT - 12] = sText_PkmnSubjectedToTorment,
-    sText_PkmnCantUseMoveTorment, // 170
+    [STRINGID_PKMNCANTUSEMOVETORMENT - 12] = sText_PkmnCantUseMoveTorment,
-    sText_PkmnTighteningFocus, // 171
+    [STRINGID_PKMNTIGHTENINGFOCUS - 12] = sText_PkmnTighteningFocus,
-    sText_PkmnFellForTaunt, // 172
+    [STRINGID_PKMNFELLFORTAUNT - 12] = sText_PkmnFellForTaunt,
-    sText_PkmnCantUseMoveTaunt, // 173
+    [STRINGID_PKMNCANTUSEMOVETAUNT - 12] = sText_PkmnCantUseMoveTaunt,
-    sText_PkmnReadyToHelp, // 174
+    [STRINGID_PKMNREADYTOHELP - 12] = sText_PkmnReadyToHelp,
-    sText_PkmnSwitchedItems, // 175
+    [STRINGID_PKMNSWITCHEDITEMS - 12] = sText_PkmnSwitchedItems,
-    sText_PkmnCopiedFoe, // 176
+    [STRINGID_PKMNCOPIEDFOE - 12] = sText_PkmnCopiedFoe,
-    sText_PkmnMadeWish, // 177
+    [STRINGID_PKMNMADEWISH - 12] = sText_PkmnMadeWish,
-    sText_PkmnWishCameTrue, // 178
+    [STRINGID_PKMNWISHCAMETRUE - 12] = sText_PkmnWishCameTrue,
-    sText_PkmnPlantedRoots, // 179
+    [STRINGID_PKMNPLANTEDROOTS - 12] = sText_PkmnPlantedRoots,
-    sText_PkmnAbsorbedNutrients, // 180
+    [STRINGID_PKMNABSORBEDNUTRIENTS - 12] = sText_PkmnAbsorbedNutrients,
-    sText_PkmnAnchoredItself, // 181
+    [STRINGID_PKMNANCHOREDITSELF - 12] = sText_PkmnAnchoredItself,
-    sText_PkmnWasMadeDrowsy, // 182
+    [STRINGID_PKMNWASMADEDROWSY - 12] = sText_PkmnWasMadeDrowsy,
-    sText_PkmnKnockedOff, // 183
+    [STRINGID_PKMNKNOCKEDOFF - 12] = sText_PkmnKnockedOff,
-    sText_PkmnSwappedAbilities, // 184
+    [STRINGID_PKMNSWAPPEDABILITIES - 12] = sText_PkmnSwappedAbilities,
-    sText_PkmnSealedOpponentMove, // 185
+    [STRINGID_PKMNSEALEDOPPONENTMOVE - 12] = sText_PkmnSealedOpponentMove,
-    sText_PkmnCantUseMoveSealed, // 186
+    [STRINGID_PKMNCANTUSEMOVESEALED - 12] = sText_PkmnCantUseMoveSealed,
-    sText_PkmnWantsGrudge, // 187
+    [STRINGID_PKMNWANTSGRUDGE - 12] = sText_PkmnWantsGrudge,
-    sText_PkmnLostPPGrudge, // 188
+    [STRINGID_PKMNLOSTPPGRUDGE - 12] = sText_PkmnLostPPGrudge,
-    sText_PkmnShroudedItself, // 189
+    [STRINGID_PKMNSHROUDEDITSELF - 12] = sText_PkmnShroudedItself,
-    sText_PkmnMoveBounced, // 190
+    [STRINGID_PKMNMOVEBOUNCED - 12] = sText_PkmnMoveBounced,
-    sText_PkmnWaitsForTarget, // 191
+    [STRINGID_PKMNWAITSFORTARGET - 12] = sText_PkmnWaitsForTarget,
-    sText_PkmnSnatchedMove, // 192
+    [STRINGID_PKMNSNATCHEDMOVE - 12] = sText_PkmnSnatchedMove,
-    sText_PkmnMadeItRain, // 193
+    [STRINGID_PKMNMADEITRAIN - 12] = sText_PkmnMadeItRain,
-    sText_PkmnRaisedSpeed, // 194
+    [STRINGID_PKMNRAISEDSPEED - 12] = sText_PkmnRaisedSpeed,
-    sText_PkmnProtectedBy, // 195
+    [STRINGID_PKMNPROTECTEDBY - 12] = sText_PkmnProtectedBy,
-    sText_PkmnPreventsUsage, // 196
+    [STRINGID_PKMNPREVENTSUSAGE - 12] = sText_PkmnPreventsUsage,
-    sText_PkmnRestoredHPUsing, // 197
+    [STRINGID_PKMNRESTOREDHPUSING - 12] = sText_PkmnRestoredHPUsing,
-    sText_PkmnChangedTypeWith, // 198
+    [STRINGID_PKMNCHANGEDTYPEWITH - 12] = sText_PkmnChangedTypeWith,
-    sText_PkmnPreventsParalysisWith, // 199
+    [STRINGID_PKMNPREVENTSPARALYSISWITH - 12] = sText_PkmnPreventsParalysisWith,
-    sText_PkmnPreventsRomanceWith, // 200
+    [STRINGID_PKMNPREVENTSROMANCEWITH - 12] = sText_PkmnPreventsRomanceWith,
-    sText_PkmnPreventsPoisoningWith, // 201
+    [STRINGID_PKMNPREVENTSPOISONINGWITH - 12] = sText_PkmnPreventsPoisoningWith,
-    sText_PkmnPreventsConfusionWith, // 202
+    [STRINGID_PKMNPREVENTSCONFUSIONWITH - 12] = sText_PkmnPreventsConfusionWith,
-    sText_PkmnRaisedFirePowerWith, // 203
+    [STRINGID_PKMNRAISEDFIREPOWERWITH - 12] = sText_PkmnRaisedFirePowerWith,
-    sText_PkmnAnchorsItselfWith, // 204
+    [STRINGID_PKMNANCHORSITSELFWITH - 12] = sText_PkmnAnchorsItselfWith,
-    sText_PkmnCutsAttackWith, // 205
+    [STRINGID_PKMNCUTSATTACKWITH - 12] = sText_PkmnCutsAttackWith,
-    sText_PkmnPreventsStatLossWith, // 206
+    [STRINGID_PKMNPREVENTSSTATLOSSWITH - 12] = sText_PkmnPreventsStatLossWith,
-    sText_PkmnHurtsWith, // 207
+    [STRINGID_PKMNHURTSWITH - 12] = sText_PkmnHurtsWith,
-    sText_PkmnTraced, // 208
+    [STRINGID_PKMNTRACED - 12] = sText_PkmnTraced,
-    sText_StatSharply, // 209
+    [STRINGID_STATSHARPLY - 12] = sText_StatSharply,
-    gText_StatRose, // 210
+    [STRINGID_STATROSE - 12] = gText_StatRose,
-    sText_StatHarshly, // 211
+    [STRINGID_STATHARSHLY - 12] = sText_StatHarshly,
-    sText_StatFell, // 212
+    [STRINGID_STATFELL - 12] = sText_StatFell,
-    sText_PkmnsStatChanged, // 213
+    [STRINGID_PKMNSSTATCHANGED - 12] = sText_PkmnsStatChanged,
-    gText_PkmnsStatChanged2, // 214
+    [STRINGID_PKMNSSTATCHANGED2 - 12] = gText_PkmnsStatChanged2,
-    sText_PkmnsStatChanged3, // 215
+    [STRINGID_PKMNSSTATCHANGED3 - 12] = sText_PkmnsStatChanged3,
-    sText_PkmnsStatChanged4, // 216
+    [STRINGID_PKMNSSTATCHANGED4 - 12] = sText_PkmnsStatChanged4,
-    sText_CriticalHit, // 217
+    [STRINGID_CRITICALHIT - 12] = sText_CriticalHit,
-    sText_OneHitKO, // 218
+    [STRINGID_ONEHITKO - 12] = sText_OneHitKO,
-    sText_123Poof, // 219
+    [STRINGID_123POOF - 12] = sText_123Poof,
-    sText_AndEllipsis, // 220
+    [STRINGID_ANDELLIPSIS - 12] = sText_AndEllipsis,
-    sText_NotVeryEffective, // 221
+    [STRINGID_NOTVERYEFFECTIVE - 12] = sText_NotVeryEffective,
-    sText_SuperEffective, // 222
+    [STRINGID_SUPEREFFECTIVE - 12] = sText_SuperEffective,
-    sText_GotAwaySafely, // 223
+    [STRINGID_GOTAWAYSAFELY - 12] = sText_GotAwaySafely,
-    sText_WildPkmnFled, // 224
+    [STRINGID_WILDPKMNFLED - 12] = sText_WildPkmnFled,
-    sText_NoRunningFromTrainers, // 225
+    [STRINGID_NORUNNINGFROMTRAINERS - 12] = sText_NoRunningFromTrainers,
-    sText_CantEscape, // 226
+    [STRINGID_CANTESCAPE - 12] = sText_CantEscape,
-    sText_DontLeaveBirch, // 227
+    [STRINGID_DONTLEAVEBIRCH - 12] = sText_DontLeaveBirch,
-    sText_ButNothingHappened, // 228
+    [STRINGID_BUTNOTHINGHAPPENED - 12] = sText_ButNothingHappened,
-    sText_ButItFailed, // 229
+    [STRINGID_BUTITFAILED - 12] = sText_ButItFailed,
-    sText_ItHurtConfusion, // 230
+    [STRINGID_ITHURTCONFUSION - 12] = sText_ItHurtConfusion,
-    sText_MirrorMoveFailed, // 231
+    [STRINGID_MIRRORMOVEFAILED - 12] = sText_MirrorMoveFailed,
-    sText_StartedToRain, // 232
+    [STRINGID_STARTEDTORAIN - 12] = sText_StartedToRain,
-    sText_DownpourStarted, // 233
+    [STRINGID_DOWNPOURSTARTED - 12] = sText_DownpourStarted,
-    sText_RainContinues, // 234
+    [STRINGID_RAINCONTINUES - 12] = sText_RainContinues,
-    sText_DownpourContinues, // 235
+    [STRINGID_DOWNPOURCONTINUES - 12] = sText_DownpourContinues,
-    sText_RainStopped, // 236
+    [STRINGID_RAINSTOPPED - 12] = sText_RainStopped,
-    sText_SandstormBrewed, // 237
+    [STRINGID_SANDSTORMBREWED - 12] = sText_SandstormBrewed,
-    sText_SandstormRages, // 238
+    [STRINGID_SANDSTORMRAGES - 12] = sText_SandstormRages,
-    sText_SandstormSubsided, // 239
+    [STRINGID_SANDSTORMSUBSIDED - 12] = sText_SandstormSubsided,
-    sText_SunlightGotBright, // 240
+    [STRINGID_SUNLIGHTGOTBRIGHT - 12] = sText_SunlightGotBright,
-    sText_SunlightStrong, // 241
+    [STRINGID_SUNLIGHTSTRONG - 12] = sText_SunlightStrong,
-    sText_SunlightFaded, // 242
+    [STRINGID_SUNLIGHTFADED - 12] = sText_SunlightFaded,
-    sText_StartedHail, // 243
+    [STRINGID_STARTEDHAIL - 12] = sText_StartedHail,
-    sText_HailContinues, // 244
+    [STRINGID_HAILCONTINUES - 12] = sText_HailContinues,
-    sText_HailStopped, // 245
+    [STRINGID_HAILSTOPPED - 12] = sText_HailStopped,
-    sText_FailedToSpitUp, // 246
+    [STRINGID_FAILEDTOSPITUP - 12] = sText_FailedToSpitUp,
-    sText_FailedToSwallow, // 247
+    [STRINGID_FAILEDTOSWALLOW - 12] = sText_FailedToSwallow,
-    sText_WindBecameHeatWave, // 248
+    [STRINGID_WINDBECAMEHEATWAVE - 12] = sText_WindBecameHeatWave,
-    sText_StatChangesGone, // 249
+    [STRINGID_STATCHANGESGONE - 12] = sText_StatChangesGone,
-    sText_CoinsScattered, // 250
+    [STRINGID_COINSSCATTERED - 12] = sText_CoinsScattered,
-    sText_TooWeakForSubstitute, // 251
+    [STRINGID_TOOWEAKFORSUBSTITUTE - 12] = sText_TooWeakForSubstitute,
-    sText_SharedPain, // 252
+    [STRINGID_SHAREDPAIN - 12] = sText_SharedPain,
-    sText_BellChimed, // 253
+    [STRINGID_BELLCHIMED - 12] = sText_BellChimed,
-    sText_FaintInThree, // 254
+    [STRINGID_FAINTINTHREE - 12] = sText_FaintInThree,
-    sText_NoPPLeft, // 255
+    [STRINGID_NOPPLEFT - 12] = sText_NoPPLeft,
-    sText_ButNoPPLeft, // 256
+    [STRINGID_BUTNOPPLEFT - 12] = sText_ButNoPPLeft,
-    sText_PlayerUsedItem, // 257
+    [STRINGID_PLAYERUSEDITEM - 12] = sText_PlayerUsedItem,
-    sText_WallyUsedItem, // 258
+    [STRINGID_WALLYUSEDITEM - 12] = sText_WallyUsedItem,
-    sText_TrainerBlockedBall, // 259
+    [STRINGID_TRAINERBLOCKEDBALL - 12] = sText_TrainerBlockedBall,
-    sText_DontBeAThief, // 260
+    [STRINGID_DONTBEATHIEF - 12] = sText_DontBeAThief,
-    sText_ItDodgedBall, // 261
+    [STRINGID_ITDODGEDBALL - 12] = sText_ItDodgedBall,
-    sText_YouMissedPkmn, // 262
+    [STRINGID_YOUMISSEDPKMN - 12] = sText_YouMissedPkmn,
-    sText_PkmnBrokeFree, // 263
+    [STRINGID_PKMNBROKEFREE - 12] = sText_PkmnBrokeFree,
-    sText_ItAppearedCaught, // 264
+    [STRINGID_ITAPPEAREDCAUGHT - 12] = sText_ItAppearedCaught,
-    sText_AarghAlmostHadIt, // 265
+    [STRINGID_AARGHALMOSTHADIT - 12] = sText_AarghAlmostHadIt,
-    sText_ShootSoClose, // 266
+    [STRINGID_SHOOTSOCLOSE - 12] = sText_ShootSoClose,
-    sText_GotchaPkmnCaught, // 267
+    [STRINGID_GOTCHAPKMNCAUGHT - 12] = sText_GotchaPkmnCaught,
-    sText_GotchaPkmnCaught2, // 268
+    [STRINGID_GOTCHAPKMNCAUGHT2 - 12] = sText_GotchaPkmnCaught2,
-    sText_GiveNicknameCaptured, // 269
+    [STRINGID_GIVENICKNAMECAPTURED - 12] = sText_GiveNicknameCaptured,
-    sText_PkmnSentToPC, // 270
+    [STRINGID_PKMNSENTTOPC - 12] = sText_PkmnSentToPC,
-    sText_PkmnDataAddedToDex, // 271
+    [STRINGID_PKMNDATAADDEDTODEX - 12] = sText_PkmnDataAddedToDex,
-    sText_ItIsRaining, // 272
+    [STRINGID_ITISRAINING - 12] = sText_ItIsRaining,
-    sText_SandstormIsRaging, // 273
+    [STRINGID_SANDSTORMISRAGING - 12] = sText_SandstormIsRaging,
-    sText_CantEscape2, // 274
+    [STRINGID_CANTESCAPE2 - 12] = sText_CantEscape2,
-    sText_PkmnIgnoresAsleep, // 275
+    [STRINGID_PKMNIGNORESASLEEP - 12] = sText_PkmnIgnoresAsleep,
-    sText_PkmnIgnoredOrders, // 276
+    [STRINGID_PKMNIGNOREDORDERS - 12] = sText_PkmnIgnoredOrders,
-    sText_PkmnBeganToNap, // 277
+    [STRINGID_PKMNBEGANTONAP - 12] = sText_PkmnBeganToNap,
-    sText_PkmnLoafing, // 278
+    [STRINGID_PKMNLOAFING - 12] = sText_PkmnLoafing,
-    sText_PkmnWontObey, // 279
+    [STRINGID_PKMNWONTOBEY - 12] = sText_PkmnWontObey,
-    sText_PkmnTurnedAway, // 280
+    [STRINGID_PKMNTURNEDAWAY - 12] = sText_PkmnTurnedAway,
-    sText_PkmnPretendNotNotice, // 281
+    [STRINGID_PKMNPRETENDNOTNOTICE - 12] = sText_PkmnPretendNotNotice,
-    sText_EnemyAboutToSwitchPkmn, // 282
+    [STRINGID_ENEMYABOUTTOSWITCHPKMN - 12] = sText_EnemyAboutToSwitchPkmn,
-    sText_CreptCloser, // 283
+    [STRINGID_CREPTCLOSER - 12] = sText_CreptCloser,
-    sText_CantGetCloser, // 284
+    [STRINGID_CANTGETCLOSER - 12] = sText_CantGetCloser,
-    sText_PkmnWatchingCarefully, // 285
+    [STRINGID_PKMNWATCHINGCAREFULLY - 12] = sText_PkmnWatchingCarefully,
-    sText_PkmnCuriousAboutX, // 286
+    [STRINGID_PKMNCURIOUSABOUTX - 12] = sText_PkmnCuriousAboutX,
-    sText_PkmnEnthralledByX, // 287
+    [STRINGID_PKMNENTHRALLEDBYX - 12] = sText_PkmnEnthralledByX,
-    sText_PkmnIgnoredX, // 288
+    [STRINGID_PKMNIGNOREDX - 12] = sText_PkmnIgnoredX,
-    sText_ThrewPokeblockAtPkmn, // 289
+    [STRINGID_THREWPOKEBLOCKATPKMN - 12] = sText_ThrewPokeblockAtPkmn,
-    sText_OutOfSafariBalls, // 290
+    [STRINGID_OUTOFSAFARIBALLS - 12] = sText_OutOfSafariBalls,
-    sText_PkmnsItemCuredParalysis, // 291
+    [STRINGID_PKMNSITEMCUREDPARALYSIS - 12] = sText_PkmnsItemCuredParalysis,
-    sText_PkmnsItemCuredPoison, // 292
+    [STRINGID_PKMNSITEMCUREDPOISON - 12] = sText_PkmnsItemCuredPoison,
-    sText_PkmnsItemHealedBurn, // 293
+    [STRINGID_PKMNSITEMHEALEDBURN - 12] = sText_PkmnsItemHealedBurn,
-    sText_PkmnsItemDefrostedIt, // 294
+    [STRINGID_PKMNSITEMDEFROSTEDIT - 12] = sText_PkmnsItemDefrostedIt,
-    sText_PkmnsItemWokeIt, // 295
+    [STRINGID_PKMNSITEMWOKEIT - 12] = sText_PkmnsItemWokeIt,
-    sText_PkmnsItemSnappedOut, // 296
+    [STRINGID_PKMNSITEMSNAPPEDOUT - 12] = sText_PkmnsItemSnappedOut,
-    sText_PkmnsItemCuredProblem, // 297
+    [STRINGID_PKMNSITEMCUREDPROBLEM - 12] = sText_PkmnsItemCuredProblem,
-    sText_PkmnsItemRestoredHealth, // 298
+    [STRINGID_PKMNSITEMRESTOREDHEALTH - 12] = sText_PkmnsItemRestoredHealth,
-    sText_PkmnsItemRestoredPP, // 299
+    [STRINGID_PKMNSITEMRESTOREDPP - 12] = sText_PkmnsItemRestoredPP,
-    sText_PkmnsItemRestoredStatus, // 300
+    [STRINGID_PKMNSITEMRESTOREDSTATUS - 12] = sText_PkmnsItemRestoredStatus,
-    sText_PkmnsItemRestoredHPALittle, // 301
+    [STRINGID_PKMNSITEMRESTOREDHPALITTLE - 12] = sText_PkmnsItemRestoredHPALittle,
-    sText_ItemAllowsOnlyYMove, // 302
+    [STRINGID_ITEMALLOWSONLYYMOVE - 12] = sText_ItemAllowsOnlyYMove,
-    sText_PkmnHungOnWithX, // 303
+    [STRINGID_PKMNHUNGONWITHX - 12] = sText_PkmnHungOnWithX,
-    gText_EmptyString3, // 304
+    [STRINGID_EMPTYSTRING3 - 12] = gText_EmptyString3,
-    sText_PkmnsXPreventsBurns, // 305
+    [STRINGID_PKMNSXPREVENTSBURNS - 12] = sText_PkmnsXPreventsBurns,
-    sText_PkmnsXBlocksY, // 306
+    [STRINGID_PKMNSXBLOCKSY - 12] = sText_PkmnsXBlocksY,
-    sText_PkmnsXRestoredHPALittle2, // 307
+    [STRINGID_PKMNSXRESTOREDHPALITTLE2 - 12] = sText_PkmnsXRestoredHPALittle2,
-    sText_PkmnsXWhippedUpSandstorm, // 308
+    [STRINGID_PKMNSXWHIPPEDUPSANDSTORM - 12] = sText_PkmnsXWhippedUpSandstorm,
-    sText_PkmnsXPreventsYLoss, // 309
+    [STRINGID_PKMNSXPREVENTSYLOSS - 12] = sText_PkmnsXPreventsYLoss,
-    sText_PkmnsXInfatuatedY, // 310
+    [STRINGID_PKMNSXINFATUATEDY - 12] = sText_PkmnsXInfatuatedY,
-    sText_PkmnsXMadeYIneffective, // 311
+    [STRINGID_PKMNSXMADEYINEFFECTIVE - 12] = sText_PkmnsXMadeYIneffective,
-    sText_PkmnsXCuredYProblem, // 312
+    [STRINGID_PKMNSXCUREDYPROBLEM - 12] = sText_PkmnsXCuredYProblem,
-    sText_ItSuckedLiquidOoze, // 313
+    [STRINGID_ITSUCKEDLIQUIDOOZE - 12] = sText_ItSuckedLiquidOoze,
-    sText_PkmnTransformed, // 314
+    [STRINGID_PKMNTRANSFORMED - 12] = sText_PkmnTransformed,
-    sText_ElectricityWeakened, // 315
+    [STRINGID_ELECTRICITYWEAKENED - 12] = sText_ElectricityWeakened,
-    sText_FireWeakened, // 316
+    [STRINGID_FIREWEAKENED - 12] = sText_FireWeakened,
-    sText_PkmnHidUnderwater, // 317
+    [STRINGID_PKMNHIDUNDERWATER - 12] = sText_PkmnHidUnderwater,
-    sText_PkmnSprangUp, // 318
+    [STRINGID_PKMNSPRANGUP - 12] = sText_PkmnSprangUp,
-    sText_HMMovesCantBeForgotten, // 319
+    [STRINGID_HMMOVESCANTBEFORGOTTEN - 12] = sText_HMMovesCantBeForgotten,
-    sText_XFoundOneY, // 320
+    [STRINGID_XFOUNDONEY - 12] = sText_XFoundOneY,
-    sText_PlayerDefeatedLinkTrainerTrainer1, // 321
+    [STRINGID_PLAYERDEFEATEDTRAINER1 - 12] = sText_PlayerDefeatedLinkTrainerTrainer1,
-    sText_SoothingAroma, // 322
+    [STRINGID_SOOTHINGAROMA - 12] = sText_SoothingAroma,
-    sText_ItemsCantBeUsedNow, // 323
+    [STRINGID_ITEMSCANTBEUSEDNOW - 12] = sText_ItemsCantBeUsedNow,
-    sText_ForXCommaYZ, // 324
+    [STRINGID_FORXCOMMAYZ - 12] = sText_ForXCommaYZ,
-    sText_UsingXTheYOfZN, // 325
+    [STRINGID_USINGXTHEYOFZN - 12] = sText_UsingXTheYOfZN,
-    sText_PkmnUsedXToGetPumped, // 326
+    [STRINGID_PKMNUSEDXTOGETPUMPED - 12] = sText_PkmnUsedXToGetPumped,
-    sText_PkmnsXMadeYUseless, // 327
+    [STRINGID_PKMNSXMADEYUSELESS - 12] = sText_PkmnsXMadeYUseless,
-    sText_PkmnTrappedBySandTomb, // 328
+    [STRINGID_PKMNTRAPPEDBYSANDTOMB - 12] = sText_PkmnTrappedBySandTomb,
-    sText_EmptyString4, // 329
+    [STRINGID_EMPTYSTRING4 - 12] = sText_EmptyString4,
-    sText_ABoosted, // 330
+    [STRINGID_ABOOSTED - 12] = sText_ABoosted,
-    sText_PkmnsXIntensifiedSun, // 331
+    [STRINGID_PKMNSXINTENSIFIEDSUN - 12] = sText_PkmnsXIntensifiedSun,
-    sText_PkmnMakesGroundMiss, // 332
+    [STRINGID_PKMNMAKESGROUNDMISS - 12] = sText_PkmnMakesGroundMiss,
-    sText_YouThrowABallNowRight, // 333
+    [STRINGID_YOUTHROWABALLNOWRIGHT - 12] = sText_YouThrowABallNowRight,
-    sText_PkmnsXTookAttack, // 334
+    [STRINGID_PKMNSXTOOKATTACK - 12] = sText_PkmnsXTookAttack,
-    sText_PkmnChoseXAsDestiny, // 335
+    [STRINGID_PKMNCHOSEXASDESTINY - 12] = sText_PkmnChoseXAsDestiny,
-    sText_PkmnLostFocus, // 336
+    [STRINGID_PKMNLOSTFOCUS - 12] = sText_PkmnLostFocus,
-    sText_UseNextPkmn, // 337
+    [STRINGID_USENEXTPKMN - 12] = sText_UseNextPkmn,
-    sText_PkmnFledUsingIts, // 338
+    [STRINGID_PKMNFLEDUSINGITS - 12] = sText_PkmnFledUsingIts,
-    sText_PkmnFledUsing, // 339
+    [STRINGID_PKMNFLEDUSING - 12] = sText_PkmnFledUsing,
-    sText_PkmnWasDraggedOut, // 340
+    [STRINGID_PKMNWASDRAGGEDOUT - 12] = sText_PkmnWasDraggedOut,
-    sText_PreventedFromWorking, // 341
+    [STRINGID_PREVENTEDFROMWORKING - 12] = sText_PreventedFromWorking,
-    sText_PkmnsItemNormalizedStatus, // 342
+    [STRINGID_PKMNSITEMNORMALIZEDSTATUS - 12] = sText_PkmnsItemNormalizedStatus,
-    sText_Trainer1UsedItem, // 343
+    [STRINGID_TRAINER1USEDITEM - 12] = sText_Trainer1UsedItem,
-    sText_BoxIsFull, // 344
+    [STRINGID_BOXISFULL - 12] = sText_BoxIsFull,
-    sText_PkmnAvoidedAttack, // 345
+    [STRINGID_PKMNAVOIDEDATTACK - 12] = sText_PkmnAvoidedAttack,
-    sText_PkmnsXMadeItIneffective, // 346
+    [STRINGID_PKMNSXMADEITINEFFECTIVE - 12] = sText_PkmnsXMadeItIneffective,
-    sText_PkmnsXPreventsFlinching, // 347
+    [STRINGID_PKMNSXPREVENTSFLINCHING - 12] = sText_PkmnsXPreventsFlinching,
-    sText_PkmnAlreadyHasBurn, // 348
+    [STRINGID_PKMNALREADYHASBURN - 12] = sText_PkmnAlreadyHasBurn,
-    sText_StatsWontDecrease2, // 349
+    [STRINGID_STATSWONTDECREASE2 - 12] = sText_StatsWontDecrease2,
-    sText_PkmnsXBlocksY2, // 350
+    [STRINGID_PKMNSXBLOCKSY2 - 12] = sText_PkmnsXBlocksY2,
-    sText_PkmnsXWoreOff, // 351
+    [STRINGID_PKMNSXWOREOFF - 12] = sText_PkmnsXWoreOff,
-    sText_PkmnRaisedDefALittle, // 352
+    [STRINGID_PKMNRAISEDDEFALITTLE - 12] = sText_PkmnRaisedDefALittle,
-    sText_PkmnRaisedSpDefALittle, // 353
+    [STRINGID_PKMNRAISEDSPDEFALITTLE - 12] = sText_PkmnRaisedSpDefALittle,
-    sText_TheWallShattered, // 354
+    [STRINGID_THEWALLSHATTERED - 12] = sText_TheWallShattered,
-    sText_PkmnsXPreventsYsZ, // 355
+    [STRINGID_PKMNSXPREVENTSYSZ - 12] = sText_PkmnsXPreventsYsZ,
-    sText_PkmnsXCuredItsYProblem, // 356
+    [STRINGID_PKMNSXCUREDITSYPROBLEM - 12] = sText_PkmnsXCuredItsYProblem,
-    sText_AttackerCantEscape, // 357
+    [STRINGID_ATTACKERCANTESCAPE - 12] = sText_AttackerCantEscape,
-    sText_PkmnObtainedX, // 358
+    [STRINGID_PKMNOBTAINEDX - 12] = sText_PkmnObtainedX,
-    sText_PkmnObtainedX2, // 359
+    [STRINGID_PKMNOBTAINEDX2 - 12] = sText_PkmnObtainedX2,
-    sText_PkmnObtainedXYObtainedZ, // 360
+    [STRINGID_PKMNOBTAINEDXYOBTAINEDZ - 12] = sText_PkmnObtainedXYObtainedZ,
-    sText_ButNoEffect, // 361
+    [STRINGID_BUTNOEFFECT - 12] = sText_ButNoEffect,
-    sText_PkmnsXHadNoEffectOnY, // 362
+    [STRINGID_PKMNSXHADNOEFFECTONY - 12] = sText_PkmnsXHadNoEffectOnY,
-    sText_TwoInGameTrainersDefeated, // 363
+    [STRINGID_TWOENEMIESDEFEATED - 12] = sText_TwoInGameTrainersDefeated,
-    sText_Trainer2LoseText, // 364
+    [STRINGID_TRAINER2LOSETEXT - 12] = sText_Trainer2LoseText,
-    sText_PkmnIncapableOfPower, // 365
+    [STRINGID_PKMNINCAPABLEOFPOWER - 12] = sText_PkmnIncapableOfPower,
-    sText_GlintAppearsInEye, // 366
+    [STRINGID_GLINTAPPEARSINEYE - 12] = sText_GlintAppearsInEye,
-    sText_PkmnGettingIntoPosition, // 367
+    [STRINGID_PKMNGETTINGINTOPOSITION - 12] = sText_PkmnGettingIntoPosition,
-    sText_PkmnBeganGrowlingDeeply, // 368
+    [STRINGID_PKMNBEGANGROWLINGDEEPLY - 12] = sText_PkmnBeganGrowlingDeeply,
-    sText_PkmnEagerForMore, // 369
+    [STRINGID_PKMNEAGERFORMORE - 12] = sText_PkmnEagerForMore,
-    sText_DefeatedOpponentByReferee, // 370
+    [STRINGID_DEFEATEDOPPONENTBYREFEREE - 12] = sText_DefeatedOpponentByReferee,
-    sText_LostToOpponentByReferee, // 371
+    [STRINGID_LOSTTOOPPONENTBYREFEREE - 12] = sText_LostToOpponentByReferee,
-    sText_TiedOpponentByReferee, // 372
+    [STRINGID_TIEDOPPONENTBYREFEREE - 12] = sText_TiedOpponentByReferee,
-    sText_QuestionForfeitMatch, // 373
+    [STRINGID_QUESTIONFORFEITMATCH - 12] = sText_QuestionForfeitMatch,
-    sText_ForfeitedMatch, // 374
+    [STRINGID_FORFEITEDMATCH - 12] = sText_ForfeitedMatch,
-    gText_PkmnTransferredSomeonesPC, // 375
+    [STRINGID_PKMNTRANSFERREDSOMEONESPC - 12] = gText_PkmnTransferredSomeonesPC,
-    gText_PkmnTransferredLanettesPC, // 376
+    [STRINGID_PKMNTRANSFERREDLANETTESPC - 12] = gText_PkmnTransferredLanettesPC,
-    gText_PkmnBoxSomeonesPCFull, // 377
+    [STRINGID_PKMNBOXSOMEONESPCFULL - 12] = gText_PkmnBoxSomeonesPCFull,
-    gText_PkmnBoxLanettesPCFull, // 378
+    [STRINGID_PKMNBOXLANETTESPCFULL - 12] = gText_PkmnBoxLanettesPCFull,
-    sText_Trainer1WinText, // 379
+    [STRINGID_TRAINER1WINTEXT - 12] = sText_Trainer1WinText,
-    sText_Trainer2WinText, // 380
+    [STRINGID_TRAINER2WINTEXT - 12] = sText_Trainer2WinText,
 };
 
 const u16 gMissStringIds[] =

src/battle_pike.c

@@ -9,7 +9,7 @@
 #include "task.h"
 #include "battle_tower.h"
 #include "party_menu.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "palette.h"
 #include "script.h"
 #include "battle_setup.h"

src/battle_pyramid.c

@@ -21,7 +21,7 @@
 #include "main.h"
 #include "load_save.h"
 #include "script.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "overworld.h"
 #include "event_scripts.h"
 #include "constants/battle_frontier.h"
@@ -1458,7 +1458,7 @@ static u16 sub_81A9F90(u8 count)
         do
         {
             trainerId = sub_8162548(challengeNum + 1, battleNum);
-            for (i = 0 ; i < count; i++)
+            for (i = 0; i < count; i++)
             {
                 if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId)
                     break;
@@ -1470,7 +1470,7 @@ static u16 sub_81A9F90(u8 count)
         do
         {
             trainerId = sub_8162548(challengeNum, battleNum);
-            for (i = 0 ; i < count; i++)
+            for (i = 0; i < count; i++)
             {
                 if (gSaveBlock2Ptr->frontier.field_CB4[i] == trainerId)
                     break;

src/battle_pyramid_bag.c

@@ -17,7 +17,7 @@
 #include "list_menu.h"
 #include "mail.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "overworld.h"

src/battle_records.c

@@ -18,7 +18,7 @@
 #include "international_string_util.h"
 #include "sound.h"
 #include "constants/songs.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "gpu_regs.h"
 #include "constants/game_stat.h"
 

src/battle_script_commands.c

@@ -677,45 +677,45 @@ static const u32 sStatusFlagsForMoveEffects[] =
 
 static const u8* const sMoveEffectBS_Ptrs[] =
 {
-    BattleScript_MoveEffectSleep,	    //  0
+    [0] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_SLEEP
+    [MOVE_EFFECT_SLEEP] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectPoison,		//	MOVE_EFFECT_POISON
+    [MOVE_EFFECT_POISON] = BattleScript_MoveEffectPoison,
-    BattleScript_MoveEffectBurn,		//	MOVE_EFFECT_BURN
+    [MOVE_EFFECT_BURN] = BattleScript_MoveEffectBurn,
-    BattleScript_MoveEffectFreeze,		//	MOVE_EFFECT_FREEZE
+    [MOVE_EFFECT_FREEZE] = BattleScript_MoveEffectFreeze,
-    BattleScript_MoveEffectParalysis,   //	MOVE_EFFECT_PARALYSIS
+    [MOVE_EFFECT_PARALYSIS] = BattleScript_MoveEffectParalysis,
-    BattleScript_MoveEffectToxic,		//	MOVE_EFFECT_TOXIC
+    [MOVE_EFFECT_TOXIC] = BattleScript_MoveEffectToxic,
-    BattleScript_MoveEffectConfusion,	//	MOVE_EFFECT_CONFUSION
+    [MOVE_EFFECT_CONFUSION] = BattleScript_MoveEffectConfusion,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_FLINCH
+    [MOVE_EFFECT_FLINCH] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_TRI_ATTACK
+    [MOVE_EFFECT_TRI_ATTACK] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectUproar,		//	MOVE_EFFECT_UPROAR
+    [MOVE_EFFECT_UPROAR] = BattleScript_MoveEffectUproar,
-    BattleScript_MoveEffectPayDay,		//	MOVE_EFFECT_PAYDAY
+    [MOVE_EFFECT_PAYDAY] = BattleScript_MoveEffectPayDay,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_CHARGING
+    [MOVE_EFFECT_CHARGING] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectWrap,		//	MOVE_EFFECT_WRAP
+    [MOVE_EFFECT_WRAP] = BattleScript_MoveEffectWrap,
-    BattleScript_MoveEffectRecoil,	    //	MOVE_EFFECT_RECOIL_25
+    [MOVE_EFFECT_RECOIL_25] = BattleScript_MoveEffectRecoil,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_ATK_PLUS_1
+    [MOVE_EFFECT_ATK_PLUS_1] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_DEF_PLUS_1
+    [MOVE_EFFECT_DEF_PLUS_1] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_SPD_PLUS_1
+    [MOVE_EFFECT_SPD_PLUS_1] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_SP_ATK_PLUS_1
+    [MOVE_EFFECT_SP_ATK_PLUS_1] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_SP_DEF_PLUS_1
+    [MOVE_EFFECT_SP_DEF_PLUS_1] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_ACC_PLUS_1
+    [MOVE_EFFECT_ACC_PLUS_1] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_EVS_PLUS_1
+    [MOVE_EFFECT_EVS_PLUS_1] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_ATK_MINUS_1
+    [MOVE_EFFECT_ATK_MINUS_1] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_DEF_MINUS_1
+    [MOVE_EFFECT_DEF_MINUS_1] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_SPD_MINUS_1
+    [MOVE_EFFECT_SPD_MINUS_1] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_SP_ATK_MINUS_1
+    [MOVE_EFFECT_SP_ATK_MINUS_1] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_SP_DEF_MINUS_1
+    [MOVE_EFFECT_SP_DEF_MINUS_1] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_ACC_MINUS_1
+    [MOVE_EFFECT_ACC_MINUS_1] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_EVS_MINUS_1
+    [MOVE_EFFECT_EVS_MINUS_1] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_RECHARGE
+    [MOVE_EFFECT_RECHARGE] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_RAGE
+    [MOVE_EFFECT_RAGE] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_STEAL_ITEM
+    [MOVE_EFFECT_STEAL_ITEM] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_PREVENT_ESCAPE
+    [MOVE_EFFECT_PREVENT_ESCAPE] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_NIGHTMARE
+    [MOVE_EFFECT_NIGHTMARE] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_ALL_STATS_UP
+    [MOVE_EFFECT_ALL_STATS_UP] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_RAPIDSPIN
+    [MOVE_EFFECT_RAPIDSPIN] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_REMOVE_PARALYSIS
+    [MOVE_EFFECT_REMOVE_PARALYSIS] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectSleep,		//	MOVE_EFFECT_ATK_DEF_DOWN
+    [MOVE_EFFECT_ATK_DEF_DOWN] = BattleScript_MoveEffectSleep,
-    BattleScript_MoveEffectRecoil,	    //	MOVE_EFFECT_RECOIL_33
+    [MOVE_EFFECT_RECOIL_33] = BattleScript_MoveEffectRecoil,
 };
 
 static const struct WindowTemplate sUnusedWinTemplate = {0, 1, 3, 7, 0xF, 0x1F, 0x3F};

src/battle_transition.c

@@ -7,7 +7,7 @@
 #include "field_effect.h"
 #include "gpu_regs.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "overworld.h"
 #include "palette.h"
 #include "random.h"

src/battle_util2.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "battle.h"
 #include "battle_controllers.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "pokemon.h"
 #include "event_data.h"
 #include "constants/abilities.h"

src/berry_blender.c

@@ -12,7 +12,7 @@
 #include "bg.h"
 #include "palette.h"
 #include "decompress.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "gpu_regs.h"
 #include "text.h"
 #include "text_window.h"

src/berry_fix_program.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "gpu_regs.h"
 #include "multiboot.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "bg.h"
 #include "graphics.h"
 #include "main.h"

src/berry_tag_screen.c

@@ -21,7 +21,7 @@
 #include "string_util.h"
 #include "strings.h"
 #include "bg.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "scanline_effect.h"
 #include "gpu_regs.h"
 #include "graphics.h"

src/contest.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "gpu_regs.h"
 #include "bg.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "constants/items.h"
 #include "constants/event_objects.h"
 #include "constants/moves.h"

src/credits.c

@@ -3,7 +3,7 @@
 #include "main.h"
 #include "task.h"
 #include "bg.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "window.h"
 #include "text.h"
 #include "menu.h"

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

src/data/item_icon_table.h

@@ -311,64 +311,64 @@ const u32 *const gItemIconTable[][2] =
     [ITEM_CLAW_FOSSIL] = {gItemIcon_ClawFossil, gItemIconPalette_HoennFossil},
     [ITEM_DEVON_SCOPE] = {gItemIcon_DevonScope, gItemIconPalette_DevonScope},
     // TMs / HMs
-    [ITEM_TM01] = {gItemIcon_TM, gItemIconPalette_FightingTMHM}, // TM01
+    [ITEM_TM01] = {gItemIcon_TM, gItemIconPalette_FightingTMHM},
-    [ITEM_TM02] = {gItemIcon_TM, gItemIconPalette_DragonTMHM}, // TM02
+    [ITEM_TM02] = {gItemIcon_TM, gItemIconPalette_DragonTMHM},
-    [ITEM_TM03] = {gItemIcon_TM, gItemIconPalette_WaterTMHM}, // TM03
+    [ITEM_TM03] = {gItemIcon_TM, gItemIconPalette_WaterTMHM},
-    [ITEM_TM04] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM04
+    [ITEM_TM04] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM},
-    [ITEM_TM05] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM05
+    [ITEM_TM05] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
-    [ITEM_TM06] = {gItemIcon_TM, gItemIconPalette_PoisonTMHM}, // TM06
+    [ITEM_TM06] = {gItemIcon_TM, gItemIconPalette_PoisonTMHM},
-    [ITEM_TM07] = {gItemIcon_TM, gItemIconPalette_IceTMHM}, // TM07
+    [ITEM_TM07] = {gItemIcon_TM, gItemIconPalette_IceTMHM},
-    [ITEM_TM08] = {gItemIcon_TM, gItemIconPalette_FightingTMHM}, // TM08
+    [ITEM_TM08] = {gItemIcon_TM, gItemIconPalette_FightingTMHM},
-    [ITEM_TM09] = {gItemIcon_TM, gItemIconPalette_GrassTMHM}, // TM09
+    [ITEM_TM09] = {gItemIcon_TM, gItemIconPalette_GrassTMHM},
-    [ITEM_TM10] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM10
+    [ITEM_TM10] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
-    [ITEM_TM11] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, // TM11
+    [ITEM_TM11] = {gItemIcon_TM, gItemIconPalette_FireTMHM},
-    [ITEM_TM12] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, // TM12
+    [ITEM_TM12] = {gItemIcon_TM, gItemIconPalette_DarkTMHM},
-    [ITEM_TM13] = {gItemIcon_TM, gItemIconPalette_IceTMHM}, // TM13
+    [ITEM_TM13] = {gItemIcon_TM, gItemIconPalette_IceTMHM},
-    [ITEM_TM14] = {gItemIcon_TM, gItemIconPalette_IceTMHM}, // TM14
+    [ITEM_TM14] = {gItemIcon_TM, gItemIconPalette_IceTMHM},
-    [ITEM_TM15] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM15
+    [ITEM_TM15] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
-    [ITEM_TM16] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM16
+    [ITEM_TM16] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM},
-    [ITEM_TM17] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM17
+    [ITEM_TM17] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
-    [ITEM_TM18] = {gItemIcon_TM, gItemIconPalette_WaterTMHM}, // TM18
+    [ITEM_TM18] = {gItemIcon_TM, gItemIconPalette_WaterTMHM},
-    [ITEM_TM19] = {gItemIcon_TM, gItemIconPalette_GrassTMHM}, // TM19
+    [ITEM_TM19] = {gItemIcon_TM, gItemIconPalette_GrassTMHM},
-    [ITEM_TM20] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM20
+    [ITEM_TM20] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
-    [ITEM_TM21] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM21
+    [ITEM_TM21] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
-    [ITEM_TM22] = {gItemIcon_TM, gItemIconPalette_GrassTMHM}, // TM22
+    [ITEM_TM22] = {gItemIcon_TM, gItemIconPalette_GrassTMHM},
-    [ITEM_TM23] = {gItemIcon_TM, gItemIconPalette_SteelTMHM}, // TM23
+    [ITEM_TM23] = {gItemIcon_TM, gItemIconPalette_SteelTMHM},
-    [ITEM_TM24] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM}, // TM24
+    [ITEM_TM24] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM},
-    [ITEM_TM25] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM}, // TM25
+    [ITEM_TM25] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM},
-    [ITEM_TM26] = {gItemIcon_TM, gItemIconPalette_GroundTMHM}, // TM26
+    [ITEM_TM26] = {gItemIcon_TM, gItemIconPalette_GroundTMHM},
-    [ITEM_TM27] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM27
+    [ITEM_TM27] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
-    [ITEM_TM28] = {gItemIcon_TM, gItemIconPalette_GroundTMHM}, // TM28
+    [ITEM_TM28] = {gItemIcon_TM, gItemIconPalette_GroundTMHM},
-    [ITEM_TM29] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM29
+    [ITEM_TM29] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM},
-    [ITEM_TM30] = {gItemIcon_TM, gItemIconPalette_GhostTMHM}, // TM30
+    [ITEM_TM30] = {gItemIcon_TM, gItemIconPalette_GhostTMHM},
-    [ITEM_TM31] = {gItemIcon_TM, gItemIconPalette_FightingTMHM}, // TM31
+    [ITEM_TM31] = {gItemIcon_TM, gItemIconPalette_FightingTMHM},
-    [ITEM_TM32] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM32
+    [ITEM_TM32] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
-    [ITEM_TM33] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM33
+    [ITEM_TM33] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM},
-    [ITEM_TM34] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM}, // TM34
+    [ITEM_TM34] = {gItemIcon_TM, gItemIconPalette_ElectricTMHM},
-    [ITEM_TM35] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, // TM35
+    [ITEM_TM35] = {gItemIcon_TM, gItemIconPalette_FireTMHM},
-    [ITEM_TM36] = {gItemIcon_TM, gItemIconPalette_PoisonTMHM}, // TM36
+    [ITEM_TM36] = {gItemIcon_TM, gItemIconPalette_PoisonTMHM},
-    [ITEM_TM37] = {gItemIcon_TM, gItemIconPalette_RockTMHM}, // TM37
+    [ITEM_TM37] = {gItemIcon_TM, gItemIconPalette_RockTMHM},
-    [ITEM_TM38] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, // TM38
+    [ITEM_TM38] = {gItemIcon_TM, gItemIconPalette_FireTMHM},
-    [ITEM_TM39] = {gItemIcon_TM, gItemIconPalette_RockTMHM}, // TM39
+    [ITEM_TM39] = {gItemIcon_TM, gItemIconPalette_RockTMHM},
-    [ITEM_TM40] = {gItemIcon_TM, gItemIconPalette_FlyingTMHM}, // TM40
+    [ITEM_TM40] = {gItemIcon_TM, gItemIconPalette_FlyingTMHM},
-    [ITEM_TM41] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, // TM41
+    [ITEM_TM41] = {gItemIcon_TM, gItemIconPalette_DarkTMHM},
-    [ITEM_TM42] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM42
+    [ITEM_TM42] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
-    [ITEM_TM43] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM43
+    [ITEM_TM43] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
-    [ITEM_TM44] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM44
+    [ITEM_TM44] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM},
-    [ITEM_TM45] = {gItemIcon_TM, gItemIconPalette_NormalTMHM}, // TM45
+    [ITEM_TM45] = {gItemIcon_TM, gItemIconPalette_NormalTMHM},
-    [ITEM_TM46] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, // TM46
+    [ITEM_TM46] = {gItemIcon_TM, gItemIconPalette_DarkTMHM},
-    [ITEM_TM47] = {gItemIcon_TM, gItemIconPalette_SteelTMHM}, // TM47
+    [ITEM_TM47] = {gItemIcon_TM, gItemIconPalette_SteelTMHM},
-    [ITEM_TM48] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM}, // TM48
+    [ITEM_TM48] = {gItemIcon_TM, gItemIconPalette_PsychicTMHM},
-    [ITEM_TM49] = {gItemIcon_TM, gItemIconPalette_DarkTMHM}, // TM49
+    [ITEM_TM49] = {gItemIcon_TM, gItemIconPalette_DarkTMHM},
-    [ITEM_TM50] = {gItemIcon_TM, gItemIconPalette_FireTMHM}, // TM50
+    [ITEM_TM50] = {gItemIcon_TM, gItemIconPalette_FireTMHM},
-    [ITEM_HM01] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, // HM01
+    [ITEM_HM01] = {gItemIcon_HM, gItemIconPalette_NormalTMHM},
-    [ITEM_HM02] = {gItemIcon_HM, gItemIconPalette_FlyingTMHM}, // HM02
+    [ITEM_HM02] = {gItemIcon_HM, gItemIconPalette_FlyingTMHM},
-    [ITEM_HM03] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, // HM03
+    [ITEM_HM03] = {gItemIcon_HM, gItemIconPalette_WaterTMHM},
-    [ITEM_HM04] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, // HM04
+    [ITEM_HM04] = {gItemIcon_HM, gItemIconPalette_NormalTMHM},
-    [ITEM_HM05] = {gItemIcon_HM, gItemIconPalette_NormalTMHM}, // HM05
+    [ITEM_HM05] = {gItemIcon_HM, gItemIconPalette_NormalTMHM},
-    [ITEM_HM06] = {gItemIcon_HM, gItemIconPalette_FightingTMHM}, // HM06
+    [ITEM_HM06] = {gItemIcon_HM, gItemIconPalette_FightingTMHM},
-    [ITEM_HM07] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, // HM07
+    [ITEM_HM07] = {gItemIcon_HM, gItemIconPalette_WaterTMHM},
-    [ITEM_HM08] = {gItemIcon_HM, gItemIconPalette_WaterTMHM}, // HM08
+    [ITEM_HM08] = {gItemIcon_HM, gItemIconPalette_WaterTMHM},
     // ????????
     [ITEM_15B] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
     [ITEM_15C] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},

src/data/pokemon/cry_ids.h

@@ -1,138 +1,138 @@
 const u16 gSpeciesIdToCryId[] =
 {
-    273, // TREECKO
+    [SPECIES_TREECKO - 277] = 273,
-    274, // GROVYLE
+    [SPECIES_GROVYLE - 277] = 274,
-    275, // SCEPTILE
+    [SPECIES_SCEPTILE - 277] = 275,
-    270, // TORCHIC
+    [SPECIES_TORCHIC - 277] = 270,
-    271, // COMBUSKEN
+    [SPECIES_COMBUSKEN - 277] = 271,
-    272, // BLAZIKEN
+    [SPECIES_BLAZIKEN - 277] = 272,
-    276, // MUDKIP
+    [SPECIES_MUDKIP - 277] = 276,
-    277, // MARSHTOMP
+    [SPECIES_MARSHTOMP - 277] = 277,
-    278, // SWAMPERT
+    [SPECIES_SWAMPERT - 277] = 278,
-    359, // POOCHYENA
+    [SPECIES_POOCHYENA - 277] = 359,
-    360, // MIGHTYENA
+    [SPECIES_MIGHTYENA - 277] = 360,
-    378, // ZIGZAGOON
+    [SPECIES_ZIGZAGOON - 277] = 378,
-    375, // LINOONE
+    [SPECIES_LINOONE - 277] = 375,
-    290, // WURMPLE
+    [SPECIES_WURMPLE - 277] = 290,
-    291, // SILCOON
+    [SPECIES_SILCOON - 277] = 291,
-    292, // BEAUTIFLY
+    [SPECIES_BEAUTIFLY - 277] = 292,
-    293, // CASCOON
+    [SPECIES_CASCOON - 277] = 293,
-    294, // DUSTOX
+    [SPECIES_DUSTOX - 277] = 294,
-    283, // LOTAD
+    [SPECIES_LOTAD - 277] = 283,
-    284, // LOMBRE
+    [SPECIES_LOMBRE - 277] = 284,
-    285, // LUDICOLO
+    [SPECIES_LUDICOLO - 277] = 285,
-    286, // SEEDOT
+    [SPECIES_SEEDOT - 277] = 286,
-    287, // NUZLEAF
+    [SPECIES_NUZLEAF - 277] = 287,
-    288, // SHIFTRY
+    [SPECIES_SHIFTRY - 277] = 288,
-    301, // NINCADA
+    [SPECIES_NINCADA - 277] = 301,
-    302, // NINJASK
+    [SPECIES_NINJASK - 277] = 302,
-    303, // SHEDINJA
+    [SPECIES_SHEDINJA - 277] = 303,
-    266, // TAILLOW
+    [SPECIES_TAILLOW - 277] = 266,
-    267, // SWELLOW
+    [SPECIES_SWELLOW - 277] = 267,
-    374, // SHROOMISH
+    [SPECIES_SHROOMISH - 277] = 374,
-    373, // BRELOOM
+    [SPECIES_BRELOOM - 277] = 373,
-    269, // SPINDA
+    [SPECIES_SPINDA - 277] = 269,
-    280, // WINGULL
+    [SPECIES_WINGULL - 277] = 280,
-    279, // PELIPPER
+    [SPECIES_PELIPPER - 277] = 279,
-    310, // SURSKIT
+    [SPECIES_SURSKIT - 277] = 310,
-    311, // MASQUERAIN
+    [SPECIES_MASQUERAIN - 277] = 311,
-    377, // WAILMER
+    [SPECIES_WAILMER - 277] = 377,
-    381, // WAILORD
+    [SPECIES_WAILORD - 277] = 381,
-    312, // SKITTY
+    [SPECIES_SKITTY - 277] = 312,
-    313, // DELCATTY
+    [SPECIES_DELCATTY - 277] = 313,
-    251, // KECLEON
+    [SPECIES_KECLEON - 277] = 251,
-    329, // BALTOY
+    [SPECIES_BALTOY - 277] = 329,
-    330, // CLAYDOL
+    [SPECIES_CLAYDOL - 277] = 330,
-    306, // NOSEPASS
+    [SPECIES_NOSEPASS - 277] = 306,
-    253, // TORKOAL
+    [SPECIES_TORKOAL - 277] = 253,
-    362, // SABLEYE
+    [SPECIES_SABLEYE - 277] = 362,
-    318, // BARBOACH
+    [SPECIES_BARBOACH - 277] = 318,
-    319, // WHISCASH
+    [SPECIES_WHISCASH - 277] = 319,
-    368, // LUVDISC
+    [SPECIES_LUVDISC - 277] = 368,
-    320, // CORPHISH
+    [SPECIES_CORPHISH - 277] = 320,
-    321, // CRAWDAUNT
+    [SPECIES_CRAWDAUNT - 277] = 321,
-    333, // FEEBAS
+    [SPECIES_FEEBAS - 277] = 333,
-    334, // MILOTIC
+    [SPECIES_MILOTIC - 277] = 334,
-    289, // CARVANHA
+    [SPECIES_CARVANHA - 277] = 289,
-    260, // SHARPEDO
+    [SPECIES_SHARPEDO - 277] = 260,
-    324, // TRAPINCH
+    [SPECIES_TRAPINCH - 277] = 324,
-    325, // VIBRAVA
+    [SPECIES_VIBRAVA - 277] = 325,
-    326, // FLYGON
+    [SPECIES_FLYGON - 277] = 326,
-    304, // MAKUHITA
+    [SPECIES_MAKUHITA - 277] = 304,
-    305, // HARIYAMA
+    [SPECIES_HARIYAMA - 277] = 305,
-    254, // ELECTRIKE
+    [SPECIES_ELECTRIKE - 277] = 254,
-    255, // MANECTRIC
+    [SPECIES_MANECTRIC - 277] = 255,
-    316, // NUMEL
+    [SPECIES_NUMEL - 277] = 316,
-    317, // CAMERUPT
+    [SPECIES_CAMERUPT - 277] = 317,
-    338, // SPHEAL
+    [SPECIES_SPHEAL - 277] = 338,
-    339, // SEALEO
+    [SPECIES_SEALEO - 277] = 339,
-    340, // WALREIN
+    [SPECIES_WALREIN - 277] = 340,
-    327, // CACNEA
+    [SPECIES_CACNEA - 277] = 327,
-    328, // CACTURNE
+    [SPECIES_CACTURNE - 277] = 328,
-    383, // SNORUNT
+    [SPECIES_SNORUNT - 277] = 383,
-    307, // GLALIE
+    [SPECIES_GLALIE - 277] = 307,
-    331, // LUNATONE
+    [SPECIES_LUNATONE - 277] = 331,
-    332, // SOLROCK
+    [SPECIES_SOLROCK - 277] = 332,
-    262, // AZURILL
+    [SPECIES_AZURILL - 277] = 262,
-    322, // SPOINK
+    [SPECIES_SPOINK - 277] = 322,
-    323, // GRUMPIG
+    [SPECIES_GRUMPIG - 277] = 323,
-    308, // PLUSLE
+    [SPECIES_PLUSLE - 277] = 308,
-    309, // MINUN
+    [SPECIES_MINUN - 277] = 309,
-    363, // MAWILE
+    [SPECIES_MAWILE - 277] = 363,
-    336, // MEDITITE
+    [SPECIES_MEDITITE - 277] = 336,
-    337, // MEDICHAM
+    [SPECIES_MEDICHAM - 277] = 337,
-    263, // SWABLU
+    [SPECIES_SWABLU - 277] = 263,
-    264, // ALTARIA
+    [SPECIES_ALTARIA - 277] = 264,
-    258, // WYNAUT
+    [SPECIES_WYNAUT - 277] = 258,
-    256, // DUSKULL
+    [SPECIES_DUSKULL - 277] = 256,
-    361, // DUSCLOPS
+    [SPECIES_DUSCLOPS - 277] = 361,
-    252, // ROSELIA
+    [SPECIES_ROSELIA - 277] = 252,
-    298, // SLAKOTH
+    [SPECIES_SLAKOTH - 277] = 298,
-    299, // VIGOROTH
+    [SPECIES_VIGOROTH - 277] = 299,
-    300, // SLAKING
+    [SPECIES_SLAKING - 277] = 300,
-    314, // GULPIN
+    [SPECIES_GULPIN - 277] = 314,
-    315, // SWALOT
+    [SPECIES_SWALOT - 277] = 315,
-    376, // TROPIUS
+    [SPECIES_TROPIUS - 277] = 376,
-    382, // WHISMUR
+    [SPECIES_WHISMUR - 277] = 382,
-    380, // LOUDRED
+    [SPECIES_LOUDRED - 277] = 380,
-    379, // EXPLOUD
+    [SPECIES_EXPLOUD - 277] = 379,
-    341, // CLAMPERL
+    [SPECIES_CLAMPERL - 277] = 341,
-    342, // HUNTAIL
+    [SPECIES_HUNTAIL - 277] = 342,
-    343, // GOREBYSS
+    [SPECIES_GOREBYSS - 277] = 343,
-    335, // ABSOL
+    [SPECIES_ABSOL - 277] = 335,
-    282, // SHUPPET
+    [SPECIES_SHUPPET - 277] = 282,
-    281, // BANETTE
+    [SPECIES_BANETTE - 277] = 281,
-    259, // SEVIPER
+    [SPECIES_SEVIPER - 277] = 259,
-    261, // ZANGOOSE
+    [SPECIES_ZANGOOSE - 277] = 261,
-    367, // RELICANTH
+    [SPECIES_RELICANTH - 277] = 367,
-    364, // ARON
+    [SPECIES_ARON - 277] = 364,
-    365, // LAIRON
+    [SPECIES_LAIRON - 277] = 365,
-    366, // AGGRON
+    [SPECIES_AGGRON - 277] = 366,
-    356, // CASTFORM
+    [SPECIES_CASTFORM - 277] = 356,
-    357, // VOLBEAT
+    [SPECIES_VOLBEAT - 277] = 357,
-    358, // ILLUMISE
+    [SPECIES_ILLUMISE - 277] = 358,
-    344, // LILEEP
+    [SPECIES_LILEEP - 277] = 344,
-    345, // CRADILY
+    [SPECIES_CRADILY - 277] = 345,
-    346, // ANORITH
+    [SPECIES_ANORITH - 277] = 346,
-    347, // ARMALDO
+    [SPECIES_ARMALDO - 277] = 347,
-    295, // RALTS
+    [SPECIES_RALTS - 277] = 295,
-    296, // KIRLIA
+    [SPECIES_KIRLIA - 277] = 296,
-    297, // GARDEVOIR
+    [SPECIES_GARDEVOIR - 277] = 297,
-    351, // BAGON
+    [SPECIES_BAGON - 277] = 351,
-    352, // SHELGON
+    [SPECIES_SHELGON - 277] = 352,
-    372, // SALAMENCE
+    [SPECIES_SALAMENCE - 277] = 372,
-    348, // BELDUM
+    [SPECIES_BELDUM - 277] = 348,
-    349, // METANG
+    [SPECIES_METANG - 277] = 349,
-    350, // METAGROSS
+    [SPECIES_METAGROSS - 277] = 350,
-    353, // REGIROCK
+    [SPECIES_REGIROCK - 277] = 353,
-    354, // REGICE
+    [SPECIES_REGICE - 277] = 354,
-    355, // REGISTEEL
+    [SPECIES_REGISTEEL - 277] = 355,
-    370, // KYOGRE
+    [SPECIES_KYOGRE - 277] = 370,
-    369, // GROUDON
+    [SPECIES_GROUDON - 277] = 369,
-    371, // RAYQUAZA
+    [SPECIES_RAYQUAZA - 277] = 371,
-    257, // LATIAS
+    [SPECIES_LATIAS - 277] = 257,
-    384, // LATIOS
+    [SPECIES_LATIOS - 277] = 384,
-    385, // JIRACHI
+    [SPECIES_JIRACHI - 277] = 385,
-    386, // DEOXYS
+    [SPECIES_DEOXYS - 277] = 386,
-    387  // CHIMECHO
+    [SPECIES_CHIMECHO - 277] = 387,
 };

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

src/data2b.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "data2.h"
 #include "graphics.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "constants/species.h"
 
 const u16 gUnknown_082FF1D8[] = INCBIN_U16("graphics/link/minigame_digits.gbapal");

src/daycare.c

@@ -532,7 +532,7 @@ static void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv)
     s32 i, j;
     u8 temp[NUM_STATS];
 
-    ivs[selectedIv] = 0xff;
+    ivs[selectedIv] = 0xFF;
     for (i = 0; i < NUM_STATS; i++)
     {
         temp[i] = ivs[i];
@@ -541,7 +541,7 @@ static void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv)
     j = 0;
     for (i = 0; i < NUM_STATS; i++)
     {
-        if (temp[i] != 0xff)
+        if (temp[i] != 0xFF)
             ivs[j++] = temp[i];
     }
 }
@@ -681,7 +681,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru
             {
                 if (sHatchedEggFatherMoves[i] == sHatchedEggEggMoves[j])
                 {
-                    if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xffff)
+                    if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xFFFF)
                         DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]);
                     break;
                 }
@@ -700,7 +700,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]) == 0xffff)
+                    if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xFFFF)
                         DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]);
                 }
             }
@@ -725,7 +725,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]) == 0xffff)
+                if (GiveMoveToMon(egg, sHatchedEggFinalMoves[i]) == 0xFFFF)
                     DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFinalMoves[i]);
                 break;
             }

src/decompress.c

@@ -2,7 +2,7 @@
 #include "decompress.h"
 #include "constants/species.h"
 #include "text.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "pokemon.h"
 
 EWRAM_DATA ALIGNED(4) u8 gDecompressionBuffer[0x4000] = {0};

src/decoration.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "constants/decorations.h"
 #include "decompress.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "text.h"
 #include "string_util.h"
 #include "international_string_util.h"
@@ -312,7 +312,7 @@ const struct SpriteFrameImage sDecorSelectorSpriteFrameImages = {
 };
 
 const struct SpriteTemplate sDecorSelectorSpriteTemplate = {
-    0xffff,
+    0xFFFF,
     OVERWORLD_PLACE_DECOR_SELECTOR_PAL_TAG,
     &sDecorSelectorOam,
     sDecorSelectorAnims,

src/dewford_trend.c

@@ -3,7 +3,7 @@
 #include "easy_chat.h"
 #include "event_data.h"
 #include "link.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "random.h"
 #include "text.h"
 #include "tv.h"

src/diploma.c

@@ -5,7 +5,7 @@
 #include "gpu_regs.h"
 #include "scanline_effect.h"
 #include "task.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "decompress.h"
 #include "bg.h"
 #include "window.h"

src/easy_chat.c

@@ -1,7 +1,7 @@
 
 // Includes
 #include "global.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "constants/songs.h"
 #include "sound.h"
 #include "overworld.h"

src/egg_hatch.c

@@ -17,7 +17,7 @@
 #include "menu.h"
 #include "trig.h"
 #include "random.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "dma3.h"
 #include "gpu_regs.h"
 #include "bg.h"

src/event_object_movement.c

@@ -9,7 +9,7 @@
 #include "field_effect_helpers.h"
 #include "field_player_avatar.h"
 #include "fieldmap.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "mauville_old_man.h"
 #include "metatile_behavior.h"
 #include "overworld.h"
@@ -142,255 +142,255 @@ void (*const gCameraObjectFuncs[])(struct Sprite *) = {
 // movement type callbacks
 static void (*const sMovementTypeCallbacks[])(struct Sprite *) =
 {
-    MovementType_None,                         // MOVEMENT_TYPE_NONE
+    [MOVEMENT_TYPE_NONE] = MovementType_None,
-    MovementType_LookAround,                   // MOVEMENT_TYPE_LOOK_AROUND
+    [MOVEMENT_TYPE_LOOK_AROUND] = MovementType_LookAround,
-    MovementType_WanderAround,                 // MOVEMENT_TYPE_WANDER_AROUND
+    [MOVEMENT_TYPE_WANDER_AROUND] = MovementType_WanderAround,
-    MovementType_WanderUpAndDown,              // MOVEMENT_TYPE_WANDER_UP_AND_DOWN
+    [MOVEMENT_TYPE_WANDER_UP_AND_DOWN] = MovementType_WanderUpAndDown,
-    MovementType_WanderUpAndDown,              // MOVEMENT_TYPE_WANDER_DOWN_AND_UP
+    [MOVEMENT_TYPE_WANDER_DOWN_AND_UP] = MovementType_WanderUpAndDown,
-    MovementType_WanderLeftAndRight,           // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT
+    [MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT] = MovementType_WanderLeftAndRight,
-    MovementType_WanderLeftAndRight,           // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT
+    [MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT] = MovementType_WanderLeftAndRight,
-    MovementType_FaceDirection,                // MOVEMENT_TYPE_FACE_UP
+    [MOVEMENT_TYPE_FACE_UP] = MovementType_FaceDirection,
-    MovementType_FaceDirection,                // MOVEMENT_TYPE_FACE_DOWN
+    [MOVEMENT_TYPE_FACE_DOWN] = MovementType_FaceDirection,
-    MovementType_FaceDirection,                // MOVEMENT_TYPE_FACE_LEFT
+    [MOVEMENT_TYPE_FACE_LEFT] = MovementType_FaceDirection,
-    MovementType_FaceDirection,                // MOVEMENT_TYPE_FACE_RIGHT
+    [MOVEMENT_TYPE_FACE_RIGHT] = MovementType_FaceDirection,
-    MovementType_Player,                       // MOVEMENT_TYPE_PLAYER
+    [MOVEMENT_TYPE_PLAYER] = MovementType_Player,
-    MovementType_BerryTreeGrowth,              // MOVEMENT_TYPE_BERRY_TREE_GROWTH
+    [MOVEMENT_TYPE_BERRY_TREE_GROWTH] = MovementType_BerryTreeGrowth,
-    MovementType_FaceDownAndUp,                // MOVEMENT_TYPE_FACE_DOWN_AND_UP
+    [MOVEMENT_TYPE_FACE_DOWN_AND_UP] = MovementType_FaceDownAndUp,
-    MovementType_FaceLeftAndRight,             // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT
+    [MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT] = MovementType_FaceLeftAndRight,
-    MovementType_FaceUpAndLeft,                // MOVEMENT_TYPE_FACE_UP_AND_LEFT
+    [MOVEMENT_TYPE_FACE_UP_AND_LEFT] = MovementType_FaceUpAndLeft,
-    MovementType_FaceUpAndRight,               // MOVEMENT_TYPE_FACE_UP_AND_RIGHT
+    [MOVEMENT_TYPE_FACE_UP_AND_RIGHT] = MovementType_FaceUpAndRight,
-    MovementType_FaceDownAndLeft,              // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT
+    [MOVEMENT_TYPE_FACE_DOWN_AND_LEFT] = MovementType_FaceDownAndLeft,
-    MovementType_FaceDownAndRight,             // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT
+    [MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT] = MovementType_FaceDownAndRight,
-    MovementType_FaceDownUpAndLeft,            // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT
+    [MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT] = MovementType_FaceDownUpAndLeft,
-    MovementType_FaceDownUpAndRight,           // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT
+    [MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT] = MovementType_FaceDownUpAndRight,
-    MovementType_FaceUpRightAndLeft,           // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT
+    [MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT] = MovementType_FaceUpRightAndLeft,
-    MovementType_FaceDownRightAndLeft,         // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT
+    [MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT] = MovementType_FaceDownRightAndLeft,
-    MovementType_RotateCounterclockwise,       // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE
+    [MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE] = MovementType_RotateCounterclockwise,
-    MovementType_RotateClockwise,              // MOVEMENT_TYPE_ROTATE_CLOCKWISE
+    [MOVEMENT_TYPE_ROTATE_CLOCKWISE] = MovementType_RotateClockwise,
-    MovementType_WalkBackAndForth,             // MOVEMENT_TYPE_WALK_UP_AND_DOWN
+    [MOVEMENT_TYPE_WALK_UP_AND_DOWN] = MovementType_WalkBackAndForth,
-    MovementType_WalkBackAndForth,             // MOVEMENT_TYPE_WALK_DOWN_AND_UP
+    [MOVEMENT_TYPE_WALK_DOWN_AND_UP] = MovementType_WalkBackAndForth,
-    MovementType_WalkBackAndForth,             // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT
+    [MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT] = MovementType_WalkBackAndForth,
-    MovementType_WalkBackAndForth,             // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT
+    [MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT] = MovementType_WalkBackAndForth,
-    MovementType_WalkSequenceUpRightLeftDown,  // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN] = MovementType_WalkSequenceUpRightLeftDown,
-    MovementType_WalkSequenceRightLeftDownUp,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP] = MovementType_WalkSequenceRightLeftDownUp,
-    MovementType_WalkSequenceDownUpRightLeft,  // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT] = MovementType_WalkSequenceDownUpRightLeft,
-    MovementType_WalkSequenceLeftDownUpRight,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT] = MovementType_WalkSequenceLeftDownUpRight,
-    MovementType_WalkSequenceUpLeftRightDown,  // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN] = MovementType_WalkSequenceUpLeftRightDown,
-    MovementType_WalkSequenceLeftRightDownUp,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP] = MovementType_WalkSequenceLeftRightDownUp,
-    MovementType_WalkSequenceDownUpLeftRight,  // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT] = MovementType_WalkSequenceDownUpLeftRight,
-    MovementType_WalkSequenceRightDownUpLeft,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT] = MovementType_WalkSequenceRightDownUpLeft,
-    MovementType_WalkSequenceLeftUpDownRight,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT] = MovementType_WalkSequenceLeftUpDownRight,
-    MovementType_WalkSequenceUpDownRightLeft,  // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT] = MovementType_WalkSequenceUpDownRightLeft,
-    MovementType_WalkSequenceRightLeftUpDown,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN] = MovementType_WalkSequenceRightLeftUpDown,
-    MovementType_WalkSequenceDownRightLeftUp,  // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP] = MovementType_WalkSequenceDownRightLeftUp,
-    MovementType_WalkSequenceRightUpDownLeft,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT] = MovementType_WalkSequenceRightUpDownLeft,
-    MovementType_WalkSequenceUpDownLeftRight,  // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT] = MovementType_WalkSequenceUpDownLeftRight,
-    MovementType_WalkSequenceLeftRightUpDown,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN] = MovementType_WalkSequenceLeftRightUpDown,
-    MovementType_WalkSequenceDownLeftRightUp,  // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP] = MovementType_WalkSequenceDownLeftRightUp,
-    MovementType_WalkSequenceUpLeftDownRight,  // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT] = MovementType_WalkSequenceUpLeftDownRight,
-    MovementType_WalkSequenceDownRightUpLeft,  // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT] = MovementType_WalkSequenceDownRightUpLeft,
-    MovementType_WalkSequenceLeftDownRightUp,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP] = MovementType_WalkSequenceLeftDownRightUp,
-    MovementType_WalkSequenceRightUpLeftDown,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN] = MovementType_WalkSequenceRightUpLeftDown,
-    MovementType_WalkSequenceUpRightDownLeft,  // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT] = MovementType_WalkSequenceUpRightDownLeft,
-    MovementType_WalkSequenceDownLeftUpRight,  // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT] = MovementType_WalkSequenceDownLeftUpRight,
-    MovementType_WalkSequenceLeftUpRightDown,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN] = MovementType_WalkSequenceLeftUpRightDown,
-    MovementType_WalkSequenceRightDownLeftUp,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP] = MovementType_WalkSequenceRightDownLeftUp,
-    MovementType_CopyPlayer,                   // MOVEMENT_TYPE_COPY_PLAYER
+    [MOVEMENT_TYPE_COPY_PLAYER] = MovementType_CopyPlayer,
-    MovementType_CopyPlayer,                   // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE
+    [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE] = MovementType_CopyPlayer,
-    MovementType_CopyPlayer,                   // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE
+    [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE] = MovementType_CopyPlayer,
-    MovementType_CopyPlayer,                   // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE
+    [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE] = MovementType_CopyPlayer,
-    MovementType_TreeDisguise,                 // MOVEMENT_TYPE_TREE_DISGUISE
+    [MOVEMENT_TYPE_TREE_DISGUISE] = MovementType_TreeDisguise,
-    MovementType_MountainDisguise,             // MOVEMENT_TYPE_MOUNTAIN_DISGUISE
+    [MOVEMENT_TYPE_MOUNTAIN_DISGUISE] = MovementType_MountainDisguise,
-    MovementType_CopyPlayerInGrass,            // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS
+    [MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS] = MovementType_CopyPlayerInGrass,
-    MovementType_CopyPlayerInGrass,            // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS
+    [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS] = MovementType_CopyPlayerInGrass,
-    MovementType_CopyPlayerInGrass,            // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS
+    [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS] = MovementType_CopyPlayerInGrass,
-    MovementType_CopyPlayerInGrass,            // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS
+    [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS] = MovementType_CopyPlayerInGrass,
-    MovementType_Hidden,                       // MOVEMENT_TYPE_HIDDEN
+    [MOVEMENT_TYPE_HIDDEN] = MovementType_Hidden,
-    MovementType_WalkInPlace,                  // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN
+    [MOVEMENT_TYPE_WALK_IN_PLACE_DOWN] = MovementType_WalkInPlace,
-    MovementType_WalkInPlace,                  // MOVEMENT_TYPE_WALK_IN_PLACE_UP
+    [MOVEMENT_TYPE_WALK_IN_PLACE_UP] = MovementType_WalkInPlace,
-    MovementType_WalkInPlace,                  // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT
+    [MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = MovementType_WalkInPlace,
-    MovementType_WalkInPlace,                  // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT
+    [MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT] = MovementType_WalkInPlace,
-    MovementType_JogInPlace,                   // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN
+    [MOVEMENT_TYPE_JOG_IN_PLACE_DOWN] = MovementType_JogInPlace,
-    MovementType_JogInPlace,                   // MOVEMENT_TYPE_JOG_IN_PLACE_UP
+    [MOVEMENT_TYPE_JOG_IN_PLACE_UP] = MovementType_JogInPlace,
-    MovementType_JogInPlace,                   // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT
+    [MOVEMENT_TYPE_JOG_IN_PLACE_LEFT] = MovementType_JogInPlace,
-    MovementType_JogInPlace,                   // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT
+    [MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT] = MovementType_JogInPlace,
-    MovementType_RunInPlace,                   // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN
+    [MOVEMENT_TYPE_RUN_IN_PLACE_DOWN] = MovementType_RunInPlace,
-    MovementType_RunInPlace,                   // MOVEMENT_TYPE_RUN_IN_PLACE_UP
+    [MOVEMENT_TYPE_RUN_IN_PLACE_UP] = MovementType_RunInPlace,
-    MovementType_RunInPlace,                   // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT
+    [MOVEMENT_TYPE_RUN_IN_PLACE_LEFT] = MovementType_RunInPlace,
-    MovementType_RunInPlace,                   // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT
+    [MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT] = MovementType_RunInPlace,
-    MovementType_Invisible,                    // MOVEMENT_TYPE_INVISIBLE
+    [MOVEMENT_TYPE_INVISIBLE] = MovementType_Invisible,
-    MovementType_WalkSlowlyInPlace,            // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN
+    [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN] = MovementType_WalkSlowlyInPlace,
-    MovementType_WalkSlowlyInPlace,            // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP
+    [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP] = MovementType_WalkSlowlyInPlace,
-    MovementType_WalkSlowlyInPlace,            // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT
+    [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT] = MovementType_WalkSlowlyInPlace,
-    MovementType_WalkSlowlyInPlace,            // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT
+    [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT] = MovementType_WalkSlowlyInPlace,
 };
 
 const u8 gRangedMovementTypes[] = {
-    0, // MOVEMENT_TYPE_NONE
+    [MOVEMENT_TYPE_NONE] = 0,
-    0, // MOVEMENT_TYPE_LOOK_AROUND
+    [MOVEMENT_TYPE_LOOK_AROUND] = 0,
-    1, // MOVEMENT_TYPE_WANDER_AROUND
+    [MOVEMENT_TYPE_WANDER_AROUND] = 1,
-    1, // MOVEMENT_TYPE_WANDER_UP_AND_DOWN
+    [MOVEMENT_TYPE_WANDER_UP_AND_DOWN] = 1,
-    1, // MOVEMENT_TYPE_WANDER_DOWN_AND_UP
+    [MOVEMENT_TYPE_WANDER_DOWN_AND_UP] = 1,
-    1, // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT
+    [MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT] = 1,
-    1, // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT
+    [MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT] = 1,
-    0, // MOVEMENT_TYPE_FACE_UP
+    [MOVEMENT_TYPE_FACE_UP] = 0,
-    0, // MOVEMENT_TYPE_FACE_DOWN
+    [MOVEMENT_TYPE_FACE_DOWN] = 0,
-    0, // MOVEMENT_TYPE_FACE_LEFT
+    [MOVEMENT_TYPE_FACE_LEFT] = 0,
-    0, // MOVEMENT_TYPE_FACE_RIGHT
+    [MOVEMENT_TYPE_FACE_RIGHT] = 0,
-    0, // MOVEMENT_TYPE_PLAYER
+    [MOVEMENT_TYPE_PLAYER] = 0,
-    0, // MOVEMENT_TYPE_BERRY_TREE_GROWTH
+    [MOVEMENT_TYPE_BERRY_TREE_GROWTH] = 0,
-    0, // MOVEMENT_TYPE_FACE_DOWN_AND_UP
+    [MOVEMENT_TYPE_FACE_DOWN_AND_UP] = 0,
-    0, // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT
+    [MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT] = 0,
-    0, // MOVEMENT_TYPE_FACE_UP_AND_LEFT
+    [MOVEMENT_TYPE_FACE_UP_AND_LEFT] = 0,
-    0, // MOVEMENT_TYPE_FACE_UP_AND_RIGHT
+    [MOVEMENT_TYPE_FACE_UP_AND_RIGHT] = 0,
-    0, // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT
+    [MOVEMENT_TYPE_FACE_DOWN_AND_LEFT] = 0,
-    0, // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT
+    [MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT] = 0,
-    0, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT
+    [MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT] = 0,
-    0, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT
+    [MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT] = 0,
-    0, // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT
+    [MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT] = 0,
-    0, // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT
+    [MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT] = 0,
-    0, // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE
+    [MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE] = 0,
-    0, // MOVEMENT_TYPE_ROTATE_CLOCKWISE
+    [MOVEMENT_TYPE_ROTATE_CLOCKWISE] = 0,
-    1, // MOVEMENT_TYPE_WALK_UP_AND_DOWN
+    [MOVEMENT_TYPE_WALK_UP_AND_DOWN] = 1,
-    1, // MOVEMENT_TYPE_WALK_DOWN_AND_UP
+    [MOVEMENT_TYPE_WALK_DOWN_AND_UP] = 1,
-    1, // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT
+    [MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT] = 1,
-    1, // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT
+    [MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT] = 1,
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN] = 1,
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP] = 1,
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT] = 1,
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT] = 1,
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN] = 1,
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP] = 1,
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT] = 1,
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT] = 1,
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT] = 1,
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT] = 1,
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN] = 1,
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP] = 1,
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT] = 1,
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT] = 1,
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN] = 1,
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP] = 1,
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT] = 1,
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT] = 1,
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP] = 1,
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN] = 1,
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT] = 1,
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT] = 1,
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN] = 1,
-    1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP] = 1,
-    1, // MOVEMENT_TYPE_COPY_PLAYER
+    [MOVEMENT_TYPE_COPY_PLAYER] = 1,
-    1, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE
+    [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE] = 1,
-    1, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE
+    [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE] = 1,
-    1, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE
+    [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE] = 1,
-    0, // MOVEMENT_TYPE_TREE_DISGUISE
+    [MOVEMENT_TYPE_TREE_DISGUISE] = 0,
-    0, // MOVEMENT_TYPE_MOUNTAIN_DISGUISE
+    [MOVEMENT_TYPE_MOUNTAIN_DISGUISE] = 0,
-    1, // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS
+    [MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS] = 1,
-    1, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS
+    [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS] = 1,
-    1, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS
+    [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS] = 1,
-    1, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS
+    [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS] = 1,
-    0, // MOVEMENT_TYPE_HIDDEN
+    [MOVEMENT_TYPE_HIDDEN] = 0,
-    0, // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN
+    [MOVEMENT_TYPE_WALK_IN_PLACE_DOWN] = 0,
-    0, // MOVEMENT_TYPE_WALK_IN_PLACE_UP
+    [MOVEMENT_TYPE_WALK_IN_PLACE_UP] = 0,
-    0, // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT
+    [MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = 0,
-    0, // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT
+    [MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT] = 0,
-    0, // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN
+    [MOVEMENT_TYPE_JOG_IN_PLACE_DOWN] = 0,
-    0, // MOVEMENT_TYPE_JOG_IN_PLACE_UP
+    [MOVEMENT_TYPE_JOG_IN_PLACE_UP] = 0,
-    0, // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT
+    [MOVEMENT_TYPE_JOG_IN_PLACE_LEFT] = 0,
-    0, // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT
+    [MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT] = 0,
-    0, // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN
+    [MOVEMENT_TYPE_RUN_IN_PLACE_DOWN] = 0,
-    0, // MOVEMENT_TYPE_RUN_IN_PLACE_UP
+    [MOVEMENT_TYPE_RUN_IN_PLACE_UP] = 0,
-    0, // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT
+    [MOVEMENT_TYPE_RUN_IN_PLACE_LEFT] = 0,
-    0, // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT
+    [MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT] = 0,
-    0, // MOVEMENT_TYPE_INVISIBLE
+    [MOVEMENT_TYPE_INVISIBLE] = 0,
-    0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN
+    [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN] = 0,
-    0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP
+    [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP] = 0,
-    0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT
+    [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT] = 0,
-    0, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT
+    [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT] = 0,
 };
 
 const u8 gInitialMovementTypeFacingDirections[] = {
-    DIR_SOUTH, // MOVEMENT_TYPE_NONE
+    [MOVEMENT_TYPE_NONE] = DIR_SOUTH,
-    DIR_SOUTH, // MOVEMENT_TYPE_LOOK_AROUND
+    [MOVEMENT_TYPE_LOOK_AROUND] = DIR_SOUTH,
-    DIR_SOUTH, // MOVEMENT_TYPE_WANDER_AROUND
+    [MOVEMENT_TYPE_WANDER_AROUND] = DIR_SOUTH,
-    DIR_NORTH, // MOVEMENT_TYPE_WANDER_UP_AND_DOWN
+    [MOVEMENT_TYPE_WANDER_UP_AND_DOWN] = DIR_NORTH,
-    DIR_SOUTH, // MOVEMENT_TYPE_WANDER_DOWN_AND_UP
+    [MOVEMENT_TYPE_WANDER_DOWN_AND_UP] = DIR_SOUTH,
-    DIR_WEST,  // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT
+    [MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT] = DIR_WEST,
-    DIR_EAST,  // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT
+    [MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT] = DIR_EAST,
-    DIR_NORTH, // MOVEMENT_TYPE_FACE_UP
+    [MOVEMENT_TYPE_FACE_UP] = DIR_NORTH,
-    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN
+    [MOVEMENT_TYPE_FACE_DOWN] = DIR_SOUTH,
-    DIR_WEST,  // MOVEMENT_TYPE_FACE_LEFT
+    [MOVEMENT_TYPE_FACE_LEFT] = DIR_WEST,
-    DIR_EAST,  // MOVEMENT_TYPE_FACE_RIGHT
+    [MOVEMENT_TYPE_FACE_RIGHT] = DIR_EAST,
-    DIR_SOUTH, // MOVEMENT_TYPE_PLAYER
+    [MOVEMENT_TYPE_PLAYER] = DIR_SOUTH,
-    DIR_SOUTH, // MOVEMENT_TYPE_BERRY_TREE_GROWTH
+    [MOVEMENT_TYPE_BERRY_TREE_GROWTH] = DIR_SOUTH,
-    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_UP
+    [MOVEMENT_TYPE_FACE_DOWN_AND_UP] = DIR_SOUTH,
-    DIR_WEST,  // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT
+    [MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT] = DIR_WEST,
-    DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_AND_LEFT
+    [MOVEMENT_TYPE_FACE_UP_AND_LEFT] = DIR_NORTH,
-    DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_AND_RIGHT
+    [MOVEMENT_TYPE_FACE_UP_AND_RIGHT] = DIR_NORTH,
-    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT
+    [MOVEMENT_TYPE_FACE_DOWN_AND_LEFT] = DIR_SOUTH,
-    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT
+    [MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT] = DIR_SOUTH,
-    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT
+    [MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT] = DIR_SOUTH,
-    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT
+    [MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT] = DIR_SOUTH,
-    DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT
+    [MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT] = DIR_NORTH,
-    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT
+    [MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT] = DIR_SOUTH,
-    DIR_SOUTH, // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE
+    [MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE] = DIR_SOUTH,
-    DIR_SOUTH, // MOVEMENT_TYPE_ROTATE_CLOCKWISE
+    [MOVEMENT_TYPE_ROTATE_CLOCKWISE] = DIR_SOUTH,
-    DIR_NORTH, // MOVEMENT_TYPE_WALK_UP_AND_DOWN
+    [MOVEMENT_TYPE_WALK_UP_AND_DOWN] = DIR_NORTH,
-    DIR_SOUTH, // MOVEMENT_TYPE_WALK_DOWN_AND_UP
+    [MOVEMENT_TYPE_WALK_DOWN_AND_UP] = DIR_SOUTH,
-    DIR_WEST,  // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT
+    [MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT] = DIR_WEST,
-    DIR_EAST,  // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT
+    [MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT] = DIR_EAST,
-    DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN] = DIR_NORTH,
-    DIR_EAST,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP] = DIR_EAST,
-    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT] = DIR_SOUTH,
-    DIR_WEST,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT] = DIR_WEST,
-    DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN] = DIR_NORTH,
-    DIR_WEST,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP] = DIR_WEST,
-    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT] = DIR_SOUTH,
-    DIR_EAST,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT] = DIR_EAST,
-    DIR_WEST,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT] = DIR_WEST,
-    DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT] = DIR_NORTH,
-    DIR_EAST,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN] = DIR_EAST,
-    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP] = DIR_SOUTH,
-    DIR_EAST,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT] = DIR_EAST,
-    DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT] = DIR_NORTH,
-    DIR_WEST,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN] = DIR_WEST,
-    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP] = DIR_SOUTH,
-    DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT] = DIR_NORTH,
-    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT] = DIR_SOUTH,
-    DIR_WEST,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP] = DIR_WEST,
-    DIR_EAST,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN] = DIR_EAST,
-    DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT] = DIR_NORTH,
-    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT
+    [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT] = DIR_SOUTH,
-    DIR_WEST,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN
+    [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN] = DIR_WEST,
-    DIR_EAST,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP
+    [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP] = DIR_EAST,
-    DIR_NORTH, // MOVEMENT_TYPE_COPY_PLAYER
+    [MOVEMENT_TYPE_COPY_PLAYER] = DIR_NORTH,
-    DIR_SOUTH, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE
+    [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE] = DIR_SOUTH,
-    DIR_WEST,  // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE
+    [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE] = DIR_WEST,
-    DIR_EAST,  // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE
+    [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE] = DIR_EAST,
-    DIR_SOUTH, // MOVEMENT_TYPE_TREE_DISGUISE
+    [MOVEMENT_TYPE_TREE_DISGUISE] = DIR_SOUTH,
-    DIR_SOUTH, // MOVEMENT_TYPE_MOUNTAIN_DISGUISE
+    [MOVEMENT_TYPE_MOUNTAIN_DISGUISE] = DIR_SOUTH,
-    DIR_NORTH, // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS
+    [MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS] = DIR_NORTH,
-    DIR_SOUTH, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS
+    [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS] = DIR_SOUTH,
-    DIR_WEST,  // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS
+    [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS] = DIR_WEST,
-    DIR_EAST,  // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS
+    [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS] = DIR_EAST,
-    DIR_SOUTH, // MOVEMENT_TYPE_HIDDEN
+    [MOVEMENT_TYPE_HIDDEN] = DIR_SOUTH,
-    DIR_SOUTH, // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN
+    [MOVEMENT_TYPE_WALK_IN_PLACE_DOWN] = DIR_SOUTH,
-    DIR_NORTH, // MOVEMENT_TYPE_WALK_IN_PLACE_UP
+    [MOVEMENT_TYPE_WALK_IN_PLACE_UP] = DIR_NORTH,
-    DIR_WEST,  // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT
+    [MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = DIR_WEST,
-    DIR_EAST,  // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT
+    [MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT] = DIR_EAST,
-    DIR_SOUTH, // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN
+    [MOVEMENT_TYPE_JOG_IN_PLACE_DOWN] = DIR_SOUTH,
-    DIR_NORTH, // MOVEMENT_TYPE_JOG_IN_PLACE_UP
+    [MOVEMENT_TYPE_JOG_IN_PLACE_UP] = DIR_NORTH,
-    DIR_WEST,  // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT
+    [MOVEMENT_TYPE_JOG_IN_PLACE_LEFT] = DIR_WEST,
-    DIR_EAST,  // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT
+    [MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT] = DIR_EAST,
-    DIR_SOUTH, // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN
+    [MOVEMENT_TYPE_RUN_IN_PLACE_DOWN] = DIR_SOUTH,
-    DIR_NORTH, // MOVEMENT_TYPE_RUN_IN_PLACE_UP
+    [MOVEMENT_TYPE_RUN_IN_PLACE_UP] = DIR_NORTH,
-    DIR_WEST,  // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT
+    [MOVEMENT_TYPE_RUN_IN_PLACE_LEFT] = DIR_WEST,
-    DIR_EAST,  // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT
+    [MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT] = DIR_EAST,
-    DIR_SOUTH, // MOVEMENT_TYPE_INVISIBLE
+    [MOVEMENT_TYPE_INVISIBLE] = DIR_SOUTH,
-    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN
+    [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN] = DIR_SOUTH,
-    DIR_NORTH, // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP
+    [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP] = DIR_NORTH,
-    DIR_WEST,  // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT
+    [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT] = DIR_WEST,
-    DIR_EAST,  // MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT
+    [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT] = DIR_EAST,
 };
 
 #define EVENT_OBJ_PAL_TAG_0  0x1103
@@ -668,181 +668,181 @@ const s16 gMovementDelaysShort[] =  {32, 48,  64,  80};
 #include "data/field_event_obj/movement_type_func_tables.h"
 
 const u8 gFaceDirectionAnimNums[] = {
-    0, // DIR_NONE
+    [DIR_NONE] = 0,
-    0, // DIR_SOUTH
+    [DIR_SOUTH] = 0,
-    1, // DIR_NORTH
+    [DIR_NORTH] = 1,
-    2, // DIR_WEST
+    [DIR_WEST] = 2,
-    3, // DIR_EAST
+    [DIR_EAST] = 3,
-    0, // DIR_SOUTHWEST
+    [DIR_SOUTHWEST] = 0,
-    0, // DIR_SOUTHEAST
+    [DIR_SOUTHEAST] = 0,
-    1, // DIR_NORTHWEST
+    [DIR_NORTHWEST] = 1,
-    1, // DIR_NORTHEAST
+    [DIR_NORTHEAST] = 1,
 };
 const u8 gMoveDirectionAnimNums[] = {
-    4, // DIR_NONE
+    [DIR_NONE] = 4,
-    4, // DIR_SOUTH
+    [DIR_SOUTH] = 4,
-    5, // DIR_NORTH
+    [DIR_NORTH] = 5,
-    6, // DIR_WEST
+    [DIR_WEST] = 6,
-    7, // DIR_EAST
+    [DIR_EAST] = 7,
-    4, // DIR_SOUTHWEST
+    [DIR_SOUTHWEST] = 4,
-    4, // DIR_SOUTHEAST
+    [DIR_SOUTHEAST] = 4,
-    5, // DIR_NORTHWEST
+    [DIR_NORTHWEST] = 5,
-    5, // DIR_NORTHEAST
+    [DIR_NORTHEAST] = 5,
 };
 const u8 gMoveDirectionFastAnimNums[] = {
-    8,  // DIR_NONE
+    [DIR_NONE] = 8,
-    8,  // DIR_SOUTH
+    [DIR_SOUTH] = 8,
-    9,  // DIR_NORTH
+    [DIR_NORTH] = 9,
-    10, // DIR_WEST
+    [DIR_WEST] = 10,
-    11, // DIR_EAST
+    [DIR_EAST] = 11,
-    8,  // DIR_SOUTHWEST
+    [DIR_SOUTHWEST] = 8,
-    8,  // DIR_SOUTHEAST
+    [DIR_SOUTHEAST] = 8,
-    9,  // DIR_NORTHWEST
+    [DIR_NORTHWEST] = 9,
-    9,  // DIR_NORTHEAST
+    [DIR_NORTHEAST] = 9,
 };
 const u8 gMoveDirectionFasterAnimNums[] = {
-    12, // DIR_NONE
+    [DIR_NONE] = 12,
-    12, // DIR_SOUTH
+    [DIR_SOUTH] = 12,
-    13, // DIR_NORTH
+    [DIR_NORTH] = 13,
-    14, // DIR_WEST
+    [DIR_WEST] = 14,
-    15, // DIR_EAST
+    [DIR_EAST] = 15,
-    12, // DIR_SOUTHWEST
+    [DIR_SOUTHWEST] = 12,
-    12, // DIR_SOUTHEAST
+    [DIR_SOUTHEAST] = 12,
-    13, // DIR_NORTHWEST
+    [DIR_NORTHWEST] = 13,
-    13, // DIR_NORTHEAST
+    [DIR_NORTHEAST] = 13,
 };
 const u8 gMoveDirectionFastestAnimNums[] = {
-    16, // DIR_NONE
+    [DIR_NONE] = 16,
-    16, // DIR_SOUTH
+    [DIR_SOUTH] = 16,
-    17, // DIR_NORTH
+    [DIR_NORTH] = 17,
-    18, // DIR_WEST
+    [DIR_WEST] = 18,
-    19, // DIR_EAST
+    [DIR_EAST] = 19,
-    16, // DIR_SOUTHWEST
+    [DIR_SOUTHWEST] = 16,
-    16, // DIR_SOUTHEAST
+    [DIR_SOUTHEAST] = 16,
-    17, // DIR_NORTHWEST
+    [DIR_NORTHWEST] = 17,
-    17, // DIR_NORTHEAST
+    [DIR_NORTHEAST] = 17,
 };
 const u8 gJumpSpecialDirectionAnimNums[] = { // used for jumping onto surf mon
-    20, // DIR_NONE
+    [DIR_NONE] = 20,
-    20, // DIR_SOUTH
+    [DIR_SOUTH] = 20,
-    21, // DIR_NORTH
+    [DIR_NORTH] = 21,
-    22, // DIR_WEST
+    [DIR_WEST] = 22,
-    23, // DIR_EAST
+    [DIR_EAST] = 23,
-    20, // DIR_SOUTHWEST
+    [DIR_SOUTHWEST] = 20,
-    20, // DIR_SOUTHEAST
+    [DIR_SOUTHEAST] = 20,
-    21, // DIR_NORTHWEST
+    [DIR_NORTHWEST] = 21,
-    21, // DIR_NORTHEAST
+    [DIR_NORTHEAST] = 21,
 };
 const u8 gAcroWheelieDirectionAnimNums[] = {
-    20, // DIR_NONE
+    [DIR_NONE] = 20,
-    20, // DIR_SOUTH
+    [DIR_SOUTH] = 20,
-    21, // DIR_NORTH
+    [DIR_NORTH] = 21,
-    22, // DIR_WEST
+    [DIR_WEST] = 22,
-    23, // DIR_EAST
+    [DIR_EAST] = 23,
-    20, // DIR_SOUTHWEST
+    [DIR_SOUTHWEST] = 20,
-    20, // DIR_SOUTHEAST
+    [DIR_SOUTHEAST] = 20,
-    21, // DIR_NORTHWEST
+    [DIR_NORTHWEST] = 21,
-    21, // DIR_NORTHEAST
+    [DIR_NORTHEAST] = 21,
 };
 const u8 gUnrefAnimNums_08375633[] = {
-    24, // DIR_NONE
+    [DIR_NONE] = 24,
-    24, // DIR_SOUTH
+    [DIR_SOUTH] = 24,
-    25, // DIR_NORTH
+    [DIR_NORTH] = 25,
-    26, // DIR_WEST
+    [DIR_WEST] = 26,
-    27, // DIR_EAST
+    [DIR_EAST] = 27,
-    24, // DIR_SOUTHWEST
+    [DIR_SOUTHWEST] = 24,
-    24, // DIR_SOUTHEAST
+    [DIR_SOUTHEAST] = 24,
-    25, // DIR_NORTHWEST
+    [DIR_NORTHWEST] = 25,
-    25, // DIR_NORTHEAST
+    [DIR_NORTHEAST] = 25,
 };
 const u8 gAcroEndWheelieDirectionAnimNums[] = {
-    28, // DIR_NONE
+    [DIR_NONE] = 28,
-    28, // DIR_SOUTH
+    [DIR_SOUTH] = 28,
-    29, // DIR_NORTH
+    [DIR_NORTH] = 29,
-    30, // DIR_WEST
+    [DIR_WEST] = 30,
-    31, // DIR_EAST
+    [DIR_EAST] = 31,
-    28, // DIR_SOUTHWEST
+    [DIR_SOUTHWEST] = 28,
-    28, // DIR_SOUTHEAST
+    [DIR_SOUTHEAST] = 28,
-    29, // DIR_NORTHWEST
+    [DIR_NORTHWEST] = 29,
-    29, // DIR_NORTHEAST
+    [DIR_NORTHEAST] = 29,
 };
 const u8 gAcroUnusedActionDirectionAnimNums[] = {
-    32, // DIR_NONE
+    [DIR_NONE] = 32,
-    32, // DIR_SOUTH
+    [DIR_SOUTH] = 32,
-    33, // DIR_NORTH
+    [DIR_NORTH] = 33,
-    34, // DIR_WEST
+    [DIR_WEST] = 34,
-    35, // DIR_EAST
+    [DIR_EAST] = 35,
-    32, // DIR_SOUTHWEST
+    [DIR_SOUTHWEST] = 32,
-    32, // DIR_SOUTHEAST
+    [DIR_SOUTHEAST] = 32,
-    33, // DIR_NORTHWEST
+    [DIR_NORTHWEST] = 33,
-    33, // DIR_NORTHEAST
+    [DIR_NORTHEAST] = 33,
 };
 const u8 gAcroWheeliePedalDirectionAnimNums[] = {
-    36, // DIR_NONE
+    [DIR_NONE] = 36,
-    36, // DIR_SOUTH
+    [DIR_SOUTH] = 36,
-    37, // DIR_NORTH
+    [DIR_NORTH] = 37,
-    38, // DIR_WEST
+    [DIR_WEST] = 38,
-    39, // DIR_EAST
+    [DIR_EAST] = 39,
-    36, // DIR_SOUTHWEST
+    [DIR_SOUTHWEST] = 36,
-    36, // DIR_SOUTHEAST
+    [DIR_SOUTHEAST] = 36,
-    37, // DIR_NORTHWEST
+    [DIR_NORTHWEST] = 37,
-    37, // DIR_NORTHEAST
+    [DIR_NORTHEAST] = 37,
 };
 const u8 gFishingDirectionAnimNums[] = {
-    0, // DIR_NONE
+    [DIR_NONE] = 0,
-    0, // DIR_SOUTH
+    [DIR_SOUTH] = 0,
-    1, // DIR_NORTH
+    [DIR_NORTH] = 1,
-    2, // DIR_WEST
+    [DIR_WEST] = 2,
-    3, // DIR_EAST
+    [DIR_EAST] = 3,
-    0, // DIR_SOUTHWEST
+    [DIR_SOUTHWEST] = 0,
-    0, // DIR_SOUTHEAST
+    [DIR_SOUTHEAST] = 0,
-    1, // DIR_NORTHWEST
+    [DIR_NORTHWEST] = 1,
-    1, // DIR_NORTHEAST
+    [DIR_NORTHEAST] = 1,
 };
 const u8 gFishingNoCatchDirectionAnimNums[] = {
-    4, // DIR_NONE
+    [DIR_NONE] = 4,
-    4, // DIR_SOUTH
+    [DIR_SOUTH] = 4,
-    5, // DIR_NORTH
+    [DIR_NORTH] = 5,
-    6, // DIR_WEST
+    [DIR_WEST] = 6,
-    7, // DIR_EAST
+    [DIR_EAST] = 7,
-    4, // DIR_SOUTHWEST
+    [DIR_SOUTHWEST] = 4,
-    4, // DIR_SOUTHEAST
+    [DIR_SOUTHEAST] = 4,
-    5, // DIR_NORTHWEST
+    [DIR_NORTHWEST] = 5,
-    5, // DIR_NORTHEAST
+    [DIR_NORTHEAST] = 5,
 };
 const u8 gFishingBiteDirectionAnimNums[] = {
-    8,  // DIR_NONE
+    [DIR_NONE] = 8,
-    8,  // DIR_SOUTH
+    [DIR_SOUTH] = 8,
-    9,  // DIR_NORTH
+    [DIR_NORTH] = 9,
-    10, // DIR_WEST
+    [DIR_WEST] = 10,
-    11, // DIR_EAST
+    [DIR_EAST] = 11,
-    8,  // DIR_SOUTHWEST
+    [DIR_SOUTHWEST] = 8,
-    8,  // DIR_SOUTHEAST
+    [DIR_SOUTHEAST] = 8,
-    9,  // DIR_NORTHWEST
+    [DIR_NORTHWEST] = 9,
-    9,  // DIR_NORTHEAST
+    [DIR_NORTHEAST] = 9,
 };
 const u8 gRunningDirectionAnimNums[] = {
-    20, // DIR_NONE
+    [DIR_NONE] = 20,
-    20, // DIR_SOUTH
+    [DIR_SOUTH] = 20,
-    21, // DIR_NORTH
+    [DIR_NORTH] = 21,
-    22, // DIR_WEST
+    [DIR_WEST] = 22,
-    23, // DIR_EAST
+    [DIR_EAST] = 23,
-    20, // DIR_SOUTHWEST
+    [DIR_SOUTHWEST] = 20,
-    20, // DIR_SOUTHEAST
+    [DIR_SOUTHEAST] = 20,
-    21, // DIR_NORTHWEST
+    [DIR_NORTHWEST] = 21,
-    21, // DIR_NORTHEAST
+    [DIR_NORTHEAST] = 21,
 };
 
 const u8 gTrainerFacingDirectionMovementTypes[] = {
-    MOVEMENT_TYPE_FACE_DOWN,  // DIR_NONE
+    [DIR_NONE] = MOVEMENT_TYPE_FACE_DOWN,
-    MOVEMENT_TYPE_FACE_DOWN,  // DIR_SOUTH
+    [DIR_SOUTH] = MOVEMENT_TYPE_FACE_DOWN,
-    MOVEMENT_TYPE_FACE_UP,    // DIR_NORTH
+    [DIR_NORTH] = MOVEMENT_TYPE_FACE_UP,
-    MOVEMENT_TYPE_FACE_LEFT,  // DIR_WEST
+    [DIR_WEST] = MOVEMENT_TYPE_FACE_LEFT,
-    MOVEMENT_TYPE_FACE_RIGHT, // DIR_EAST
+    [DIR_EAST] = MOVEMENT_TYPE_FACE_RIGHT,
-    MOVEMENT_TYPE_FACE_DOWN,  // DIR_SOUTHWEST
+    [DIR_SOUTHWEST] = MOVEMENT_TYPE_FACE_DOWN,
-    MOVEMENT_TYPE_FACE_DOWN,  // DIR_SOUTHEAST
+    [DIR_SOUTHEAST] = MOVEMENT_TYPE_FACE_DOWN,
-    MOVEMENT_TYPE_FACE_UP,    // DIR_NORTHWEST
+    [DIR_NORTHWEST] = MOVEMENT_TYPE_FACE_UP,
-    MOVEMENT_TYPE_FACE_UP,    // DIR_NORTHEAST
+    [DIR_NORTHEAST] = MOVEMENT_TYPE_FACE_UP,
 };
 
 bool8 (*const gOppositeDirectionBlockedMetatileFuncs[])(u8) = {

src/evolution_scene.c

@@ -2,7 +2,7 @@
 #include "evolution_scene.h"
 #include "evolution_graphics.h"
 #include "sprite.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "task.h"
 #include "palette.h"
 #include "main.h"

src/field_effect.c

@@ -305,7 +305,7 @@ const union AnimCmd *const gNewGameBirchImageAnimTable[] = {
 };
 
 const struct SpriteTemplate gNewGameBirchObjectTemplate = {
-    .tileTag = 0xffff,
+    .tileTag = 0xFFFF,
     .paletteTag = 4102,
     .oam = &gNewGameBirchOamAttributes,
     .anims = gNewGameBirchImageAnimTable,
@@ -383,7 +383,7 @@ const union AnimCmd *const gSpriteAnimTable_855C300[] = {
 };
 
 const struct SpriteTemplate gSpriteTemplate_855C304 = {
-    .tileTag = 0xffff,
+    .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 = 0xffff,
+    .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 = 0xffff,
+    .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 = 0xffff,
+    .tileTag = 0xFFFF,
     .paletteTag = 4112,
     .oam = &gOamData_855C26C,
     .anims = gSpriteAnimTable_855C300,
@@ -3591,7 +3591,7 @@ const union AnimCmd *const gSpriteAnimTable_855C5DC[] = {
 };
 
 const struct SpriteTemplate gUnknown_0855C5EC = {
-    .tileTag = 0xffff,
+    .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
+        [DIR_NONE] = 0,
-        0, // DIR_SOUTH
+        [DIR_SOUTH] = 0,
-        1, // DIR_NORTH
+        [DIR_NORTH] = 1,
-        2, // DIR_WEST
+        [DIR_WEST] = 2,
-        3, // DIR_EAST
+        [DIR_EAST] = 3,
-        0,
+        [DIR_SOUTHWEST] = 0,
-        0,
+        [DIR_SOUTHEAST] = 0,
-        1,
+        [DIR_NORTHWEST] = 1,
-        1,
+        [DIR_NORTHEAST] = 1,
     };
 
     if (sub_8155640(sprite) == 0)

src/field_region_map.c

@@ -3,7 +3,7 @@
 #include "gpu_regs.h"
 #include "international_string_util.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "menu.h"
 #include "palette.h"
 #include "region_map.h"

src/field_specials.c

@@ -20,7 +20,7 @@
 #include "link.h"
 #include "list_menu.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "match_call.h"
 #include "menu.h"
 #include "overworld.h"
@@ -1957,7 +1957,7 @@ 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, 0xffff };
+    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;
@@ -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, 0xffff };
+    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_085B3142[] = { 0x0071, 0x006f, 0x0072, 0x0073, 0x0074, 0xFFFF };
-    static const u16 gUnknown_085B314E[] = { 0x0040, 0x0043, 0x0041, 0x0046, 0x0042, 0x003f, 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 u16 gUnknown_085B315C[] = { 0x00c8, 0x00b4, 0x00b7, 0x00b9, 0x00b3, 0x00ba, 0x00bb, 0x00c4, 0x00c6, 0xFFFF };
 
     static const u8 *const gUnknown_085B3170[] = {
         BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA,
@@ -3841,7 +3841,7 @@ bool32 sub_813B9C0(void)
         MAP_TRADE_CENTER,
         MAP_RECORD_CORNER,
         MAP_DOUBLE_BATTLE_COLOSSEUM,
-        0xffff
+        0xFFFF
     };
 
     int i;

src/fieldmap.c

@@ -496,7 +496,7 @@ u16 GetBehaviorByMetatileId(u16 metatile)
     }
     else
     {
-        return 0xff;
+        return 0xFF;
     }
 }
 

src/fldeff_cut.c

@@ -6,7 +6,7 @@
 #include "field_player_avatar.h"
 #include "fieldmap.h"
 #include "fldeff_cut.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "metatile_behavior.h"
 #include "overworld.h"
 #include "party_menu.h"

src/fldeff_groundshake.c

@@ -2,7 +2,7 @@
 #include "event_data.h"
 #include "event_object_movement.h"
 #include "field_camera.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "random.h"
 #include "roulette_util.h"
 #include "script.h"

src/fossil_specials.c

@@ -8,7 +8,7 @@
 #include "fieldmap.h"
 #include "global.fieldmap.h"
 #include "gpu_regs.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "menu.h"
 #include "random.h"
 #include "script.h"

src/frontier_util.c

@@ -24,7 +24,7 @@
 #include "data2.h"
 #include "record_mixing.h"
 #include "strings.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "save.h"
 #include "load_save.h"
 #include "battle_dome.h"

src/hall_of_fame.c

@@ -6,7 +6,7 @@
 #include "pokemon.h"
 #include "text.h"
 #include "text_window.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "gpu_regs.h"
 #include "graphics.h"
 #include "main.h"

src/intro.c

@@ -5,7 +5,7 @@
 #include "task.h"
 #include "title_screen.h"
 #include "libgcnmultiboot.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "gpu_regs.h"
 #include "link.h"
 #include "multiboot_pokemon_colosseum.h"

src/item.c

@@ -4,7 +4,7 @@
 #include "string_util.h"
 #include "text.h"
 #include "event_data.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "secret_base.h"
 #include "item_menu.h"
 #include "strings.h"

src/item_icon.c

@@ -2,7 +2,7 @@
 #include "decompress.h"
 #include "graphics.h"
 #include "item_icon.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "sprite.h"
 #include "constants/items.h"
 

src/item_menu.c

@@ -23,7 +23,7 @@
 #include "link.h"
 #include "mail.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "map_name_popup.h"
 #include "menu.h"
 #include "money.h"

src/learn_move.c

@@ -9,7 +9,7 @@
 #include "gpu_regs.h"
 #include "learn_move.h"
 #include "list_menu.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "overworld.h"

src/link.c

@@ -2,7 +2,7 @@
 // Includes
 #include "global.h"
 #include "m4a.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "reset_save_heap.h"
 #include "save.h"
 #include "bg.h"

src/link_rfu.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "alloc.h"
 #include "battle.h"
 #include "berry_blender.h"
 #include "decompress.h"
@@ -7,7 +8,6 @@
 #include "librfu.h"
 #include "link.h"
 #include "link_rfu.h"
-#include "malloc.h"
 #include "overworld.h"
 #include "random.h"
 #include "palette.h"
@@ -276,7 +276,7 @@ const struct {
     { gBlockSendBuffer,  40 }
 };
 const u16 gUnknown_082ED6E0[] = {
-    0x0002, 0x7f7d, 0x0000, 0xffff
+    0x0002, 0x7f7d, 0x0000, 0xFFFF
 };
 
 const char sUnref_082ED6E8[][15] = {
@@ -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 != 0xffff; ptr++)
+        for (ptr = gUnknown_03004140.unk_20; *ptr != 0xFFFF; ptr++)
         {
             if (gUnknown_03007890->unk_14[i].unk_04 == *ptr)
             {
@@ -3077,7 +3077,7 @@ bool32 sub_800F1E0(void)
                 {
                     if (gUnknown_03005000.unk_14[i][1])
                     {
-                        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_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] == 0xffff)
+        if (gUnknown_082ED6E0[i] == 0xFFFF)
             return FALSE;
     }
     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 == 0xff)
+    if (r0 == 0xFF)
         return 2;
     if (gUnknown_03007880[r0]->unk_0 == 0)
         return 1;

src/list_menu.c

@@ -8,7 +8,7 @@
 #include "trig.h"
 #include "decompress.h"
 #include "palette.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "strings.h"
 #include "sound.h"
 #include "constants/songs.h"

src/load_save.c

@@ -4,7 +4,7 @@
 #include "main.h"
 #include "pokemon.h"
 #include "random.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "item.h"
 #include "overworld.h"
 #include "decoration_inventory.h"

src/mail.c

@@ -17,7 +17,7 @@
 #include "bg.h"
 #include "pokemon_icon.h"
 #include "constants/species.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "easy_chat.h"
 
 extern const u16 gMailPalette_Orange[];

src/main.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "crt0.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "link.h"
 #include "link_rfu.h"
 #include "librfu.h"

src/malloc.c

@@ -1,210 +0,0 @@
-#include "global.h"
-
-static void *sHeapStart;
-static u32 sHeapSize;
-static u32 malloc_c_unused_0300000c; // needed to align dma3_manager.o(.bss)
-
-#define MALLOC_SYSTEM_ID 0xA3A3
-
-struct MemBlock {
-	// Whether this block is currently allocated.
-	bool16 flag;
-
-	// Magic number used for error checking. Should equal MALLOC_SYSTEM_ID.
-	u16 magic;
-
-	// Size of the block (not including this header struct).
-	u32 size;
-
-	// Previous block pointer. Equals sHeapStart if this is the first block.
-	struct MemBlock *prev;
-
-	// Next block pointer. Equals sHeapStart if this is the last block.
-	struct MemBlock *next;
-
-	// Data in the memory block. (Arrays of length 0 are a GNU extension.)
-	u8 data[0];
-};
-
-void PutMemBlockHeader(void *block, struct MemBlock *prev, struct MemBlock *next, u32 size)
-{
-	struct MemBlock *header = (struct MemBlock *)block;
-
-	header->flag = FALSE;
-	header->magic = MALLOC_SYSTEM_ID;
-	header->size = size;
-	header->prev = prev;
-	header->next = next;
-}
-
-void PutFirstMemBlockHeader(void *block, u32 size)
-{
-	PutMemBlockHeader(block, (struct MemBlock *)block, (struct MemBlock *)block, size - sizeof(struct MemBlock));
-}
-
-void *AllocInternal(void *heapStart, u32 size)
-{
-	struct MemBlock *pos = (struct MemBlock *)heapStart;
-	struct MemBlock *head = pos;
-	struct MemBlock *splitBlock;
-	u32 foundBlockSize;
-
-    // Alignment
-	if (size & 3)
-		size = 4 * ((size / 4) + 1);
-
-	for (;;) {
-		// Loop through the blocks looking for unused block that's big enough.
-
-		if (!pos->flag) {
-			foundBlockSize = pos->size;
-
-			if (foundBlockSize >= size) {
-				if (foundBlockSize - size < 2 * sizeof(struct MemBlock)) {
-					// The block isn't much bigger than the requested size,
-					// so just use it.
-					pos->flag = TRUE;
-				} else {
-					// The block is significantly bigger than the requested
-					// size, so split the rest into a separate block.
-					foundBlockSize -= sizeof(struct MemBlock);
-					foundBlockSize -= size;
-
-					splitBlock = (struct MemBlock *)(pos->data + size);
-
-					pos->flag = TRUE;
-					pos->size = size;
-
-					PutMemBlockHeader(splitBlock, pos, pos->next, foundBlockSize);
-
-					pos->next = splitBlock;
-
-					if (splitBlock->next != head)
-						splitBlock->next->prev = splitBlock;
-				}
-
-				return pos->data;
-			}
-		}
-
-		if (pos->next == head)
-			return NULL;
-
-		pos = pos->next;
-	}
-}
-
-void FreeInternal(void *heapStart, void *pointer)
-{
-	if (pointer) {
-		struct MemBlock *head = (struct MemBlock *)heapStart;
-		struct MemBlock *block = (struct MemBlock *)((u8 *)pointer - sizeof(struct MemBlock));
-		block->flag = FALSE;
-
-		// If the freed block isn't the last one, merge with the next block
-		// if it's not in use.
-		if (block->next != head) {
-			if (!block->next->flag) {
-				block->size += sizeof(struct MemBlock) + block->next->size;
-				block->next->magic = 0;
-				block->next = block->next->next;
-				if (block->next != head)
-					block->next->prev = block;
-			}
-		}
-
-		// If the freed block isn't the first one, merge with the previous block
-		// if it's not in use.
-		if (block != head) {
-			if (!block->prev->flag) {
-				block->prev->next = block->next;
-
-				if (block->next != head)
-					block->next->prev = block->prev;
-
-				block->magic = 0;
-				block->prev->size += sizeof(struct MemBlock) + block->size;
-			}
-		}
-	}
-}
-
-void *AllocZeroedInternal(void *heapStart, u32 size)
-{
-	void *mem = AllocInternal(heapStart, size);
-
-	if (mem != NULL) {
-		if (size & 3)
-			size = 4 * ((size / 4) + 1);
-
-		CpuFill32(0, mem, size);
-	}
-
-	return mem;
-}
-
-bool32 CheckMemBlockInternal(void *heapStart, void *pointer)
-{
-	struct MemBlock *head = (struct MemBlock *)heapStart;
-	struct MemBlock *block = (struct MemBlock *)((u8 *)pointer - sizeof(struct MemBlock));
-
-	if (block->magic != MALLOC_SYSTEM_ID)
-		return FALSE;
-
-	if (block->next->magic != MALLOC_SYSTEM_ID)
-		return FALSE;
-
-	if (block->next != head && block->next->prev != block)
-		return FALSE;
-
-	if (block->prev->magic != MALLOC_SYSTEM_ID)
-		return FALSE;
-
-	if (block->prev != head && block->prev->next != block)
-		return FALSE;
-
-	if (block->next != head && block->next != (struct MemBlock *)(block->data + block->size))
-		return FALSE;
-
-	return TRUE;
-}
-
-void InitHeap(void *heapStart, u32 heapSize)
-{
-	sHeapStart = heapStart;
-	sHeapSize = heapSize;
-	PutFirstMemBlockHeader(heapStart, heapSize);
-}
-
-void *Alloc(u32 size)
-{
-	AllocInternal(sHeapStart, size);
-}
-
-void *AllocZeroed(u32 size)
-{
-	AllocZeroedInternal(sHeapStart, size);
-}
-
-void Free(void *pointer)
-{
-	FreeInternal(sHeapStart, pointer);
-}
-
-bool32 CheckMemBlock(void *pointer)
-{
-	return CheckMemBlockInternal(sHeapStart, pointer);
-}
-
-bool32 CheckHeap()
-{
-	struct MemBlock *pos = (struct MemBlock *)sHeapStart;
-
-	do {
-		if (!CheckMemBlockInternal(sHeapStart, pos->data))
-			return FALSE;
-		pos = pos->next;
-	} while (pos != (struct MemBlock *)sHeapStart);
-
-	return TRUE;
-}

src/menu.c

@@ -7,7 +7,7 @@
 #include "main.h"
 #include "sound.h"
 #include "menu_helpers.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "task.h"
 #include "dma3.h"
 #include "string_util.h"

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

src/mossdeep_gym.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "event_object_movement.h"
 #include "fieldmap.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "mossdeep_gym.h"
 #include "script_movement.h"
 #include "constants/event_object_movement_constants.h"

src/naming_screen.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "naming_screen.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "palette.h"
 #include "task.h"
 #include "sprite.h"

src/overworld.c

@@ -27,7 +27,7 @@
 #include "link_rfu.h"
 #include "load_save.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "m4a.h"
 #include "map_name_popup.h"
 #include "menu.h"
@@ -296,15 +296,51 @@ static const u8 sUnusedData[] =
 
 const struct UCoords32 gDirectionToVectors[] =
 {
-    { 0,  0}, // DIR_NONE
+    [DIR_NONE] =
-    { 0,  1}, // DIR_SOUTH
+    {
-    { 0, -1}, // DIR_NORTH
+        .x =  0,
-    {-1,  0}, // DIR_WEST
+        .y =  0,
-    { 1,  0}, // DIR_EAST
+    },
-    {-1,  1}, // DIR_SOUTHWEST
+    [DIR_SOUTH] =
-    { 1,  1}, // DIR_SOUTHEAST
+    {
-    {-1, -1}, // DIR_NORTHWEST
+        .x =  0,
-    { 1, -1}, // DIR_NORTHEAST
+        .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[] =

src/player_pc.c

@@ -15,7 +15,7 @@
 #include "list_menu.h"
 #include "mail.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "overworld.h"

src/pokeblock.c

@@ -13,7 +13,7 @@
 #include "lilycove_lady.h"
 #include "list_menu.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "overworld.h"

src/pokeblock_feed.c

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

src/pokedex.c

@@ -8,7 +8,7 @@
 #include "graphics.h"
 #include "international_string_util.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "menu.h"
 #include "m4a.h"
 #include "overworld.h"
@@ -4763,7 +4763,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;
-
         }
     }
 

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/pokedex_cry_screen.c

@@ -2,7 +2,7 @@
 #include "bg.h"
 #include "m4a.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "palette.h"
 #include "pokedex_cry_screen.h"
 #include "sound.h"

src/pokemon_animation.c

@@ -786,31 +786,31 @@ static const u8 sBackAnimationIds[] =
 
 static const u8 sBackAnimNatureModTable[] =
 {
-    0x00, // NATURE_HARDY
+    [NATURE_HARDY] = 0x00,
-	0x02, // NATURE_LONELY
+    [NATURE_LONELY] = 0x02,
-	0x00, // NATURE_BRAVE
+    [NATURE_BRAVE] = 0x00,
-	0x00, // NATURE_ADAMANT
+    [NATURE_ADAMANT] = 0x00,
-	0x00, // NATURE_NAUGHTY
+    [NATURE_NAUGHTY] = 0x00,
-	0x01, // NATURE_BOLD
+    [NATURE_BOLD] = 0x01,
-	0x01, // NATURE_DOCILE
+    [NATURE_DOCILE] = 0x01,
-	0x01, // NATURE_RELAXED
+    [NATURE_RELAXED] = 0x01,
-	0x00, // NATURE_IMPISH
+    [NATURE_IMPISH] = 0x00,
-	0x01, // NATURE_LAX
+    [NATURE_LAX] = 0x01,
-	0x02, // NATURE_TIMID
+    [NATURE_TIMID] = 0x02,
-	0x00, // NATURE_HASTY
+    [NATURE_HASTY] = 0x00,
-	0x01, // NATURE_SERIOUS
+    [NATURE_SERIOUS] = 0x01,
-	0x00, // NATURE_JOLLY
+    [NATURE_JOLLY] = 0x00,
-	0x00, // NATURE_NAIVE
+    [NATURE_NAIVE] = 0x00,
-	0x02, // NATURE_MODEST
+    [NATURE_MODEST] = 0x02,
-	0x02, // NATURE_MILD
+    [NATURE_MILD] = 0x02,
-	0x02, // NATURE_QUIET
+    [NATURE_QUIET] = 0x02,
-	0x02, // NATURE_BASHFUL
+    [NATURE_BASHFUL] = 0x02,
-	0x01, // NATURE_RASH
+    [NATURE_RASH] = 0x01,
-	0x01, // NATURE_CALM
+    [NATURE_CALM] = 0x01,
-	0x02, // NATURE_GENTLE
+    [NATURE_GENTLE] = 0x02,
-	0x01, // NATURE_SASSY
+    [NATURE_SASSY] = 0x01,
-	0x02, // NATURE_CAREFUL
+    [NATURE_CAREFUL] = 0x02,
-	0x01, // NATURE_QUIRKY
+    [NATURE_QUIRKY] = 0x01,
 };
 
 static const union AffineAnimCmd sSpriteAffineAnim_860AD48[] =

src/pokemon_icon.c

@@ -469,446 +469,446 @@ const u8 *const gMonIconTable[] =
 
 const u8 gMonIconPaletteIndices[] =
 {
-    0, // ??????????
+    [SPECIES_NONE] = 0,
-    1, // Bulbasaur
+    [SPECIES_BULBASAUR] = 1,
-    1, // Ivysaur
+    [SPECIES_IVYSAUR] = 1,
-    1, // Venusaur
+    [SPECIES_VENUSAUR] = 1,
-    0, // Charmander
+    [SPECIES_CHARMANDER] = 0,
-    0, // Charmeleon
+    [SPECIES_CHARMELEON] = 0,
-    0, // Charizard
+    [SPECIES_CHARIZARD] = 0,
-    0, // Squirtle
+    [SPECIES_SQUIRTLE] = 0,
-    2, // Wartortle
+    [SPECIES_WARTORTLE] = 2,
-    2, // Blastoise
+    [SPECIES_BLASTOISE] = 2,
-    1, // Caterpie
+    [SPECIES_CATERPIE] = 1,
-    1, // Metapod
+    [SPECIES_METAPOD] = 1,
-    0, // Butterfree
+    [SPECIES_BUTTERFREE] = 0,
-    1, // Weedle
+    [SPECIES_WEEDLE] = 1,
-    2, // Kakuna
+    [SPECIES_KAKUNA] = 2,
-    2, // Beedrill
+    [SPECIES_BEEDRILL] = 2,
-    0, // Pidgey
+    [SPECIES_PIDGEY] = 0,
-    0, // Pidgeotto
+    [SPECIES_PIDGEOTTO] = 0,
-    0, // Pidgeot
+    [SPECIES_PIDGEOT] = 0,
-    2, // Rattata
+    [SPECIES_RATTATA] = 2,
-    1, // Raticate
+    [SPECIES_RATICATE] = 1,
-    0, // Spearow
+    [SPECIES_SPEAROW] = 0,
-    0, // Fearow
+    [SPECIES_FEAROW] = 0,
-    2, // Ekans
+    [SPECIES_EKANS] = 2,
-    2, // Arbok
+    [SPECIES_ARBOK] = 2,
-    2, // Pikachu
+    [SPECIES_PIKACHU] = 2,
-    0, // Raichu
+    [SPECIES_RAICHU] = 0,
-    2, // Sandshrew
+    [SPECIES_SANDSHREW] = 2,
-    2, // Sandslash
+    [SPECIES_SANDSLASH] = 2,
-    2, // Nidoran♀
+    [SPECIES_NIDORAN_F] = 2,
-    2, // Nidorina
+    [SPECIES_NIDORINA] = 2,
-    2, // Nidoqueen
+    [SPECIES_NIDOQUEEN] = 2,
-    2, // Nidoran♂
+    [SPECIES_NIDORAN_M] = 2,
-    2, // Nidorino
+    [SPECIES_NIDORINO] = 2,
-    2, // Nidoking
+    [SPECIES_NIDOKING] = 2,
-    0, // Clefairy
+    [SPECIES_CLEFAIRY] = 0,
-    0, // Clefable
+    [SPECIES_CLEFABLE] = 0,
-    2, // Vulpix
+    [SPECIES_VULPIX] = 2,
-    1, // Ninetales
+    [SPECIES_NINETALES] = 1,
-    0, // Jigglypuff
+    [SPECIES_JIGGLYPUFF] = 0,
-    0, // Wigglytuff
+    [SPECIES_WIGGLYTUFF] = 0,
-    2, // Zubat
+    [SPECIES_ZUBAT] = 2,
-    2, // Golbat
+    [SPECIES_GOLBAT] = 2,
-    1, // Oddish
+    [SPECIES_ODDISH] = 1,
-    0, // Gloom
+    [SPECIES_GLOOM] = 0,
-    0, // Vileplume
+    [SPECIES_VILEPLUME] = 0,
-    0, // Paras
+    [SPECIES_PARAS] = 0,
-    0, // Parasect
+    [SPECIES_PARASECT] = 0,
-    0, // Venonat
+    [SPECIES_VENONAT] = 0,
-    2, // Venomoth
+    [SPECIES_VENOMOTH] = 2,
-    2, // Diglett
+    [SPECIES_DIGLETT] = 2,
-    2, // Dugtrio
+    [SPECIES_DUGTRIO] = 2,
-    1, // Meowth
+    [SPECIES_MEOWTH] = 1,
-    1, // Persian
+    [SPECIES_PERSIAN] = 1,
-    1, // Psyduck
+    [SPECIES_PSYDUCK] = 1,
-    2, // Golduck
+    [SPECIES_GOLDUCK] = 2,
-    1, // Mankey
+    [SPECIES_MANKEY] = 1,
-    2, // Primeape
+    [SPECIES_PRIMEAPE] = 2,
-    0, // Growlithe
+    [SPECIES_GROWLITHE] = 0,
-    0, // Arcanine
+    [SPECIES_ARCANINE] = 0,
-    0, // Poliwag
+    [SPECIES_POLIWAG] = 0,
-    0, // Poliwhirl
+    [SPECIES_POLIWHIRL] = 0,
-    0, // Poliwrath
+    [SPECIES_POLIWRATH] = 0,
-    2, // Abra
+    [SPECIES_ABRA] = 2,
-    2, // Kadabra
+    [SPECIES_KADABRA] = 2,
-    2, // Alakazam
+    [SPECIES_ALAKAZAM] = 2,
-    0, // Machop
+    [SPECIES_MACHOP] = 0,
-    2, // Machoke
+    [SPECIES_MACHOKE] = 2,
-    0, // Machamp
+    [SPECIES_MACHAMP] = 0,
-    1, // Bellsprout
+    [SPECIES_BELLSPROUT] = 1,
-    1, // Weepinbell
+    [SPECIES_WEEPINBELL] = 1,
-    1, // Victreebel
+    [SPECIES_VICTREEBEL] = 1,
-    2, // Tentacool
+    [SPECIES_TENTACOOL] = 2,
-    2, // Tentacruel
+    [SPECIES_TENTACRUEL] = 2,
-    1, // Geodude
+    [SPECIES_GEODUDE] = 1,
-    1, // Graveler
+    [SPECIES_GRAVELER] = 1,
-    1, // Golem
+    [SPECIES_GOLEM] = 1,
-    0, // Ponyta
+    [SPECIES_PONYTA] = 0,
-    0, // Rapidash
+    [SPECIES_RAPIDASH] = 0,
-    0, // Slowpoke
+    [SPECIES_SLOWPOKE] = 0,
-    0, // Slowbro
+    [SPECIES_SLOWBRO] = 0,
-    0, // Magnemite
+    [SPECIES_MAGNEMITE] = 0,
-    0, // Magneton
+    [SPECIES_MAGNETON] = 0,
-    1, // Farfetch'd
+    [SPECIES_FARFETCHD] = 1,
-    2, // Doduo
+    [SPECIES_DODUO] = 2,
-    2, // Dodrio
+    [SPECIES_DODRIO] = 2,
-    2, // Seel
+    [SPECIES_SEEL] = 2,
-    2, // Dewgong
+    [SPECIES_DEWGONG] = 2,
-    2, // Grimer
+    [SPECIES_GRIMER] = 2,
-    2, // Muk
+    [SPECIES_MUK] = 2,
-    2, // Shellder
+    [SPECIES_SHELLDER] = 2,
-    2, // Cloyster
+    [SPECIES_CLOYSTER] = 2,
-    2, // Gastly
+    [SPECIES_GASTLY] = 2,
-    2, // Haunter
+    [SPECIES_HAUNTER] = 2,
-    2, // Gengar
+    [SPECIES_GENGAR] = 2,
-    2, // Onix
+    [SPECIES_ONIX] = 2,
-    2, // Drowzee
+    [SPECIES_DROWZEE] = 2,
-    1, // Hypno
+    [SPECIES_HYPNO] = 1,
-    2, // Krabby
+    [SPECIES_KRABBY] = 2,
-    2, // Kingler
+    [SPECIES_KINGLER] = 2,
-    0, // Voltorb
+    [SPECIES_VOLTORB] = 0,
-    0, // Electrode
+    [SPECIES_ELECTRODE] = 0,
-    0, // Exeggcute
+    [SPECIES_EXEGGCUTE] = 0,
-    1, // Exeggutor
+    [SPECIES_EXEGGUTOR] = 1,
-    1, // Cubone
+    [SPECIES_CUBONE] = 1,
-    1, // Marowak
+    [SPECIES_MAROWAK] = 1,
-    2, // Hitmonlee
+    [SPECIES_HITMONLEE] = 2,
-    2, // Hitmonchan
+    [SPECIES_HITMONCHAN] = 2,
-    1, // Lickitung
+    [SPECIES_LICKITUNG] = 1,
-    2, // Koffing
+    [SPECIES_KOFFING] = 2,
-    2, // Weezing
+    [SPECIES_WEEZING] = 2,
-    1, // Rhyhorn
+    [SPECIES_RHYHORN] = 1,
-    1, // Rhydon
+    [SPECIES_RHYDON] = 1,
-    0, // Chansey
+    [SPECIES_CHANSEY] = 0,
-    0, // Tangela
+    [SPECIES_TANGELA] = 0,
-    1, // Kangaskhan
+    [SPECIES_KANGASKHAN] = 1,
-    0, // Horsea
+    [SPECIES_HORSEA] = 0,
-    0, // Seadra
+    [SPECIES_SEADRA] = 0,
-    0, // Goldeen
+    [SPECIES_GOLDEEN] = 0,
-    0, // Seaking
+    [SPECIES_SEAKING] = 0,
-    2, // Staryu
+    [SPECIES_STARYU] = 2,
-    2, // Starmie
+    [SPECIES_STARMIE] = 2,
-    0, // Mr. mime
+    [SPECIES_MR_MIME] = 0,
-    1, // Scyther
+    [SPECIES_SCYTHER] = 1,
-    2, // Jynx
+    [SPECIES_JYNX] = 2,
-    1, // Electabuzz
+    [SPECIES_ELECTABUZZ] = 1,
-    0, // Magmar
+    [SPECIES_MAGMAR] = 0,
-    2, // Pinsir
+    [SPECIES_PINSIR] = 2,
-    2, // Tauros
+    [SPECIES_TAUROS] = 2,
-    0, // Magikarp
+    [SPECIES_MAGIKARP] = 0,
-    0, // Gyarados
+    [SPECIES_GYARADOS] = 0,
-    2, // Lapras
+    [SPECIES_LAPRAS] = 2,
-    2, // Ditto
+    [SPECIES_DITTO] = 2,
-    2, // Eevee
+    [SPECIES_EEVEE] = 2,
-    0, // Vaporeon
+    [SPECIES_VAPOREON] = 0,
-    0, // Jolteon
+    [SPECIES_JOLTEON] = 0,
-    0, // Flareon
+    [SPECIES_FLAREON] = 0,
-    0, // Porygon
+    [SPECIES_PORYGON] = 0,
-    0, // Omanyte
+    [SPECIES_OMANYTE] = 0,
-    0, // Omastar
+    [SPECIES_OMASTAR] = 0,
-    2, // Kabuto
+    [SPECIES_KABUTO] = 2,
-    2, // Kabutops
+    [SPECIES_KABUTOPS] = 2,
-    0, // Aerodactyl
+    [SPECIES_AERODACTYL] = 0,
-    1, // Snorlax
+    [SPECIES_SNORLAX] = 1,
-    0, // Articuno
+    [SPECIES_ARTICUNO] = 0,
-    0, // Zapdos
+    [SPECIES_ZAPDOS] = 0,
-    0, // Moltres
+    [SPECIES_MOLTRES] = 0,
-    0, // Dratini
+    [SPECIES_DRATINI] = 0,
-    0, // Dragonair
+    [SPECIES_DRAGONAIR] = 0,
-    2, // Dragonite
+    [SPECIES_DRAGONITE] = 2,
-    2, // Mewtwo
+    [SPECIES_MEWTWO] = 2,
-    0, // Mew
+    [SPECIES_MEW] = 0,
-    1, // Chikorita
+    [SPECIES_CHIKORITA] = 1,
-    1, // Bayleef
+    [SPECIES_BAYLEEF] = 1,
-    1, // Meganium
+    [SPECIES_MEGANIUM] = 1,
-    1, // Cyndaquil
+    [SPECIES_CYNDAQUIL] = 1,
-    1, // Quilava
+    [SPECIES_QUILAVA] = 1,
-    1, // Typhlosion
+    [SPECIES_TYPHLOSION] = 1,
-    2, // Totodile
+    [SPECIES_TOTODILE] = 2,
-    2, // Croconaw
+    [SPECIES_CROCONAW] = 2,
-    2, // Feraligatr
+    [SPECIES_FERALIGATR] = 2,
-    2, // Sentret
+    [SPECIES_SENTRET] = 2,
-    2, // Furret
+    [SPECIES_FURRET] = 2,
-    2, // Hoothoot
+    [SPECIES_HOOTHOOT] = 2,
-    2, // Noctowl
+    [SPECIES_NOCTOWL] = 2,
-    0, // Ledyba
+    [SPECIES_LEDYBA] = 0,
-    0, // Ledian
+    [SPECIES_LEDIAN] = 0,
-    1, // Spinarak
+    [SPECIES_SPINARAK] = 1,
-    0, // Ariados
+    [SPECIES_ARIADOS] = 0,
-    2, // Crobat
+    [SPECIES_CROBAT] = 2,
-    2, // Chinchou
+    [SPECIES_CHINCHOU] = 2,
-    0, // Lanturn
+    [SPECIES_LANTURN] = 0,
-    0, // Pichu
+    [SPECIES_PICHU] = 0,
-    0, // Cleffa
+    [SPECIES_CLEFFA] = 0,
-    1, // Igglybuff
+    [SPECIES_IGGLYBUFF] = 1,
-    2, // Togepi
+    [SPECIES_TOGEPI] = 2,
-    2, // Togetic
+    [SPECIES_TOGETIC] = 2,
-    0, // Natu
+    [SPECIES_NATU] = 0,
-    0, // Xatu
+    [SPECIES_XATU] = 0,
-    2, // Mareep
+    [SPECIES_MAREEP] = 2,
-    0, // Flaaffy
+    [SPECIES_FLAAFFY] = 0,
-    0, // Ampharos
+    [SPECIES_AMPHAROS] = 0,
-    1, // Bellossom
+    [SPECIES_BELLOSSOM] = 1,
-    2, // Marill
+    [SPECIES_MARILL] = 2,
-    2, // Azumarill
+    [SPECIES_AZUMARILL] = 2,
-    1, // Sudowoodo
+    [SPECIES_SUDOWOODO] = 1,
-    1, // Politoed
+    [SPECIES_POLITOED] = 1,
-    1, // Hoppip
+    [SPECIES_HOPPIP] = 1,
-    1, // Skiploom
+    [SPECIES_SKIPLOOM] = 1,
-    2, // Jumpluff
+    [SPECIES_JUMPLUFF] = 2,
-    2, // Aipom
+    [SPECIES_AIPOM] = 2,
-    1, // Sunkern
+    [SPECIES_SUNKERN] = 1,
-    1, // Sunflora
+    [SPECIES_SUNFLORA] = 1,
-    1, // Yanma
+    [SPECIES_YANMA] = 1,
-    0, // Wooper
+    [SPECIES_WOOPER] = 0,
-    0, // Quagsire
+    [SPECIES_QUAGSIRE] = 0,
-    2, // Espeon
+    [SPECIES_ESPEON] = 2,
-    2, // Umbreon
+    [SPECIES_UMBREON] = 2,
-    2, // Murkrow
+    [SPECIES_MURKROW] = 2,
-    0, // Slowking
+    [SPECIES_SLOWKING] = 0,
-    0, // Misdreavus
+    [SPECIES_MISDREAVUS] = 0,
-    0, // Unown A
+    [SPECIES_UNOWN] = 0,
-    0, // Wobbuffet
+    [SPECIES_WOBBUFFET] = 0,
-    1, // Girafarig
+    [SPECIES_GIRAFARIG] = 1,
-    0, // Pineco
+    [SPECIES_PINECO] = 0,
-    2, // Forretress
+    [SPECIES_FORRETRESS] = 2,
-    2, // Dunsparce
+    [SPECIES_DUNSPARCE] = 2,
-    2, // Gligar
+    [SPECIES_GLIGAR] = 2,
-    0, // Steelix
+    [SPECIES_STEELIX] = 0,
-    0, // Snubbull
+    [SPECIES_SNUBBULL] = 0,
-    2, // Granbull
+    [SPECIES_GRANBULL] = 2,
-    0, // Qwilfish
+    [SPECIES_QWILFISH] = 0,
-    0, // Scizor
+    [SPECIES_SCIZOR] = 0,
-    1, // Shuckle
+    [SPECIES_SHUCKLE] = 1,
-    2, // Heracross
+    [SPECIES_HERACROSS] = 2,
-    0, // Sneasel
+    [SPECIES_SNEASEL] = 0,
-    0, // Teddiursa
+    [SPECIES_TEDDIURSA] = 0,
-    2, // Ursaring
+    [SPECIES_URSARING] = 2,
-    0, // Slugma
+    [SPECIES_SLUGMA] = 0,
-    0, // Magcargo
+    [SPECIES_MAGCARGO] = 0,
-    2, // Swinub
+    [SPECIES_SWINUB] = 2,
-    2, // Piloswine
+    [SPECIES_PILOSWINE] = 2,
-    0, // Corsola
+    [SPECIES_CORSOLA] = 0,
-    0, // Remoraid
+    [SPECIES_REMORAID] = 0,
-    0, // Octillery
+    [SPECIES_OCTILLERY] = 0,
-    0, // Delibird
+    [SPECIES_DELIBIRD] = 0,
-    2, // Mantine
+    [SPECIES_MANTINE] = 2,
-    0, // Skarmory
+    [SPECIES_SKARMORY] = 0,
-    0, // Houndour
+    [SPECIES_HOUNDOUR] = 0,
-    0, // Houndoom
+    [SPECIES_HOUNDOOM] = 0,
-    0, // Kingdra
+    [SPECIES_KINGDRA] = 0,
-    0, // Phanpy
+    [SPECIES_PHANPY] = 0,
-    0, // Donphan
+    [SPECIES_DONPHAN] = 0,
-    0, // Porygon2
+    [SPECIES_PORYGON2] = 0,
-    2, // Stantler
+    [SPECIES_STANTLER] = 2,
-    1, // Smeargle
+    [SPECIES_SMEARGLE] = 1,
-    2, // Tyrogue
+    [SPECIES_TYROGUE] = 2,
-    2, // Hitmontop
+    [SPECIES_HITMONTOP] = 2,
-    1, // Smoochum
+    [SPECIES_SMOOCHUM] = 1,
-    1, // Elekid
+    [SPECIES_ELEKID] = 1,
-    1, // Magby
+    [SPECIES_MAGBY] = 1,
-    1, // Miltank
+    [SPECIES_MILTANK] = 1,
-    1, // Blissey
+    [SPECIES_BLISSEY] = 1,
-    0, // Raikou
+    [SPECIES_RAIKOU] = 0,
-    2, // Entei
+    [SPECIES_ENTEI] = 2,
-    0, // Suicune
+    [SPECIES_SUICUNE] = 0,
-    1, // Larvitar
+    [SPECIES_LARVITAR] = 1,
-    0, // Pupitar
+    [SPECIES_PUPITAR] = 0,
-    1, // Tyranitar
+    [SPECIES_TYRANITAR] = 1,
-    0, // Lugia
+    [SPECIES_LUGIA] = 0,
-    1, // Ho-Oh
+    [SPECIES_HO_OH] = 1,
-    1, // Celebi
+    [SPECIES_CELEBI] = 1,
-    0, // ?
+    [SPECIES_OLD_UNOWN_B] = 0,
-    0, // ?
+    [SPECIES_OLD_UNOWN_C] = 0,
-    0, // ?
+    [SPECIES_OLD_UNOWN_D] = 0,
-    0, // ?
+    [SPECIES_OLD_UNOWN_E] = 0,
-    0, // ?
+    [SPECIES_OLD_UNOWN_F] = 0,
-    0, // ?
+    [SPECIES_OLD_UNOWN_G] = 0,
-    0, // ?
+    [SPECIES_OLD_UNOWN_H] = 0,
-    0, // ?
+    [SPECIES_OLD_UNOWN_I] = 0,
-    0, // ?
+    [SPECIES_OLD_UNOWN_J] = 0,
-    0, // ?
+    [SPECIES_OLD_UNOWN_K] = 0,
-    0, // ?
+    [SPECIES_OLD_UNOWN_L] = 0,
-    0, // ?
+    [SPECIES_OLD_UNOWN_M] = 0,
-    0, // ?
+    [SPECIES_OLD_UNOWN_N] = 0,
-    0, // ?
+    [SPECIES_OLD_UNOWN_O] = 0,
-    0, // ?
+    [SPECIES_OLD_UNOWN_P] = 0,
-    0, // ?
+    [SPECIES_OLD_UNOWN_Q] = 0,
-    0, // ?
+    [SPECIES_OLD_UNOWN_R] = 0,
-    0, // ?
+    [SPECIES_OLD_UNOWN_S] = 0,
-    0, // ?
+    [SPECIES_OLD_UNOWN_T] = 0,
-    0, // ?
+    [SPECIES_OLD_UNOWN_U] = 0,
-    0, // ?
+    [SPECIES_OLD_UNOWN_V] = 0,
-    0, // ?
+    [SPECIES_OLD_UNOWN_W] = 0,
-    0, // ?
+    [SPECIES_OLD_UNOWN_X] = 0,
-    0, // ?
+    [SPECIES_OLD_UNOWN_Y] = 0,
-    0, // ?
+    [SPECIES_OLD_UNOWN_Z] = 0,
-    1, // Treecko
+    [SPECIES_TREECKO] = 1,
-    0, // Grovyle
+    [SPECIES_GROVYLE] = 0,
-    1, // Sceptile
+    [SPECIES_SCEPTILE] = 1,
-    0, // Torchic
+    [SPECIES_TORCHIC] = 0,
-    0, // Combusken
+    [SPECIES_COMBUSKEN] = 0,
-    0, // Blaziken
+    [SPECIES_BLAZIKEN] = 0,
-    0, // Mudkip
+    [SPECIES_MUDKIP] = 0,
-    0, // Marshtomp
+    [SPECIES_MARSHTOMP] = 0,
-    0, // Swampert
+    [SPECIES_SWAMPERT] = 0,
-    2, // Poochyena
+    [SPECIES_POOCHYENA] = 2,
-    2, // Mightyena
+    [SPECIES_MIGHTYENA] = 2,
-    2, // Zigzagoon
+    [SPECIES_ZIGZAGOON] = 2,
-    2, // Linoone
+    [SPECIES_LINOONE] = 2,
-    0, // Wurmple
+    [SPECIES_WURMPLE] = 0,
-    2, // Silcoon
+    [SPECIES_SILCOON] = 2,
-    0, // Beautifly
+    [SPECIES_BEAUTIFLY] = 0,
-    2, // Cascoon
+    [SPECIES_CASCOON] = 2,
-    1, // Dustox
+    [SPECIES_DUSTOX] = 1,
-    1, // Lotad
+    [SPECIES_LOTAD] = 1,
-    1, // Lombre
+    [SPECIES_LOMBRE] = 1,
-    1, // Ludicolo
+    [SPECIES_LUDICOLO] = 1,
-    1, // Seedot
+    [SPECIES_SEEDOT] = 1,
-    1, // Nuzleaf
+    [SPECIES_NUZLEAF] = 1,
-    0, // Shiftry
+    [SPECIES_SHIFTRY] = 0,
-    1, // Nincada
+    [SPECIES_NINCADA] = 1,
-    1, // Ninjask
+    [SPECIES_NINJASK] = 1,
-    1, // Shedinja
+    [SPECIES_SHEDINJA] = 1,
-    2, // Taillow
+    [SPECIES_TAILLOW] = 2,
-    2, // Swellow
+    [SPECIES_SWELLOW] = 2,
-    1, // Shroomish
+    [SPECIES_SHROOMISH] = 1,
-    1, // Breloom
+    [SPECIES_BRELOOM] = 1,
-    1, // Spinda
+    [SPECIES_SPINDA] = 1,
-    0, // Wingull
+    [SPECIES_WINGULL] = 0,
-    0, // Pelipper
+    [SPECIES_PELIPPER] = 0,
-    2, // Surskit
+    [SPECIES_SURSKIT] = 2,
-    0, // Masquerain
+    [SPECIES_MASQUERAIN] = 0,
-    2, // Wailmer
+    [SPECIES_WAILMER] = 2,
-    0, // Wailord
+    [SPECIES_WAILORD] = 0,
-    0, // Skitty
+    [SPECIES_SKITTY] = 0,
-    2, // Delcatty
+    [SPECIES_DELCATTY] = 2,
-    1, // Kecleon
+    [SPECIES_KECLEON] = 1,
-    1, // Baltoy
+    [SPECIES_BALTOY] = 1,
-    0, // Claydol
+    [SPECIES_CLAYDOL] = 0,
-    0, // Nosepass
+    [SPECIES_NOSEPASS] = 0,
-    1, // Torkoal
+    [SPECIES_TORKOAL] = 1,
-    2, // Sableye
+    [SPECIES_SABLEYE] = 2,
-    0, // Barboach
+    [SPECIES_BARBOACH] = 0,
-    0, // Whiscash
+    [SPECIES_WHISCASH] = 0,
-    0, // Luvdisc
+    [SPECIES_LUVDISC] = 0,
-    0, // Corphish
+    [SPECIES_CORPHISH] = 0,
-    0, // Crawdaunt
+    [SPECIES_CRAWDAUNT] = 0,
-    2, // Feebas
+    [SPECIES_FEEBAS] = 2,
-    0, // Milotic
+    [SPECIES_MILOTIC] = 0,
-    0, // Carvanha
+    [SPECIES_CARVANHA] = 0,
-    0, // Sharpedo
+    [SPECIES_SHARPEDO] = 0,
-    1, // Trapinch
+    [SPECIES_TRAPINCH] = 1,
-    1, // Vibrava
+    [SPECIES_VIBRAVA] = 1,
-    1, // Flygon
+    [SPECIES_FLYGON] = 1,
-    2, // Makuhita
+    [SPECIES_MAKUHITA] = 2,
-    1, // Hariyama
+    [SPECIES_HARIYAMA] = 1,
-    1, // Electrike
+    [SPECIES_ELECTRIKE] = 1,
-    0, // Manectric
+    [SPECIES_MANECTRIC] = 0,
-    1, // Numel
+    [SPECIES_NUMEL] = 1,
-    0, // Camerupt
+    [SPECIES_CAMERUPT] = 0,
-    2, // Spheal
+    [SPECIES_SPHEAL] = 2,
-    2, // Sealeo
+    [SPECIES_SEALEO] = 2,
-    0, // Walrein
+    [SPECIES_WALREIN] = 0,
-    1, // Cacnea
+    [SPECIES_CACNEA] = 1,
-    1, // Cacturne
+    [SPECIES_CACTURNE] = 1,
-    2, // Snorunt
+    [SPECIES_SNORUNT] = 2,
-    0, // Glalie
+    [SPECIES_GLALIE] = 0,
-    1, // Lunatone
+    [SPECIES_LUNATONE] = 1,
-    0, // Solrock
+    [SPECIES_SOLROCK] = 0,
-    2, // Azurill
+    [SPECIES_AZURILL] = 2,
-    0, // Spoink
+    [SPECIES_SPOINK] = 0,
-    2, // Grumpig
+    [SPECIES_GRUMPIG] = 2,
-    0, // Plusle
+    [SPECIES_PLUSLE] = 0,
-    0, // Minun
+    [SPECIES_MINUN] = 0,
-    2, // Mawile
+    [SPECIES_MAWILE] = 2,
-    0, // Meditite
+    [SPECIES_MEDITITE] = 0,
-    0, // Medicham
+    [SPECIES_MEDICHAM] = 0,
-    0, // Swablu
+    [SPECIES_SWABLU] = 0,
-    0, // Altaria
+    [SPECIES_ALTARIA] = 0,
-    0, // Wynaut
+    [SPECIES_WYNAUT] = 0,
-    0, // Duskull
+    [SPECIES_DUSKULL] = 0,
-    0, // Dusclops
+    [SPECIES_DUSCLOPS] = 0,
-    0, // Roselia
+    [SPECIES_ROSELIA] = 0,
-    2, // Slakoth
+    [SPECIES_SLAKOTH] = 2,
-    2, // Vigoroth
+    [SPECIES_VIGOROTH] = 2,
-    1, // Slaking
+    [SPECIES_SLAKING] = 1,
-    1, // Gulpin
+    [SPECIES_GULPIN] = 1,
-    2, // Swalot
+    [SPECIES_SWALOT] = 2,
-    1, // Tropius
+    [SPECIES_TROPIUS] = 1,
-    0, // Whismur
+    [SPECIES_WHISMUR] = 0,
-    2, // Loudred
+    [SPECIES_LOUDRED] = 2,
-    2, // Exploud
+    [SPECIES_EXPLOUD] = 2,
-    0, // Clamperl
+    [SPECIES_CLAMPERL] = 0,
-    0, // Huntail
+    [SPECIES_HUNTAIL] = 0,
-    0, // Gorebyss
+    [SPECIES_GOREBYSS] = 0,
-    0, // Absol
+    [SPECIES_ABSOL] = 0,
-    0, // Shuppet
+    [SPECIES_SHUPPET] = 0,
-    0, // Banette
+    [SPECIES_BANETTE] = 0,
-    2, // Seviper
+    [SPECIES_SEVIPER] = 2,
-    0, // Zangoose
+    [SPECIES_ZANGOOSE] = 0,
-    1, // Relicanth
+    [SPECIES_RELICANTH] = 1,
-    2, // Aron
+    [SPECIES_ARON] = 2,
-    2, // Lairon
+    [SPECIES_LAIRON] = 2,
-    2, // Aggron
+    [SPECIES_AGGRON] = 2,
-    0, // Castform
+    [SPECIES_CASTFORM] = 0,
-    0, // Volbeat
+    [SPECIES_VOLBEAT] = 0,
-    2, // Illumise
+    [SPECIES_ILLUMISE] = 2,
-    2, // Lileep
+    [SPECIES_LILEEP] = 2,
-    0, // Cradily
+    [SPECIES_CRADILY] = 0,
-    0, // Anorith
+    [SPECIES_ANORITH] = 0,
-    0, // Armaldo
+    [SPECIES_ARMALDO] = 0,
-    1, // Ralts
+    [SPECIES_RALTS] = 1,
-    1, // Kirlia
+    [SPECIES_KIRLIA] = 1,
-    1, // Gardevoir
+    [SPECIES_GARDEVOIR] = 1,
-    2, // Bagon
+    [SPECIES_BAGON] = 2,
-    2, // Shelgon
+    [SPECIES_SHELGON] = 2,
-    0, // Salamence
+    [SPECIES_SALAMENCE] = 0,
-    0, // Beldum
+    [SPECIES_BELDUM] = 0,
-    0, // Metang
+    [SPECIES_METANG] = 0,
-    0, // Metagross
+    [SPECIES_METAGROSS] = 0,
-    2, // Regirock
+    [SPECIES_REGIROCK] = 2,
-    2, // Regice
+    [SPECIES_REGICE] = 2,
-    2, // Registeel
+    [SPECIES_REGISTEEL] = 2,
-    2, // Kyogre
+    [SPECIES_KYOGRE] = 2,
-    0, // Groudon
+    [SPECIES_GROUDON] = 0,
-    1, // Rayquaza
+    [SPECIES_RAYQUAZA] = 1,
-    0, // Latias
+    [SPECIES_LATIAS] = 0,
-    2, // Latios
+    [SPECIES_LATIOS] = 2,
-    0, // Jirachi
+    [SPECIES_JIRACHI] = 0,
-    0, // Deoxys
+    [SPECIES_DEOXYS] = 0,
-    0, // Chimecho
+    [SPECIES_CHIMECHO] = 0,
-    1, // Egg
+    [SPECIES_EGG] = 1,
-    0, // Unown B
+    [SPECIES_UNOWN_B] = 0,
-    0, // Unown C
+    [SPECIES_UNOWN_C] = 0,
-    0, // Unown D
+    [SPECIES_UNOWN_D] = 0,
-    0, // Unown E
+    [SPECIES_UNOWN_E] = 0,
-    0, // Unown F
+    [SPECIES_UNOWN_F] = 0,
-    0, // Unown G
+    [SPECIES_UNOWN_G] = 0,
-    0, // Unown H
+    [SPECIES_UNOWN_H] = 0,
-    0, // Unown I
+    [SPECIES_UNOWN_I] = 0,
-    0, // Unown J
+    [SPECIES_UNOWN_J] = 0,
-    0, // Unown K
+    [SPECIES_UNOWN_K] = 0,
-    0, // Unown L
+    [SPECIES_UNOWN_L] = 0,
-    0, // Unown M
+    [SPECIES_UNOWN_M] = 0,
-    0, // Unown N
+    [SPECIES_UNOWN_N] = 0,
-    0, // Unown O
+    [SPECIES_UNOWN_O] = 0,
-    0, // Unown P
+    [SPECIES_UNOWN_P] = 0,
-    0, // Unown Q
+    [SPECIES_UNOWN_Q] = 0,
-    0, // Unown R
+    [SPECIES_UNOWN_R] = 0,
-    0, // Unown S
+    [SPECIES_UNOWN_S] = 0,
-    0, // Unown T
+    [SPECIES_UNOWN_T] = 0,
-    0, // Unown U
+    [SPECIES_UNOWN_U] = 0,
-    0, // Unown V
+    [SPECIES_UNOWN_V] = 0,
-    0, // Unown W
+    [SPECIES_UNOWN_W] = 0,
-    0, // Unown X
+    [SPECIES_UNOWN_X] = 0,
-    0, // Unown Y
+    [SPECIES_UNOWN_Y] = 0,
-    0, // Unown Z
+    [SPECIES_UNOWN_Z] = 0,
-    0, // Unown Exclamation Mark
+    [SPECIES_UNOWN_EMARK] = 0,
-    0, // Unown Question Mark
+    [SPECIES_UNOWN_QMARK] = 0,
 };
 
 const struct SpritePalette gMonIconPaletteTable[] =
@@ -1211,7 +1211,7 @@ void sub_80D304C(u16 offset)
     if(offset <= 0xA0)
     {
         monIconPalettePtr = gMonIconPaletteTable;
-        for(i = 5; i >= 0 ; i--)
+        for(i = 5; i >= 0; i--)
         {
             LoadPalette(monIconPalettePtr->data, offset, 0x20);
             offset += 0x10;

src/pokemon_summary_screen.c

@@ -19,7 +19,7 @@
 #include "item.h"
 #include "link.h"
 #include "m4a.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "mon_markings.h"

src/rayquaza_scene.c

@@ -5,7 +5,7 @@
 #include "graphics.h"
 #include "bg.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "palette.h"
 #include "scanline_effect.h"
 #include "menu.h"
@@ -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
+    [RAY_ANIM_DUO_FIGHT_PRE] = Task_DuoFightAnim,
-    Task_DuoFightAnim, // RAY_ANIM_DUO_FIGHT
+    [RAY_ANIM_DUO_FIGHT] = Task_DuoFightAnim,
-    Task_RayTakesFlightAnim, // RAY_ANIM_TAKES_FLIGHT
+    [RAY_ANIM_TAKES_FLIGHT] = Task_RayTakesFlightAnim,
-    Task_RayDescendsAnim, // RAY_ANIM_DESCENDS
+    [RAY_ANIM_DESCENDS] = Task_RayDescendsAnim,
-    Task_RayChargesAnim, // RAY_ANIM_CHARGES
+    [RAY_ANIM_CHARGES] = Task_RayChargesAnim,
-    Task_RayChasesAwayAnim, // RAY_ANIM_CHACES_AWAY
+    [RAY_ANIM_CHACES_AWAY] = Task_RayChasesAwayAnim,
-    Task_EndAfterFadeScreen // RAY_ANIM_END
+    [RAY_ANIM_END] = Task_EndAfterFadeScreen,
 };
 
 static const struct OamData sOamData_862A6BC =

src/record_mixing.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "random.h"
 #include "constants/items.h"
 #include "text.h"

src/recorded_battle.c

@@ -9,7 +9,7 @@
 #include "string_util.h"
 #include "palette.h"
 #include "save.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "util.h"
 #include "task.h"
 #include "text.h"
@@ -221,7 +221,7 @@ u8 RecordedBattle_GetBattlerAction(u8 battlerId)
         ResetPaletteFadeControl();
         BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
         SetMainCallback2(CB2_QuitRecordedBattle);
-        return -1;
+        return 0xFF;
     }
     else
     {

src/region_map.c

@@ -2,7 +2,7 @@
 #include "main.h"
 #include "text.h"
 #include "menu.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "gpu_regs.h"
 #include "palette.h"
 #include "party_menu.h"

src/reset_save_heap.c

@@ -6,7 +6,7 @@
 #include "save.h"
 #include "new_game.h"
 #include "overworld.h"
-#include "malloc.h"
+#include "alloc.h"
 
 void sub_81700F8(void)
 {

src/rom_8011DC0.c

@@ -7,7 +7,7 @@
 #include "link.h"
 #include "link_rfu.h"
 #include "librfu.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "menu.h"
 #include "list_menu.h"
 #include "menu_helpers.h"

src/rom_8034C54.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "rom_8034C54.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "decompress.h"
 #include "main.h"
 

src/rom_81520A8.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "rom_81520A8.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "main.h"
 #include "rom_8034C54.h"
 

src/rotating_gate.c

@@ -871,7 +871,7 @@ static s32 RotatingGate_CanRotate(u8 gateId, s32 rotationDirection)
     y = gRotatingGate_PuzzleConfig[gateId].y + 7;
 
     // Loop through the gate's "arms" clockwise (north, south, east, west)
-    for (i = GATE_ARM_NORTH ; i <= GATE_ARM_WEST; i++)
+    for (i = GATE_ARM_NORTH; i <= GATE_ARM_WEST; i++)
     {
         // Ensure that no part of the arm collides with the map
         for (j = 0; j < GATE_ARM_MAX_LENGTH; j++)

src/secret_base.c

@@ -3,7 +3,7 @@
 #include "global.h"
 #include "constants/bg_event_constants.h"
 #include "constants/decorations.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "main.h"
 #include "task.h"
 #include "palette.h"

src/shop.c

@@ -17,7 +17,7 @@
 #include "item_menu.h"
 #include "list_menu.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "money.h"
@@ -447,8 +447,8 @@ static void CB2_InitBuyMenu(void)
         clear_scheduled_bg_copies_to_vram();
         gShopDataPtr = AllocZeroed(sizeof(struct ShopData));
         gShopDataPtr->scrollIndicatorsTaskId = 0xFF;
-        gShopDataPtr->itemSpriteIds[0] = -1;
+        gShopDataPtr->itemSpriteIds[0] = 0xFF;
-        gShopDataPtr->itemSpriteIds[1] = -1;
+        gShopDataPtr->itemSpriteIds[1] = 0xFF;
         BuyMenuBuildListMenuTemplate();
         BuyMenuInitBgs();
         FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20);

src/slot_machine.c

@@ -14,7 +14,7 @@
 #include "util.h"
 #include "text.h"
 #include "menu.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "bg.h"
 #include "gpu_regs.h"
 #include "coins.h"
@@ -1637,7 +1637,7 @@ void PlaySlotMachine(u8 arg0, MainCallback cb)
 
 /*static */bool8 sub_8102A44(void)
 {
-    if (FindTaskIdByFunc(sub_8102A64) == 0xff)
+    if (FindTaskIdByFunc(sub_8102A64) == 0xFF)
         return TRUE;
     else
         return FALSE;

src/task.c

@@ -186,7 +186,7 @@ u8 FindTaskIdByFunc(TaskFunc func)
         if (gTasks[i].isActive == TRUE && gTasks[i].func == func)
             return (u8)i;
 
-    return -1;
+    return 0xFF;
 }
 
 u8 GetTaskCount(void)

src/trainer_pokemon_sprites.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "sprite.h"
 #include "window.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "constants/species.h"
 #include "palette.h"
 #include "decompress.h"

src/tv.c

@@ -30,7 +30,7 @@
 #include "text.h"
 #include "script_menu.h"
 #include "naming_screen.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "region_map.h"
 #include "constants/region_map_sections.h"
 #include "decoration.h"
@@ -833,7 +833,7 @@ void UpdateTVScreensOnMap(int width, int height)
             {
                 SetTVMetatilesOnMap(width, height, 0x3);
             }
-            else if (FlagGet(FLAG_SYS_TV_START) && (FindAnyTVShowOnTheAir() != 0xff || FindAnyTVNewsOnTheAir() != 0xff || IsTVShowInSearchOfTrainersAiring()))
+            else if (FlagGet(FLAG_SYS_TV_START) && (FindAnyTVShowOnTheAir() != 0xFF || FindAnyTVNewsOnTheAir() != 0xFF || IsTVShowInSearchOfTrainersAiring()))
             {
                 FlagClear(FLAG_SYS_TV_WATCH);
                 SetTVMetatilesOnMap(width, height, 0x3);
@@ -2742,7 +2742,7 @@ u8 FindAnyTVNewsOnTheAir(void)
             return i;
         }
     }
-    return -1;
+    return 0xFF;
 }
 
 void DoPokeNews(void)

src/unk_pokedex_area_screen_helper.c

@@ -2,7 +2,7 @@
 #include "main.h"
 #include "menu.h"
 #include "bg.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "palette.h"
 #include "unk_pokedex_area_screen_helper.h"
 

src/use_pokeblock.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "main.h"
 #include "pokeblock.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "palette.h"
 #include "pokenav.h"
 #include "scanline_effect.h"

src/wallclock.c

@@ -890,13 +890,13 @@ static u16 CalcNewMinHandAngle(u16 angle, u8 direction, u8 speed)
     {
         case MVMT_BACKWARD:
             if (angle)
-                angle -= delta ;
+                angle -= delta;
             else
-                angle = 360 - delta ;
+                angle = 360 - delta;
             break;
         case MVMT_FORWARD:
-            if (angle < 360 - delta )
+            if (angle < 360 - delta)
-                angle += delta ;
+                angle += delta;
             else
                 angle = 0;
             break;

src/wild_encounter.c

@@ -5079,7 +5079,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi
         return FALSE;
 
     headerId = GetCurrentMapWildMonHeaderId();
-    if (headerId == 0xFFFF) // invalid
+    if (headerId == 0xFFFF)
     {
         if (gMapHeader.mapLayoutId == 0x166)
         {
@@ -5222,7 +5222,7 @@ bool8 SweetScentWildEncounter(void)
 
     PlayerGetDestCoords(&x, &y);
     headerId = GetCurrentMapWildMonHeaderId();
-    if (headerId == 0xFFFF) // invalid
+    if (headerId == 0xFFFF)
     {
         if (gMapHeader.mapLayoutId == 0x166)
         {

src/window.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "window.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "bg.h"
 #include "blit.h"
 

sym_bss.txt

@@ -1,5 +1,5 @@
 	.include "src/main.o"
-	.include "src/malloc.o"
+	.include "src/alloc.o"
 	.include "src/dma3_manager.o"
 	.include "src/gpu_regs.o"
 	.include "src/bg.o"