Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows

src/battle_ai_switch_items.c

@@ -703,8 +703,8 @@ u8 GetMostSuitableMonToSwitchInto(void)
                 && i != *(gBattleStruct->monToSwitchIntoId + battlerIn1)
                 && i != *(gBattleStruct->monToSwitchIntoId + battlerIn2))
             {
-                u8 type1 = gSpeciesInfo[species].type1;
-                u8 type2 = gSpeciesInfo[species].type2;
+                u8 type1 = gSpeciesInfo[species].types[0];
+                u8 type2 = gSpeciesInfo[species].types[1];
                 u8 typeDmg = TYPE_MUL_NORMAL;
                 ModulateByTypeEffectiveness(gBattleMons[opposingBattler].type1, type1, type2, &typeDmg);
                 ModulateByTypeEffectiveness(gBattleMons[opposingBattler].type2, type1, type2, &typeDmg);
@@ -751,7 +751,7 @@ u8 GetMostSuitableMonToSwitchInto(void)
     gMoveResultFlags = 0;
     gCritMultiplier = 1;
     bestDmg = 0;
-    bestMonId = 6;
+    bestMonId = PARTY_SIZE;
 
     // If we couldn't find the best mon in terms of typing, find the one that deals most damage.
     for (i = firstId; i < lastId; i++)

src/battle_anim.c

@@ -706,8 +706,8 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible)
         SetGpuReg(REG_OFFSET_BG1HOFS, gBattle_BG1_X);
         SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y);
 
-        LoadPalette(&gPlttBufferUnfaded[0x100 + battlerId * 16], animBg.paletteId * 16, 0x20);
-        CpuCopy32(&gPlttBufferUnfaded[0x100 + battlerId * 16], (void *)(BG_PLTT + animBg.paletteId * 32), 0x20);
+        LoadPalette(&gPlttBufferUnfaded[OBJ_PLTT_ID(battlerId)], BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP);
+        CpuCopy32(&gPlttBufferUnfaded[OBJ_PLTT_ID(battlerId)], (void *)(BG_PLTT + PLTT_OFFSET_4BPP(animBg.paletteId)), PLTT_SIZE_4BPP);
 
         if (IsContest())
             battlerPosition = 0;
@@ -741,8 +741,8 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible)
         SetGpuReg(REG_OFFSET_BG2HOFS, gBattle_BG2_X);
         SetGpuReg(REG_OFFSET_BG2VOFS, gBattle_BG2_Y);
 
-        LoadPalette(&gPlttBufferUnfaded[0x100 + battlerId * 16], 0x90, 0x20);
-        CpuCopy32(&gPlttBufferUnfaded[0x100 + battlerId * 16], (void *)(BG_PLTT + 0x120), 0x20);
+        LoadPalette(&gPlttBufferUnfaded[OBJ_PLTT_ID(battlerId)], BG_PLTT_ID(9), PLTT_SIZE_4BPP);
+        CpuCopy32(&gPlttBufferUnfaded[OBJ_PLTT_ID(battlerId)], (void *)(BG_PLTT + PLTT_OFFSET_4BPP(9)), PLTT_SIZE_4BPP);
 
         DrawBattlerOnBg(2, 0, 0, GetBattlerPosition(battlerId), animBg.paletteId, animBg.bgTiles + 0x1000, animBg.bgTilemap + 0x400, animBg.tilesOffset);
     }
@@ -1208,13 +1208,13 @@ static void LoadMoveBg(u16 bgId)
         dmaDest = (void *)BG_SCREEN_ADDR(26);
         DmaCopy32(3, dmaSrc, dmaDest, 0x800);
         LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)BG_SCREEN_ADDR(4));
-        LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, GetBattleBgPaletteNum() * 16, 32);
+        LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, BG_PLTT_ID(GetBattleBgPaletteNum()), PLTT_SIZE_4BPP);
     }
     else
     {
         LZDecompressVram(gBattleAnimBackgroundTable[bgId].tilemap, (void *)BG_SCREEN_ADDR(26));
         LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)BG_CHAR_ADDR(2));
-        LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, 32, 32);
+        LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, BG_PLTT_ID(2), PLTT_SIZE_4BPP);
     }
 }
 

src/battle_anim_dark.c

@@ -426,7 +426,7 @@ void AnimTask_MoveAttackerMementoShadow(u8 taskId)
         GetBattleAnimBg1Data(&animBg);
         task->data[10] = gBattle_BG1_Y;
         SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG1);
-        FillPalette(RGB_BLACK, animBg.paletteId * 16, 32);
+        FillPalette(RGB_BLACK, BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP);
         scanlineParams.dmaDest = &REG_BG1VOFS;
         var0 = WINOUT_WIN01_BG1;
         if (!IsContest())
@@ -436,7 +436,7 @@ void AnimTask_MoveAttackerMementoShadow(u8 taskId)
     {
         task->data[10] = gBattle_BG2_Y;
         SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG2);
-        FillPalette(RGB_BLACK, 144, 32);
+        FillPalette(RGB_BLACK, BG_PLTT_ID(9), PLTT_SIZE_4BPP);
         scanlineParams.dmaDest = &REG_BG2VOFS;
         var0 = WINOUT_WIN01_BG2;
         if (!IsContest())
@@ -566,12 +566,12 @@ void AnimTask_MoveTargetMementoShadow(u8 taskId)
         {
             GetBattleAnimBg1Data(&animBg);
             task->data[10] = gBattle_BG1_Y;
-            FillPalette(RGB_BLACK, animBg.paletteId * 16, 32);
+            FillPalette(RGB_BLACK, BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP);
         }
         else
         {
             task->data[10] = gBattle_BG2_Y;
-            FillPalette(RGB_BLACK, 9 * 16, 32);
+            FillPalette(RGB_BLACK, BG_PLTT_ID(9), PLTT_SIZE_4BPP);
         }
 
         SetAllBattlersSpritePriority(3);
@@ -863,7 +863,7 @@ void AnimTask_MetallicShine(u8 taskId)
     GetBattleAnimBg1Data(&animBg);
     AnimLoadCompressedBgTilemap(animBg.bgId, gMetalShineTilemap);
     AnimLoadCompressedBgGfx(animBg.bgId, gMetalShineGfx, animBg.tilesOffset);
-    LoadCompressedPalette(gMetalShinePalette, animBg.paletteId * 16, 32);
+    LoadCompressedPalette(gMetalShinePalette, BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP);
 
     gBattle_BG1_X = -gSprites[spriteId].x + 96;
     gBattle_BG1_Y = -gSprites[spriteId].y + 32;
@@ -872,7 +872,7 @@ void AnimTask_MetallicShine(u8 taskId)
     if (gBattleAnimArgs[1] == 0)
         SetGrayscaleOrOriginalPalette(paletteNum, FALSE);
     else
-        BlendPalette(paletteNum * 16, 16, 11, gBattleAnimArgs[2]);
+        BlendPalette(BG_PLTT_ID(paletteNum), 16, 11, gBattleAnimArgs[2]);
 
     gTasks[taskId].data[0] = newSpriteId;
     gTasks[taskId].data[1] = gBattleAnimArgs[0];
@@ -943,19 +943,19 @@ void AnimTask_SetGrayscaleOrOriginalPal(u8 taskId)
     case ANIM_DEF_PARTNER:
         spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
         break;
-    case 4:
+    case ANIM_PLAYER_LEFT:
         position = B_POSITION_PLAYER_LEFT;
         calcSpriteId = TRUE;
         break;
-    case 5:
+    case ANIM_PLAYER_RIGHT:
         position = B_POSITION_PLAYER_RIGHT;
         calcSpriteId = TRUE;
         break;
-    case 6:
+    case ANIM_OPPONENT_LEFT:
         position = B_POSITION_OPPONENT_LEFT;
         calcSpriteId = TRUE;
         break;
-    case 7:
+    case ANIM_OPPONENT_RIGHT:
         position = B_POSITION_OPPONENT_RIGHT;
         calcSpriteId = TRUE;
         break;

src/battle_anim_effects_1.c

@@ -3641,8 +3641,8 @@ void AnimTask_CycleMagicalLeafPal(u8 taskId)
     switch (task->data[0])
     {
     case 0:
-        task->data[8] = IndexOfSpritePaletteTag(ANIM_TAG_LEAF) * 16 + 256;
-        task->data[12] = IndexOfSpritePaletteTag(ANIM_TAG_RAZOR_LEAF) * 16 + 256;
+        task->data[8] = OBJ_PLTT_ID(IndexOfSpritePaletteTag(ANIM_TAG_LEAF));
+        task->data[12] = OBJ_PLTT_ID(IndexOfSpritePaletteTag(ANIM_TAG_RAZOR_LEAF));
         task->data[0]++;
         break;
     case 1:
@@ -4349,7 +4349,7 @@ static void AnimLockOnTarget_Step4(struct Sprite *sprite)
         int pal;
         sprite->data[2]++;
         pal = sprite->oam.paletteNum;
-        LoadPalette(&gPlttBufferUnfaded[0x108 + pal * 16], pal * 16 | 0x101, 4);
+        LoadPalette(&gPlttBufferUnfaded[OBJ_PLTT_ID(pal) + 8], OBJ_PLTT_ID(pal) + 1, PLTT_SIZEOF(2));
         PlaySE12WithPanning(SE_M_LEER, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
     }
     else if (sprite->data[1] == 0)
@@ -5173,8 +5173,8 @@ void AnimTask_DoubleTeam(u8 taskId)
     struct Task *task = &gTasks[taskId];
     task->data[0] = GetAnimBattlerSpriteId(ANIM_ATTACKER);
     task->data[1] = AllocSpritePalette(ANIM_TAG_BENT_SPOON);
-    r3 = (task->data[1] * 16) + 0x100;
-    r4 = (gSprites[task->data[0]].oam.paletteNum + 16) << 4;
+    r3 = OBJ_PLTT_ID(task->data[1]);
+    r4 = OBJ_PLTT_ID2(gSprites[task->data[0]].oam.paletteNum);
     for (i = 1; i < 16; i++)
         gPlttBufferUnfaded[r3 + i] = gPlttBufferUnfaded[r4 + i];
 

src/battle_anim_effects_2.c

@@ -2678,7 +2678,7 @@ static void AnimUproarRing(struct Sprite *sprite)
     u8 index = IndexOfSpritePaletteTag(ANIM_TAG_THIN_RING);
     if (index != 0xFF)
     {
-        BlendPalette(((index << 20) + 0x1010000) >> 16, 15, gBattleAnimArgs[5], gBattleAnimArgs[4]);
+        BlendPalette((OBJ_PLTT_ID(index) + 1), 15, gBattleAnimArgs[5], gBattleAnimArgs[4]);
     }
 
     StartSpriteAffineAnim(sprite, 1);
@@ -3026,7 +3026,7 @@ void AnimTask_LoadMusicNotesPals(u8 taskId)
     gMonSpritesGfxPtr->buffer = AllocZeroed(0x2000);
     LZDecompressWram(gBattleAnimSpritePal_MusicNotes2, gMonSpritesGfxPtr->buffer);
     for (i = 0; i < NUM_MUSIC_NOTE_PAL_TAGS; i++)
-        LoadPalette(&gMonSpritesGfxPtr->buffer[i * 32], (u16)((paletteNums[i] << 4) + 0x100), 32);
+        LoadPalette(&gMonSpritesGfxPtr->buffer[i * 32], (u16)(OBJ_PLTT_ID(paletteNums[i])), PLTT_SIZE_4BPP);
 
     FREE_AND_SET_NULL(gMonSpritesGfxPtr->buffer);
     DestroyAnimVisualTask(taskId);
@@ -3259,7 +3259,7 @@ void AnimTask_HeartsBackground(u8 taskId)
     GetBattleAnimBg1Data(&animBg);
     AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnimBgImage_Attract, animBg.tilesOffset);
     AnimLoadCompressedBgTilemapHandleContest(&animBg, gBattleAnimBgTilemap_Attract, FALSE);
-    LoadCompressedPalette(gBattleAnimBgPalette_Attract, animBg.paletteId * 16, 32);
+    LoadCompressedPalette(gBattleAnimBgPalette_Attract, BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP);
     gTasks[taskId].func = AnimTask_HeartsBackground_Step;
 }
 
@@ -3343,7 +3343,7 @@ void AnimTask_ScaryFace(u8 taskId)
         AnimLoadCompressedBgTilemapHandleContest(&animBg, &gBattleAnimBgTilemap_ScaryFaceOpponent, FALSE);
 
     AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnimBgImage_ScaryFace, animBg.tilesOffset);
-    LoadCompressedPalette(gBattleAnimBgPalette_ScaryFace, animBg.paletteId * 16, 32);
+    LoadCompressedPalette(gBattleAnimBgPalette_ScaryFace, BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP);
     gTasks[taskId].func = AnimTask_ScaryFace_Step;
 }
 

src/battle_anim_effects_3.c

@@ -2405,7 +2405,7 @@ void AnimTask_MorningSunLightBeam(u8 taskId)
         }
 
         AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnimMaskImage_LightBeam, animBg.tilesOffset);
-        LoadCompressedPalette(gBattleAnimMaskPalette_LightBeam, animBg.paletteId * 16, 32);
+        LoadCompressedPalette(gBattleAnimMaskPalette_LightBeam, BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP);
 
         gTasks[taskId].data[10] = gBattle_BG1_X;
         gTasks[taskId].data[11] = gBattle_BG1_Y;
@@ -2601,7 +2601,7 @@ void AnimTask_DoomDesireLightBeam(u8 taskId)
         }
 
         AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnimMaskImage_LightBeam, animBg.tilesOffset);
-        LoadCompressedPalette(gBattleAnimMaskPalette_LightBeam, animBg.paletteId * 16, 32);
+        LoadCompressedPalette(gBattleAnimMaskPalette_LightBeam, BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP);
         gTasks[taskId].data[10] = gBattle_BG1_X;
         gTasks[taskId].data[11] = gBattle_BG1_Y;
         gTasks[taskId].data[0]++;
@@ -3252,7 +3252,7 @@ void AnimTask_RolePlaySilhouette(u8 taskId)
 
     gSprites[spriteId].oam.priority = priority;
     gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
-    FillPalette(RGB_WHITE, (gSprites[spriteId].oam.paletteNum << 4) + 0x100, 32);
+    FillPalette(RGB_WHITE, OBJ_PLTT_ID(gSprites[spriteId].oam.paletteNum), PLTT_SIZE_4BPP);
     gSprites[spriteId].oam.priority = priority;
     SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL);
     SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[1], 16 - gTasks[taskId].data[1]));
@@ -3880,7 +3880,7 @@ void AnimTask_FacadeColorBlend(u8 taskId)
     gTasks[taskId].data[0] = 0;
     gTasks[taskId].data[1] = gBattleAnimArgs[1];
     spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
-    gTasks[taskId].data[2] = 0x100 + gSprites[spriteId].oam.paletteNum * 16;
+    gTasks[taskId].data[2] = OBJ_PLTT_ID(gSprites[spriteId].oam.paletteNum);
     gTasks[taskId].func = AnimTask_FacadeColorBlend_Step;
 }
 
@@ -5145,7 +5145,7 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId)
 
         spriteId2 = CreateAdditionalMonSpriteForMoveAnim(species, isBackPic, 0, x, GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y), subpriority, personality, otId, gBattleAnimAttacker, FALSE);
         if (gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].transformSpecies != SPECIES_NONE)
-            BlendPalette((gSprites[spriteId2].oam.paletteNum * 16) | 0x100, 16, 6, RGB_WHITE);
+            BlendPalette(OBJ_PLTT_ID(gSprites[spriteId2].oam.paletteNum), 16, 6, RGB_WHITE);
 
         gTasks[taskId].data[15] = spriteId2;
         gTasks[taskId].data[0]++;

src/battle_anim_fire.c

@@ -2,6 +2,7 @@
 #include "battle_anim.h"
 #include "constants/rgb.h"
 #include "constants/songs.h"
+#include "palette.h"
 #include "sound.h"
 #include "util.h"
 #include "task.h"
@@ -1329,7 +1330,7 @@ void AnimTask_BlendBackground(u8 taskId)
 {
     struct BattleAnimBgData animBg;
     GetBattleAnimBg1Data(&animBg);
-    BlendPalette(animBg.paletteId * 16, 16, gBattleAnimArgs[0], gBattleAnimArgs[1]);
+    BlendPalette(BG_PLTT_ID(animBg.paletteId), 16, gBattleAnimArgs[0], gBattleAnimArgs[1]);
     DestroyAnimVisualTask(taskId);
 }
 

src/battle_anim_ghost.c

@@ -642,8 +642,8 @@ static void AnimTask_SpiteTargetShadow_Step1(u8 taskId)
         }
         break;
     case 1:
-        task->data[14] = (task->data[14] + 16) * 16;
-        CpuCopy32(&gPlttBufferUnfaded[task->data[4]], &gPlttBufferFaded[task->data[14]], 32);
+        task->data[14] = OBJ_PLTT_ID2(task->data[14]);
+        CpuCopy32(&gPlttBufferUnfaded[task->data[4]], &gPlttBufferFaded[task->data[14]], PLTT_SIZE_4BPP);
         BlendPalette(task->data[4], 16, 10, RGB(13, 0, 15));
         task->data[15]++;
         break;

src/battle_anim_ice.c

@@ -1005,7 +1005,7 @@ void AnimTask_HazeScrollingFog(u8 taskId)
     GetBattleAnimBg1Data(&animBg);
     LoadBgTiles(animBg.bgId, gWeatherFogHorizontalTiles, 0x800, animBg.tilesOffset);
     AnimLoadCompressedBgTilemapHandleContest(&animBg, gBattleAnimFogTilemap, FALSE);
-    LoadPalette(&gFogPalette, animBg.paletteId * 16, 32);
+    LoadPalette(&gFogPalette, BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP);
 
     gTasks[taskId].func = AnimTask_HazeScrollingFog_Step;
 }
@@ -1110,7 +1110,7 @@ void AnimTask_MistBallFog(u8 taskId)
     GetBattleAnimBg1Data(&animBg);
     LoadBgTiles(animBg.bgId, gWeatherFogHorizontalTiles, 0x800, animBg.tilesOffset);
     AnimLoadCompressedBgTilemapHandleContest(&animBg, gBattleAnimFogTilemap, FALSE);
-    LoadPalette(&gFogPalette, animBg.paletteId * 16, 32);
+    LoadPalette(&gFogPalette, BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP);
 
     gTasks[taskId].data[15] = -1;
     gTasks[taskId].func = AnimTask_MistBallFog_Step;

src/battle_anim_mon_movement.c

@@ -164,20 +164,20 @@ void AnimTask_ShakeMon2(u8 taskId)
         if (spriteId == SPRITE_NONE)
             abort = TRUE;
     }
-    else if (gBattleAnimArgs[0] != 8)
+    else if (gBattleAnimArgs[0] != ANIM_ATTACKER_FORCE)
     {
         switch (gBattleAnimArgs[0])
         {
-        case 4:
+        case ANIM_PLAYER_LEFT:
             battlerId = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
             break;
-        case 5:
+        case ANIM_PLAYER_RIGHT:
             battlerId = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
             break;
-        case 6:
+        case ANIM_OPPONENT_LEFT:
             battlerId = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
             break;
-        case 7:
+        case ANIM_OPPONENT_RIGHT:
         default:
             battlerId = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
             break;

src/battle_anim_mons.c

@@ -1726,7 +1726,7 @@ void AnimTask_BlendMonInAndOut(u8 task)
         DestroyAnimVisualTask(task);
         return;
     }
-    gTasks[task].data[0] = (gSprites[spriteId].oam.paletteNum * 0x10) + 0x101;
+    gTasks[task].data[0] = OBJ_PLTT_ID(gSprites[spriteId].oam.paletteNum) + 1;
     AnimTask_BlendPalInAndOutSetup(&gTasks[task]);
 }
 
@@ -2104,7 +2104,7 @@ u8 CreateAdditionalMonSpriteForMoveAnim(u16 species, bool8 isBackpic, u8 id, s16
         gMonSpritesGfxPtr->buffer = AllocZeroed(0x2000);
     if (!isBackpic)
     {
-        LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, trainerId, personality), (palette * 0x10) + 0x100, 0x20);
+        LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, trainerId, personality), OBJ_PLTT_ID(palette), PLTT_SIZE_4BPP);
         if (ignoreDeoxysForm == TRUE || ShouldIgnoreDeoxysForm(5, battlerId) == TRUE || gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != 0)
             LoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[species],
                                                 gMonSpritesGfxPtr->buffer,
@@ -2120,7 +2120,7 @@ u8 CreateAdditionalMonSpriteForMoveAnim(u16 species, bool8 isBackpic, u8 id, s16
     }
     else
     {
-        LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, trainerId, personality), (palette * 0x10) + 0x100, 0x20);
+        LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, trainerId, personality), OBJ_PLTT_ID(palette), PLTT_SIZE_4BPP);
         if (ignoreDeoxysForm == TRUE || ShouldIgnoreDeoxysForm(5, battlerId) == TRUE || gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != 0)
             LoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[species],
                                                 gMonSpritesGfxPtr->buffer,
@@ -2427,8 +2427,8 @@ void AnimTask_AttackerPunchWithTrace(u8 taskId)
     task->tPaletteNum = AllocSpritePalette(ANIM_TAG_BENT_SPOON);
     task->tNumTracesActive = 0;
 
-    dest = (task->tPaletteNum + 16) * 16;
-    src = (gSprites[task->tBattlerSpriteId].oam.paletteNum + 0x10) * 0x10;
+    dest = OBJ_PLTT_ID2(task->tPaletteNum);
+    src = OBJ_PLTT_ID2(gSprites[task->tBattlerSpriteId].oam.paletteNum);
 
     // Set trace's priority based on battler's subpriority
     task->tPriority = GetBattlerSpriteSubpriority(gBattleAnimAttacker);
@@ -2437,7 +2437,7 @@ void AnimTask_AttackerPunchWithTrace(u8 taskId)
     else
         task->tPriority = 3;
 
-    CpuCopy32(&gPlttBufferUnfaded[src], &gPlttBufferFaded[dest], 0x20);
+    CpuCopy32(&gPlttBufferUnfaded[src], &gPlttBufferFaded[dest], PLTT_SIZE_4BPP);
     BlendPalette(dest, 16, gBattleAnimArgs[1], gBattleAnimArgs[0]);
     task->func = AnimTask_AttackerPunchWithTrace_Step;
 }

src/battle_anim_rock.c

@@ -410,7 +410,7 @@ void AnimTask_LoadSandstormBackground(u8 taskId)
     GetBattleAnimBg1Data(&animBg);
     AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnimBgImage_Sandstorm, animBg.tilesOffset);
     AnimLoadCompressedBgTilemapHandleContest(&animBg, gBattleAnimBgTilemap_Sandstorm, FALSE);
-    LoadCompressedPalette(gBattleAnimSpritePal_FlyingDirt, animBg.paletteId * 16, 32);
+    LoadCompressedPalette(gBattleAnimSpritePal_FlyingDirt, BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP);
 
     if (gBattleAnimArgs[0] && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         var0 = 1;

src/battle_anim_status_effects.c

@@ -316,7 +316,7 @@ static void Task_UpdateFlashingCircleImpacts(u8 taskId)
     if (gTasks[taskId].data[2] == 2)
     {
         gTasks[taskId].data[2] = 0;
-        BlendPalette(0x100 + gTasks[taskId].data[0] * 16, 16, gTasks[taskId].data[4], gTasks[taskId].data[1]);
+        BlendPalette(OBJ_PLTT_ID(gTasks[taskId].data[0]), 16, gTasks[taskId].data[4], gTasks[taskId].data[1]);
         if (gTasks[taskId].data[5] == 0)
         {
             gTasks[taskId].data[4]++;

src/battle_anim_throw.c

@@ -471,7 +471,7 @@ void AnimTask_UnusedLevelUpHealthBox(u8 taskId)
     GetBattleAnimBg1Data(&animBgData);
     AnimLoadCompressedBgTilemap(animBgData.bgId, UnusedLevelupAnimationTilemap);
     AnimLoadCompressedBgGfx(animBgData.bgId, UnusedLevelupAnimationGfx, animBgData.tilesOffset);
-    LoadCompressedPalette(gCureBubblesPal, animBgData.paletteId << 4, 32);
+    LoadCompressedPalette(gCureBubblesPal, BG_PLTT_ID(animBgData.paletteId), PLTT_SIZE_4BPP);
 
     gBattle_BG1_X = -gSprites[spriteId3].x + 32;
     gBattle_BG1_Y = -gSprites[spriteId3].y - 32;
@@ -553,10 +553,10 @@ static void LoadHealthboxPalsForLevelUp(u8 *paletteId1, u8 *paletteId2, u8 battl
     *paletteId1 = AllocSpritePalette(TAG_HEALTHBOX_PALS_1);
     *paletteId2 = AllocSpritePalette(TAG_HEALTHBOX_PALS_2);
 
-    offset1 = (gSprites[healthBoxSpriteId].oam.paletteNum * 16) + 0x100;
-    offset2 = (gSprites[spriteId2].oam.paletteNum * 16) + 0x100;
-    LoadPalette(&gPlttBufferUnfaded[offset1], *paletteId1 * 16 + 0x100, 0x20);
-    LoadPalette(&gPlttBufferUnfaded[offset2], *paletteId2 * 16 + 0x100, 0x20);
+    offset1 = OBJ_PLTT_ID(gSprites[healthBoxSpriteId].oam.paletteNum);
+    offset2 = OBJ_PLTT_ID(gSprites[spriteId2].oam.paletteNum);
+    LoadPalette(&gPlttBufferUnfaded[offset1], OBJ_PLTT_ID(*paletteId1), PLTT_SIZE_4BPP);
+    LoadPalette(&gPlttBufferUnfaded[offset2], OBJ_PLTT_ID(*paletteId2), PLTT_SIZE_4BPP);
 
     gSprites[healthBoxSpriteId].oam.paletteNum = *paletteId1;
     gSprites[spriteId1].oam.paletteNum = *paletteId1;
@@ -620,7 +620,7 @@ static void AnimTask_FlashHealthboxOnLevelUp_Step(u8 taskId)
             if (gTasks[taskId].data[2] > 16)
                 gTasks[taskId].data[2] = 16;
 
-            paletteOffset = paletteNum * 16 + 0x100;
+            paletteOffset = OBJ_PLTT_ID(paletteNum);
             BlendPalette(paletteOffset + colorOffset, 1, gTasks[taskId].data[2], RGB(20, 27, 31));
             if (gTasks[taskId].data[2] == 16)
                 gTasks[taskId].data[1]++;
@@ -630,7 +630,7 @@ static void AnimTask_FlashHealthboxOnLevelUp_Step(u8 taskId)
             if (gTasks[taskId].data[2] < 0)
                 gTasks[taskId].data[2] = 0;
 
-            paletteOffset = paletteNum * 16 + 0x100;
+            paletteOffset = OBJ_PLTT_ID(paletteNum);
             BlendPalette(paletteOffset + colorOffset, 1, gTasks[taskId].data[2], RGB(20, 27, 31));
             if (gTasks[taskId].data[2] == 0)
                 DestroyAnimVisualTask(taskId);
@@ -2030,12 +2030,12 @@ u8 LaunchBallFadeMonTask(bool8 unfadeLater, u8 spritePalNum, u32 selectedPalette
 
     if (!unfadeLater)
     {
-        BlendPalette(spritePalNum * 16 + 0x100, 16, 0, gBallOpenFadeColors[ballId]);
+        BlendPalette(OBJ_PLTT_ID(spritePalNum), 16, 0, gBallOpenFadeColors[ballId]);
         gTasks[taskId].tdCoeff = 1;
     }
     else
     {
-        BlendPalette(spritePalNum * 16 + 0x100, 16, 16, gBallOpenFadeColors[ballId]);
+        BlendPalette(OBJ_PLTT_ID(spritePalNum), 16, 16, gBallOpenFadeColors[ballId]);
         gTasks[taskId].tCoeff = 16;
         gTasks[taskId].tdCoeff = -1;
         gTasks[taskId].func = Task_FadeMon_ToNormal;
@@ -2051,7 +2051,7 @@ static void Task_FadeMon_ToBallColor(u8 taskId)
 
     if (gTasks[taskId].tTimer <= 16)
     {
-        BlendPalette(gTasks[taskId].tPalOffset * 16 + 0x100, 16, gTasks[taskId].tCoeff, gBallOpenFadeColors[ballId]);
+        BlendPalette(OBJ_PLTT_ID(gTasks[taskId].tPalOffset), 16, gTasks[taskId].tCoeff, gBallOpenFadeColors[ballId]);
         gTasks[taskId].tCoeff += gTasks[taskId].tdCoeff;
         gTasks[taskId].tTimer++;
     }
@@ -2079,7 +2079,7 @@ static void Task_FadeMon_ToNormal_Step(u8 taskId)
 
     if (gTasks[taskId].tTimer <= 16)
     {
-        BlendPalette(gTasks[taskId].tPalOffset * 16 + 0x100, 16, gTasks[taskId].tCoeff, gBallOpenFadeColors[ballId]);
+        BlendPalette(OBJ_PLTT_ID(gTasks[taskId].tPalOffset), 16, gTasks[taskId].tCoeff, gBallOpenFadeColors[ballId]);
         gTasks[taskId].tCoeff += gTasks[taskId].tdCoeff;
         gTasks[taskId].tTimer++;
     }

src/battle_anim_utility_funcs.c

@@ -166,7 +166,7 @@ void StartBlendAnimSpriteColor(u8 taskId, u32 selectedPalettes)
 static void AnimTask_BlendSpriteColor_Step2(u8 taskId)
 {
     u32 selectedPalettes;
-    u16 singlePaletteMask = 0;
+    u16 singlePaletteOffset = 0;
 
     if (gTasks[taskId].data[9] == gTasks[taskId].data[2])
     {
@@ -175,8 +175,8 @@ static void AnimTask_BlendSpriteColor_Step2(u8 taskId)
         while (selectedPalettes != 0)
         {
             if (selectedPalettes & 1)
-                BlendPalette(singlePaletteMask, 16, gTasks[taskId].data[10], gTasks[taskId].data[5]);
-            singlePaletteMask += 0x10;
+                BlendPalette(singlePaletteOffset, 16, gTasks[taskId].data[10], gTasks[taskId].data[5]);
+            singlePaletteOffset += 16;
             selectedPalettes >>= 1;
         }
 
@@ -333,7 +333,7 @@ void AnimTask_DrawFallingWhiteLinesOnAttacker(u8 taskId)
     GetBattleAnimBg1Data(&animBgData);
     AnimLoadCompressedBgTilemapHandleContest(&animBgData, gBattleAnimMaskTilemap_Curse, FALSE);
     AnimLoadCompressedBgGfx(animBgData.bgId, gBattleAnimMaskImage_Curse, animBgData.tilesOffset);
-    LoadPalette(sCurseLinesPalette, animBgData.paletteId * 16 + 1, 2);
+    LoadPalette(sCurseLinesPalette, BG_PLTT_ID(animBgData.paletteId) + 1, PLTT_SIZEOF(1));
 
     gBattle_BG1_X = -gSprites[spriteId].x + 32;
     gBattle_BG1_Y = -gSprites[spriteId].y + 32;
@@ -478,28 +478,28 @@ static void StatsChangeAnimation_Step2(u8 taskId)
     switch (sAnimStatsChangeData->data[1])
     {
     case 0:
-        LoadCompressedPalette(gBattleStatMask2_Pal, animBgData.paletteId * 16, 32);
+        LoadCompressedPalette(gBattleStatMask2_Pal, BG_PLTT_ID(animBgData.paletteId), PLTT_SIZE_4BPP);
         break;
     case 1:
-        LoadCompressedPalette(gBattleStatMask1_Pal, animBgData.paletteId * 16, 32);
+        LoadCompressedPalette(gBattleStatMask1_Pal, BG_PLTT_ID(animBgData.paletteId), PLTT_SIZE_4BPP);
         break;
     case 2:
-        LoadCompressedPalette(gBattleStatMask3_Pal, animBgData.paletteId * 16, 32);
+        LoadCompressedPalette(gBattleStatMask3_Pal, BG_PLTT_ID(animBgData.paletteId), PLTT_SIZE_4BPP);
         break;
     case 3:
-        LoadCompressedPalette(gBattleStatMask4_Pal, animBgData.paletteId * 16, 32);
+        LoadCompressedPalette(gBattleStatMask4_Pal, BG_PLTT_ID(animBgData.paletteId), PLTT_SIZE_4BPP);
         break;
     case 4:
-        LoadCompressedPalette(gBattleStatMask6_Pal, animBgData.paletteId * 16, 32);
+        LoadCompressedPalette(gBattleStatMask6_Pal, BG_PLTT_ID(animBgData.paletteId), PLTT_SIZE_4BPP);
         break;
     case 5:
-        LoadCompressedPalette(gBattleStatMask7_Pal, animBgData.paletteId * 16, 32);
+        LoadCompressedPalette(gBattleStatMask7_Pal, BG_PLTT_ID(animBgData.paletteId), PLTT_SIZE_4BPP);
         break;
     case 6:
-        LoadCompressedPalette(gBattleStatMask8_Pal, animBgData.paletteId * 16, 32);
+        LoadCompressedPalette(gBattleStatMask8_Pal, BG_PLTT_ID(animBgData.paletteId), PLTT_SIZE_4BPP);
         break;
     default:
-        LoadCompressedPalette(gBattleStatMask5_Pal, animBgData.paletteId * 16, 32);
+        LoadCompressedPalette(gBattleStatMask5_Pal, BG_PLTT_ID(animBgData.paletteId), PLTT_SIZE_4BPP);
         break;
     }
 
@@ -639,16 +639,10 @@ static void AnimTask_Flash_Step(u8 taskId)
             for (i = 0; i < 16; i++)
             {
                 if ((task->data[15] >> i) & 1)
-                {
-                    u16 paletteOffset = i * 16;
-                    BlendPalette(paletteOffset, 16, task->data[2], 0xFFFF);
-                }
+                    BlendPalette(BG_PLTT_ID(i), 16, task->data[2], 0xFFFF);
 
                 if ((task->data[14] >> i) & 1)
-                {
-                    u16 paletteOffset = i * 16 + 0x100;
-                    BlendPalette(paletteOffset, 16, task->data[2], 0);
-                }
+                    BlendPalette(OBJ_PLTT_ID(i), 16, task->data[2], 0);
             }
 
             if (task->data[2] == 0)
@@ -822,7 +816,7 @@ void StartMonScrollingBgMask(u8 taskId, int unused, u16 scrollSpeed, u8 battler,
     GetBattleAnimBg1Data(&animBgData);
     AnimLoadCompressedBgTilemapHandleContest(&animBgData, tilemap, FALSE);
     AnimLoadCompressedBgGfx(animBgData.bgId, gfx, animBgData.tilesOffset);
-    LoadCompressedPalette(palette, animBgData.paletteId * 16, 32);
+    LoadCompressedPalette(palette, BG_PLTT_ID(animBgData.paletteId), PLTT_SIZE_4BPP);
 
     gBattle_BG1_X = 0;
     gBattle_BG1_Y = 0;

src/battle_anim_water.c

@@ -825,9 +825,9 @@ void AnimTask_CreateSurfWave(u8 taskId)
     }
     AnimLoadCompressedBgGfx(animBg.bgId, gBattleAnimBgImage_Surf, animBg.tilesOffset);
     if (gBattleAnimArgs[0] == 0)
-        LoadCompressedPalette(gBattleAnimBgPalette_Surf, animBg.paletteId * 16, 32);
+        LoadCompressedPalette(gBattleAnimBgPalette_Surf, BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP);
     else
-        LoadCompressedPalette(gBattleAnimBackgroundImageMuddyWater_Pal, animBg.paletteId * 16, 32);
+        LoadCompressedPalette(gBattleAnimBackgroundImageMuddyWater_Pal, BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP);
     taskId2 = CreateTask(AnimTask_SurfWaveScanlineEffect, gTasks[taskId].priority + 1);
     gTasks[taskId].data[15] = taskId2;
     gTasks[taskId2].data[0] = 0;

src/battle_arena.c

@@ -390,7 +390,7 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state)
         BeginNormalPaletteFade(0x7FFFFF1C, 4, 0, 8, RGB_BLACK);
         SetGpuReg(REG_OFFSET_WININ, (WININ_WIN0_ALL & ~WININ_WIN0_BG0) | WININ_WIN1_ALL);
         LoadCompressedSpriteSheet(sBattleArenaJudgmentSymbolsSpriteSheet);
-        LoadCompressedPalette(gBattleArenaJudgmentSymbolsPalette, 0x1F0, 0x20);
+        LoadCompressedPalette(gBattleArenaJudgmentSymbolsPalette, OBJ_PLTT_ID(15), PLTT_SIZE_4BPP);
         gBattle_WIN0H = 0xFF;
         gBattle_WIN0V = 0x70;
         (*state)++;

src/battle_bg.c

@@ -742,17 +742,17 @@ void InitBattleBgsVideo(void)
 
 void LoadBattleMenuWindowGfx(void)
 {
-    LoadUserWindowBorderGfx(2, 0x12, 0x10);
-    LoadUserWindowBorderGfx(2, 0x22, 0x10);
-    LoadCompressedPalette(gBattleWindowTextPalette, 0x50, 0x20);
+    LoadUserWindowBorderGfx(2, 0x12, BG_PLTT_ID(1));
+    LoadUserWindowBorderGfx(2, 0x22, BG_PLTT_ID(1));
+    LoadCompressedPalette(gBattleWindowTextPalette, BG_PLTT_ID(5), PLTT_SIZE_4BPP);
 
     if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
     {
         // Load graphics for the Battle Arena referee's mid-battle messages.
-        Menu_LoadStdPalAt(0x70);
-        LoadMessageBoxGfx(0, 0x30, 0x70);
-        gPlttBufferUnfaded[0x76] = 0;
-        CpuCopy16(&gPlttBufferUnfaded[0x76], &gPlttBufferFaded[0x76], 2);
+        Menu_LoadStdPalAt(BG_PLTT_ID(7));
+        LoadMessageBoxGfx(0, 0x30, BG_PLTT_ID(7));
+        gPlttBufferUnfaded[BG_PLTT_ID(7) + 6] = 0;
+        CpuCopy16(&gPlttBufferUnfaded[BG_PLTT_ID(7) + 6], &gPlttBufferFaded[BG_PLTT_ID(7) + 6], PLTT_SIZEOF(1));
     }
 }
 
@@ -762,25 +762,25 @@ void DrawMainBattleBackground(void)
     {
         LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2)));
         LZDecompressVram(gBattleTerrainTilemap_Building, (void *)(BG_SCREEN_ADDR(26)));
-        LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60);
+        LoadCompressedPalette(gBattleTerrainPalette_Frontier, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_GROUDON)
     {
         LZDecompressVram(gBattleTerrainTiles_Cave, (void *)(BG_CHAR_ADDR(2)));
         LZDecompressVram(gBattleTerrainTilemap_Cave, (void *)(BG_SCREEN_ADDR(26)));
-        LoadCompressedPalette(gBattleTerrainPalette_Groudon, 0x20, 0x60);
+        LoadCompressedPalette(gBattleTerrainPalette_Groudon, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE)
     {
         LZDecompressVram(gBattleTerrainTiles_Water, (void *)(BG_CHAR_ADDR(2)));
         LZDecompressVram(gBattleTerrainTilemap_Water, (void *)(BG_SCREEN_ADDR(26)));
-        LoadCompressedPalette(gBattleTerrainPalette_Kyogre, 0x20, 0x60);
+        LoadCompressedPalette(gBattleTerrainPalette_Kyogre, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_RAYQUAZA)
     {
         LZDecompressVram(gBattleTerrainTiles_Rayquaza, (void *)(BG_CHAR_ADDR(2)));
         LZDecompressVram(gBattleTerrainTilemap_Rayquaza, (void *)(BG_SCREEN_ADDR(26)));
-        LoadCompressedPalette(gBattleTerrainPalette_Rayquaza, 0x20, 0x60);
+        LoadCompressedPalette(gBattleTerrainPalette_Rayquaza, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
     }
     else
     {
@@ -791,14 +791,14 @@ void DrawMainBattleBackground(void)
             {
                 LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2)));
                 LZDecompressVram(gBattleTerrainTilemap_Building, (void *)(BG_SCREEN_ADDR(26)));
-                LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, 0x20, 0x60);
+                LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
                 return;
             }
             else if (trainerClass == TRAINER_CLASS_CHAMPION)
             {
                 LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2)));
                 LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26)));
-                LoadCompressedPalette(gBattleTerrainPalette_StadiumWallace, 0x20, 0x60);
+                LoadCompressedPalette(gBattleTerrainPalette_StadiumWallace, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
                 return;
             }
         }
@@ -809,47 +809,47 @@ void DrawMainBattleBackground(void)
         case MAP_BATTLE_SCENE_NORMAL:
             LZDecompressVram(sBattleTerrainTable[gBattleTerrain].tileset, (void *)(BG_CHAR_ADDR(2)));
             LZDecompressVram(sBattleTerrainTable[gBattleTerrain].tilemap, (void *)(BG_SCREEN_ADDR(26)));
-            LoadCompressedPalette(sBattleTerrainTable[gBattleTerrain].palette, 0x20, 0x60);
+            LoadCompressedPalette(sBattleTerrainTable[gBattleTerrain].palette, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
             break;
         case MAP_BATTLE_SCENE_GYM:
             LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2)));
             LZDecompressVram(gBattleTerrainTilemap_Building, (void *)(BG_SCREEN_ADDR(26)));
-            LoadCompressedPalette(gBattleTerrainPalette_BuildingGym, 0x20, 0x60);
+            LoadCompressedPalette(gBattleTerrainPalette_BuildingGym, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
             break;
         case MAP_BATTLE_SCENE_MAGMA:
             LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2)));
             LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26)));
-            LoadCompressedPalette(gBattleTerrainPalette_StadiumMagma, 0x20, 0x60);
+            LoadCompressedPalette(gBattleTerrainPalette_StadiumMagma, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
             break;
         case MAP_BATTLE_SCENE_AQUA:
             LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2)));
             LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26)));
-            LoadCompressedPalette(gBattleTerrainPalette_StadiumAqua, 0x20, 0x60);
+            LoadCompressedPalette(gBattleTerrainPalette_StadiumAqua, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
             break;
         case MAP_BATTLE_SCENE_SIDNEY:
             LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2)));
             LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26)));
-            LoadCompressedPalette(gBattleTerrainPalette_StadiumSidney, 0x20, 0x60);
+            LoadCompressedPalette(gBattleTerrainPalette_StadiumSidney, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
             break;
         case MAP_BATTLE_SCENE_PHOEBE:
             LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2)));
             LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26)));
-            LoadCompressedPalette(gBattleTerrainPalette_StadiumPhoebe, 0x20, 0x60);
+            LoadCompressedPalette(gBattleTerrainPalette_StadiumPhoebe, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
             break;
         case MAP_BATTLE_SCENE_GLACIA:
             LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2)));
             LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26)));
-            LoadCompressedPalette(gBattleTerrainPalette_StadiumGlacia, 0x20, 0x60);
+            LoadCompressedPalette(gBattleTerrainPalette_StadiumGlacia, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
             break;
         case MAP_BATTLE_SCENE_DRAKE:
             LZDecompressVram(gBattleTerrainTiles_Stadium, (void *)(BG_CHAR_ADDR(2)));
             LZDecompressVram(gBattleTerrainTilemap_Stadium, (void *)(BG_SCREEN_ADDR(26)));
-            LoadCompressedPalette(gBattleTerrainPalette_StadiumDrake, 0x20, 0x60);
+            LoadCompressedPalette(gBattleTerrainPalette_StadiumDrake, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
             break;
         case MAP_BATTLE_SCENE_FRONTIER:
             LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2)));
             LZDecompressVram(gBattleTerrainTilemap_Building, (void *)(BG_SCREEN_ADDR(26)));
-            LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60);
+            LoadCompressedPalette(gBattleTerrainPalette_Frontier, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
             break;
         }
     }
@@ -860,7 +860,7 @@ void LoadBattleTextboxAndBackground(void)
     LZDecompressVram(gBattleTextboxTiles, (void *)(BG_CHAR_ADDR(0)));
     CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0);
     CopyBgTilemapBufferToVram(0);
-    LoadCompressedPalette(gBattleTextboxPalette, 0, 0x40);
+    LoadCompressedPalette(gBattleTextboxPalette, BG_PLTT_ID(0), 2 * PLTT_SIZE_4BPP);
     LoadBattleMenuWindowGfx();
     DrawMainBattleBackground();
 }
@@ -1126,7 +1126,7 @@ void DrawBattleEntryBackground(void)
     {
         LZDecompressVram(gBattleVSFrame_Gfx, (void *)(BG_CHAR_ADDR(1)));
         LZDecompressVram(gVsLettersGfx, (void *)OBJ_VRAM0);
-        LoadCompressedPalette(gBattleVSFrame_Pal, 0x60, 0x20);
+        LoadCompressedPalette(gBattleVSFrame_Pal, BG_PLTT_ID(6), PLTT_SIZE_4BPP);
         SetBgAttribute(1, BG_ATTR_SCREENSIZE, 1);
         SetGpuReg(REG_OFFSET_BG1CNT, 0x5C04);
         CopyToBgTilemapBuffer(1, gBattleVSFrame_Tilemap, 0, 0);
@@ -1219,7 +1219,7 @@ bool8 LoadChosenBattleElement(u8 caseId)
         CopyBgTilemapBufferToVram(0);
         break;
     case 2:
-        LoadCompressedPalette(gBattleTextboxPalette, 0, 0x40);
+        LoadCompressedPalette(gBattleTextboxPalette, BG_PLTT_ID(0), 2 * PLTT_SIZE_4BPP);
         break;
     case 3:
         if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_EREADER_TRAINER))
@@ -1345,14 +1345,14 @@ bool8 LoadChosenBattleElement(u8 caseId)
     case 5:
         if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_EREADER_TRAINER))
         {
-            LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60);
+            LoadCompressedPalette(gBattleTerrainPalette_Frontier, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
         }
         else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON)
         {
             if (gGameVersion == VERSION_RUBY)
-                LoadCompressedPalette(gBattleTerrainPalette_Groudon, 0x20, 0x60);
+                LoadCompressedPalette(gBattleTerrainPalette_Groudon, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
             else
-                LoadCompressedPalette(gBattleTerrainPalette_Kyogre, 0x20, 0x60);
+                LoadCompressedPalette(gBattleTerrainPalette_Kyogre, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
         }
         else
         {
@@ -1361,12 +1361,12 @@ bool8 LoadChosenBattleElement(u8 caseId)
                 u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
                 if (trainerClass == TRAINER_CLASS_LEADER)
                 {
-                    LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, 0x20, 0x60);
+                    LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
                     break;
                 }
                 else if (trainerClass == TRAINER_CLASS_CHAMPION)
                 {
-                    LoadCompressedPalette(gBattleTerrainPalette_StadiumWallace, 0x20, 0x60);
+                    LoadCompressedPalette(gBattleTerrainPalette_StadiumWallace, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
                     break;
                 }
             }
@@ -1375,31 +1375,31 @@ bool8 LoadChosenBattleElement(u8 caseId)
             {
             default:
             case MAP_BATTLE_SCENE_NORMAL:
-                LoadCompressedPalette(sBattleTerrainTable[gBattleTerrain].palette, 0x20, 0x60);
+                LoadCompressedPalette(sBattleTerrainTable[gBattleTerrain].palette, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
                 break;
             case MAP_BATTLE_SCENE_GYM:
-                LoadCompressedPalette(gBattleTerrainPalette_BuildingGym, 0x20, 0x60);
+                LoadCompressedPalette(gBattleTerrainPalette_BuildingGym, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
                 break;
             case MAP_BATTLE_SCENE_MAGMA:
-                LoadCompressedPalette(gBattleTerrainPalette_StadiumMagma, 0x20, 0x60);
+                LoadCompressedPalette(gBattleTerrainPalette_StadiumMagma, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
                 break;
             case MAP_BATTLE_SCENE_AQUA:
-                LoadCompressedPalette(gBattleTerrainPalette_StadiumAqua, 0x20, 0x60);
+                LoadCompressedPalette(gBattleTerrainPalette_StadiumAqua, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
                 break;
             case MAP_BATTLE_SCENE_SIDNEY:
-                LoadCompressedPalette(gBattleTerrainPalette_StadiumSidney, 0x20, 0x60);
+                LoadCompressedPalette(gBattleTerrainPalette_StadiumSidney, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
                 break;
             case MAP_BATTLE_SCENE_PHOEBE:
-                LoadCompressedPalette(gBattleTerrainPalette_StadiumPhoebe, 0x20, 0x60);
+                LoadCompressedPalette(gBattleTerrainPalette_StadiumPhoebe, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
                 break;
             case MAP_BATTLE_SCENE_GLACIA:
-                LoadCompressedPalette(gBattleTerrainPalette_StadiumGlacia, 0x20, 0x60);
+                LoadCompressedPalette(gBattleTerrainPalette_StadiumGlacia, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
                 break;
             case MAP_BATTLE_SCENE_DRAKE:
-                LoadCompressedPalette(gBattleTerrainPalette_StadiumDrake, 0x20, 0x60);
+                LoadCompressedPalette(gBattleTerrainPalette_StadiumDrake, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
                 break;
             case MAP_BATTLE_SCENE_FRONTIER:
-                LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60);
+                LoadCompressedPalette(gBattleTerrainPalette_Frontier, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
                 break;
             }
         }

src/battle_controller_link_partner.c

@@ -1558,7 +1558,7 @@ static void LinkPartnerHandleIntroTrainerBallThrow(void)
         trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender;
     }
 
-    LoadCompressedPalette(gTrainerBackPicPaletteTable[trainerPicId].data, 0x100 + paletteNum * 16, 32);
+    LoadCompressedPalette(gTrainerBackPicPaletteTable[trainerPicId].data, OBJ_PLTT_ID(paletteNum), PLTT_SIZE_4BPP);
 
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum;
 

src/battle_controller_opponent.c

@@ -1151,7 +1151,7 @@ static void OpponentHandleLoadMonSprite(void)
 
 static void OpponentHandleSwitchInAnim(void)
 {
-    *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = 6;
+    *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = PARTY_SIZE;
     gBattlerPartyIndexes[gActiveBattler] = gBattleBufferA[gActiveBattler][1];
     StartSendOutAnim(gActiveBattler, gBattleBufferA[gActiveBattler][2]);
     gBattlerControllerFuncs[gActiveBattler] = SwitchIn_TryShinyAnim;
@@ -1635,13 +1635,13 @@ static void OpponentHandleChoosePokemon(void)
             if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_TOWER_LINK_MULTI))
             {
                 if (gActiveBattler == 1)
-                    firstId = 0, lastId = 3;
+                    firstId = 0, lastId = PARTY_SIZE / 2;
                 else
-                    firstId = 3, lastId = 6;
+                    firstId = PARTY_SIZE / 2, lastId = PARTY_SIZE;
             }
             else
             {
-                firstId = 0, lastId = 6;
+                firstId = 0, lastId = PARTY_SIZE;
             }
 
             for (chosenMonId = firstId; chosenMonId < lastId; chosenMonId++)

src/battle_controller_player.c

@@ -2960,7 +2960,7 @@ static void PlayerHandleIntroTrainerBallThrow(void)
     StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], 1);
 
     paletteNum = AllocSpritePalette(0xD6F8);
-    LoadCompressedPalette(gTrainerBackPicPaletteTable[gSaveBlock2Ptr->playerGender].data, 0x100 + paletteNum * 16, 32);
+    LoadCompressedPalette(gTrainerBackPicPaletteTable[gSaveBlock2Ptr->playerGender].data, OBJ_PLTT_ID(paletteNum), PLTT_SIZE_4BPP);
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum;
 
     taskId = CreateTask(Task_StartSendOutAnim, 5);

src/battle_controller_player_partner.c

@@ -1540,12 +1540,12 @@ static void PlayerPartnerHandleChoosePokemon(void)
 {
     s32 chosenMonId = GetMostSuitableMonToSwitchInto();
 
-    if (chosenMonId == 6) // just switch to the next mon
+    if (chosenMonId == PARTY_SIZE) // just switch to the next mon
     {
         u8 playerMonIdentity = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
         u8 selfIdentity = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
 
-        for (chosenMonId = 3; chosenMonId < 6; chosenMonId++)
+        for (chosenMonId = PARTY_SIZE / 2; chosenMonId < PARTY_SIZE; chosenMonId++)
         {
             if (GetMonData(&gPlayerParty[chosenMonId], MON_DATA_HP) != 0
                 && chosenMonId != gBattlerPartyIndexes[playerMonIdentity]
@@ -1794,12 +1794,12 @@ static void PlayerPartnerHandleIntroTrainerBallThrow(void)
     if (gPartnerTrainerId == TRAINER_STEVEN_PARTNER)
     {
         u8 spriteId = TRAINER_BACK_PIC_STEVEN;
-        LoadCompressedPalette(gTrainerBackPicPaletteTable[spriteId].data, 0x100 + paletteNum * 16, 32);
+        LoadCompressedPalette(gTrainerBackPicPaletteTable[spriteId].data, OBJ_PLTT_ID(paletteNum), PLTT_SIZE_4BPP);
     }
     else
     {
         u8 spriteId = GetFrontierTrainerFrontSpriteId(gPartnerTrainerId);
-        LoadCompressedPalette(gTrainerFrontPicPaletteTable[spriteId].data, 0x100 + paletteNum * 16, 32);
+        LoadCompressedPalette(gTrainerFrontPicPaletteTable[spriteId].data, OBJ_PLTT_ID(paletteNum), PLTT_SIZE_4BPP);
     }
 
 

src/battle_controller_recorded_player.c

@@ -1678,7 +1678,7 @@ static void RecordedPlayerHandleIntroTrainerBallThrow(void)
     else
         trainerPicId = gSaveBlock2Ptr->playerGender;
 
-    LoadCompressedPalette(gTrainerBackPicPaletteTable[trainerPicId].data, 0x100 + paletteNum * 16, 32);
+    LoadCompressedPalette(gTrainerBackPicPaletteTable[trainerPicId].data, OBJ_PLTT_ID(paletteNum), PLTT_SIZE_4BPP);
 
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum;
 

src/battle_controller_wally.c

@@ -1445,7 +1445,7 @@ static void WallyHandleIntroTrainerBallThrow(void)
     StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], 1);
 
     paletteNum = AllocSpritePalette(0xD6F8);
-    LoadCompressedPalette(gTrainerBackPicPaletteTable[TRAINER_BACK_PIC_WALLY].data, 0x100 + paletteNum * 16, 32);
+    LoadCompressedPalette(gTrainerBackPicPaletteTable[TRAINER_BACK_PIC_WALLY].data, OBJ_PLTT_ID(paletteNum), PLTT_SIZE_4BPP);
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = paletteNum;
 
     taskId = CreateTask(Task_StartSendOutAnim, 5);

src/battle_dome.c

@@ -2375,8 +2375,8 @@ static void InitDomeTrainers(void)
         rankingScores[0] += GetMonData(&gPlayerParty[trainerId], MON_DATA_SPDEF, NULL);
         rankingScores[0] += GetMonData(&gPlayerParty[trainerId], MON_DATA_SPEED, NULL);
         rankingScores[0] += GetMonData(&gPlayerParty[trainerId], MON_DATA_MAX_HP, NULL);
-        monTypesBits |= gBitTable[gSpeciesInfo[GetMonData(&gPlayerParty[trainerId], MON_DATA_SPECIES, NULL)].type1];
-        monTypesBits |= gBitTable[gSpeciesInfo[GetMonData(&gPlayerParty[trainerId], MON_DATA_SPECIES, NULL)].type2];
+        monTypesBits |= gBitTable[gSpeciesInfo[GetMonData(&gPlayerParty[trainerId], MON_DATA_SPECIES, NULL)].types[0]];
+        monTypesBits |= gBitTable[gSpeciesInfo[GetMonData(&gPlayerParty[trainerId], MON_DATA_SPECIES, NULL)].types[1]];
     }
 
     // Count the number of types in the players party, to factor into the ranking
@@ -2410,8 +2410,8 @@ static void InitDomeTrainers(void)
             rankingScores[i] += statValues[STAT_SPDEF];
             rankingScores[i] += statValues[STAT_SPEED];
             rankingScores[i] += statValues[STAT_HP];
-            monTypesBits |= gBitTable[gSpeciesInfo[gFacilityTrainerMons[DOME_MONS[i][j]].species].type1];
-            monTypesBits |= gBitTable[gSpeciesInfo[gFacilityTrainerMons[DOME_MONS[i][j]].species].type2];
+            monTypesBits |= gBitTable[gSpeciesInfo[gFacilityTrainerMons[DOME_MONS[i][j]].species].types[0]];
+            monTypesBits |= gBitTable[gSpeciesInfo[gFacilityTrainerMons[DOME_MONS[i][j]].species].types[1]];
         }
 
         for (monTypesCount = 0, j = 0; j < 32; j++)
@@ -2777,8 +2777,8 @@ static int GetTypeEffectivenessPoints(int move, int targetSpecies, int mode)
     if (move == MOVE_NONE || move == MOVE_UNAVAILABLE || gBattleMoves[move].power == 0)
         return 0;
 
-    defType1 = gSpeciesInfo[targetSpecies].type1;
-    defType2 = gSpeciesInfo[targetSpecies].type2;
+    defType1 = gSpeciesInfo[targetSpecies].types[0];
+    defType2 = gSpeciesInfo[targetSpecies].types[1];
     defAbility = gSpeciesInfo[targetSpecies].abilities[0];
     moveType = gBattleMoves[move].type;
 
@@ -3075,12 +3075,12 @@ static void Task_ShowTourneyInfoCard(u8 taskId)
         DecompressAndLoadBgGfxUsingHeap(2, gDomeTourneyInfoCard_Tilemap, 0x2000, 0, 1);
         DecompressAndLoadBgGfxUsingHeap(3, gDomeTourneyInfoCardBg_Tilemap, 0x800, 0, 1);
         LoadCompressedSpriteSheet(sTourneyTreeButtonsSpriteSheet);
-        LoadCompressedPalette(gDomeTourneyTree_Pal, 0, 0x200);
-        LoadCompressedPalette(gDomeTourneyTreeButtons_Pal, 0x100, 0x200);
-        LoadCompressedPalette(gBattleWindowTextPalette, 0xF0, 0x20);
+        LoadCompressedPalette(gDomeTourneyTree_Pal, BG_PLTT_OFFSET, BG_PLTT_SIZE);
+        LoadCompressedPalette(gDomeTourneyTreeButtons_Pal, OBJ_PLTT_OFFSET, OBJ_PLTT_SIZE);
+        LoadCompressedPalette(gBattleWindowTextPalette, BG_PLTT_ID(15), PLTT_SIZE_4BPP);
         if (mode == INFOCARD_MATCH)
-            LoadCompressedPalette(gDomeTourneyMatchCardBg_Pal, 0x50, 0x20); // Changes the moving info card bg to orange when in match card mode
-        CpuFill32(0, gPlttBufferFaded, 0x400);
+            LoadCompressedPalette(gDomeTourneyMatchCardBg_Pal, BG_PLTT_ID(5), PLTT_SIZE_4BPP); // Changes the moving info card bg to orange when in match card mode
+        CpuFill32(0, gPlttBufferFaded, PLTT_SIZE);
         ShowBg(0);
         ShowBg(1);
         ShowBg(2);
@@ -4281,7 +4281,7 @@ static u8 Task_GetInfoCardInput(u8 taskId)
 #undef tUsingAlternateSlot
 
 // allocatedArray below needs to be large enough to hold stat totals for each mon, or totals of each type of move points
-#define ALLOC_ARRAY_SIZE (NUM_STATS * FRONTIER_PARTY_SIZE >= NUM_MOVE_POINT_TYPES ? (NUM_STATS * FRONTIER_PARTY_SIZE) :  NUM_MOVE_POINT_TYPES)
+#define ALLOC_ARRAY_SIZE max(NUM_STATS * FRONTIER_PARTY_SIZE, NUM_MOVE_POINT_TYPES)
 
 static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId)
 {
@@ -5354,10 +5354,10 @@ static void Task_ShowTourneyTree(u8 taskId)
         DecompressAndLoadBgGfxUsingHeap(2, gDomeTourneyLine_Gfx, 0x2000, 0, 0);
         DecompressAndLoadBgGfxUsingHeap(2, gDomeTourneyLineDown_Tilemap, 0x2000, 0, 1);
         DecompressAndLoadBgGfxUsingHeap(3, gDomeTourneyLineUp_Tilemap, 0x2000, 0, 1);
-        LoadCompressedPalette(gDomeTourneyTree_Pal, 0, 0x200);
-        LoadCompressedPalette(gDomeTourneyTreeButtons_Pal, 0x100, 0x200);
-        LoadCompressedPalette(gBattleWindowTextPalette, 0xF0, 0x20);
-        CpuFill32(0, gPlttBufferFaded, 0x400);
+        LoadCompressedPalette(gDomeTourneyTree_Pal, BG_PLTT_OFFSET, BG_PLTT_SIZE);
+        LoadCompressedPalette(gDomeTourneyTreeButtons_Pal, OBJ_PLTT_OFFSET, OBJ_PLTT_SIZE);
+        LoadCompressedPalette(gBattleWindowTextPalette, BG_PLTT_ID(15), PLTT_SIZE_4BPP);
+        CpuFill32(0, gPlttBufferFaded, PLTT_SIZE);
         ShowBg(0);
         ShowBg(1);
         ShowBg(2);
@@ -5910,8 +5910,8 @@ static void InitRandomTourneyTreeResults(void)
             statSums[i] += statValues[STAT_SPDEF];
             statSums[i] += statValues[STAT_SPEED];
             statSums[i] += statValues[STAT_HP];
-            monTypesBits |= gBitTable[gSpeciesInfo[gFacilityTrainerMons[DOME_MONS[i][j]].species].type1];
-            monTypesBits |= gBitTable[gSpeciesInfo[gFacilityTrainerMons[DOME_MONS[i][j]].species].type2];
+            monTypesBits |= gBitTable[gSpeciesInfo[gFacilityTrainerMons[DOME_MONS[i][j]].species].types[0]];
+            monTypesBits |= gBitTable[gSpeciesInfo[gFacilityTrainerMons[DOME_MONS[i][j]].species].types[1]];
         }
 
         // Because GF hates temporary vars, trainerId acts like monTypesCount here.

src/battle_factory.c

@@ -618,9 +618,9 @@ static void GetOpponentMostCommonMonType(void)
     for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
     {
         u32 species = gFacilityTrainerMons[gFrontierTempParty[i]].species;
-        typeCounts[gSpeciesInfo[species].type1]++;
-        if (gSpeciesInfo[species].type1 != gSpeciesInfo[species].type2)
-            typeCounts[gSpeciesInfo[species].type2]++;
+        typeCounts[gSpeciesInfo[species].types[0]]++;
+        if (gSpeciesInfo[species].types[0] != gSpeciesInfo[species].types[1])
+            typeCounts[gSpeciesInfo[species].types[1]]++;
     }
 
     // Determine which are the two most-common types.

src/battle_factory_screen.c

@@ -1175,16 +1175,16 @@ static void CB2_InitSelectScreen(void)
         LoadBgTiles(3, sSelectMonPicBgTilesetBuffer, 0x60, 0);
         CpuCopy16(gFrontierFactorySelectMenu_Tilemap, sSelectMenuTilemapBuffer, BG_SCREEN_SIZE);
         LoadBgTilemap(1, sSelectMenuTilemapBuffer, BG_SCREEN_SIZE, 0);
-        LoadPalette(gFrontierFactorySelectMenu_Pal, 0, 0x40);
-        LoadPalette(sSelectText_Pal, 0xF0, 8);
-        LoadPalette(sSelectText_Pal, 0xE0, 10);
+        LoadPalette(gFrontierFactorySelectMenu_Pal, 0, 2 * PLTT_SIZE_4BPP);
+        LoadPalette(sSelectText_Pal, BG_PLTT_ID(15), PLTT_SIZEOF(4));
+        LoadPalette(sSelectText_Pal, BG_PLTT_ID(14), PLTT_SIZEOF(5));
 #ifdef UBFIX
         if (sFactorySelectScreen && sFactorySelectScreen->fromSummaryScreen)
 #else
         if (sFactorySelectScreen->fromSummaryScreen == TRUE)
 #endif
             gPlttBufferUnfaded[228] = sFactorySelectScreen->speciesNameColorBackup;
-        LoadPalette(sMonPicBg_Pal, 0x20, 4);
+        LoadPalette(sMonPicBg_Pal, BG_PLTT_ID(2), PLTT_SIZEOF(2));
         gMain.state++;
         break;
     case 3:
@@ -2748,7 +2748,7 @@ static void Swap_Task_FadeOutSpeciesName(u8 taskId)
         gTasks[taskId].tState++;
         break;
     case 1:
-        LoadPalette(&gPlttBufferUnfaded[0xF0], 0xE0, 0xA);
+        LoadPalette(&gPlttBufferUnfaded[BG_PLTT_ID(15)], BG_PLTT_ID(14), PLTT_SIZEOF(5));
         gTasks[taskId].tState++;
         break;
     case 2:
@@ -2994,7 +2994,7 @@ static void Swap_Task_ScreenInfoTransitionOut(u8 taskId)
     switch (gTasks[taskId].tState)
     {
     case 0:
-        LoadPalette(sSwapText_Pal, 0xE0, sizeof(sSwapText_Pal));
+        LoadPalette(sSwapText_Pal, BG_PLTT_ID(14), sizeof(sSwapText_Pal));
         Swap_PrintActionStrings();
         PutWindowTilemap(SWAP_WIN_ACTION_FADE);
         gTasks[taskId].tState++;
@@ -3309,10 +3309,10 @@ static void CB2_InitSwapScreen(void)
         LoadBgTiles(3, sSwapMonPicBgTilesetBuffer, 0x60, 0);
         CpuCopy16(gFrontierFactorySelectMenu_Tilemap, sSwapMenuTilemapBuffer, BG_SCREEN_SIZE);
         LoadBgTilemap(1, sSwapMenuTilemapBuffer, BG_SCREEN_SIZE, 0);
-        LoadPalette(gFrontierFactorySelectMenu_Pal, 0, 0x40);
-        LoadPalette(sSwapText_Pal, 0xF0, sizeof(sSwapText_Pal));
-        LoadPalette(sSwapText_Pal, 0xE0, sizeof(sSwapText_Pal));
-        LoadPalette(sMonPicBg_Pal, 0x20, 4);
+        LoadPalette(gFrontierFactorySelectMenu_Pal, 0, 2 * PLTT_SIZE_4BPP);
+        LoadPalette(sSwapText_Pal, BG_PLTT_ID(15), sizeof(sSwapText_Pal));
+        LoadPalette(sSwapText_Pal, BG_PLTT_ID(14), sizeof(sSwapText_Pal));
+        LoadPalette(sMonPicBg_Pal, BG_PLTT_ID(2), PLTT_SIZEOF(2));
         gMain.state++;
         break;
     case 3:
@@ -3867,7 +3867,7 @@ static void Swap_PrintMonSpeciesAtFade(void)
         pal[4] = gPlttBufferFaded[228];
     else
         pal[4] = sFactorySwapScreen->speciesNameColorBackup;
-    LoadPalette(pal, 0xF0, sizeof(sSwapText_Pal));
+    LoadPalette(pal, BG_PLTT_ID(15), sizeof(sSwapText_Pal));
 
     PutWindowTilemap(SWAP_WIN_SPECIES_AT_FADE);
     FillWindowPixelBuffer(SWAP_WIN_SPECIES_AT_FADE, PIXEL_FILL(0));
@@ -3895,8 +3895,8 @@ static void Swap_PrintMonSpeciesForTransition(void)
     u16 species;
     u8 x;
 
-    LoadPalette(sSwapText_Pal, 0xE0, sizeof(sSwapText_Pal));
-    CpuCopy16(&gPlttBufferUnfaded[240], &gPlttBufferFaded[224], 10);
+    LoadPalette(sSwapText_Pal, BG_PLTT_ID(14), sizeof(sSwapText_Pal));
+    CpuCopy16(&gPlttBufferUnfaded[BG_PLTT_ID(15)], &gPlttBufferFaded[BG_PLTT_ID(14)], PLTT_SIZEOF(5));
 
     if (sFactorySwapScreen->cursorPos >= FRONTIER_PARTY_SIZE)
     {

src/battle_gfx_sfx_util.c

@@ -576,7 +576,7 @@ void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 battlerId)
                                               gMonSpritesGfxPtr->sprites.ptr[position],
                                               species, currentPersonality);
 
-    paletteOffset = 0x100 + battlerId * 16;
+    paletteOffset = OBJ_PLTT_ID(battlerId);
 
     if (gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies == SPECIES_NONE)
         lzPaletteData = GetMonFrontSpritePal(mon);
@@ -584,21 +584,21 @@ void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 battlerId)
         lzPaletteData = GetMonSpritePalFromSpeciesAndPersonality(species, otId, monsPersonality);
 
     LZDecompressWram(lzPaletteData, gDecompressionBuffer);
-    LoadPalette(gDecompressionBuffer, paletteOffset, 0x20);
-    LoadPalette(gDecompressionBuffer, 0x80 + battlerId * 16, 0x20);
+    LoadPalette(gDecompressionBuffer, paletteOffset, PLTT_SIZE_4BPP);
+    LoadPalette(gDecompressionBuffer, BG_PLTT_ID(8) + BG_PLTT_ID(battlerId), PLTT_SIZE_4BPP);
 
     if (species == SPECIES_CASTFORM)
     {
-        paletteOffset = 0x100 + battlerId * 16;
+        paletteOffset = OBJ_PLTT_ID(battlerId);
         LZDecompressWram(lzPaletteData, gBattleStruct->castformPalette);
-        LoadPalette(gBattleStruct->castformPalette[gBattleMonForms[battlerId]], paletteOffset, 0x20);
+        LoadPalette(gBattleStruct->castformPalette[gBattleMonForms[battlerId]], paletteOffset, PLTT_SIZE_4BPP);
     }
 
     // transform's pink color
     if (gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != SPECIES_NONE)
     {
         BlendPalette(paletteOffset, 16, 6, RGB_WHITE);
-        CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
+        CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, PLTT_SIZEOF(16));
     }
 }
 
@@ -639,7 +639,7 @@ void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 battlerId)
                                 species, currentPersonality);
     }
 
-    paletteOffset = 0x100 + battlerId * 16;
+    paletteOffset = OBJ_PLTT_ID(battlerId);
 
     if (gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies == SPECIES_NONE)
         lzPaletteData = GetMonFrontSpritePal(mon);
@@ -647,21 +647,21 @@ void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 battlerId)
         lzPaletteData = GetMonSpritePalFromSpeciesAndPersonality(species, otId, monsPersonality);
 
     LZDecompressWram(lzPaletteData, gDecompressionBuffer);
-    LoadPalette(gDecompressionBuffer, paletteOffset, 0x20);
-    LoadPalette(gDecompressionBuffer, 0x80 + battlerId * 16, 0x20);
+    LoadPalette(gDecompressionBuffer, paletteOffset, PLTT_SIZE_4BPP);
+    LoadPalette(gDecompressionBuffer, BG_PLTT_ID(8) + BG_PLTT_ID(battlerId), PLTT_SIZE_4BPP);
 
     if (species == SPECIES_CASTFORM)
     {
-        paletteOffset = 0x100 + battlerId * 16;
+        paletteOffset = OBJ_PLTT_ID(battlerId);
         LZDecompressWram(lzPaletteData, gBattleStruct->castformPalette);
-        LoadPalette(gBattleStruct->castformPalette[gBattleMonForms[battlerId]], paletteOffset, 0x20);
+        LoadPalette(gBattleStruct->castformPalette[gBattleMonForms[battlerId]], paletteOffset, PLTT_SIZE_4BPP);
     }
 
     // transform's pink color
     if (gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != SPECIES_NONE)
     {
         BlendPalette(paletteOffset, 16, 6, RGB_WHITE);
-        CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
+        CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, PLTT_SIZEOF(16));
     }
 }
 
@@ -690,7 +690,7 @@ void DecompressTrainerBackPic(u16 backPicId, u8 battlerId)
                              gMonSpritesGfxPtr->sprites.ptr[position],
                              SPECIES_NONE);
     LoadCompressedPalette(gTrainerBackPicPaletteTable[backPicId].data,
-                          0x100 + 16 * battlerId, 0x20);
+                          OBJ_PLTT_ID(battlerId), PLTT_SIZE_4BPP);
 }
 
 void BattleGfxSfxDummy3(u8 gender)
@@ -903,13 +903,13 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool8 castform)
     if (castform)
     {
         StartSpriteAnim(&gSprites[gBattlerSpriteIds[battlerAtk]], gBattleSpritesDataPtr->animationData->animArg);
-        paletteOffset = 0x100 + battlerAtk * 16;
-        LoadPalette(gBattleStruct->castformPalette[gBattleSpritesDataPtr->animationData->animArg], paletteOffset, 32);
+        paletteOffset = OBJ_PLTT_ID(battlerAtk);
+        LoadPalette(gBattleStruct->castformPalette[gBattleSpritesDataPtr->animationData->animArg], paletteOffset, PLTT_SIZE_4BPP);
         gBattleMonForms[battlerAtk] = gBattleSpritesDataPtr->animationData->animArg;
         if (gBattleSpritesDataPtr->battlerData[battlerAtk].transformSpecies != SPECIES_NONE)
         {
             BlendPalette(paletteOffset, 16, 6, RGB_WHITE);
-            CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
+            CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, PLTT_SIZEOF(16));
         }
         gSprites[gBattlerSpriteIds[battlerAtk]].y = GetBattlerSpriteDefault_Y(battlerAtk);
     }
@@ -965,20 +965,20 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool8 castform)
         src = gMonSpritesGfxPtr->sprites.ptr[position];
         dst = (void *)(OBJ_VRAM0 + gSprites[gBattlerSpriteIds[battlerAtk]].oam.tileNum * 32);
         DmaCopy32(3, src, dst, MON_PIC_SIZE);
-        paletteOffset = 0x100 + battlerAtk * 16;
+        paletteOffset = OBJ_PLTT_ID(battlerAtk);
         lzPaletteData = GetMonSpritePalFromSpeciesAndPersonality(targetSpecies, otId, personalityValue);
         LZDecompressWram(lzPaletteData, gDecompressionBuffer);
-        LoadPalette(gDecompressionBuffer, paletteOffset, 32);
+        LoadPalette(gDecompressionBuffer, paletteOffset, PLTT_SIZE_4BPP);
 
         if (targetSpecies == SPECIES_CASTFORM)
         {
             gSprites[gBattlerSpriteIds[battlerAtk]].anims = gMonFrontAnimsPtrTable[targetSpecies];
             LZDecompressWram(lzPaletteData, gBattleStruct->castformPalette);
-            LoadPalette(gBattleStruct->castformPalette[gBattleMonForms[battlerDef]], paletteOffset, 32);
+            LoadPalette(gBattleStruct->castformPalette[gBattleMonForms[battlerDef]], paletteOffset, PLTT_SIZE_4BPP);
         }
 
         BlendPalette(paletteOffset, 16, 6, RGB_WHITE);
-        CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
+        CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, PLTT_SIZEOF(16));
 
         if (!IsContest())
         {
@@ -1014,8 +1014,8 @@ void BattleLoadSubstituteOrMonSpriteGfx(u8 battlerId, bool8 loadMonSprite)
             Dma3CopyLarge32_(gMonSpritesGfxPtr->sprites.ptr[position], &gMonSpritesGfxPtr->sprites.byte[position][MON_PIC_SIZE * i], MON_PIC_SIZE);
         }
 
-        palOffset = (battlerId * 16) + 0x100;
-        LoadCompressedPalette(gSubstituteDollPal, palOffset, 32);
+        palOffset = OBJ_PLTT_ID(battlerId);
+        LoadCompressedPalette(gSubstituteDollPal, palOffset, PLTT_SIZE_4BPP);
     }
     else
     {

src/battle_interface.c

@@ -2055,11 +2055,11 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId)
         return;
     }
 
-    pltAdder = gSprites[healthboxSpriteId].oam.paletteNum * 16;
+    pltAdder = PLTT_ID(gSprites[healthboxSpriteId].oam.paletteNum);
     pltAdder += battlerId + 12;
 
-    FillPalette(sStatusIconColors[statusPalId], pltAdder + 0x100, 2);
-    CpuCopy16(gPlttBufferUnfaded + 0x100 + pltAdder, (void *)(OBJ_PLTT + pltAdder * 2), 2);
+    FillPalette(sStatusIconColors[statusPalId], OBJ_PLTT_OFFSET + pltAdder, PLTT_SIZEOF(1));
+    CpuCopy16(gPlttBufferUnfaded + OBJ_PLTT_OFFSET + pltAdder, (u16 *)OBJ_PLTT + pltAdder, PLTT_SIZEOF(1));
     CpuCopy32(statusGfxPtr, (void *)(OBJ_VRAM0 + (gSprites[healthboxSpriteId].oam.tileNum + tileNumAdder) * TILE_SIZE_4BPP), 96);
     if (IsDoubleBattle() == TRUE || GetBattlerSide(battlerId) == B_SIDE_OPPONENT)
     {

src/battle_main.c

@@ -2214,7 +2214,7 @@ void CB2_InitEndLinkBattle(void)
         gBattle_BG3_Y = 0;
 
         InitBattleBgsVideo();
-        LoadCompressedPalette(gBattleTextboxPalette, 0, 64);
+        LoadCompressedPalette(gBattleTextboxPalette, BG_PLTT_ID(0), 2 * PLTT_SIZE_4BPP);
         LoadBattleMenuWindowGfx();
         ResetSpriteData();
         ResetTasks();
@@ -3332,8 +3332,8 @@ void FaintClearSetData(void)
 
     gBattleResources->flags->flags[gActiveBattler] = 0;
 
-    gBattleMons[gActiveBattler].type1 = gSpeciesInfo[gBattleMons[gActiveBattler].species].type1;
-    gBattleMons[gActiveBattler].type2 = gSpeciesInfo[gBattleMons[gActiveBattler].species].type2;
+    gBattleMons[gActiveBattler].type1 = gSpeciesInfo[gBattleMons[gActiveBattler].species].types[0];
+    gBattleMons[gActiveBattler].type2 = gSpeciesInfo[gBattleMons[gActiveBattler].species].types[1];
 
     ClearBattlerMoveHistory(gActiveBattler);
     ClearBattlerAbilityHistory(gActiveBattler);
@@ -3400,8 +3400,8 @@ static void BattleIntroDrawTrainersOrMonsSprites(void)
             for (i = 0; i < sizeof(struct BattlePokemon); i++)
                 ptr[i] = gBattleBufferB[gActiveBattler][4 + i];
 
-            gBattleMons[gActiveBattler].type1 = gSpeciesInfo[gBattleMons[gActiveBattler].species].type1;
-            gBattleMons[gActiveBattler].type2 = gSpeciesInfo[gBattleMons[gActiveBattler].species].type2;
+            gBattleMons[gActiveBattler].type1 = gSpeciesInfo[gBattleMons[gActiveBattler].species].types[0];
+            gBattleMons[gActiveBattler].type2 = gSpeciesInfo[gBattleMons[gActiveBattler].species].types[1];
             gBattleMons[gActiveBattler].ability = GetAbilityBySpecies(gBattleMons[gActiveBattler].species, gBattleMons[gActiveBattler].abilityNum);
             hpOnSwitchout = &gBattleStruct->hpOnSwitchout[GetBattlerSide(gActiveBattler)];
             *hpOnSwitchout = gBattleMons[gActiveBattler].hp;

src/battle_message.c

@@ -1481,288 +1481,236 @@ static const struct BattleWindowText sTextOnWindowsInfo_Normal[] =
         .fontId = FONT_NORMAL,
         .x = 0,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 1,
-        .fgColor = TEXT_COLOR_WHITE,
-        .bgColor = TEXT_DYNAMIC_COLOR_6,
-        .shadowColor = TEXT_COLOR_GREEN,
+        .fgColor = 1,
+        .bgColor = 15,
+        .shadowColor = 6,
     },
     [B_WIN_ACTION_PROMPT] = {
         .fillValue = PIXEL_FILL(0xF),
         .fontId = FONT_NORMAL,
         .x = 1,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_COLOR_WHITE,
-        .bgColor = TEXT_DYNAMIC_COLOR_6,
-        .shadowColor = TEXT_COLOR_GREEN,
+        .fgColor = 1,
+        .bgColor = 15,
+        .shadowColor = 6,
     },
     [B_WIN_ACTION_MENU] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NORMAL,
         .x = 0,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_MOVE_NAME_1] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NARROW,
         .x = 0,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_MOVE_NAME_2] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NARROW,
         .x = 0,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_MOVE_NAME_3] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NARROW,
         .x = 0,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_MOVE_NAME_4] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NARROW,
         .x = 0,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_PP] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NARROW,
         .x = 0,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_3,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_2,
+        .fgColor = 12,
+        .bgColor = 14,
+        .shadowColor = 11,
     },
     [B_WIN_DUMMY] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NORMAL,
         .x = 0,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_PP_REMAINING] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NORMAL,
         .x = 2,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_3,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_2,
+        .fgColor = 12,
+        .bgColor = 14,
+        .shadowColor = 11,
     },
     [B_WIN_MOVE_TYPE] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NARROW,
         .x = 0,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_SWITCH_PROMPT] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NARROW,
         .x = 0,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_YESNO] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NORMAL,
         .x = 0,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_LEVEL_UP_BOX] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NORMAL,
         .x = 0,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_LEVEL_UP_BANNER] = {
         .fillValue = PIXEL_FILL(0),
         .fontId = FONT_NORMAL,
         .x = 32,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_COLOR_WHITE,
-        .bgColor = TEXT_COLOR_TRANSPARENT,
-        .shadowColor = TEXT_COLOR_DARK_GRAY,
+        .fgColor = 1,
+        .shadowColor = 2,
     },
     [B_WIN_VS_PLAYER] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NORMAL,
         .x = -1,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_VS_OPPONENT] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NORMAL,
         .x = -1,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_VS_MULTI_PLAYER_1] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NORMAL,
         .x = -1,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_VS_MULTI_PLAYER_2] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NORMAL,
         .x = -1,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_VS_MULTI_PLAYER_3] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NORMAL,
         .x = -1,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_VS_MULTI_PLAYER_4] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NORMAL,
         .x = -1,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_VS_OUTCOME_DRAW] = {
         .fillValue = PIXEL_FILL(0),
         .fontId = FONT_NORMAL,
         .x = -1,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_COLOR_WHITE,
-        .bgColor = TEXT_COLOR_TRANSPARENT,
-        .shadowColor = TEXT_COLOR_GREEN,
+        .fgColor = 1,
+        .shadowColor = 6,
     },
     [B_WIN_VS_OUTCOME_LEFT] = {
         .fillValue = PIXEL_FILL(0),
         .fontId = FONT_NORMAL,
         .x = -1,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_COLOR_WHITE,
-        .bgColor = TEXT_COLOR_TRANSPARENT,
-        .shadowColor = TEXT_COLOR_GREEN,
+        .fgColor = 1,
+        .shadowColor = 6,
     },
     [B_WIN_VS_OUTCOME_RIGHT] = {
         .fillValue = PIXEL_FILL(0x0),
         .fontId = FONT_NORMAL,
         .x = -1,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_COLOR_WHITE,
-        .bgColor = TEXT_COLOR_TRANSPARENT,
-        .shadowColor = TEXT_COLOR_GREEN,
+        .fgColor = 1,
+        .shadowColor = 6,
     },
 };
 
@@ -1773,276 +1721,229 @@ static const struct BattleWindowText sTextOnWindowsInfo_Arena[] =
         .fontId = FONT_NORMAL,
         .x = 0,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 1,
-        .fgColor = TEXT_COLOR_WHITE,
-        .bgColor = TEXT_DYNAMIC_COLOR_6,
-        .shadowColor = TEXT_COLOR_GREEN,
+        .fgColor = 1,
+        .bgColor = 15,
+        .shadowColor = 6,
     },
     [B_WIN_ACTION_PROMPT] = {
         .fillValue = PIXEL_FILL(0xF),
         .fontId = FONT_NORMAL,
         .x = 1,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_COLOR_WHITE,
-        .bgColor = TEXT_DYNAMIC_COLOR_6,
-        .shadowColor = TEXT_COLOR_GREEN,
+        .fgColor = 1,
+        .bgColor = 15,
+        .shadowColor = 6,
     },
     [B_WIN_ACTION_MENU] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NORMAL,
         .x = 0,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_MOVE_NAME_1] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NARROW,
         .x = 0,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_MOVE_NAME_2] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NARROW,
         .x = 0,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_MOVE_NAME_3] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NARROW,
         .x = 0,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_MOVE_NAME_4] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NARROW,
         .x = 0,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_PP] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NARROW,
         .x = 0,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_3,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_2,
+        .fgColor = 12,
+        .bgColor = 14,
+        .shadowColor = 11,
     },
     [B_WIN_DUMMY] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NORMAL,
         .x = 0,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_PP_REMAINING] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NORMAL,
         .x = 2,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_3,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_2,
+        .fgColor = 12,
+        .bgColor = 14,
+        .shadowColor = 11,
     },
     [B_WIN_MOVE_TYPE] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NARROW,
         .x = 0,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_SWITCH_PROMPT] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NARROW,
         .x = 0,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_YESNO] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NORMAL,
         .x = 0,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_LEVEL_UP_BOX] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NORMAL,
         .x = 0,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [B_WIN_LEVEL_UP_BANNER] = {
         .fillValue = PIXEL_FILL(0),
         .fontId = FONT_NORMAL,
         .x = 32,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_COLOR_WHITE,
-        .bgColor = TEXT_COLOR_TRANSPARENT,
-        .shadowColor = TEXT_COLOR_DARK_GRAY,
+        .fgColor = 1,
+        .shadowColor = 2,
     },
     [ARENA_WIN_PLAYER_NAME] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NORMAL,
         .x = -1,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_COLOR_WHITE,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 1,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [ARENA_WIN_VS] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NORMAL,
         .x = -1,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [ARENA_WIN_OPPONENT_NAME] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NORMAL,
         .x = -1,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [ARENA_WIN_MIND] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NORMAL,
         .x = -1,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [ARENA_WIN_SKILL] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NORMAL,
         .x = -1,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [ARENA_WIN_BODY] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NORMAL,
         .x = -1,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [ARENA_WIN_JUDGMENT_TITLE] = {
         .fillValue = PIXEL_FILL(0xE),
         .fontId = FONT_NORMAL,
         .x = -1,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 0,
-        .fgColor = TEXT_DYNAMIC_COLOR_4,
-        .bgColor = TEXT_DYNAMIC_COLOR_5,
-        .shadowColor = TEXT_DYNAMIC_COLOR_6,
+        .fgColor = 13,
+        .bgColor = 14,
+        .shadowColor = 15,
     },
     [ARENA_WIN_JUDGMENT_TEXT] = {
         .fillValue = PIXEL_FILL(0x1),
         .fontId = FONT_NORMAL,
         .x = 0,
         .y = 1,
-        .letterSpacing = 0,
-        .lineSpacing = 0,
         .speed = 1,
-        .fgColor = TEXT_COLOR_DARK_GRAY,
-        .bgColor = TEXT_COLOR_WHITE,
-        .shadowColor = TEXT_COLOR_LIGHT_GRAY,
+        .fgColor = 2,
+        .bgColor = 1,
+        .shadowColor = 3,
     },
 };
 

src/battle_pike.c

@@ -845,21 +845,21 @@ static bool8 DoesTypePreventStatus(u16 species, u32 status)
     switch (status)
     {
     case STATUS1_TOXIC_POISON:
-        if (gSpeciesInfo[species].type1 == TYPE_STEEL || gSpeciesInfo[species].type1 == TYPE_POISON
-            || gSpeciesInfo[species].type2 == TYPE_STEEL || gSpeciesInfo[species].type2 == TYPE_POISON)
+        if (gSpeciesInfo[species].types[0] == TYPE_STEEL || gSpeciesInfo[species].types[0] == TYPE_POISON
+            || gSpeciesInfo[species].types[1] == TYPE_STEEL || gSpeciesInfo[species].types[1] == TYPE_POISON)
             ret = TRUE;
         break;
     case STATUS1_FREEZE:
-        if (gSpeciesInfo[species].type1 == TYPE_ICE || gSpeciesInfo[species].type2 == TYPE_ICE)
+        if (gSpeciesInfo[species].types[0] == TYPE_ICE || gSpeciesInfo[species].types[1] == TYPE_ICE)
             ret = TRUE;
         break;
     case STATUS1_PARALYSIS:
-        if (gSpeciesInfo[species].type1 == TYPE_GROUND || gSpeciesInfo[species].type1 == TYPE_ELECTRIC
-            || gSpeciesInfo[species].type2 == TYPE_GROUND || gSpeciesInfo[species].type2 == TYPE_ELECTRIC)
+        if (gSpeciesInfo[species].types[0] == TYPE_GROUND || gSpeciesInfo[species].types[0] == TYPE_ELECTRIC
+            || gSpeciesInfo[species].types[1] == TYPE_GROUND || gSpeciesInfo[species].types[1] == TYPE_ELECTRIC)
             ret = TRUE;
         break;
     case STATUS1_BURN:
-        if (gSpeciesInfo[species].type1 == TYPE_FIRE || gSpeciesInfo[species].type2 == TYPE_FIRE)
+        if (gSpeciesInfo[species].types[0] == TYPE_FIRE || gSpeciesInfo[species].types[1] == TYPE_FIRE)
             ret = TRUE;
         break;
     case STATUS1_SLEEP:

src/battle_pyramid_bag.c

@@ -578,7 +578,7 @@ static bool8 LoadPyramidBagGfx(void)
         }
         break;
     case 2:
-        LoadCompressedPalette(gBattlePyramidBagInterface_Pal, 0, 32);
+        LoadCompressedPalette(gBattlePyramidBagInterface_Pal, BG_PLTT_ID(0), PLTT_SIZE_4BPP);
         gPyramidBagMenu->state++;
         break;
     case 3:
@@ -1439,9 +1439,9 @@ static void InitPyramidBagWindows(void)
 
     InitWindows(sWindowTemplates);
     DeactivateAllTextPrinters();
-    LoadUserWindowBorderGfx(0, 0x1, 0xE0);
-    LoadMessageBoxGfx(0, 0xA, 0xD0);
-    LoadPalette(gStandardMenuPalette, 0xF0, 0x20);
+    LoadUserWindowBorderGfx(0, 0x1, BG_PLTT_ID(14));
+    LoadMessageBoxGfx(0, 0xA, BG_PLTT_ID(13));
+    LoadPalette(gStandardMenuPalette, BG_PLTT_ID(15), PLTT_SIZE_4BPP);
 
     for (i = 0; i < ARRAY_COUNT(sWindowTemplates); i++)
         FillWindowPixelBuffer(i, PIXEL_FILL(0));
@@ -1537,10 +1537,10 @@ static void FreeItemIconSprite(u8 spriteArrId)
 static void LoadPyramidBagPalette(void)
 {
     struct SpritePalette spritePalette;
-    u16 *palPtr = Alloc(0x40);
+    u16 *palPtr = Alloc(2 * PLTT_SIZE_4BPP);
 
     LZDecompressWram(gBattlePyramidBag_Pal, palPtr);
-    spritePalette.data = palPtr + (gSaveBlock2Ptr->frontier.lvlMode * 16);
+    spritePalette.data = palPtr + PLTT_ID(gSaveBlock2Ptr->frontier.lvlMode);
     spritePalette.tag = TAG_PYRAMID_BAG;
     LoadSpritePalette(&spritePalette);
     Free(palPtr);

src/battle_records.c

@@ -444,7 +444,7 @@ static void LoadTrainerHillRecordsWindowGfx(u8 bgId)
 {
     LoadBgTiles(bgId, sTrainerHillWindowTileset, sizeof(sTrainerHillWindowTileset), 0);
     CopyToBgTilemapBufferRect(bgId, sTrainerHillWindowTilemap, 0, 0, 0x20, 0x20);
-    LoadPalette(sTrainerHillWindowPalette, 0, 0x20);
+    LoadPalette(sTrainerHillWindowPalette, BG_PLTT_ID(0), PLTT_SIZE_4BPP);
 }
 
 static void VblankCB_TrainerHillRecords(void)
@@ -491,7 +491,7 @@ static void CB2_ShowTrainerHillRecords(void)
         break;
     case 3:
         LoadTrainerHillRecordsWindowGfx(3);
-        LoadPalette(GetTextWindowPalette(0), 0xF0, 0x20);
+        LoadPalette(GetTextWindowPalette(0), BG_PLTT_ID(15), PLTT_SIZE_4BPP);
         gMain.state++;
         break;
     case 4:

src/battle_script_commands.c

@@ -1595,7 +1595,7 @@ u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility)
 {
     s32 i = 0;
     u8 flags = 0;
-    u8 type1 = gSpeciesInfo[targetSpecies].type1, type2 = gSpeciesInfo[targetSpecies].type2;
+    u8 type1 = gSpeciesInfo[targetSpecies].types[0], type2 = gSpeciesInfo[targetSpecies].types[1];
     u8 moveType;
 
     if (move == MOVE_STRUGGLE)
@@ -4604,8 +4604,8 @@ static void Cmd_switchindataupdate(void)
     for (i = 0; i < sizeof(struct BattlePokemon); i++)
         monData[i] = gBattleBufferB[gActiveBattler][4 + i];
 
-    gBattleMons[gActiveBattler].type1 = gSpeciesInfo[gBattleMons[gActiveBattler].species].type1;
-    gBattleMons[gActiveBattler].type2 = gSpeciesInfo[gBattleMons[gActiveBattler].species].type2;
+    gBattleMons[gActiveBattler].type1 = gSpeciesInfo[gBattleMons[gActiveBattler].species].types[0];
+    gBattleMons[gActiveBattler].type2 = gSpeciesInfo[gBattleMons[gActiveBattler].species].types[1];
     gBattleMons[gActiveBattler].ability = GetAbilityBySpecies(gBattleMons[gActiveBattler].species, gBattleMons[gActiveBattler].abilityNum);
 
     // check knocked off item
@@ -6013,7 +6013,7 @@ static void InitLevelUpBanner(void)
     gBattle_BG2_Y = 0;
     gBattle_BG2_X = LEVEL_UP_BANNER_START;
 
-    LoadPalette(sLevelUpBanner_Pal, 0x60, 0x20);
+    LoadPalette(sLevelUpBanner_Pal, BG_PLTT_ID(6), PLTT_SIZE_4BPP);
     CopyToWindowPixelBuffer(B_WIN_LEVEL_UP_BANNER, sLevelUpBanner_Gfx, 0, 0);
     PutWindowTilemap(B_WIN_LEVEL_UP_BANNER);
     CopyWindowToVram(B_WIN_LEVEL_UP_BANNER, COPYWIN_FULL);

src/battle_transition.c

@@ -1406,7 +1406,7 @@ static bool8 Aqua_Init(struct Task *task)
     GetBg0TilesDst(&tilemap, &tileset);
     CpuFill16(0, tilemap, BG_SCREEN_SIZE);
     LZ77UnCompVram(sTeamAqua_Tileset, tileset);
-    LoadPalette(sEvilTeam_Palette, 0xF0, sizeof(sEvilTeam_Palette));
+    LoadPalette(sEvilTeam_Palette, BG_PLTT_ID(15), sizeof(sEvilTeam_Palette));
 
     task->tState++;
     return FALSE;
@@ -1421,7 +1421,7 @@ static bool8 Magma_Init(struct Task *task)
     GetBg0TilesDst(&tilemap, &tileset);
     CpuFill16(0, tilemap, BG_SCREEN_SIZE);
     LZ77UnCompVram(sTeamMagma_Tileset, tileset);
-    LoadPalette(sEvilTeam_Palette, 0xF0, sizeof(sEvilTeam_Palette));
+    LoadPalette(sEvilTeam_Palette, BG_PLTT_ID(15), sizeof(sEvilTeam_Palette));
 
     task->tState++;
     return FALSE;
@@ -1449,7 +1449,7 @@ static bool8 BigPokeball_Init(struct Task *task)
     GetBg0TilesDst(&tilemap, &tileset);
     CpuFill16(0, tilemap, BG_SCREEN_SIZE);
     CpuCopy16(sBigPokeball_Tileset, tileset, sizeof(sBigPokeball_Tileset));
-    LoadPalette(sFieldEffectPal_Pokeball, 0xF0, sizeof(sFieldEffectPal_Pokeball));
+    LoadPalette(sFieldEffectPal_Pokeball, BG_PLTT_ID(15), sizeof(sFieldEffectPal_Pokeball));
 
     task->tState++;
     return FALSE;
@@ -1504,7 +1504,7 @@ static bool8 Regice_SetGfx(struct Task *task)
     u16 *tilemap, *tileset;
 
     GetBg0TilesDst(&tilemap, &tileset);
-    LoadPalette(sRegice_Palette, 0xF0, sizeof(sRegice_Palette));
+    LoadPalette(sRegice_Palette, BG_PLTT_ID(15), sizeof(sRegice_Palette));
     CpuCopy16(sRegice_Tilemap, tilemap, 0x500);
     SetSinWave(gScanlineEffectRegBuffers[0], 0, task->tSinIndex, 132, task->tAmplitude, DISPLAY_HEIGHT);
 
@@ -1517,7 +1517,7 @@ static bool8 Registeel_SetGfx(struct Task *task)
     u16 *tilemap, *tileset;
 
     GetBg0TilesDst(&tilemap, &tileset);
-    LoadPalette(sRegisteel_Palette, 0xF0, sizeof(sRegisteel_Palette));
+    LoadPalette(sRegisteel_Palette, BG_PLTT_ID(15), sizeof(sRegisteel_Palette));
     CpuCopy16(sRegisteel_Tilemap, tilemap, 0x500);
     SetSinWave(gScanlineEffectRegBuffers[0], 0, task->tSinIndex, 132, task->tAmplitude, DISPLAY_HEIGHT);
 
@@ -1530,7 +1530,7 @@ static bool8 Regirock_SetGfx(struct Task *task)
     u16 *tilemap, *tileset;
 
     GetBg0TilesDst(&tilemap, &tileset);
-    LoadPalette(sRegirock_Palette, 0xF0, sizeof(sRegirock_Palette));
+    LoadPalette(sRegirock_Palette, BG_PLTT_ID(15), sizeof(sRegirock_Palette));
     CpuCopy16(sRegirock_Tilemap, tilemap, 0x500);
     SetSinWave(gScanlineEffectRegBuffers[0], 0, task->tSinIndex, 132, task->tAmplitude, DISPLAY_HEIGHT);
 
@@ -1559,7 +1559,7 @@ static bool8 Kyogre_PaletteFlash(struct Task *task)
     {
         u16 offset = task->tTimer % 30;
         offset /= 3;
-        LoadPalette(&sKyogre1_Palette[offset * 16], 0xF0, 0x20);
+        LoadPalette(&sKyogre1_Palette[offset * 16], BG_PLTT_ID(15), PLTT_SIZE_4BPP);
     }
     if (++task->tTimer > 58)
     {
@@ -1575,7 +1575,7 @@ static bool8 Kyogre_PaletteBrighten(struct Task *task)
     if (task->tTimer % 5 == 0)
     {
         s16 offset = task->tTimer / 5;
-        LoadPalette(&sKyogre2_Palette[offset * 16], 0xF0, 0x20);
+        LoadPalette(&sKyogre2_Palette[offset * 16], BG_PLTT_ID(15), PLTT_SIZE_4BPP);
     }
     if (++task->tTimer > 68)
     {
@@ -1776,7 +1776,7 @@ static bool8 PokeballsTrail_Init(struct Task *task)
     GetBg0TilesDst(&tilemap, &tileset);
     CpuSet(sPokeballTrail_Tileset, tileset, 0x20);
     CpuFill32(0, tilemap, BG_SCREEN_SIZE);
-    LoadPalette(sFieldEffectPal_Pokeball, 0xF0, sizeof(sFieldEffectPal_Pokeball));
+    LoadPalette(sFieldEffectPal_Pokeball, BG_PLTT_ID(15), sizeof(sFieldEffectPal_Pokeball));
 
     task->tState++;
     return FALSE;
@@ -2328,8 +2328,8 @@ static bool8 Mugshot_SetGfx(struct Task *task)
     mugshotsMap = sMugshotsTilemap;
     GetBg0TilesDst(&tilemap, &tileset);
     CpuSet(sEliteFour_Tileset, tileset, 0xF0);
-    LoadPalette(sOpponentMugshotsPals[task->tMugshotId], 0xF0, 0x20);
-    LoadPalette(sPlayerMugshotsPals[gSaveBlock2Ptr->playerGender], 0xFA, 0xC);
+    LoadPalette(sOpponentMugshotsPals[task->tMugshotId], BG_PLTT_ID(15), PLTT_SIZE_4BPP);
+    LoadPalette(sPlayerMugshotsPals[gSaveBlock2Ptr->playerGender], BG_PLTT_ID(15) + 10, PLTT_SIZEOF(6));
 
     for (i = 0; i < 20; i++)
     {
@@ -3193,7 +3193,7 @@ static bool8 RectangularSpiral_Init(struct Task *task)
     CpuCopy16(sShrinkingBoxTileset, tileset, 0x20);
     CpuCopy16(&sShrinkingBoxTileset[0x70], &tileset[0x20], 0x20);
     CpuFill16(0xF0 << 8, tilemap, BG_SCREEN_SIZE);
-    LoadPalette(sFieldEffectPal_Pokeball, 0xF0, sizeof(sFieldEffectPal_Pokeball));
+    LoadPalette(sFieldEffectPal_Pokeball, BG_PLTT_ID(15), sizeof(sFieldEffectPal_Pokeball));
 
     task->data[3] = 1;
     task->tState++;
@@ -3389,7 +3389,7 @@ static bool8 Groudon_PaletteFlash(struct Task *task)
     if (task->tTimer % 3 == 0)
     {
         u16 offset = (task->tTimer % 30) / 3;
-        LoadPalette(&sGroudon1_Palette[offset * 16], 0xF0, 0x20);
+        LoadPalette(&sGroudon1_Palette[offset * 16], BG_PLTT_ID(15), PLTT_SIZE_4BPP);
     }
     if (++task->tTimer > 58)
     {
@@ -3405,7 +3405,7 @@ static bool8 Groudon_PaletteBrighten(struct Task *task)
     if (task->tTimer % 5 == 0)
     {
         s16 offset = task->tTimer / 5;
-        LoadPalette(&sGroudon2_Palette[offset * 16], 0xF0, 0x20);
+        LoadPalette(&sGroudon2_Palette[offset * 16], BG_PLTT_ID(15), PLTT_SIZE_4BPP);
     }
     if (++task->tTimer > 68)
     {
@@ -3448,7 +3448,7 @@ static bool8 Rayquaza_Init(struct Task *task)
 
     sTransitionData->counter = 0;
     task->tState++;
-    LoadPalette(&sRayquaza_Palette[0x50], 0xF0, 0x20);
+    LoadPalette(&sRayquaza_Palette[80], BG_PLTT_ID(15), PLTT_SIZE_4BPP);
 
     for (i = 0; i < DISPLAY_HEIGHT; i++)
     {
@@ -3476,7 +3476,7 @@ static bool8 Rayquaza_PaletteFlash(struct Task *task)
     {
         u16 value = task->tTimer / 4;
         const u16 *palPtr = &sRayquaza_Palette[(value + 5) * 16];
-        LoadPalette(palPtr, 0xF0, 0x20);
+        LoadPalette(palPtr, BG_PLTT_ID(15), PLTT_SIZE_4BPP);
     }
     if (++task->tTimer > 40)
     {
@@ -3524,7 +3524,7 @@ static bool8 Rayquaza_TriRing(struct Task *task)
     {
         u16 value = task->tTimer / 3;
         const u16 *palPtr = &sRayquaza_Palette[(value + 0) * 16];
-        LoadPalette(palPtr, 0xF0, 0x20);
+        LoadPalette(palPtr, BG_PLTT_ID(15), PLTT_SIZE_4BPP);
     }
     if (++task->tTimer >= 40)
     {
@@ -3775,7 +3775,7 @@ static bool8 GridSquares_Init(struct Task *task)
     GetBg0TilesDst(&tilemap, &tileset);
     CpuSet(sShrinkingBoxTileset, tileset, 16);
     CpuFill16(0xF0 << 8, tilemap, BG_SCREEN_SIZE);
-    LoadPalette(sFieldEffectPal_Pokeball, 0xF0, sizeof(sFieldEffectPal_Pokeball));
+    LoadPalette(sFieldEffectPal_Pokeball, BG_PLTT_ID(15), sizeof(sFieldEffectPal_Pokeball));
 
     task->tState++;
     return FALSE;
@@ -4242,7 +4242,7 @@ static bool8 FrontierLogoWiggle_Init(struct Task *task)
     GetBg0TilesDst(&tilemap, &tileset);
     CpuFill16(0, tilemap, BG_SCREEN_SIZE);
     LZ77UnCompVram(sFrontierLogo_Tileset, tileset);
-    LoadPalette(sFrontierLogo_Palette, 0xF0, sizeof(sFrontierLogo_Palette));
+    LoadPalette(sFrontierLogo_Palette, BG_PLTT_ID(15), sizeof(sFrontierLogo_Palette));
 
     task->tState++;
     return FALSE;
@@ -4304,7 +4304,7 @@ static bool8 FrontierLogoWave_Init(struct Task *task)
     GetBg0TilesDst(&tilemap, &tileset);
     CpuFill16(0, tilemap, BG_SCREEN_SIZE);
     LZ77UnCompVram(sFrontierLogo_Tileset, tileset);
-    LoadPalette(sFrontierLogo_Palette, 0xF0, sizeof(sFrontierLogo_Palette));
+    LoadPalette(sFrontierLogo_Palette, BG_PLTT_ID(15), sizeof(sFrontierLogo_Palette));
     sTransitionData->cameraY = 0;
 
     task->tState++;
@@ -4454,7 +4454,7 @@ static bool8 FrontierSquares_Init(struct Task *task)
     FillBgTilemapBufferRect(0, 1, 0, 0, MARGIN_SIZE, 32, 15);
     FillBgTilemapBufferRect(0, 1, 30 - MARGIN_SIZE, 0, MARGIN_SIZE, 32, 15);
     CopyBgTilemapBufferToVram(0);
-    LoadPalette(sFrontierSquares_Palette, 0xF0, sizeof(sFrontierSquares_Palette));
+    LoadPalette(sFrontierSquares_Palette, BG_PLTT_ID(15), sizeof(sFrontierSquares_Palette));
 
     task->tPosX = MARGIN_SIZE;
     task->tPosY = 0;
@@ -4549,9 +4549,9 @@ static bool8 FrontierSquaresSpiral_Init(struct Task *task)
     FillBgTilemapBufferRect(0, 1, 0, 0, MARGIN_SIZE, 32, 15);
     FillBgTilemapBufferRect(0, 1, 30 - MARGIN_SIZE, 0, MARGIN_SIZE, 32, 15);
     CopyBgTilemapBufferToVram(0);
-    LoadPalette(sFrontierSquares_Palette, 0xE0, sizeof(sFrontierSquares_Palette));
-    LoadPalette(sFrontierSquares_Palette, 0xF0, sizeof(sFrontierSquares_Palette));
-    BlendPalette(0xE0, 16, 8, RGB_BLACK);
+    LoadPalette(sFrontierSquares_Palette, BG_PLTT_ID(14), sizeof(sFrontierSquares_Palette));
+    LoadPalette(sFrontierSquares_Palette, BG_PLTT_ID(15), sizeof(sFrontierSquares_Palette));
+    BlendPalette(BG_PLTT_ID(14), 16, 8, RGB_BLACK);
 
     task->tSquareNum = NUM_SQUARES - 1;
     task->tFadeFlag = 0;
@@ -4581,7 +4581,7 @@ static bool8 FrontierSquaresSpiral_Outward(struct Task *task)
 // set it to black so it's not revealed when the squares are removed.
 static bool8 FrontierSquaresSpiral_SetBlack(struct Task *task)
 {
-    BlendPalette(0xE0, 16, 3, RGB_BLACK);
+    BlendPalette(BG_PLTT_ID(14), 16, 3, RGB_BLACK);
     BlendPalettes(PALETTES_ALL & ~(1 << 15 | 1 << 14), 16, RGB_BLACK);
 
     task->tSquareNum = 0;
@@ -4664,7 +4664,7 @@ static bool8 FrontierSquaresScroll_Init(struct Task *task)
     LZ77UnCompVram(sFrontierSquares_FilledBg_Tileset, tileset);
     FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 32, 32);
     CopyBgTilemapBufferToVram(0);
-    LoadPalette(sFrontierSquares_Palette, 0xF0, sizeof(sFrontierSquares_Palette));
+    LoadPalette(sFrontierSquares_Palette, BG_PLTT_ID(15), sizeof(sFrontierSquares_Palette));
 
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;

src/battle_transition_frontier.c

@@ -226,7 +226,7 @@ static void LoadLogoGfx(void)
     GetBg0TilesDst(&tilemap, &tileset);
     LZ77UnCompVram(sLogoCenter_Gfx, tileset);
     LZ77UnCompVram(sLogoCenter_Tilemap, tilemap);
-    LoadPalette(sLogo_Pal, 0xF0, sizeof(sLogo_Pal));
+    LoadPalette(sLogo_Pal, BG_PLTT_ID(15), sizeof(sLogo_Pal));
     LoadCompressedSpriteSheet(&sSpriteSheet_LogoCircles);
     LoadSpritePalette(&sSpritePalette_LogoCircles);
 }

src/berry_blender.c

@@ -966,7 +966,7 @@ static bool8 LoadBerryBlenderGfx(void)
     case 1:
         CopyToBgTilemapBuffer(2, sBlenderCenter_Tilemap, 0x400, 0);
         CopyBgTilemapBufferToVram(2);
-        LoadPalette(sBlenderCenter_Pal, 0, 0x100);
+        LoadPalette(sBlenderCenter_Pal, BG_PLTT_ID(0), 8 * PLTT_SIZE_4BPP);
         sBerryBlender->loadGfxState++;
         break;
     case 2:
@@ -991,7 +991,7 @@ static bool8 LoadBerryBlenderGfx(void)
         sBerryBlender->loadGfxState++;
         break;
     case 7:
-        LoadPalette(sBlenderOuter_Pal, 0x80, 0x20);
+        LoadPalette(sBlenderOuter_Pal, BG_PLTT_ID(8), PLTT_SIZE_4BPP);
         sBerryBlender->loadGfxState++;
         break;
     case 8:
@@ -1072,8 +1072,8 @@ static void CB2_LoadBerryBlender(void)
         InitBgsFromTemplates(1, sBgTemplates, ARRAY_COUNT(sBgTemplates));
         SetBgTilemapBuffer(1, sBerryBlender->tilemapBuffers[0]);
         SetBgTilemapBuffer(2, sBerryBlender->tilemapBuffers[1]);
-        LoadUserWindowBorderGfx(0, 1, 0xD0);
-        LoadMessageBoxGfx(0, 0x14, 0xF0);
+        LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(13));
+        LoadMessageBoxGfx(0, 0x14, BG_PLTT_ID(15));
         InitBerryBlenderWindows();
 
         sBerryBlender->mainState++;
@@ -1509,8 +1509,8 @@ static void InitBlenderBgs(void)
 
     SetBgTilemapBuffer(1, sBerryBlender->tilemapBuffers[0]);
     SetBgTilemapBuffer(2, sBerryBlender->tilemapBuffers[1]);
-    LoadUserWindowBorderGfx(0, 1, 0xD0);
-    LoadMessageBoxGfx(0, 0x14, 0xF0);
+    LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(13));
+    LoadMessageBoxGfx(0, 0x14, BG_PLTT_ID(15));
     InitBerryBlenderWindows();
 
     sBerryBlender->unk0 = 0;

src/berry_crush.c

@@ -1235,7 +1235,7 @@ static s32 ShowGameDisplay(void)
         gPaletteFade.bufferTransferDisabled = TRUE;
         break;
     case 7:
-        LoadPalette(gBerryCrush_Crusher_Pal, 0, 0x180);
+        LoadPalette(gBerryCrush_Crusher_Pal, BG_PLTT_ID(0), 12 * PLTT_SIZE_4BPP);
         CopyToBgTilemapBuffer(1, sCrusherTop_Tilemap, 0, 0);
         CopyToBgTilemapBuffer(2, sContainerCap_Tilemap, 0, 0);
         CopyToBgTilemapBuffer(3, sBg_Tilemap, 0, 0);
@@ -1751,7 +1751,7 @@ static bool32 OpenResultsWindow(struct BerryCrushGame *game, struct BerryCrushGa
         FillWindowPixelBuffer(gfx->resultsWindowId, PIXEL_FILL(0));
         break;
     case 2:
-        LoadUserWindowBorderGfx_(gfx->resultsWindowId, 541, 208);
+        LoadUserWindowBorderGfx_(gfx->resultsWindowId, 541, BG_PLTT_ID(13));
         DrawStdFrameWithCustomTileAndPalette(gfx->resultsWindowId, FALSE, 541, 13);
         break;
     case 3:
@@ -1809,7 +1809,7 @@ static void Task_ShowRankings(u8 taskId)
         tWindowId = AddWindow(&sWindowTemplate_Rankings);
         PutWindowTilemap(tWindowId);
         FillWindowPixelBuffer(tWindowId, PIXEL_FILL(0));
-        LoadUserWindowBorderGfx_(tWindowId, 541, 208);
+        LoadUserWindowBorderGfx_(tWindowId, 541, BG_PLTT_ID(13));
         DrawStdFrameWithCustomTileAndPalette(tWindowId, FALSE, 541, 13);
         break;
     case 1:

src/berry_powder.c

@@ -4,6 +4,7 @@
 #include "event_data.h"
 #include "load_save.h"
 #include "menu.h"
+#include "palette.h"
 #include "string_util.h"
 #include "strings.h"
 #include "text.h"
@@ -228,7 +229,7 @@ void DisplayBerryPowderVendorMenu(void)
     sBerryPowderVendorWindowId = AddWindow(&template);
     FillWindowPixelBuffer(sBerryPowderVendorWindowId, PIXEL_FILL(0));
     PutWindowTilemap(sBerryPowderVendorWindowId);
-    LoadUserWindowBorderGfx_(sBerryPowderVendorWindowId, 0x21D, 0xD0);
+    LoadUserWindowBorderGfx_(sBerryPowderVendorWindowId, 0x21D, BG_PLTT_ID(13));
     DrawPlayerPowderAmount(sBerryPowderVendorWindowId, 0x21D, 13, GetBerryPowder());
 }
 

src/berry_tag_screen.c

@@ -346,7 +346,7 @@ static bool8 LoadBerryTagGfx(void)
         sBerryTag->gfxState++;
         break;
     case 4:
-        LoadCompressedPalette(gBerryCheck_Pal, 0, 0xC0);
+        LoadCompressedPalette(gBerryCheck_Pal, BG_PLTT_ID(0), 6 * PLTT_SIZE_4BPP);
         sBerryTag->gfxState++;
         break;
     case 5:
@@ -367,7 +367,7 @@ static void HandleInitWindows(void)
 
     InitWindows(sWindowTemplates);
     DeactivateAllTextPrinters();
-    LoadPalette(sFontPalette, 0xF0, 0x20);
+    LoadPalette(sFontPalette, BG_PLTT_ID(15), PLTT_SIZE_4BPP);
     for (i = 0; i < ARRAY_COUNT(sWindowTemplates) - 1; i++)
         PutWindowTilemap(i);
     ScheduleBgCopyTilemapToVram(0);

src/cable_car.c

@@ -307,7 +307,7 @@ static void CB2_LoadCableCar(void)
     case 3:
         if (!FreeTempTileDataBuffersIfPossible())
         {
-            LoadPalette(gCableCarBg_Pal, 0, 0x80);
+            LoadPalette(gCableCarBg_Pal, BG_PLTT_ID(0), 4 * PLTT_SIZE_4BPP);
             gMain.state++;
         }
         break;

src/clear_save_data_screen.c

@@ -204,6 +204,6 @@ static void InitClearSaveDataScreenWindows(void)
     InitWindows(sClearSaveTextWindow);
     DeactivateAllTextPrinters();
     FillWindowPixelBuffer(0, PIXEL_FILL(0));
-    LoadWindowGfx(0, 0, 2, 224);
-    LoadPalette(gStandardMenuPalette, 0xF0, 0x20);
+    LoadWindowGfx(0, 0, 2, BG_PLTT_ID(14));
+    LoadPalette(gStandardMenuPalette, BG_PLTT_ID(15), PLTT_SIZE_4BPP);
 }

src/contest.c

@@ -736,7 +736,7 @@ static const struct WindowTemplate sContestWindowTemplates[] =
         .tilemapTop = 0,
         .width = 12,
         .height = 2,
-        .paletteNum = 0xF,
+        .paletteNum = 15,
         .baseBlock = 0x200
     },
     [WIN_CONTESTANT1_NAME] = {
@@ -745,7 +745,7 @@ static const struct WindowTemplate sContestWindowTemplates[] =
         .tilemapTop = 5,
         .width = 12,
         .height = 2,
-        .paletteNum = 0xF,
+        .paletteNum = 15,
         .baseBlock = 0x218
     },
     [WIN_CONTESTANT2_NAME] = {
@@ -754,7 +754,7 @@ static const struct WindowTemplate sContestWindowTemplates[] =
         .tilemapTop = 10,
         .width = 12,
         .height = 2,
-        .paletteNum = 0xF,
+        .paletteNum = 15,
         .baseBlock = 0x230
     },
     [WIN_CONTESTANT3_NAME] = {
@@ -763,7 +763,7 @@ static const struct WindowTemplate sContestWindowTemplates[] =
         .tilemapTop = 15,
         .width = 12,
         .height = 2,
-        .paletteNum = 0xF,
+        .paletteNum = 15,
         .baseBlock = 0x248
     },
     [WIN_GENERAL_TEXT] = {
@@ -772,7 +772,7 @@ static const struct WindowTemplate sContestWindowTemplates[] =
         .tilemapTop = 15,
         .width = 17,
         .height = 4,
-        .paletteNum = 0xF,
+        .paletteNum = 15,
         .baseBlock = 0x260
     },
     [WIN_MOVE0] = {
@@ -781,7 +781,7 @@ static const struct WindowTemplate sContestWindowTemplates[] =
         .tilemapTop = 31,
         .width = 9,
         .height = 2,
-        .paletteNum = 0xF,
+        .paletteNum = 15,
         .baseBlock = 0x2A4
     },
     [WIN_MOVE1] = {
@@ -790,7 +790,7 @@ static const struct WindowTemplate sContestWindowTemplates[] =
         .tilemapTop = 33,
         .width = 9,
         .height = 2,
-        .paletteNum = 0xF,
+        .paletteNum = 15,
         .baseBlock = 0x2B6
     },
     [WIN_MOVE2] = {
@@ -799,7 +799,7 @@ static const struct WindowTemplate sContestWindowTemplates[] =
         .tilemapTop = 35,
         .width = 9,
         .height = 2,
-        .paletteNum = 0xF,
+        .paletteNum = 15,
         .baseBlock = 0x2C8
     },
     [WIN_MOVE3] = {
@@ -808,7 +808,7 @@ static const struct WindowTemplate sContestWindowTemplates[] =
         .tilemapTop = 37,
         .width = 9,
         .height = 2,
-        .paletteNum = 0xF,
+        .paletteNum = 15,
         .baseBlock = 0x2DA
     },
     [WIN_SLASH] = {
@@ -817,7 +817,7 @@ static const struct WindowTemplate sContestWindowTemplates[] =
         .tilemapTop = 31,
         .width = 1,
         .height = 2,
-        .paletteNum = 0xF,
+        .paletteNum = 15,
         .baseBlock = 0x2EC
     },
     [WIN_MOVE_DESCRIPTION] = {
@@ -826,7 +826,7 @@ static const struct WindowTemplate sContestWindowTemplates[] =
         .tilemapTop = 35,
         .width = 18,
         .height = 4,
-        .paletteNum = 0xF,
+        .paletteNum = 15,
         .baseBlock = 0x2EE
     },
     DUMMY_WIN_TEMPLATE
@@ -1035,13 +1035,13 @@ void LoadContestBgAfterMoveAnim(void)
     LZDecompressVram(gContestAudienceGfx, (void *)(BG_SCREEN_ADDR(4)));
     CopyToBgTilemapBuffer(3, gContestAudienceTilemap, 0, 0);
     CopyBgTilemapBufferToVram(3);
-    LoadCompressedPalette(gContestInterfaceAudiencePalette, 0, 0x200);
+    LoadCompressedPalette(gContestInterfaceAudiencePalette, BG_PLTT_OFFSET, BG_PLTT_SIZE);
     LoadContestPalettes();
     for (i = 0; i < CONTESTANT_COUNT; i++)
     {
         u32 contestantWindowId = 5 + i;
 
-        LoadPalette(eContestTempSave.cachedWindowPalettes[contestantWindowId], 16 * (5 + gContestantTurnOrder[i]), sizeof((eContestTempSave.cachedWindowPalettes[contestantWindowId])));
+        LoadPalette(eContestTempSave.cachedWindowPalettes[contestantWindowId], BG_PLTT_ID(5 + gContestantTurnOrder[i]), sizeof((eContestTempSave.cachedWindowPalettes[contestantWindowId])));
     }
 }
 
@@ -1076,11 +1076,11 @@ static void LoadContestPalettes(void)
 {
     s32 i;
 
-    LoadPalette(sText_Pal, 0xf0, 0x20);
-    FillPalette(RGB_BLACK, 0, 2);
+    LoadPalette(sText_Pal, BG_PLTT_ID(15), PLTT_SIZE_4BPP);
+    SetBackdropFromColor(RGB_BLACK);
     for (i = 10; i < 14; i++)
-        LoadPalette(gPlttBufferUnfaded + 241, 240 + i, 2);
-    FillPalette(RGB(31, 17, 31), 0xF3, 2);
+        LoadPalette(gPlttBufferUnfaded + BG_PLTT_ID(15) + 1, BG_PLTT_ID(15) + i, PLTT_SIZEOF(1));
+    FillPalette(RGB(31, 17, 31), BG_PLTT_ID(15) + 3, PLTT_SIZEOF(1));
 }
 
 static void InitContestResources(void)
@@ -1330,11 +1330,11 @@ static bool8 SetupContestGraphics(u8 *stateVar)
         DmaCopy32Defvars(3, gContestResources->contestBgTilemaps[2], eContestTempSave.savedJunk, sizeof(eContestTempSave.savedJunk));
         break;
     case 5:
-        LoadCompressedPalette(gContestInterfaceAudiencePalette, 0, 0x200);
-        CpuCopy32(gPlttBufferUnfaded + 128, tempPalette1, 16 * sizeof(u16));
-        CpuCopy32(gPlttBufferUnfaded + (5 + gContestPlayerMonIndex) * 16, tempPalette2, 16 * sizeof(u16));
-        CpuCopy32(tempPalette2, gPlttBufferUnfaded + 128, 16 * sizeof(u16));
-        CpuCopy32(tempPalette1, gPlttBufferUnfaded + (5 + gContestPlayerMonIndex) * 16, 16 * sizeof(u16));
+        LoadCompressedPalette(gContestInterfaceAudiencePalette, BG_PLTT_OFFSET, BG_PLTT_SIZE);
+        CpuCopy32(gPlttBufferUnfaded + BG_PLTT_ID(8), tempPalette1, PLTT_SIZE_4BPP);
+        CpuCopy32(gPlttBufferUnfaded + BG_PLTT_ID(5 + gContestPlayerMonIndex), tempPalette2, PLTT_SIZE_4BPP);
+        CpuCopy32(tempPalette2, gPlttBufferUnfaded + BG_PLTT_ID(8), PLTT_SIZE_4BPP);
+        CpuCopy32(tempPalette1, gPlttBufferUnfaded + BG_PLTT_ID(5 + gContestPlayerMonIndex), PLTT_SIZE_4BPP);
         DmaCopy32Defvars(3, gPlttBufferUnfaded, eContestTempSave.cachedWindowPalettes, sizeof(eContestTempSave.cachedWindowPalettes));
         LoadContestPalettes();
         break;
@@ -3100,7 +3100,7 @@ static u8 CreateJudgeSprite(void)
     u8 spriteId;
 
     LoadCompressedSpriteSheet(&sSpriteSheet_Judge);
-    LoadCompressedPalette(gContest2Pal, 0x110, 32);
+    LoadCompressedPalette(gContest2Pal, OBJ_PLTT_ID(1), PLTT_SIZE_4BPP);
     spriteId = CreateSprite(&sSpriteTemplate_Judge, 112, 36, 30);
     gSprites[spriteId].oam.paletteNum = 1;
     gSprites[spriteId].callback = SpriteCallbackDummy;
@@ -3129,7 +3129,7 @@ static u8 CreateContestantSprite(u16 species, u32 otId, u32 personality, u32 ind
     else
         HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[species], gMonSpritesGfxPtr->sprites.ptr[B_POSITION_PLAYER_LEFT], species, personality);
 
-    LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, otId, personality), 0x120, 0x20);
+    LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, otId, personality), OBJ_PLTT_ID(2), PLTT_SIZE_4BPP);
     SetMultiuseSpriteTemplateToPokemon(species, B_POSITION_PLAYER_LEFT);
 
     spriteId = CreateSprite(&gMultiuseSpriteTemplate, 0x70, GetBattlerSpriteFinal_Y(2, species, FALSE), 30);
@@ -4000,7 +4000,7 @@ static void Task_StopFlashJudgeAttentionEye(u8 taskId)
     {
         gTasks[eContest.judgeAttentionTaskId].data[contestant * 4 + 0] = 0xFF;
         gTasks[eContest.judgeAttentionTaskId].data[contestant * 4 + 1] = 0;
-        BlendPalette((eContest.prevTurnOrder[contestant] + 5) * 16 + 6, 2, 0, RGB(31, 31, 18));
+        BlendPalette(BG_PLTT_ID(5 + eContest.prevTurnOrder[contestant]) + 6, 2, 0, RGB(31, 31, 18));
         DestroyTask(taskId);
     }
 }
@@ -4024,7 +4024,7 @@ static void Task_FlashJudgeAttentionEye(u8 taskId)
              || gTasks[taskId].data[offset + 0] == 0)
                 gTasks[taskId].data[offset + 1] ^= 1;
 
-            BlendPalette((eContest.prevTurnOrder[i] + 5) * 16 + 6, 2, gTasks[taskId].data[offset + 0], RGB(31, 31, 18));
+            BlendPalette(BG_PLTT_ID(5 + eContest.prevTurnOrder[i]) + 6, 2, gTasks[taskId].data[offset + 0], RGB(31, 31, 18));
         }
     }
 }
@@ -4103,8 +4103,8 @@ static void Task_UnusedBlend(u8 taskId)
                  || gTasks[taskId].data[idx] == 0)
                     gTasks[taskId].data[idx + 1] ^= 1;
 
-                BlendPalette((i + 5) * 16 + 10,     1, gTasks[taskId].data[idx + 0], RGB(31, 31, 18));
-                BlendPalette((i + 5) * 16 + 12 + i, 1, gTasks[taskId].data[idx + 0], RGB(31, 31, 18));
+                BlendPalette(BG_PLTT_ID(5 + i) + 10,     1, gTasks[taskId].data[idx + 0], RGB(31, 31, 18));
+                BlendPalette(BG_PLTT_ID(5 + i) + 12 + i, 1, gTasks[taskId].data[idx + 0], RGB(31, 31, 18));
             }
         }
     }
@@ -4417,7 +4417,7 @@ static void DrawContestantWindows(void)
     for (i = 0; i < CONTESTANT_COUNT; i++)
     {
         s32 windowId = i + 5;
-        LoadPalette(eContestTempSave.cachedWindowPalettes[windowId], (gContestantTurnOrder[i] + 5) * 16, sizeof(eContestTempSave.cachedWindowPalettes[0]));
+        LoadPalette(eContestTempSave.cachedWindowPalettes[windowId], BG_PLTT_ID(5 + gContestantTurnOrder[i]), sizeof(eContestTempSave.cachedWindowPalettes[0]));
     }
     DrawContestantWindowText();
 }
@@ -4772,7 +4772,7 @@ static void Task_ApplauseOverflowAnimation(u8 taskId)
         else
             gTasks[taskId].data[4]--;
 
-        BlendPalette(264 + gTasks[taskId].data[2] * 16, 1, gTasks[taskId].data[4], RGB_WHITE);
+        BlendPalette(OBJ_PLTT_ID(gTasks[taskId].data[2]) + 8, 1, gTasks[taskId].data[4], RGB_WHITE);
 
         // At the maximum or minimum blending, switch directions.
         if (gTasks[taskId].data[4] == 0 || gTasks[taskId].data[4] == 16)
@@ -4782,7 +4782,7 @@ static void Task_ApplauseOverflowAnimation(u8 taskId)
             // Continue the animation until the applause meter is cleared.
             if (eContest.applauseLevel < 5)
             {
-                BlendPalette(264 + gTasks[taskId].data[2] * 16, 1, 0, RGB_RED);
+                BlendPalette(OBJ_PLTT_ID(gTasks[taskId].data[2]) + 8, 1, 0, RGB_RED);
                 DestroyTask(taskId);
             }
         }
@@ -4995,8 +4995,8 @@ static void Task_BlendAudienceBackground(u8 taskId)
         else
             gTasks[taskId].tBlendCoeff--;
 
-        BlendPalette(17, 1, gTasks[taskId].tBlendCoeff, gTasks[taskId].tBlendColor);
-        BlendPalette(26, 1, gTasks[taskId].tBlendCoeff, gTasks[taskId].tBlendColor);
+        BlendPalette(BG_PLTT_ID(1) + 1,  1, gTasks[taskId].tBlendCoeff, gTasks[taskId].tBlendColor);
+        BlendPalette(BG_PLTT_ID(1) + 10, 1, gTasks[taskId].tBlendCoeff, gTasks[taskId].tBlendColor);
 
         if (gTasks[taskId].tBlendCoeff == gTasks[taskId].tTargetBlendCoeff)
         {
@@ -5320,7 +5320,7 @@ static void SetMoveSpecificAnimData(u8 contestant)
     switch (move)
     {
     case MOVE_CURSE:
-        if (gSpeciesInfo[species].type1 == TYPE_GHOST || gSpeciesInfo[species].type2 == TYPE_GHOST)
+        if (gSpeciesInfo[species].types[0] == TYPE_GHOST || gSpeciesInfo[species].types[1] == TYPE_GHOST)
             gAnimMoveTurn = 0;
         else
             gAnimMoveTurn = 1;

src/contest_painting.c

@@ -223,7 +223,7 @@ static void ShowContestPainting(void)
         break;
     case 4:
         PrintContestPaintingCaption(gCurContestWinnerSaveIdx, gCurContestWinnerIsForArtist);
-        LoadPalette(sBgPalette, 0, 1 * 2);
+        SetBackdropFromPalette(sBgPalette);
         DmaClear32(3, PLTT, PLTT_SIZE);
         BeginFastPaletteFade(2);
         SetVBlankCallback(VBlankCB_ContestPainting);
@@ -420,7 +420,7 @@ static void LoadContestPaintingFrame(u8 contestWinnerId, bool8 isForArtist)
 {
     u8 x, y;
 
-    LoadPalette(sPictureFramePalettes, 0, 0x100);
+    LoadPalette(sPictureFramePalettes, BG_PLTT_ID(0), 8 * PLTT_SIZE_4BPP);
     if (isForArtist == TRUE)
     {
         // Load Artist's frame
@@ -586,7 +586,7 @@ static void DoContestPaintingImageProcessing(u8 imageEffect)
     ApplyImageProcessingEffects(&gImageProcessingContext);
     ApplyImageProcessingQuantization(&gImageProcessingContext);
     ConvertImageProcessingToGBA(&gImageProcessingContext);
-    LoadPalette(gContestPaintingMonPalette, 0x100, 0x200);
+    LoadPalette(gContestPaintingMonPalette, OBJ_PLTT_ID(0), 16 * PLTT_SIZE_4BPP);
 }
 
 static void CreateContestPaintingPicture(u8 contestWinnerId, bool8 isForArtist)

src/contest_util.c

@@ -456,8 +456,8 @@ static void LoadContestResultsBgGfx(void)
     CopyToBgTilemapBuffer(2, gContestResults_Interface_Tilemap, 0, 0);
     CopyToBgTilemapBuffer(0, gContestResults_WinnerBanner_Tilemap, 0, 0);
     LoadContestResultsTitleBarTilemaps();
-    LoadCompressedPalette(gContestResults_Pal, 0, 0x200);
-    LoadPalette(sResultsTextWindow_Pal, 0xF0, sizeof(sResultsTextWindow_Pal));
+    LoadCompressedPalette(gContestResults_Pal, BG_PLTT_ID(0), 16 * PLTT_SIZE_4BPP);
+    LoadPalette(sResultsTextWindow_Pal, BG_PLTT_ID(15), sizeof(sResultsTextWindow_Pal));
 
     for (i = 0; i < CONTESTANT_COUNT; i++)
     {
@@ -1093,9 +1093,9 @@ static void Task_FlashStarsAndHearts(u8 taskId)
         else if (gTasks[taskId].tCoeff == 0)
             gTasks[taskId].tDecreasing = FALSE;
 
-        BlendPalette(0x6B, 1, gTasks[taskId].tCoeff, RGB(30, 22, 11));
-        BlendPalette(0x68, 1, gTasks[taskId].tCoeff, RGB_WHITE);
-        BlendPalette(0x6E, 1, gTasks[taskId].tCoeff, RGB(30, 29, 29));
+        BlendPalette(BG_PLTT_ID(6) + 11, 1, gTasks[taskId].tCoeff, RGB(30, 22, 11));
+        BlendPalette(BG_PLTT_ID(6) + 8, 1, gTasks[taskId].tCoeff, RGB_WHITE);
+        BlendPalette(BG_PLTT_ID(6) + 14, 1, gTasks[taskId].tCoeff, RGB(30, 29, 29));
     }
 
     if (gTasks[taskId].tCoeff == 0)
@@ -1144,7 +1144,7 @@ static void LoadAllContestMonIconPalettes(void)
     for (i = 0; i < CONTESTANT_COUNT; i++)
     {
         species = gContestMons[i].species;
-        LoadPalette(gMonIconPalettes[gMonIconPaletteIndices[GetIconSpecies(species, 0)]], i * 0x10 + 0xA0, 0x20);
+        LoadPalette(gMonIconPalettes[gMonIconPaletteIndices[GetIconSpecies(species, 0)]], BG_PLTT_ID(10 + i), PLTT_SIZE_4BPP);
     }
 }
 
@@ -1562,7 +1562,7 @@ static void Task_HighlightWinnersBox(u8 taskId)
     if (++gTasks[taskId].data[11] == 1)
     {
         gTasks[taskId].data[11] = 0;
-        BlendPalette(0x91, 1, gTasks[taskId].data[12], RGB(13, 28, 27));
+        BlendPalette(BG_PLTT_ID(9) + 1, 1, gTasks[taskId].data[12], RGB(13, 28, 27));
         if (gTasks[taskId].data[13] == 0)
         {
             if (++gTasks[taskId].data[12] == 16)
@@ -2526,16 +2526,16 @@ void LoadLinkContestPlayerPalettes(void)
             if (version == VERSION_RUBY || version == VERSION_SAPPHIRE)
             {
                 if (gLinkPlayers[i].gender == MALE)
-                    LoadPalette(gObjectEventPal_RubySapphireBrendan, 0x160 + i * 0x10, 0x20);
+                    LoadPalette(gObjectEventPal_RubySapphireBrendan, OBJ_PLTT_ID(6 + i), PLTT_SIZE_4BPP);
                 else
-                    LoadPalette(gObjectEventPal_RubySapphireMay, 0x160 + i * 0x10, 0x20);
+                    LoadPalette(gObjectEventPal_RubySapphireMay, OBJ_PLTT_ID(6 + i), PLTT_SIZE_4BPP);
             }
             else
             {
                 if (gLinkPlayers[i].gender == MALE)
-                    LoadPalette(gObjectEventPal_Brendan, 0x160 + i * 0x10, 0x20);
+                    LoadPalette(gObjectEventPal_Brendan, OBJ_PLTT_ID(6 + i), PLTT_SIZE_4BPP);
                 else
-                    LoadPalette(gObjectEventPal_May, 0x160 + i * 0x10, 0x20);
+                    LoadPalette(gObjectEventPal_May, OBJ_PLTT_ID(6 + i), PLTT_SIZE_4BPP);
             }
         }
     }

src/credits.c

@@ -365,7 +365,7 @@ static void InitCreditsBgsAndWindows(void)
     ResetBgsAndClearDma3BusyFlags(0);
     InitBgsFromTemplates(0, sBackgroundTemplates, ARRAY_COUNT(sBackgroundTemplates));
     SetBgTilemapBuffer(0, AllocZeroed(BG_SCREEN_SIZE));
-    LoadPalette(sCredits_Pal, 0x80, 64);
+    LoadPalette(sCredits_Pal, BG_PLTT_ID(8), 2 * PLTT_SIZE_4BPP);
     InitWindows(sWindowTemplates);
     DeactivateAllTextPrinters();
     PutWindowTilemap(0);
@@ -547,9 +547,9 @@ static void Task_LoadShowMons(u8 taskId)
         ResetAllPicSprites();
         FreeAllSpritePalettes();
         gReservedSpritePaletteCount = 8;
-        LZ77UnCompVram(gBirchHelpGfx, (void *)VRAM);
+        LZ77UnCompVram(gBirchBagGrass_Gfx, (void *)VRAM);
         LZ77UnCompVram(gBirchGrassTilemap, (void *)(BG_SCREEN_ADDR(7)));
-        LoadPalette(gBirchBagGrassPal[0] + 1, 1, 31 * 2);
+        LoadPalette(gBirchBagGrass_Pal + 1, BG_PLTT_ID(0) + 1, PLTT_SIZEOF(2 * 16 - 1));
 
         for (i = 0; i < MON_PIC_SIZE; i++)
             gDecompressionBuffer[i] = 0x11;
@@ -624,7 +624,7 @@ static void Task_CreditsTheEnd3(u8 taskId)
 {
     ResetGpuAndVram();
     ResetPaletteFade();
-    LoadTheEndScreen(0, 0x3800, 0);
+    LoadTheEndScreen(0, 0x3800, BG_PLTT_ID(0));
     ResetSpriteData();
     FreeAllSpritePalettes();
     BeginNormalPaletteFade(PALETTES_ALL, 8, 16, 0, RGB_BLACK);

src/data/easy_chat/easy_chat_group_actions.h

@@ -78,391 +78,469 @@ const u8 gEasyChatWord_Faint[] = _("FAINT");
 const u8 gEasyChatWord_Fainted[] = _("FAINTED");
 
 const struct EasyChatWordInfo gEasyChatGroup_Actions[] = {
+    [EC_INDEX(EC_WORD_MEETS)] =
     {
         .text = gEasyChatWord_Meets,
         .alphabeticalOrder = 72,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CONCEDE)] =
     {
         .text = gEasyChatWord_Concede,
         .alphabeticalOrder = 14,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GIVE)] =
     {
         .text = gEasyChatWord_Give,
         .alphabeticalOrder = 48,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GIVES)] =
     {
         .text = gEasyChatWord_Gives,
         .alphabeticalOrder = 75,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PLAYED)] =
     {
         .text = gEasyChatWord_Played,
         .alphabeticalOrder = 39,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PLAYS)] =
     {
         .text = gEasyChatWord_Plays,
         .alphabeticalOrder = 36,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_COLLECT)] =
     {
         .text = gEasyChatWord_Collect,
         .alphabeticalOrder = 28,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WALKING)] =
     {
         .text = gEasyChatWord_Walking,
         .alphabeticalOrder = 46,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WALKS)] =
     {
         .text = gEasyChatWord_Walks,
         .alphabeticalOrder = 31,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SAYS)] =
     {
         .text = gEasyChatWord_Says,
         .alphabeticalOrder = 19,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WENT)] =
     {
         .text = gEasyChatWord_Went,
         .alphabeticalOrder = 26,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SAID)] =
     {
         .text = gEasyChatWord_Said,
         .alphabeticalOrder = 6,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WAKE_UP)] =
     {
         .text = gEasyChatWord_WakeUp,
         .alphabeticalOrder = 27,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WAKES_UP)] =
     {
         .text = gEasyChatWord_WakesUp,
         .alphabeticalOrder = 1,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ANGERS)] =
     {
         .text = gEasyChatWord_Angers,
         .alphabeticalOrder = 45,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TEACH)] =
     {
         .text = gEasyChatWord_Teach,
         .alphabeticalOrder = 47,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TEACHES)] =
     {
         .text = gEasyChatWord_Teaches,
         .alphabeticalOrder = 54,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PLEASE)] =
     {
         .text = gEasyChatWord_Please,
         .alphabeticalOrder = 41,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LEARN)] =
     {
         .text = gEasyChatWord_Learn,
         .alphabeticalOrder = 76,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CHANGE)] =
     {
         .text = gEasyChatWord_Change,
         .alphabeticalOrder = 77,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_STORY)] =
     {
         .text = gEasyChatWord_Story,
         .alphabeticalOrder = 73,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TRUST)] =
     {
         .text = gEasyChatWord_Trust,
         .alphabeticalOrder = 74,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LAVISH)] =
     {
         .text = gEasyChatWord_Lavish,
         .alphabeticalOrder = 2,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LISTENS)] =
     {
         .text = gEasyChatWord_Listens,
         .alphabeticalOrder = 3,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HEARING)] =
     {
         .text = gEasyChatWord_Hearing,
         .alphabeticalOrder = 24,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TRAINS)] =
     {
         .text = gEasyChatWord_Trains,
         .alphabeticalOrder = 37,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CHOOSE)] =
     {
         .text = gEasyChatWord_Choose,
         .alphabeticalOrder = 32,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_COME)] =
     {
         .text = gEasyChatWord_Come,
         .alphabeticalOrder = 33,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CAME)] =
     {
         .text = gEasyChatWord_Came,
         .alphabeticalOrder = 22,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SEARCH)] =
     {
         .text = gEasyChatWord_Search,
         .alphabeticalOrder = 18,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MAKE)] =
     {
         .text = gEasyChatWord_Make,
         .alphabeticalOrder = 23,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CAUSE)] =
     {
         .text = gEasyChatWord_Cause,
         .alphabeticalOrder = 67,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_KNOW)] =
     {
         .text = gEasyChatWord_Know,
         .alphabeticalOrder = 30,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_KNOWS)] =
     {
         .text = gEasyChatWord_Knows,
         .alphabeticalOrder = 0,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_REFUSE)] =
     {
         .text = gEasyChatWord_Refuse,
         .alphabeticalOrder = 65,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_STORES)] =
     {
         .text = gEasyChatWord_Stores,
         .alphabeticalOrder = 70,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BRAG)] =
     {
         .text = gEasyChatWord_Brag,
         .alphabeticalOrder = 4,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_IGNORANT)] =
     {
         .text = gEasyChatWord_Ignorant,
         .alphabeticalOrder = 5,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THINKS)] =
     {
         .text = gEasyChatWord_Thinks,
         .alphabeticalOrder = 17,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BELIEVE)] =
     {
         .text = gEasyChatWord_Believe,
         .alphabeticalOrder = 64,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SLIDE)] =
     {
         .text = gEasyChatWord_Slide,
         .alphabeticalOrder = 63,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EATS)] =
     {
         .text = gEasyChatWord_Eats,
         .alphabeticalOrder = 34,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_USE)] =
     {
         .text = gEasyChatWord_Use,
         .alphabeticalOrder = 53,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_USES)] =
     {
         .text = gEasyChatWord_Uses,
         .alphabeticalOrder = 56,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_USING)] =
     {
         .text = gEasyChatWord_Using,
         .alphabeticalOrder = 55,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_COULDN_T)] =
     {
         .text = gEasyChatWord_Couldnt,
         .alphabeticalOrder = 11,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CAPABLE)] =
     {
         .text = gEasyChatWord_Capable,
         .alphabeticalOrder = 9,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DISAPPEAR)] =
     {
         .text = gEasyChatWord_Disappear,
         .alphabeticalOrder = 29,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_APPEAR)] =
     {
         .text = gEasyChatWord_Appear,
         .alphabeticalOrder = 69,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THROW)] =
     {
         .text = gEasyChatWord_Throw,
         .alphabeticalOrder = 68,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WORRY)] =
     {
         .text = gEasyChatWord_Worry,
         .alphabeticalOrder = 66,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SLEPT)] =
     {
         .text = gEasyChatWord_Slept,
         .alphabeticalOrder = 61,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SLEEP)] =
     {
         .text = gEasyChatWord_Sleep,
         .alphabeticalOrder = 52,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_RELEASE)] =
     {
         .text = gEasyChatWord_Release,
         .alphabeticalOrder = 51,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DRINKS)] =
     {
         .text = gEasyChatWord_Drinks,
         .alphabeticalOrder = 40,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_RUNS)] =
     {
         .text = gEasyChatWord_Runs,
         .alphabeticalOrder = 62,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_RUN)] =
     {
         .text = gEasyChatWord_Run,
         .alphabeticalOrder = 35,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WORKS)] =
     {
         .text = gEasyChatWord_Works,
         .alphabeticalOrder = 20,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WORKING)] =
     {
         .text = gEasyChatWord_Working,
         .alphabeticalOrder = 71,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TALKING)] =
     {
         .text = gEasyChatWord_Talking,
         .alphabeticalOrder = 60,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TALK)] =
     {
         .text = gEasyChatWord_Talk,
         .alphabeticalOrder = 59,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SINK)] =
     {
         .text = gEasyChatWord_Sink,
         .alphabeticalOrder = 15,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SMACK)] =
     {
         .text = gEasyChatWord_Smack,
         .alphabeticalOrder = 16,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PRETEND)] =
     {
         .text = gEasyChatWord_Pretend,
         .alphabeticalOrder = 38,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PRAISE)] =
     {
         .text = gEasyChatWord_Praise,
         .alphabeticalOrder = 49,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OVERDO)] =
     {
         .text = gEasyChatWord_Overdo,
         .alphabeticalOrder = 25,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SHOW)] =
     {
         .text = gEasyChatWord_Show,
         .alphabeticalOrder = 21,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LOOKS)] =
     {
         .text = gEasyChatWord_Looks,
         .alphabeticalOrder = 42,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SEES)] =
     {
         .text = gEasyChatWord_Sees,
         .alphabeticalOrder = 43,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SEEK)] =
     {
         .text = gEasyChatWord_Seek,
         .alphabeticalOrder = 44,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OWN)] =
     {
         .text = gEasyChatWord_Own,
         .alphabeticalOrder = 12,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TAKE)] =
     {
         .text = gEasyChatWord_Take,
         .alphabeticalOrder = 13,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ALLOW)] =
     {
         .text = gEasyChatWord_Allow,
         .alphabeticalOrder = 7,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FORGET)] =
     {
         .text = gEasyChatWord_Forget,
         .alphabeticalOrder = 8,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FORGETS)] =
     {
         .text = gEasyChatWord_Forgets,
         .alphabeticalOrder = 10,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_APPEARS)] =
     {
         .text = gEasyChatWord_Appears,
         .alphabeticalOrder = 58,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FAINT)] =
     {
         .text = gEasyChatWord_Faint,
         .alphabeticalOrder = 57,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FAINTED)] =
     {
         .text = gEasyChatWord_Fainted,
         .alphabeticalOrder = 50,

src/data/easy_chat/easy_chat_group_adjectives.h

@@ -36,181 +36,217 @@ const u8 gEasyChatWord_Happily[] = _("HAPPILY");
 const u8 gEasyChatWord_Anticipation[] = _("ANTICIPATION");
 
 const struct EasyChatWordInfo gEasyChatGroup_Adjectives[] = {
+    [EC_INDEX(EC_WORD_WANDERING)] =
     {
         .text = gEasyChatWord_Wandering,
         .alphabeticalOrder = 35,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_RICKETY)] =
     {
         .text = gEasyChatWord_Rickety,
         .alphabeticalOrder = 23,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ROCK_SOLID)] =
     {
         .text = gEasyChatWord_RockSolid,
         .alphabeticalOrder = 20,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HUNGRY)] =
     {
         .text = gEasyChatWord_Hungry,
         .alphabeticalOrder = 31,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TIGHT)] =
     {
         .text = gEasyChatWord_Tight,
         .alphabeticalOrder = 14,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TICKLISH)] =
     {
         .text = gEasyChatWord_Ticklish,
         .alphabeticalOrder = 15,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TWIRLING)] =
     {
         .text = gEasyChatWord_Twirling,
         .alphabeticalOrder = 32,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SPIRALING)] =
     {
         .text = gEasyChatWord_Spiraling,
         .alphabeticalOrder = 34,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THIRSTY)] =
     {
         .text = gEasyChatWord_Thirsty,
         .alphabeticalOrder = 12,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LOLLING)] =
     {
         .text = gEasyChatWord_Lolling,
         .alphabeticalOrder = 3,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SILKY)] =
     {
         .text = gEasyChatWord_Silky,
         .alphabeticalOrder = 29,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SADLY)] =
     {
         .text = gEasyChatWord_Sadly,
         .alphabeticalOrder = 9,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HOPELESS)] =
     {
         .text = gEasyChatWord_Hopeless,
         .alphabeticalOrder = 33,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_USELESS)] =
     {
         .text = gEasyChatWord_Useless,
         .alphabeticalOrder = 1,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DROOLING)] =
     {
         .text = gEasyChatWord_Drooling,
         .alphabeticalOrder = 27,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EXCITING)] =
     {
         .text = gEasyChatWord_Exciting,
         .alphabeticalOrder = 2,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THICK)] =
     {
         .text = gEasyChatWord_Thick,
         .alphabeticalOrder = 11,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SMOOTH)] =
     {
         .text = gEasyChatWord_Smooth,
         .alphabeticalOrder = 22,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SLIMY)] =
     {
         .text = gEasyChatWord_Slimy,
         .alphabeticalOrder = 26,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THIN)] =
     {
         .text = gEasyChatWord_Thin,
         .alphabeticalOrder = 28,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BREAK)] =
     {
         .text = gEasyChatWord_Break,
         .alphabeticalOrder = 10,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_VORACIOUS)] =
     {
         .text = gEasyChatWord_Voracious,
         .alphabeticalOrder = 18,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SCATTER)] =
     {
         .text = gEasyChatWord_Scatter,
         .alphabeticalOrder = 17,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_AWESOME)] =
     {
         .text = gEasyChatWord_Awesome,
         .alphabeticalOrder = 7,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WIMPY)] =
     {
         .text = gEasyChatWord_Wimpy,
         .alphabeticalOrder = 16,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WOBBLY)] =
     {
         .text = gEasyChatWord_Wobbly,
         .alphabeticalOrder = 19,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SHAKY)] =
     {
         .text = gEasyChatWord_Shaky,
         .alphabeticalOrder = 8,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_RIPPED)] =
     {
         .text = gEasyChatWord_Ripped,
         .alphabeticalOrder = 5,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SHREDDED)] =
     {
         .text = gEasyChatWord_Shredded,
         .alphabeticalOrder = 4,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_INCREASING)] =
     {
         .text = gEasyChatWord_Increasing,
         .alphabeticalOrder = 6,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_YET)] =
     {
         .text = gEasyChatWord_Yet,
         .alphabeticalOrder = 13,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DESTROYED)] =
     {
         .text = gEasyChatWord_Destroyed,
         .alphabeticalOrder = 21,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FIERY)] =
     {
         .text = gEasyChatWord_Fiery,
         .alphabeticalOrder = 0,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LOVEY_DOVEY)] =
     {
         .text = gEasyChatWord_LoveyDovey,
         .alphabeticalOrder = 24,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HAPPILY)] =
     {
         .text = gEasyChatWord_Happily,
         .alphabeticalOrder = 25,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ANTICIPATION)] =
     {
         .text = gEasyChatWord_Anticipation,
         .alphabeticalOrder = 30,

src/data/easy_chat/easy_chat_group_battle.h

@@ -63,316 +63,379 @@ const u8 gEasyChatWord_Rule[] = _("RULE");
 const u8 gEasyChatWord_Move[] = _("MOVE");
 
 const struct EasyChatWordInfo gEasyChatGroup_Battle[] = {
+    [EC_INDEX(EC_WORD_MATCH_UP)] =
     {
         .text = gEasyChatWord_MatchUp,
         .alphabeticalOrder = 53,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GO)] =
     {
         .text = gEasyChatWord_Go,
         .alphabeticalOrder = 39,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NO_1)] =
     {
         .text = gEasyChatWord_No1,
         .alphabeticalOrder = 18,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DECIDE)] =
     {
         .text = gEasyChatWord_Decide,
         .alphabeticalOrder = 40,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LET_ME_WIN)] =
     {
         .text = gEasyChatWord_LetMeWin,
         .alphabeticalOrder = 11,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WINS)] =
     {
         .text = gEasyChatWord_Wins,
         .alphabeticalOrder = 10,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WIN)] =
     {
         .text = gEasyChatWord_Win,
         .alphabeticalOrder = 31,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WON)] =
     {
         .text = gEasyChatWord_Won,
         .alphabeticalOrder = 17,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_IF_I_WIN)] =
     {
         .text = gEasyChatWord_IfIWin,
         .alphabeticalOrder = 3,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WHEN_I_WIN)] =
     {
         .text = gEasyChatWord_WhenIWin,
         .alphabeticalOrder = 14,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CAN_T_WIN)] =
     {
         .text = gEasyChatWord_CantWin,
         .alphabeticalOrder = 56,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CAN_WIN)] =
     {
         .text = gEasyChatWord_CanWin,
         .alphabeticalOrder = 38,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NO_MATCH)] =
     {
         .text = gEasyChatWord_NoMatch,
         .alphabeticalOrder = 41,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SPIRIT)] =
     {
         .text = gEasyChatWord_Spirit,
         .alphabeticalOrder = 29,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DECIDED)] =
     {
         .text = gEasyChatWord_Decided,
         .alphabeticalOrder = 35,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TRUMP_CARD)] =
     {
         .text = gEasyChatWord_TrumpCard,
         .alphabeticalOrder = 36,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TAKE_THAT)] =
     {
         .text = gEasyChatWord_TakeThat,
         .alphabeticalOrder = 45,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_COME_ON)] =
     {
         .text = gEasyChatWord_ComeOn,
         .alphabeticalOrder = 1,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ATTACK)] =
     {
         .text = gEasyChatWord_Attack,
         .alphabeticalOrder = 34,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SURRENDER)] =
     {
         .text = gEasyChatWord_Surrender,
         .alphabeticalOrder = 50,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GUTSY)] =
     {
         .text = gEasyChatWord_Gutsy,
         .alphabeticalOrder = 20,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TALENT)] =
     {
         .text = gEasyChatWord_Talent,
         .alphabeticalOrder = 47,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_STRATEGY)] =
     {
         .text = gEasyChatWord_Strategy,
         .alphabeticalOrder = 8,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SMITE)] =
     {
         .text = gEasyChatWord_Smite,
         .alphabeticalOrder = 54,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MATCH)] =
     {
         .text = gEasyChatWord_Match,
         .alphabeticalOrder = 60,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_VICTORY)] =
     {
         .text = gEasyChatWord_Victory,
         .alphabeticalOrder = 37,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OFFENSIVE)] =
     {
         .text = gEasyChatWord_Offensive,
         .alphabeticalOrder = 4,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SENSE)] =
     {
         .text = gEasyChatWord_Sense,
         .alphabeticalOrder = 49,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_VERSUS)] =
     {
         .text = gEasyChatWord_Versus,
         .alphabeticalOrder = 46,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FIGHTS)] =
     {
         .text = gEasyChatWord_Fights,
         .alphabeticalOrder = 48,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_POWER)] =
     {
         .text = gEasyChatWord_Power,
         .alphabeticalOrder = 24,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CHALLENGE)] =
     {
         .text = gEasyChatWord_Challenge,
         .alphabeticalOrder = 0,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_STRONG)] =
     {
         .text = gEasyChatWord_Strong,
         .alphabeticalOrder = 62,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TOO_STRONG)] =
     {
         .text = gEasyChatWord_TooStrong,
         .alphabeticalOrder = 12,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GO_EASY)] =
     {
         .text = gEasyChatWord_GoEasy,
         .alphabeticalOrder = 2,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FOE)] =
     {
         .text = gEasyChatWord_Foe,
         .alphabeticalOrder = 26,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GENIUS)] =
     {
         .text = gEasyChatWord_Genius,
         .alphabeticalOrder = 51,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LEGEND)] =
     {
         .text = gEasyChatWord_Legend,
         .alphabeticalOrder = 43,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ESCAPE)] =
     {
         .text = gEasyChatWord_Escape,
         .alphabeticalOrder = 30,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_AIM)] =
     {
         .text = gEasyChatWord_Aim,
         .alphabeticalOrder = 59,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BATTLE)] =
     {
         .text = gEasyChatWord_Battle,
         .alphabeticalOrder = 55,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FIGHT)] =
     {
         .text = gEasyChatWord_Fight,
         .alphabeticalOrder = 52,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_RESUSCITATE)] =
     {
         .text = gEasyChatWord_Resuscitate,
         .alphabeticalOrder = 42,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_POINTS)] =
     {
         .text = gEasyChatWord_Points,
         .alphabeticalOrder = 61,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SERIOUS)] =
     {
         .text = gEasyChatWord_Serious,
         .alphabeticalOrder = 27,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GIVE_UP)] =
     {
         .text = gEasyChatWord_GiveUp,
         .alphabeticalOrder = 44,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LOSS)] =
     {
         .text = gEasyChatWord_Loss,
         .alphabeticalOrder = 23,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_IF_I_LOSE)] =
     {
         .text = gEasyChatWord_IfILose,
         .alphabeticalOrder = 13,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LOST)] =
     {
         .text = gEasyChatWord_Lost,
         .alphabeticalOrder = 22,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LOSE)] =
     {
         .text = gEasyChatWord_Lose,
         .alphabeticalOrder = 32,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GUARD)] =
     {
         .text = gEasyChatWord_Guard,
         .alphabeticalOrder = 19,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PARTNER)] =
     {
         .text = gEasyChatWord_Partner,
         .alphabeticalOrder = 16,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_REJECT)] =
     {
         .text = gEasyChatWord_Reject,
         .alphabeticalOrder = 21,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ACCEPT)] =
     {
         .text = gEasyChatWord_Accept,
         .alphabeticalOrder = 33,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_INVINCIBLE)] =
     {
         .text = gEasyChatWord_Invincible,
         .alphabeticalOrder = 58,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_RECEIVED)] =
     {
         .text = gEasyChatWord_Received,
         .alphabeticalOrder = 15,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EASY)] =
     {
         .text = gEasyChatWord_Easy,
         .alphabeticalOrder = 28,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WEAK)] =
     {
         .text = gEasyChatWord_Weak,
         .alphabeticalOrder = 25,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TOO_WEAK)] =
     {
         .text = gEasyChatWord_TooWeak,
         .alphabeticalOrder = 57,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PUSHOVER)] =
     {
         .text = gEasyChatWord_Pushover,
         .alphabeticalOrder = 9,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LEADER)] =
     {
         .text = gEasyChatWord_Leader,
         .alphabeticalOrder = 6,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_RULE)] =
     {
         .text = gEasyChatWord_Rule,
         .alphabeticalOrder = 5,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MOVE)] =
     {
         .text = gEasyChatWord_Move,
         .alphabeticalOrder = 7,

src/data/easy_chat/easy_chat_group_conditions.h

@@ -69,346 +69,415 @@ const u8 gEasyChatWord_Seems[] = _("SEEMS");
 const u8 gEasyChatWord_Badly[] = _("BADLY");
 
 const struct EasyChatWordInfo gEasyChatGroup_Conditions[] = {
+    [EC_INDEX(EC_WORD_HOT)] =
     {
         .text = gEasyChatWord_Hot,
         .alphabeticalOrder = 13,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EXISTS)] =
     {
         .text = gEasyChatWord_Exists,
         .alphabeticalOrder = 55,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EXCESS)] =
     {
         .text = gEasyChatWord_Excess,
         .alphabeticalOrder = 23,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_APPROVED)] =
     {
         .text = gEasyChatWord_Approved,
         .alphabeticalOrder = 3,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HAS)] =
     {
         .text = gEasyChatWord_Has,
         .alphabeticalOrder = 54,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GOOD)] =
     {
         .text = gEasyChatWord_Good,
         .alphabeticalOrder = 68,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LESS)] =
     {
         .text = gEasyChatWord_Less,
         .alphabeticalOrder = 50,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MOMENTUM)] =
     {
         .text = gEasyChatWord_Momentum,
         .alphabeticalOrder = 14,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GOING)] =
     {
         .text = gEasyChatWord_Going,
         .alphabeticalOrder = 60,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WEIRD)] =
     {
         .text = gEasyChatWord_Weird,
         .alphabeticalOrder = 19,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BUSY)] =
     {
         .text = gEasyChatWord_Busy,
         .alphabeticalOrder = 56,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TOGETHER)] =
     {
         .text = gEasyChatWord_Together,
         .alphabeticalOrder = 10,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FULL)] =
     {
         .text = gEasyChatWord_Full,
         .alphabeticalOrder = 21,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ABSENT)] =
     {
         .text = gEasyChatWord_Absent,
         .alphabeticalOrder = 30,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BEING)] =
     {
         .text = gEasyChatWord_Being,
         .alphabeticalOrder = 38,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NEED)] =
     {
         .text = gEasyChatWord_Need,
         .alphabeticalOrder = 41,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TASTY)] =
     {
         .text = gEasyChatWord_Tasty,
         .alphabeticalOrder = 22,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SKILLED)] =
     {
         .text = gEasyChatWord_Skilled,
         .alphabeticalOrder = 36,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NOISY)] =
     {
         .text = gEasyChatWord_Noisy,
         .alphabeticalOrder = 24,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BIG)] =
     {
         .text = gEasyChatWord_Big,
         .alphabeticalOrder = 28,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LATE)] =
     {
         .text = gEasyChatWord_Late,
         .alphabeticalOrder = 2,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CLOSE)] =
     {
         .text = gEasyChatWord_Close,
         .alphabeticalOrder = 1,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DOCILE)] =
     {
         .text = gEasyChatWord_Docile,
         .alphabeticalOrder = 37,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_AMUSING)] =
     {
         .text = gEasyChatWord_Amusing,
         .alphabeticalOrder = 35,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ENTERTAINING)] =
     {
         .text = gEasyChatWord_Entertaining,
         .alphabeticalOrder = 52,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PERFECTION)] =
     {
         .text = gEasyChatWord_Perfection,
         .alphabeticalOrder = 12,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PRETTY)] =
     {
         .text = gEasyChatWord_Pretty,
         .alphabeticalOrder = 8,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HEALTHY)] =
     {
         .text = gEasyChatWord_Healthy,
         .alphabeticalOrder = 5,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EXCELLENT)] =
     {
         .text = gEasyChatWord_Excellent,
         .alphabeticalOrder = 4,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_UPSIDE_DOWN)] =
     {
         .text = gEasyChatWord_UpsideDown,
         .alphabeticalOrder = 27,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_COLD)] =
     {
         .text = gEasyChatWord_Cold,
         .alphabeticalOrder = 0,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_REFRESHING)] =
     {
         .text = gEasyChatWord_Refreshing,
         .alphabeticalOrder = 39,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_UNAVOIDABLE)] =
     {
         .text = gEasyChatWord_Unavoidable,
         .alphabeticalOrder = 63,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MUCH)] =
     {
         .text = gEasyChatWord_Much,
         .alphabeticalOrder = 59,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OVERWHELMING)] =
     {
         .text = gEasyChatWord_Overwhelming,
         .alphabeticalOrder = 20,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FABULOUS)] =
     {
         .text = gEasyChatWord_Fabulous,
         .alphabeticalOrder = 6,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ELSE)] =
     {
         .text = gEasyChatWord_Else,
         .alphabeticalOrder = 61,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EXPENSIVE)] =
     {
         .text = gEasyChatWord_Expensive,
         .alphabeticalOrder = 53,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CORRECT)] =
     {
         .text = gEasyChatWord_Correct,
         .alphabeticalOrder = 51,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_IMPOSSIBLE)] =
     {
         .text = gEasyChatWord_Impossible,
         .alphabeticalOrder = 62,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SMALL)] =
     {
         .text = gEasyChatWord_Small,
         .alphabeticalOrder = 7,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DIFFERENT)] =
     {
         .text = gEasyChatWord_Different,
         .alphabeticalOrder = 33,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TIRED)] =
     {
         .text = gEasyChatWord_Tired,
         .alphabeticalOrder = 58,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SKILL)] =
     {
         .text = gEasyChatWord_Skill,
         .alphabeticalOrder = 49,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TOP)] =
     {
         .text = gEasyChatWord_Top,
         .alphabeticalOrder = 15,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NON_STOP)] =
     {
         .text = gEasyChatWord_NonStop,
         .alphabeticalOrder = 18,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PREPOSTEROUS)] =
     {
         .text = gEasyChatWord_Preposterous,
         .alphabeticalOrder = 45,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NONE)] =
     {
         .text = gEasyChatWord_None,
         .alphabeticalOrder = 47,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NOTHING)] =
     {
         .text = gEasyChatWord_Nothing,
         .alphabeticalOrder = 48,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NATURAL)] =
     {
         .text = gEasyChatWord_Natural,
         .alphabeticalOrder = 34,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BECOMES)] =
     {
         .text = gEasyChatWord_Becomes,
         .alphabeticalOrder = 25,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LUKEWARM)] =
     {
         .text = gEasyChatWord_Lukewarm,
         .alphabeticalOrder = 46,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FAST)] =
     {
         .text = gEasyChatWord_Fast,
         .alphabeticalOrder = 26,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LOW)] =
     {
         .text = gEasyChatWord_Low,
         .alphabeticalOrder = 31,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_AWFUL)] =
     {
         .text = gEasyChatWord_Awful,
         .alphabeticalOrder = 57,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ALONE)] =
     {
         .text = gEasyChatWord_Alone,
         .alphabeticalOrder = 67,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BORED)] =
     {
         .text = gEasyChatWord_Bored,
         .alphabeticalOrder = 66,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SECRET)] =
     {
         .text = gEasyChatWord_Secret,
         .alphabeticalOrder = 43,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MYSTERY)] =
     {
         .text = gEasyChatWord_Mystery,
         .alphabeticalOrder = 17,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LACKS)] =
     {
         .text = gEasyChatWord_Lacks,
         .alphabeticalOrder = 40,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BEST)] =
     {
         .text = gEasyChatWord_Best,
         .alphabeticalOrder = 16,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LOUSY)] =
     {
         .text = gEasyChatWord_Lousy,
         .alphabeticalOrder = 42,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MISTAKE)] =
     {
         .text = gEasyChatWord_Mistake,
         .alphabeticalOrder = 11,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_KIND)] =
     {
         .text = gEasyChatWord_Kind,
         .alphabeticalOrder = 44,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WELL)] =
     {
         .text = gEasyChatWord_Well,
         .alphabeticalOrder = 32,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WEAKENED)] =
     {
         .text = gEasyChatWord_Weakened,
         .alphabeticalOrder = 29,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SIMPLE)] =
     {
         .text = gEasyChatWord_Simple,
         .alphabeticalOrder = 65,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SEEMS)] =
     {
         .text = gEasyChatWord_Seems,
         .alphabeticalOrder = 9,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BADLY)] =
     {
         .text = gEasyChatWord_Badly,
         .alphabeticalOrder = 64,

src/data/easy_chat/easy_chat_group_endings.h

@@ -69,346 +69,415 @@ const u8 gEasyChatWord_Once[] = _("ONCE");
 const u8 gEasyChatWord_Anywhere[] = _("ANYWHERE");
 
 const struct EasyChatWordInfo gEasyChatGroup_Endings[] = {
+    [EC_INDEX(EC_WORD_WILL)] =
     {
         .text = gEasyChatWord_Will,
         .alphabeticalOrder = 32,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WILL_BE_HERE)] =
     {
         .text = gEasyChatWord_WillBeHere,
         .alphabeticalOrder = 39,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OR)] =
     {
         .text = gEasyChatWord_Or,
         .alphabeticalOrder = 63,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TIMES)] =
     {
         .text = gEasyChatWord_Times,
         .alphabeticalOrder = 42,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WONDER)] =
     {
         .text = gEasyChatWord_Wonder,
         .alphabeticalOrder = 33,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_IS_IT_QUES)] =
     {
         .text = gEasyChatWord_IsItQues,
         .alphabeticalOrder = 68,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BE)] =
     {
         .text = gEasyChatWord_Be,
         .alphabeticalOrder = 15,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GIMME)] =
     {
         .text = gEasyChatWord_Gimme,
         .alphabeticalOrder = 46,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_COULD)] =
     {
         .text = gEasyChatWord_Could,
         .alphabeticalOrder = 54,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LIKELY_TO)] =
     {
         .text = gEasyChatWord_LikelyTo,
         .alphabeticalOrder = 6,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WOULD)] =
     {
         .text = gEasyChatWord_Would,
         .alphabeticalOrder = 64,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_IS)] =
     {
         .text = gEasyChatWord_Is,
         .alphabeticalOrder = 53,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ISN_T_IT_QUES)] =
     {
         .text = gEasyChatWord_IsntItQues,
         .alphabeticalOrder = 49,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LET_S)] =
     {
         .text = gEasyChatWord_Lets,
         .alphabeticalOrder = 22,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OTHER)] =
     {
         .text = gEasyChatWord_Other,
         .alphabeticalOrder = 21,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ARE)] =
     {
         .text = gEasyChatWord_Are,
         .alphabeticalOrder = 8,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WAS)] =
     {
         .text = gEasyChatWord_Was,
         .alphabeticalOrder = 59,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WERE)] =
     {
         .text = gEasyChatWord_Were,
         .alphabeticalOrder = 60,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THOSE)] =
     {
         .text = gEasyChatWord_Those,
         .alphabeticalOrder = 24,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ISN_T)] =
     {
         .text = gEasyChatWord_Isnt,
         .alphabeticalOrder = 25,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WON_T)] =
     {
         .text = gEasyChatWord_Wont,
         .alphabeticalOrder = 61,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CAN_T)] =
     {
         .text = gEasyChatWord_Cant,
         .alphabeticalOrder = 23,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CAN)] =
     {
         .text = gEasyChatWord_Can,
         .alphabeticalOrder = 50,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DON_T)] =
     {
         .text = gEasyChatWord_Dont,
         .alphabeticalOrder = 43,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DO)] =
     {
         .text = gEasyChatWord_Do,
         .alphabeticalOrder = 7,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DOES)] =
     {
         .text = gEasyChatWord_Does,
         .alphabeticalOrder = 30,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WHOM)] =
     {
         .text = gEasyChatWord_Whom,
         .alphabeticalOrder = 31,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WHICH)] =
     {
         .text = gEasyChatWord_Which,
         .alphabeticalOrder = 55,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WASN_T)] =
     {
         .text = gEasyChatWord_Wasnt,
         .alphabeticalOrder = 11,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WEREN_T)] =
     {
         .text = gEasyChatWord_Werent,
         .alphabeticalOrder = 5,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HAVE)] =
     {
         .text = gEasyChatWord_Have,
         .alphabeticalOrder = 19,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HAVEN_T)] =
     {
         .text = gEasyChatWord_Havent,
         .alphabeticalOrder = 12,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_A)] =
     {
         .text = gEasyChatWord_A,
         .alphabeticalOrder = 41,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_AN)] =
     {
         .text = gEasyChatWord_An,
         .alphabeticalOrder = 13,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NOT)] =
     {
         .text = gEasyChatWord_Not,
         .alphabeticalOrder = 58,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THERE)] =
     {
         .text = gEasyChatWord_There,
         .alphabeticalOrder = 9,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OK_QUES)] =
     {
         .text = gEasyChatWord_OkQues,
         .alphabeticalOrder = 38,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SO)] =
     {
         .text = gEasyChatWord_So,
         .alphabeticalOrder = 34,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MAYBE)] =
     {
         .text = gEasyChatWord_Maybe,
         .alphabeticalOrder = 52,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ABOUT)] =
     {
         .text = gEasyChatWord_About,
         .alphabeticalOrder = 45,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OVER)] =
     {
         .text = gEasyChatWord_Over,
         .alphabeticalOrder = 36,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_IT)] =
     {
         .text = gEasyChatWord_It,
         .alphabeticalOrder = 44,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ALL)] =
     {
         .text = gEasyChatWord_All,
         .alphabeticalOrder = 67,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FOR)] =
     {
         .text = gEasyChatWord_For,
         .alphabeticalOrder = 2,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ON)] =
     {
         .text = gEasyChatWord_On,
         .alphabeticalOrder = 14,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OFF)] =
     {
         .text = gEasyChatWord_Off,
         .alphabeticalOrder = 56,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_AS)] =
     {
         .text = gEasyChatWord_As,
         .alphabeticalOrder = 40,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TO)] =
     {
         .text = gEasyChatWord_To,
         .alphabeticalOrder = 51,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WITH)] =
     {
         .text = gEasyChatWord_With,
         .alphabeticalOrder = 37,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BETTER)] =
     {
         .text = gEasyChatWord_Better,
         .alphabeticalOrder = 66,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EVER)] =
     {
         .text = gEasyChatWord_Ever,
         .alphabeticalOrder = 35,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SINCE)] =
     {
         .text = gEasyChatWord_Since,
         .alphabeticalOrder = 18,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OF)] =
     {
         .text = gEasyChatWord_Of,
         .alphabeticalOrder = 3,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BELONGS_TO)] =
     {
         .text = gEasyChatWord_BelongsTo,
         .alphabeticalOrder = 47,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_AT)] =
     {
         .text = gEasyChatWord_At,
         .alphabeticalOrder = 57,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_IN)] =
     {
         .text = gEasyChatWord_In,
         .alphabeticalOrder = 16,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OUT)] =
     {
         .text = gEasyChatWord_Out,
         .alphabeticalOrder = 28,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TOO)] =
     {
         .text = gEasyChatWord_Too,
         .alphabeticalOrder = 17,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LIKE)] =
     {
         .text = gEasyChatWord_Like,
         .alphabeticalOrder = 29,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DID)] =
     {
         .text = gEasyChatWord_Did,
         .alphabeticalOrder = 27,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DIDN_T)] =
     {
         .text = gEasyChatWord_Didnt,
         .alphabeticalOrder = 65,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DOESN_T)] =
     {
         .text = gEasyChatWord_Doesnt,
         .alphabeticalOrder = 26,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WITHOUT)] =
     {
         .text = gEasyChatWord_Without,
         .alphabeticalOrder = 0,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_AFTER)] =
     {
         .text = gEasyChatWord_After,
         .alphabeticalOrder = 1,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BEFORE)] =
     {
         .text = gEasyChatWord_Before,
         .alphabeticalOrder = 48,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WHILE)] =
     {
         .text = gEasyChatWord_While,
         .alphabeticalOrder = 62,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THAN)] =
     {
         .text = gEasyChatWord_Than,
         .alphabeticalOrder = 20,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ONCE)] =
     {
         .text = gEasyChatWord_Once,
         .alphabeticalOrder = 4,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ANYWHERE)] =
     {
         .text = gEasyChatWord_Anywhere,
         .alphabeticalOrder = 10,

src/data/easy_chat/easy_chat_group_events.h

@@ -29,146 +29,175 @@ const u8 gEasyChatWord_Wireless[] = _("WIRELESS");
 const u8 gEasyChatWord_Frontier[] = _("FRONTIER");
 
 const struct EasyChatWordInfo gEasyChatGroup_Events[] = {
+    [EC_INDEX(EC_WORD_APPEAL)] =
     {
         .text = gEasyChatWord_Appeal,
         .alphabeticalOrder = 0,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EVENTS)] =
     {
         .text = gEasyChatWord_Events,
         .alphabeticalOrder = 14,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_STAY_AT_HOME)] =
     {
         .text = gEasyChatWord_StayAtHome,
         .alphabeticalOrder = 12,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BERRY)] =
     {
         .text = gEasyChatWord_Berry,
         .alphabeticalOrder = 3,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CONTEST)] =
     {
         .text = gEasyChatWord_Contest,
         .alphabeticalOrder = 17,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MC)] =
     {
         .text = gEasyChatWord_Mc,
         .alphabeticalOrder = 4,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_JUDGE)] =
     {
         .text = gEasyChatWord_Judge,
         .alphabeticalOrder = 22,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SUPER)] =
     {
         .text = gEasyChatWord_Super,
         .alphabeticalOrder = 23,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_STAGE)] =
     {
         .text = gEasyChatWord_Stage,
         .alphabeticalOrder = 1,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HALL_OF_FAME)] =
     {
         .text = gEasyChatWord_HallOfFame,
         .alphabeticalOrder = 10,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EVOLUTION)] =
     {
         .text = gEasyChatWord_Evolution,
         .alphabeticalOrder = 28,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HYPER)] =
     {
         .text = gEasyChatWord_Hyper,
         .alphabeticalOrder = 9,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BATTLE_TOWER)] =
     {
         .text = gEasyChatWord_BattleTower,
         .alphabeticalOrder = 15,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LEADERS)] =
     {
         .text = gEasyChatWord_Leaders,
         .alphabeticalOrder = 11,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BATTLE_ROOM)] =
     {
         .text = gEasyChatWord_BattleRoom,
         .alphabeticalOrder = 6,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HIDDEN)] =
     {
         .text = gEasyChatWord_Hidden,
         .alphabeticalOrder = 13,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SECRET_BASE)] =
     {
         .text = gEasyChatWord_SecretBase,
         .alphabeticalOrder = 19,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BLEND)] =
     {
         .text = gEasyChatWord_Blend,
         .alphabeticalOrder = 5,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_POKEBLOCK)] =
     {
         .text = gEasyChatWord_POKEBLOCK,
         .alphabeticalOrder = 18,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MASTER)] =
     {
         .text = gEasyChatWord_Master,
         .alphabeticalOrder = 20,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_RANK)] =
     {
         .text = gEasyChatWord_Rank,
         .alphabeticalOrder = 21,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_RIBBON)] =
     {
         .text = gEasyChatWord_Ribbon,
         .alphabeticalOrder = 26,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CRUSH)] =
     {
         .text = gEasyChatWord_Crush,
         .alphabeticalOrder = 16,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DIRECT)] =
     {
         .text = gEasyChatWord_Direct,
         .alphabeticalOrder = 8,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TOWER)] =
     {
         .text = gEasyChatWord_Tower,
         .alphabeticalOrder = 2,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_UNION)] =
     {
         .text = gEasyChatWord_Union,
         .alphabeticalOrder = 7,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ROOM)] =
     {
         .text = gEasyChatWord_Room,
         .alphabeticalOrder = 24,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WIRELESS)] =
     {
         .text = gEasyChatWord_Wireless,
         .alphabeticalOrder = 25,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FRONTIER)] =
     {
         .text = gEasyChatWord_Frontier,
         .alphabeticalOrder = 27,

src/data/easy_chat/easy_chat_group_feelings.h

@@ -69,346 +69,415 @@ const u8 gEasyChatWord_Understand[] = _("UNDERSTAND");
 const u8 gEasyChatWord_Understands[] = _("UNDERSTANDS");
 
 const struct EasyChatWordInfo gEasyChatGroup_Feelings[] = {
+    [EC_INDEX(EC_WORD_MEET)] =
     {
         .text = gEasyChatWord_Meet,
         .alphabeticalOrder = 40,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PLAY)] =
     {
         .text = gEasyChatWord_Play,
         .alphabeticalOrder = 39,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HURRIED)] =
     {
         .text = gEasyChatWord_Hurried,
         .alphabeticalOrder = 24,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GOES)] =
     {
         .text = gEasyChatWord_Goes,
         .alphabeticalOrder = 23,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GIDDY)] =
     {
         .text = gEasyChatWord_Giddy,
         .alphabeticalOrder = 46,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HAPPY)] =
     {
         .text = gEasyChatWord_Happy,
         .alphabeticalOrder = 63,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HAPPINESS)] =
     {
         .text = gEasyChatWord_Happiness,
         .alphabeticalOrder = 36,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EXCITE)] =
     {
         .text = gEasyChatWord_Excite,
         .alphabeticalOrder = 37,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_IMPORTANT)] =
     {
         .text = gEasyChatWord_Important,
         .alphabeticalOrder = 38,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FUNNY)] =
     {
         .text = gEasyChatWord_Funny,
         .alphabeticalOrder = 61,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GOT)] =
     {
         .text = gEasyChatWord_Got,
         .alphabeticalOrder = 31,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GO_HOME)] =
     {
         .text = gEasyChatWord_GoHome,
         .alphabeticalOrder = 62,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DISAPPOINTED)] =
     {
         .text = gEasyChatWord_Disappointed,
         .alphabeticalOrder = 27,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DISAPPOINTS)] =
     {
         .text = gEasyChatWord_Disappoints,
         .alphabeticalOrder = 12,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SAD)] =
     {
         .text = gEasyChatWord_Sad,
         .alphabeticalOrder = 13,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TRY)] =
     {
         .text = gEasyChatWord_Try,
         .alphabeticalOrder = 41,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TRIES)] =
     {
         .text = gEasyChatWord_Tries,
         .alphabeticalOrder = 22,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HEARS)] =
     {
         .text = gEasyChatWord_Hears,
         .alphabeticalOrder = 35,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THINK)] =
     {
         .text = gEasyChatWord_Think,
         .alphabeticalOrder = 60,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HEAR)] =
     {
         .text = gEasyChatWord_Hear,
         .alphabeticalOrder = 32,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WANTS)] =
     {
         .text = gEasyChatWord_Wants,
         .alphabeticalOrder = 51,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MISHEARD)] =
     {
         .text = gEasyChatWord_Misheard,
         .alphabeticalOrder = 44,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DISLIKE)] =
     {
         .text = gEasyChatWord_Dislike,
         .alphabeticalOrder = 42,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ANGRY)] =
     {
         .text = gEasyChatWord_Angry,
         .alphabeticalOrder = 43,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ANGER)] =
     {
         .text = gEasyChatWord_Anger,
         .alphabeticalOrder = 7,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SCARY)] =
     {
         .text = gEasyChatWord_Scary,
         .alphabeticalOrder = 53,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LONESOME)] =
     {
         .text = gEasyChatWord_Lonesome,
         .alphabeticalOrder = 9,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DISAPPOINT)] =
     {
         .text = gEasyChatWord_Disappoint,
         .alphabeticalOrder = 29,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_JOY)] =
     {
         .text = gEasyChatWord_Joy,
         .alphabeticalOrder = 4,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GETS)] =
     {
         .text = gEasyChatWord_Gets,
         .alphabeticalOrder = 11,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NEVER)] =
     {
         .text = gEasyChatWord_Never,
         .alphabeticalOrder = 3,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DARN)] =
     {
         .text = gEasyChatWord_Darn,
         .alphabeticalOrder = 10,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DOWNCAST)] =
     {
         .text = gEasyChatWord_Downcast,
         .alphabeticalOrder = 64,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_INCREDIBLE)] =
     {
         .text = gEasyChatWord_Incredible,
         .alphabeticalOrder = 6,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LIKES)] =
     {
         .text = gEasyChatWord_Likes,
         .alphabeticalOrder = 5,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DISLIKES)] =
     {
         .text = gEasyChatWord_Dislikes,
         .alphabeticalOrder = 47,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BORING)] =
     {
         .text = gEasyChatWord_Boring,
         .alphabeticalOrder = 19,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CARE)] =
     {
         .text = gEasyChatWord_Care,
         .alphabeticalOrder = 17,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CARES)] =
     {
         .text = gEasyChatWord_Cares,
         .alphabeticalOrder = 2,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ALL_RIGHT)] =
     {
         .text = gEasyChatWord_AllRight,
         .alphabeticalOrder = 8,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ADORE)] =
     {
         .text = gEasyChatWord_Adore,
         .alphabeticalOrder = 33,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DISASTER)] =
     {
         .text = gEasyChatWord_Disaster,
         .alphabeticalOrder = 28,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ENJOY)] =
     {
         .text = gEasyChatWord_Enjoy,
         .alphabeticalOrder = 45,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ENJOYS)] =
     {
         .text = gEasyChatWord_Enjoys,
         .alphabeticalOrder = 34,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EAT)] =
     {
         .text = gEasyChatWord_Eat,
         .alphabeticalOrder = 26,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LACKING)] =
     {
         .text = gEasyChatWord_Lacking,
         .alphabeticalOrder = 0,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BAD)] =
     {
         .text = gEasyChatWord_Bad,
         .alphabeticalOrder = 21,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HARD)] =
     {
         .text = gEasyChatWord_Hard,
         .alphabeticalOrder = 59,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TERRIBLE)] =
     {
         .text = gEasyChatWord_Terrible,
         .alphabeticalOrder = 30,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SHOULD)] =
     {
         .text = gEasyChatWord_Should,
         .alphabeticalOrder = 50,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NICE)] =
     {
         .text = gEasyChatWord_Nice,
         .alphabeticalOrder = 1,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DRINK)] =
     {
         .text = gEasyChatWord_Drink,
         .alphabeticalOrder = 66,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SURPRISE)] =
     {
         .text = gEasyChatWord_Surprise,
         .alphabeticalOrder = 58,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FEAR)] =
     {
         .text = gEasyChatWord_Fear,
         .alphabeticalOrder = 65,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WANT)] =
     {
         .text = gEasyChatWord_Want,
         .alphabeticalOrder = 14,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WAIT)] =
     {
         .text = gEasyChatWord_Wait,
         .alphabeticalOrder = 56,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SATISFIED)] =
     {
         .text = gEasyChatWord_Satisfied,
         .alphabeticalOrder = 25,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SEE)] =
     {
         .text = gEasyChatWord_See,
         .alphabeticalOrder = 57,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_RARE)] =
     {
         .text = gEasyChatWord_Rare,
         .alphabeticalOrder = 49,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NEGATIVE)] =
     {
         .text = gEasyChatWord_Negative,
         .alphabeticalOrder = 52,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DONE)] =
     {
         .text = gEasyChatWord_Done,
         .alphabeticalOrder = 48,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DANGER)] =
     {
         .text = gEasyChatWord_Danger,
         .alphabeticalOrder = 18,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DEFEATED)] =
     {
         .text = gEasyChatWord_Defeated,
         .alphabeticalOrder = 16,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BEAT)] =
     {
         .text = gEasyChatWord_Beat,
         .alphabeticalOrder = 15,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GREAT)] =
     {
         .text = gEasyChatWord_Great,
         .alphabeticalOrder = 67,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ROMANTIC)] =
     {
         .text = gEasyChatWord_Romantic,
         .alphabeticalOrder = 68,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_QUESTION)] =
     {
         .text = gEasyChatWord_Question,
         .alphabeticalOrder = 55,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_UNDERSTAND)] =
     {
         .text = gEasyChatWord_Understand,
         .alphabeticalOrder = 54,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_UNDERSTANDS)] =
     {
         .text = gEasyChatWord_Understands,
         .alphabeticalOrder = 20,

src/data/easy_chat/easy_chat_group_greetings.h

@@ -42,211 +42,253 @@ const u8 gEasyChatWord_ComeOver[] = _("COME OVER");
 const u8 gEasyChatWord_CountOn[] = _("COUNT ON");
 
 const struct EasyChatWordInfo gEasyChatGroup_Greetings[] = {
+    [EC_INDEX(EC_WORD_THANKS)] =
     {
         .text = gEasyChatWord_Thanks,
         .alphabeticalOrder = 12,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_YES)] =
     {
         .text = gEasyChatWord_Yes,
         .alphabeticalOrder = 25,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HERE_GOES)] =
     {
         .text = gEasyChatWord_HereGoes,
         .alphabeticalOrder = 32,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HERE_I_COME)] =
     {
         .text = gEasyChatWord_HereICome,
         .alphabeticalOrder = 40,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HERE_IT_IS)] =
     {
         .text = gEasyChatWord_HereItIs,
         .alphabeticalOrder = 9,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_YEAH)] =
     {
         .text = gEasyChatWord_Yeah,
         .alphabeticalOrder = 41,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WELCOME)] =
     {
         .text = gEasyChatWord_Welcome,
         .alphabeticalOrder = 20,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OI)] =
     {
         .text = gEasyChatWord_Oi,
         .alphabeticalOrder = 22,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HOW_DO)] =
     {
         .text = gEasyChatWord_HowDo,
         .alphabeticalOrder = 13,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CONGRATS)] =
     {
         .text = gEasyChatWord_Congrats,
         .alphabeticalOrder = 10,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GIVE_ME)] =
     {
         .text = gEasyChatWord_GiveMe,
         .alphabeticalOrder = 24,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SORRY)] =
     {
         .text = gEasyChatWord_Sorry,
         .alphabeticalOrder = 16,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_APOLOGIZE)] =
     {
         .text = gEasyChatWord_Apologize,
         .alphabeticalOrder = 15,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FORGIVE)] =
     {
         .text = gEasyChatWord_Forgive,
         .alphabeticalOrder = 2,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HEY_THERE)] =
     {
         .text = gEasyChatWord_HeyThere,
         .alphabeticalOrder = 3,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HELLO)] =
     {
         .text = gEasyChatWord_Hello,
         .alphabeticalOrder = 4,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GOOD_BYE)] =
     {
         .text = gEasyChatWord_GoodBye,
         .alphabeticalOrder = 34,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THANK_YOU)] =
     {
         .text = gEasyChatWord_ThankYou,
         .alphabeticalOrder = 14,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_I_VE_ARRIVED)] =
     {
         .text = gEasyChatWord_IveArrived,
         .alphabeticalOrder = 26,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PARDON)] =
     {
         .text = gEasyChatWord_Pardon,
         .alphabeticalOrder = 30,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EXCUSE)] =
     {
         .text = gEasyChatWord_Excuse,
         .alphabeticalOrder = 37,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SEE_YA)] =
     {
         .text = gEasyChatWord_SeeYa,
         .alphabeticalOrder = 8,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EXCUSE_ME)] =
     {
         .text = gEasyChatWord_ExcuseMe,
         .alphabeticalOrder = 28,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WELL_THEN)] =
     {
         .text = gEasyChatWord_WellThen,
         .alphabeticalOrder = 18,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GO_AHEAD)] =
     {
         .text = gEasyChatWord_GoAhead,
         .alphabeticalOrder = 36,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_APPRECIATE)] =
     {
         .text = gEasyChatWord_Appreciate,
         .alphabeticalOrder = 33,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HEY_QUES)] =
     {
         .text = gEasyChatWord_HeyQues,
         .alphabeticalOrder = 29,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WHAT_S_UP_QUES)] =
     {
         .text = gEasyChatWord_WhatsUpQues,
         .alphabeticalOrder = 7,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HUH_QUES)] =
     {
         .text = gEasyChatWord_HuhQues,
         .alphabeticalOrder = 19,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NO)] =
     {
         .text = gEasyChatWord_No,
         .alphabeticalOrder = 21,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HI)] =
     {
         .text = gEasyChatWord_Hi,
         .alphabeticalOrder = 35,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_YEAH_YEAH)] =
     {
         .text = gEasyChatWord_YeahYeah,
         .alphabeticalOrder = 11,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BYE_BYE)] =
     {
         .text = gEasyChatWord_ByeBye,
         .alphabeticalOrder = 17,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MEET_YOU)] =
     {
         .text = gEasyChatWord_MeetYou,
         .alphabeticalOrder = 0,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HEY)] =
     {
         .text = gEasyChatWord_Hey,
         .alphabeticalOrder = 6,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SMELL)] =
     {
         .text = gEasyChatWord_Smell,
         .alphabeticalOrder = 23,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LISTENING)] =
     {
         .text = gEasyChatWord_Listening,
         .alphabeticalOrder = 27,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HOO_HAH)] =
     {
         .text = gEasyChatWord_HooHah,
         .alphabeticalOrder = 38,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_YAHOO)] =
     {
         .text = gEasyChatWord_Yahoo,
         .alphabeticalOrder = 5,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_YO)] =
     {
         .text = gEasyChatWord_Yo,
         .alphabeticalOrder = 31,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_COME_OVER)] =
     {
         .text = gEasyChatWord_ComeOver,
         .alphabeticalOrder = 1,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_COUNT_ON)] =
     {
         .text = gEasyChatWord_CountOn,
         .alphabeticalOrder = 39,

src/data/easy_chat/easy_chat_group_hobbies.h

@@ -54,271 +54,325 @@ const u8 gEasyChatWord_Vacation[] = _("VACATION");
 const u8 gEasyChatWord_Look[] = _("LOOK");
 
 const struct EasyChatWordInfo gEasyChatGroup_Hobbies[] = {
+    [EC_INDEX(EC_WORD_IDOL)] =
     {
         .text = gEasyChatWord_Idol,
         .alphabeticalOrder = 43,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ANIME)] =
     {
         .text = gEasyChatWord_Anime,
         .alphabeticalOrder = 1,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SONG)] =
     {
         .text = gEasyChatWord_Song,
         .alphabeticalOrder = 45,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MOVIE)] =
     {
         .text = gEasyChatWord_Movie,
         .alphabeticalOrder = 21,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SWEETS)] =
     {
         .text = gEasyChatWord_Sweets,
         .alphabeticalOrder = 44,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CHAT)] =
     {
         .text = gEasyChatWord_Chat,
         .alphabeticalOrder = 46,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CHILD_S_PLAY)] =
     {
         .text = gEasyChatWord_ChildsPlay,
         .alphabeticalOrder = 11,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TOYS)] =
     {
         .text = gEasyChatWord_Toys,
         .alphabeticalOrder = 9,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MUSIC)] =
     {
         .text = gEasyChatWord_Music,
         .alphabeticalOrder = 30,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CARDS)] =
     {
         .text = gEasyChatWord_Cards,
         .alphabeticalOrder = 5,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SHOPPING)] =
     {
         .text = gEasyChatWord_Shopping,
         .alphabeticalOrder = 6,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CAMERA)] =
     {
         .text = gEasyChatWord_Camera,
         .alphabeticalOrder = 17,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_VIEWING)] =
     {
         .text = gEasyChatWord_Viewing,
         .alphabeticalOrder = 48,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SPECTATOR)] =
     {
         .text = gEasyChatWord_Spectator,
         .alphabeticalOrder = 18,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GOURMET)] =
     {
         .text = gEasyChatWord_Gourmet,
         .alphabeticalOrder = 29,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GAME)] =
     {
         .text = gEasyChatWord_Game,
         .alphabeticalOrder = 33,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_RPG)] =
     {
         .text = gEasyChatWord_Rpg,
         .alphabeticalOrder = 34,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_COLLECTION)] =
     {
         .text = gEasyChatWord_Collection,
         .alphabeticalOrder = 26,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_COMPLETE)] =
     {
         .text = gEasyChatWord_Complete,
         .alphabeticalOrder = 42,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MAGAZINE)] =
     {
         .text = gEasyChatWord_Magazine,
         .alphabeticalOrder = 47,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WALK)] =
     {
         .text = gEasyChatWord_Walk,
         .alphabeticalOrder = 32,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BIKE)] =
     {
         .text = gEasyChatWord_Bike,
         .alphabeticalOrder = 38,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HOBBY)] =
     {
         .text = gEasyChatWord_Hobby,
         .alphabeticalOrder = 15,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SPORTS)] =
     {
         .text = gEasyChatWord_Sports,
         .alphabeticalOrder = 14,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SOFTWARE)] =
     {
         .text = gEasyChatWord_Software,
         .alphabeticalOrder = 39,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SONGS)] =
     {
         .text = gEasyChatWord_Songs,
         .alphabeticalOrder = 41,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DIET)] =
     {
         .text = gEasyChatWord_Diet,
         .alphabeticalOrder = 22,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TREASURE)] =
     {
         .text = gEasyChatWord_Treasure,
         .alphabeticalOrder = 49,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TRAVEL)] =
     {
         .text = gEasyChatWord_Travel,
         .alphabeticalOrder = 0,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DANCE)] =
     {
         .text = gEasyChatWord_Dance,
         .alphabeticalOrder = 35,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CHANNEL)] =
     {
         .text = gEasyChatWord_Channel,
         .alphabeticalOrder = 53,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MAKING)] =
     {
         .text = gEasyChatWord_Making,
         .alphabeticalOrder = 19,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FISHING)] =
     {
         .text = gEasyChatWord_Fishing,
         .alphabeticalOrder = 31,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DATE)] =
     {
         .text = gEasyChatWord_Date,
         .alphabeticalOrder = 3,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DESIGN)] =
     {
         .text = gEasyChatWord_Design,
         .alphabeticalOrder = 8,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LOCOMOTIVE)] =
     {
         .text = gEasyChatWord_Locomotive,
         .alphabeticalOrder = 40,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PLUSH_DOLL)] =
     {
         .text = gEasyChatWord_PlushDoll,
         .alphabeticalOrder = 37,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PC)] =
     {
         .text = gEasyChatWord_Pc,
         .alphabeticalOrder = 50,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FLOWERS)] =
     {
         .text = gEasyChatWord_Flowers,
         .alphabeticalOrder = 36,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HERO)] =
     {
         .text = gEasyChatWord_Hero,
         .alphabeticalOrder = 16,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NAP)] =
     {
         .text = gEasyChatWord_Nap,
         .alphabeticalOrder = 10,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HEROINE)] =
     {
         .text = gEasyChatWord_Heroine,
         .alphabeticalOrder = 24,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FASHION)] =
     {
         .text = gEasyChatWord_Fashion,
         .alphabeticalOrder = 2,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ADVENTURE)] =
     {
         .text = gEasyChatWord_Adventure,
         .alphabeticalOrder = 25,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BOARD)] =
     {
         .text = gEasyChatWord_Board,
         .alphabeticalOrder = 13,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BALL)] =
     {
         .text = gEasyChatWord_Ball,
         .alphabeticalOrder = 23,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BOOK)] =
     {
         .text = gEasyChatWord_Book,
         .alphabeticalOrder = 4,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FESTIVAL)] =
     {
         .text = gEasyChatWord_Festival,
         .alphabeticalOrder = 7,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_COMICS)] =
     {
         .text = gEasyChatWord_Comics,
         .alphabeticalOrder = 28,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HOLIDAY)] =
     {
         .text = gEasyChatWord_Holiday,
         .alphabeticalOrder = 27,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PLANS)] =
     {
         .text = gEasyChatWord_Plans,
         .alphabeticalOrder = 51,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TRENDY)] =
     {
         .text = gEasyChatWord_Trendy,
         .alphabeticalOrder = 52,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_VACATION)] =
     {
         .text = gEasyChatWord_Vacation,
         .alphabeticalOrder = 12,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LOOK)] =
     {
         .text = gEasyChatWord_Look,
         .alphabeticalOrder = 20,

src/data/easy_chat/easy_chat_group_lifestyle.h

@@ -45,226 +45,271 @@ const u8 gEasyChatWord_Rental[] = _("RENTAL");
 const u8 gEasyChatWord_World[] = _("WORLD");
 
 const struct EasyChatWordInfo gEasyChatGroup_Lifestyle[] = {
+    [EC_INDEX(EC_WORD_CHORES)] =
     {
         .text = gEasyChatWord_Chores,
         .alphabeticalOrder = 3,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HOME)] =
     {
         .text = gEasyChatWord_Home,
         .alphabeticalOrder = 4,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MONEY)] =
     {
         .text = gEasyChatWord_Money,
         .alphabeticalOrder = 0,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ALLOWANCE)] =
     {
         .text = gEasyChatWord_Allowance,
         .alphabeticalOrder = 16,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BATH)] =
     {
         .text = gEasyChatWord_Bath,
         .alphabeticalOrder = 7,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CONVERSATION)] =
     {
         .text = gEasyChatWord_Conversation,
         .alphabeticalOrder = 5,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SCHOOL)] =
     {
         .text = gEasyChatWord_School,
         .alphabeticalOrder = 26,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_COMMEMORATE)] =
     {
         .text = gEasyChatWord_Commemorate,
         .alphabeticalOrder = 24,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HABIT)] =
     {
         .text = gEasyChatWord_Habit,
         .alphabeticalOrder = 39,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GROUP)] =
     {
         .text = gEasyChatWord_Group,
         .alphabeticalOrder = 23,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WORD)] =
     {
         .text = gEasyChatWord_Word,
         .alphabeticalOrder = 9,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_STORE)] =
     {
         .text = gEasyChatWord_Store,
         .alphabeticalOrder = 8,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SERVICE)] =
     {
         .text = gEasyChatWord_Service,
         .alphabeticalOrder = 1,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WORK)] =
     {
         .text = gEasyChatWord_Work,
         .alphabeticalOrder = 18,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SYSTEM)] =
     {
         .text = gEasyChatWord_System,
         .alphabeticalOrder = 29,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TRAIN)] =
     {
         .text = gEasyChatWord_Train,
         .alphabeticalOrder = 40,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CLASS)] =
     {
         .text = gEasyChatWord_Class,
         .alphabeticalOrder = 17,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LESSONS)] =
     {
         .text = gEasyChatWord_Lessons,
         .alphabeticalOrder = 22,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_INFORMATION)] =
     {
         .text = gEasyChatWord_Information,
         .alphabeticalOrder = 41,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LIVING)] =
     {
         .text = gEasyChatWord_Living,
         .alphabeticalOrder = 19,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TEACHER)] =
     {
         .text = gEasyChatWord_Teacher,
         .alphabeticalOrder = 35,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TOURNAMENT)] =
     {
         .text = gEasyChatWord_Tournament,
         .alphabeticalOrder = 36,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LETTER)] =
     {
         .text = gEasyChatWord_Letter,
         .alphabeticalOrder = 37,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EVENT)] =
     {
         .text = gEasyChatWord_Event,
         .alphabeticalOrder = 2,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DIGITAL)] =
     {
         .text = gEasyChatWord_Digital,
         .alphabeticalOrder = 30,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TEST)] =
     {
         .text = gEasyChatWord_Test,
         .alphabeticalOrder = 31,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DEPT_STORE)] =
     {
         .text = gEasyChatWord_DeptStore,
         .alphabeticalOrder = 33,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TELEVISION)] =
     {
         .text = gEasyChatWord_Television,
         .alphabeticalOrder = 28,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PHONE)] =
     {
         .text = gEasyChatWord_Phone,
         .alphabeticalOrder = 32,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ITEM)] =
     {
         .text = gEasyChatWord_Item,
         .alphabeticalOrder = 38,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NAME)] =
     {
         .text = gEasyChatWord_Name,
         .alphabeticalOrder = 42,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NEWS)] =
     {
         .text = gEasyChatWord_News,
         .alphabeticalOrder = 43,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_POPULAR)] =
     {
         .text = gEasyChatWord_Popular,
         .alphabeticalOrder = 6,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PARTY)] =
     {
         .text = gEasyChatWord_Party,
         .alphabeticalOrder = 12,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_STUDY)] =
     {
         .text = gEasyChatWord_Study,
         .alphabeticalOrder = 11,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MACHINE)] =
     {
         .text = gEasyChatWord_Machine,
         .alphabeticalOrder = 34,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MAIL)] =
     {
         .text = gEasyChatWord_Mail,
         .alphabeticalOrder = 14,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MESSAGE)] =
     {
         .text = gEasyChatWord_Message,
         .alphabeticalOrder = 20,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PROMISE)] =
     {
         .text = gEasyChatWord_Promise,
         .alphabeticalOrder = 27,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DREAM)] =
     {
         .text = gEasyChatWord_Dream,
         .alphabeticalOrder = 25,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_KINDERGARTEN)] =
     {
         .text = gEasyChatWord_Kindergarten,
         .alphabeticalOrder = 21,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LIFE)] =
     {
         .text = gEasyChatWord_Life,
         .alphabeticalOrder = 15,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_RADIO)] =
     {
         .text = gEasyChatWord_Radio,
         .alphabeticalOrder = 10,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_RENTAL)] =
     {
         .text = gEasyChatWord_Rental,
         .alphabeticalOrder = 13,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WORLD)] =
     {
         .text = gEasyChatWord_World,
         .alphabeticalOrder = 44,

src/data/easy_chat/easy_chat_group_misc.h

@@ -42,211 +42,253 @@ const u8 gEasyChatWord_Left[] = _("LEFT");
 const u8 gEasyChatWord_Right[] = _("RIGHT");
 
 const struct EasyChatWordInfo gEasyChatGroup_Misc[] = {
+    [EC_INDEX(EC_WORD_HIGHS)] =
     {
         .text = gEasyChatWord_Highs,
         .alphabeticalOrder = 7,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LOWS)] =
     {
         .text = gEasyChatWord_Lows,
         .alphabeticalOrder = 24,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_UM)] =
     {
         .text = gEasyChatWord_Um,
         .alphabeticalOrder = 30,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_REAR)] =
     {
         .text = gEasyChatWord_Rear,
         .alphabeticalOrder = 8,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THINGS)] =
     {
         .text = gEasyChatWord_Things,
         .alphabeticalOrder = 6,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THING)] =
     {
         .text = gEasyChatWord_Thing,
         .alphabeticalOrder = 13,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BELOW)] =
     {
         .text = gEasyChatWord_Below,
         .alphabeticalOrder = 28,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ABOVE)] =
     {
         .text = gEasyChatWord_Above,
         .alphabeticalOrder = 38,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BACK)] =
     {
         .text = gEasyChatWord_Back,
         .alphabeticalOrder = 35,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HIGH)] =
     {
         .text = gEasyChatWord_High,
         .alphabeticalOrder = 19,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HERE)] =
     {
         .text = gEasyChatWord_Here,
         .alphabeticalOrder = 16,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_INSIDE)] =
     {
         .text = gEasyChatWord_Inside,
         .alphabeticalOrder = 29,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OUTSIDE)] =
     {
         .text = gEasyChatWord_Outside,
         .alphabeticalOrder = 26,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BESIDE)] =
     {
         .text = gEasyChatWord_Beside,
         .alphabeticalOrder = 10,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THIS_IS_IT_EXCL)] =
     {
         .text = gEasyChatWord_ThisIsItExcl,
         .alphabeticalOrder = 9,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THIS)] =
     {
         .text = gEasyChatWord_This,
         .alphabeticalOrder = 0,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EVERY)] =
     {
         .text = gEasyChatWord_Every,
         .alphabeticalOrder = 11,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THESE)] =
     {
         .text = gEasyChatWord_These,
         .alphabeticalOrder = 40,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THESE_WERE)] =
     {
         .text = gEasyChatWord_TheseWere,
         .alphabeticalOrder = 1,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DOWN)] =
     {
         .text = gEasyChatWord_Down,
         .alphabeticalOrder = 31,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THAT)] =
     {
         .text = gEasyChatWord_That,
         .alphabeticalOrder = 39,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THOSE_ARE)] =
     {
         .text = gEasyChatWord_ThoseAre,
         .alphabeticalOrder = 12,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THOSE_WERE)] =
     {
         .text = gEasyChatWord_ThoseWere,
         .alphabeticalOrder = 3,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THAT_S_IT_EXCL)] =
     {
         .text = gEasyChatWord_ThatsItExcl,
         .alphabeticalOrder = 41,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_AM)] =
     {
         .text = gEasyChatWord_Am,
         .alphabeticalOrder = 36,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THAT_WAS)] =
     {
         .text = gEasyChatWord_ThatWas,
         .alphabeticalOrder = 20,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FRONT)] =
     {
         .text = gEasyChatWord_Front,
         .alphabeticalOrder = 25,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_UP)] =
     {
         .text = gEasyChatWord_Up,
         .alphabeticalOrder = 23,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CHOICE)] =
     {
         .text = gEasyChatWord_Choice,
         .alphabeticalOrder = 17,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FAR)] =
     {
         .text = gEasyChatWord_Far,
         .alphabeticalOrder = 18,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_AWAY)] =
     {
         .text = gEasyChatWord_Away,
         .alphabeticalOrder = 5,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NEAR)] =
     {
         .text = gEasyChatWord_Near,
         .alphabeticalOrder = 4,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WHERE)] =
     {
         .text = gEasyChatWord_Where,
         .alphabeticalOrder = 15,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WHEN)] =
     {
         .text = gEasyChatWord_When,
         .alphabeticalOrder = 14,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WHAT)] =
     {
         .text = gEasyChatWord_What,
         .alphabeticalOrder = 21,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DEEP)] =
     {
         .text = gEasyChatWord_Deep,
         .alphabeticalOrder = 22,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SHALLOW)] =
     {
         .text = gEasyChatWord_Shallow,
         .alphabeticalOrder = 2,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WHY)] =
     {
         .text = gEasyChatWord_Why,
         .alphabeticalOrder = 27,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CONFUSED)] =
     {
         .text = gEasyChatWord_Confused,
         .alphabeticalOrder = 34,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OPPOSITE)] =
     {
         .text = gEasyChatWord_Opposite,
         .alphabeticalOrder = 33,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LEFT)] =
     {
         .text = gEasyChatWord_Left,
         .alphabeticalOrder = 32,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_RIGHT)] =
     {
         .text = gEasyChatWord_Right,
         .alphabeticalOrder = 37,

src/data/easy_chat/easy_chat_group_people.h

@@ -63,7 +63,7 @@ const u8 gEasyChatWord_We[] = _("WE");
 const u8 gEasyChatWord_Been[] = _("BEEN");
 const u8 gEasyChatWord_ToUs[] = _("TO US");
 const u8 gEasyChatWord_Our[] = _("OUR");
-const u8 gEasyChatWord_WeAre[] = _("WE'RE");
+const u8 gEasyChatWord_WeRe[] = _("WE'RE");
 const u8 gEasyChatWord_Rival[] = _("RIVAL");
 const u8 gEasyChatWord_Weve[] = _("WE'VE");
 const u8 gEasyChatWord_Woman[] = _("WOMAN");
@@ -75,376 +75,451 @@ const u8 gEasyChatWord_SheIs[] = _("SHE IS");
 const u8 gEasyChatWord_Some[] = _("SOME");
 
 const struct EasyChatWordInfo gEasyChatGroup_People[] = {
+    [EC_INDEX(EC_WORD_OPPONENT)] =
     {
         .text = gEasyChatWord_Opponent,
         .alphabeticalOrder = 13,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_I)] =
     {
         .text = gEasyChatWord_I,
         .alphabeticalOrder = 52,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_YOU)] =
     {
         .text = gEasyChatWord_You,
         .alphabeticalOrder = 31,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_YOURS)] =
     {
         .text = gEasyChatWord_Yours,
         .alphabeticalOrder = 17,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SON)] =
     {
         .text = gEasyChatWord_Son,
         .alphabeticalOrder = 22,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_YOUR)] =
     {
         .text = gEasyChatWord_Your,
         .alphabeticalOrder = 62,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_YOU_RE)] =
     {
         .text = gEasyChatWord_Youre,
         .alphabeticalOrder = 12,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_YOU_VE)] =
     {
         .text = gEasyChatWord_Youve,
         .alphabeticalOrder = 14,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MOTHER)] =
     {
         .text = gEasyChatWord_Mother,
         .alphabeticalOrder = 34,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GRANDFATHER)] =
     {
         .text = gEasyChatWord_Grandfather,
         .alphabeticalOrder = 28,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_UNCLE)] =
     {
         .text = gEasyChatWord_Uncle,
         .alphabeticalOrder = 54,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FATHER)] =
     {
         .text = gEasyChatWord_Father,
         .alphabeticalOrder = 23,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BOY)] =
     {
         .text = gEasyChatWord_Boy,
         .alphabeticalOrder = 11,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ADULT)] =
     {
         .text = gEasyChatWord_Adult,
         .alphabeticalOrder = 51,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BROTHER)] =
     {
         .text = gEasyChatWord_Brother,
         .alphabeticalOrder = 21,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SISTER)] =
     {
         .text = gEasyChatWord_Sister,
         .alphabeticalOrder = 9,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GRANDMOTHER)] =
     {
         .text = gEasyChatWord_Grandmother,
         .alphabeticalOrder = 16,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_AUNT)] =
     {
         .text = gEasyChatWord_Aunt,
         .alphabeticalOrder = 26,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PARENT)] =
     {
         .text = gEasyChatWord_Parent,
         .alphabeticalOrder = 30,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MAN)] =
     {
         .text = gEasyChatWord_Man,
         .alphabeticalOrder = 24,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ME)] =
     {
         .text = gEasyChatWord_Me,
         .alphabeticalOrder = 72,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GIRL)] =
     {
         .text = gEasyChatWord_Girl,
         .alphabeticalOrder = 25,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BABE)] =
     {
         .text = gEasyChatWord_Babe,
         .alphabeticalOrder = 29,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FAMILY)] =
     {
         .text = gEasyChatWord_Family,
         .alphabeticalOrder = 1,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HER)] =
     {
         .text = gEasyChatWord_Her,
         .alphabeticalOrder = 41,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HIM)] =
     {
         .text = gEasyChatWord_Him,
         .alphabeticalOrder = 38,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HE)] =
     {
         .text = gEasyChatWord_He,
         .alphabeticalOrder = 42,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PLACE)] =
     {
         .text = gEasyChatWord_Place,
         .alphabeticalOrder = 49,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DAUGHTER)] =
     {
         .text = gEasyChatWord_Daughter,
         .alphabeticalOrder = 33,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HIS)] =
     {
         .text = gEasyChatWord_His,
         .alphabeticalOrder = 50,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HE_S)] =
     {
         .text = gEasyChatWord_Hes,
         .alphabeticalOrder = 19,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_AREN_T)] =
     {
         .text = gEasyChatWord_Arent,
         .alphabeticalOrder = 20,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SIBLINGS)] =
     {
         .text = gEasyChatWord_Siblings,
         .alphabeticalOrder = 8,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_KID)] =
     {
         .text = gEasyChatWord_Kid,
         .alphabeticalOrder = 35,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CHILDREN)] =
     {
         .text = gEasyChatWord_Children,
         .alphabeticalOrder = 36,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MR)] =
     {
         .text = gEasyChatWord_Mr,
         .alphabeticalOrder = 40,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MRS)] =
     {
         .text = gEasyChatWord_Mrs,
         .alphabeticalOrder = 37,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MYSELF)] =
     {
         .text = gEasyChatWord_Myself,
         .alphabeticalOrder = 0,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_I_WAS)] =
     {
         .text = gEasyChatWord_IWas,
         .alphabeticalOrder = 64,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TO_ME)] =
     {
         .text = gEasyChatWord_ToMe,
         .alphabeticalOrder = 18,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MY)] =
     {
         .text = gEasyChatWord_My,
         .alphabeticalOrder = 53,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_I_AM)] =
     {
         .text = gEasyChatWord_IAm,
         .alphabeticalOrder = 27,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_I_VE)] =
     {
         .text = gEasyChatWord_Ive,
         .alphabeticalOrder = 66,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WHO)] =
     {
         .text = gEasyChatWord_Who,
         .alphabeticalOrder = 69,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SOMEONE)] =
     {
         .text = gEasyChatWord_Someone,
         .alphabeticalOrder = 73,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WHO_WAS)] =
     {
         .text = gEasyChatWord_WhoWas,
         .alphabeticalOrder = 70,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TO_WHOM)] =
     {
         .text = gEasyChatWord_ToWhom,
         .alphabeticalOrder = 32,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WHOSE)] =
     {
         .text = gEasyChatWord_Whose,
         .alphabeticalOrder = 15,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WHO_IS)] =
     {
         .text = gEasyChatWord_WhoIs,
         .alphabeticalOrder = 74,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_IT_S)] =
     {
         .text = gEasyChatWord_Its,
         .alphabeticalOrder = 44,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LADY)] =
     {
         .text = gEasyChatWord_Lady,
         .alphabeticalOrder = 4,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FRIEND)] =
     {
         .text = gEasyChatWord_Friend,
         .alphabeticalOrder = 58,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ALLY)] =
     {
         .text = gEasyChatWord_Ally,
         .alphabeticalOrder = 55,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PERSON)] =
     {
         .text = gEasyChatWord_Person,
         .alphabeticalOrder = 56,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DUDE)] =
     {
         .text = gEasyChatWord_Dude,
         .alphabeticalOrder = 59,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THEY)] =
     {
         .text = gEasyChatWord_They,
         .alphabeticalOrder = 60,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THEY_WERE)] =
     {
         .text = gEasyChatWord_TheyWere,
         .alphabeticalOrder = 71,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TO_THEM)] =
     {
         .text = gEasyChatWord_ToThem,
         .alphabeticalOrder = 39,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THEIR)] =
     {
         .text = gEasyChatWord_Their,
         .alphabeticalOrder = 57,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THEY_RE)] =
     {
         .text = gEasyChatWord_Theyre,
         .alphabeticalOrder = 63,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THEY_VE)] =
     {
         .text = gEasyChatWord_Theyve,
         .alphabeticalOrder = 46,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WE)] =
     {
         .text = gEasyChatWord_We,
         .alphabeticalOrder = 10,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BEEN)] =
     {
         .text = gEasyChatWord_Been,
         .alphabeticalOrder = 61,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TO_US)] =
     {
         .text = gEasyChatWord_ToUs,
         .alphabeticalOrder = 65,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OUR)] =
     {
         .text = gEasyChatWord_Our,
         .alphabeticalOrder = 67,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WE_RE)] =
     {
-        .text = gEasyChatWord_WeAre,
+        .text = gEasyChatWord_WeRe,
         .alphabeticalOrder = 43,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_RIVAL)] =
     {
         .text = gEasyChatWord_Rival,
         .alphabeticalOrder = 48,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WE_VE)] =
     {
         .text = gEasyChatWord_Weve,
         .alphabeticalOrder = 45,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WOMAN)] =
     {
         .text = gEasyChatWord_Woman,
         .alphabeticalOrder = 47,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SHE)] =
     {
         .text = gEasyChatWord_She,
         .alphabeticalOrder = 68,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SHE_WAS)] =
     {
         .text = gEasyChatWord_SheWas,
         .alphabeticalOrder = 2,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TO_HER)] =
     {
         .text = gEasyChatWord_ToHer,
         .alphabeticalOrder = 6,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HERS)] =
     {
         .text = gEasyChatWord_Hers,
         .alphabeticalOrder = 7,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SHE_IS)] =
     {
         .text = gEasyChatWord_SheIs,
         .alphabeticalOrder = 5,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SOME)] =
     {
         .text = gEasyChatWord_Some,
         .alphabeticalOrder = 3,

src/data/easy_chat/easy_chat_group_speech.h

@@ -60,301 +60,361 @@ const u8 gEasyChatWord_Instead[] = _("INSTEAD");
 const u8 gEasyChatWord_Fantastic[] = _("FANTASTIC");
 
 const struct EasyChatWordInfo gEasyChatGroup_Speech[] = {
+    [EC_INDEX(EC_WORD_LISTEN)] =
     {
         .text = gEasyChatWord_Listen,
         .alphabeticalOrder = 19,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NOT_VERY)] =
     {
         .text = gEasyChatWord_NotVery,
         .alphabeticalOrder = 18,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MEAN)] =
     {
         .text = gEasyChatWord_Mean,
         .alphabeticalOrder = 27,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LIE)] =
     {
         .text = gEasyChatWord_Lie,
         .alphabeticalOrder = 20,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LAY)] =
     {
         .text = gEasyChatWord_Lay,
         .alphabeticalOrder = 41,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_RECOMMEND)] =
     {
         .text = gEasyChatWord_Recommend,
         .alphabeticalOrder = 40,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NITWIT)] =
     {
         .text = gEasyChatWord_Nitwit,
         .alphabeticalOrder = 21,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_QUITE)] =
     {
         .text = gEasyChatWord_Quite,
         .alphabeticalOrder = 57,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FROM)] =
     {
         .text = gEasyChatWord_From,
         .alphabeticalOrder = 23,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FEELING)] =
     {
         .text = gEasyChatWord_Feeling,
         .alphabeticalOrder = 49,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BUT)] =
     {
         .text = gEasyChatWord_But,
         .alphabeticalOrder = 43,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HOWEVER)] =
     {
         .text = gEasyChatWord_However,
         .alphabeticalOrder = 52,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CASE)] =
     {
         .text = gEasyChatWord_Case,
         .alphabeticalOrder = 10,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THE)] =
     {
         .text = gEasyChatWord_The,
         .alphabeticalOrder = 12,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MISS)] =
     {
         .text = gEasyChatWord_Miss,
         .alphabeticalOrder = 17,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HOW)] =
     {
         .text = gEasyChatWord_How,
         .alphabeticalOrder = 31,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HIT)] =
     {
         .text = gEasyChatWord_Hit,
         .alphabeticalOrder = 59,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ENOUGH)] =
     {
         .text = gEasyChatWord_Enough,
         .alphabeticalOrder = 9,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_A_LOT)] =
     {
         .text = gEasyChatWord_ALot,
         .alphabeticalOrder = 56,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_A_LITTLE)] =
     {
         .text = gEasyChatWord_ALittle,
         .alphabeticalOrder = 34,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ABSOLUTELY)] =
     {
         .text = gEasyChatWord_Absolutely,
         .alphabeticalOrder = 8,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_AND)] =
     {
         .text = gEasyChatWord_And,
         .alphabeticalOrder = 16,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ONLY)] =
     {
         .text = gEasyChatWord_Only,
         .alphabeticalOrder = 15,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_AROUND)] =
     {
         .text = gEasyChatWord_Around,
         .alphabeticalOrder = 11,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PROBABLY)] =
     {
         .text = gEasyChatWord_Probably,
         .alphabeticalOrder = 25,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_IF)] =
     {
         .text = gEasyChatWord_If,
         .alphabeticalOrder = 58,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_VERY)] =
     {
         .text = gEasyChatWord_Very,
         .alphabeticalOrder = 36,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_A_TINY_BIT)] =
     {
         .text = gEasyChatWord_ATinyBit,
         .alphabeticalOrder = 30,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WILD)] =
     {
         .text = gEasyChatWord_Wild,
         .alphabeticalOrder = 4,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THAT_S)] =
     {
         .text = gEasyChatWord_Thats,
         .alphabeticalOrder = 3,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_JUST)] =
     {
         .text = gEasyChatWord_Just,
         .alphabeticalOrder = 0,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EVEN_SO)] =
     {
         .text = gEasyChatWord_EvenSo,
         .alphabeticalOrder = 2,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MUST_BE)] =
     {
         .text = gEasyChatWord_MustBe,
         .alphabeticalOrder = 14,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NATURALLY)] =
     {
         .text = gEasyChatWord_Naturally,
         .alphabeticalOrder = 53,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FOR_NOW)] =
     {
         .text = gEasyChatWord_ForNow,
         .alphabeticalOrder = 50,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_UNDERSTOOD)] =
     {
         .text = gEasyChatWord_Understood,
         .alphabeticalOrder = 54,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_JOKING)] =
     {
         .text = gEasyChatWord_Joking,
         .alphabeticalOrder = 32,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_READY)] =
     {
         .text = gEasyChatWord_Ready,
         .alphabeticalOrder = 33,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SOMETHING)] =
     {
         .text = gEasyChatWord_Something,
         .alphabeticalOrder = 6,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SOMEHOW)] =
     {
         .text = gEasyChatWord_Somehow,
         .alphabeticalOrder = 1,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ALTHOUGH)] =
     {
         .text = gEasyChatWord_Although,
         .alphabeticalOrder = 22,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ALSO)] =
     {
         .text = gEasyChatWord_Also,
         .alphabeticalOrder = 42,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PERFECT)] =
     {
         .text = gEasyChatWord_Perfect,
         .alphabeticalOrder = 24,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_AS_MUCH_AS)] =
     {
         .text = gEasyChatWord_AsMuchAs,
         .alphabeticalOrder = 7,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_REALLY)] =
     {
         .text = gEasyChatWord_Really,
         .alphabeticalOrder = 51,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TRULY)] =
     {
         .text = gEasyChatWord_Truly,
         .alphabeticalOrder = 37,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SERIOUSLY)] =
     {
         .text = gEasyChatWord_Seriously,
         .alphabeticalOrder = 44,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TOTALLY)] =
     {
         .text = gEasyChatWord_Totally,
         .alphabeticalOrder = 5,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_UNTIL)] =
     {
         .text = gEasyChatWord_Until,
         .alphabeticalOrder = 46,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_AS_IF)] =
     {
         .text = gEasyChatWord_AsIf,
         .alphabeticalOrder = 39,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MOOD)] =
     {
         .text = gEasyChatWord_Mood,
         .alphabeticalOrder = 38,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_RATHER)] =
     {
         .text = gEasyChatWord_Rather,
         .alphabeticalOrder = 29,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_AWFULLY)] =
     {
         .text = gEasyChatWord_Awfully,
         .alphabeticalOrder = 13,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MODE)] =
     {
         .text = gEasyChatWord_Mode,
         .alphabeticalOrder = 55,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MORE)] =
     {
         .text = gEasyChatWord_More,
         .alphabeticalOrder = 47,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TOO_LATE)] =
     {
         .text = gEasyChatWord_TooLate,
         .alphabeticalOrder = 45,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FINALLY)] =
     {
         .text = gEasyChatWord_Finally,
         .alphabeticalOrder = 35,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ANY)] =
     {
         .text = gEasyChatWord_Any,
         .alphabeticalOrder = 48,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_INSTEAD)] =
     {
         .text = gEasyChatWord_Instead,
         .alphabeticalOrder = 26,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FANTASTIC)] =
     {
         .text = gEasyChatWord_Fantastic,
         .alphabeticalOrder = 28,

src/data/easy_chat/easy_chat_group_status.h

@@ -109,546 +109,655 @@ const u8 gEasyChatWord_PurePower[] = _("PURE POWER");
 const u8 gEasyChatWord_ShieldDust[] = _("SHIELD DUST");
 
 const struct EasyChatWordInfo gEasyChatGroup_Status[] = {
+    [EC_INDEX(EC_WORD_DARK)] =
     {
         .text = gEasyChatWord_Dark,
         .alphabeticalOrder = 13,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_STENCH)] =
     {
         .text = gEasyChatWord_Stench,
         .alphabeticalOrder = 9,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THICK_FAT)] =
     {
         .text = gEasyChatWord_ThickFat,
         .alphabeticalOrder = 5,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_RAIN_DISH)] =
     {
         .text = gEasyChatWord_RainDish,
         .alphabeticalOrder = 23,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DRIZZLE)] =
     {
         .text = gEasyChatWord_Drizzle,
         .alphabeticalOrder = 11,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ARENA_TRAP)] =
     {
         .text = gEasyChatWord_ArenaTrap,
         .alphabeticalOrder = 12,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_INTIMIDATE)] =
     {
         .text = gEasyChatWord_Intimidate,
         .alphabeticalOrder = 101,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ROCK_HEAD)] =
     {
         .text = gEasyChatWord_RockHead,
         .alphabeticalOrder = 97,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_COLOR)] =
     {
         .text = gEasyChatWord_Color,
         .alphabeticalOrder = 106,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ALT_COLOR)] =
     {
         .text = gEasyChatWord_AltColor,
         .alphabeticalOrder = 29,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ROCK)] =
     {
         .text = gEasyChatWord_Rock,
         .alphabeticalOrder = 68,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BEAUTIFUL)] =
     {
         .text = gEasyChatWord_Beautiful,
         .alphabeticalOrder = 8,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BEAUTY)] =
     {
         .text = gEasyChatWord_Beauty,
         .alphabeticalOrder = 86,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_AIR_LOCK)] =
     {
         .text = gEasyChatWord_AirLock,
         .alphabeticalOrder = 78,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PSYCHIC)] =
     {
         .text = gEasyChatWord_Psychic,
         .alphabeticalOrder = 21,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HYPER_CUTTER)] =
     {
         .text = gEasyChatWord_HyperCutter,
         .alphabeticalOrder = 22,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FIGHTING)] =
     {
         .text = gEasyChatWord_Fighting,
         .alphabeticalOrder = 24,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SHADOW_TAG)] =
     {
         .text = gEasyChatWord_ShadowTag,
         .alphabeticalOrder = 99,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SMART)] =
     {
         .text = gEasyChatWord_Smart,
         .alphabeticalOrder = 25,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SMARTNESS)] =
     {
         .text = gEasyChatWord_Smartness,
         .alphabeticalOrder = 37,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SPEED_BOOST)] =
     {
         .text = gEasyChatWord_SpeedBoost,
         .alphabeticalOrder = 0,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_COOL)] =
     {
         .text = gEasyChatWord_Cool,
         .alphabeticalOrder = 62,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_COOLNESS)] =
     {
         .text = gEasyChatWord_Coolness,
         .alphabeticalOrder = 4,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BATTLE_ARMOR)] =
     {
         .text = gEasyChatWord_BattleArmor,
         .alphabeticalOrder = 76,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CUTE)] =
     {
         .text = gEasyChatWord_Cute,
         .alphabeticalOrder = 72,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CUTENESS)] =
     {
         .text = gEasyChatWord_Cuteness,
         .alphabeticalOrder = 88,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_STURDY)] =
     {
         .text = gEasyChatWord_Sturdy,
         .alphabeticalOrder = 57,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SUCTION_CUPS)] =
     {
         .text = gEasyChatWord_SuctionCups,
         .alphabeticalOrder = 16,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GRASS)] =
     {
         .text = gEasyChatWord_Grass,
         .alphabeticalOrder = 90,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CLEAR_BODY)] =
     {
         .text = gEasyChatWord_ClearBody,
         .alphabeticalOrder = 91,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TORRENT)] =
     {
         .text = gEasyChatWord_Torrent,
         .alphabeticalOrder = 104,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GHOST)] =
     {
         .text = gEasyChatWord_Ghost,
         .alphabeticalOrder = 75,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ICE)] =
     {
         .text = gEasyChatWord_Ice,
         .alphabeticalOrder = 58,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GUTS)] =
     {
         .text = gEasyChatWord_Guts,
         .alphabeticalOrder = 31,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ROUGH_SKIN)] =
     {
         .text = gEasyChatWord_RoughSkin,
         .alphabeticalOrder = 28,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SHELL_ARMOR)] =
     {
         .text = gEasyChatWord_ShellArmor,
         .alphabeticalOrder = 38,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NATURAL_CURE)] =
     {
         .text = gEasyChatWord_NaturalCure,
         .alphabeticalOrder = 33,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DAMP)] =
     {
         .text = gEasyChatWord_Damp,
         .alphabeticalOrder = 54,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GROUND)] =
     {
         .text = gEasyChatWord_Ground,
         .alphabeticalOrder = 73,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LIMBER)] =
     {
         .text = gEasyChatWord_Limber,
         .alphabeticalOrder = 15,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MAGNET_PULL)] =
     {
         .text = gEasyChatWord_MagnetPull,
         .alphabeticalOrder = 32,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WHITE_SMOKE)] =
     {
         .text = gEasyChatWord_WhiteSmoke,
         .alphabeticalOrder = 71,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SYNCHRONIZE)] =
     {
         .text = gEasyChatWord_Synchronize,
         .alphabeticalOrder = 100,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OVERGROW)] =
     {
         .text = gEasyChatWord_Overgrow,
         .alphabeticalOrder = 48,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SWIFT_SWIM)] =
     {
         .text = gEasyChatWord_SwiftSwim,
         .alphabeticalOrder = 81,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SAND_STREAM)] =
     {
         .text = gEasyChatWord_SandStream,
         .alphabeticalOrder = 6,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SAND_VEIL)] =
     {
         .text = gEasyChatWord_SandVeil,
         .alphabeticalOrder = 47,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_KEEN_EYE)] =
     {
         .text = gEasyChatWord_KeenEye,
         .alphabeticalOrder = 82,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_INNER_FOCUS)] =
     {
         .text = gEasyChatWord_InnerFocus,
         .alphabeticalOrder = 77,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_STATIC)] =
     {
         .text = gEasyChatWord_Static,
         .alphabeticalOrder = 39,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TYPE)] =
     {
         .text = gEasyChatWord_Type,
         .alphabeticalOrder = 85,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TOUGH)] =
     {
         .text = gEasyChatWord_Tough,
         .alphabeticalOrder = 94,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TOUGHNESS)] =
     {
         .text = gEasyChatWord_Toughness,
         .alphabeticalOrder = 40,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SHED_SKIN)] =
     {
         .text = gEasyChatWord_ShedSkin,
         .alphabeticalOrder = 79,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HUGE_POWER)] =
     {
         .text = gEasyChatWord_HugePower,
         .alphabeticalOrder = 92,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_VOLT_ABSORB)] =
     {
         .text = gEasyChatWord_VoltAbsorb,
         .alphabeticalOrder = 36,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WATER_ABSORB)] =
     {
         .text = gEasyChatWord_WaterAbsorb,
         .alphabeticalOrder = 69,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ELECTRIC)] =
     {
         .text = gEasyChatWord_Electric,
         .alphabeticalOrder = 64,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FORECAST)] =
     {
         .text = gEasyChatWord_Forecast,
         .alphabeticalOrder = 43,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SERENE_GRACE)] =
     {
         .text = gEasyChatWord_SereneGrace,
         .alphabeticalOrder = 93,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_POISON)] =
     {
         .text = gEasyChatWord_Poison,
         .alphabeticalOrder = 103,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_POISON_POINT)] =
     {
         .text = gEasyChatWord_PoisonPoint,
         .alphabeticalOrder = 102,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DRAGON)] =
     {
         .text = gEasyChatWord_Dragon,
         .alphabeticalOrder = 89,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TRACE)] =
     {
         .text = gEasyChatWord_Trace,
         .alphabeticalOrder = 83,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OBLIVIOUS)] =
     {
         .text = gEasyChatWord_Oblivious,
         .alphabeticalOrder = 60,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TRUANT)] =
     {
         .text = gEasyChatWord_Truant,
         .alphabeticalOrder = 61,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_RUN_AWAY)] =
     {
         .text = gEasyChatWord_RunAway,
         .alphabeticalOrder = 84,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_STICKY_HOLD)] =
     {
         .text = gEasyChatWord_StickyHold,
         .alphabeticalOrder = 14,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CLOUD_NINE)] =
     {
         .text = gEasyChatWord_CloudNine,
         .alphabeticalOrder = 107,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NORMAL)] =
     {
         .text = gEasyChatWord_Normal,
         .alphabeticalOrder = 3,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_STEEL)] =
     {
         .text = gEasyChatWord_Steel,
         .alphabeticalOrder = 10,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ILLUMINATE)] =
     {
         .text = gEasyChatWord_Illuminate,
         .alphabeticalOrder = 7,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EARLY_BIRD)] =
     {
         .text = gEasyChatWord_EarlyBird,
         .alphabeticalOrder = 34,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HUSTLE)] =
     {
         .text = gEasyChatWord_Hustle,
         .alphabeticalOrder = 66,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SHINE)] =
     {
         .text = gEasyChatWord_Shine,
         .alphabeticalOrder = 45,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FLYING)] =
     {
         .text = gEasyChatWord_Flying,
         .alphabeticalOrder = 46,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DROUGHT)] =
     {
         .text = gEasyChatWord_Drought,
         .alphabeticalOrder = 59,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LIGHTNINGROD)] =
     {
         .text = gEasyChatWord_Lightningrod,
         .alphabeticalOrder = 17,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_COMPOUNDEYES)] =
     {
         .text = gEasyChatWord_Compoundeyes,
         .alphabeticalOrder = 53,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MARVEL_SCALE)] =
     {
         .text = gEasyChatWord_MarvelScale,
         .alphabeticalOrder = 35,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WONDER_GUARD)] =
     {
         .text = gEasyChatWord_WonderGuard,
         .alphabeticalOrder = 108,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_INSOMNIA)] =
     {
         .text = gEasyChatWord_Insomnia,
         .alphabeticalOrder = 74,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LEVITATE)] =
     {
         .text = gEasyChatWord_Levitate,
         .alphabeticalOrder = 18,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PLUS)] =
     {
         .text = gEasyChatWord_Plus,
         .alphabeticalOrder = 19,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PRESSURE)] =
     {
         .text = gEasyChatWord_Pressure,
         .alphabeticalOrder = 87,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LIQUID_OOZE)] =
     {
         .text = gEasyChatWord_LiquidOoze,
         .alphabeticalOrder = 20,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_COLOR_CHANGE)] =
     {
         .text = gEasyChatWord_ColorChange,
         .alphabeticalOrder = 49,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SOUNDPROOF)] =
     {
         .text = gEasyChatWord_Soundproof,
         .alphabeticalOrder = 70,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EFFECT_SPORE)] =
     {
         .text = gEasyChatWord_EffectSpore,
         .alphabeticalOrder = 1,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PKRS)] =
     {
         .text = gEasyChatWord_Pkrs,
         .alphabeticalOrder = 67,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FIRE)] =
     {
         .text = gEasyChatWord_Fire,
         .alphabeticalOrder = 26,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FLAME_BODY)] =
     {
         .text = gEasyChatWord_FlameBody,
         .alphabeticalOrder = 27,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MINUS)] =
     {
         .text = gEasyChatWord_Minus,
         .alphabeticalOrder = 98,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OWN_TEMPO)] =
     {
         .text = gEasyChatWord_OwnTempo,
         .alphabeticalOrder = 44,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MAGMA_ARMOR)] =
     {
         .text = gEasyChatWord_MagmaArmor,
         .alphabeticalOrder = 42,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WATER)] =
     {
         .text = gEasyChatWord_Water,
         .alphabeticalOrder = 2,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WATER_VEIL)] =
     {
         .text = gEasyChatWord_WaterVeil,
         .alphabeticalOrder = 30,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BUG)] =
     {
         .text = gEasyChatWord_Bug,
         .alphabeticalOrder = 51,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SWARM)] =
     {
         .text = gEasyChatWord_Swarm,
         .alphabeticalOrder = 52,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CUTE_CHARM)] =
     {
         .text = gEasyChatWord_CuteCharm,
         .alphabeticalOrder = 63,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_IMMUNITY)] =
     {
         .text = gEasyChatWord_Immunity,
         .alphabeticalOrder = 65,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BLAZE)] =
     {
         .text = gEasyChatWord_Blaze,
         .alphabeticalOrder = 50,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PICKUP)] =
     {
         .text = gEasyChatWord_Pickup,
         .alphabeticalOrder = 105,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PATTERN)] =
     {
         .text = gEasyChatWord_Pattern,
         .alphabeticalOrder = 55,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FLASH_FIRE)] =
     {
         .text = gEasyChatWord_FlashFire,
         .alphabeticalOrder = 95,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_VITAL_SPIRIT)] =
     {
         .text = gEasyChatWord_VitalSpirit,
         .alphabeticalOrder = 56,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CHLOROPHYLL)] =
     {
         .text = gEasyChatWord_Chlorophyll,
         .alphabeticalOrder = 96,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_PURE_POWER)] =
     {
         .text = gEasyChatWord_PurePower,
         .alphabeticalOrder = 41,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SHIELD_DUST)] =
     {
         .text = gEasyChatWord_ShieldDust,
         .alphabeticalOrder = 80,

src/data/easy_chat/easy_chat_group_time.h

@@ -45,226 +45,271 @@ const u8 gEasyChatWord_Night[] = _("NIGHT");
 const u8 gEasyChatWord_Week[] = _("WEEK");
 
 const struct EasyChatWordInfo gEasyChatGroup_Time[] = {
+    [EC_INDEX(EC_WORD_FALL)] =
     {
         .text = gEasyChatWord_Fall,
         .alphabeticalOrder = 29,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MORNING)] =
     {
         .text = gEasyChatWord_Morning,
         .alphabeticalOrder = 39,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TOMORROW)] =
     {
         .text = gEasyChatWord_Tomorrow,
         .alphabeticalOrder = 6,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LAST)] =
     {
         .text = gEasyChatWord_Last,
         .alphabeticalOrder = 18,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DAY)] =
     {
         .text = gEasyChatWord_Day,
         .alphabeticalOrder = 33,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SOMETIME)] =
     {
         .text = gEasyChatWord_Sometime,
         .alphabeticalOrder = 7,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ALWAYS)] =
     {
         .text = gEasyChatWord_Always,
         .alphabeticalOrder = 37,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CURRENT)] =
     {
         .text = gEasyChatWord_Current,
         .alphabeticalOrder = 4,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FOREVER)] =
     {
         .text = gEasyChatWord_Forever,
         .alphabeticalOrder = 9,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DAYS)] =
     {
         .text = gEasyChatWord_Days,
         .alphabeticalOrder = 35,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_END)] =
     {
         .text = gEasyChatWord_End,
         .alphabeticalOrder = 17,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TUESDAY)] =
     {
         .text = gEasyChatWord_Tuesday,
         .alphabeticalOrder = 10,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_YESTERDAY)] =
     {
         .text = gEasyChatWord_Yesterday,
         .alphabeticalOrder = 0,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TODAY)] =
     {
         .text = gEasyChatWord_Today,
         .alphabeticalOrder = 27,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FRIDAY)] =
     {
         .text = gEasyChatWord_Friday,
         .alphabeticalOrder = 20,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MONDAY)] =
     {
         .text = gEasyChatWord_Monday,
         .alphabeticalOrder = 8,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LATER)] =
     {
         .text = gEasyChatWord_Later,
         .alphabeticalOrder = 14,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EARLIER)] =
     {
         .text = gEasyChatWord_Earlier,
         .alphabeticalOrder = 3,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ANOTHER)] =
     {
         .text = gEasyChatWord_Another,
         .alphabeticalOrder = 16,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TIME)] =
     {
         .text = gEasyChatWord_Time,
         .alphabeticalOrder = 15,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FINISH)] =
     {
         .text = gEasyChatWord_Finish,
         .alphabeticalOrder = 24,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WEDNESDAY)] =
     {
         .text = gEasyChatWord_Wednesday,
         .alphabeticalOrder = 1,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SOON)] =
     {
         .text = gEasyChatWord_Soon,
         .alphabeticalOrder = 40,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_START)] =
     {
         .text = gEasyChatWord_Start,
         .alphabeticalOrder = 28,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MONTH)] =
     {
         .text = gEasyChatWord_Month,
         .alphabeticalOrder = 43,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_STOP)] =
     {
         .text = gEasyChatWord_Stop,
         .alphabeticalOrder = 42,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NOW)] =
     {
         .text = gEasyChatWord_Now,
         .alphabeticalOrder = 26,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FINAL)] =
     {
         .text = gEasyChatWord_Final,
         .alphabeticalOrder = 38,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NEXT)] =
     {
         .text = gEasyChatWord_Next,
         .alphabeticalOrder = 30,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_AGE)] =
     {
         .text = gEasyChatWord_Age,
         .alphabeticalOrder = 5,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SATURDAY)] =
     {
         .text = gEasyChatWord_Saturday,
         .alphabeticalOrder = 22,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SUMMER)] =
     {
         .text = gEasyChatWord_Summer,
         .alphabeticalOrder = 34,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SUNDAY)] =
     {
         .text = gEasyChatWord_Sunday,
         .alphabeticalOrder = 23,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BEGINNING)] =
     {
         .text = gEasyChatWord_Beginning,
         .alphabeticalOrder = 25,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SPRING)] =
     {
         .text = gEasyChatWord_Spring,
         .alphabeticalOrder = 31,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DAYTIME)] =
     {
         .text = gEasyChatWord_Daytime,
         .alphabeticalOrder = 32,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WINTER)] =
     {
         .text = gEasyChatWord_Winter,
         .alphabeticalOrder = 41,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DAILY)] =
     {
         .text = gEasyChatWord_Daily,
         .alphabeticalOrder = 19,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OLDEN)] =
     {
         .text = gEasyChatWord_Olden,
         .alphabeticalOrder = 13,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ALMOST)] =
     {
         .text = gEasyChatWord_Almost,
         .alphabeticalOrder = 2,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NEARLY)] =
     {
         .text = gEasyChatWord_Nearly,
         .alphabeticalOrder = 11,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_THURSDAY)] =
     {
         .text = gEasyChatWord_Thursday,
         .alphabeticalOrder = 21,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NIGHTTIME)] =
     {
         .text = gEasyChatWord_Nighttime,
         .alphabeticalOrder = 44,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NIGHT)] =
     {
         .text = gEasyChatWord_Night,
         .alphabeticalOrder = 36,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WEEK)] =
     {
         .text = gEasyChatWord_Week,
         .alphabeticalOrder = 12,

src/data/easy_chat/easy_chat_group_trainer.h

@@ -27,136 +27,163 @@ const u8 gEasyChatWord_Silver[] = _("SILVER");
 const u8 gEasyChatWord_Emerald[] = _("EMERALD");
 
 const struct EasyChatWordInfo gEasyChatGroup_Trainer[] = {
+    [EC_INDEX(EC_WORD_I_CHOOSE_YOU)] =
     {
         .text = gEasyChatWord_IChooseYou,
         .alphabeticalOrder = 21,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GOTCHA)] =
     {
         .text = gEasyChatWord_Gotcha,
         .alphabeticalOrder = 7,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TRADE)] =
     {
         .text = gEasyChatWord_Trade,
         .alphabeticalOrder = 8,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SAPPHIRE)] =
     {
         .text = gEasyChatWord_Sapphire,
         .alphabeticalOrder = 26,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EVOLVE)] =
     {
         .text = gEasyChatWord_Evolve,
         .alphabeticalOrder = 5,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ENCYCLOPEDIA)] =
     {
         .text = gEasyChatWord_Encyclopedia,
         .alphabeticalOrder = 4,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NATURE)] =
     {
         .text = gEasyChatWord_Nature,
         .alphabeticalOrder = 22,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CENTER)] =
     {
         .text = gEasyChatWord_Center,
         .alphabeticalOrder = 15,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EGG)] =
     {
         .text = gEasyChatWord_Egg,
         .alphabeticalOrder = 23,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LINK)] =
     {
         .text = gEasyChatWord_Link,
         .alphabeticalOrder = 1,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SP_ABILITY)] =
     {
         .text = gEasyChatWord_SpAbility,
         .alphabeticalOrder = 20,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TRAINER)] =
     {
         .text = gEasyChatWord_Trainer,
         .alphabeticalOrder = 0,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_VERSION)] =
     {
         .text = gEasyChatWord_Version,
         .alphabeticalOrder = 24,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_POKENAV)] =
     {
         .text = gEasyChatWord_Pokenav,
         .alphabeticalOrder = 18,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_POKEMON)] =
     {
         .text = gEasyChatWord_Pokemon,
         .alphabeticalOrder = 9,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GET)] =
     {
         .text = gEasyChatWord_Get,
         .alphabeticalOrder = 6,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_POKEDEX)] =
     {
         .text = gEasyChatWord_Pokedex,
         .alphabeticalOrder = 16,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_RUBY)] =
     {
         .text = gEasyChatWord_Ruby,
         .alphabeticalOrder = 14,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LEVEL)] =
     {
         .text = gEasyChatWord_Level,
         .alphabeticalOrder = 13,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_RED)] =
     {
         .text = gEasyChatWord_Red,
         .alphabeticalOrder = 19,
         .enabled = FALSE,
     },
+    [EC_INDEX(EC_WORD_GREEN)] =
     {
         .text = gEasyChatWord_Green,
         .alphabeticalOrder = 17,
         .enabled = FALSE,
     },
+    [EC_INDEX(EC_WORD_BAG)] =
     {
         .text = gEasyChatWord_Bag,
         .alphabeticalOrder = 3,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FLAME)] =
     {
         .text = gEasyChatWord_Flame,
         .alphabeticalOrder = 25,
         .enabled = FALSE,
     },
+    [EC_INDEX(EC_WORD_GOLD)] =
     {
         .text = gEasyChatWord_Gold,
         .alphabeticalOrder = 10,
         .enabled = FALSE,
     },
+    [EC_INDEX(EC_WORD_LEAF)] =
     {
         .text = gEasyChatWord_Leaf,
         .alphabeticalOrder = 2,
         .enabled = FALSE,
     },
+    [EC_INDEX(EC_WORD_SILVER)] =
     {
         .text = gEasyChatWord_Silver,
         .alphabeticalOrder = 11,
         .enabled = FALSE,
     },
+    [EC_INDEX(EC_WORD_EMERALD)] =
     {
         .text = gEasyChatWord_Emerald,
         .alphabeticalOrder = 12,

src/data/easy_chat/easy_chat_group_trendy_saying.h

@@ -33,166 +33,199 @@ const u8 gEasyChatWord_Young[] = _("YOUNG");
 const u8 gEasyChatWord_Ugly[] = _("UGLY");
 
 const struct EasyChatWordInfo gEasyChatGroup_TrendySaying[] = {
+    [EC_INDEX(EC_WORD_KTHX_BYE)] =
     {
         .text = gEasyChatWord_KthxBye,
         .alphabeticalOrder = 7,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_YES_SIR_EXCL)] =
     {
         .text = gEasyChatWord_YesSirExcl,
         .alphabeticalOrder = 2,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_AVANT_GARDE)] =
     {
         .text = gEasyChatWord_AvantGarde,
         .alphabeticalOrder = 28,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_COUPLE)] =
     {
         .text = gEasyChatWord_Couple,
         .alphabeticalOrder = 22,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MUCH_OBLIGED)] =
     {
         .text = gEasyChatWord_MuchObliged,
         .alphabeticalOrder = 9,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_YEEHAW_EXCL)] =
     {
         .text = gEasyChatWord_YeehawExcl,
         .alphabeticalOrder = 3,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MEGA)] =
     {
         .text = gEasyChatWord_Mega,
         .alphabeticalOrder = 8,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_1_HIT_KO_EXCL)] =
     {
         .text = gEasyChatWord_1HitKOExcl,
         .alphabeticalOrder = 26,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DESTINY)] =
     {
         .text = gEasyChatWord_Destiny,
         .alphabeticalOrder = 11,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CANCEL)] =
     {
         .text = gEasyChatWord_Cancel,
         .alphabeticalOrder = 15,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NEW)] =
     {
         .text = gEasyChatWord_New,
         .alphabeticalOrder = 24,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FLATTEN)] =
     {
         .text = gEasyChatWord_Flatten,
         .alphabeticalOrder = 29,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_KIDDING)] =
     {
         .text = gEasyChatWord_Kidding,
         .alphabeticalOrder = 16,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LOSER)] =
     {
         .text = gEasyChatWord_Loser,
         .alphabeticalOrder = 12,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LOSING)] =
     {
         .text = gEasyChatWord_Losing,
         .alphabeticalOrder = 23,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HAPPENING)] =
     {
         .text = gEasyChatWord_Happening,
         .alphabeticalOrder = 0,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HIP_AND)] =
     {
         .text = gEasyChatWord_HipAnd,
         .alphabeticalOrder = 13,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SHAKE)] =
     {
         .text = gEasyChatWord_Shake,
         .alphabeticalOrder = 14,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SHADY)] =
     {
         .text = gEasyChatWord_Shady,
         .alphabeticalOrder = 6,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_UPBEAT)] =
     {
         .text = gEasyChatWord_Upbeat,
         .alphabeticalOrder = 20,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MODERN)] =
     {
         .text = gEasyChatWord_Modern,
         .alphabeticalOrder = 4,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SMELL_YA)] =
     {
         .text = gEasyChatWord_SmellYa,
         .alphabeticalOrder = 10,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BANG)] =
     {
         .text = gEasyChatWord_Bang,
         .alphabeticalOrder = 30,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_KNOCKOUT)] =
     {
         .text = gEasyChatWord_Knockout,
         .alphabeticalOrder = 18,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HASSLE)] =
     {
         .text = gEasyChatWord_Hassle,
         .alphabeticalOrder = 17,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WINNER)] =
     {
         .text = gEasyChatWord_Winner,
         .alphabeticalOrder = 21,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FEVER)] =
     {
         .text = gEasyChatWord_Fever,
         .alphabeticalOrder = 32,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WANNABE)] =
     {
         .text = gEasyChatWord_Wannabe,
         .alphabeticalOrder = 19,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_BABY)] =
     {
         .text = gEasyChatWord_Baby,
         .alphabeticalOrder = 27,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HEART)] =
     {
         .text = gEasyChatWord_Heart,
         .alphabeticalOrder = 25,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OLD)] =
     {
         .text = gEasyChatWord_Old,
         .alphabeticalOrder = 5,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_YOUNG)] =
     {
         .text = gEasyChatWord_Young,
         .alphabeticalOrder = 1,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_UGLY)] =
     {
         .text = gEasyChatWord_Ugly,
         .alphabeticalOrder = 31,

src/data/easy_chat/easy_chat_group_voices.h

@@ -63,316 +63,379 @@ const u8 gEasyChatWord_Gwah[] = _("GWAH");
 const u8 gEasyChatWord_Wahahaha[] = _("WAHAHAHA");
 
 const struct EasyChatWordInfo gEasyChatGroup_Voices[] = {
+    [EC_INDEX(EC_WORD_EXCL)] =
     {
         .text = gEasyChatWord_Excl,
         .alphabeticalOrder = 0,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EXCL_EXCL)] =
     {
         .text = gEasyChatWord_ExclExcl,
         .alphabeticalOrder = 1,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_QUES_EXCL)] =
     {
         .text = gEasyChatWord_QuesExcl,
         .alphabeticalOrder = 7,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_QUES)] =
     {
         .text = gEasyChatWord_Ques,
         .alphabeticalOrder = 8,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ELLIPSIS)] =
     {
         .text = gEasyChatWord_Ellipsis,
         .alphabeticalOrder = 4,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ELLIPSIS_EXCL)] =
     {
         .text = gEasyChatWord_EllipsisExcl,
         .alphabeticalOrder = 5,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS)] =
     {
         .text = gEasyChatWord_EllipsisEllipsisEllipsis,
         .alphabeticalOrder = 6,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DASH)] =
     {
         .text = gEasyChatWord_Dash,
         .alphabeticalOrder = 3,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_DASH_DASH_DASH)] =
     {
         .text = gEasyChatWord_DashDashDash,
         .alphabeticalOrder = 2,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_UH_OH)] =
     {
         .text = gEasyChatWord_UhOh,
         .alphabeticalOrder = 23,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WAAAH)] =
     {
         .text = gEasyChatWord_Waaah,
         .alphabeticalOrder = 11,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_AHAHA)] =
     {
         .text = gEasyChatWord_Ahaha,
         .alphabeticalOrder = 41,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OH_QUES)] =
     {
         .text = gEasyChatWord_OhQues,
         .alphabeticalOrder = 52,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_NOPE)] =
     {
         .text = gEasyChatWord_Nope,
         .alphabeticalOrder = 59,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_URGH)] =
     {
         .text = gEasyChatWord_Urgh,
         .alphabeticalOrder = 22,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HMM)] =
     {
         .text = gEasyChatWord_Hmm,
         .alphabeticalOrder = 25,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WHOAH)] =
     {
         .text = gEasyChatWord_Whoah,
         .alphabeticalOrder = 32,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WROOOAAR_EXCL)] =
     {
         .text = gEasyChatWord_WroooaarExcl,
         .alphabeticalOrder = 24,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WOW)] =
     {
         .text = gEasyChatWord_Wow,
         .alphabeticalOrder = 26,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GIGGLE)] =
     {
         .text = gEasyChatWord_Giggle,
         .alphabeticalOrder = 43,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SIGH)] =
     {
         .text = gEasyChatWord_Sigh,
         .alphabeticalOrder = 19,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_UNBELIEVABLE)] =
     {
         .text = gEasyChatWord_Unbelievable,
         .alphabeticalOrder = 33,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CRIES)] =
     {
         .text = gEasyChatWord_Cries,
         .alphabeticalOrder = 61,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_AGREE)] =
     {
         .text = gEasyChatWord_Agree,
         .alphabeticalOrder = 34,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EH_QUES)] =
     {
         .text = gEasyChatWord_EhQues,
         .alphabeticalOrder = 38,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_CRY)] =
     {
         .text = gEasyChatWord_Cry,
         .alphabeticalOrder = 40,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EHEHE)] =
     {
         .text = gEasyChatWord_Ehehe,
         .alphabeticalOrder = 48,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OI_OI_OI)] =
     {
         .text = gEasyChatWord_OiOiOi,
         .alphabeticalOrder = 37,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OH_YEAH)] =
     {
         .text = gEasyChatWord_OhYeah,
         .alphabeticalOrder = 47,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OH)] =
     {
         .text = gEasyChatWord_Oh,
         .alphabeticalOrder = 42,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OOPS)] =
     {
         .text = gEasyChatWord_Oops,
         .alphabeticalOrder = 15,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SHOCKED)] =
     {
         .text = gEasyChatWord_Shocked,
         .alphabeticalOrder = 49,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_EEK)] =
     {
         .text = gEasyChatWord_Eek,
         .alphabeticalOrder = 46,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GRAAAH)] =
     {
         .text = gEasyChatWord_Graaah,
         .alphabeticalOrder = 57,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GWAHAHAHA)] =
     {
         .text = gEasyChatWord_Gwahahaha,
         .alphabeticalOrder = 44,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WAY)] =
     {
         .text = gEasyChatWord_Way,
         .alphabeticalOrder = 54,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_TCH)] =
     {
         .text = gEasyChatWord_Tch,
         .alphabeticalOrder = 53,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HEHE)] =
     {
         .text = gEasyChatWord_Hehe,
         .alphabeticalOrder = 13,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HAH)] =
     {
         .text = gEasyChatWord_Hah,
         .alphabeticalOrder = 29,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_YUP)] =
     {
         .text = gEasyChatWord_Yup,
         .alphabeticalOrder = 51,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HAHAHA)] =
     {
         .text = gEasyChatWord_Hahaha,
         .alphabeticalOrder = 28,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_AIYEEH)] =
     {
         .text = gEasyChatWord_Aiyeeh,
         .alphabeticalOrder = 55,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HIYAH)] =
     {
         .text = gEasyChatWord_Hiyah,
         .alphabeticalOrder = 12,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_FUFUFU)] =
     {
         .text = gEasyChatWord_Fufufu,
         .alphabeticalOrder = 27,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LOL)] =
     {
         .text = gEasyChatWord_Lol,
         .alphabeticalOrder = 56,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_SNORT)] =
     {
         .text = gEasyChatWord_Snort,
         .alphabeticalOrder = 30,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HUMPH)] =
     {
         .text = gEasyChatWord_Humph,
         .alphabeticalOrder = 31,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HEHEHE)] =
     {
         .text = gEasyChatWord_Hehehe,
         .alphabeticalOrder = 20,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HEH)] =
     {
         .text = gEasyChatWord_Heh,
         .alphabeticalOrder = 45,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_HOHOHO)] =
     {
         .text = gEasyChatWord_Hohoho,
         .alphabeticalOrder = 36,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_UH_HUH)] =
     {
         .text = gEasyChatWord_UhHuh,
         .alphabeticalOrder = 50,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OH_DEAR)] =
     {
         .text = gEasyChatWord_OhDear,
         .alphabeticalOrder = 9,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_ARRGH)] =
     {
         .text = gEasyChatWord_Arrgh,
         .alphabeticalOrder = 21,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MUFUFU)] =
     {
         .text = gEasyChatWord_Mufufu,
         .alphabeticalOrder = 14,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_MMM)] =
     {
         .text = gEasyChatWord_Mmm,
         .alphabeticalOrder = 10,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OH_KAY)] =
     {
         .text = gEasyChatWord_OhKay,
         .alphabeticalOrder = 62,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_OKAY)] =
     {
         .text = gEasyChatWord_Okay,
         .alphabeticalOrder = 35,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_LALALA)] =
     {
         .text = gEasyChatWord_Lalala,
         .alphabeticalOrder = 16,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_YAY)] =
     {
         .text = gEasyChatWord_Yay,
         .alphabeticalOrder = 18,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_AWW)] =
     {
         .text = gEasyChatWord_Aww,
         .alphabeticalOrder = 60,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WOWEE)] =
     {
         .text = gEasyChatWord_Wowee,
         .alphabeticalOrder = 17,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_GWAH)] =
     {
         .text = gEasyChatWord_Gwah,
         .alphabeticalOrder = 58,
         .enabled = TRUE,
     },
+    [EC_INDEX(EC_WORD_WAHAHAHA)] =
     {
         .text = gEasyChatWord_Wahahaha,
         .alphabeticalOrder = 39,

src/data/easy_chat/easy_chat_groups.h

@@ -24,111 +24,133 @@
 #include "easy_chat_group_pokemon2.h"
 
 const struct EasyChatGroup gEasyChatGroups[] = {
+    [EC_GROUP_POKEMON] =
     {
         .wordData = {.valueList = gEasyChatGroup_Pokemon},
         .numWords = ARRAY_COUNT(gEasyChatGroup_Pokemon),
         .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Pokemon),
     },
+    [EC_GROUP_TRAINER] =
     {
         .wordData = {.words = gEasyChatGroup_Trainer},
         .numWords = ARRAY_COUNT(gEasyChatGroup_Trainer),
         .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Trainer) - 6, // Excludes Red, Green, Flame, Gold, Leaf, and Silver
     },
+    [EC_GROUP_STATUS] =
     {
         .wordData = {.words = gEasyChatGroup_Status},
         .numWords = ARRAY_COUNT(gEasyChatGroup_Status),
         .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Status),
     },
+    [EC_GROUP_BATTLE] =
     {
         .wordData = {.words = gEasyChatGroup_Battle},
         .numWords = ARRAY_COUNT(gEasyChatGroup_Battle),
         .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Battle),
     },
+    [EC_GROUP_GREETINGS] =
     {
         .wordData = {.words = gEasyChatGroup_Greetings},
         .numWords = ARRAY_COUNT(gEasyChatGroup_Greetings),
         .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Greetings),
     },
+    [EC_GROUP_PEOPLE] =
     {
         .wordData = {.words = gEasyChatGroup_People},
         .numWords = ARRAY_COUNT(gEasyChatGroup_People),
         .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_People),
     },
+    [EC_GROUP_VOICES] =
     {
         .wordData = {.words = gEasyChatGroup_Voices},
         .numWords = ARRAY_COUNT(gEasyChatGroup_Voices),
         .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Voices),
     },
+    [EC_GROUP_SPEECH] =
     {
         .wordData = {.words = gEasyChatGroup_Speech},
         .numWords = ARRAY_COUNT(gEasyChatGroup_Speech),
         .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Speech),
     },
+    [EC_GROUP_ENDINGS] =
     {
         .wordData = {.words = gEasyChatGroup_Endings},
         .numWords = ARRAY_COUNT(gEasyChatGroup_Endings),
         .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Endings),
     },
+    [EC_GROUP_FEELINGS] =
     {
         .wordData = {.words = gEasyChatGroup_Feelings},
         .numWords = ARRAY_COUNT(gEasyChatGroup_Feelings),
         .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Feelings),
     },
+    [EC_GROUP_CONDITIONS] =
     {
         .wordData = {.words = gEasyChatGroup_Conditions},
         .numWords = ARRAY_COUNT(gEasyChatGroup_Conditions),
         .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Conditions),
     },
+    [EC_GROUP_ACTIONS] =
     {
         .wordData = {.words = gEasyChatGroup_Actions},
         .numWords = ARRAY_COUNT(gEasyChatGroup_Actions),
         .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Actions),
     },
+    [EC_GROUP_LIFESTYLE] =
     {
         .wordData = {.words = gEasyChatGroup_Lifestyle},
         .numWords = ARRAY_COUNT(gEasyChatGroup_Lifestyle),
         .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Lifestyle),
     },
+    [EC_GROUP_HOBBIES] =
     {
         .wordData = {.words = gEasyChatGroup_Hobbies},
         .numWords = ARRAY_COUNT(gEasyChatGroup_Hobbies),
         .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Hobbies),
     },
+    [EC_GROUP_TIME] =
     {
         .wordData = {.words = gEasyChatGroup_Time},
         .numWords = ARRAY_COUNT(gEasyChatGroup_Time),
         .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Time),
     },
+    [EC_GROUP_MISC] =
     {
         .wordData = {.words = gEasyChatGroup_Misc},
         .numWords = ARRAY_COUNT(gEasyChatGroup_Misc),
         .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Misc),
     },
+    [EC_GROUP_ADJECTIVES] =
     {
         .wordData = {.words = gEasyChatGroup_Adjectives},
         .numWords = ARRAY_COUNT(gEasyChatGroup_Adjectives),
         .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Adjectives),
     },
+    [EC_GROUP_EVENTS] =
     {
         .wordData = {.words = gEasyChatGroup_Events},
         .numWords = ARRAY_COUNT(gEasyChatGroup_Events),
         .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Events),
     },
+    [EC_GROUP_MOVE_1] =
     {
         .wordData = {.valueList = gEasyChatGroup_Move1},
         .numWords = ARRAY_COUNT(gEasyChatGroup_Move1),
         .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Move1),
     },
+    [EC_GROUP_MOVE_2] =
     {
         .wordData = {.valueList = gEasyChatGroup_Move2},
         .numWords = ARRAY_COUNT(gEasyChatGroup_Move2),
         .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Move2),
     },
+    [EC_GROUP_TRENDY_SAYING] =
     {
         .wordData = {.words = gEasyChatGroup_TrendySaying},
         .numWords = ARRAY_COUNT(gEasyChatGroup_TrendySaying),
         .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_TrendySaying),
     },
+    [EC_GROUP_POKEMON_NATIONAL] =
     {
         .wordData = {.valueList = gEasyChatGroup_Pokemon2},
         .numWords = ARRAY_COUNT(gEasyChatGroup_Pokemon2),

src/daycare.c

@@ -1031,8 +1031,8 @@ static u8 GetDaycareCompatibilityScore(struct DayCare *daycare)
         trainerIds[i] = GetBoxMonData(&daycare->mons[i].mon, MON_DATA_OT_ID);
         personality = GetBoxMonData(&daycare->mons[i].mon, MON_DATA_PERSONALITY);
         genders[i] = GetGenderFromSpeciesAndPersonality(species[i], personality);
-        eggGroups[i][0] = gSpeciesInfo[species[i]].eggGroup1;
-        eggGroups[i][1] = gSpeciesInfo[species[i]].eggGroup2;
+        eggGroups[i][0] = gSpeciesInfo[species[i]].eggGroups[0];
+        eggGroups[i][1] = gSpeciesInfo[species[i]].eggGroups[1];
     }
 
     // check unbreedable egg group

src/decoration.c

@@ -688,7 +688,7 @@ static void ReturnToDecorationActionsAfterInvalidSelection(u8 taskId)
 
 static void SecretBasePC_PrepMenuForSelectingStoredDecors(u8 taskId)
 {
-    LoadPalette(sDecorationMenuPalette, 0xd0, 0x20);
+    LoadPalette(sDecorationMenuPalette, BG_PLTT_ID(13), PLTT_SIZE_4BPP);
     ClearDialogWindowAndFrame(0, FALSE);
     RemoveDecorationWindow(WINDOW_MAIN_MENU);
     InitDecorationCategoriesWindow(taskId);
@@ -834,7 +834,7 @@ static void ReturnToActionsMenuFromCategories(u8 taskId)
 
 void ShowDecorationCategoriesWindow(u8 taskId)
 {
-    LoadPalette(sDecorationMenuPalette, 0xd0, 0x20);
+    LoadPalette(sDecorationMenuPalette, BG_PLTT_ID(13), PLTT_SIZE_4BPP);
     ClearDialogWindowAndFrame(0, FALSE);
     gTasks[taskId].tDecorationMenuCommand = DECOR_MENU_TRADE;
     sCurDecorationCategory = DECORCAT_DESK;

src/diploma.c

@@ -72,7 +72,7 @@ void CB2_ShowDiploma(void)
     ResetSpriteData();
     ResetPaletteFade();
     FreeAllSpritePalettes();
-    LoadPalette(sDiplomaPalettes, 0, 64);
+    LoadPalette(sDiplomaPalettes, BG_PLTT_ID(0), 2 * PLTT_SIZE_4BPP);
     sDiplomaTilemapPtr = Alloc(0x1000);
     InitDiplomaBg();
     InitDiplomaWindow();
@@ -196,7 +196,7 @@ static void InitDiplomaWindow(void)
 {
     InitWindows(sDiplomaWinTemplates);
     DeactivateAllTextPrinters();
-    LoadPalette(gStandardMenuPalette, 0xF0, 0x20);
+    LoadPalette(gStandardMenuPalette, BG_PLTT_ID(15), PLTT_SIZE_4BPP);
     FillWindowPixelBuffer(0, PIXEL_FILL(0));
     PutWindowTilemap(0);
 }

src/dodrio_berry_picking.c

@@ -3005,8 +3005,8 @@ static void PrintRecordsText(u8 windowId, s32 width)
     recordNums[1] = gSaveBlock2Ptr->berryPick.bestScore;
     recordNums[2] = gSaveBlock2Ptr->berryPick.berriesPickedInRow;
 
-    LoadUserWindowBorderGfx_(windowId, 0x21D, 0xD0);
-    DrawTextBorderOuter(windowId, 0x21D, 0xD);
+    LoadUserWindowBorderGfx_(windowId, 0x21D, BG_PLTT_ID(13));
+    DrawTextBorderOuter(windowId, 0x21D, 13);
     FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
     AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_BerryPickingRecords, GetStringCenterAlignXOffset(FONT_NORMAL, gText_BerryPickingRecords, width * 8), 1, TEXT_SKIP_DRAW, NULL);
     for (i = 0; i < NUM_RECORD_TYPES; i++)
@@ -4429,12 +4429,12 @@ static void ResetBerryAndStatusBarSprites(void)
 static void LoadWindowFrameGfx(u8 frameId)
 {
     LoadBgTiles(BG_INTERFACE, GetWindowFrameTilesPal(frameId)->tiles, 0x120, 1);
-    LoadPalette(GetWindowFrameTilesPal(frameId)->pal, 0xA0, 0x20);
+    LoadPalette(GetWindowFrameTilesPal(frameId)->pal, BG_PLTT_ID(10), PLTT_SIZE_4BPP);
 }
 
 static void LoadUserWindowFrameGfx(void)
 {
-    LoadUserWindowBorderGfx_(0, 0xA, 0xB0);
+    LoadUserWindowBorderGfx_(0, 0xA, BG_PLTT_ID(11));
 }
 
 static void ResetGfxState(void)
@@ -5193,7 +5193,7 @@ static bool32 LoadBgGfx(void)
     switch (sGfx->loadState)
     {
     case 0:
-        LoadPalette(sBg_Pal, 0, sizeof(sBg_Pal));
+        LoadPalette(sBg_Pal, BG_PLTT_ID(0), sizeof(sBg_Pal));
         break;
     case 1:
         ResetTempTileDataBuffers();
@@ -5209,7 +5209,7 @@ static bool32 LoadBgGfx(void)
             return FALSE;
         break;
     case 5:
-        LoadPalette(GetTextWindowPalette(3), 0xD0, 0x20);
+        LoadPalette(GetTextWindowPalette(3), BG_PLTT_ID(13), PLTT_SIZE_4BPP);
         break;
     default:
         sGfx->loadState = 0;

src/easy_chat.c

@@ -879,17 +879,17 @@ static const u8 *const sEasyChatKeyboardAlphabet[NUM_ALPHABET_ROWS] =
 static const struct SpriteSheet sSpriteSheets[] = {
     {
         .data = sTriangleCursor_Gfx,
-        .size = 0x20,
+        .size = sizeof(sTriangleCursor_Gfx),
         .tag = GFXTAG_TRIANGLE_CURSOR
     },
     {
         .data = sScrollIndicator_Gfx,
-        .size = 0x100,
+        .size = sizeof(sScrollIndicator_Gfx),
         .tag = GFXTAG_SCROLL_INDICATOR
     },
     {
         .data = sStartSelectButtons_Gfx,
-        .size = 0x100,
+        .size = sizeof(sStartSelectButtons_Gfx),
         .tag = GFXTAG_START_SELECT_BUTTONS
     },
     {0}
@@ -3929,13 +3929,13 @@ static void InitEasyChatBgs(void)
 static void LoadEasyChatPalettes(void)
 {
     ResetPaletteFade();
-    LoadPalette(gEasyChatMode_Pal, 0, 32);
-    LoadPalette(sTextInputFrameOrange_Pal, 1 * 16, 32);
-    LoadPalette(sTextInputFrameGreen_Pal, 4 * 16, 32);
-    LoadPalette(sTitleText_Pal, 10 * 16, 8);
-    LoadPalette(sText_Pal, 11 * 16, 12);
-    LoadPalette(sText_Pal, 15 * 16, 12);
-    LoadPalette(sText_Pal, 3 * 16, 12);
+    LoadPalette(gEasyChatMode_Pal, BG_PLTT_ID(0), PLTT_SIZE_4BPP);
+    LoadPalette(sTextInputFrameOrange_Pal, BG_PLTT_ID(1), PLTT_SIZE_4BPP);
+    LoadPalette(sTextInputFrameGreen_Pal, BG_PLTT_ID(4), PLTT_SIZE_4BPP);
+    LoadPalette(sTitleText_Pal, BG_PLTT_ID(10), PLTT_SIZEOF(4));
+    LoadPalette(sText_Pal, BG_PLTT_ID(11), PLTT_SIZEOF(6));
+    LoadPalette(sText_Pal, BG_PLTT_ID(15), PLTT_SIZEOF(6));
+    LoadPalette(sText_Pal, BG_PLTT_ID(3), PLTT_SIZEOF(6));
 }
 
 static void PrintTitle(void)
@@ -3969,7 +3969,7 @@ static void PrintEasyChatTextWithColors(u8 windowId, u8 fontId, const u8 *str, u
 static void PrintInitialInstructions(void)
 {
     FillBgTilemapBufferRect(0, 0, 0, 0, 32, 20, 17);
-    LoadUserWindowBorderGfx(WIN_MSG, 1, 0xE0);
+    LoadUserWindowBorderGfx(WIN_MSG, 1, BG_PLTT_ID(14));
     DrawTextBorderOuter(WIN_MSG, 1, 14);
     PrintEasyChatStdMessage(MSG_INSTRUCTIONS);
     PutWindowTilemap(WIN_MSG);

src/egg_hatch.c

@@ -145,14 +145,14 @@ static const union AnimCmd *const sSpriteAnimTable_Egg[] =
 static const struct SpriteSheet sEggHatch_Sheet =
 {
     .data = sEggHatchTiles,
-    .size = 0x800,
+    .size = sizeof(sEggHatchTiles),
     .tag = GFXTAG_EGG,
 };
 
 static const struct SpriteSheet sEggShards_Sheet =
 {
     .data = sEggShardTiles,
-    .size = 0x80,
+    .size = sizeof(sEggShardTiles),
     .tag = GFXTAG_EGG_SHARD,
 };
 
@@ -532,7 +532,7 @@ static void CB2_LoadEggHatch(void)
     case 2:
         DecompressAndLoadBgGfxUsingHeap(0, gBattleTextboxTiles, 0, 0, 0);
         CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0);
-        LoadCompressedPalette(gBattleTextboxPalette, 0, 0x20);
+        LoadCompressedPalette(gBattleTextboxPalette, BG_PLTT_ID(0), PLTT_SIZE_4BPP);
         gMain.state++;
         break;
     case 3:
@@ -556,7 +556,7 @@ static void CB2_LoadEggHatch(void)
         break;
     case 7:
         SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
-        LoadPalette(gTradeGba2_Pal, 0x10, 0xA0);
+        LoadPalette(gTradeGba2_Pal, BG_PLTT_ID(1), 5 * PLTT_SIZE_4BPP);
         LoadBgTiles(1, gTradeGba_Gfx, 0x1420, 0);
         CopyToBgTilemapBuffer(1, gTradePlatform_Tilemap, 0x1000, 0);
         CopyBgTilemapBufferToVram(1);
@@ -678,7 +678,7 @@ static void CB2_EggHatch(void)
         // Print the nickname prompt
         if (!IsTextPrinterActive(sEggHatchData->windowId))
         {
-            LoadUserWindowBorderGfx(sEggHatchData->windowId, 0x140, 0xE0);
+            LoadUserWindowBorderGfx(sEggHatchData->windowId, 0x140, BG_PLTT_ID(14));
             CreateYesNoMenu(&sYesNoWinTemplate, 0x140, 0xE, 0);
             sEggHatchData->state++;
         }

src/event_object_movement.c

@@ -497,7 +497,12 @@ static const struct SpritePalette sObjectEventSpritePalettes[] = {
     {gObjectEventPal_Lugia,                 OBJ_EVENT_PAL_TAG_LUGIA},
     {gObjectEventPal_RubySapphireBrendan,   OBJ_EVENT_PAL_TAG_RS_BRENDAN},
     {gObjectEventPal_RubySapphireMay,       OBJ_EVENT_PAL_TAG_RS_MAY},
-    {},
+#ifdef BUGFIX
+    {NULL,                                  OBJ_EVENT_PAL_TAG_NONE}, 
+#else
+    {}, // BUG: FindObjectEventPaletteIndexByTag looks for OBJ_EVENT_PAL_TAG_NONE and not 0x0.
+        // If it's looking for a tag that isn't in this table, the game locks in an infinite loop.
+#endif
 };
 
 static const u16 sReflectionPaletteTags_Brendan[] = {
@@ -1993,7 +1998,12 @@ static void LoadObjectEventPalette(u16 paletteTag)
 {
     u16 i = FindObjectEventPaletteIndexByTag(paletteTag);
 
-    if (i != OBJ_EVENT_PAL_TAG_NONE) // always true
+// FindObjectEventPaletteIndexByTag returns 0xFF on failure, not OBJ_EVENT_PAL_TAG_NONE.
+#ifdef BUGFIX
+    if (i != 0xFF)
+#else
+    if (i != OBJ_EVENT_PAL_TAG_NONE)
+#endif
         LoadSpritePaletteIfTagExists(&sObjectEventSpritePalettes[i]);
 }
 
@@ -2016,9 +2026,10 @@ static u8 LoadSpritePaletteIfTagExists(const struct SpritePalette *spritePalette
 
 void PatchObjectPalette(u16 paletteTag, u8 paletteSlot)
 {
+    // paletteTag is assumed to exist in sObjectEventSpritePalettes
     u8 paletteIndex = FindObjectEventPaletteIndexByTag(paletteTag);
 
-    LoadPalette(sObjectEventSpritePalettes[paletteIndex].data, 16 * paletteSlot + 0x100, 0x20);
+    LoadPalette(sObjectEventSpritePalettes[paletteIndex].data, OBJ_PLTT_ID(paletteSlot), PLTT_SIZE_4BPP);
 }
 
 void PatchObjectPaletteRange(const u16 *paletteTags, u8 minSlot, u8 maxSlot)

src/evolution_scene.c

@@ -263,7 +263,7 @@ void EvolutionScene(struct Pokemon *mon, u16 postEvoSpecies, bool8 canStopEvo, u
                              gMonSpritesGfxPtr->sprites.ptr[B_POSITION_OPPONENT_LEFT],
                              currSpecies);
     pokePal = GetMonSpritePalStructFromOtIdPersonality(currSpecies, trainerId, personality);
-    LoadCompressedPalette(pokePal->data, 0x110, 0x20);
+    LoadCompressedPalette(pokePal->data, OBJ_PLTT_ID(1), PLTT_SIZE_4BPP);
 
     SetMultiuseSpriteTemplateToPokemon(currSpecies, B_POSITION_OPPONENT_LEFT);
     gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
@@ -278,7 +278,7 @@ void EvolutionScene(struct Pokemon *mon, u16 postEvoSpecies, bool8 canStopEvo, u
                              gMonSpritesGfxPtr->sprites.ptr[B_POSITION_OPPONENT_RIGHT],
                              postEvoSpecies);
     pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality);
-    LoadCompressedPalette(pokePal->data, 0x120, 0x20);
+    LoadCompressedPalette(pokePal->data, OBJ_PLTT_ID(2), PLTT_SIZE_4BPP);
 
     SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, B_POSITION_OPPONENT_RIGHT);
     gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
@@ -356,7 +356,7 @@ static void CB2_EvolutionSceneLoadGraphics(void)
                              postEvoSpecies);
     pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality);
 
-    LoadCompressedPalette(pokePal->data, 0x120, 0x20);
+    LoadCompressedPalette(pokePal->data, OBJ_PLTT_ID(2), PLTT_SIZE_4BPP);
 
     SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, B_POSITION_OPPONENT_RIGHT);
     gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
@@ -427,7 +427,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void)
                                      gMonSpritesGfxPtr->sprites.ptr[B_POSITION_OPPONENT_RIGHT],
                                      postEvoSpecies);
             pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality);
-            LoadCompressedPalette(pokePal->data, 0x120, 0x20);
+            LoadCompressedPalette(pokePal->data, OBJ_PLTT_ID(2), PLTT_SIZE_4BPP);
             gMain.state++;
         }
         break;
@@ -492,7 +492,7 @@ void TradeEvolutionScene(struct Pokemon *mon, u16 postEvoSpecies, u8 preEvoSprit
                             postEvoSpecies);
 
     pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality);
-    LoadCompressedPalette(pokePal->data, 0x120, 0x20);
+    LoadCompressedPalette(pokePal->data, OBJ_PLTT_ID(2), PLTT_SIZE_4BPP);
 
     SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, B_POSITION_OPPONENT_LEFT);
     gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
@@ -1301,7 +1301,7 @@ static void Task_TradeEvolutionScene(u8 taskId)
         case T_MVSTATE_PRINT_YES_NO:
             if (!IsTextPrinterActive(0) && !IsSEPlaying())
             {
-                LoadUserWindowBorderGfx(0, 0xA8, 0xE0);
+                LoadUserWindowBorderGfx(0, 0xA8, BG_PLTT_ID(14));
                 CreateYesNoMenu(&gTradeEvolutionSceneYesNoWindowTemplate, 0xA8, 0xE, 0);
                 sEvoCursorPos = 0;
                 gTasks[taskId].tLearnMoveState++;
@@ -1507,7 +1507,7 @@ static void Task_UpdateBgPalette(u8 taskId)
         else
         {
             // Haven't reached final palette in current stage, load the current palette
-            LoadPalette(&sBgAnimPal[tPalStage * 16], 0xA0, 0x20);
+            LoadPalette(&sBgAnimPal[tPalStage * 16], BG_PLTT_ID(10), PLTT_SIZE_4BPP);
             tCycleTimer = 0;
             tPalStage++;
         }
@@ -1605,7 +1605,7 @@ static void StartBgAnimation(bool8 isLink)
     else
         innerBgId = 1, outerBgId = 3;
 
-    LoadPalette(sBgAnim_Intro_Pal, 0xA0, 0x20);
+    LoadPalette(sBgAnim_Intro_Pal, BG_PLTT_ID(10), PLTT_SIZE_4BPP);
 
     DecompressAndLoadBgGfxUsingHeap(1, sBgAnim_Gfx, FALSE, 0, 0);
     CopyToBgTilemapBuffer(innerBgId, sBgAnim_Inner_Tilemap, 0, 0);
@@ -1644,7 +1644,7 @@ static void PauseBgPaletteAnim(void)
     if (taskId != TASK_NONE)
         gTasks[taskId].tPaused = TRUE;
 
-    FillPalette(RGB_BLACK, 0xA0, 0x20);
+    FillPalette(RGB_BLACK, BG_PLTT_ID(10), PLTT_SIZE_4BPP);
 }
 
 #undef tPaused
@@ -1658,7 +1658,7 @@ static void StopBgAnimation(void)
     if ((taskId = FindTaskIdByFunc(Task_AnimateBg)) != TASK_NONE)
         DestroyTask(taskId);
 
-    FillPalette(RGB_BLACK, 0xA0, 0x20);
+    FillPalette(RGB_BLACK, BG_PLTT_ID(10), PLTT_SIZE_4BPP);
     RestoreBgAfterAnim();
 }
 

src/field_effect.c

@@ -903,7 +903,7 @@ u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buf
 void LoadTrainerGfx_TrainerCard(u8 gender, u16 palOffset, u8 *dest)
 {
     LZDecompressVram(gTrainerFrontPicTable[gender].data, dest);
-    LoadCompressedPalette(gTrainerFrontPicPaletteTable[gender].data, palOffset, 0x20);
+    LoadCompressedPalette(gTrainerFrontPicPaletteTable[gender].data, palOffset, PLTT_SIZE_4BPP);
 }
 
 u8 AddNewGameBirchObject(s16 x, s16 y, u8 subpriority)
@@ -2630,7 +2630,7 @@ static void FieldMoveShowMonOutdoorsEffect_LoadGfx(struct Task *task)
     u16 delta = ((REG_BG0CNT >> 8) << 11);
     CpuCopy16(sFieldMoveStreaksOutdoors_Gfx, (void *)(VRAM + offset), 0x200);
     CpuFill32(0, (void *)(VRAM + delta), 0x800);
-    LoadPalette(sFieldMoveStreaksOutdoors_Pal, 0xf0, sizeof(sFieldMoveStreaksOutdoors_Pal));
+    LoadPalette(sFieldMoveStreaksOutdoors_Pal, BG_PLTT_ID(15), sizeof(sFieldMoveStreaksOutdoors_Pal));
     LoadFieldMoveOutdoorStreaksTilemap(delta);
     task->tState++;
 }
@@ -2793,7 +2793,7 @@ static void FieldMoveShowMonIndoorsEffect_LoadGfx(struct Task *task)
     task->data[12] = delta;
     CpuCopy16(sFieldMoveStreaksIndoors_Gfx, (void *)(VRAM + offset), 0x80);
     CpuFill32(0, (void *)(VRAM + delta), 0x800);
-    LoadPalette(sFieldMoveStreaksIndoors_Pal, 0xf0, sizeof(sFieldMoveStreaksIndoors_Pal));
+    LoadPalette(sFieldMoveStreaksIndoors_Pal, BG_PLTT_ID(15), sizeof(sFieldMoveStreaksIndoors_Pal));
     task->tState++;
 }
 
@@ -3092,7 +3092,7 @@ u8 FldEff_RayquazaSpotlight(void)
     SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD);
     SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(14, 14));
     SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR);
-    LoadPalette(sSpotlight_Pal, 0xC0, sizeof(sSpotlight_Pal));
+    LoadPalette(sSpotlight_Pal, BG_PLTT_ID(12), sizeof(sSpotlight_Pal));
     SetGpuReg(REG_OFFSET_BG0VOFS, 120);
     for (i = 3; i < 15; i++)
     {

src/field_region_map.c

@@ -115,7 +115,7 @@ static void MCB2_InitRegionMapRegisters(void)
     InitBgsFromTemplates(1, sFieldRegionMapBgTemplates, ARRAY_COUNT(sFieldRegionMapBgTemplates));
     InitWindows(sFieldRegionMapWindowTemplates);
     DeactivateAllTextPrinters();
-    LoadUserWindowBorderGfx(0, 0x27, 0xd0);
+    LoadUserWindowBorderGfx(0, 0x27, BG_PLTT_ID(13));
     ClearScheduledBgCopiesToVram();
     SetMainCallback2(MCB2_FieldUpdateRegionMap);
     SetVBlankCallback(VBCB_FieldUpdateRegionMap);

src/field_screen_effect.c

@@ -1079,9 +1079,7 @@ static void LoadOrbEffectPalette(bool8 blueOrb)
         color[0] = RGB_BLUE;
 
     for (i = 0; i < 16; i++)
-    {
-        LoadPalette(color, 0xF0 + i, 2);
-    }
+        LoadPalette(color, BG_PLTT_ID(15) + i, PLTT_SIZEOF(1));
 }
 
 static bool8 UpdateOrbEffectBlend(u16 shakeDir)

src/field_specials.c

@@ -583,16 +583,16 @@ static void LoadLinkPartnerObjectEventSpritePalette(u8 graphicsId, u8 localEvent
             switch (graphicsId)
             {
             case OBJ_EVENT_GFX_LINK_RS_BRENDAN:
-                LoadPalette(gObjectEventPal_RubySapphireBrendan, 0x100 + (adjustedPaletteNum << 4), 0x20);
+                LoadPalette(gObjectEventPal_RubySapphireBrendan, OBJ_PLTT_ID(adjustedPaletteNum), PLTT_SIZE_4BPP);
                 break;
             case OBJ_EVENT_GFX_LINK_RS_MAY:
-                LoadPalette(gObjectEventPal_RubySapphireMay, 0x100 + (adjustedPaletteNum << 4), 0x20);
+                LoadPalette(gObjectEventPal_RubySapphireMay, OBJ_PLTT_ID(adjustedPaletteNum), PLTT_SIZE_4BPP);
                 break;
             case OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL:
-                LoadPalette(gObjectEventPal_Brendan, 0x100 + (adjustedPaletteNum << 4), 0x20);
+                LoadPalette(gObjectEventPal_Brendan, OBJ_PLTT_ID(adjustedPaletteNum), PLTT_SIZE_4BPP);
                 break;
             case OBJ_EVENT_GFX_RIVAL_MAY_NORMAL:
-                LoadPalette(gObjectEventPal_May, 0x100 + (adjustedPaletteNum << 4), 0x20);
+                LoadPalette(gObjectEventPal_May, OBJ_PLTT_ID(adjustedPaletteNum), PLTT_SIZE_4BPP);
                 break;
             }
         }
@@ -1196,7 +1196,7 @@ void IsGrassTypeInParty(void)
         if (GetMonData(pokemon, MON_DATA_SANITY_HAS_SPECIES) && !GetMonData(pokemon, MON_DATA_IS_EGG))
         {
             species = GetMonData(pokemon, MON_DATA_SPECIES);
-            if (gSpeciesInfo[species].type1 == TYPE_GRASS || gSpeciesInfo[species].type2 == TYPE_GRASS)
+            if (gSpeciesInfo[species].types[0] == TYPE_GRASS || gSpeciesInfo[species].types[1] == TYPE_GRASS)
             {
                 gSpecialVar_Result = TRUE;
                 return;
@@ -1234,9 +1234,9 @@ void GetSecretBaseNearbyMapName(void)
     GetMapName(gStringVar1, VarGet(VAR_SECRET_BASE_MAP), 0);
 }
 
-u16 GetBestBattleTowerStreak(void)
+u16 GetBattleTowerSinglesStreak(void)
 {
-    return GetGameStat(GAME_STAT_BATTLE_TOWER_BEST_STREAK);
+    return GetGameStat(GAME_STAT_BATTLE_TOWER_SINGLES_STREAK);
 }
 
 void BufferEReaderTrainerName(void)
@@ -3266,7 +3266,7 @@ static void Task_DeoxysRockInteraction(u8 taskId)
 static void ChangeDeoxysRockLevel(u8 rockLevel)
 {
     u8 objectEventId;
-    LoadPalette(&sDeoxysRockPalettes[rockLevel], 0x1A0, 8);
+    LoadPalette(&sDeoxysRockPalettes[rockLevel], OBJ_PLTT_ID(10), PLTT_SIZEOF(4));
     TryGetObjectEventIdByLocalIdAndMap(LOCALID_BIRTH_ISLAND_EXTERIOR_ROCK, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId);
 
     if (rockLevel == 0)
@@ -3314,7 +3314,7 @@ void IncrementBirthIslandRockStepCount(void)
 
 void SetDeoxysRockPalette(void)
 {
-    LoadPalette(&sDeoxysRockPalettes[(u8)VarGet(VAR_DEOXYS_ROCK_LEVEL)], 0x1A0, 8);
+    LoadPalette(&sDeoxysRockPalettes[(u8)VarGet(VAR_DEOXYS_ROCK_LEVEL)], OBJ_PLTT_ID(10), PLTT_SIZEOF(4));
     BlendPalettes(0x04000000, 16, 0);
 }
 

src/field_weather.c

@@ -552,7 +552,7 @@ static void ApplyColorMapWithBlend(u8 startPalIndex, u8 numPalettes, s8 colorMap
     u8 gBlend = color.g;
     u8 bBlend = color.b;
 
-    palOffset = startPalIndex * 16;
+    palOffset = BG_PLTT_ID(startPalIndex);
     numPalettes += startPalIndex;
     colorMapIndex--;
     curPalIndex = startPalIndex;
@@ -656,7 +656,7 @@ static void ApplyFogBlend(u8 blendCoeff, u16 blendColor)
     u8 bBlend;
     u16 curPalIndex;
 
-    BlendPalette(0, 256, blendCoeff, blendColor);
+    BlendPalette(BG_PLTT_ID(0), 16 * 16, blendCoeff, blendColor);
     color = *(struct RGBColor *)&blendColor;
     rBlend = color.r;
     gBlend = color.g;
@@ -690,7 +690,7 @@ static void ApplyFogBlend(u8 blendCoeff, u16 blendColor)
         }
         else
         {
-            BlendPalette(curPalIndex * 16, 16, blendCoeff, blendColor);
+            BlendPalette(PLTT_ID(curPalIndex), 16, blendCoeff, blendColor);
         }
     }
 }
@@ -830,8 +830,8 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex)
         }
         break;
     case WEATHER_PAL_STATE_SCREEN_FADING_OUT:
-        paletteIndex *= 16;
-        CpuFastCopy(gPlttBufferFaded + paletteIndex, gPlttBufferUnfaded + paletteIndex, 32);
+        paletteIndex = PLTT_ID(paletteIndex);
+        CpuFastCopy(gPlttBufferFaded + paletteIndex, gPlttBufferUnfaded + paletteIndex, PLTT_SIZE_4BPP);
         BlendPalette(paletteIndex, 16, gPaletteFade.y, gPaletteFade.blendColor);
         break;
     // WEATHER_PAL_STATE_CHANGING_WEATHER
@@ -843,7 +843,7 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex)
         }
         else
         {
-            paletteIndex *= 16;
+            paletteIndex = PLTT_ID(paletteIndex);
             BlendPalette(paletteIndex, 16, 12, RGB(28, 31, 28));
         }
         break;
@@ -866,7 +866,7 @@ static bool8 IsFirstFrameOfWeatherFadeIn(void)
 
 void LoadCustomWeatherSpritePalette(const u16 *palette)
 {
-    LoadPalette(palette, 0x100 + gWeatherPtr->weatherPicSpritePalIndex * 16, 32);
+    LoadPalette(palette, OBJ_PLTT_ID(gWeatherPtr->weatherPicSpritePalIndex), PLTT_SIZE_4BPP);
     UpdateSpritePaletteWithWeather(gWeatherPtr->weatherPicSpritePalIndex);
 }
 

src/fieldmap.c

@@ -879,9 +879,9 @@ void LoadTilesetPalette(struct Tileset const *tileset, u16 destOffset, u16 size)
     {
         if (tileset->isSecondary == FALSE)
         {
-            LoadPalette(&black, destOffset, 2);
-            LoadPalette(tileset->palettes[0] + 1, destOffset + 1, size - 2);
-            ApplyGlobalTintToPaletteEntries(destOffset + 1, (size - 2) >> 1);
+            LoadPalette(&black, destOffset, PLTT_SIZEOF(1));
+            LoadPalette(tileset->palettes[0] + 1, destOffset + 1, size - PLTT_SIZEOF(1));
+            ApplyGlobalTintToPaletteEntries(destOffset + 1, (size - PLTT_SIZEOF(1)) >> 1);
         }
         else if (tileset->isSecondary == TRUE)
         {
@@ -913,12 +913,12 @@ void CopySecondaryTilesetToVramUsingHeap(struct MapLayout const *mapLayout)
 
 static void LoadPrimaryTilesetPalette(struct MapLayout const *mapLayout)
 {
-    LoadTilesetPalette(mapLayout->primaryTileset, 0, NUM_PALS_IN_PRIMARY * 16 * 2);
+    LoadTilesetPalette(mapLayout->primaryTileset, BG_PLTT_ID(0), NUM_PALS_IN_PRIMARY * PLTT_SIZE_4BPP);
 }
 
 void LoadSecondaryTilesetPalette(struct MapLayout const *mapLayout)
 {
-    LoadTilesetPalette(mapLayout->secondaryTileset, NUM_PALS_IN_PRIMARY * 16, (NUM_PALS_TOTAL - NUM_PALS_IN_PRIMARY) * 16 * 2);
+    LoadTilesetPalette(mapLayout->secondaryTileset, BG_PLTT_ID(NUM_PALS_IN_PRIMARY), (NUM_PALS_TOTAL - NUM_PALS_IN_PRIMARY) * PLTT_SIZE_4BPP);
 }
 
 void CopyMapTilesetsToVram(struct MapLayout const *mapLayout)

src/fldeff_flash.c

@@ -218,8 +218,8 @@ static void Task_ExitCaveTransition2(u8 taskId)
     SetGpuReg(REG_OFFSET_DISPCNT, 0);
     LZ77UnCompVram(sCaveTransitionTiles, (void *)(VRAM + 0xC000));
     LZ77UnCompVram(sCaveTransitionTilemap, (void *)(VRAM + 0xF800));
-    LoadPalette(sCaveTransitionPalette_White, 0xE0, 0x20);
-    LoadPalette(sCaveTransitionPalette_Exit, 0xE0, 0x10);
+    LoadPalette(sCaveTransitionPalette_White, BG_PLTT_ID(14), PLTT_SIZE_4BPP);
+    LoadPalette(sCaveTransitionPalette_Exit, BG_PLTT_ID(14), PLTT_SIZEOF(8));
     SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0
                                 | BLDCNT_EFFECT_BLEND
                                 | BLDCNT_TGT2_BG1
@@ -270,11 +270,11 @@ static void Task_ExitCaveTransition4(u8 taskId)
     if (count < 8)
     {
         gTasks[taskId].data[2]++;
-        LoadPalette(&sCaveTransitionPalette_Exit[count], 0xE0, 16 - 2 * count);
+        LoadPalette(&sCaveTransitionPalette_Exit[count], BG_PLTT_ID(14), PLTT_SIZEOF(8) - PLTT_SIZEOF(count));
     }
     else
     {
-        LoadPalette(sCaveTransitionPalette_White, 0, 0x20);
+        LoadPalette(sCaveTransitionPalette_White, BG_PLTT_ID(0), PLTT_SIZE_4BPP);
         gTasks[taskId].func = Task_ExitCaveTransition5;
         gTasks[taskId].data[2] = 8;
     }
@@ -315,8 +315,8 @@ static void Task_EnterCaveTransition2(u8 taskId)
                                 | DISPCNT_OBJ_1D_MAP
                                 | DISPCNT_BG0_ON
                                 | DISPCNT_OBJ_ON);
-    LoadPalette(sCaveTransitionPalette_White, 0xE0, 0x20);
-    LoadPalette(sCaveTransitionPalette_Black, 0, 0x20);
+    LoadPalette(sCaveTransitionPalette_White, BG_PLTT_ID(14), PLTT_SIZE_4BPP);
+    LoadPalette(sCaveTransitionPalette_Black, BG_PLTT_ID(0), PLTT_SIZE_4BPP);
     gTasks[taskId].func = Task_EnterCaveTransition3;
     gTasks[taskId].data[0] = 16;
     gTasks[taskId].data[1] = 0;
@@ -331,7 +331,7 @@ static void Task_EnterCaveTransition3(u8 taskId)
     {
         gTasks[taskId].data[2]++;
         gTasks[taskId].data[2]++;
-        LoadPalette(&sCaveTransitionPalette_Enter[15 - count], 0xE0, 2 * (count + 1));
+        LoadPalette(&sCaveTransitionPalette_Enter[15 - count], BG_PLTT_ID(14), PLTT_SIZEOF(count + 1));
     }
     else
     {
@@ -359,7 +359,7 @@ static void Task_EnterCaveTransition4(u8 taskId)
     }
     else
     {
-        LoadPalette(sCaveTransitionPalette_Black, 0, 0x20);
+        LoadPalette(sCaveTransitionPalette_Black, BG_PLTT_ID(0), PLTT_SIZE_4BPP);
         SetMainCallback2(gMain.savedCallback);
     }
 }

src/frontier_pass.c

@@ -768,9 +768,9 @@ static bool32 InitFrontierPass(void)
         CopyBgTilemapBufferToVram(2);
         break;
     case 8:
-        LoadPalette(gFrontierPassBg_Pal[0], 0, 0x1A0);
-        LoadPalette(gFrontierPassBg_Pal[1 + sPassData->trainerStars], 0x10, 0x20);
-        LoadPalette(GetTextWindowPalette(0), 0xF0, 0x20);
+        LoadPalette(gFrontierPassBg_Pal[0], 0, 13 * PLTT_SIZE_4BPP);
+        LoadPalette(gFrontierPassBg_Pal[1 + sPassData->trainerStars], BG_PLTT_ID(1), PLTT_SIZE_4BPP);
+        LoadPalette(GetTextWindowPalette(0), BG_PLTT_ID(15), PLTT_SIZE_4BPP);
         DrawFrontierPassBg();
         UpdateAreaHighlight(sPassData->cursorArea, sPassData->previousCursorArea);
         if (sPassData->areaToShow == CURSOR_AREA_MAP || sPassData->areaToShow == CURSOR_AREA_CARD)
@@ -1412,8 +1412,8 @@ static bool32 InitFrontierMap(void)
     case 5:
         if (FreeTempTileDataBuffersIfPossible())
             return FALSE;
-        LoadPalette(gFrontierPassBg_Pal[0], 0, 0x1A0);
-        LoadPalette(GetTextWindowPalette(0), 0xF0, 0x20);
+        LoadPalette(gFrontierPassBg_Pal[0], BG_PLTT_ID(0), 13 * PLTT_SIZE_4BPP);
+        LoadPalette(GetTextWindowPalette(0), BG_PLTT_ID(15), PLTT_SIZE_4BPP);
         CopyToBgTilemapBuffer(2, sMapScreen_Tilemap, 0, 0);
         CopyBgTilemapBufferToVram(2);
         break;

src/frontier_util.c

@@ -2122,7 +2122,7 @@ static void IncrementWinStreak(void)
             gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode]++;
             if (battleMode == FRONTIER_MODE_SINGLES)
             {
-                SetGameStat(GAME_STAT_BATTLE_TOWER_BEST_STREAK, gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode]);
+                SetGameStat(GAME_STAT_BATTLE_TOWER_SINGLES_STREAK, gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode]);
                 gSaveBlock2Ptr->frontier.towerSinglesStreak = gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode];
             }
         }

src/graphics.c

@@ -356,19 +356,15 @@ const u16 gBattleInterface_BallDisplayPal[] = INCBIN_U16("graphics/battle_interf
 
 const u8 gHealthboxElementsGfxTable[] = INCBIN_U8("graphics/battle_interface/hpbar.4bpp",
                                                   "graphics/battle_interface/expbar.4bpp",
-                                                  "graphics/battle_interface/status_psn.4bpp",
-                                                  "graphics/battle_interface/status_par.4bpp",
-                                                  "graphics/battle_interface/status_slp.4bpp",
-                                                  "graphics/battle_interface/status_frz.4bpp",
-                                                  "graphics/battle_interface/status_brn.4bpp",
+                                                  "graphics/battle_interface/status.4bpp",
                                                   "graphics/battle_interface/misc.4bpp",
                                                   "graphics/battle_interface/hpbar_anim.4bpp",
                                                   "graphics/battle_interface/misc_frameend.4bpp",
                                                   "graphics/battle_interface/ball_display.4bpp",
                                                   "graphics/battle_interface/ball_caught_indicator.4bpp",
-                                                  "graphics/battle_interface/status2.4bpp",  // these three duplicate sets of graphics are for the opponent pokemon
-                                                  "graphics/battle_interface/status3.4bpp",  // and are also for use in double battles. they use dynamic palettes so
-                                                  "graphics/battle_interface/status4.4bpp",  // coloring them is an extreme headache and wont be done for now
+                                                  "graphics/battle_interface/status2.4bpp", // these three duplicate sets of graphics are for the opponent/partner pokemon
+                                                  "graphics/battle_interface/status3.4bpp",
+                                                  "graphics/battle_interface/status4.4bpp",
                                                   "graphics/battle_interface/healthbox_doubles_frameend.4bpp",
                                                   "graphics/battle_interface/healthbox_doubles_frameend_bar.4bpp");
 const u32 gBattleInterfaceGfx_UnusedWindow3[] = INCBIN_U32("graphics/battle_interface/unused_window3.4bpp.lz");
@@ -439,7 +435,7 @@ const u32 gJPContestBgTilemap[] = INCBIN_U32("graphics/contest/japanese/bg.bin.l
 const u32 gJPContestWindowsTilemap[] = INCBIN_U32("graphics/contest/japanese/windows.bin.lz");
 const u32 gJPContestGfx2[] = INCBIN_U32("graphics/contest/japanese/composite_2.4bpp.lz");
 
-const u32 gContestInterfaceAudiencePalette[] = INCBIN_U32("graphics/contest/interface_audience.gbapal.lz");
+const u32 gContestInterfaceAudiencePalette[] = INCBIN_U32("graphics/contest/interface.gbapal.lz");
 const u32 gContestAudienceTilemap[] = INCBIN_U32("graphics/contest/audience.bin.lz");
 const u32 gContestInterfaceTilemap[] = INCBIN_U32("graphics/contest/interface.bin.lz");
 const u32 gJPContestInterfaceTilemap[] = INCBIN_U32("graphics/contest/japanese/interface.bin.lz");
@@ -1378,24 +1374,24 @@ const u16 gUsePokeblockNatureWin_Pal[] = INCBIN_U16("graphics/pokeblock/use_scre
 
 // trainer card
 
-const u16 gHoennTrainerCard0Star_Pal[] = INCBIN_U16("graphics/trainer_card/0star.gbapal");
-const u32 gHoennTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/card.4bpp.lz");
+const u16 gHoennTrainerCardGreen_Pal[] = INCBIN_U16("graphics/trainer_card/green.gbapal");
+const u32 gHoennTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/tiles.4bpp.lz");
 const u32 gHoennTrainerCardBg_Tilemap[] = INCBIN_U32("graphics/trainer_card/bg.bin.lz");
 const u32 gHoennTrainerCardFront_Tilemap[] = INCBIN_U32("graphics/trainer_card/front.bin.lz");
 const u32 gHoennTrainerCardBack_Tilemap[] = INCBIN_U32("graphics/trainer_card/back.bin.lz");
 const u32 gHoennTrainerCardFrontLink_Tilemap[] = INCBIN_U32("graphics/trainer_card/front_link.bin.lz");
 
-const u16 gKantoTrainerCard0Star_Pal[] = INCBIN_U16("graphics/trainer_card/0star_fr.gbapal");
-const u32 gKantoTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/card_fr.4bpp.lz");
-const u32 gKantoTrainerCardBg_Tilemap[] = INCBIN_U32("graphics/trainer_card/bg_fr.bin.lz");
-const u32 gKantoTrainerCardFront_Tilemap[] = INCBIN_U32("graphics/trainer_card/front_fr.bin.lz");
-const u32 gKantoTrainerCardBack_Tilemap[] = INCBIN_U32("graphics/trainer_card/back_fr.bin.lz");
-const u32 gKantoTrainerCardFrontLink_Tilemap[] = INCBIN_U32("graphics/trainer_card/front_link_fr.bin.lz");
+const u16 gKantoTrainerCardBlue_Pal[] = INCBIN_U16("graphics/trainer_card/frlg/blue.gbapal");
+const u32 gKantoTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/frlg/tiles.4bpp.lz");
+const u32 gKantoTrainerCardBg_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/bg.bin.lz");
+const u32 gKantoTrainerCardFront_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/front.bin.lz");
+const u32 gKantoTrainerCardBack_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/back.bin.lz");
+const u32 gKantoTrainerCardFrontLink_Tilemap[] = INCBIN_U32("graphics/trainer_card/frlg/front_link.bin.lz");
 
 // pokemon storage system
 
 const u32 gStorageSystemMenu_Gfx[] = INCBIN_U32("graphics/pokemon_storage/menu.4bpp.lz");
-const u16 gStorageSystemPartyMenu_Pal[] = INCBIN_U16("graphics/pokemon_storage/menu.gbapal"); // Only used by party menu, but generated from all menu gfx
+const u16 gStorageSystemPartyMenu_Pal[] = INCBIN_U16("graphics/pokemon_storage/party_menu.gbapal");
 const u32 gStorageSystemPartyMenu_Tilemap[] = INCBIN_U32("graphics/pokemon_storage/party_menu.bin.lz");
 
 // naming screen

src/hall_of_fame.c

@@ -702,8 +702,8 @@ static void Task_Hof_DisplayPlayer(u8 taskId)
     ShowBg(3);
     gTasks[taskId].tPlayerSpriteID = CreateTrainerPicSprite(PlayerGenderToFrontTrainerPicId_Debug(gSaveBlock2Ptr->playerGender, TRUE), TRUE, 120, 72, 6, TAG_NONE);
     AddWindow(&sHof_WindowTemplate);
-    LoadWindowGfx(1, gSaveBlock2Ptr->optionsWindowFrameType, 0x21D, 0xD0);
-    LoadPalette(GetTextWindowPalette(1), 0xE0, 0x20);
+    LoadWindowGfx(1, gSaveBlock2Ptr->optionsWindowFrameType, 0x21D, BG_PLTT_ID(13));
+    LoadPalette(GetTextWindowPalette(1), BG_PLTT_ID(14), PLTT_SIZE_4BPP);
     gTasks[taskId].tFrameCount = 120;
     gTasks[taskId].func = Task_Hof_WaitAndPrintPlayerInfo;
 }
@@ -1269,7 +1269,7 @@ static void ClearVramOamPltt_LoadHofPal(void)
     DmaFill16(3, 0, plttOffset, plttSize);
 
     ResetPaletteFade();
-    LoadPalette(sHallOfFame_Pal, 0, 0x20);
+    LoadPalette(sHallOfFame_Pal, BG_PLTT_ID(0), PLTT_SIZE_4BPP);
 }
 
 static void LoadHofGfx(void)

src/intro.c

@@ -1051,11 +1051,11 @@ static void MainCB2_EndIntro(void)
         SetMainCallback2(CB2_InitTitleScreen);
 }
 
-static void LoadCopyrightGraphics(u16 tilesetAddress, u16 tilemapAddress, u16 paletteAddress)
+static void LoadCopyrightGraphics(u16 tilesetAddress, u16 tilemapAddress, u16 paletteOffset)
 {
     LZ77UnCompVram(gIntroCopyright_Gfx, (void *)(VRAM + tilesetAddress));
     LZ77UnCompVram(gIntroCopyright_Tilemap, (void *)(VRAM + tilemapAddress));
-    LoadPalette(gIntroCopyright_Pal, paletteAddress, 32);
+    LoadPalette(gIntroCopyright_Pal, paletteOffset, PLTT_SIZE_4BPP);
 }
 
 static void SerialCB_CopyrightScreen(void)
@@ -1080,7 +1080,7 @@ static u8 SetUpCopyrightScreen(void)
         CpuFill32(0, (void *)OAM, OAM_SIZE);
         CpuFill16(0, (void *)(PLTT + 2), PLTT_SIZE - 2);
         ResetPaletteFade();
-        LoadCopyrightGraphics(0, 0x3800, 0);
+        LoadCopyrightGraphics(0, 0x3800, BG_PLTT_ID(0));
         ScanlineEffect_Stop();
         ResetTasks();
         ResetSpriteData();
@@ -1178,7 +1178,7 @@ static void Task_Scene1_Load(u8 taskId)
     DmaClear16(3, BG_SCREEN_ADDR(21), BG_SCREEN_SIZE);
     LZ77UnCompVram(sIntro1Bg3_Tilemap, (void *)(BG_SCREEN_ADDR(22)));
     DmaClear16(3, BG_SCREEN_ADDR(23), BG_SCREEN_SIZE);
-    LoadPalette(sIntro1Bg_Pal, 0, sizeof(sIntro1Bg_Pal));
+    LoadPalette(sIntro1Bg_Pal, BG_PLTT_ID(0), sizeof(sIntro1Bg_Pal));
     SetGpuReg(REG_OFFSET_BG3CNT, BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(22) | BGCNT_16COLOR | BGCNT_TXT256x512);
     SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(2) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(20) | BGCNT_16COLOR | BGCNT_TXT256x512);
     SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(1) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(18) | BGCNT_16COLOR | BGCNT_TXT256x512);
@@ -1717,7 +1717,7 @@ static void Task_Scene3_Load(u8 taskId)
     IntroResetGpuRegs();
     LZ77UnCompVram(sIntroPokeball_Gfx, (void *)VRAM);
     LZ77UnCompVram(sIntroPokeball_Tilemap, (void *)(BG_CHAR_ADDR(1)));
-    LoadPalette(sIntroPokeball_Pal, 0, sizeof(sIntroPokeball_Pal));
+    LoadPalette(sIntroPokeball_Pal, BG_PLTT_ID(0), sizeof(sIntroPokeball_Pal));
     gTasks[taskId].tAlpha = 0;
     gTasks[taskId].tZoomDiv = 0;
     gTasks[taskId].tZoomDivSpeed = 0;
@@ -2663,10 +2663,10 @@ static void Task_RayquazaAttack(u8 taskId)
         {
             if (--data[3] != 0)
             {
-                BlendPalette(0x50, 16, data[3], RGB(9, 10, 10));
-                CpuCopy16(&gIntro3Bg_Pal[0x1AC], &gPlttBufferFaded[94], 2);
-                CpuCopy16(&gIntro3Bg_Pal[0x1AC], &gPlttBufferFaded[88], 2);
-                CpuCopy16(&gIntro3Bg_Pal[0x18C], &gPlttBufferFaded[92], 2);
+                BlendPalette(BG_PLTT_ID(5), 16, data[3], RGB(9, 10, 10));
+                CpuCopy16(&gIntro3Bg_Pal[428], &gPlttBufferFaded[BG_PLTT_ID(5) + 14], PLTT_SIZEOF(1));
+                CpuCopy16(&gIntro3Bg_Pal[428], &gPlttBufferFaded[BG_PLTT_ID(5) + 8], PLTT_SIZEOF(1));
+                CpuCopy16(&gIntro3Bg_Pal[396], &gPlttBufferFaded[BG_PLTT_ID(5) + 12], PLTT_SIZEOF(1));
             }
             else
             {

src/intro_credits_graphics.c

@@ -730,7 +730,7 @@ void LoadIntroPart2Graphics(u8 scenery)
 {
     LZ77UnCompVram(sGrass_Gfx, (void *)(BG_CHAR_ADDR(1)));
     LZ77UnCompVram(sGrass_Tilemap, (void *)(BG_SCREEN_ADDR(15)));
-    LoadPalette(&sGrass_Pal, 240, sizeof(sGrass_Pal));
+    LoadPalette(&sGrass_Pal, BG_PLTT_ID(15), sizeof(sGrass_Pal));
     switch (scenery)
     {
     case 0:
@@ -739,17 +739,17 @@ void LoadIntroPart2Graphics(u8 scenery)
         // Clouds are never used in this part of the intro
         LZ77UnCompVram(sCloudsBg_Gfx, (void *)(VRAM));
         LZ77UnCompVram(sCloudsBg_Tilemap, (void *)(BG_SCREEN_ADDR(6)));
-        LoadPalette(&sCloudsBg_Pal, 0, sizeof(sCloudsBg_Pal));
+        LoadPalette(&sCloudsBg_Pal, BG_PLTT_ID(0), sizeof(sCloudsBg_Pal));
         LoadCompressedSpriteSheet(sSpriteSheet_Clouds);
-        LoadPalette(&sClouds_Pal, 256, sizeof(sClouds_Pal));
+        LoadPalette(&sClouds_Pal, OBJ_PLTT_ID(0), sizeof(sClouds_Pal));
         CreateCloudSprites();
         break;
     case 1:
         LZ77UnCompVram(sTrees_Gfx, (void *)(VRAM));
         LZ77UnCompVram(sTrees_Tilemap, (void *)(BG_SCREEN_ADDR(6)));
-        LoadPalette(&sTrees_Pal, 0, sizeof(sTrees_Pal));
+        LoadPalette(&sTrees_Pal, BG_PLTT_ID(0), sizeof(sTrees_Pal));
         LoadCompressedSpriteSheet(sSpriteSheet_TreesSmall);
-        LoadPalette(&sTreesSmall_Pal, 256, sizeof(sTreesSmall_Pal));
+        LoadPalette(&sTreesSmall_Pal, OBJ_PLTT_ID(0), sizeof(sTreesSmall_Pal));
         CreateTreeSprites();
         break;
     }
@@ -843,42 +843,42 @@ void LoadCreditsSceneGraphics(u8 scene)
     {
     case SCENE_OCEAN_MORNING:
     default:
-        LoadPalette(&sGrass_Pal, 240, sizeof(sGrass_Pal));
+        LoadPalette(&sGrass_Pal, BG_PLTT_ID(15), sizeof(sGrass_Pal));
         LZ77UnCompVram(sCloudsBg_Gfx, (void *)(VRAM));
         LZ77UnCompVram(sCloudsBg_Tilemap, (void *)(BG_SCREEN_ADDR(6)));
-        LoadPalette(&sCloudsBg_Pal, 0, sizeof(sCloudsBg_Pal));
+        LoadPalette(&sCloudsBg_Pal, BG_PLTT_ID(0), sizeof(sCloudsBg_Pal));
         LoadCompressedSpriteSheet(sSpriteSheet_Clouds);
         LZ77UnCompVram(sClouds_Gfx, (void *)(OBJ_VRAM0));
-        LoadPalette(&sClouds_Pal, 256, sizeof(sClouds_Pal));
+        LoadPalette(&sClouds_Pal, OBJ_PLTT_ID(0), sizeof(sClouds_Pal));
         CreateCloudSprites();
         break;
     case SCENE_OCEAN_SUNSET:
-        LoadPalette(&sGrassSunset_Pal, 240, sizeof(sGrassSunset_Pal));
+        LoadPalette(&sGrassSunset_Pal, BG_PLTT_ID(15), sizeof(sGrassSunset_Pal));
         LZ77UnCompVram(sCloudsBg_Gfx, (void *)(VRAM));
         LZ77UnCompVram(sCloudsBg_Tilemap, (void *)(BG_SCREEN_ADDR(6)));
-        LoadPalette(&sCloudsBgSunset_Pal, 0, sizeof(sCloudsBgSunset_Pal));
+        LoadPalette(&sCloudsBgSunset_Pal, BG_PLTT_ID(0), sizeof(sCloudsBgSunset_Pal));
         LoadCompressedSpriteSheet(sSpriteSheet_Clouds);
         LZ77UnCompVram(sClouds_Gfx, (void *)(OBJ_VRAM0));
-        LoadPalette(&sCloudsSunset_Pal, 256, sizeof(sCloudsSunset_Pal));
+        LoadPalette(&sCloudsSunset_Pal, OBJ_PLTT_ID(0), sizeof(sCloudsSunset_Pal));
         CreateCloudSprites();
         break;
     case SCENE_FOREST_RIVAL_ARRIVE:
     case SCENE_FOREST_CATCH_RIVAL:
-        LoadPalette(&sGrassSunset_Pal, 240, sizeof(sGrassSunset_Pal));
+        LoadPalette(&sGrassSunset_Pal, BG_PLTT_ID(15), sizeof(sGrassSunset_Pal));
         LZ77UnCompVram(sTrees_Gfx, (void *)(VRAM));
         LZ77UnCompVram(sTrees_Tilemap, (void *)(BG_SCREEN_ADDR(6)));
-        LoadPalette(&sTreesSunset_Pal, 0, sizeof(sTreesSunset_Pal));
+        LoadPalette(&sTreesSunset_Pal, BG_PLTT_ID(0), sizeof(sTreesSunset_Pal));
         LoadCompressedSpriteSheet(sSpriteSheet_TreesSmall);
-        LoadPalette(&sTreesSunset_Pal, 256, sizeof(sTreesSunset_Pal));
+        LoadPalette(&sTreesSunset_Pal, OBJ_PLTT_ID(0), sizeof(sTreesSunset_Pal));
         CreateTreeSprites();
         break;
     case SCENE_CITY_NIGHT:
-        LoadPalette(&sGrassNight_Pal, 240, sizeof(sGrassNight_Pal));
+        LoadPalette(&sGrassNight_Pal, BG_PLTT_ID(15), sizeof(sGrassNight_Pal));
         LZ77UnCompVram(sHouses_Gfx, (void *)(VRAM));
         LZ77UnCompVram(sHouses_Tilemap, (void *)(BG_SCREEN_ADDR(6)));
-        LoadPalette(&sHouses_Pal, 0, sizeof(sHouses_Pal));
+        LoadPalette(&sHouses_Pal, BG_PLTT_ID(0), sizeof(sHouses_Pal));
         LoadCompressedSpriteSheet(sSpriteSheet_HouseSilhouette);
-        LoadPalette(&sHouseSilhouette_Pal, 256, sizeof(sHouseSilhouette_Pal));
+        LoadPalette(&sHouseSilhouette_Pal, OBJ_PLTT_ID(0), sizeof(sHouseSilhouette_Pal));
         CreateHouseSprites();
         break;
     }
@@ -1006,8 +1006,8 @@ void CycleSceneryPalette(u8 mode)
                 x = gPlttBufferUnfaded[10];
                 y = gPlttBufferUnfaded[9];
             }
-            LoadPalette(&x, 9, sizeof(x));
-            LoadPalette(&y, 10, sizeof(y));
+            LoadPalette(&x, BG_PLTT_ID(0) + 9, sizeof(x));
+            LoadPalette(&y, BG_PLTT_ID(0) + 10, sizeof(y));
             break;
         case 2:
             if (gMain.vblankCounter1 & 3 || gPaletteFade.active)
@@ -1022,8 +1022,8 @@ void CycleSceneryPalette(u8 mode)
                 x = RGB(28, 24, 0);
                 y = RGB(7, 9, 15);
             }
-            LoadPalette(&x, 12, sizeof(x));
-            LoadPalette(&y, 13, sizeof(y));
+            LoadPalette(&x, BG_PLTT_ID(0) + 12, sizeof(x));
+            LoadPalette(&y, BG_PLTT_ID(0) + 13, sizeof(y));
             break;
         case 1:
             break;

src/item_menu.c

@@ -818,9 +818,9 @@ static bool8 LoadBagMenu_Graphics(void)
         break;
     case 2:
         if (!IsWallysBag() && gSaveBlock2Ptr->playerGender != MALE)
-            LoadCompressedPalette(gBagScreenFemale_Pal, 0, 0x40);
+            LoadCompressedPalette(gBagScreenFemale_Pal, BG_PLTT_ID(0), 2 * PLTT_SIZE_4BPP);
         else
-            LoadCompressedPalette(gBagScreenMale_Pal, 0, 0x40);
+            LoadCompressedPalette(gBagScreenMale_Pal, BG_PLTT_ID(0), 2 * PLTT_SIZE_4BPP);
         gBagMenu->graphicsLoadState++;
         break;
     case 3:
@@ -2448,10 +2448,10 @@ static void LoadBagMenuTextWindows(void)
 
     InitWindows(sDefaultBagWindows);
     DeactivateAllTextPrinters();
-    LoadUserWindowBorderGfx(0, 1, 0xE0);
-    LoadMessageBoxGfx(0, 10, 0xD0);
-    ListMenuLoadStdPalAt(0xC0, 1);
-    LoadPalette(&gStandardMenuPalette, 0xF0, 0x20);
+    LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(14));
+    LoadMessageBoxGfx(0, 10, BG_PLTT_ID(13));
+    ListMenuLoadStdPalAt(BG_PLTT_ID(12), 1);
+    LoadPalette(&gStandardMenuPalette, BG_PLTT_ID(15), PLTT_SIZE_4BPP);
     for (i = 0; i <= WIN_POCKET_NAME; i++)
     {
         FillWindowPixelBuffer(i, PIXEL_FILL(0));

src/item_menu_icons.c

@@ -205,7 +205,7 @@ static const union AffineAnimCmd *const sRotatingBallAnimCmds_FullRotation[] =
 
 static const struct SpriteSheet sRotatingBallTable =
 {
-    sRotatingBall_Gfx, 0x80, TAG_ROTATING_BALL_GFX
+    sRotatingBall_Gfx, sizeof(sRotatingBall_Gfx), TAG_ROTATING_BALL_GFX
 };
 
 static const struct SpritePalette sRotatingBallPaletteTable =

src/link.c

@@ -257,7 +257,7 @@ void Task_DestroySelf(u8 taskId)
 
 static void InitLinkTestBG(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u8 charBaseBlock, u16 baseChar)
 {
-    LoadPalette(sLinkTestDigitsPal, paletteNum * 16, 0x20);
+    LoadPalette(sLinkTestDigitsPal, BG_PLTT_ID(paletteNum), PLTT_SIZE_4BPP);
     DmaCopy16(3, sLinkTestDigitsGfx, (u16 *)BG_CHAR_ADDR(charBaseBlock) + (16 * baseChar), sizeof sLinkTestDigitsGfx);
     gLinkTestBGInfo.screenBaseBlock = screenBaseBlock;
     gLinkTestBGInfo.paletteNum = paletteNum;
@@ -281,7 +281,7 @@ static void InitLinkTestBG(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u8 charB
 // Unused
 static void LoadLinkTestBgGfx(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u8 charBaseBlock)
 {
-    LoadPalette(sLinkTestDigitsPal, paletteNum * 16, 0x20);
+    LoadPalette(sLinkTestDigitsPal, BG_PLTT_ID(paletteNum), PLTT_SIZE_4BPP);
     DmaCopy16(3, sLinkTestDigitsGfx, (u16 *)BG_CHAR_ADDR(charBaseBlock), sizeof sLinkTestDigitsGfx);
     gLinkTestBGInfo.screenBaseBlock = screenBaseBlock;
     gLinkTestBGInfo.paletteNum = paletteNum;
@@ -1605,7 +1605,7 @@ void CB2_LinkError(void)
     ResetSpriteData();
     FreeAllSpritePalettes();
     ResetPaletteFadeControl();
-    FillPalette(RGB_BLACK, 0, 2);
+    SetBackdropFromColor(RGB_BLACK);
     ResetTasks();
     ScanlineEffect_Stop();
     if (gWirelessCommType)
@@ -1631,7 +1631,7 @@ void CB2_LinkError(void)
         SetGpuReg(REG_OFFSET_BG1HOFS, 0);
         SetGpuReg(REG_OFFSET_BG1VOFS, 0);
         ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON | DISPCNT_WIN1_ON | DISPCNT_OBJWIN_ON);
-        LoadPalette(gStandardMenuPalette, 0xf0, 0x20);
+        LoadPalette(gStandardMenuPalette, BG_PLTT_ID(15), PLTT_SIZE_4BPP);
         gSoftResetDisabled = FALSE;
         CreateTask(Task_DestroySelf, 0);
         StopMapMusic();

src/list_menu.c

@@ -1084,7 +1084,7 @@ u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate *arrowInfo, u16
 
     if (arrowInfo->palTag == TAG_NONE)
     {
-        LoadPalette(sRedInterface_Pal, (16 * arrowInfo->palNum) + 0x100, 0x20);
+        LoadPalette(sRedInterface_Pal, OBJ_PLTT_ID(arrowInfo->palNum), PLTT_SIZE_4BPP);
     }
     else
     {
@@ -1330,7 +1330,7 @@ static u8 ListMenuAddRedOutlineCursorObject(struct CursorStruct *cursor)
 
     if (cursor->palTag == TAG_NONE)
     {
-        LoadPalette(sRedInterface_Pal, (16 * cursor->palNum) + 0x100, 0x20);
+        LoadPalette(sRedInterface_Pal, OBJ_PLTT_ID(cursor->palNum), PLTT_SIZE_4BPP);
     }
     else
     {
@@ -1415,7 +1415,7 @@ static u8 ListMenuAddRedArrowCursorObject(struct CursorStruct *cursor)
 
     if (cursor->palTag == TAG_NONE)
     {
-        LoadPalette(sRedInterface_Pal, (16 * cursor->palNum) + 0x100, 0x20);
+        LoadPalette(sRedInterface_Pal, OBJ_PLTT_ID(cursor->palNum), PLTT_SIZE_4BPP);
     }
     else
     {

src/mail.c

@@ -566,13 +566,13 @@ static bool8 MailReadBuildGraphics(void)
             CopyBgTilemapBufferToVram(2);
             break;
         case 12:
-            LoadPalette(GetOverworldTextboxPalettePtr(), 240, 32);
+            LoadPalette(GetOverworldTextboxPalettePtr(), BG_PLTT_ID(15), PLTT_SIZE_4BPP);
 
             gPlttBufferUnfaded[250] = sMailGraphics[sMailRead->mailType].textColor;
             gPlttBufferFaded[250] = sMailGraphics[sMailRead->mailType].textColor;
             gPlttBufferUnfaded[251] = sMailGraphics[sMailRead->mailType].textShadow;
             gPlttBufferFaded[251] = sMailGraphics[sMailRead->mailType].textShadow;
-            LoadPalette(sMailGraphics[sMailRead->mailType].palette, 0, 32);
+            LoadPalette(sMailGraphics[sMailRead->mailType].palette, BG_PLTT_ID(0), PLTT_SIZE_4BPP);
 
             gPlttBufferUnfaded[10] = sBgColors[gSaveBlock2Ptr->playerGender][0];
             gPlttBufferFaded[10] = sBgColors[gSaveBlock2Ptr->playerGender][0];

src/main_menu.c

@@ -571,8 +571,8 @@ static u32 InitMainMenu(bool8 returningFromOptionsMenu)
     DmaFill16(3, 0, (void *)(PLTT + 2), PLTT_SIZE - 2);
 
     ResetPaletteFade();
-    LoadPalette(sMainMenuBgPal, 0, 32);
-    LoadPalette(sMainMenuTextPal, 0xF0, 32);
+    LoadPalette(sMainMenuBgPal, BG_PLTT_ID(0), PLTT_SIZE_4BPP);
+    LoadPalette(sMainMenuTextPal, BG_PLTT_ID(15), PLTT_SIZE_4BPP);
     ScanlineEffect_Stop();
     ResetTasks();
     ResetSpriteData();
@@ -750,28 +750,28 @@ static void Task_DisplayMainMenu(u8 taskId)
         SetGpuReg(REG_OFFSET_BLDY, 7);
 
         palette = RGB_BLACK;
-        LoadPalette(&palette, 254, 2);
+        LoadPalette(&palette, BG_PLTT_ID(15) + 14, PLTT_SIZEOF(1));
 
         palette = RGB_WHITE;
-        LoadPalette(&palette, 250, 2);
+        LoadPalette(&palette, BG_PLTT_ID(15) + 10, PLTT_SIZEOF(1));
 
         palette = RGB(12, 12, 12);
-        LoadPalette(&palette, 251, 2);
+        LoadPalette(&palette, BG_PLTT_ID(15) + 11, PLTT_SIZEOF(1));
 
         palette = RGB(26, 26, 25);
-        LoadPalette(&palette, 252, 2);
+        LoadPalette(&palette, BG_PLTT_ID(15) + 12, PLTT_SIZEOF(1));
 
         // Note: If there is no save file, the save block is zeroed out,
         // so the default gender is MALE.
         if (gSaveBlock2Ptr->playerGender == MALE)
         {
             palette = RGB(4, 16, 31);
-            LoadPalette(&palette, 241, 2);
+            LoadPalette(&palette, BG_PLTT_ID(15) + 1, PLTT_SIZEOF(1));
         }
         else
         {
             palette = RGB(31, 3, 21);
-            LoadPalette(&palette, 241, 2);
+            LoadPalette(&palette, BG_PLTT_ID(15) + 1, PLTT_SIZEOF(1));
         }
 
         switch (gTasks[taskId].tMenuType)
@@ -1274,8 +1274,8 @@ static void Task_NewGameBirchSpeech_Init(u8 taskId)
 
     LZ77UnCompVram(sBirchSpeechShadowGfx, (void *)VRAM);
     LZ77UnCompVram(sBirchSpeechBgMap, (void *)(BG_SCREEN_ADDR(7)));
-    LoadPalette(sBirchSpeechBgPals, 0, 64);
-    LoadPalette(sBirchSpeechPlatformBlackPal, 1, 16);
+    LoadPalette(sBirchSpeechBgPals, BG_PLTT_ID(0), 2 * PLTT_SIZE_4BPP);
+    LoadPalette(sBirchSpeechPlatformBlackPal, BG_PLTT_ID(0) + 1, PLTT_SIZEOF(8));
     ScanlineEffect_Stop();
     ResetSpriteData();
     FreeAllSpritePalettes();
@@ -1327,7 +1327,7 @@ static void Task_NewGameBirchSpeech_WaitForSpriteFadeInWelcome(u8 taskId)
         {
             InitWindows(sNewGameBirchSpeechTextWindows);
             LoadMainMenuWindowFrameTiles(0, 0xF3);
-            LoadMessageBoxGfx(0, 0xFC, 0xF0);
+            LoadMessageBoxGfx(0, 0xFC, BG_PLTT_ID(15));
             NewGameBirchSpeech_ShowDialogueWindow(0, 1);
             PutWindowTilemap(0);
             CopyWindowToVram(0, COPYWIN_GFX);
@@ -1809,8 +1809,8 @@ static void CB2_NewGameBirchSpeech_ReturnFromNamingScreen(void)
     ResetPaletteFade();
     LZ77UnCompVram(sBirchSpeechShadowGfx, (u8 *)VRAM);
     LZ77UnCompVram(sBirchSpeechBgMap, (u8 *)(BG_SCREEN_ADDR(7)));
-    LoadPalette(sBirchSpeechBgPals, 0, 64);
-    LoadPalette(&sBirchSpeechBgGradientPal[1], 1, 16);
+    LoadPalette(sBirchSpeechBgPals, BG_PLTT_ID(0), 2 * PLTT_SIZE_4BPP);
+    LoadPalette(&sBirchSpeechBgGradientPal[1], BG_PLTT_ID(0) + 1, PLTT_SIZEOF(8));
     ResetTasks();
     taskId = CreateTask(Task_NewGameBirchSpeech_ReturnFromNamingScreenShowTextbox, 0);
     gTasks[taskId].tTimer = 5;
@@ -1853,7 +1853,7 @@ static void CB2_NewGameBirchSpeech_ReturnFromNamingScreen(void)
     SetMainCallback2(CB2_MainMenu);
     InitWindows(sNewGameBirchSpeechTextWindows);
     LoadMainMenuWindowFrameTiles(0, 0xF3);
-    LoadMessageBoxGfx(0, 0xFC, 0xF0);
+    LoadMessageBoxGfx(0, 0xFC, BG_PLTT_ID(15));
     PutWindowTilemap(0);
     CopyWindowToVram(0, COPYWIN_FULL);
 }
@@ -2029,7 +2029,7 @@ static void Task_NewGameBirchSpeech_FadePlatformIn(u8 taskId)
     {
         gTasks[taskId].tDelayTimer = gTasks[taskId].tDelay;
         gTasks[taskId].tPalIndex++;
-        LoadPalette(&sBirchSpeechBgGradientPal[gTasks[taskId].tPalIndex], 1, 16);
+        LoadPalette(&sBirchSpeechBgGradientPal[gTasks[taskId].tPalIndex], BG_PLTT_ID(0) + 1, PLTT_SIZEOF(8));
     }
 }
 
@@ -2063,7 +2063,7 @@ static void Task_NewGameBirchSpeech_FadePlatformOut(u8 taskId)
     {
         gTasks[taskId].tDelayTimer = gTasks[taskId].tDelay;
         gTasks[taskId].tPalIndex--;
-        LoadPalette(&sBirchSpeechBgGradientPal[gTasks[taskId].tPalIndex], 1, 16);
+        LoadPalette(&sBirchSpeechBgGradientPal[gTasks[taskId].tPalIndex], BG_PLTT_ID(0) + 1, PLTT_SIZEOF(8));
     }
 }
 
@@ -2191,7 +2191,7 @@ static void MainMenu_FormatSavegameBadges(void)
 static void LoadMainMenuWindowFrameTiles(u8 bgId, u16 tileOffset)
 {
     LoadBgTiles(bgId, GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->tiles, 0x120, tileOffset);
-    LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->pal, 32, 32);
+    LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->pal, BG_PLTT_ID(2), PLTT_SIZE_4BPP);
 }
 
 static void DrawMainMenuWindowBorder(const struct WindowTemplate *template, u16 baseTileNum)

src/map_name_popup.c

@@ -385,8 +385,8 @@ static void LoadMapNamePopUpWindowBg(void)
     CallWindowFunction(popupWindowId, DrawMapNamePopUpFrame);
     PutWindowTilemap(popupWindowId);
     if (gMapHeader.weather == WEATHER_UNDERWATER_BUBBLES)
-        LoadPalette(&sMapPopUp_Palette_Underwater, 0xE0, sizeof(sMapPopUp_Palette_Underwater));
+        LoadPalette(&sMapPopUp_Palette_Underwater, BG_PLTT_ID(14), sizeof(sMapPopUp_Palette_Underwater));
     else
-        LoadPalette(sMapPopUp_PaletteTable[popUpThemeId], 0xE0, sizeof(sMapPopUp_PaletteTable[0]));
+        LoadPalette(sMapPopUp_PaletteTable[popUpThemeId], BG_PLTT_ID(14), sizeof(sMapPopUp_PaletteTable[0]));
     BlitBitmapToWindow(popupWindowId, sMapPopUp_Table[popUpThemeId], 0, 0, 80, 24);
 }

src/match_call.c

@@ -1267,8 +1267,8 @@ static bool32 MatchCall_LoadGfx(u8 taskId)
     }
 
     FillWindowPixelBuffer(tWindowId, PIXEL_FILL(8));
-    LoadPalette(sMatchCallWindow_Pal, 0xE0, sizeof(sMatchCallWindow_Pal));
-    LoadPalette(sPokenavIcon_Pal, 0xF0, sizeof(sPokenavIcon_Pal));
+    LoadPalette(sMatchCallWindow_Pal, BG_PLTT_ID(14), sizeof(sMatchCallWindow_Pal));
+    LoadPalette(sPokenavIcon_Pal, BG_PLTT_ID(15), sizeof(sPokenavIcon_Pal));
     ChangeBgY(0, -0x2000, BG_COORD_SET);
     return TRUE;
 }
@@ -2102,7 +2102,7 @@ void LoadMatchCallWindowGfx(u32 windowId, u32 destOffset, u32 paletteId)
 {
     u8 bg = GetWindowAttribute(windowId, WINDOW_BG);
     LoadBgTiles(bg, sMatchCallWindow_Gfx, 0x100, destOffset);
-    LoadPalette(sMatchCallWindow_Pal, paletteId << 4, sizeof(sMatchCallWindow_Pal));
+    LoadPalette(sMatchCallWindow_Pal, BG_PLTT_ID(paletteId), sizeof(sMatchCallWindow_Pal));
 }
 
 void DrawMatchCallTextBoxBorder(u32 windowId, u32 tileOffset, u32 paletteId)

src/menu.c

@@ -23,6 +23,7 @@
 #define DLG_WINDOW_PALETTE_NUM 15
 #define DLG_WINDOW_BASE_TILE_NUM 0x200
 #define STD_WINDOW_PALETTE_NUM 14
+#define STD_WINDOW_PALETTE_SIZE PLTT_SIZEOF(10)
 #define STD_WINDOW_BASE_TILE_NUM 0x214
 
 struct MenuInfoIcon
@@ -208,8 +209,8 @@ void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonP
 
 void LoadMessageBoxAndBorderGfx(void)
 {
-    LoadMessageBoxGfx(0, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM * 0x10);
-    LoadUserWindowBorderGfx(0, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM * 0x10);
+    LoadMessageBoxGfx(0, DLG_WINDOW_BASE_TILE_NUM, BG_PLTT_ID(DLG_WINDOW_PALETTE_NUM));
+    LoadUserWindowBorderGfx(0, STD_WINDOW_BASE_TILE_NUM, BG_PLTT_ID(STD_WINDOW_PALETTE_NUM));
 }
 
 void DrawDialogueFrame(u8 windowId, bool8 copyToVram)
@@ -427,18 +428,18 @@ void SetStandardWindowBorderStyle(u8 windowId, bool8 copyToVram)
 
 void LoadMessageBoxAndFrameGfx(u8 windowId, bool8 copyToVram)
 {
-    LoadMessageBoxGfx(windowId, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM * 0x10);
-    DrawDialogFrameWithCustomTileAndPalette(windowId, copyToVram, DLG_WINDOW_BASE_TILE_NUM, 0xF);
+    LoadMessageBoxGfx(windowId, DLG_WINDOW_BASE_TILE_NUM, BG_PLTT_ID(DLG_WINDOW_PALETTE_NUM));
+    DrawDialogFrameWithCustomTileAndPalette(windowId, copyToVram, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM);
 }
 
 void Menu_LoadStdPal(void)
 {
-    LoadPalette(gStandardMenuPalette, STD_WINDOW_PALETTE_NUM * 0x10, 0x14);
+    LoadPalette(gStandardMenuPalette, BG_PLTT_ID(STD_WINDOW_PALETTE_NUM), STD_WINDOW_PALETTE_SIZE);
 }
 
 void Menu_LoadStdPalAt(u16 offset)
 {
-    LoadPalette(gStandardMenuPalette, offset, 0x14);
+    LoadPalette(gStandardMenuPalette, offset, STD_WINDOW_PALETTE_SIZE);
 }
 
 // Unused
@@ -550,7 +551,7 @@ void AddTextPrinterWithCallbackForMessage(bool8 canSpeedUp, void (*callback)(str
 
 void EraseFieldMessageBox(bool8 copyToVram)
 {
-    FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 0x11);
+    FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 17);
     if (copyToVram == TRUE)
         CopyBgTilemapBufferToVram(0);
 }
@@ -806,9 +807,9 @@ u8 HofPCTopBar_AddWindow(u8 bg, u8 xPos, u8 yPos, u8 palette, u16 baseTile)
     sHofPCTopBarWindowId = AddWindow(&window);
 
     if (palette > 15)
-        palette = 15 * 16;
+        palette = BG_PLTT_ID(15);
     else
-        palette *= 16;
+        palette = BG_PLTT_ID(palette);
 
     LoadPalette(sHofPC_TopBar_Pal, palette, sizeof(sHofPC_TopBar_Pal));
     return sHofPCTopBarWindowId;
@@ -2084,7 +2085,7 @@ static void UnusedBlitBitmapRect(const struct Bitmap *src, struct Bitmap *dst, u
 // Unused
 static void LoadMonIconPalAtOffset(u8 palOffset, u16 speciesId)
 {
-    LoadPalette(GetValidMonIconPalettePtr(speciesId), palOffset, 0x20);
+    LoadPalette(GetValidMonIconPalettePtr(speciesId), palOffset, PLTT_SIZE_4BPP);
 }
 
 // Unused
@@ -2111,7 +2112,7 @@ void ListMenuLoadStdPalAt(u8 palOffset, u8 palId)
             break;
     }
 
-    LoadPalette(palette, palOffset, 0x20);
+    LoadPalette(palette, palOffset, PLTT_SIZE_4BPP);
 }
 
 void BlitMenuInfoIcon(u8 windowId, u8 iconId, u16 x, u16 y)

src/menu_specialized.c

@@ -113,7 +113,7 @@ static const struct WindowTemplate sMoveRelearnerWindowTemplates[] =
         .tilemapTop = 1,
         .width = 16,
         .height = 12,
-        .paletteNum = 0xF,
+        .paletteNum = 15,
         .baseBlock = 0xA
     },
     [RELEARNERWIN_DESC_CONTEST] = {
@@ -122,7 +122,7 @@ static const struct WindowTemplate sMoveRelearnerWindowTemplates[] =
         .tilemapTop = 1,
         .width = 16,
         .height = 12,
-        .paletteNum = 0xF,
+        .paletteNum = 15,
         .baseBlock = 0xCA
     },
     [RELEARNERWIN_MOVE_LIST] = {
@@ -131,7 +131,7 @@ static const struct WindowTemplate sMoveRelearnerWindowTemplates[] =
         .tilemapTop = 1,
         .width = 10,
         .height = 12,
-        .paletteNum = 0xF,
+        .paletteNum = 15,
         .baseBlock = 0x18A
     },
     [RELEARNERWIN_MSG] = {
@@ -140,7 +140,7 @@ static const struct WindowTemplate sMoveRelearnerWindowTemplates[] =
         .tilemapTop = 15,
         .width = 22,
         .height = 4,
-        .paletteNum = 0xF,
+        .paletteNum = 15,
         .baseBlock = 0x202
     },
     // Unused. Identical to sMoveRelearnerYesNoMenuTemplate
@@ -150,7 +150,7 @@ static const struct WindowTemplate sMoveRelearnerWindowTemplates[] =
         .tilemapTop = 8,
         .width = 5,
         .height = 4,
-        .paletteNum = 0xF,
+        .paletteNum = 15,
         .baseBlock = 0x25A
     },
     DUMMY_WIN_TEMPLATE
@@ -163,7 +163,7 @@ static const struct WindowTemplate sMoveRelearnerYesNoMenuTemplate =
     .tilemapTop = 8,
     .width = 5,
     .height = 4,
-    .paletteNum = 0xF,
+    .paletteNum = 15,
     .baseBlock = 0x25A
 };
 
@@ -707,8 +707,8 @@ void InitMoveRelearnerWindows(bool8 useContestWindow)
 
     InitWindows(sMoveRelearnerWindowTemplates);
     DeactivateAllTextPrinters();
-    LoadUserWindowBorderGfx(0, 1, 0xE0);
-    LoadPalette(gStandardMenuPalette, 0xF0, 0x20);
+    LoadUserWindowBorderGfx(0, 1, BG_PLTT_ID(14));
+    LoadPalette(gStandardMenuPalette, BG_PLTT_ID(15), PLTT_SIZE_4BPP);
 
     for (i = 0; i < ARRAY_COUNT(sMoveRelearnerWindowTemplates) - 1; i++)
         FillWindowPixelBuffer(i, PIXEL_FILL(1));

src/metatile_behavior.c

@@ -23,7 +23,7 @@ static const u8 sTileBitAttributes[NUM_METATILE_BEHAVIORS] =
     [MB_MOSSDEEP_GYM_WARP]               = TILE_FLAG_UNUSED,
     [MB_MT_PYRE_HOLE]                    = TILE_FLAG_UNUSED,
     [MB_POND_WATER]                      = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS,
-    [MB_SEMI_DEEP_WATER]                 = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS,
+    [MB_INTERIOR_DEEP_WATER]             = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS,
     [MB_DEEP_WATER]                      = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE | TILE_FLAG_HAS_ENCOUNTERS,
     [MB_WATERFALL]                       = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE,
     [MB_SOOTOPOLIS_DEEP_WATER]           = TILE_FLAG_UNUSED | TILE_FLAG_SURFABLE,
@@ -852,7 +852,7 @@ bool8 MetatileBehavior_IsMountain(u8 metatileBehavior)
 
 bool8 MetatileBehavior_IsDiveable(u8 metatileBehavior)
 {
-    if (metatileBehavior == MB_SEMI_DEEP_WATER
+    if (metatileBehavior == MB_INTERIOR_DEEP_WATER
      || metatileBehavior == MB_DEEP_WATER
      || metatileBehavior == MB_SOOTOPOLIS_DEEP_WATER)
         return TRUE;
@@ -905,7 +905,7 @@ bool8 MetatileBehavior_IsCrackedIce(u8 metatileBehavior)
 bool8 MetatileBehavior_IsDeepOrOceanWater(u8 metatileBehavior)
 {
     if (metatileBehavior == MB_OCEAN_WATER
-     || metatileBehavior == MB_SEMI_DEEP_WATER
+     || metatileBehavior == MB_INTERIOR_DEEP_WATER
      || metatileBehavior == MB_DEEP_WATER)
         return TRUE;
     else
@@ -1163,7 +1163,7 @@ bool8 MetatileBehavior_IsSurfableFishableWater(u8 metatileBehavior)
 {
     if (metatileBehavior == MB_POND_WATER
      || metatileBehavior == MB_OCEAN_WATER
-     || metatileBehavior == MB_SEMI_DEEP_WATER
+     || metatileBehavior == MB_INTERIOR_DEEP_WATER
      || metatileBehavior == MB_DEEP_WATER
      || metatileBehavior == MB_SOOTOPOLIS_DEEP_WATER
      || (metatileBehavior == MB_EASTWARD_CURRENT

src/mini_printf.c

@@ -142,7 +142,7 @@ static s32 mini_strlen(const char *s)
 	return len;
 }
 
-static s32 mini_itoa(u32 value, u32 radix, s32 uppercase, bool32 unsig, char *buffer)
+static s32 mini_itoa(s32 value, u32 radix, s32 uppercase, bool32 unsig, char *buffer)
 {
     char *pbuffer = buffer;
     s32 negative = 0;