diff --git a/include/bg_palette_buffer.h b/include/bg_palette_buffer.h
index e2db2993b..8a940289b 100644
--- a/include/bg_palette_buffer.h
+++ b/include/bg_palette_buffer.h
@@ -4,10 +4,10 @@
 #include "structs/rgb.h"
 
 void InitBGPaletteBuffer(void);
-void nullsub_4(s32 index, const RGB *color, s32 brightness, const RGB *ramp);
-void nullsub_5(s32 index, const RGB *color);
-void SetBGPaletteBufferColorArray(s32 index, const RGB *color);
-void SetBGPaletteBufferColorRGB(s32 index, const RGB *color, s32 brightness, const RGB *ramp);
+void nullsub_4(s32 index, const RGB_Struct *color, s32 brightness, const RGB_Struct *ramp);
+void nullsub_5(s32 index, const RGB_Struct *color);
+void SetBGPaletteBufferColorArray(s32 index, const RGB_Struct *color);
+void SetBGPaletteBufferColorRGB(s32 index, const RGB_Struct *color, s32 brightness, const RGB_Struct *ramp);
 void SetBGPaletteBufferColor(s32 index, u16 *color);
 void TransferBGPaletteBuffer(void);
 
diff --git a/include/code_8004AA0.h b/include/code_8004AA0.h
index ea28b2846..50fe50a62 100644
--- a/include/code_8004AA0.h
+++ b/include/code_8004AA0.h
@@ -12,12 +12,12 @@ typedef struct unkDataFor8004AA4
 {
     /* 0x0 */ s16 colorCount;
     s16 unk2;
-    /* 0x4 */ RGB colors[0];
+    /* 0x4 */ RGB_Struct colors[0];
 } unkDataFor8004AA4;
 
 void nullsub_6(void);
 void sub_8004AA4(unkStruct_202EE8C *, OpenedFile *, s32);
-bool8 sub_8004AF0(bool8, unkStruct_202EE8C *, s32, s32, s32, const RGB *);
+bool8 sub_8004AF0(bool8, unkStruct_202EE8C *, s32, s32, s32, const RGB_Struct *);
 bool8 sub_8004D14(unkStruct_202EE8C *, s32);
 bool8 sub_8004D40(unkStruct_202EE8C *, s32);
 
diff --git a/include/code_801D014.h b/include/code_801D014.h
index a68229345..c10df25e0 100644
--- a/include/code_801D014.h
+++ b/include/code_801D014.h
@@ -24,13 +24,6 @@ struct unk_203B250
     WindowTemplates windows;
 };
 
-// size: 0x8
-struct TeamBadgeData
-{
-    /* 0x0 */ u8 *pics; // probably a pointer to an arrays of pixels?
-    /* 0x4 */ RGB *palette; // Pics share common palette
-};
-
 bool8 sub_801D014(Pokemon *);
 u32 sub_801D0DC(void);
 u32 sub_801D178(void);
diff --git a/include/graphics_memory.h b/include/graphics_memory.h
index 33ead71ea..9e2ad8a80 100644
--- a/include/graphics_memory.h
+++ b/include/graphics_memory.h
@@ -3,7 +3,7 @@
 
 #include "structs/axdata.h"
 
-extern RGB gFontPalette[128];
+extern RGB_Struct gFontPalette[128];
 
 struct unkStruct_8009A1C_ptr
 {
@@ -19,7 +19,7 @@ void ScheduleMemCopy(u32 *, const u32 *, u32);
 void ScheduleBgTilemapCopy(u32);
 void DoScheduledMemCopies(void);
 void CopyBgTilemaps0And1(void);
-void SetFontsBaseColor(RGB);
+void SetFontsBaseColor(RGB_Struct);
 bool8 sub_8009A7C(struct EfbFileData *a0, s32 a1, s32 a2, s32 a3, bool8 a4, s32 *a5, s16 *a6);
 
 #endif // GUARD_GRAPHICS_MEMORY_H
diff --git a/include/ornament_gfx.h b/include/ornament_gfx.h
index 1c9aaa21b..80ccbbb28 100644
--- a/include/ornament_gfx.h
+++ b/include/ornament_gfx.h
@@ -6,80 +6,80 @@
 #include "structs/sprite_oam.h"
 #include "structs/rgb.h"
 
-extern const RGB gFlag00Pal[];
+extern const RGB_Struct gFlag00Pal[];
 extern const SiroArchive gAxFlag00;
-extern const RGB gFlag01Pal[];
+extern const RGB_Struct gFlag01Pal[];
 extern const SiroArchive gAxFlag01;
-extern const RGB gFlag02Pal[];
+extern const RGB_Struct gFlag02Pal[];
 extern const SiroArchive gAxFlag02;
-extern const RGB gFlag03Pal[];
+extern const RGB_Struct gFlag03Pal[];
 extern const SiroArchive gAxFlag03;
-extern const RGB gFlag04Pal[];
+extern const RGB_Struct gFlag04Pal[];
 extern const SiroArchive gAxFlag04;
-extern const RGB gFlag05Pal[];
+extern const RGB_Struct gFlag05Pal[];
 extern const SiroArchive gAxFlag05;
-extern const RGB gFlag06Pal[];
+extern const RGB_Struct gFlag06Pal[];
 extern const SiroArchive gAxFlag06;
-extern const RGB gFlag07Pal[];
+extern const RGB_Struct gFlag07Pal[];
 extern const SiroArchive gAxFlag07;
-extern const RGB gFlag08Pal[];
+extern const RGB_Struct gFlag08Pal[];
 extern const SiroArchive gAxFlag08;
-extern const RGB gFlag09Pal[];
+extern const RGB_Struct gFlag09Pal[];
 extern const SiroArchive gAxFlag09;
-extern const RGB gFlag100Pal[];
+extern const RGB_Struct gFlag100Pal[];
 extern const SiroArchive gAxFlag100;
-extern const RGB gFlag101Pal[];
+extern const RGB_Struct gFlag101Pal[];
 extern const SiroArchive gAxFlag101;
-extern const RGB gFlag102Pal[];
+extern const RGB_Struct gFlag102Pal[];
 extern const SiroArchive gAxFlag102;
-extern const RGB gFlag103Pal[];
+extern const RGB_Struct gFlag103Pal[];
 extern const SiroArchive gAxFlag103;
-extern const RGB gFlag104Pal[];
+extern const RGB_Struct gFlag104Pal[];
 extern const SiroArchive gAxFlag104;
-extern const RGB gFlag105Pal[];
+extern const RGB_Struct gFlag105Pal[];
 extern const SiroArchive gAxFlag105;
-extern const RGB gFlag106Pal[];
+extern const RGB_Struct gFlag106Pal[];
 extern const SiroArchive gAxFlag106;
-extern const RGB gFlag107Pal[];
+extern const RGB_Struct gFlag107Pal[];
 extern const SiroArchive gAxFlag107;
-extern const RGB gFlag108Pal[];
+extern const RGB_Struct gFlag108Pal[];
 extern const SiroArchive gAxFlag108;
-extern const RGB gFlag109Pal[];
+extern const RGB_Struct gFlag109Pal[];
 extern const SiroArchive gAxFlag109;
-extern const RGB gFlag10Pal[];
+extern const RGB_Struct gFlag10Pal[];
 extern const SiroArchive gAxFlag10;
-extern const RGB gFlag110Pal[];
+extern const RGB_Struct gFlag110Pal[];
 extern const SiroArchive gAxFlag110;
-extern const RGB gFlag111Pal[];
+extern const RGB_Struct gFlag111Pal[];
 extern const SiroArchive gAxFlag111;
-extern const RGB gFlag112Pal[];
+extern const RGB_Struct gFlag112Pal[];
 extern const SiroArchive gAxFlag112;
-extern const RGB gFlag113Pal[];
+extern const RGB_Struct gFlag113Pal[];
 extern const SiroArchive gAxFlag113;
-extern const RGB gFlag114Pal[];
+extern const RGB_Struct gFlag114Pal[];
 extern const SiroArchive gAxFlag114;
-extern const RGB gFlag11Pal[];
+extern const RGB_Struct gFlag11Pal[];
 extern const SiroArchive gAxFlag11;
-extern const RGB gFlag12Pal[];
+extern const RGB_Struct gFlag12Pal[];
 extern const SiroArchive gAxFlag12;
-extern const RGB gFlag13Pal[];
+extern const RGB_Struct gFlag13Pal[];
 extern const SiroArchive gAxFlag13;
-extern const RGB gFlag14Pal[];
+extern const RGB_Struct gFlag14Pal[];
 extern const SiroArchive gAxFlag14;
-extern const RGB gFlag15Pal[];
+extern const RGB_Struct gFlag15Pal[];
 extern const SiroArchive gAxFlag15;
-extern const RGB gFlag16Pal[];
+extern const RGB_Struct gFlag16Pal[];
 extern const SiroArchive gAxFlag16;
 extern const SiroArchive gAxItem01;
 extern const SiroArchive gAxNpc01;
 extern const SiroArchive gAxNpc02;
 extern const SiroArchive gAxNpc03;
 extern const SiroArchive gAxNpc04;
-extern const RGB gStoneimPal[];
+extern const RGB_Struct gStoneimPal[];
 extern const SiroArchive gAxTitlebg1;
-extern const RGB gTitlebgPal[];
+extern const RGB_Struct gTitlebgPal[];
 extern const SiroArchive gAxTitleop1;
 extern const SiroArchive gAxTitleop2;
-extern const RGB gTitleopPal[];
+extern const RGB_Struct gTitleopPal[];
 
 #endif
diff --git a/include/sprite.h b/include/sprite.h
index 58e4b77bb..d47af2bd1 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -51,11 +51,11 @@ void SetSavingIconCoords(DungeonPos *pos);
 void sub_8004E8C(unkStruct_2039DB0 *);
 void sub_8005180(void);
 void sub_8005304(void);
-void sub_8005610(OpenedFile *, s32 vramIdx, s32 brightness, const RGB *ramp);
-const RGB *sub_8005674(const EfoFileData *, s32 vramIdx);
+void sub_8005610(OpenedFile *, s32 vramIdx, s32 brightness, const RGB_Struct *ramp);
+const RGB_Struct *sub_8005674(const EfoFileData *, s32 vramIdx);
 void sub_800569C(DungeonPos *, axdata *, u8);
 void sub_8005700(DungeonPos *dstPos, axdata *axData);
-void sub_8005770(s32, const RGB *color, s32 brightness, const RGB *ramp);
+void sub_8005770(s32, const RGB_Struct *color, s32 brightness, const RGB_Struct *ramp);
 
 static inline bool8 AxFlag8000(axdata *ax)
 {
diff --git a/include/structs/axdata.h b/include/structs/axdata.h
index 654219207..dce011676 100644
--- a/include/structs/axdata.h
+++ b/include/structs/axdata.h
@@ -128,7 +128,7 @@ typedef struct axObject
 
 typedef struct Palette256
 {
-    RGB pal[256];
+    RGB_Struct pal[256];
 } Palette256;
 
 // size: 0x20
@@ -140,7 +140,7 @@ typedef struct EfoFileData
     /* 0xC */ void *spriteData; // ?
     /* 0x10 */ Palette256 *unk10; // ?
     /* 0x14 */ const u32 *tiles;
-    /* 0x18 */ const RGB *pal;
+    /* 0x18 */ const RGB_Struct *pal;
     /* 0x1C */ s32 tileCount;
 } EfoFileData;
 
@@ -150,7 +150,7 @@ typedef struct EfbFileData
     const u16 *const *frames;
     s32 tileCount;
     const u32 *tiles;
-    const RGB *pal;
+    const RGB_Struct *pal;
 } EfbFileData;
 
 #endif // GUARD_AXDATA_H
diff --git a/include/structs/menu.h b/include/structs/menu.h
index 486435b48..afd3d5046 100644
--- a/include/structs/menu.h
+++ b/include/structs/menu.h
@@ -101,22 +101,22 @@ typedef struct MenuHeaderWindow
 // These macros are used for updating menu windows, as the last page can have less entries than other pages, so the window's height needs to reflect that.
 // Note: In order to get matching ASM, this macro had to be created.
 // It's probable the code below is not exactly how it was originally written, but it generates the same asm.
-#define UPDATE_MENU_WINDOW_HEIGHT_INTERNAL(ptr, _newHeight)                             \
-{                                                                                       \
-    UNUSED s32 new10;                                                                   \
-    s16 newHeight;                                                                      \
-    s16 newHeightVal = (_newHeight);                                                    \
-    UNUSED s32 dummyMatch = newHeightVal;                                               \
-    UNUSED s16 oldHeight = (ptr).windows.id[(ptr).menuWinId].height;                    \
-    dummyMatch = 0;                                                                     \
-    new10 = newHeightVal + 2;                                                           \
-    newHeight = newHeightVal;                                                           \
-                                                                                        \
-    (ptr).windows.id[(ptr).menuWinId].height = newHeight;                               \
-    (ptr).windows.id[(ptr).menuWinId].unk10 = newHeightVal + 2;                         \
-                                                                                        \
-    ResetUnusedInputStruct();                                                           \
-    ShowWindows(&(ptr).windows, TRUE, TRUE);                                            \
+#define UPDATE_MENU_WINDOW_HEIGHT_INTERNAL(ptr, _newHeight)             \
+{                                                                       \
+    UNUSED s32 newheightInTiles;                                        \
+    s16 newHeight;                                                      \
+    s16 newHeightVal = (_newHeight);                                    \
+    UNUSED s32 dummyMatch = newHeightVal;                               \
+    UNUSED s16 oldHeight = (ptr).windows.id[(ptr).menuWinId].height;    \
+    dummyMatch = 0;                                                     \
+    newheightInTiles = newHeightVal + 2;                                \
+    newHeight = newHeightVal;                                           \
+                                                                        \
+    (ptr).windows.id[(ptr).menuWinId].height = newHeight;               \
+    (ptr).windows.id[(ptr).menuWinId].heightInTiles = newHeightVal + 2; \
+                                                                        \
+    ResetUnusedInputStruct();                                           \
+    ShowWindows(&(ptr).windows, TRUE, TRUE);                            \
 }
 
 #define UPDATE_MENU_WINDOW_HEIGHT(ptr)                                                  \
@@ -125,22 +125,22 @@ typedef struct MenuHeaderWindow
 }
 
 // For Windows where height is the same as unk10.
-#define UPDATE_MENU_WINDOW_HEIGHT_2(ptr)                                                \
-{                                                                                       \
-    s32 newHeightVal = CalcEntriesTotalHeight((ptr).input.currPageEntries, DEFAULT_MENU_ENTRY_HEIGHT) + 2;                \
-    UNUSED s16 oldHeight = (ptr).windows.id[(ptr).menuWinId].height;                    \
-    s16 newHeight = newHeightVal;                                                       \
-                                                                                        \
-    (ptr).windows.id[(ptr).menuWinId].height = newHeight;                               \
-    (ptr).windows.id[(ptr).menuWinId].unk10 = newHeight;                                \
-                                                                                        \
-    ResetUnusedInputStruct();                                                           \
-    ShowWindows(&(ptr).windows, TRUE, TRUE);                                            \
+#define UPDATE_MENU_WINDOW_HEIGHT_2(ptr)                                                                   \
+{                                                                                                          \
+    s32 newHeightVal = CalcEntriesTotalHeight((ptr).input.currPageEntries, DEFAULT_MENU_ENTRY_HEIGHT) + 2; \
+    UNUSED s16 oldHeight = (ptr).windows.id[(ptr).menuWinId].height;                                       \
+    s16 newHeight = newHeightVal;                                                                          \
+                                                                                                           \
+    (ptr).windows.id[(ptr).menuWinId].height = newHeight;                                                  \
+    (ptr).windows.id[(ptr).menuWinId].heightInTiles = newHeight;                                           \
+                                                                                                           \
+    ResetUnusedInputStruct();                                                                              \
+    ShowWindows(&(ptr).windows, TRUE, TRUE);                                                               \
 }
 
 // For menu windows with two lines entries(for example job mail)
-#define UPDATE_TWO_LINES_MENU_WINDOW_HEIGHT(ptr)                                        \
-{                                                                                       \
+#define UPDATE_TWO_LINES_MENU_WINDOW_HEIGHT(ptr)                                                                                          \
+{                                                                                                                                         \
     UPDATE_MENU_WINDOW_HEIGHT_INTERNAL(ptr, CalcTwoLinesEntriesTotalHeight((ptr).input.currPageEntries, TWO_LINES_MENU_ENTRY_HEIGHT) + 2) \
 }
 
diff --git a/include/structs/rgb.h b/include/structs/rgb.h
index 56afc1153..309a0cafb 100644
--- a/include/structs/rgb.h
+++ b/include/structs/rgb.h
@@ -1,13 +1,14 @@
 #ifndef GUARD_RGB_H
 #define GUARD_RGB_H
 
-typedef struct RGB
+// 0x4
+typedef struct RGB_Struct
 {
     u8 r;
     u8 g;
     u8 b;
     u8 unk4; // Never read, always 0x80. Unused transparency/alpha flag?
-} RGB;
+} RGB_Struct;
 
 #define RGB_R 0
 #define RGB_G 1
@@ -23,7 +24,7 @@ typedef struct RGB_Array
 typedef union RGB_Union
 {
     RGB_Array asArr;
-    RGB separate;
+    RGB_Struct separate;
 } RGB_Union;
 
 #define RGB_TO_GBA(r, g, b) RGB2(((u32)(r) & 0xF8) >> 3, ((g) & 0xF8) >> 3, ((b) & 0xF8) >> 3)
diff --git a/include/structs/str_202EE8C.h b/include/structs/str_202EE8C.h
index b12cea000..68db0eaa4 100644
--- a/include/structs/str_202EE8C.h
+++ b/include/structs/str_202EE8C.h
@@ -9,10 +9,10 @@ typedef struct unkStruct_202EE8C
     u32 unk0;
     u16 unk4;
     s16 unk6;
-    RGB *unk8;
-    RGB *unkC;
-    RGB *unk10;
-    RGB unk14;
+    RGB_Struct *unk8;
+    RGB_Struct *unkC;
+    RGB_Struct *unk10;
+    RGB_Struct unk14;
 } unkStruct_202EE8C;
 
 #endif // GUARD_STR_202EE8C_H
diff --git a/include/structs/str_dungeon.h b/include/structs/str_dungeon.h
index 24f58cc05..5d04d0934 100644
--- a/include/structs/str_dungeon.h
+++ b/include/structs/str_dungeon.h
@@ -404,7 +404,7 @@ typedef struct Dungeon
     Entity *unkBC;
     Entity unkC0;
     struct unkStruct_Dungeon134_sub unk134;
-    /* 0x17C */ RGB colorRamp[COLOR_RAMP_COUNT];
+    /* 0x17C */ RGB_Struct colorRamp[COLOR_RAMP_COUNT];
     /* 0x57C */ unkDungeon57C unk57C;
     /* 0x5C0 */ s32 unk5C0;
     /* 0x5C4 */ struct unkStruct_Dungeon5C4_sub unk5C4[3];
diff --git a/include/structs/str_mon_portrait.h b/include/structs/str_mon_portrait.h
index dc92df3fd..99518235a 100644
--- a/include/structs/str_mon_portrait.h
+++ b/include/structs/str_mon_portrait.h
@@ -8,7 +8,7 @@
 // size: 0x8
 typedef struct PortraitGfxSub
 {
-    /* 0x0 */ const RGB *pal;
+    /* 0x0 */ const RGB_Struct *pal;
     /* 0x4 */ const u8 *gfx;
 } PortraitGfxSub;
 
diff --git a/include/structs/str_text.h b/include/structs/str_text.h
index 319ec052c..757781dd6 100644
--- a/include/structs/str_text.h
+++ b/include/structs/str_text.h
@@ -22,11 +22,11 @@ typedef struct Window
     /* 0x2 */ s16 y;
     /* 0x4 */ s16 width;
     /* 0x6 */ s16 height;
-    /* 0x8 */ s16 unk8;
+    /* 0x8 */ s16 heightInTiles;
     /* 0xC */ s32 type;
     /* 0x10 */ u32 unk10;
     /* 0x14 */ u32 unk14;
-    /* 0x18 */ u32 *unk18;
+    /* 0x18 */ u32 *unk18; // Appears to be window graphics data
     /* 0x1C */ u32 *unk1C;
     /* 0x20 */ s32 unk20;
     /* 0x24 */ s32 unk24;
@@ -54,14 +54,14 @@ typedef struct WindowHeader
 // size: 0x18
 typedef struct WindowTemplate
 {
-    u8 unk0;
-    /* 0x4 */ s32 type;
-    /* 0x8 */ DungeonPos pos;
-    /* 0xC */ s16 width;
-    /* 0xE */ s16 height;
-    s16 unk10; // In most cases it's the same as height. If it's smaller than height, the window may look glitchy. Maybe something with tile allocation/how the window is filled?
-    s16 unk12;
-    const WindowHeader *header;
+    /* 0x00 */ u8 unk0; // Appears to be some bit flags
+    /* 0x04 */ s32 type;
+    /* 0x08 */ DungeonPos pos;
+    /* 0x0C */ s16 width;
+    /* 0x0E */ s16 height;
+    /* 0x10 */ s16 heightInTiles;
+    /* 0x12 */ s16 unk12;
+    /* 0x14 */ const WindowHeader *header;
 } WindowTemplate;
 
 #define WINDOW_TYPE_0                0
@@ -76,7 +76,7 @@ typedef struct WindowTemplate
 #define MAX_WINDOWS 4
 
 // All fields are zeroed out except for type which is set to WINDOW_TYPE_NORMAL.
-#define WIN_TEMPLATE_DUMMY (WindowTemplate) { .unk0 = 0, .type = WINDOW_TYPE_NORMAL, .pos = { .x = 0, .y = 0 }, .width = 0, .height = 0, .unk10 = 0, .unk12 = 0, .header = NULL }
+#define WIN_TEMPLATE_DUMMY (WindowTemplate) { .unk0 = 0, .type = WINDOW_TYPE_NORMAL, .pos = { .x = 0, .y = 0 }, .width = 0, .height = 0, .heightInTiles = 0, .unk12 = 0, .header = NULL }
 
 // size: 0x60
 typedef struct WindowTemplates
diff --git a/include/text_2.h b/include/text_2.h
index 942664179..e9d78bb0f 100644
--- a/include/text_2.h
+++ b/include/text_2.h
@@ -6,14 +6,14 @@
 void AddDoubleUnderScoreHighlight(u32 windowId, s32 x, s32 y, s32 width, u32 color);
 void AddUnderScoreHighlight(u32 windowId, s32 x, s32 y, s32 width, u32 color);
 void CallPrepareTextbox_8008C54(u32 windowId);
-void DisplayMonPortraitSprite(s32 a0, const u8 *compressedData, s32 a2);
-void DisplayMonPortraitSpriteFlipped(s32 a0, const u8 *compressedData, s32 a1);
+void DisplayMonPortraitSprite(s32 winID, const u8 *compressedData, s32 palNum);
+void DisplayMonPortraitSpriteFlipped(s32 winID, const u8 *compressedData, s32 palNum);
 const unkChar *GetCharacter(s32 chr);
 void PrepareTextbox_8008C6C(Window *windows, u32 windowId);
 void ResetWindowBgData(void);
 void sub_8007A78(u32 a0, s32 x, s32 y, s32 a3, u32 color);
 void sub_8007B7C(u32 a0, s32 x, s32 y, s32 a3, u32 color);
-void sub_8007E20(u32 a0, u32 a1, u32 a2, u32 a3, u32 a4, u32 *a5, u32 a6);
+void sub_8007E20(u32 winID, u32 x, u32 y, u32 w, u32 h, u32 src[8], u32 palNum);
 void sub_80087EC(s32 a0, s32 a1, s32 a2, s32 a3, s32 a4);
 void sub_80089AC(const WindowTemplate *r4, DungeonPos *r5_Str);
 u32 DrawCharOnWindow(s32 x, s32 y, u32 chr, u32 color, u32 windowId);
diff --git a/src/bg_palette_buffer.c b/src/bg_palette_buffer.c
index 2e85296a7..9388b0d78 100644
--- a/src/bg_palette_buffer.c
+++ b/src/bg_palette_buffer.c
@@ -23,7 +23,7 @@ void InitBGPaletteBuffer(void)
 }
 
 // arm9.bin::020011A0
-void SetBGPaletteBufferColorRGB(s32 index, const RGB *color, s32 brightnessRaw, const RGB *ramp)
+void SetBGPaletteBufferColorRGB(s32 index, const RGB_Struct *color, s32 brightnessRaw, const RGB_Struct *ramp)
 {
     s32 brightness = brightnessRaw;
 
@@ -47,7 +47,7 @@ void SetBGPaletteBufferColorRGB(s32 index, const RGB *color, s32 brightnessRaw,
 }
 
 // arm9.bin::02001130
-void SetBGPaletteBufferColorArray(s32 index, const RGB *color32)
+void SetBGPaletteBufferColorArray(s32 index, const RGB_Struct *color32)
 {
     sBGPaletteRowDirty[index / BG_PALETTE_ROW_SIZE] = TRUE;
     sBGPaletteBuffer[index] = RGB2(color32->r >> 3, color32->g >> 3, color32->b >> 3);
@@ -61,12 +61,12 @@ void SetBGPaletteBufferColor(s32 index, u16 *color)
 }
 
 // arm9.bin::02000FC8
-void nullsub_4(s32 index, const RGB *colorArray, s32 brightness, const RGB *ramp)
+void nullsub_4(s32 index, const RGB_Struct *colorArray, s32 brightness, const RGB_Struct *ramp)
 {
 }
 
 // arm9.bin::02000F58
-void nullsub_5(s32 index, const RGB *colorArray)
+void nullsub_5(s32 index, const RGB_Struct *colorArray)
 {
 }
 
diff --git a/src/code_8004AA0.c b/src/code_8004AA0.c
index 3940cd2e6..51fe3c253 100644
--- a/src/code_8004AA0.c
+++ b/src/code_8004AA0.c
@@ -33,7 +33,7 @@ void sub_8004AA4(unkStruct_202EE8C *a0, OpenedFile *a1, s32 a2)
     }
 }
 
-bool8 sub_8004AF0(bool8 a0, unkStruct_202EE8C *a1, s32 a2, s32 a3, s32 a4, const RGB *a5)
+bool8 sub_8004AF0(bool8 a0, unkStruct_202EE8C *a1, s32 a2, s32 a3, s32 a4, const RGB_Struct *a5)
 {
     bool8 bVar3;
     bool8 ret;
@@ -65,7 +65,7 @@ bool8 sub_8004AF0(bool8 a0, unkStruct_202EE8C *a1, s32 a2, s32 a3, s32 a4, const
     return ret;
 }
 
-UNUSED static bool8 sub_8004B78(bool8 a0, unkStruct_202EE8C *a1, s32 a2, s32 a3, s32 a4, const RGB *a5)
+UNUSED static bool8 sub_8004B78(bool8 a0, unkStruct_202EE8C *a1, s32 a2, s32 a3, s32 a4, const RGB_Struct *a5)
 {
     bool8 bVar3;
     bool8 ret;
@@ -97,14 +97,14 @@ UNUSED static bool8 sub_8004B78(bool8 a0, unkStruct_202EE8C *a1, s32 a2, s32 a3,
     return ret;
 }
 
-bool8 sub_8004C00(unkStruct_202EE8C *a0, s32 a1, s32 a2, s32 brightness, const RGB *ramp, s16 *a5)
+bool8 sub_8004C00(unkStruct_202EE8C *a0, s32 a1, s32 a2, s32 brightness, const RGB_Struct *ramp, s16 *a5)
 {
     bool8 ret;
     s32 i;
     s32 r;
     s32 g;
     s32 b;
-    RGB color;
+    RGB_Struct color;
 
     ret = FALSE;
 
diff --git a/src/code_800D090.c b/src/code_800D090.c
index b9309b2a9..4d60ddfc1 100644
--- a/src/code_800D090.c
+++ b/src/code_800D090.c
@@ -5,7 +5,7 @@
 
 void Hang(void)
 {
-    while(1)
+    while (TRUE)
     {
         asm("swi 0x2");
     }
diff --git a/src/code_801D014.c b/src/code_801D014.c
index 021acf810..1b251d835 100644
--- a/src/code_801D014.c
+++ b/src/code_801D014.c
@@ -32,12 +32,19 @@
 #include "wonder_mail_802C4C8.h"
 #include "wonder_mail_802C860.h"
 
+// size: 0x8
+struct TeamBadgeData
+{
+    /* 0x0 */ u32 *pics; // Array of (MAX_TEAM_RANKS * 32)
+    /* 0x4 */ RGB_Struct *palette; // Array of 16
+};
+
 static EWRAM_INIT struct unk_203B250 *sUnknown_203B250 = {NULL};
 static EWRAM_INIT u32 sUnknown_203B254 = {0};
 
 #include "data/code_801D014.h"
 
-static void LoadTeamRankBadge(u32, u32, u32);
+static void LoadTeamRankBadge(u32 winID, u32 x, u32 y);
 
 static void sub_801D208(u32 newState);
 static void sub_801D220(void);
@@ -588,25 +595,27 @@ static void sub_801D894(void)
     sub_80073E0(2);
 }
 
-static void LoadTeamRankBadge(u32 a0, u32 a1, u32 a2)
+static void LoadTeamRankBadge(u32 winID, u32 x, u32 y)
 {
     OpenedFile *teamBadgeFile;
-    s32 paletteIndex;
-    u8 rank;
-    RGB *colorArray;
-    u8 *teamBadgePic;
+    u32 *pic;
+    RGB_Struct *pal;
+    s32 i;
 
     teamBadgeFile = OpenFileAndGetFileDataPtr(sTeamRankBadgeFileName, &gTitleMenuFileArchive);
-    teamBadgePic = ((struct TeamBadgeData *)(teamBadgeFile->data))->pics;
-    colorArray = ((struct TeamBadgeData *)(teamBadgeFile->data))->palette;
+#define TMRKPAT_DATA ((struct TeamBadgeData *)teamBadgeFile->data)
 
-    for (paletteIndex = 0; paletteIndex < 16; paletteIndex++) {
-        SetBGPaletteBufferColorArray(paletteIndex + 224, colorArray);
-        colorArray++;
+    pic = TMRKPAT_DATA->pics;
+    pal = TMRKPAT_DATA->palette;
+
+    for (i = 0; i < 16; i++) {
+        SetBGPaletteBufferColorArray(i + 0xE0, pal);
+        pal++;
     }
 
-    rank = GetRescueTeamRank();
-    teamBadgePic = &teamBadgePic[rank * 128];
-    sub_8007E20(a0, a1, a2, 16, 16, (void *) teamBadgePic, 14);
+    pic = &pic[GetRescueTeamRank() * 32];
+    sub_8007E20(winID, x, y, 16, 16, pic, 14);
+
+#undef TMRKPAT_DATA
     CloseFile(teamBadgeFile);
 }
diff --git a/src/code_803B050.c b/src/code_803B050.c
index b836e8088..a1c54cf2d 100644
--- a/src/code_803B050.c
+++ b/src/code_803B050.c
@@ -20,12 +20,13 @@ EWRAM_INIT unkStruct_203B3FC *gUnknown_203B3FC = NULL; // arm9.bin::020EAF84
 
 const WindowTemplate gUnknown_80E7F3C = WIN_TEMPLATE_DUMMY;
 
-const WindowTemplate gUnknown_80E7F54 =
-{
+const WindowTemplate gUnknown_80E7F54 = {
     .unk0 = 0,
     .type = WINDOW_TYPE_WITH_HEADER,
-    .pos = {2, 2},
-    .width = 24, .height = 17, .unk10 = 17,
+    .pos = { 2, 2 },
+    .width = 24,
+    .height = 17,
+    .heightInTiles = 17,
     .unk12 = 0,
     .header = NULL
 };
diff --git a/src/code_803DA7C_2.c b/src/code_803DA7C_2.c
index c56f0b9e7..095709e57 100644
--- a/src/code_803DA7C_2.c
+++ b/src/code_803DA7C_2.c
@@ -20,7 +20,7 @@ EWRAM_DATA OpenedFile *gUnknown_202EC94 = NULL;
 EWRAM_DATA OpenedFile *gUnknown_202EC98 = NULL;
 EWRAM_DATA OpenedFile *gUnknown_202EC9C = NULL;
 EWRAM_DATA OpenedFile *gUnknown_202ECA0 = NULL;
-EWRAM_DATA RGB gUnknown_202ECA4[33] = {0};
+EWRAM_DATA RGB_Struct gUnknown_202ECA4[33] = {0};
 
 struct FileStruct2
 {
@@ -121,7 +121,7 @@ void sub_803E02C(void)
 void sub_803E13C(void)
 {
     s32 i;
-    RGB *pal;
+    RGB_Struct *pal;
 
     SetWindowBGColor();
     if (gGameOptionsRef->playerGender != 0)
diff --git a/src/code_8040094_1.c b/src/code_8040094_1.c
index 129634765..895b1fc80 100644
--- a/src/code_8040094_1.c
+++ b/src/code_8040094_1.c
@@ -95,7 +95,7 @@ static void sub_8040C4C(Entity *entity, Move *move, bool32 hasSpecialEffect)
     r4 = sub_800EA84(&sp);
     sub_8042DD4(r4, entity, 5);
     savedUnkVar = gUnknown_203B40D;
-    while (1) {
+    while (TRUE) {
         if (!sub_800E9A8(r4))
             break;
         if (!r8)
@@ -323,7 +323,7 @@ void sub_8041168(Entity *entity, Entity *entity2, Move *move, DungeonPos *pos)
     var3 = sub_800EBC8(&sp);
     DungeonRunFrameActions(0x5B);
     sub_8042DD4(var3, entity2, 6);
-    while (1) {
+    while (TRUE) {
         if (!sub_800E9A8(var3))
             break;
         DungeonRunFrameActions(0x28);
diff --git a/src/code_8099360.c b/src/code_8099360.c
index 7e5d53aed..e3abdfcc6 100644
--- a/src/code_8099360.c
+++ b/src/code_8099360.c
@@ -32,38 +32,40 @@ void sub_809965C(void)
 
 void sub_8099690(u32 param_1)
 {
-    OpenedFile *temp;
-    RGB *pal;
-    RGB *var2;
+    OpenedFile *file;
+    RGB_Struct *pal;
+    RGB_Struct *var2;
     u8 gender;
 
     s32 index;
 
-    temp = OpenFileAndGetFileDataPtr("fontpal", &gSystemFileArchive);
+    file = OpenFileAndGetFileDataPtr("fontpal", &gSystemFileArchive);
 
-    switch(param_1)
-    {
-        default:
+    switch (param_1) {
+        default: {
             gender = gGameOptionsRef->playerGender;
-             pal = &gFontPalette[0x10];
-            if(gender != 0)
+            pal = &gFontPalette[0x10];
+            if (gender != MALE)
                 pal += 0x40;
             break;
-        case 1:
+        }
+        case 1: {
             pal = &gFontPalette[0x60];
             break;
-        case 2:
+        }
+        case 2: {
             pal = &gFontPalette[0x70];
             break;
+        }
     }
 
     sub_800388C(0xF0, (const RGB_Union *)pal, 0x10);
     var2 = pal;
-    for(index = 0; index < 0x10; index++)
-    {
+    for (index = 0; index < 0x10; index++) {
         nullsub_5(index + 0xF0, var2++);
     }
-    CloseFile(temp);
+
+    CloseFile(file);
 }
 
 UNUSED static void sub_8099708(u16 a0, RGB_Array a1)
diff --git a/src/credits1.c b/src/credits1.c
index 12b8fdf90..21e74f20f 100644
--- a/src/credits1.c
+++ b/src/credits1.c
@@ -14,10 +14,10 @@ static const WindowTemplate sDummyWinTemplate = WIN_TEMPLATE_DUMMY;
 static const WindowTemplate gUnknown_80E4A28 = {
     .unk0 = 0,
     .type = WINDOW_TYPE_ONLY_TEXT,
-    .pos = {2, 2},
+    .pos = { 2, 2 },
     .width = 26,
     .height = 16,
-    .unk10 = 16,
+    .heightInTiles = 16,
     .unk12 = 0,
     .header = NULL,
 };
diff --git a/src/data/effects/efbg000.c b/src/data/effects/efbg000.c
index 38856615a..2208a47da 100644
--- a/src/data/effects/efbg000.c
+++ b/src/data/effects/efbg000.c
@@ -85,7 +85,7 @@ const u16 *const gUnknown_9747A00[] = {
     gUnknown_9746BEC,
     gUnknown_97472F6,
 };
-const RGB gUnknown_9747A40[] = INCBIN_U8("data/effects/efbg000.pmdpal");
+const RGB_Struct gUnknown_9747A40[] = INCBIN_U8("data/effects/efbg000.pmdpal");
 const u32 gUnknown_9747E40[] = INCBIN_U32("data/effects/efbg000.4bpp");
 const struct EfbFileData gUnknown_974BE40 = {
     ARRAY_COUNT(gUnknown_9747A00), // 16
diff --git a/src/data/effects/efbg001.c b/src/data/effects/efbg001.c
index 26b75fa48..3c34869ce 100644
--- a/src/data/effects/efbg001.c
+++ b/src/data/effects/efbg001.c
@@ -85,7 +85,7 @@ const u16 *const gUnknown_9752F04[] = {
     gUnknown_97520F0,
     gUnknown_97527FA,
 };
-const RGB gUnknown_9752F44[] = INCBIN_U8("data/effects/efbg001.pmdpal");
+const RGB_Struct gUnknown_9752F44[] = INCBIN_U8("data/effects/efbg001.pmdpal");
 const u32 gUnknown_9753344[] = INCBIN_U32("data/effects/efbg001.4bpp");
 const struct EfbFileData gUnknown_97547C4 = {
     ARRAY_COUNT(gUnknown_9752F04), // 16
diff --git a/src/data/effects/efbg002.c b/src/data/effects/efbg002.c
index 98848ab4d..eb4d6c41a 100644
--- a/src/data/effects/efbg002.c
+++ b/src/data/effects/efbg002.c
@@ -350,7 +350,7 @@ const u16 *const gUnknown_9755E2C[] = {
     gUnknown_9755DE0,
     gUnknown_9755E06,
 };
-const RGB gUnknown_9755F40[] = INCBIN_U8("data/effects/efbg002.pmdpal");
+const RGB_Struct gUnknown_9755F40[] = INCBIN_U8("data/effects/efbg002.pmdpal");
 const u32 gUnknown_9756340[] = INCBIN_U32("data/effects/efbg002.4bpp");
 const struct EfbFileData gUnknown_9756660 = {
     ARRAY_COUNT(gUnknown_9755E2C), // 69
diff --git a/src/data/effects/efbg003.c b/src/data/effects/efbg003.c
index 1a9a709b7..d06cf574e 100644
--- a/src/data/effects/efbg003.c
+++ b/src/data/effects/efbg003.c
@@ -165,7 +165,7 @@ const u16 *const gUnknown_97647C4[] = {
     gUnknown_97639B0,
     gUnknown_97640BA,
 };
-const RGB gUnknown_9764844[] = INCBIN_U8("data/effects/efbg003.pmdpal");
+const RGB_Struct gUnknown_9764844[] = INCBIN_U8("data/effects/efbg003.pmdpal");
 const u32 gUnknown_9764C44[] = INCBIN_U32("data/effects/efbg003.4bpp");
 const struct EfbFileData gUnknown_9766A64 = {
     ARRAY_COUNT(gUnknown_97647C4), // 32
diff --git a/src/data/effects/efbg004.c b/src/data/effects/efbg004.c
index 9a4411a59..286785ca8 100644
--- a/src/data/effects/efbg004.c
+++ b/src/data/effects/efbg004.c
@@ -320,7 +320,7 @@ const u16 *const gUnknown_97688F8[] = {
     gUnknown_97688CC,
     gUnknown_97688E2,
 };
-const RGB gUnknown_97689F4[] = INCBIN_U8("data/effects/efbg004.pmdpal");
+const RGB_Struct gUnknown_97689F4[] = INCBIN_U8("data/effects/efbg004.pmdpal");
 const u32 gUnknown_9768DF4[] = INCBIN_U32("data/effects/efbg004.4bpp");
 const struct EfbFileData gUnknown_9769074 = {
     ARRAY_COUNT(gUnknown_97688F8), // 63
diff --git a/src/data/effects/efbg005.c b/src/data/effects/efbg005.c
index 487f8ed47..92ebc9715 100644
--- a/src/data/effects/efbg005.c
+++ b/src/data/effects/efbg005.c
@@ -115,7 +115,7 @@ const u16 *const gUnknown_9772B74[] = {
     gUnknown_9771D60,
     gUnknown_977246A,
 };
-const RGB gUnknown_9772BCC[] = INCBIN_U8("data/effects/efbg005.pmdpal");
+const RGB_Struct gUnknown_9772BCC[] = INCBIN_U8("data/effects/efbg005.pmdpal");
 const u32 gUnknown_9772FCC[] = INCBIN_U32("data/effects/efbg005.4bpp");
 const struct EfbFileData gUnknown_9773AEC = {
     ARRAY_COUNT(gUnknown_9772B74), // 22
diff --git a/src/data/effects/efbg006.c b/src/data/effects/efbg006.c
index 014ccfa32..ff3c39ab3 100644
--- a/src/data/effects/efbg006.c
+++ b/src/data/effects/efbg006.c
@@ -165,7 +165,7 @@ const u16 *const gUnknown_9781C50[] = {
     gUnknown_9780E3C,
     gUnknown_9781546,
 };
-const RGB gUnknown_9781CD0[] = INCBIN_U8("data/effects/efbg006.pmdpal");
+const RGB_Struct gUnknown_9781CD0[] = INCBIN_U8("data/effects/efbg006.pmdpal");
 const u32 gUnknown_97820D0[] = INCBIN_U32("data/effects/efbg006.4bpp");
 const struct EfbFileData gUnknown_9783EF0 = {
     ARRAY_COUNT(gUnknown_9781C50), // 32
diff --git a/src/data/effects/efbg007.c b/src/data/effects/efbg007.c
index 402fab97f..e8198b1f1 100644
--- a/src/data/effects/efbg007.c
+++ b/src/data/effects/efbg007.c
@@ -165,7 +165,7 @@ const u16 *const gUnknown_978BC8C[] = {
     gUnknown_978B2F4,
     gUnknown_978B830,
 };
-const RGB gUnknown_978BD0C[] = INCBIN_U8("data/effects/efbg007.pmdpal");
+const RGB_Struct gUnknown_978BD0C[] = INCBIN_U8("data/effects/efbg007.pmdpal");
 const u32 gUnknown_978C10C[] = INCBIN_U32("data/effects/efbg007.4bpp");
 const struct EfbFileData gUnknown_978C7AC = {
     ARRAY_COUNT(gUnknown_978BC8C), // 32
diff --git a/src/data/effects/efob000.c b/src/data/effects/efob000.c
index 571131b8d..21cbf4823 100644
--- a/src/data/effects/efob000.c
+++ b/src/data/effects/efob000.c
@@ -6193,7 +6193,7 @@ const ax_anim gUnknown_9798AD8[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9798B44[] = INCBIN_U32("data/effects/efob000.4bpp");
-const RGB gUnknown_979A6A4[] = INCBIN_U8("data/effects/efob000.pmdpal");
+const RGB_Struct gUnknown_979A6A4[] = INCBIN_U8("data/effects/efob000.pmdpal");
 const ax_pose *const gUnknown_979A6E4[] = {
     gUnknown_978C7D0,
     gUnknown_978C802,
diff --git a/src/data/effects/efob001.c b/src/data/effects/efob001.c
index 0185f6fa2..070ff3e7f 100644
--- a/src/data/effects/efob001.c
+++ b/src/data/effects/efob001.c
@@ -332,7 +332,7 @@ const ax_anim gUnknown_979C054[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_979C084[] = INCBIN_U32("data/effects/efob001.4bpp");
-const RGB gUnknown_979DA44[] = INCBIN_U8("data/effects/efob001.pmdpal");
+const RGB_Struct gUnknown_979DA44[] = INCBIN_U8("data/effects/efob001.pmdpal");
 const ax_pose *const gUnknown_979DA84[] = {
     gUnknown_979B740,
     gUnknown_979B754,
diff --git a/src/data/effects/efob002.c b/src/data/effects/efob002.c
index 94c2403de..6c4565701 100644
--- a/src/data/effects/efob002.c
+++ b/src/data/effects/efob002.c
@@ -76,7 +76,7 @@ const ax_anim gUnknown_979DEA4[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_979DF1C[] = INCBIN_U32("data/effects/efob002.4bpp");
-const RGB gUnknown_979EC1C[] = INCBIN_U8("data/effects/efob002.pmdpal");
+const RGB_Struct gUnknown_979EC1C[] = INCBIN_U8("data/effects/efob002.pmdpal");
 const ax_pose *const gUnknown_979EC5C[] = {
     gUnknown_979DD04,
     gUnknown_979DD22,
diff --git a/src/data/effects/efob003.c b/src/data/effects/efob003.c
index 5c4f76435..a94a83ff0 100644
--- a/src/data/effects/efob003.c
+++ b/src/data/effects/efob003.c
@@ -494,7 +494,7 @@ const ax_anim gUnknown_979FD9C[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_979FF7C[] = INCBIN_U32("data/effects/efob003.4bpp");
-const RGB gUnknown_97A0D3C[] = INCBIN_U8("data/effects/efob003.pmdpal");
+const RGB_Struct gUnknown_97A0D3C[] = INCBIN_U8("data/effects/efob003.pmdpal");
 const ax_pose *const gUnknown_97A0D7C[] = {
     gUnknown_979ECD4,
     gUnknown_979ECE8,
diff --git a/src/data/effects/efob004.c b/src/data/effects/efob004.c
index 139075dbb..004d9d298 100644
--- a/src/data/effects/efob004.c
+++ b/src/data/effects/efob004.c
@@ -304,7 +304,7 @@ const ax_anim gUnknown_97A16FC[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97A18C4[] = INCBIN_U32("data/effects/efob004.4bpp");
-const RGB gUnknown_97A1FC4[] = INCBIN_U8("data/effects/efob004.pmdpal");
+const RGB_Struct gUnknown_97A1FC4[] = INCBIN_U8("data/effects/efob004.pmdpal");
 const ax_pose *const gUnknown_97A2004[] = {
     gUnknown_97A0F44,
     gUnknown_97A0F58,
diff --git a/src/data/effects/efob005.c b/src/data/effects/efob005.c
index 8f305c174..ef3ffd2a5 100644
--- a/src/data/effects/efob005.c
+++ b/src/data/effects/efob005.c
@@ -292,7 +292,7 @@ const ax_anim gUnknown_97A2810[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97A287C[] = INCBIN_U32("data/effects/efob005.4bpp");
-const RGB gUnknown_97A37FC[] = INCBIN_U8("data/effects/efob005.pmdpal");
+const RGB_Struct gUnknown_97A37FC[] = INCBIN_U8("data/effects/efob005.pmdpal");
 const ax_pose *const gUnknown_97A383C[] = {
     gUnknown_97A20D4,
     gUnknown_97A20F2,
diff --git a/src/data/effects/efob006.c b/src/data/effects/efob006.c
index 87aff2938..2350ff443 100644
--- a/src/data/effects/efob006.c
+++ b/src/data/effects/efob006.c
@@ -202,7 +202,7 @@ const ax_anim gUnknown_97A3F64[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97A4018[] = INCBIN_U32("data/effects/efob006.4bpp");
-const RGB gUnknown_97A4EB8[] = INCBIN_U8("data/effects/efob006.pmdpal");
+const RGB_Struct gUnknown_97A4EB8[] = INCBIN_U8("data/effects/efob006.pmdpal");
 const ax_pose *const gUnknown_97A4EF8[] = {
     gUnknown_97A3998,
     gUnknown_97A39D4,
diff --git a/src/data/effects/efob007.c b/src/data/effects/efob007.c
index cda85538e..0e29f8cba 100644
--- a/src/data/effects/efob007.c
+++ b/src/data/effects/efob007.c
@@ -1363,7 +1363,7 @@ const ax_anim gUnknown_97A7910[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97A79DC[] = INCBIN_U32("data/effects/efob007.4bpp");
-const RGB gUnknown_97A883C[] = INCBIN_U8("data/effects/efob007.pmdpal");
+const RGB_Struct gUnknown_97A883C[] = INCBIN_U8("data/effects/efob007.pmdpal");
 const ax_pose *const gUnknown_97A887C[] = {
     gUnknown_97A4FBC,
     gUnknown_97A4FD0,
diff --git a/src/data/effects/efob008.c b/src/data/effects/efob008.c
index 25d5c1e08..22b65721f 100644
--- a/src/data/effects/efob008.c
+++ b/src/data/effects/efob008.c
@@ -125,7 +125,7 @@ const ax_anim gUnknown_97A8F8C[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97A9010[] = INCBIN_U32("data/effects/efob008.4bpp");
-const RGB gUnknown_97A9FB0[] = INCBIN_U8("data/effects/efob008.pmdpal");
+const RGB_Struct gUnknown_97A9FB0[] = INCBIN_U8("data/effects/efob008.pmdpal");
 const ax_pose *const gUnknown_97A9FF0[] = {
     gUnknown_97A8C48,
     gUnknown_97A8C5C,
diff --git a/src/data/effects/efob009.c b/src/data/effects/efob009.c
index e1a2c6232..28dfa01fa 100644
--- a/src/data/effects/efob009.c
+++ b/src/data/effects/efob009.c
@@ -195,7 +195,7 @@ const ax_anim gUnknown_97AA620[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97AA704[] = INCBIN_U32("data/effects/efob009.4bpp");
-const RGB gUnknown_97AAAE4[] = INCBIN_U8("data/effects/efob009.pmdpal");
+const RGB_Struct gUnknown_97AAAE4[] = INCBIN_U8("data/effects/efob009.pmdpal");
 const ax_pose *const gUnknown_97AAB24[] = {
     gUnknown_97AA0C0,
     gUnknown_97AA11A,
diff --git a/src/data/effects/efob010.c b/src/data/effects/efob010.c
index 778ba9f73..8be33a5c0 100644
--- a/src/data/effects/efob010.c
+++ b/src/data/effects/efob010.c
@@ -1494,7 +1494,7 @@ const ax_anim gUnknown_97ADF98[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97AE058[] = INCBIN_U32("data/effects/efob010.4bpp");
-const RGB gUnknown_97AF018[] = INCBIN_U8("data/effects/efob010.pmdpal");
+const RGB_Struct gUnknown_97AF018[] = INCBIN_U8("data/effects/efob010.pmdpal");
 const ax_pose *const gUnknown_97AF058[] = {
     gUnknown_97AABB8,
     gUnknown_97AABCC,
diff --git a/src/data/effects/efob011.c b/src/data/effects/efob011.c
index d6115a84b..48e2f7b66 100644
--- a/src/data/effects/efob011.c
+++ b/src/data/effects/efob011.c
@@ -86,7 +86,7 @@ const ax_anim gUnknown_97AF3E0[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97AF434[] = INCBIN_U32("data/effects/efob011.4bpp");
-const RGB gUnknown_97AFD74[] = INCBIN_U8("data/effects/efob011.pmdpal");
+const RGB_Struct gUnknown_97AFD74[] = INCBIN_U8("data/effects/efob011.pmdpal");
 const ax_pose *const gUnknown_97AFDB4[] = {
     gUnknown_97AF224,
     gUnknown_97AF238,
diff --git a/src/data/effects/efob012.c b/src/data/effects/efob012.c
index 798804c03..7e8d13773 100644
--- a/src/data/effects/efob012.c
+++ b/src/data/effects/efob012.c
@@ -72,7 +72,7 @@ const ax_anim gUnknown_97AFFA0[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97B0030[] = INCBIN_U32("data/effects/efob012.4bpp");
-const RGB gUnknown_97B0850[] = INCBIN_U8("data/effects/efob012.pmdpal");
+const RGB_Struct gUnknown_97B0850[] = INCBIN_U8("data/effects/efob012.pmdpal");
 const ax_pose *const gUnknown_97B0890[] = {
     gUnknown_97AFE64,
     gUnknown_97AFE78,
diff --git a/src/data/effects/efob013.c b/src/data/effects/efob013.c
index 115627809..c03d22ae3 100644
--- a/src/data/effects/efob013.c
+++ b/src/data/effects/efob013.c
@@ -1833,7 +1833,7 @@ const ax_anim gUnknown_97B41D8[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97B41FC[] = INCBIN_U32("data/effects/efob013.4bpp");
-const RGB gUnknown_97B4BDC[] = INCBIN_U8("data/effects/efob013.pmdpal");
+const RGB_Struct gUnknown_97B4BDC[] = INCBIN_U8("data/effects/efob013.pmdpal");
 const ax_pose *const gUnknown_97B4C1C[] = {
     gUnknown_97B0910,
     gUnknown_97B0956,
diff --git a/src/data/effects/efob014.c b/src/data/effects/efob014.c
index 33fcf2b2e..f5a089fb4 100644
--- a/src/data/effects/efob014.c
+++ b/src/data/effects/efob014.c
@@ -87,7 +87,7 @@ const ax_anim gUnknown_97B5790[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97B5910[] = INCBIN_U32("data/effects/efob014.4bpp");
-const RGB gUnknown_97B6870[] = INCBIN_U8("data/effects/efob014.pmdpal");
+const RGB_Struct gUnknown_97B6870[] = INCBIN_U8("data/effects/efob014.pmdpal");
 const ax_pose *const gUnknown_97B68B0[] = {
     gUnknown_97B569C,
     gUnknown_97B56B0,
diff --git a/src/data/effects/efob015.c b/src/data/effects/efob015.c
index 5a358ed8d..c43744769 100644
--- a/src/data/effects/efob015.c
+++ b/src/data/effects/efob015.c
@@ -61,7 +61,7 @@ const ax_anim gUnknown_97B6A70[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97B6AC4[] = INCBIN_U32("data/effects/efob015.4bpp");
-const RGB gUnknown_97B6E64[] = INCBIN_U8("data/effects/efob015.pmdpal");
+const RGB_Struct gUnknown_97B6E64[] = INCBIN_U8("data/effects/efob015.pmdpal");
 const ax_pose *const gUnknown_97B6EA4[] = {
     gUnknown_97B6934,
     gUnknown_97B6948,
diff --git a/src/data/effects/efob016.c b/src/data/effects/efob016.c
index 3eeba25cf..81dfb54ac 100644
--- a/src/data/effects/efob016.c
+++ b/src/data/effects/efob016.c
@@ -341,7 +341,7 @@ const ax_anim gUnknown_97B79A4[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97B7BB4[] = INCBIN_U32("data/effects/efob016.4bpp");
-const RGB gUnknown_97B8AB4[] = INCBIN_U8("data/effects/efob016.pmdpal");
+const RGB_Struct gUnknown_97B8AB4[] = INCBIN_U8("data/effects/efob016.pmdpal");
 const ax_pose *const gUnknown_97B8AF4[] = {
     gUnknown_97B6F3C,
     gUnknown_97B7086,
diff --git a/src/data/effects/efob017.c b/src/data/effects/efob017.c
index 107efff4d..0c2b772ea 100644
--- a/src/data/effects/efob017.c
+++ b/src/data/effects/efob017.c
@@ -61,7 +61,7 @@ const ax_anim gUnknown_97B8BC4[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97B8DC8[] = INCBIN_U32("data/effects/efob017.4bpp");
-const RGB gUnknown_97B8FE8[] = INCBIN_U8("data/effects/efob017.pmdpal");
+const RGB_Struct gUnknown_97B8FE8[] = INCBIN_U8("data/effects/efob017.pmdpal");
 const ax_pose *const gUnknown_97B9028[] = {
     gUnknown_97B8B78,
     gUnknown_97B8BAA,
diff --git a/src/data/effects/efob018.c b/src/data/effects/efob018.c
index 141e8858e..1f940143b 100644
--- a/src/data/effects/efob018.c
+++ b/src/data/effects/efob018.c
@@ -249,7 +249,7 @@ const ax_anim gUnknown_97B96E4[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97B9894[] = INCBIN_U32("data/effects/efob018.4bpp");
-const RGB gUnknown_97BA834[] = INCBIN_U8("data/effects/efob018.pmdpal");
+const RGB_Struct gUnknown_97BA834[] = INCBIN_U8("data/effects/efob018.pmdpal");
 const ax_pose *const gUnknown_97BA874[] = {
     gUnknown_97B9084,
     gUnknown_97B9098,
diff --git a/src/data/effects/efob019.c b/src/data/effects/efob019.c
index eb7bb3a5f..e6474c831 100644
--- a/src/data/effects/efob019.c
+++ b/src/data/effects/efob019.c
@@ -33,7 +33,7 @@ const ax_anim gUnknown_97BA9DC[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97BAA30[] = INCBIN_U32("data/effects/efob019.4bpp");
-const RGB gUnknown_97BAC30[] = INCBIN_U8("data/effects/efob019.pmdpal");
+const RGB_Struct gUnknown_97BAC30[] = INCBIN_U8("data/effects/efob019.pmdpal");
 const ax_pose *const gUnknown_97BAC70[] = {
     gUnknown_97BA968,
     gUnknown_97BA97C,
diff --git a/src/data/effects/efob020.c b/src/data/effects/efob020.c
index 27d840a25..6dc400462 100644
--- a/src/data/effects/efob020.c
+++ b/src/data/effects/efob020.c
@@ -749,7 +749,7 @@ const ax_anim gUnknown_97BC5A8[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97BC614[] = INCBIN_U32("data/effects/efob020.4bpp");
-const RGB gUnknown_97BD234[] = INCBIN_U8("data/effects/efob020.pmdpal");
+const RGB_Struct gUnknown_97BD234[] = INCBIN_U8("data/effects/efob020.pmdpal");
 const ax_pose *const gUnknown_97BD274[] = {
     gUnknown_97BACD4,
     gUnknown_97BAD06,
diff --git a/src/data/effects/efob021.c b/src/data/effects/efob021.c
index 2a5b4c9ca..02b7445d0 100644
--- a/src/data/effects/efob021.c
+++ b/src/data/effects/efob021.c
@@ -87,7 +87,7 @@ const ax_anim gUnknown_97BD6C8[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97BD6E0[] = INCBIN_U32("data/effects/efob021.4bpp");
-const RGB gUnknown_97BE540[] = INCBIN_U8("data/effects/efob021.pmdpal");
+const RGB_Struct gUnknown_97BE540[] = INCBIN_U8("data/effects/efob021.pmdpal");
 const ax_pose *const gUnknown_97BE580[] = {
     gUnknown_97BD46C,
     gUnknown_97BD48A,
diff --git a/src/data/effects/efob022.c b/src/data/effects/efob022.c
index c64fd1c0c..294c74760 100644
--- a/src/data/effects/efob022.c
+++ b/src/data/effects/efob022.c
@@ -256,7 +256,7 @@ const ax_anim gUnknown_97BED7C[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97BEDA0[] = INCBIN_U32("data/effects/efob022.4bpp");
-const RGB gUnknown_97BEF20[] = INCBIN_U8("data/effects/efob022.pmdpal");
+const RGB_Struct gUnknown_97BEF20[] = INCBIN_U8("data/effects/efob022.pmdpal");
 const ax_pose *const gUnknown_97BEF60[] = {
     gUnknown_97BE624,
     gUnknown_97BE638,
diff --git a/src/data/effects/efob023.c b/src/data/effects/efob023.c
index 6fec72d43..5d2c71e85 100644
--- a/src/data/effects/efob023.c
+++ b/src/data/effects/efob023.c
@@ -684,7 +684,7 @@ const ax_anim gUnknown_97C0474[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97C054C[] = INCBIN_U32("data/effects/efob023.4bpp");
-const RGB gUnknown_97C13AC[] = INCBIN_U8("data/effects/efob023.pmdpal");
+const RGB_Struct gUnknown_97C13AC[] = INCBIN_U8("data/effects/efob023.pmdpal");
 const ax_pose *const gUnknown_97C13EC[] = {
     gUnknown_97BF09C,
     gUnknown_97BF0B0,
diff --git a/src/data/effects/efob024.c b/src/data/effects/efob024.c
index 61cf70381..11b5a70ec 100644
--- a/src/data/effects/efob024.c
+++ b/src/data/effects/efob024.c
@@ -48,7 +48,7 @@ const ax_anim gUnknown_97C1848[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97C18E4[] = INCBIN_U32("data/effects/efob024.4bpp");
-const RGB gUnknown_97C26E4[] = INCBIN_U8("data/effects/efob024.pmdpal");
+const RGB_Struct gUnknown_97C26E4[] = INCBIN_U8("data/effects/efob024.pmdpal");
 const ax_pose *const gUnknown_97C2724[] = {
     gUnknown_97C17B8,
     gUnknown_97C17CC,
diff --git a/src/data/effects/efob025.c b/src/data/effects/efob025.c
index 255c83c40..46663779d 100644
--- a/src/data/effects/efob025.c
+++ b/src/data/effects/efob025.c
@@ -226,7 +226,7 @@ const ax_anim gUnknown_97C2E74[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97C2F28[] = INCBIN_U32("data/effects/efob025.4bpp");
-const RGB gUnknown_97C3D08[] = INCBIN_U8("data/effects/efob025.pmdpal");
+const RGB_Struct gUnknown_97C3D08[] = INCBIN_U8("data/effects/efob025.pmdpal");
 const ax_pose *const gUnknown_97C3D48[] = {
     gUnknown_97C2794,
     gUnknown_97C27A8,
diff --git a/src/data/effects/efob026.c b/src/data/effects/efob026.c
index df29535d0..9c64cd2c4 100644
--- a/src/data/effects/efob026.c
+++ b/src/data/effects/efob026.c
@@ -892,7 +892,7 @@ const ax_anim gUnknown_97C5B68[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97C5BBC[] = INCBIN_U32("data/effects/efob026.4bpp");
-const RGB gUnknown_97C677C[] = INCBIN_U8("data/effects/efob026.pmdpal");
+const RGB_Struct gUnknown_97C677C[] = INCBIN_U8("data/effects/efob026.pmdpal");
 const ax_pose *const gUnknown_97C67BC[] = {
     gUnknown_97C3E2C,
     gUnknown_97C3E4A,
diff --git a/src/data/effects/efob027.c b/src/data/effects/efob027.c
index 7b4fd5c67..24d3ab576 100644
--- a/src/data/effects/efob027.c
+++ b/src/data/effects/efob027.c
@@ -185,7 +185,7 @@ const ax_anim gUnknown_97C6FA4[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97C70DC[] = INCBIN_U32("data/effects/efob027.4bpp");
-const RGB gUnknown_97C75DC[] = INCBIN_U8("data/effects/efob027.pmdpal");
+const RGB_Struct gUnknown_97C75DC[] = INCBIN_U8("data/effects/efob027.pmdpal");
 const ax_pose *const gUnknown_97C761C[] = {
     gUnknown_97C6B18,
     gUnknown_97C6B36,
diff --git a/src/data/effects/efob028.c b/src/data/effects/efob028.c
index 2438e341d..7b04b0a79 100644
--- a/src/data/effects/efob028.c
+++ b/src/data/effects/efob028.c
@@ -823,7 +823,7 @@ const ax_anim gUnknown_97C8FC0[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97C9014[] = INCBIN_U32("data/effects/efob028.4bpp");
-const RGB gUnknown_97C9FF4[] = INCBIN_U8("data/effects/efob028.pmdpal");
+const RGB_Struct gUnknown_97C9FF4[] = INCBIN_U8("data/effects/efob028.pmdpal");
 const ax_pose *const gUnknown_97CA034[] = {
     gUnknown_97C76B8,
     gUnknown_97C76D6,
diff --git a/src/data/effects/efob029.c b/src/data/effects/efob029.c
index 5eefd5da4..a63ee68ad 100644
--- a/src/data/effects/efob029.c
+++ b/src/data/effects/efob029.c
@@ -302,7 +302,7 @@ const ax_anim gUnknown_97CABC8[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97CAC94[] = INCBIN_U32("data/effects/efob029.4bpp");
-const RGB gUnknown_97CBC34[] = INCBIN_U8("data/effects/efob029.pmdpal");
+const RGB_Struct gUnknown_97CBC34[] = INCBIN_U8("data/effects/efob029.pmdpal");
 const ax_pose *const gUnknown_97CBC74[] = {
     gUnknown_97CA2A0,
     gUnknown_97CA34A,
diff --git a/src/data/effects/efob030.c b/src/data/effects/efob030.c
index ba2405a94..d0aacb378 100644
--- a/src/data/effects/efob030.c
+++ b/src/data/effects/efob030.c
@@ -348,7 +348,7 @@ const ax_anim gUnknown_97CC7B4[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97CC8C8[] = INCBIN_U32("data/effects/efob030.4bpp");
-const RGB gUnknown_97CD368[] = INCBIN_U8("data/effects/efob030.pmdpal");
+const RGB_Struct gUnknown_97CD368[] = INCBIN_U8("data/effects/efob030.pmdpal");
 const ax_pose *const gUnknown_97CD3A8[] = {
     gUnknown_97CBD68,
     gUnknown_97CBD90,
diff --git a/src/data/effects/efob031.c b/src/data/effects/efob031.c
index 6d88622a0..0f1d27c58 100644
--- a/src/data/effects/efob031.c
+++ b/src/data/effects/efob031.c
@@ -65,7 +65,7 @@ const ax_anim gUnknown_97CD5BC[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97CD664[] = INCBIN_U32("data/effects/efob031.4bpp");
-const RGB gUnknown_97CE584[] = INCBIN_U8("data/effects/efob031.pmdpal");
+const RGB_Struct gUnknown_97CE584[] = INCBIN_U8("data/effects/efob031.pmdpal");
 const ax_pose *const gUnknown_97CE5C4[] = {
     gUnknown_97CD48C,
     gUnknown_97CD4AA,
diff --git a/src/data/effects/efob032.c b/src/data/effects/efob032.c
index 8d4e556c4..45b629f75 100644
--- a/src/data/effects/efob032.c
+++ b/src/data/effects/efob032.c
@@ -624,7 +624,7 @@ const ax_anim gUnknown_97CFB38[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97CFC7C[] = INCBIN_U32("data/effects/efob032.4bpp");
-const RGB gUnknown_97D057C[] = INCBIN_U8("data/effects/efob032.pmdpal");
+const RGB_Struct gUnknown_97D057C[] = INCBIN_U8("data/effects/efob032.pmdpal");
 const ax_pose *const gUnknown_97D05BC[] = {
     gUnknown_97CE634,
     gUnknown_97CE648,
diff --git a/src/data/effects/efob033.c b/src/data/effects/efob033.c
index 9d8669fbb..218e6b810 100644
--- a/src/data/effects/efob033.c
+++ b/src/data/effects/efob033.c
@@ -790,7 +790,7 @@ const ax_anim gUnknown_97D1C1C[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97D1EB0[] = INCBIN_U32("data/effects/efob033.4bpp");
-const RGB gUnknown_97D2B90[] = INCBIN_U8("data/effects/efob033.pmdpal");
+const RGB_Struct gUnknown_97D2B90[] = INCBIN_U8("data/effects/efob033.pmdpal");
 const ax_pose *const gUnknown_97D2BD0[] = {
     gUnknown_97D06A4,
     gUnknown_97D06D6,
diff --git a/src/data/effects/efob034.c b/src/data/effects/efob034.c
index 8ec6069c5..a6d65efc2 100644
--- a/src/data/effects/efob034.c
+++ b/src/data/effects/efob034.c
@@ -48,7 +48,7 @@ const ax_anim gUnknown_97D2EAC[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97D2F18[] = INCBIN_U32("data/effects/efob034.4bpp");
-const RGB gUnknown_97D3318[] = INCBIN_U8("data/effects/efob034.pmdpal");
+const RGB_Struct gUnknown_97D3318[] = INCBIN_U8("data/effects/efob034.pmdpal");
 const ax_pose *const gUnknown_97D3358[] = {
     gUnknown_97D2E08,
     gUnknown_97D2E1C,
diff --git a/src/data/effects/efob035.c b/src/data/effects/efob035.c
index bcee14830..b42ecc04d 100644
--- a/src/data/effects/efob035.c
+++ b/src/data/effects/efob035.c
@@ -160,7 +160,7 @@ const ax_anim gUnknown_97D37F8[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97D3858[] = INCBIN_U32("data/effects/efob035.4bpp");
-const RGB gUnknown_97D47B8[] = INCBIN_U8("data/effects/efob035.pmdpal");
+const RGB_Struct gUnknown_97D47B8[] = INCBIN_U8("data/effects/efob035.pmdpal");
 const ax_pose *const gUnknown_97D47F8[] = {
     gUnknown_97D33CC,
     gUnknown_97D3430,
diff --git a/src/data/effects/efob036.c b/src/data/effects/efob036.c
index b8e8e453b..acbcb7ac6 100644
--- a/src/data/effects/efob036.c
+++ b/src/data/effects/efob036.c
@@ -511,7 +511,7 @@ const ax_anim gUnknown_97D57D8[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97D59D0[] = INCBIN_U32("data/effects/efob036.4bpp");
-const RGB gUnknown_97D67F0[] = INCBIN_U8("data/effects/efob036.pmdpal");
+const RGB_Struct gUnknown_97D67F0[] = INCBIN_U8("data/effects/efob036.pmdpal");
 const ax_pose *const gUnknown_97D6830[] = {
     gUnknown_97D48FC,
     gUnknown_97D4910,
diff --git a/src/data/effects/efob037.c b/src/data/effects/efob037.c
index 5410618b0..9def07d57 100644
--- a/src/data/effects/efob037.c
+++ b/src/data/effects/efob037.c
@@ -1896,7 +1896,7 @@ const ax_anim gUnknown_97DA290[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97DA2CC[] = INCBIN_U32("data/effects/efob037.4bpp");
-const RGB gUnknown_97DAF8C[] = INCBIN_U8("data/effects/efob037.pmdpal");
+const RGB_Struct gUnknown_97DAF8C[] = INCBIN_U8("data/effects/efob037.pmdpal");
 const ax_pose *const gUnknown_97DAFCC[] = {
     gUnknown_97D6928,
     gUnknown_97D6964,
diff --git a/src/data/effects/efob038.c b/src/data/effects/efob038.c
index 209eabc76..6cf4aceb3 100644
--- a/src/data/effects/efob038.c
+++ b/src/data/effects/efob038.c
@@ -994,7 +994,7 @@ const ax_anim gUnknown_97DD160[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97DD2EC[] = INCBIN_U32("data/effects/efob038.4bpp");
-const RGB gUnknown_97DDFCC[] = INCBIN_U8("data/effects/efob038.pmdpal");
+const RGB_Struct gUnknown_97DDFCC[] = INCBIN_U8("data/effects/efob038.pmdpal");
 const ax_pose *const gUnknown_97DE00C[] = {
     gUnknown_97DB4F0,
     gUnknown_97DB50E,
diff --git a/src/data/effects/efob039.c b/src/data/effects/efob039.c
index 5d96e101f..d6df5daed 100644
--- a/src/data/effects/efob039.c
+++ b/src/data/effects/efob039.c
@@ -383,7 +383,7 @@ const ax_anim gUnknown_97DEE00[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97DEF8C[] = INCBIN_U32("data/effects/efob039.4bpp");
-const RGB gUnknown_97DFE8C[] = INCBIN_U8("data/effects/efob039.pmdpal");
+const RGB_Struct gUnknown_97DFE8C[] = INCBIN_U8("data/effects/efob039.pmdpal");
 const ax_pose *const gUnknown_97DFECC[] = {
     gUnknown_97DE2D0,
     gUnknown_97DE302,
diff --git a/src/data/effects/efob040.c b/src/data/effects/efob040.c
index 35ab40953..d02fc9daa 100644
--- a/src/data/effects/efob040.c
+++ b/src/data/effects/efob040.c
@@ -119,7 +119,7 @@ const ax_anim gUnknown_97E038C[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97E03B0[] = INCBIN_U32("data/effects/efob040.4bpp");
-const RGB gUnknown_97E0A30[] = INCBIN_U8("data/effects/efob040.pmdpal");
+const RGB_Struct gUnknown_97E0A30[] = INCBIN_U8("data/effects/efob040.pmdpal");
 const ax_pose *const gUnknown_97E0A70[] = {
     gUnknown_97DFFE8,
     gUnknown_97E001A,
diff --git a/src/data/effects/efob041.c b/src/data/effects/efob041.c
index cdebf14e7..0b34de65b 100644
--- a/src/data/effects/efob041.c
+++ b/src/data/effects/efob041.c
@@ -1156,7 +1156,7 @@ const ax_anim gUnknown_97E2AB8[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97E2AD0[] = INCBIN_U32("data/effects/efob041.4bpp");
-const RGB gUnknown_97E39B0[] = INCBIN_U8("data/effects/efob041.pmdpal");
+const RGB_Struct gUnknown_97E39B0[] = INCBIN_U8("data/effects/efob041.pmdpal");
 const ax_pose *const gUnknown_97E39F0[] = {
     gUnknown_97E0B28,
     gUnknown_97E0B3C,
diff --git a/src/data/effects/efob042.c b/src/data/effects/efob042.c
index 3876c6d53..a9903a422 100644
--- a/src/data/effects/efob042.c
+++ b/src/data/effects/efob042.c
@@ -239,7 +239,7 @@ const ax_anim gUnknown_97E4460[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97E4574[] = INCBIN_U32("data/effects/efob042.4bpp");
-const RGB gUnknown_97E5414[] = INCBIN_U8("data/effects/efob042.pmdpal");
+const RGB_Struct gUnknown_97E5414[] = INCBIN_U8("data/effects/efob042.pmdpal");
 const ax_pose *const gUnknown_97E5454[] = {
     gUnknown_97E3E20,
     gUnknown_97E3E66,
diff --git a/src/data/effects/efob043.c b/src/data/effects/efob043.c
index 508d1e17e..751c73b36 100644
--- a/src/data/effects/efob043.c
+++ b/src/data/effects/efob043.c
@@ -2252,7 +2252,7 @@ const ax_anim gUnknown_97E96EC[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97E989C[] = INCBIN_U32("data/effects/efob043.4bpp");
-const RGB gUnknown_97EA5DC[] = INCBIN_U8("data/effects/efob043.pmdpal");
+const RGB_Struct gUnknown_97EA5DC[] = INCBIN_U8("data/effects/efob043.pmdpal");
 const ax_pose *const gUnknown_97EA61C[] = {
     gUnknown_97E5558,
     gUnknown_97E558A,
diff --git a/src/data/effects/efob044.c b/src/data/effects/efob044.c
index 270390502..39f74e8cc 100644
--- a/src/data/effects/efob044.c
+++ b/src/data/effects/efob044.c
@@ -152,7 +152,7 @@ const ax_anim gUnknown_97EAF68[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97EB0F4[] = INCBIN_U32("data/effects/efob044.4bpp");
-const RGB gUnknown_97EB394[] = INCBIN_U8("data/effects/efob044.pmdpal");
+const RGB_Struct gUnknown_97EB394[] = INCBIN_U8("data/effects/efob044.pmdpal");
 const ax_pose *const gUnknown_97EB3D4[] = {
     gUnknown_97EAC44,
     gUnknown_97EAC76,
diff --git a/src/data/effects/efob045.c b/src/data/effects/efob045.c
index ade2a331d..a697c994a 100644
--- a/src/data/effects/efob045.c
+++ b/src/data/effects/efob045.c
@@ -113,7 +113,7 @@ const ax_anim gUnknown_97EB75C[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97EB780[] = INCBIN_U32("data/effects/efob045.4bpp");
-const RGB gUnknown_97EC740[] = INCBIN_U8("data/effects/efob045.pmdpal");
+const RGB_Struct gUnknown_97EC740[] = INCBIN_U8("data/effects/efob045.pmdpal");
 const ax_pose *const gUnknown_97EC780[] = {
     gUnknown_97EB468,
     gUnknown_97EB4C2,
diff --git a/src/data/effects/efob046.c b/src/data/effects/efob046.c
index 13a23f9f8..62d70602f 100644
--- a/src/data/effects/efob046.c
+++ b/src/data/effects/efob046.c
@@ -172,7 +172,7 @@ const ax_anim gUnknown_97ECCB0[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97ECE48[] = INCBIN_U32("data/effects/efob046.4bpp");
-const RGB gUnknown_97EDDA8[] = INCBIN_U8("data/effects/efob046.pmdpal");
+const RGB_Struct gUnknown_97EDDA8[] = INCBIN_U8("data/effects/efob046.pmdpal");
 const ax_pose *const gUnknown_97EDDE8[] = {
     gUnknown_97EC8F4,
     gUnknown_97EC912,
diff --git a/src/data/effects/efob047.c b/src/data/effects/efob047.c
index 4e2d39ef2..1e7356b47 100644
--- a/src/data/effects/efob047.c
+++ b/src/data/effects/efob047.c
@@ -68,7 +68,7 @@ const ax_anim gUnknown_97EE04C[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97EE094[] = INCBIN_U32("data/effects/efob047.4bpp");
-const RGB gUnknown_97EE0D4[] = INCBIN_U8("data/effects/efob047.pmdpal");
+const RGB_Struct gUnknown_97EE0D4[] = INCBIN_U8("data/effects/efob047.pmdpal");
 const ax_pose *const gUnknown_97EE114[] = {
     gUnknown_97EDE84,
     gUnknown_97EDEDE,
diff --git a/src/data/effects/efob048.c b/src/data/effects/efob048.c
index 74af1dd30..e7fe32cda 100644
--- a/src/data/effects/efob048.c
+++ b/src/data/effects/efob048.c
@@ -615,7 +615,7 @@ const ax_anim gUnknown_97EF264[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97EF5AC[] = INCBIN_U32("data/effects/efob048.4bpp");
-const RGB gUnknown_97F054C[] = INCBIN_U8("data/effects/efob048.pmdpal");
+const RGB_Struct gUnknown_97F054C[] = INCBIN_U8("data/effects/efob048.pmdpal");
 const ax_pose *const gUnknown_97F058C[] = {
     gUnknown_97EE17C,
     gUnknown_97EE190,
diff --git a/src/data/effects/efob049.c b/src/data/effects/efob049.c
index 4ea7d03e9..396bccf69 100644
--- a/src/data/effects/efob049.c
+++ b/src/data/effects/efob049.c
@@ -286,7 +286,7 @@ const ax_anim gUnknown_97F0F00[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97F0F90[] = INCBIN_U32("data/effects/efob049.4bpp");
-const RGB gUnknown_97F1F90[] = INCBIN_U8("data/effects/efob049.pmdpal");
+const RGB_Struct gUnknown_97F1F90[] = INCBIN_U8("data/effects/efob049.pmdpal");
 const ax_pose *const gUnknown_97F1FD0[] = {
     gUnknown_97F06E8,
     gUnknown_97F0706,
diff --git a/src/data/effects/efob050.c b/src/data/effects/efob050.c
index 8d6945fa9..839581728 100644
--- a/src/data/effects/efob050.c
+++ b/src/data/effects/efob050.c
@@ -33,7 +33,7 @@ const ax_anim gUnknown_97F2130[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97F2178[] = INCBIN_U32("data/effects/efob050.4bpp");
-const RGB gUnknown_97F2B78[] = INCBIN_U8("data/effects/efob050.pmdpal");
+const RGB_Struct gUnknown_97F2B78[] = INCBIN_U8("data/effects/efob050.pmdpal");
 const ax_pose *const gUnknown_97F2BB8[] = {
     gUnknown_97F20C8,
     gUnknown_97F20DC,
diff --git a/src/data/effects/efob051.c b/src/data/effects/efob051.c
index 05498b8f5..f168d2fa3 100644
--- a/src/data/effects/efob051.c
+++ b/src/data/effects/efob051.c
@@ -643,7 +643,7 @@ const ax_anim gUnknown_97F3DA4[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97F3E10[] = INCBIN_U32("data/effects/efob051.4bpp");
-const RGB gUnknown_97F4D70[] = INCBIN_U8("data/effects/efob051.pmdpal");
+const RGB_Struct gUnknown_97F4D70[] = INCBIN_U8("data/effects/efob051.pmdpal");
 const ax_pose *const gUnknown_97F4DB0[] = {
     gUnknown_97F2C20,
     gUnknown_97F2C34,
diff --git a/src/data/effects/efob052.c b/src/data/effects/efob052.c
index 40be0c299..9662a35c1 100644
--- a/src/data/effects/efob052.c
+++ b/src/data/effects/efob052.c
@@ -141,7 +141,7 @@ const ax_anim gUnknown_97F53C8[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97F53EC[] = INCBIN_U32("data/effects/efob052.4bpp");
-const RGB gUnknown_97F54EC[] = INCBIN_U8("data/effects/efob052.pmdpal");
+const RGB_Struct gUnknown_97F54EC[] = INCBIN_U8("data/effects/efob052.pmdpal");
 const ax_pose *const gUnknown_97F552C[] = {
     gUnknown_97F5048,
     gUnknown_97F5070,
diff --git a/src/data/effects/efob053.c b/src/data/effects/efob053.c
index 99817cd43..dcdf37d4d 100644
--- a/src/data/effects/efob053.c
+++ b/src/data/effects/efob053.c
@@ -578,7 +578,7 @@ const ax_anim gUnknown_97F66C4[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97F673C[] = INCBIN_U32("data/effects/efob053.4bpp");
-const RGB gUnknown_97F74FC[] = INCBIN_U8("data/effects/efob053.pmdpal");
+const RGB_Struct gUnknown_97F74FC[] = INCBIN_U8("data/effects/efob053.pmdpal");
 const ax_pose *const gUnknown_97F753C[] = {
     gUnknown_97F56BC,
     gUnknown_97F56D0,
diff --git a/src/data/effects/efob054.c b/src/data/effects/efob054.c
index 63ab141f7..ce3c4843a 100644
--- a/src/data/effects/efob054.c
+++ b/src/data/effects/efob054.c
@@ -43,7 +43,7 @@ const ax_anim gUnknown_97F77CC[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97F782C[] = INCBIN_U32("data/effects/efob054.4bpp");
-const RGB gUnknown_97F806C[] = INCBIN_U8("data/effects/efob054.pmdpal");
+const RGB_Struct gUnknown_97F806C[] = INCBIN_U8("data/effects/efob054.pmdpal");
 const ax_pose *const gUnknown_97F80AC[] = {
     gUnknown_97F773C,
     gUnknown_97F7750,
diff --git a/src/data/effects/efob055.c b/src/data/effects/efob055.c
index 0349359fe..27303aec6 100644
--- a/src/data/effects/efob055.c
+++ b/src/data/effects/efob055.c
@@ -230,7 +230,7 @@ const ax_anim gUnknown_97F87D0[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97F8920[] = INCBIN_U32("data/effects/efob055.4bpp");
-const RGB gUnknown_97F8F40[] = INCBIN_U8("data/effects/efob055.pmdpal");
+const RGB_Struct gUnknown_97F8F40[] = INCBIN_U8("data/effects/efob055.pmdpal");
 const ax_pose *const gUnknown_97F8F80[] = {
     gUnknown_97F811C,
     gUnknown_97F81C6,
diff --git a/src/data/effects/efob056.c b/src/data/effects/efob056.c
index 55484c00d..3b7c8b8e7 100644
--- a/src/data/effects/efob056.c
+++ b/src/data/effects/efob056.c
@@ -207,7 +207,7 @@ const ax_anim gUnknown_97F95AC[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97F9654[] = INCBIN_U32("data/effects/efob056.4bpp");
-const RGB gUnknown_97F9FD4[] = INCBIN_U8("data/effects/efob056.pmdpal");
+const RGB_Struct gUnknown_97F9FD4[] = INCBIN_U8("data/effects/efob056.pmdpal");
 const ax_pose *const gUnknown_97FA014[] = {
     gUnknown_97F9004,
     gUnknown_97F9036,
diff --git a/src/data/effects/efob057.c b/src/data/effects/efob057.c
index dbdd81bad..5da17ce08 100644
--- a/src/data/effects/efob057.c
+++ b/src/data/effects/efob057.c
@@ -673,7 +673,7 @@ const ax_anim gUnknown_97FB524[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97FB6F8[] = INCBIN_U32("data/effects/efob057.4bpp");
-const RGB gUnknown_97FBDB8[] = INCBIN_U8("data/effects/efob057.pmdpal");
+const RGB_Struct gUnknown_97FBDB8[] = INCBIN_U8("data/effects/efob057.pmdpal");
 const ax_pose *const gUnknown_97FBDF8[] = {
     gUnknown_97FA100,
     gUnknown_97FA114,
diff --git a/src/data/effects/efob058.c b/src/data/effects/efob058.c
index 9872c7cf0..55b428ce9 100644
--- a/src/data/effects/efob058.c
+++ b/src/data/effects/efob058.c
@@ -83,7 +83,7 @@ const ax_anim gUnknown_97FC034[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97FC154[] = INCBIN_U32("data/effects/efob058.4bpp");
-const RGB gUnknown_97FCDF4[] = INCBIN_U8("data/effects/efob058.pmdpal");
+const RGB_Struct gUnknown_97FCDF4[] = INCBIN_U8("data/effects/efob058.pmdpal");
 const ax_pose *const gUnknown_97FCE34[] = {
     gUnknown_97FBF2C,
     gUnknown_97FBF40,
diff --git a/src/data/effects/efob059.c b/src/data/effects/efob059.c
index 15b3ba3d9..723fa5e09 100644
--- a/src/data/effects/efob059.c
+++ b/src/data/effects/efob059.c
@@ -195,7 +195,7 @@ const ax_anim gUnknown_97FD398[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97FD3EC[] = INCBIN_U32("data/effects/efob059.4bpp");
-const RGB gUnknown_97FDD2C[] = INCBIN_U8("data/effects/efob059.pmdpal");
+const RGB_Struct gUnknown_97FDD2C[] = INCBIN_U8("data/effects/efob059.pmdpal");
 const ax_pose *const gUnknown_97FDD6C[] = {
     gUnknown_97FCEBC,
     gUnknown_97FCED0,
diff --git a/src/data/effects/efob060.c b/src/data/effects/efob060.c
index 42190bb09..899f3cd5f 100644
--- a/src/data/effects/efob060.c
+++ b/src/data/effects/efob060.c
@@ -881,7 +881,7 @@ const ax_anim gUnknown_97FF780[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_97FF840[] = INCBIN_U32("data/effects/efob060.4bpp");
-const RGB gUnknown_98007A0[] = INCBIN_U8("data/effects/efob060.pmdpal");
+const RGB_Struct gUnknown_98007A0[] = INCBIN_U8("data/effects/efob060.pmdpal");
 const ax_pose *const gUnknown_98007E0[] = {
     gUnknown_97FDF04,
     gUnknown_97FDF18,
diff --git a/src/data/effects/efob061.c b/src/data/effects/efob061.c
index 36f4c6732..9c43b8b2e 100644
--- a/src/data/effects/efob061.c
+++ b/src/data/effects/efob061.c
@@ -110,7 +110,7 @@ const ax_anim gUnknown_9800D6C[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9800DFC[] = INCBIN_U32("data/effects/efob061.4bpp");
-const RGB gUnknown_9800F9C[] = INCBIN_U8("data/effects/efob061.pmdpal");
+const RGB_Struct gUnknown_9800F9C[] = INCBIN_U8("data/effects/efob061.pmdpal");
 const ax_pose *const gUnknown_9800FDC[] = {
     gUnknown_9800B10,
     gUnknown_9800B24,
diff --git a/src/data/effects/efob062.c b/src/data/effects/efob062.c
index d8f9f09f5..6a7bbb25e 100644
--- a/src/data/effects/efob062.c
+++ b/src/data/effects/efob062.c
@@ -105,7 +105,7 @@ const ax_anim gUnknown_9801334[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9801358[] = INCBIN_U32("data/effects/efob062.4bpp");
-const RGB gUnknown_9801458[] = INCBIN_U8("data/effects/efob062.pmdpal");
+const RGB_Struct gUnknown_9801458[] = INCBIN_U8("data/effects/efob062.pmdpal");
 const ax_pose *const gUnknown_9801498[] = {
     gUnknown_9801090,
     gUnknown_98010C2,
diff --git a/src/data/effects/efob063.c b/src/data/effects/efob063.c
index de5f384a6..b2ec1bcf9 100644
--- a/src/data/effects/efob063.c
+++ b/src/data/effects/efob063.c
@@ -163,7 +163,7 @@ const ax_anim gUnknown_980195C[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9801B24[] = INCBIN_U32("data/effects/efob063.4bpp");
-const RGB gUnknown_9802344[] = INCBIN_U8("data/effects/efob063.pmdpal");
+const RGB_Struct gUnknown_9802344[] = INCBIN_U8("data/effects/efob063.pmdpal");
 const ax_pose *const gUnknown_9802384[] = {
     gUnknown_980160C,
     gUnknown_9801620,
diff --git a/src/data/effects/efob064.c b/src/data/effects/efob064.c
index fa8a8f6f5..337306058 100644
--- a/src/data/effects/efob064.c
+++ b/src/data/effects/efob064.c
@@ -99,7 +99,7 @@ const ax_anim gUnknown_98026D8[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9802750[] = INCBIN_U32("data/effects/efob064.4bpp");
-const RGB gUnknown_98030B0[] = INCBIN_U8("data/effects/efob064.pmdpal");
+const RGB_Struct gUnknown_98030B0[] = INCBIN_U8("data/effects/efob064.pmdpal");
 const ax_pose *const gUnknown_98030F0[] = {
     gUnknown_9802448,
     gUnknown_980245C,
diff --git a/src/data/effects/efob065.c b/src/data/effects/efob065.c
index 19a02c58b..dab752064 100644
--- a/src/data/effects/efob065.c
+++ b/src/data/effects/efob065.c
@@ -116,7 +116,7 @@ const ax_anim gUnknown_98032B0[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_980352C[] = INCBIN_U32("data/effects/efob065.4bpp");
-const RGB gUnknown_980452C[] = INCBIN_U8("data/effects/efob065.pmdpal");
+const RGB_Struct gUnknown_980452C[] = INCBIN_U8("data/effects/efob065.pmdpal");
 const ax_pose *const gUnknown_980456C[] = {
     gUnknown_9803194,
     gUnknown_98031A8,
diff --git a/src/data/effects/efob066.c b/src/data/effects/efob066.c
index 5322af701..dcaa47c9c 100644
--- a/src/data/effects/efob066.c
+++ b/src/data/effects/efob066.c
@@ -277,7 +277,7 @@ const ax_anim gUnknown_9804CB4[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9804E34[] = INCBIN_U32("data/effects/efob066.4bpp");
-const RGB gUnknown_9805094[] = INCBIN_U8("data/effects/efob066.pmdpal");
+const RGB_Struct gUnknown_9805094[] = INCBIN_U8("data/effects/efob066.pmdpal");
 const ax_pose *const gUnknown_98050D4[] = {
     gUnknown_98045F8,
     gUnknown_980460C,
diff --git a/src/data/effects/efob067.c b/src/data/effects/efob067.c
index 7873b71fd..9a93cd411 100644
--- a/src/data/effects/efob067.c
+++ b/src/data/effects/efob067.c
@@ -51,7 +51,7 @@ const ax_anim gUnknown_980525C[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9805340[] = INCBIN_U32("data/effects/efob067.4bpp");
-const RGB gUnknown_9805F60[] = INCBIN_U8("data/effects/efob067.pmdpal");
+const RGB_Struct gUnknown_9805F60[] = INCBIN_U8("data/effects/efob067.pmdpal");
 const ax_pose *const gUnknown_9805FA0[] = {
     gUnknown_98051AC,
     gUnknown_98051DE,
diff --git a/src/data/effects/efob068.c b/src/data/effects/efob068.c
index 99f89b183..cf49b152e 100644
--- a/src/data/effects/efob068.c
+++ b/src/data/effects/efob068.c
@@ -63,7 +63,7 @@ const ax_anim gUnknown_98060F8[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_98061B8[] = INCBIN_U32("data/effects/efob068.4bpp");
-const RGB gUnknown_9806738[] = INCBIN_U8("data/effects/efob068.pmdpal");
+const RGB_Struct gUnknown_9806738[] = INCBIN_U8("data/effects/efob068.pmdpal");
 const ax_pose *const gUnknown_9806778[] = {
     gUnknown_9806004,
     gUnknown_980602C,
diff --git a/src/data/effects/efob069.c b/src/data/effects/efob069.c
index 2e750296e..6fc98609a 100644
--- a/src/data/effects/efob069.c
+++ b/src/data/effects/efob069.c
@@ -117,7 +117,7 @@ const ax_anim gUnknown_9806A7C[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9806AA0[] = INCBIN_U32("data/effects/efob069.4bpp");
-const RGB gUnknown_9806CA0[] = INCBIN_U8("data/effects/efob069.pmdpal");
+const RGB_Struct gUnknown_9806CA0[] = INCBIN_U8("data/effects/efob069.pmdpal");
 const ax_pose *const gUnknown_9806CE0[] = {
     gUnknown_98067EC,
     gUnknown_980680A,
diff --git a/src/data/effects/efob070.c b/src/data/effects/efob070.c
index 89dbdcdd3..67e807871 100644
--- a/src/data/effects/efob070.c
+++ b/src/data/effects/efob070.c
@@ -48,7 +48,7 @@ const ax_anim gUnknown_9806F14[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9806F80[] = INCBIN_U32("data/effects/efob070.4bpp");
-const RGB gUnknown_9807400[] = INCBIN_U8("data/effects/efob070.pmdpal");
+const RGB_Struct gUnknown_9807400[] = INCBIN_U8("data/effects/efob070.pmdpal");
 const ax_pose *const gUnknown_9807440[] = {
     gUnknown_9806E70,
     gUnknown_9806E84,
diff --git a/src/data/effects/efob071.c b/src/data/effects/efob071.c
index 948949030..5b0def48c 100644
--- a/src/data/effects/efob071.c
+++ b/src/data/effects/efob071.c
@@ -38,7 +38,7 @@ const ax_anim gUnknown_98074E0[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_98075F4[] = INCBIN_U32("data/effects/efob071.4bpp");
-const RGB gUnknown_9807814[] = INCBIN_U8("data/effects/efob071.pmdpal");
+const RGB_Struct gUnknown_9807814[] = INCBIN_U8("data/effects/efob071.pmdpal");
 const ax_pose *const gUnknown_9807854[] = {
     gUnknown_98074B4,
     gUnknown_98074C8,
diff --git a/src/data/effects/efob072.c b/src/data/effects/efob072.c
index 7a061e4ac..00313241a 100644
--- a/src/data/effects/efob072.c
+++ b/src/data/effects/efob072.c
@@ -54,7 +54,7 @@ const ax_anim gUnknown_98078DC[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9807AB0[] = INCBIN_U32("data/effects/efob072.4bpp");
-const RGB gUnknown_9807B50[] = INCBIN_U8("data/effects/efob072.pmdpal");
+const RGB_Struct gUnknown_9807B50[] = INCBIN_U8("data/effects/efob072.pmdpal");
 const ax_pose *const gUnknown_9807B90[] = {
     gUnknown_98078B0,
     gUnknown_98078C4,
diff --git a/src/data/effects/efob073.c b/src/data/effects/efob073.c
index da4d60152..dbdbd2ff7 100644
--- a/src/data/effects/efob073.c
+++ b/src/data/effects/efob073.c
@@ -247,7 +247,7 @@ const ax_anim gUnknown_98083E0[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_980847C[] = INCBIN_U32("data/effects/efob073.4bpp");
-const RGB gUnknown_98087DC[] = INCBIN_U8("data/effects/efob073.pmdpal");
+const RGB_Struct gUnknown_98087DC[] = INCBIN_U8("data/effects/efob073.pmdpal");
 const ax_pose *const gUnknown_980881C[] = {
     gUnknown_9807BEC,
     gUnknown_9807C00,
diff --git a/src/data/effects/efob074.c b/src/data/effects/efob074.c
index dffa89793..4b9945b2b 100644
--- a/src/data/effects/efob074.c
+++ b/src/data/effects/efob074.c
@@ -308,7 +308,7 @@ const ax_anim gUnknown_9809240[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9809324[] = INCBIN_U32("data/effects/efob074.4bpp");
-const RGB gUnknown_980A284[] = INCBIN_U8("data/effects/efob074.pmdpal");
+const RGB_Struct gUnknown_980A284[] = INCBIN_U8("data/effects/efob074.pmdpal");
 const ax_pose *const gUnknown_980A2C4[] = {
     gUnknown_98088A0,
     gUnknown_98088C8,
diff --git a/src/data/effects/efob075.c b/src/data/effects/efob075.c
index 0269a1f49..aaba994c0 100644
--- a/src/data/effects/efob075.c
+++ b/src/data/effects/efob075.c
@@ -51,7 +51,7 @@ const ax_anim gUnknown_980A490[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_980A4F0[] = INCBIN_U32("data/effects/efob075.4bpp");
-const RGB gUnknown_980B4F0[] = INCBIN_U8("data/effects/efob075.pmdpal");
+const RGB_Struct gUnknown_980B4F0[] = INCBIN_U8("data/effects/efob075.pmdpal");
 const ax_pose *const gUnknown_980B530[] = {
     gUnknown_980A360,
     gUnknown_980A3F6,
diff --git a/src/data/effects/efob076.c b/src/data/effects/efob076.c
index bb907c6f8..99c3e4f4c 100644
--- a/src/data/effects/efob076.c
+++ b/src/data/effects/efob076.c
@@ -335,7 +335,7 @@ const ax_anim gUnknown_980BEF0[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_980BFF8[] = INCBIN_U32("data/effects/efob076.4bpp");
-const RGB gUnknown_980C1D8[] = INCBIN_U8("data/effects/efob076.pmdpal");
+const RGB_Struct gUnknown_980C1D8[] = INCBIN_U8("data/effects/efob076.pmdpal");
 const ax_pose *const gUnknown_980C218[] = {
     gUnknown_980B590,
     gUnknown_980B5AE,
diff --git a/src/data/effects/efob077.c b/src/data/effects/efob077.c
index 4df46fd25..df061bdf5 100644
--- a/src/data/effects/efob077.c
+++ b/src/data/effects/efob077.c
@@ -122,7 +122,7 @@ const ax_anim gUnknown_980C5D0[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_980C690[] = INCBIN_U32("data/effects/efob077.4bpp");
-const RGB gUnknown_980C770[] = INCBIN_U8("data/effects/efob077.pmdpal");
+const RGB_Struct gUnknown_980C770[] = INCBIN_U8("data/effects/efob077.pmdpal");
 const ax_pose *const gUnknown_980C7B0[] = {
     gUnknown_980C318,
     gUnknown_980C32C,
diff --git a/src/data/effects/efob078.c b/src/data/effects/efob078.c
index 1ea1945af..f738ba19c 100644
--- a/src/data/effects/efob078.c
+++ b/src/data/effects/efob078.c
@@ -164,7 +164,7 @@ const ax_anim gUnknown_980CC94[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_980CCB8[] = INCBIN_U32("data/effects/efob078.4bpp");
-const RGB gUnknown_980D978[] = INCBIN_U8("data/effects/efob078.pmdpal");
+const RGB_Struct gUnknown_980D978[] = INCBIN_U8("data/effects/efob078.pmdpal");
 const ax_pose *const gUnknown_980D9B8[] = {
     gUnknown_980C840,
     gUnknown_980C868,
diff --git a/src/data/effects/efob079.c b/src/data/effects/efob079.c
index 223b24255..5e4c6011e 100644
--- a/src/data/effects/efob079.c
+++ b/src/data/effects/efob079.c
@@ -36,7 +36,7 @@ const ax_anim gUnknown_980DBC0[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_980DC38[] = INCBIN_U32("data/effects/efob079.4bpp");
-const RGB gUnknown_980DFF8[] = INCBIN_U8("data/effects/efob079.pmdpal");
+const RGB_Struct gUnknown_980DFF8[] = INCBIN_U8("data/effects/efob079.pmdpal");
 const ax_pose *const gUnknown_980E038[] = {
     gUnknown_980DB4C,
     gUnknown_980DB60,
diff --git a/src/data/effects/efob080.c b/src/data/effects/efob080.c
index cf5867c8a..2b3d2c73b 100644
--- a/src/data/effects/efob080.c
+++ b/src/data/effects/efob080.c
@@ -254,7 +254,7 @@ const ax_anim gUnknown_980E778[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_980E82C[] = INCBIN_U32("data/effects/efob080.4bpp");
-const RGB gUnknown_980EACC[] = INCBIN_U8("data/effects/efob080.pmdpal");
+const RGB_Struct gUnknown_980EACC[] = INCBIN_U8("data/effects/efob080.pmdpal");
 const ax_pose *const gUnknown_980EB0C[] = {
     gUnknown_980E09C,
     gUnknown_980E0B0,
diff --git a/src/data/effects/efob081.c b/src/data/effects/efob081.c
index 715fc455a..694a86e46 100644
--- a/src/data/effects/efob081.c
+++ b/src/data/effects/efob081.c
@@ -1555,7 +1555,7 @@ const ax_anim gUnknown_981185C[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_98118EC[] = INCBIN_U32("data/effects/efob081.4bpp");
-const RGB gUnknown_981284C[] = INCBIN_U8("data/effects/efob081.pmdpal");
+const RGB_Struct gUnknown_981284C[] = INCBIN_U8("data/effects/efob081.pmdpal");
 const ax_pose *const gUnknown_981288C[] = {
     gUnknown_980EBFC,
     gUnknown_980EC10,
diff --git a/src/data/effects/efob082.c b/src/data/effects/efob082.c
index d63ce2576..970943629 100644
--- a/src/data/effects/efob082.c
+++ b/src/data/effects/efob082.c
@@ -217,7 +217,7 @@ const ax_anim gUnknown_98134F4[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9813614[] = INCBIN_U32("data/effects/efob082.4bpp");
-const RGB gUnknown_9813634[] = INCBIN_U8("data/effects/efob082.pmdpal");
+const RGB_Struct gUnknown_9813634[] = INCBIN_U8("data/effects/efob082.pmdpal");
 const ax_pose *const gUnknown_9813674[] = {
     gUnknown_9812F64,
     gUnknown_9812F78,
diff --git a/src/data/effects/efob083.c b/src/data/effects/efob083.c
index eaec37035..9fe1c0043 100644
--- a/src/data/effects/efob083.c
+++ b/src/data/effects/efob083.c
@@ -81,7 +81,7 @@ const ax_anim gUnknown_98138A0[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_981396C[] = INCBIN_U32("data/effects/efob083.4bpp");
-const RGB gUnknown_98143AC[] = INCBIN_U8("data/effects/efob083.pmdpal");
+const RGB_Struct gUnknown_98143AC[] = INCBIN_U8("data/effects/efob083.pmdpal");
 const ax_pose *const gUnknown_98143EC[] = {
     gUnknown_9813720,
     gUnknown_9813734,
diff --git a/src/data/effects/efob084.c b/src/data/effects/efob084.c
index ebb773e05..acb1e566d 100644
--- a/src/data/effects/efob084.c
+++ b/src/data/effects/efob084.c
@@ -141,7 +141,7 @@ const ax_anim gUnknown_981483C[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_98148E4[] = INCBIN_U32("data/effects/efob084.4bpp");
-const RGB gUnknown_9814BE4[] = INCBIN_U8("data/effects/efob084.pmdpal");
+const RGB_Struct gUnknown_9814BE4[] = INCBIN_U8("data/effects/efob084.pmdpal");
 const ax_pose *const gUnknown_9814C24[] = {
     gUnknown_981448C,
     gUnknown_98144C8,
diff --git a/src/data/effects/efob085.c b/src/data/effects/efob085.c
index 5f20fa151..e31d6a88a 100644
--- a/src/data/effects/efob085.c
+++ b/src/data/effects/efob085.c
@@ -170,7 +170,7 @@ const ax_anim gUnknown_981519C[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9815238[] = INCBIN_U32("data/effects/efob085.4bpp");
-const RGB gUnknown_9815B58[] = INCBIN_U8("data/effects/efob085.pmdpal");
+const RGB_Struct gUnknown_9815B58[] = INCBIN_U8("data/effects/efob085.pmdpal");
 const ax_pose *const gUnknown_9815B98[] = {
     gUnknown_9814CAC,
     gUnknown_9814CCA,
diff --git a/src/data/effects/efob086.c b/src/data/effects/efob086.c
index 615398428..1d8165c9a 100644
--- a/src/data/effects/efob086.c
+++ b/src/data/effects/efob086.c
@@ -23,7 +23,7 @@ const ax_anim gUnknown_9815C5C[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9815C8C[] = INCBIN_U32("data/effects/efob086.4bpp");
-const RGB gUnknown_9815E0C[] = INCBIN_U8("data/effects/efob086.pmdpal");
+const RGB_Struct gUnknown_9815E0C[] = INCBIN_U8("data/effects/efob086.pmdpal");
 const ax_pose *const gUnknown_9815E4C[] = {
     gUnknown_9815C1C,
     gUnknown_9815C30,
diff --git a/src/data/effects/efob087.c b/src/data/effects/efob087.c
index 43e5f6b5c..37cfddf0a 100644
--- a/src/data/effects/efob087.c
+++ b/src/data/effects/efob087.c
@@ -131,7 +131,7 @@ const ax_anim gUnknown_9816208[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_98162BC[] = INCBIN_U32("data/effects/efob087.4bpp");
-const RGB gUnknown_9816FDC[] = INCBIN_U8("data/effects/efob087.pmdpal");
+const RGB_Struct gUnknown_9816FDC[] = INCBIN_U8("data/effects/efob087.pmdpal");
 const ax_pose *const gUnknown_981701C[] = {
     gUnknown_9815EAC,
     gUnknown_9815EDE,
diff --git a/src/data/effects/efob088.c b/src/data/effects/efob088.c
index 8d048b392..652d224ae 100644
--- a/src/data/effects/efob088.c
+++ b/src/data/effects/efob088.c
@@ -38,7 +38,7 @@ const ax_anim gUnknown_9817140[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9817194[] = INCBIN_U32("data/effects/efob088.4bpp");
-const RGB gUnknown_98174B4[] = INCBIN_U8("data/effects/efob088.pmdpal");
+const RGB_Struct gUnknown_98174B4[] = INCBIN_U8("data/effects/efob088.pmdpal");
 const ax_pose *const gUnknown_98174F4[] = {
     gUnknown_98170C4,
     gUnknown_98170D8,
diff --git a/src/data/effects/efob089.c b/src/data/effects/efob089.c
index 5fa56af99..59faeec03 100644
--- a/src/data/effects/efob089.c
+++ b/src/data/effects/efob089.c
@@ -141,7 +141,7 @@ const ax_anim gUnknown_98179E4[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9817A14[] = INCBIN_U32("data/effects/efob089.4bpp");
-const RGB gUnknown_9817A74[] = INCBIN_U8("data/effects/efob089.pmdpal");
+const RGB_Struct gUnknown_9817A74[] = INCBIN_U8("data/effects/efob089.pmdpal");
 const ax_pose *const gUnknown_9817AB4[] = {
     gUnknown_9817560,
     gUnknown_981760A,
diff --git a/src/data/effects/efob090.c b/src/data/effects/efob090.c
index 7d423850d..941e0bdd4 100644
--- a/src/data/effects/efob090.c
+++ b/src/data/effects/efob090.c
@@ -391,7 +391,7 @@ const ax_anim gUnknown_981860C[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_98186B4[] = INCBIN_U32("data/effects/efob090.4bpp");
-const RGB gUnknown_9819554[] = INCBIN_U8("data/effects/efob090.pmdpal");
+const RGB_Struct gUnknown_9819554[] = INCBIN_U8("data/effects/efob090.pmdpal");
 const ax_pose *const gUnknown_9819594[] = {
     gUnknown_9817B4C,
     gUnknown_9817B7E,
diff --git a/src/data/effects/efob091.c b/src/data/effects/efob091.c
index df4d33a62..e2c9833b9 100644
--- a/src/data/effects/efob091.c
+++ b/src/data/effects/efob091.c
@@ -218,7 +218,7 @@ const ax_anim gUnknown_9819C70[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9819D84[] = INCBIN_U32("data/effects/efob091.4bpp");
-const RGB gUnknown_981AB84[] = INCBIN_U8("data/effects/efob091.pmdpal");
+const RGB_Struct gUnknown_981AB84[] = INCBIN_U8("data/effects/efob091.pmdpal");
 const ax_pose *const gUnknown_981ABC4[] = {
     gUnknown_98196CC,
     gUnknown_98196E0,
diff --git a/src/data/effects/efob092.c b/src/data/effects/efob092.c
index 84a1305c8..cac9950b3 100644
--- a/src/data/effects/efob092.c
+++ b/src/data/effects/efob092.c
@@ -24,7 +24,7 @@ const ax_anim gUnknown_981ACD8[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_981ACFC[] = INCBIN_U32("data/effects/efob092.4bpp");
-const RGB gUnknown_981AF3C[] = INCBIN_U8("data/effects/efob092.pmdpal");
+const RGB_Struct gUnknown_981AF3C[] = INCBIN_U8("data/effects/efob092.pmdpal");
 const ax_pose *const gUnknown_981AF7C[] = {
     gUnknown_981AC70,
     gUnknown_981ACA2,
diff --git a/src/data/effects/efob093.c b/src/data/effects/efob093.c
index c1bdfcc38..bf0648a8b 100644
--- a/src/data/effects/efob093.c
+++ b/src/data/effects/efob093.c
@@ -614,7 +614,7 @@ const ax_anim gUnknown_981C1B8[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_981C2CC[] = INCBIN_U32("data/effects/efob093.4bpp");
-const RGB gUnknown_981CA4C[] = INCBIN_U8("data/effects/efob093.pmdpal");
+const RGB_Struct gUnknown_981CA4C[] = INCBIN_U8("data/effects/efob093.pmdpal");
 const ax_pose *const gUnknown_981CA8C[] = {
     gUnknown_981AFD8,
     gUnknown_981AFEC,
diff --git a/src/data/effects/efob094.c b/src/data/effects/efob094.c
index cc74e2839..a428dd2b8 100644
--- a/src/data/effects/efob094.c
+++ b/src/data/effects/efob094.c
@@ -416,7 +416,7 @@ const ax_anim gUnknown_981D42C[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_981D768[] = INCBIN_U32("data/effects/efob094.4bpp");
-const RGB gUnknown_981D7E8[] = INCBIN_U8("data/effects/efob094.pmdpal");
+const RGB_Struct gUnknown_981D7E8[] = INCBIN_U8("data/effects/efob094.pmdpal");
 const ax_pose *const gUnknown_981D828[] = {
     gUnknown_981CC30,
     gUnknown_981CC4E,
diff --git a/src/data/effects/efob095.c b/src/data/effects/efob095.c
index 4a3ca4dae..8cb2b66dd 100644
--- a/src/data/effects/efob095.c
+++ b/src/data/effects/efob095.c
@@ -158,7 +158,7 @@ const ax_anim gUnknown_981DD70[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_981DE48[] = INCBIN_U32("data/effects/efob095.4bpp");
-const RGB gUnknown_981E388[] = INCBIN_U8("data/effects/efob095.pmdpal");
+const RGB_Struct gUnknown_981E388[] = INCBIN_U8("data/effects/efob095.pmdpal");
 const ax_pose *const gUnknown_981E3C8[] = {
     gUnknown_981D98C,
     gUnknown_981D9A0,
diff --git a/src/data/effects/efob096.c b/src/data/effects/efob096.c
index c4b035c60..02cba5007 100644
--- a/src/data/effects/efob096.c
+++ b/src/data/effects/efob096.c
@@ -497,7 +497,7 @@ const ax_anim gUnknown_981F318[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_981F4B0[] = INCBIN_U32("data/effects/efob096.4bpp");
-const RGB gUnknown_981FC90[] = INCBIN_U8("data/effects/efob096.pmdpal");
+const RGB_Struct gUnknown_981FC90[] = INCBIN_U8("data/effects/efob096.pmdpal");
 const ax_pose *const gUnknown_981FCD0[] = {
     gUnknown_981E460,
     gUnknown_981E474,
diff --git a/src/data/effects/efob097.c b/src/data/effects/efob097.c
index f9ac0ef3f..d8ac4ef86 100644
--- a/src/data/effects/efob097.c
+++ b/src/data/effects/efob097.c
@@ -313,7 +313,7 @@ const ax_anim gUnknown_982064C[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_98207C0[] = INCBIN_U32("data/effects/efob097.4bpp");
-const RGB gUnknown_98215A0[] = INCBIN_U8("data/effects/efob097.pmdpal");
+const RGB_Struct gUnknown_98215A0[] = INCBIN_U8("data/effects/efob097.pmdpal");
 const ax_pose *const gUnknown_98215E0[] = {
     gUnknown_981FDEC,
     gUnknown_981FE00,
diff --git a/src/data/effects/efob098.c b/src/data/effects/efob098.c
index 20b463e53..1da21fffc 100644
--- a/src/data/effects/efob098.c
+++ b/src/data/effects/efob098.c
@@ -38,7 +38,7 @@ const ax_anim gUnknown_9821784[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_98217E4[] = INCBIN_U32("data/effects/efob098.4bpp");
-const RGB gUnknown_9821984[] = INCBIN_U8("data/effects/efob098.pmdpal");
+const RGB_Struct gUnknown_9821984[] = INCBIN_U8("data/effects/efob098.pmdpal");
 const ax_pose *const gUnknown_98219C4[] = {
     gUnknown_98216FC,
     gUnknown_982171A,
diff --git a/src/data/effects/efob099.c b/src/data/effects/efob099.c
index ad559c6c7..f08ec565c 100644
--- a/src/data/effects/efob099.c
+++ b/src/data/effects/efob099.c
@@ -523,7 +523,7 @@ const ax_anim gUnknown_9822A2C[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9822A80[] = INCBIN_U32("data/effects/efob099.4bpp");
-const RGB gUnknown_9823980[] = INCBIN_U8("data/effects/efob099.pmdpal");
+const RGB_Struct gUnknown_9823980[] = INCBIN_U8("data/effects/efob099.pmdpal");
 const ax_pose *const gUnknown_98239C0[] = {
     gUnknown_9821A2C,
     gUnknown_9821A40,
diff --git a/src/data/effects/efob100.c b/src/data/effects/efob100.c
index 0ecbad655..02ae39143 100644
--- a/src/data/effects/efob100.c
+++ b/src/data/effects/efob100.c
@@ -257,7 +257,7 @@ const ax_anim gUnknown_98243F4[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_982446C[] = INCBIN_U32("data/effects/efob100.4bpp");
-const RGB gUnknown_9824B4C[] = INCBIN_U8("data/effects/efob100.pmdpal");
+const RGB_Struct gUnknown_9824B4C[] = INCBIN_U8("data/effects/efob100.pmdpal");
 const ax_pose *const gUnknown_9824B8C[] = {
     gUnknown_9823C20,
     gUnknown_9823C3E,
diff --git a/src/data/effects/efob101.c b/src/data/effects/efob101.c
index 8f36aca8c..6135cab54 100644
--- a/src/data/effects/efob101.c
+++ b/src/data/effects/efob101.c
@@ -108,7 +108,7 @@ const ax_anim gUnknown_9825020[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_982508C[] = INCBIN_U32("data/effects/efob101.4bpp");
-const RGB gUnknown_982542C[] = INCBIN_U8("data/effects/efob101.pmdpal");
+const RGB_Struct gUnknown_982542C[] = INCBIN_U8("data/effects/efob101.pmdpal");
 const ax_pose *const gUnknown_982546C[] = {
     gUnknown_9824E3C,
     gUnknown_9824E50,
diff --git a/src/data/effects/efob102.c b/src/data/effects/efob102.c
index c8e70b067..9eec29132 100644
--- a/src/data/effects/efob102.c
+++ b/src/data/effects/efob102.c
@@ -594,7 +594,7 @@ const ax_anim gUnknown_98266AC[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_98266E8[] = INCBIN_U32("data/effects/efob102.4bpp");
-const RGB gUnknown_9827688[] = INCBIN_U8("data/effects/efob102.pmdpal");
+const RGB_Struct gUnknown_9827688[] = INCBIN_U8("data/effects/efob102.pmdpal");
 const ax_pose *const gUnknown_98276C8[] = {
     gUnknown_9825518,
     gUnknown_982552C,
diff --git a/src/data/effects/efob103.c b/src/data/effects/efob103.c
index a85735509..609bbdb94 100644
--- a/src/data/effects/efob103.c
+++ b/src/data/effects/efob103.c
@@ -267,7 +267,7 @@ const ax_anim gUnknown_9827F88[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_98280FC[] = INCBIN_U32("data/effects/efob103.4bpp");
-const RGB gUnknown_9828DDC[] = INCBIN_U8("data/effects/efob103.pmdpal");
+const RGB_Struct gUnknown_9828DDC[] = INCBIN_U8("data/effects/efob103.pmdpal");
 const ax_pose *const gUnknown_9828E1C[] = {
     gUnknown_98278E8,
     gUnknown_98278FC,
diff --git a/src/data/effects/efob104.c b/src/data/effects/efob104.c
index 58c2aa3e7..0f8f37e43 100644
--- a/src/data/effects/efob104.c
+++ b/src/data/effects/efob104.c
@@ -125,7 +125,7 @@ const ax_anim gUnknown_98292D8[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_982935C[] = INCBIN_U32("data/effects/efob104.4bpp");
-const RGB gUnknown_98299DC[] = INCBIN_U8("data/effects/efob104.pmdpal");
+const RGB_Struct gUnknown_98299DC[] = INCBIN_U8("data/effects/efob104.pmdpal");
 const ax_pose *const gUnknown_9829A1C[] = {
     gUnknown_9828EE8,
     gUnknown_9828EFC,
diff --git a/src/data/effects/efob105.c b/src/data/effects/efob105.c
index 9d62e0749..9834d373a 100644
--- a/src/data/effects/efob105.c
+++ b/src/data/effects/efob105.c
@@ -163,7 +163,7 @@ const ax_anim gUnknown_9829F98[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_982A0C4[] = INCBIN_U32("data/effects/efob105.4bpp");
-const RGB gUnknown_982A884[] = INCBIN_U8("data/effects/efob105.pmdpal");
+const RGB_Struct gUnknown_982A884[] = INCBIN_U8("data/effects/efob105.pmdpal");
 const ax_pose *const gUnknown_982A8C4[] = {
     gUnknown_9829B7C,
     gUnknown_9829BE0,
diff --git a/src/data/effects/efob106.c b/src/data/effects/efob106.c
index ba3ccfa1a..f4d9772e2 100644
--- a/src/data/effects/efob106.c
+++ b/src/data/effects/efob106.c
@@ -113,7 +113,7 @@ const ax_anim gUnknown_982ABD8[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_982ABFC[] = INCBIN_U32("data/effects/efob106.4bpp");
-const RGB gUnknown_982AD1C[] = INCBIN_U8("data/effects/efob106.pmdpal");
+const RGB_Struct gUnknown_982AD1C[] = INCBIN_U8("data/effects/efob106.pmdpal");
 const ax_pose *const gUnknown_982AD5C[] = {
     gUnknown_982A970,
     gUnknown_982A98E,
diff --git a/src/data/effects/efob107.c b/src/data/effects/efob107.c
index d9a62115d..f43207be5 100644
--- a/src/data/effects/efob107.c
+++ b/src/data/effects/efob107.c
@@ -18,7 +18,7 @@ const ax_anim gUnknown_982AF18[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_982AF3C[] = INCBIN_U32("data/effects/efob107.4bpp");
-const RGB gUnknown_982B03C[] = INCBIN_U8("data/effects/efob107.pmdpal");
+const RGB_Struct gUnknown_982B03C[] = INCBIN_U8("data/effects/efob107.pmdpal");
 const ax_pose *const gUnknown_982B07C[] = {
     gUnknown_982AEEC,
     gUnknown_982AF00,
diff --git a/src/data/effects/efob108.c b/src/data/effects/efob108.c
index a320bf204..6ad367d8d 100644
--- a/src/data/effects/efob108.c
+++ b/src/data/effects/efob108.c
@@ -3956,7 +3956,7 @@ const ax_anim gUnknown_9832878[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9832CBC[] = INCBIN_U32("data/effects/efob108.4bpp");
-const RGB gUnknown_9833BDC[] = INCBIN_U8("data/effects/efob108.pmdpal");
+const RGB_Struct gUnknown_9833BDC[] = INCBIN_U8("data/effects/efob108.pmdpal");
 const ax_pose *const gUnknown_9833C1C[] = {
     gUnknown_982B0D8,
     gUnknown_982B11E,
diff --git a/src/data/effects/efob109.c b/src/data/effects/efob109.c
index c50192c2f..dd3a3f90c 100644
--- a/src/data/effects/efob109.c
+++ b/src/data/effects/efob109.c
@@ -536,7 +536,7 @@ const ax_anim gUnknown_983558C[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_98355E0[] = INCBIN_U32("data/effects/efob109.4bpp");
-const RGB gUnknown_98365E0[] = INCBIN_U8("data/effects/efob109.pmdpal");
+const RGB_Struct gUnknown_98365E0[] = INCBIN_U8("data/effects/efob109.pmdpal");
 const ax_pose *const gUnknown_9836620[] = {
     gUnknown_98344D8,
     gUnknown_9834528,
diff --git a/src/data/effects/efob110.c b/src/data/effects/efob110.c
index 22451104d..fa931a2fb 100644
--- a/src/data/effects/efob110.c
+++ b/src/data/effects/efob110.c
@@ -367,7 +367,7 @@ const ax_anim gUnknown_9837278[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9837308[] = INCBIN_U32("data/effects/efob110.4bpp");
-const RGB gUnknown_98378C8[] = INCBIN_U8("data/effects/efob110.pmdpal");
+const RGB_Struct gUnknown_98378C8[] = INCBIN_U8("data/effects/efob110.pmdpal");
 const ax_pose *const gUnknown_9837908[] = {
     gUnknown_98367E4,
     gUnknown_9836834,
diff --git a/src/data/effects/efob111.c b/src/data/effects/efob111.c
index 4f18bbfff..0300170c0 100644
--- a/src/data/effects/efob111.c
+++ b/src/data/effects/efob111.c
@@ -71,7 +71,7 @@ const ax_anim gUnknown_9837BB0[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9837C28[] = INCBIN_U32("data/effects/efob111.4bpp");
-const RGB gUnknown_98385C8[] = INCBIN_U8("data/effects/efob111.pmdpal");
+const RGB_Struct gUnknown_98385C8[] = INCBIN_U8("data/effects/efob111.pmdpal");
 const ax_pose *const gUnknown_9838608[] = {
     gUnknown_9837A44,
     gUnknown_9837A58,
diff --git a/src/data/effects/efob112.c b/src/data/effects/efob112.c
index da9af2d41..0a909a32e 100644
--- a/src/data/effects/efob112.c
+++ b/src/data/effects/efob112.c
@@ -36,7 +36,7 @@ const ax_anim gUnknown_98386F0[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_983875C[] = INCBIN_U32("data/effects/efob112.4bpp");
-const RGB gUnknown_9838A1C[] = INCBIN_U8("data/effects/efob112.pmdpal");
+const RGB_Struct gUnknown_9838A1C[] = INCBIN_U8("data/effects/efob112.pmdpal");
 const ax_pose *const gUnknown_9838A5C[] = {
     gUnknown_9838688,
     gUnknown_983869C,
diff --git a/src/data/effects/efob113.c b/src/data/effects/efob113.c
index fd25833b3..280d45767 100644
--- a/src/data/effects/efob113.c
+++ b/src/data/effects/efob113.c
@@ -365,7 +365,7 @@ const ax_anim gUnknown_98396B8[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9839748[] = INCBIN_U32("data/effects/efob113.4bpp");
-const RGB gUnknown_983A6A8[] = INCBIN_U8("data/effects/efob113.pmdpal");
+const RGB_Struct gUnknown_983A6A8[] = INCBIN_U8("data/effects/efob113.pmdpal");
 const ax_pose *const gUnknown_983A6E8[] = {
     gUnknown_9838AC4,
     gUnknown_9838B96,
diff --git a/src/data/effects/efob114.c b/src/data/effects/efob114.c
index a89615105..d745c5f0e 100644
--- a/src/data/effects/efob114.c
+++ b/src/data/effects/efob114.c
@@ -477,7 +477,7 @@ const ax_anim gUnknown_983B2FC[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_983B5B4[] = INCBIN_U32("data/effects/efob114.4bpp");
-const RGB gUnknown_983BD34[] = INCBIN_U8("data/effects/efob114.pmdpal");
+const RGB_Struct gUnknown_983BD34[] = INCBIN_U8("data/effects/efob114.pmdpal");
 const ax_pose *const gUnknown_983BD74[] = {
     gUnknown_983A7B8,
     gUnknown_983A7CC,
diff --git a/src/data/effects/efob115.c b/src/data/effects/efob115.c
index 3d65fba15..8cff4e450 100644
--- a/src/data/effects/efob115.c
+++ b/src/data/effects/efob115.c
@@ -39,7 +39,7 @@ const ax_anim gUnknown_983BF58[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_983BFF4[] = INCBIN_U32("data/effects/efob115.4bpp");
-const RGB gUnknown_983C1B4[] = INCBIN_U8("data/effects/efob115.pmdpal");
+const RGB_Struct gUnknown_983C1B4[] = INCBIN_U8("data/effects/efob115.pmdpal");
 const ax_pose *const gUnknown_983C1F4[] = {
     gUnknown_983BEE4,
     gUnknown_983BEF8,
diff --git a/src/data/effects/efob116.c b/src/data/effects/efob116.c
index 8ee0b1ee4..aa910184b 100644
--- a/src/data/effects/efob116.c
+++ b/src/data/effects/efob116.c
@@ -165,7 +165,7 @@ const ax_anim gUnknown_983C5F4[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_983C78C[] = INCBIN_U32("data/effects/efob116.4bpp");
-const RGB gUnknown_983D34C[] = INCBIN_U8("data/effects/efob116.pmdpal");
+const RGB_Struct gUnknown_983D34C[] = INCBIN_U8("data/effects/efob116.pmdpal");
 const ax_pose *const gUnknown_983D38C[] = {
     gUnknown_983C258,
     gUnknown_983C26C,
diff --git a/src/data/effects/efob117.c b/src/data/effects/efob117.c
index 1afbabb9b..b6b8bd614 100644
--- a/src/data/effects/efob117.c
+++ b/src/data/effects/efob117.c
@@ -18,7 +18,7 @@ const ax_anim gUnknown_983D44C[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_983D470[] = INCBIN_U32("data/effects/efob117.4bpp");
-const RGB gUnknown_983D570[] = INCBIN_U8("data/effects/efob117.pmdpal");
+const RGB_Struct gUnknown_983D570[] = INCBIN_U8("data/effects/efob117.pmdpal");
 const ax_pose *const gUnknown_983D5B0[] = {
     gUnknown_983D420,
     gUnknown_983D434,
diff --git a/src/data/effects/efob118.c b/src/data/effects/efob118.c
index 51cae73d9..0560869f1 100644
--- a/src/data/effects/efob118.c
+++ b/src/data/effects/efob118.c
@@ -253,7 +253,7 @@ const ax_anim gUnknown_983DCB4[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_983DCF0[] = INCBIN_U32("data/effects/efob118.4bpp");
-const RGB gUnknown_983DDF0[] = INCBIN_U8("data/effects/efob118.pmdpal");
+const RGB_Struct gUnknown_983DDF0[] = INCBIN_U8("data/effects/efob118.pmdpal");
 const ax_pose *const gUnknown_983DE30[] = {
     gUnknown_983D60C,
     gUnknown_983D634,
diff --git a/src/data/effects/efob119.c b/src/data/effects/efob119.c
index 8c52f1027..6a9689d58 100644
--- a/src/data/effects/efob119.c
+++ b/src/data/effects/efob119.c
@@ -199,7 +199,7 @@ const ax_anim gUnknown_983E578[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_983E650[] = INCBIN_U32("data/effects/efob119.4bpp");
-const RGB gUnknown_983EF50[] = INCBIN_U8("data/effects/efob119.pmdpal");
+const RGB_Struct gUnknown_983EF50[] = INCBIN_U8("data/effects/efob119.pmdpal");
 const ax_pose *const gUnknown_983EF90[] = {
     gUnknown_983E000,
     gUnknown_983E014,
diff --git a/src/data/effects/efob120.c b/src/data/effects/efob120.c
index f2a7172ec..dba2d71a1 100644
--- a/src/data/effects/efob120.c
+++ b/src/data/effects/efob120.c
@@ -45,7 +45,7 @@ const ax_anim gUnknown_983F128[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_983F1D0[] = INCBIN_U32("data/effects/efob120.4bpp");
-const RGB gUnknown_983F2F0[] = INCBIN_U8("data/effects/efob120.pmdpal");
+const RGB_Struct gUnknown_983F2F0[] = INCBIN_U8("data/effects/efob120.pmdpal");
 const ax_pose *const gUnknown_983F330[] = {
     gUnknown_983F070,
     gUnknown_983F084,
diff --git a/src/data/effects/efob121.c b/src/data/effects/efob121.c
index cfd7470db..290e93501 100644
--- a/src/data/effects/efob121.c
+++ b/src/data/effects/efob121.c
@@ -1301,7 +1301,7 @@ const ax_anim gUnknown_98415F0[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9841698[] = INCBIN_U32("data/effects/efob121.4bpp");
-const RGB gUnknown_9841EB8[] = INCBIN_U8("data/effects/efob121.pmdpal");
+const RGB_Struct gUnknown_9841EB8[] = INCBIN_U8("data/effects/efob121.pmdpal");
 const ax_pose *const gUnknown_9841EF8[] = {
     gUnknown_983F3B4,
     gUnknown_983F3DC,
diff --git a/src/data/effects/efob122.c b/src/data/effects/efob122.c
index d0e423538..e24b672c5 100644
--- a/src/data/effects/efob122.c
+++ b/src/data/effects/efob122.c
@@ -757,7 +757,7 @@ const ax_anim gUnknown_98439E8[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9843A3C[] = INCBIN_U32("data/effects/efob122.4bpp");
-const RGB gUnknown_984499C[] = INCBIN_U8("data/effects/efob122.pmdpal");
+const RGB_Struct gUnknown_984499C[] = INCBIN_U8("data/effects/efob122.pmdpal");
 const ax_pose *const gUnknown_98449DC[] = {
     gUnknown_98424A8,
     gUnknown_98424DA,
diff --git a/src/data/effects/efob123.c b/src/data/effects/efob123.c
index 332d2a17f..61ba945bf 100644
--- a/src/data/effects/efob123.c
+++ b/src/data/effects/efob123.c
@@ -39,7 +39,7 @@ const ax_anim gUnknown_9844F38[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9845034[] = INCBIN_U32("data/effects/efob123.4bpp");
-const RGB gUnknown_9845254[] = INCBIN_U8("data/effects/efob123.pmdpal");
+const RGB_Struct gUnknown_9845254[] = INCBIN_U8("data/effects/efob123.pmdpal");
 const ax_pose *const gUnknown_9845294[] = {
     gUnknown_9844EEC,
     gUnknown_9844F1E,
diff --git a/src/data/effects/efob124.c b/src/data/effects/efob124.c
index 3ab35f558..15e244324 100644
--- a/src/data/effects/efob124.c
+++ b/src/data/effects/efob124.c
@@ -249,7 +249,7 @@ const ax_anim gUnknown_9845AB4[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9845AF0[] = INCBIN_U32("data/effects/efob124.4bpp");
-const RGB gUnknown_98469D0[] = INCBIN_U8("data/effects/efob124.pmdpal");
+const RGB_Struct gUnknown_98469D0[] = INCBIN_U8("data/effects/efob124.pmdpal");
 const ax_pose *const gUnknown_9846A10[] = {
     gUnknown_98452F0,
     gUnknown_984530E,
diff --git a/src/data/effects/efob125.c b/src/data/effects/efob125.c
index 79b69d7c3..53a450ab6 100644
--- a/src/data/effects/efob125.c
+++ b/src/data/effects/efob125.c
@@ -360,7 +360,7 @@ const ax_anim gUnknown_98475B0[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9847640[] = INCBIN_U32("data/effects/efob125.4bpp");
-const RGB gUnknown_9847BC0[] = INCBIN_U8("data/effects/efob125.pmdpal");
+const RGB_Struct gUnknown_9847BC0[] = INCBIN_U8("data/effects/efob125.pmdpal");
 const ax_pose *const gUnknown_9847C00[] = {
     gUnknown_9846AD8,
     gUnknown_9846B28,
diff --git a/src/data/effects/efob126.c b/src/data/effects/efob126.c
index 45b3087a2..5644a5c20 100644
--- a/src/data/effects/efob126.c
+++ b/src/data/effects/efob126.c
@@ -93,7 +93,7 @@ const ax_anim gUnknown_9847F74[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9847FB0[] = INCBIN_U32("data/effects/efob126.4bpp");
-const RGB gUnknown_9848130[] = INCBIN_U8("data/effects/efob126.pmdpal");
+const RGB_Struct gUnknown_9848130[] = INCBIN_U8("data/effects/efob126.pmdpal");
 const ax_pose *const gUnknown_9848170[] = {
     gUnknown_9847D2C,
     gUnknown_9847D40,
diff --git a/src/data/effects/efob127.c b/src/data/effects/efob127.c
index a2a92d36e..e849e714c 100644
--- a/src/data/effects/efob127.c
+++ b/src/data/effects/efob127.c
@@ -69,7 +69,7 @@ const ax_anim gUnknown_984842C[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9848444[] = INCBIN_U32("data/effects/efob127.4bpp");
-const RGB gUnknown_9848844[] = INCBIN_U8("data/effects/efob127.pmdpal");
+const RGB_Struct gUnknown_9848844[] = INCBIN_U8("data/effects/efob127.pmdpal");
 const ax_pose *const gUnknown_9848884[] = {
     gUnknown_98482E0,
     gUnknown_98482F4,
diff --git a/src/data/effects/efob128.c b/src/data/effects/efob128.c
index 7e64c9d0a..221f11b73 100644
--- a/src/data/effects/efob128.c
+++ b/src/data/effects/efob128.c
@@ -90,7 +90,7 @@ const ax_anim gUnknown_9848AAC[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9848CE0[] = INCBIN_U32("data/effects/efob128.4bpp");
-const RGB gUnknown_9849100[] = INCBIN_U8("data/effects/efob128.pmdpal");
+const RGB_Struct gUnknown_9849100[] = INCBIN_U8("data/effects/efob128.pmdpal");
 const ax_pose *const gUnknown_9849140[] = {
     gUnknown_98489F4,
     gUnknown_9848A08,
diff --git a/src/data/effects/efob129.c b/src/data/effects/efob129.c
index 5918ee8f0..b0603de2e 100644
--- a/src/data/effects/efob129.c
+++ b/src/data/effects/efob129.c
@@ -607,7 +607,7 @@ const ax_anim gUnknown_984A154[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_984A22C[] = INCBIN_U32("data/effects/efob129.4bpp");
-const RGB gUnknown_984AB2C[] = INCBIN_U8("data/effects/efob129.pmdpal");
+const RGB_Struct gUnknown_984AB2C[] = INCBIN_U8("data/effects/efob129.pmdpal");
 const ax_pose *const gUnknown_984AB6C[] = {
     gUnknown_98491B8,
     gUnknown_98491CC,
diff --git a/src/data/effects/efob130.c b/src/data/effects/efob130.c
index 98a947d4d..77a6e25c5 100644
--- a/src/data/effects/efob130.c
+++ b/src/data/effects/efob130.c
@@ -103,7 +103,7 @@ const ax_anim gUnknown_984AF50[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_984B238[] = INCBIN_U32("data/effects/efob130.4bpp");
-const RGB gUnknown_984BD58[] = INCBIN_U8("data/effects/efob130.pmdpal");
+const RGB_Struct gUnknown_984BD58[] = INCBIN_U8("data/effects/efob130.pmdpal");
 const ax_pose *const gUnknown_984BD98[] = {
     gUnknown_984AE84,
     gUnknown_984AEA2,
diff --git a/src/data/effects/efob131.c b/src/data/effects/efob131.c
index a382d8ac2..196369123 100644
--- a/src/data/effects/efob131.c
+++ b/src/data/effects/efob131.c
@@ -63,7 +63,7 @@ const ax_anim gUnknown_984BF28[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_984BF7C[] = INCBIN_U32("data/effects/efob131.4bpp");
-const RGB gUnknown_984CC1C[] = INCBIN_U8("data/effects/efob131.pmdpal");
+const RGB_Struct gUnknown_984CC1C[] = INCBIN_U8("data/effects/efob131.pmdpal");
 const ax_pose *const gUnknown_984CC5C[] = {
     gUnknown_984BE08,
     gUnknown_984BE1C,
diff --git a/src/data/effects/efob132.c b/src/data/effects/efob132.c
index ad822e33b..dc4eaa84a 100644
--- a/src/data/effects/efob132.c
+++ b/src/data/effects/efob132.c
@@ -277,7 +277,7 @@ const ax_anim gUnknown_984D520[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_984D628[] = INCBIN_U32("data/effects/efob132.4bpp");
-const RGB gUnknown_984E388[] = INCBIN_U8("data/effects/efob132.pmdpal");
+const RGB_Struct gUnknown_984E388[] = INCBIN_U8("data/effects/efob132.pmdpal");
 const ax_pose *const gUnknown_984E3C8[] = {
     gUnknown_984CCFC,
     gUnknown_984CD10,
diff --git a/src/data/effects/efob133.c b/src/data/effects/efob133.c
index 6d3582a0f..d23a9693e 100644
--- a/src/data/effects/efob133.c
+++ b/src/data/effects/efob133.c
@@ -182,7 +182,7 @@ const ax_anim gUnknown_984E81C[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_984E9C0[] = INCBIN_U32("data/effects/efob133.4bpp");
-const RGB gUnknown_984EAC0[] = INCBIN_U8("data/effects/efob133.pmdpal");
+const RGB_Struct gUnknown_984EAC0[] = INCBIN_U8("data/effects/efob133.pmdpal");
 const ax_pose *const gUnknown_984EB00[] = {
     gUnknown_984E46C,
     gUnknown_984E480,
diff --git a/src/data/effects/efob134.c b/src/data/effects/efob134.c
index 4b709cf57..ebcfce328 100644
--- a/src/data/effects/efob134.c
+++ b/src/data/effects/efob134.c
@@ -124,7 +124,7 @@ const ax_anim gUnknown_984EE34[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_984EEC4[] = INCBIN_U32("data/effects/efob134.4bpp");
-const RGB gUnknown_984FB24[] = INCBIN_U8("data/effects/efob134.pmdpal");
+const RGB_Struct gUnknown_984FB24[] = INCBIN_U8("data/effects/efob134.pmdpal");
 const ax_pose *const gUnknown_984FB64[] = {
     gUnknown_984EBB0,
     gUnknown_984EBC4,
diff --git a/src/data/effects/efob135.c b/src/data/effects/efob135.c
index 5e8fda1b2..61245465a 100644
--- a/src/data/effects/efob135.c
+++ b/src/data/effects/efob135.c
@@ -1217,7 +1217,7 @@ const ax_anim gUnknown_98520F4[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_98523E8[] = INCBIN_U32("data/effects/efob135.4bpp");
-const RGB gUnknown_98531E8[] = INCBIN_U8("data/effects/efob135.pmdpal");
+const RGB_Struct gUnknown_98531E8[] = INCBIN_U8("data/effects/efob135.pmdpal");
 const ax_pose *const gUnknown_9853228[] = {
     gUnknown_984FC50,
     gUnknown_984FC6E,
diff --git a/src/data/effects/efob136.c b/src/data/effects/efob136.c
index 3bf774fae..7aecd7fcc 100644
--- a/src/data/effects/efob136.c
+++ b/src/data/effects/efob136.c
@@ -485,7 +485,7 @@ const ax_anim gUnknown_9854034[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9854058[] = INCBIN_U32("data/effects/efob136.4bpp");
-const RGB gUnknown_98543D8[] = INCBIN_U8("data/effects/efob136.pmdpal");
+const RGB_Struct gUnknown_98543D8[] = INCBIN_U8("data/effects/efob136.pmdpal");
 const ax_pose *const gUnknown_9854418[] = {
     gUnknown_9853454,
     gUnknown_9853472,
diff --git a/src/data/effects/efob137.c b/src/data/effects/efob137.c
index 66ceb454e..3e74c66d7 100644
--- a/src/data/effects/efob137.c
+++ b/src/data/effects/efob137.c
@@ -60,7 +60,7 @@ const ax_anim gUnknown_9854ADC[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9854B48[] = INCBIN_U32("data/effects/efob137.4bpp");
-const RGB gUnknown_9854C48[] = INCBIN_U8("data/effects/efob137.pmdpal");
+const RGB_Struct gUnknown_9854C48[] = INCBIN_U8("data/effects/efob137.pmdpal");
 const ax_pose *const gUnknown_9854C88[] = {
     gUnknown_98549C8,
     gUnknown_98549DC,
diff --git a/src/data/effects/efob138.c b/src/data/effects/efob138.c
index cc16b372a..332a3b22f 100644
--- a/src/data/effects/efob138.c
+++ b/src/data/effects/efob138.c
@@ -1284,7 +1284,7 @@ const ax_anim gUnknown_985739C[] = {
     { 0,   0,   0, { 0, 0 }, { 0, 0 } },
 };
 const u32 gUnknown_9857720[] = INCBIN_U32("data/effects/efob138.4bpp");
-const RGB gUnknown_9858720[] = INCBIN_U8("data/effects/efob138.pmdpal");
+const RGB_Struct gUnknown_9858720[] = INCBIN_U8("data/effects/efob138.pmdpal");
 const ax_pose *const gUnknown_9858760[] = {
     gUnknown_9854D20,
     gUnknown_9854D34,
diff --git a/src/data/ornament/flag00.h b/src/data/ornament/flag00.h
index 1060397b8..1a7268bb2 100644
--- a/src/data/ornament/flag00.h
+++ b/src/data/ornament/flag00.h
@@ -1,4 +1,4 @@
-const RGB gFlag00Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag00.pmdpal") };
+const RGB_Struct gFlag00Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag00.pmdpal") };
 
 static const axmain sAxMainFlag00;
 const SiroArchive gAxFlag00 = {"SIRO", &sAxMainFlag00};
diff --git a/src/data/ornament/flag01.h b/src/data/ornament/flag01.h
index c250fcf28..169daf414 100644
--- a/src/data/ornament/flag01.h
+++ b/src/data/ornament/flag01.h
@@ -1,4 +1,4 @@
-const RGB gFlag01Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag01.pmdpal") };
+const RGB_Struct gFlag01Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag01.pmdpal") };
 
 static const axmain sAxMainFlag01;
 const SiroArchive gAxFlag01 = {"SIRO", &sAxMainFlag01};
diff --git a/src/data/ornament/flag02.h b/src/data/ornament/flag02.h
index 5b753aadf..a71fa388e 100644
--- a/src/data/ornament/flag02.h
+++ b/src/data/ornament/flag02.h
@@ -1,4 +1,4 @@
-const RGB gFlag02Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag02.pmdpal") };
+const RGB_Struct gFlag02Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag02.pmdpal") };
 
 static const axmain sAxMainFlag02;
 const SiroArchive gAxFlag02 = {"SIRO", &sAxMainFlag02};
diff --git a/src/data/ornament/flag03.h b/src/data/ornament/flag03.h
index 6773f1626..1c7d45cb2 100644
--- a/src/data/ornament/flag03.h
+++ b/src/data/ornament/flag03.h
@@ -1,4 +1,4 @@
-const RGB gFlag03Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag03.pmdpal") };
+const RGB_Struct gFlag03Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag03.pmdpal") };
 
 static const axmain sAxMainFlag03;
 const SiroArchive gAxFlag03 = {"SIRO", &sAxMainFlag03};
diff --git a/src/data/ornament/flag04.h b/src/data/ornament/flag04.h
index 03725b2c7..d4c9e662f 100644
--- a/src/data/ornament/flag04.h
+++ b/src/data/ornament/flag04.h
@@ -1,4 +1,4 @@
-const RGB gFlag04Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag04.pmdpal") };
+const RGB_Struct gFlag04Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag04.pmdpal") };
 
 static const axmain sAxMainFlag04;
 const SiroArchive gAxFlag04 = {"SIRO", &sAxMainFlag04};
diff --git a/src/data/ornament/flag05.h b/src/data/ornament/flag05.h
index a92ac22e7..9e158f0c4 100644
--- a/src/data/ornament/flag05.h
+++ b/src/data/ornament/flag05.h
@@ -1,4 +1,4 @@
-const RGB gFlag05Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag05.pmdpal") };
+const RGB_Struct gFlag05Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag05.pmdpal") };
 
 static const axmain sAxMainFlag05;
 const SiroArchive gAxFlag05 = {"SIRO", &sAxMainFlag05};
diff --git a/src/data/ornament/flag06.h b/src/data/ornament/flag06.h
index 076159150..c8c1ca12d 100644
--- a/src/data/ornament/flag06.h
+++ b/src/data/ornament/flag06.h
@@ -1,4 +1,4 @@
-const RGB gFlag06Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag06.pmdpal") };
+const RGB_Struct gFlag06Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag06.pmdpal") };
 
 static const axmain sAxMainFlag06;
 const SiroArchive gAxFlag06 = {"SIRO", &sAxMainFlag06};
diff --git a/src/data/ornament/flag07.h b/src/data/ornament/flag07.h
index 0ce201c4d..53a171d65 100644
--- a/src/data/ornament/flag07.h
+++ b/src/data/ornament/flag07.h
@@ -1,4 +1,4 @@
-const RGB gFlag07Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag07.pmdpal") };
+const RGB_Struct gFlag07Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag07.pmdpal") };
 
 static const axmain sAxMainFlag07;
 const SiroArchive gAxFlag07 = {"SIRO", &sAxMainFlag07};
diff --git a/src/data/ornament/flag08.h b/src/data/ornament/flag08.h
index 553782921..5139479d4 100644
--- a/src/data/ornament/flag08.h
+++ b/src/data/ornament/flag08.h
@@ -1,4 +1,4 @@
-const RGB gFlag08Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag08.pmdpal") };
+const RGB_Struct gFlag08Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag08.pmdpal") };
 
 static const axmain sAxMainFlag08;
 const SiroArchive gAxFlag08 = {"SIRO", &sAxMainFlag08};
diff --git a/src/data/ornament/flag09.h b/src/data/ornament/flag09.h
index 4b12839d7..30adeb17a 100644
--- a/src/data/ornament/flag09.h
+++ b/src/data/ornament/flag09.h
@@ -1,4 +1,4 @@
-const RGB gFlag09Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag09.pmdpal") };
+const RGB_Struct gFlag09Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag09.pmdpal") };
 
 static const axmain sAxMainFlag09;
 const SiroArchive gAxFlag09 = {"SIRO", &sAxMainFlag09};
diff --git a/src/data/ornament/flag10.h b/src/data/ornament/flag10.h
index 8f589a06e..6057ef621 100644
--- a/src/data/ornament/flag10.h
+++ b/src/data/ornament/flag10.h
@@ -111,7 +111,7 @@ static const axmain sAxMainFlag109 = {
 	.spriteData = sAxSpritesFlag109,
 	.positions = NULL,
 };
-const RGB gFlag10Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag10.pmdpal") };
+const RGB_Struct gFlag10Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag10.pmdpal") };
 
 static const axmain sAxMainFlag10;
 const SiroArchive gAxFlag10 = {"SIRO", &sAxMainFlag10};
diff --git a/src/data/ornament/flag100.h b/src/data/ornament/flag100.h
index 03dadd1dc..b30528282 100644
--- a/src/data/ornament/flag100.h
+++ b/src/data/ornament/flag100.h
@@ -1,4 +1,4 @@
-const RGB gFlag100Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag100.pmdpal") };
+const RGB_Struct gFlag100Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag100.pmdpal") };
 
 static const axmain sAxMainFlag100;
 const SiroArchive gAxFlag100 = {"SIRO", &sAxMainFlag100};
diff --git a/src/data/ornament/flag101.h b/src/data/ornament/flag101.h
index 182612393..cc71a1e35 100644
--- a/src/data/ornament/flag101.h
+++ b/src/data/ornament/flag101.h
@@ -1,4 +1,4 @@
-const RGB gFlag101Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag101.pmdpal") };
+const RGB_Struct gFlag101Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag101.pmdpal") };
 
 static const axmain sAxMainFlag101;
 const SiroArchive gAxFlag101 = {"SIRO", &sAxMainFlag101};
diff --git a/src/data/ornament/flag102.h b/src/data/ornament/flag102.h
index 0e60e9b4b..04918e7c9 100644
--- a/src/data/ornament/flag102.h
+++ b/src/data/ornament/flag102.h
@@ -1,4 +1,4 @@
-const RGB gFlag102Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag102.pmdpal") };
+const RGB_Struct gFlag102Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag102.pmdpal") };
 
 static const axmain sAxMainFlag102;
 const SiroArchive gAxFlag102 = {"SIRO", &sAxMainFlag102};
diff --git a/src/data/ornament/flag103.h b/src/data/ornament/flag103.h
index 70c7d0a46..0c1656359 100644
--- a/src/data/ornament/flag103.h
+++ b/src/data/ornament/flag103.h
@@ -1,4 +1,4 @@
-const RGB gFlag103Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag103.pmdpal") };
+const RGB_Struct gFlag103Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag103.pmdpal") };
 
 static const axmain sAxMainFlag103;
 const SiroArchive gAxFlag103 = {"SIRO", &sAxMainFlag103};
diff --git a/src/data/ornament/flag104.h b/src/data/ornament/flag104.h
index f8847891f..aff2bd353 100644
--- a/src/data/ornament/flag104.h
+++ b/src/data/ornament/flag104.h
@@ -1,4 +1,4 @@
-const RGB gFlag104Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag104.pmdpal") };
+const RGB_Struct gFlag104Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag104.pmdpal") };
 
 static const axmain sAxMainFlag104;
 const SiroArchive gAxFlag104 = {"SIRO", &sAxMainFlag104};
diff --git a/src/data/ornament/flag105.h b/src/data/ornament/flag105.h
index 121e12ff7..1f4adb4ec 100644
--- a/src/data/ornament/flag105.h
+++ b/src/data/ornament/flag105.h
@@ -1,4 +1,4 @@
-const RGB gFlag105Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag105.pmdpal") };
+const RGB_Struct gFlag105Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag105.pmdpal") };
 
 static const axmain sAxMainFlag105;
 const SiroArchive gAxFlag105 = {"SIRO", &sAxMainFlag105};
diff --git a/src/data/ornament/flag106.h b/src/data/ornament/flag106.h
index b59da97a5..aed050a3e 100644
--- a/src/data/ornament/flag106.h
+++ b/src/data/ornament/flag106.h
@@ -1,4 +1,4 @@
-const RGB gFlag106Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag106.pmdpal") };
+const RGB_Struct gFlag106Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag106.pmdpal") };
 
 static const axmain sAxMainFlag106;
 const SiroArchive gAxFlag106 = {"SIRO", &sAxMainFlag106};
diff --git a/src/data/ornament/flag107.h b/src/data/ornament/flag107.h
index fe42664b5..ddfbb76d6 100644
--- a/src/data/ornament/flag107.h
+++ b/src/data/ornament/flag107.h
@@ -1,4 +1,4 @@
-const RGB gFlag107Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag107.pmdpal") };
+const RGB_Struct gFlag107Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag107.pmdpal") };
 
 static const axmain sAxMainFlag107;
 const SiroArchive gAxFlag107 = {"SIRO", &sAxMainFlag107};
diff --git a/src/data/ornament/flag108.h b/src/data/ornament/flag108.h
index 0322efe93..349a53449 100644
--- a/src/data/ornament/flag108.h
+++ b/src/data/ornament/flag108.h
@@ -1,4 +1,4 @@
-const RGB gFlag108Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag108.pmdpal") };
+const RGB_Struct gFlag108Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag108.pmdpal") };
 
 static const axmain sAxMainFlag108;
 const SiroArchive gAxFlag108 = {"SIRO", &sAxMainFlag108};
diff --git a/src/data/ornament/flag109.h b/src/data/ornament/flag109.h
index 88f65da54..be842a34c 100644
--- a/src/data/ornament/flag109.h
+++ b/src/data/ornament/flag109.h
@@ -1,2 +1,2 @@
-const RGB gFlag109Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag109.pmdpal") };
+const RGB_Struct gFlag109Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag109.pmdpal") };
 
diff --git a/src/data/ornament/flag11.h b/src/data/ornament/flag11.h
index 8226ff5ef..242b6d463 100644
--- a/src/data/ornament/flag11.h
+++ b/src/data/ornament/flag11.h
@@ -1,4 +1,4 @@
-const RGB gFlag11Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag11.pmdpal") };
+const RGB_Struct gFlag11Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag11.pmdpal") };
 
 static const axmain sAxMainFlag11;
 const SiroArchive gAxFlag11 = {"SIRO", &sAxMainFlag11};
diff --git a/src/data/ornament/flag110.h b/src/data/ornament/flag110.h
index 979ed50ce..5280fedd8 100644
--- a/src/data/ornament/flag110.h
+++ b/src/data/ornament/flag110.h
@@ -1,4 +1,4 @@
-const RGB gFlag110Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag110.pmdpal") };
+const RGB_Struct gFlag110Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag110.pmdpal") };
 
 static const axmain sAxMainFlag110;
 const SiroArchive gAxFlag110 = {"SIRO", &sAxMainFlag110};
diff --git a/src/data/ornament/flag111.h b/src/data/ornament/flag111.h
index f3b26c3ac..b342e088a 100644
--- a/src/data/ornament/flag111.h
+++ b/src/data/ornament/flag111.h
@@ -1,4 +1,4 @@
-const RGB gFlag111Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag111.pmdpal") };
+const RGB_Struct gFlag111Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag111.pmdpal") };
 
 static const axmain sAxMainFlag111;
 const SiroArchive gAxFlag111 = {"SIRO", &sAxMainFlag111};
diff --git a/src/data/ornament/flag112.h b/src/data/ornament/flag112.h
index 4fa9e0ab3..782ec7d8c 100644
--- a/src/data/ornament/flag112.h
+++ b/src/data/ornament/flag112.h
@@ -1,4 +1,4 @@
-const RGB gFlag112Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag112.pmdpal") };
+const RGB_Struct gFlag112Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag112.pmdpal") };
 
 static const axmain sAxMainFlag112;
 const SiroArchive gAxFlag112 = {"SIRO", &sAxMainFlag112};
diff --git a/src/data/ornament/flag113.h b/src/data/ornament/flag113.h
index bc00fba42..b2ee26a00 100644
--- a/src/data/ornament/flag113.h
+++ b/src/data/ornament/flag113.h
@@ -1,4 +1,4 @@
-const RGB gFlag113Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag113.pmdpal") };
+const RGB_Struct gFlag113Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag113.pmdpal") };
 
 static const axmain sAxMainFlag113;
 const SiroArchive gAxFlag113 = {"SIRO", &sAxMainFlag113};
diff --git a/src/data/ornament/flag114.h b/src/data/ornament/flag114.h
index bdace10dd..f0adb5d54 100644
--- a/src/data/ornament/flag114.h
+++ b/src/data/ornament/flag114.h
@@ -1,4 +1,4 @@
-const RGB gFlag114Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag114.pmdpal") };
+const RGB_Struct gFlag114Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag114.pmdpal") };
 
 static const axmain sAxMainFlag114;
 const SiroArchive gAxFlag114 = {"SIRO", &sAxMainFlag114};
diff --git a/src/data/ornament/flag12.h b/src/data/ornament/flag12.h
index 886aeba42..8e6578323 100644
--- a/src/data/ornament/flag12.h
+++ b/src/data/ornament/flag12.h
@@ -1,4 +1,4 @@
-const RGB gFlag12Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag12.pmdpal") };
+const RGB_Struct gFlag12Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag12.pmdpal") };
 
 static const axmain sAxMainFlag12;
 const SiroArchive gAxFlag12 = {"SIRO", &sAxMainFlag12};
diff --git a/src/data/ornament/flag13.h b/src/data/ornament/flag13.h
index 263bf51f1..a0554741e 100644
--- a/src/data/ornament/flag13.h
+++ b/src/data/ornament/flag13.h
@@ -1,4 +1,4 @@
-const RGB gFlag13Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag13.pmdpal") };
+const RGB_Struct gFlag13Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag13.pmdpal") };
 
 static const axmain sAxMainFlag13;
 const SiroArchive gAxFlag13 = {"SIRO", &sAxMainFlag13};
diff --git a/src/data/ornament/flag14.h b/src/data/ornament/flag14.h
index 9fa7abe9a..d4b911ca7 100644
--- a/src/data/ornament/flag14.h
+++ b/src/data/ornament/flag14.h
@@ -1,4 +1,4 @@
-const RGB gFlag14Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag14.pmdpal") };
+const RGB_Struct gFlag14Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag14.pmdpal") };
 
 static const axmain sAxMainFlag14;
 const SiroArchive gAxFlag14 = {"SIRO", &sAxMainFlag14};
diff --git a/src/data/ornament/flag15.h b/src/data/ornament/flag15.h
index 37b2b4d62..a0cc1b522 100644
--- a/src/data/ornament/flag15.h
+++ b/src/data/ornament/flag15.h
@@ -1,4 +1,4 @@
-const RGB gFlag15Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag15.pmdpal") };
+const RGB_Struct gFlag15Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag15.pmdpal") };
 
 static const axmain sAxMainFlag15;
 const SiroArchive gAxFlag15 = {"SIRO", &sAxMainFlag15};
diff --git a/src/data/ornament/flag16.h b/src/data/ornament/flag16.h
index 774d598c0..63eea3de4 100644
--- a/src/data/ornament/flag16.h
+++ b/src/data/ornament/flag16.h
@@ -1,4 +1,4 @@
-const RGB gFlag16Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag16.pmdpal") };
+const RGB_Struct gFlag16Pal[] = { INCBIN_RGB("graphics/ornament/pal/flag16.pmdpal") };
 
 static const axmain sAxMainFlag16;
 const SiroArchive gAxFlag16 = {"SIRO", &sAxMainFlag16};
diff --git a/src/data/ornament/stoneim.h b/src/data/ornament/stoneim.h
index 32de5fb09..480370ca1 100644
--- a/src/data/ornament/stoneim.h
+++ b/src/data/ornament/stoneim.h
@@ -1,2 +1,2 @@
-const RGB gStoneimPal[] = { INCBIN_RGB("graphics/ornament/pal/stoneim.pmdpal") };
+const RGB_Struct gStoneimPal[] = { INCBIN_RGB("graphics/ornament/pal/stoneim.pmdpal") };
 
diff --git a/src/data/ornament/titlebg.h b/src/data/ornament/titlebg.h
index 4844855be..e27cd9cf3 100644
--- a/src/data/ornament/titlebg.h
+++ b/src/data/ornament/titlebg.h
@@ -396,5 +396,5 @@ static const axmain sAxMainTitlebg1 = {
 	.spriteData = sAxSpritesTitlebg1,
 	.positions = NULL,
 };
-const RGB gTitlebgPal[] = { INCBIN_RGB("graphics/ornament/pal/titlebg.pmdpal") };
+const RGB_Struct gTitlebgPal[] = { INCBIN_RGB("graphics/ornament/pal/titlebg.pmdpal") };
 
diff --git a/src/data/ornament/titleop2.h b/src/data/ornament/titleop2.h
index c34b46fca..a1b3e01ff 100644
--- a/src/data/ornament/titleop2.h
+++ b/src/data/ornament/titleop2.h
@@ -92,4 +92,4 @@ static const axmain sAxMainTitleop2 = {
 	.spriteData = sAxSpritesTitleop2,
 	.positions = NULL,
 };
-const RGB gTitleopPal[] = { INCBIN_RGB("graphics/ornament/pal/titleop.pmdpal") };
+const RGB_Struct gTitleopPal[] = { INCBIN_RGB("graphics/ornament/pal/titleop.pmdpal") };
diff --git a/src/debug_field_map.c b/src/debug_field_map.c
index 583160b7b..50ef85498 100644
--- a/src/debug_field_map.c
+++ b/src/debug_field_map.c
@@ -40,14 +40,14 @@ UNUSED static void DebugMapViewer(void)
     ResetDialogueBox();
     sub_8005838(NULL, 0);
     AllocGroundMapAction();
-    while (1) {
+    while (TRUE) {
         bool8 quitMapView;
         PixelPos pixPos1, pixPos2;
         PixelPos boundary;
 
         if (DebugFieldMapWindow_Init()) {
             DebugFieldMapWindow_MoveMenuTo(mapId);
-            while (1) {
+            while (TRUE) {
                 sub_8005838(NULL, 0);
                 sub_8012A18(0);
                 switch (DebugFieldMapWindow_GetInput()) {
@@ -88,7 +88,7 @@ UNUSED static void DebugMapViewer(void)
         currPos.y = 0;
         sub_80999E8(4);
         quitMapView = FALSE;
-        while (1) {
+        while (TRUE) {
             xxx_call_update_bg_sound_input();
             ResetSprites(FALSE);
             if (quitMapView && !sub_8099B94())
diff --git a/src/debug_field_map_window.c b/src/debug_field_map_window.c
index cf6f66bdc..e11b285b3 100644
--- a/src/debug_field_map_window.c
+++ b/src/debug_field_map_window.c
@@ -20,10 +20,10 @@ static const WindowTemplate sDummyWinTemplate = WIN_TEMPLATE_DUMMY;
 static const WindowTemplate sDebugWindowTemplate = {
     .unk0 = 0,
     .type = WINDOW_TYPE_WITH_HEADER,
-    .pos = {2, 2},
+    .pos = { 2, 2 },
     .width = 24,
     .height = 17,
-    .unk10 = 17,
+    .heightInTiles = 17,
     .unk12 = 0,
     .header = NULL,
 };
diff --git a/src/dungeon_cleared_window.c b/src/dungeon_cleared_window.c
index 78070e513..2af97d541 100644
--- a/src/dungeon_cleared_window.c
+++ b/src/dungeon_cleared_window.c
@@ -19,10 +19,10 @@ void ShowDungeonClearedWindow(void)
         .id = {
             [0] = {
                 .type = WINDOW_TYPE_WITH_HEADER,
-                .pos = {4, 3},
+                .pos = { 4, 3 },
                 .width = 22,
                 .height = 14,
-                .unk10 = 14,
+                .heightInTiles = 14,
                 .unk12 = 0,
                 .header = &header,
             },
diff --git a/src/dungeon_cutscene.c b/src/dungeon_cutscene.c
index 65426ff35..f1d195919 100644
--- a/src/dungeon_cutscene.c
+++ b/src/dungeon_cutscene.c
@@ -48,9 +48,9 @@ struct RgbS16
 };
 
 extern OpenedFile *gDungeonPaletteFile;
-extern RGB gUnknown_202ECA4[];
+extern RGB_Struct gUnknown_202ECA4[33];
 
-extern bool8 sub_8004C00(unkStruct_202EE8C *a0, s32 a1, s32 a2, s32 brightness, const RGB *ramp, struct RgbS16 *a5);
+extern bool8 sub_8004C00(unkStruct_202EE8C *a0, s32 a1, s32 a2, s32 brightness, const RGB_Struct *ramp, struct RgbS16 *a5);
 extern void sub_8088EE8(void);
 extern void sub_8088848(void);
 extern void sub_808A718(void);
@@ -1217,8 +1217,8 @@ bool8 sub_8085B80(struct_8085B80 *a0)
 void SetDungeonBGColorRGB(s32 r, s32 g, s32 b, bool8 a3, bool8 a4)
 {
     s32 i, palIndex, n;
-    const RGB *colorPtr;
-    RGB color;
+    const RGB_Struct *colorPtr;
+    RGB_Struct color;
     struct RgbS16 colorS16;
 
     n = 160;
diff --git a/src/dungeon_cutscene_jirachi.c b/src/dungeon_cutscene_jirachi.c
index 008106fd5..2f64cdfec 100644
--- a/src/dungeon_cutscene_jirachi.c
+++ b/src/dungeon_cutscene_jirachi.c
@@ -203,7 +203,7 @@ static void JirachiWish_Async(void)
   DisplayDungeonDialogue_Async(&gUnknown_81056DC);
   DungeonWaitFrames_Async(10,0x46);
   while( 1 ) {
-    while (1) {
+    while (TRUE) {
         wishChoice = DisplayDungeonMenuMessage(NULL,gUnknown_8105798,gUnknown_810579C,0x705);
         if (wishChoice >= 1) break;
     }
@@ -419,7 +419,7 @@ static void JirachiDropInEffect(Entity *jirachiEntity)
   iVar1 = IntToF248(160);
   iVar2 = IntToF248(2);
   PlaySoundEffect(0x1f8);
-  while (1) {
+  while (TRUE) {
     iVar1 -= iVar2;
     if (F248LessThanInt(iVar1, 24)) {
       iVar2 = IntToF248(1);
diff --git a/src/dungeon_engine.c b/src/dungeon_engine.c
index 5344d2f55..a2eef83df 100644
--- a/src/dungeon_engine.c
+++ b/src/dungeon_engine.c
@@ -91,7 +91,7 @@ static bool8 RunLeaderTurn_Async(bool8 param_1)
     if (GetEntInfo(entity)->attacking)
         return FALSE;
 
-    while (1) {
+    while (TRUE) {
         entity = GetLeader();
         if (entity == NULL)
             return FALSE;
diff --git a/src/dungeon_generation.c b/src/dungeon_generation.c
index 77af4aa22..e3346a67d 100644
--- a/src/dungeon_generation.c
+++ b/src/dungeon_generation.c
@@ -223,7 +223,7 @@ void GenerateFloor(void)
 
                 // Attempt to generate random grid dimensions
                 attempts = 32;
-                while (1) {
+                while (TRUE) {
                     if (layout != LAYOUT_LARGE_0x8) {
                         gridSizeX = DungeonRandRange(2, 9);
                         gridSizeY = DungeonRandRange(2, 8);
@@ -1250,7 +1250,7 @@ static void GenerateExtraHallways(struct GridCell grid[GRID_CELL_LEN][GRID_CELL_
 
         roomId = GetTile(currX, currY)->room;
 		// Walk in the random direction until out of the room
-		while (1) {
+		while (TRUE) {
             if (roomId != GetTile(currX, currY)->room)
                 break;
             // gAdjacentTileOffsets gives us the proper (x,y) offset to move one tile in the given direction.
@@ -1259,7 +1259,7 @@ static void GenerateExtraHallways(struct GridCell grid[GRID_CELL_LEN][GRID_CELL_
 		}
 
 		// Keep walking until an obstacle is encountered
-		while (1) {
+		while (TRUE) {
             if (GetTerrainType(GetTile(currX, currY)) != TERRAIN_TYPE_NORMAL)
                 break;
 
@@ -1796,7 +1796,7 @@ static void AssignGridCellConnections(struct GridCell grid[GRID_CELL_LEN][GRID_C
 
 		// Make sure our cardinalDirection isn't going into a border
 		// If so, rotate counterclockwise
-		while (1) {
+		while (TRUE) {
             bool8 notOk = FALSE;
             switch (cardinalDirection & CARDINAL_DIRECTION_MASK) {
             	case CARDINAL_DIR_RIGHT:
@@ -1870,7 +1870,7 @@ static void AssignGridCellConnections(struct GridCell grid[GRID_CELL_LEN][GRID_C
         return;
 
     // No dead ends, add some extra connections!
-    while (1) {
+    while (TRUE) {
         bool8 more = FALSE;
 
         // Locate potential dead ends
@@ -3573,13 +3573,13 @@ static void GenerateMaze(struct GridCell *gridCell, bool8 useSecondaryTerrain)
  */
 static void GenerateMazeLine(s32 x0, s32 y0, s32 xMin, s32 yMin, s32 xMax, s32 yMax, bool8 useSecondaryTerrain, u32 roomIndex)
 {
-	while (1) {
+	while (TRUE) {
 		s32 direction = DungeonRandInt(NUM_CARDINAL_DIRECTIONS);
         s32 i = 0;
 
 		SetTerrainObstacleChecked(GetTileMut(x0, y0), useSecondaryTerrain, roomIndex);
 
-        while (1) {
+        while (TRUE) {
             s32 offsetX, offsetY;
             s32 posX, posY;
 
@@ -4646,7 +4646,7 @@ static void GenerateSecondaryTerrainFormations(u32 flag, FloorProperties *floorP
 		x = DungeonRandRange(2, DUNGEON_MAX_SIZE_X - 2);
 		dirX = 0;
 
-		while (1) {
+		while (TRUE) {
             // Fill in tiles in chunks of size 2-7 before changing the flow direction
             numTilesFill = DungeonRandInt(6) + 2;
             while (numTilesFill != 0) {
@@ -5631,7 +5631,7 @@ bool8 StairsAlwaysReachable(s32 stairsX, s32 stairsY, bool8 markUnreachable)
 
 	// Uses a semi-BFS starting from the stairs until all reachable tiles
 	// have been visited
-	while (1) {
+	while (TRUE) {
         s32 checked = 0;
 		sNumTilesReachableFromStairs += 1;
 
diff --git a/src/dungeon_item_action.c b/src/dungeon_item_action.c
index 7361c270d..32991adcc 100644
--- a/src/dungeon_item_action.c
+++ b/src/dungeon_item_action.c
@@ -842,7 +842,7 @@ bool8 HandleLinkBoxAction(Entity *entity, Item *item)
     }
 
     originalAction = *entityActionPtr;
-    while (1) {
+    while (TRUE) {
         ClearMonsterActionFields(entityActionPtr);
         if (ShowDungeonMovesMenu(entity2,1,0,0,1)) {
             if (!ret)
diff --git a/src/dungeon_items.c b/src/dungeon_items.c
index 684a47c3a..07c46294e 100644
--- a/src/dungeon_items.c
+++ b/src/dungeon_items.c
@@ -475,7 +475,7 @@ void SpawnDroppedItem(Entity *entity1, Entity *entity2, Item *item, bool8 a3, Du
         i = 1;
     }
 
-    while (1) {
+    while (TRUE) {
         if (gUnknown_80F4468[i].x == 99) {
             var_24 = FALSE;
             break;
diff --git a/src/dungeon_jobs.c b/src/dungeon_jobs.c
index 4a5830482..84581c485 100644
--- a/src/dungeon_jobs.c
+++ b/src/dungeon_jobs.c
@@ -128,7 +128,7 @@ void sub_8084448(Entity *pokemon)
     sub_8042A34(&pokemon->pos);
     HandleFaint_Async(pokemon,DUNGEON_EXIT_DELETED_FOR_EVENT,0);
     sub_804178C_Async(1);
-    while(1) {
+    while (TRUE) {
         if (DisplayDungeonYesNoMessage_Async(0,str,1) == 1) {
             if (DisplayDungeonYesNoMessage_Async(0,gUnknown_80FA394,0) == 1) {
                 gDungeon->unk4 = 1;
@@ -188,7 +188,7 @@ void sub_80845E0(Entity *pokemon)
     HandleFaint_Async(pokemon,DUNGEON_EXIT_DELETED_FOR_EVENT,0);
     HandleFaint_Async(entity,DUNGEON_EXIT_DELETED_FOR_EVENT,0);
     sub_804178C_Async(1);
-    while(1) {
+    while (TRUE) {
         if (DisplayDungeonYesNoMessage_Async(0,gUnknown_80FA4D8,1) == 1) {
             if (DisplayDungeonYesNoMessage_Async(0,gUnknown_80FA394,0) == 1) {
                 gDungeon->unk4 = 1;
diff --git a/src/dungeon_list_menu.c b/src/dungeon_list_menu.c
index ba61ffc82..cd737cdf1 100644
--- a/src/dungeon_list_menu.c
+++ b/src/dungeon_list_menu.c
@@ -31,10 +31,10 @@ static const WindowTemplate sWinTemplateDummy = WIN_TEMPLATE_DUMMY;
 static const WindowTemplate sWinTemplateNarrow = {
     .unk0 = 0,
     .type = WINDOW_TYPE_WITH_HEADER,
-    .pos = {2, 2},
+    .pos = { 2, 2 },
     .width = 14,
     .height = 14,
-    .unk10 = 14,
+    .heightInTiles = 14,
     .unk12 = 0,
     .header = NULL,
 };
@@ -42,10 +42,10 @@ static const WindowTemplate sWinTemplateNarrow = {
 static const WindowTemplate sWinTemplateWide = {
     .unk0 = 0,
     .type = WINDOW_TYPE_WITH_HEADER,
-    .pos = {2, 2},
+    .pos = { 2, 2 },
     .width = 16,
     .height = 16,
-    .unk10 = 16,
+    .heightInTiles = 16,
     .unk12 = 0,
     .header = NULL,
 };
diff --git a/src/dungeon_main.c b/src/dungeon_main.c
index 06e382c62..087540590 100644
--- a/src/dungeon_main.c
+++ b/src/dungeon_main.c
@@ -115,7 +115,7 @@ void DungeonHandlePlayerInput(void)
     }
 
     sub_806A914(1, 1, 1);
-    while (1) {
+    while (TRUE) {
         Entity *leader = GetLeader();
         EntityInfo *leaderInfo = GetEntInfo(leader);
 
@@ -366,7 +366,7 @@ void DungeonHandlePlayerInput(void)
                 UpdateMinimap();
                 SetBGOBJEnableFlags(0x1E);
                 DungeonWaitFrames_Async(0xA, 0x2F);
-                while (1) {
+                while (TRUE) {
                     DungeonRunFrameActions(0x2F);
                     if (gRealInputs.pressed & SELECT_BUTTON)
                         break;
@@ -1131,13 +1131,13 @@ static void ShowMainMenu(bool8 fromBPress, bool8 a1)
         PlayDungeonStartButtonSE();
     }
 
-    while (1) {
+    while (TRUE) {
         if (r10 < 0) {
             SetLeaderActionToNothing(TRUE);
             gTeamMenuChosenId = -1;
             PrintOnMainMenu(printAll);
             TryPointCameraToMonster(GetLeader(), 0);
-            while (1) {
+            while (TRUE) {
                 AddMenuCursorSprite(&gDungeonMenu);
                 DungeonRunFrameActions(0x1D);
                 if (gRealInputs.repeated & DPAD_DOWN) {
@@ -1290,7 +1290,7 @@ static void ShowMainMenu(bool8 fromBPress, bool8 a1)
                 }
             }
 
-            while (1) {
+            while (TRUE) {
                 s32 r9, teamMonsCount;
 
                 SetLeaderActionToNothing(0);
diff --git a/src/dungeon_map.c b/src/dungeon_map.c
index a99f45c2c..232cf4757 100644
--- a/src/dungeon_map.c
+++ b/src/dungeon_map.c
@@ -31,7 +31,7 @@ struct UnkStruct1
 struct DungeonMapGfx
 {
     struct UnkStruct1 *gfx;
-    RGB *pal;
+    RGB_Struct *pal;
 };
 
 enum {
diff --git a/src/dungeon_menu_items.c b/src/dungeon_menu_items.c
index 7a66ee6d8..e679554d3 100644
--- a/src/dungeon_menu_items.c
+++ b/src/dungeon_menu_items.c
@@ -85,10 +85,10 @@ bool8 ShowDungeonItemsMenu(Entity * a0, struct UnkMenuBitsStruct *a1)
             [0] =
             {
                 .type = WINDOW_TYPE_WITH_HEADER,
-                .pos = {2, 2},
-                .width = 0x12,
-                .height = 0x10,
-                .unk10 = 0x10,
+                .pos = { 2, 2 },
+                .width = 18,
+                .height = 16,
+                .heightInTiles = 16,
                 .header = &header,
             },
             [1] = WIN_TEMPLATE_DUMMY,
@@ -115,7 +115,7 @@ bool8 ShowDungeonItemsMenu(Entity * a0, struct UnkMenuBitsStruct *a1)
 
     r8 = 0;
     sUnknown_202F240 = 0;
-    while (1)
+    while (TRUE)
     {
         s32 id;
         Entity *r4;
@@ -157,7 +157,7 @@ bool8 ShowDungeonItemsMenu(Entity * a0, struct UnkMenuBitsStruct *a1)
         TryPointCameraToMonster(r4, 0);
         ChangeDungeonCameraPos(&r4->pos, 0, 1, 1);
 
-        while (1) {
+        while (TRUE) {
             AddMenuCursorSprite(&gDungeonMenu);
             DungeonRunFrameActions(0x14);
             if (!var_30) {
@@ -274,7 +274,7 @@ bool8 ShowDungeonItemsMenu(Entity * a0, struct UnkMenuBitsStruct *a1)
             SetSubMenuActions(a0);
             sub_8060800(&header, gDungeonMenu.currPage);
             CreateDungeonMenuSubWindow(&windows.id[0], 0x16);
-            while (1) {
+            while (TRUE) {
                 AddMenuCursorSprite(&gDungeonMenu);
                 DungeonRunFrameActions(0x14);
                 if (gRealInputs.repeated & DPAD_DOWN) {
@@ -348,10 +348,10 @@ static void PrintOnDungeonItemsMenu(s32 a0, Entity *a1, bool8 showWhichWindow, b
     Window *txtStrPtr;
     WindowTemplate whichWindow = {
         .type = WINDOW_TYPE_NORMAL,
-        .pos = {2, 4},
+        .pos = { 2, 4 },
         .width = 6,
         .height = 2,
-        .unk10 = 2,
+        .heightInTiles = 2,
         .unk12 = 0,
         .header = NULL,
     };
@@ -369,31 +369,35 @@ static void PrintOnDungeonItemsMenu(s32 a0, Entity *a1, bool8 showWhichWindow, b
     gDungeonMenu.unk14.x = 0;
     ResetTouchScreenMenuInput(&gDungeonMenu.touchScreen);
     gDungeon->unk181e8.unk18212 = 0;
+
     switch (sUnknown_202F248[a0]) {
         case 0:
-        case 1:
-            windows->id[0].unk10 = 0x10;
-            windows->id[0].height = 0x10;
-            header->width = 0xC;
-            gDungeonMenu.firstEntryY = 0x10;
-            gDungeonMenu.entriesPerPage = 0xA;
+        case 1: {
+            windows->id[0].heightInTiles = 16;
+            windows->id[0].height = 16;
+            header->width = 12;
+            gDungeonMenu.firstEntryY = 16;
+            gDungeonMenu.entriesPerPage = 10;
             gDungeon->unk181e8.unk18212 = 1;
             break;
-        case 2:
-            windows->id[0].unk10 = 4;
+        }
+        case 2: {
+            windows->id[0].heightInTiles = 4;
             windows->id[0].height = 4;
             header->width = 6;
-            gDungeonMenu.firstEntryY = 0x12;
+            gDungeonMenu.firstEntryY = 18;
             gDungeonMenu.entriesPerPage = 1;
             break;
+        }
         case 3:
-        default:
-            windows->id[0].unk10 = 4;
+        default: {
+            windows->id[0].heightInTiles = 4;
             windows->id[0].height = 4;
-            header->width = 0xC;
-            gDungeonMenu.firstEntryY = 0x12;
+            header->width = 12;
+            gDungeonMenu.firstEntryY = 18;
             gDungeonMenu.entriesPerPage = 1;
             break;
+        }
     }
 
     if (showWhichWindow) {
diff --git a/src/dungeon_menu_moves.c b/src/dungeon_menu_moves.c
index 1fc46e066..f314ce407 100644
--- a/src/dungeon_menu_moves.c
+++ b/src/dungeon_menu_moves.c
@@ -65,7 +65,7 @@ void ShowMovesFromTeamMenu(ActionContainer *a0)
     Entity *entityOrg = gDungeon->teamPokemon[id];
     Entity *entityNew = entityOrg;
 
-    while (1) {
+    while (TRUE) {
         s32 i, count, countUntilId;
 
         countUntilId = 0;
@@ -168,10 +168,10 @@ bool8 ShowDungeonMovesMenu(Entity * entity, bool8 addLinkOptions, bool8 addUseMo
         .id = {
             [0] = {
                 .type = WINDOW_TYPE_WITH_HEADER,
-                .pos = {2, 2},
+                .pos = { 2, 2 },
                 .width = 18,
                 .height = 16,
-                .unk10 = 16,
+                .heightInTiles = 16,
                 .unk12 = 0,
                 .header = &header,
             },
@@ -350,7 +350,7 @@ bool8 ShowDungeonMovesMenu(Entity * entity, bool8 addLinkOptions, bool8 addUseMo
 
         sub_8009524(2);
         CreateDungeonMenuSubWindow(&windows.id[0], 0x16);
-        while (1) {
+        while (TRUE) {
             AddMenuCursorSprite(&gDungeonMenu);
             DungeonRunFrameActions(0x1B);
             if (gRealInputs.repeated & DPAD_DOWN) {
@@ -401,10 +401,10 @@ static void ShowMovesMenuWindows(Entity *entity, EntityInfo *entInfo, bool8 redC
     s32 i, movesCount;
     WindowTemplate windowNew = {
         .type = WINDOW_TYPE_NORMAL,
-        .pos = {2, 14},
+        .pos = { 2, 14 },
         .width = 26,
         .height = 3,
-        .unk10 = 3,
+        .heightInTiles = 3,
         .unk12 = 0,
         .header = NULL,
     };
@@ -432,7 +432,7 @@ static void ShowMovesMenuWindows(Entity *entity, EntityInfo *entInfo, bool8 redC
     gDungeonMenu.windowId = 0;
     ResetTouchScreenMenuInput(&gDungeonMenu.touchScreen);
 
-    windows->id[0].height = windows->id[0].unk10 = CalcEntriesTotalHeight(4, DEFAULT_MENU_ENTRY_HEIGHT) + 2;
+    windows->id[0].height = windows->id[0].heightInTiles = CalcEntriesTotalHeight(4, DEFAULT_MENU_ENTRY_HEIGHT) + 2;
     header->width = 13;
     windows->id[0].pos.x = 2;
     windows->id[1] = windows->id[3];
@@ -600,7 +600,7 @@ static void ShowMovesInfoWindow(Move *moves, s32 firstMoveId, s32 movesCount)
     }
 
     currId = 0;
-    while (1) {
+    while (TRUE) {
         s32 statusesCount;
         s32 inputAction = 0;
 
@@ -623,7 +623,7 @@ static void ShowMovesInfoWindow(Move *moves, s32 firstMoveId, s32 movesCount)
         gDungeonMenu.entriesPerPage = 0;
         DungeonShowWindows(&windows, TRUE);
         statusesCount = unk_PrintMoveDescription(currId, &moves[firstMoveId + currId], 0, statuses);
-        while (1) {
+        while (TRUE) {
             if (statusesCount != 0) {
                 ShowStatusDescriptionMenuArrow();
             }
@@ -901,10 +901,10 @@ bool8 sub_8063E70(Entity *entity, Move *moves, bool8 showYesNoBox, bool8 allowBP
         .id = {
             [0] = {
                 .type = WINDOW_TYPE_WITH_HEADER,
-                .pos = {2, 2},
+                .pos = { 2, 2 },
                 .width = 18,
                 .height = 16,
-                .unk10 = 16,
+                .heightInTiles = 16,
                 .unk12 = 0,
                 .header = &header,
             },
@@ -916,12 +916,12 @@ bool8 sub_8063E70(Entity *entity, Move *moves, bool8 showYesNoBox, bool8 allowBP
     Move movesLocal[8];
 
     sChosenMoveSlotId = 0;
-    while (1) {
+    while (TRUE) {
         s32 inputAction;
         s32 yesNoAnswer;
 
         sub_8064228(entity, moves, &windows, &header);
-        while (1) {
+        while (TRUE) {
             AddMenuCursorSprite(&gDungeonMenu);
             DungeonRunFrameActions(0x1E);
             if (gRealInputs.repeated & DPAD_DOWN) {
@@ -977,7 +977,7 @@ bool8 sub_8063E70(Entity *entity, Move *moves, bool8 showYesNoBox, bool8 allowBP
             sub_8064310(moves);
             CreateDungeonMenuSubWindow(&windows.id[0], 22);
 
-            while (1) {
+            while (TRUE) {
                 AddMenuCursorSprite(&gDungeonMenu);
                 DungeonRunFrameActions(0x1B);
 
@@ -1108,7 +1108,7 @@ static void sub_8064228(Entity *entity, Move *moves, WindowTemplates *windows, W
     gDungeonMenu.unk14.x = 0;
     gDungeonMenu.windowId = 0;
     ResetTouchScreenMenuInput(&gDungeonMenu.touchScreen);
-    windows->id[0].height = windows->id[0].unk10 = CalcEntriesTotalHeight(count, DEFAULT_MENU_ENTRY_HEIGHT) + 2;
+    windows->id[0].height = windows->id[0].heightInTiles = CalcEntriesTotalHeight(count, DEFAULT_MENU_ENTRY_HEIGHT) + 2;
     header->width = 14;
     windows->id[0].pos.x = 2;
     windows->id[1] = windows->id[3];
diff --git a/src/dungeon_menu_others.c b/src/dungeon_menu_others.c
index 59c26df16..bfcfd37dd 100644
--- a/src/dungeon_menu_others.c
+++ b/src/dungeon_menu_others.c
@@ -75,11 +75,11 @@ void ShowDungeonOthersMenu(void)
 
     sOthersCursorId = 0;
     unkAlwaysFalse = FALSE;
-    while (1) {
+    while (TRUE) {
         bool8 bPress = FALSE;
 
         PrintOthersMenuOptions();
-        while (1) {
+        while (TRUE) {
             AddMenuCursorSprite(&gDungeonMenu);
             DungeonRunFrameActions(0x24);
             if (gRealInputs.repeated & DPAD_DOWN) {
@@ -152,11 +152,11 @@ enum {
 
 static void ShowGameOptionsMenu(void)
 {
-    while (1) {
+    while (TRUE) {
         bool8 bPress = FALSE;
 
         PrintGameOptions();
-        while (1) {
+        while (TRUE) {
             AddMenuCursorSprite(&gDungeonMenu);
             DungeonRunFrameActions(0x24);
             if (gRealInputs.repeated & DPAD_DOWN) {
@@ -220,12 +220,12 @@ static bool8 ShowDungeonOptions(void)
     bool8 bPress = FALSE;
 
     gDungeonMenu.menuIndex = 0;
-    while (1) {
+    while (TRUE) {
         bPress = FALSE;
         dpadMoved = FALSE;
 
         PrintDungeonOptions();
-        while (1) {
+        while (TRUE) {
             AddMenuCursorSprite(&gDungeonMenu);
             DungeonRunFrameActions(0x24);
             if (gRealInputs.repeated & DPAD_DOWN) {
@@ -281,12 +281,12 @@ static bool8 ShowOthersOptions(void)
     bool8 bPress = FALSE;
 
     gDungeonMenu.menuIndex = 0;
-    while (1) {
+    while (TRUE) {
         bPress = FALSE;
         dpadMoved = FALSE;
 
         PrintOthersOptions();
-        while (1) {
+        while (TRUE) {
             AddMenuCursorSprite(&gDungeonMenu);
             DungeonRunFrameActions(0x24);
             if (gRealInputs.repeated & DPAD_DOWN) {
@@ -368,11 +368,11 @@ static void AskToResetToDefault(void)
 static void ShowQuickSaveGiveUpMenu(void)
 {
     bool8 unkAlwaysFalse = FALSE;
-    while (1) {
+    while (TRUE) {
         bool8 bPress = FALSE;
 
         PrintQuickSaveMenuOptions();
-        while (1) {
+        while (TRUE) {
             AddMenuCursorSprite(&gDungeonMenu);
             DungeonRunFrameActions(0x24);
             if (gRealInputs.repeated & DPAD_DOWN) {
@@ -452,10 +452,10 @@ static void PrintOthersMenuOptions(void)
         .id = {
             [0] = {
                 .type = WINDOW_TYPE_WITH_HEADER,
-                .pos = {2, 2},
+                .pos = { 2, 2 },
                 .width = 18,
                 .height = 16,
-                .unk10 = 16,
+                .heightInTiles = 16,
                 .unk12 = 0,
                 .header = &header,
             },
@@ -482,7 +482,7 @@ static void PrintOthersMenuOptions(void)
     gDungeonMenu.windowId = 0;
     ResetTouchScreenMenuInput(&gDungeonMenu.touchScreen);
     windows.id[0].width = 18;
-    windows.id[0].height = windows.id[0].unk10 = CalcEntriesTotalHeight(optionsCount, DEFAULT_MENU_ENTRY_HEIGHT) + 2;
+    windows.id[0].height = windows.id[0].heightInTiles = CalcEntriesTotalHeight(optionsCount, DEFAULT_MENU_ENTRY_HEIGHT) + 2;
     header.width = 10;
     windows.id[0].pos.x = 2;
     DungeonShowWindows(&windows, TRUE);
@@ -515,10 +515,10 @@ static void PrintQuickSaveMenuOptions(void)
         .id = {
             [0] = {
                 .type = WINDOW_TYPE_WITH_HEADER,
-                .pos = {2, 2},
+                .pos = { 2, 2 },
                 .width = 18,
                 .height = 16,
-                .unk10 = 16,
+                .heightInTiles = 16,
                 .unk12 = 0,
                 .header = &header,
             },
@@ -545,7 +545,7 @@ static void PrintQuickSaveMenuOptions(void)
     gDungeonMenu.windowId = 0;
     ResetTouchScreenMenuInput(&gDungeonMenu.touchScreen);
     windows.id[0].width = 18;
-    windows.id[0].height = windows.id[0].unk10 = CalcEntriesTotalHeight(optionsCount, DEFAULT_MENU_ENTRY_HEIGHT) + 2;
+    windows.id[0].height = windows.id[0].heightInTiles = CalcEntriesTotalHeight(optionsCount, DEFAULT_MENU_ENTRY_HEIGHT) + 2;
     header.width = 10;
     windows.id[0].pos.x = 2;
     DungeonShowWindows(&windows, TRUE);
@@ -568,10 +568,10 @@ static void PrintGameOptions(void)
         .id = {
             [0] = {
                 .type = WINDOW_TYPE_WITH_HEADER,
-                .pos = {2, 2},
+                .pos = { 2, 2 },
                 .width = 12,
                 .height = 16,
-                .unk10 = 16,
+                .heightInTiles = 16,
                 .unk12 = 0,
                 .header = &header,
             },
@@ -598,7 +598,7 @@ static void PrintGameOptions(void)
     gDungeonMenu.windowId = 0;
     ResetTouchScreenMenuInput(&gDungeonMenu.touchScreen);
     windows.id[0].width = 12;
-    windows.id[0].height = windows.id[0].unk10 = CalcEntriesTotalHeight(optionsCount, DEFAULT_MENU_ENTRY_HEIGHT) + 2;
+    windows.id[0].height = windows.id[0].heightInTiles = CalcEntriesTotalHeight(optionsCount, DEFAULT_MENU_ENTRY_HEIGHT) + 2;
     header.width = 10;
     windows.id[0].pos.x = 2;
     DungeonShowWindows(&windows, TRUE);
@@ -623,10 +623,10 @@ static void PrintDungeonOptions(void)
         .id = {
             [0] = {
                 .type = WINDOW_TYPE_WITH_HEADER,
-                .pos = {2, 2},
+                .pos = { 2, 2 },
                 .width = 18,
                 .height = 16,
-                .unk10 = 16,
+                .heightInTiles = 16,
                 .unk12 = 0,
                 .header = &header,
             },
@@ -653,7 +653,7 @@ static void PrintDungeonOptions(void)
     gDungeonMenu.windowId = 0;
     ResetTouchScreenMenuInput(&gDungeonMenu.touchScreen);
     windows.id[0].width = 24;
-    windows.id[0].height = windows.id[0].unk10 = CalcEntriesTotalHeight(DUNGEON_OPTIONS_COUNT, DEFAULT_MENU_ENTRY_HEIGHT) + 2;
+    windows.id[0].height = windows.id[0].heightInTiles = CalcEntriesTotalHeight(DUNGEON_OPTIONS_COUNT, DEFAULT_MENU_ENTRY_HEIGHT) + 2;
     header.width = 10;
     windows.id[0].pos.x = 2;
     DungeonShowWindows(&windows, TRUE);
@@ -714,10 +714,10 @@ static void PrintOthersOptions(void)
         .id = {
             [0] = {
                 .type = WINDOW_TYPE_WITH_HEADER,
-                .pos = {2, 2},
+                .pos = { 2, 2 },
                 .width = 18,
                 .height = 16,
-                .unk10 = 16,
+                .heightInTiles = 16,
                 .unk12 = 0,
                 .header = &header,
             },
@@ -744,7 +744,7 @@ static void PrintOthersOptions(void)
     gDungeonMenu.windowId = 0;
     ResetTouchScreenMenuInput(&gDungeonMenu.touchScreen);
     windows.id[0].width = 24;
-    windows.id[0].height = windows.id[0].unk10 = CalcEntriesTotalHeight(OTHERS_OPTIONS_COUNT, DEFAULT_MENU_ENTRY_HEIGHT) + 2;
+    windows.id[0].height = windows.id[0].heightInTiles = CalcEntriesTotalHeight(OTHERS_OPTIONS_COUNT, DEFAULT_MENU_ENTRY_HEIGHT) + 2;
     header.width = 10;
     windows.id[0].pos.x = 2;
     DungeonShowWindows(&windows, TRUE);
@@ -843,11 +843,11 @@ static bool8 UnknownOthersOption(void)
 
 static void ShowHintsMenu(void)
 {
-    while (1) {
+    while (TRUE) {
         bool8 bPress = FALSE;
 
         PrintHintsMenu();
-        while (1) {
+        while (TRUE) {
             AddMenuCursorSprite(&gDungeonMenu);
             DungeonRunFrameActions(0x24);
             if (gRealInputs.repeated & DPAD_DOWN) {
@@ -887,10 +887,10 @@ static void PrintHintsMenu(void)
         .id = {
             [0] = {
                 .type = WINDOW_TYPE_WITH_HEADER,
-                .pos = {2, 2},
+                .pos = { 2, 2 },
                 .width = 12,
                 .height = 16,
-                .unk10 = 16,
+                .heightInTiles = 16,
                 .unk12 = 0,
                 .header = &header,
             },
@@ -916,7 +916,7 @@ static void PrintHintsMenu(void)
     gDungeonMenu.windowId = 0;
     ResetTouchScreenMenuInput(&gDungeonMenu.touchScreen);
     windows.id[0].width = 12;
-    windows.id[0].height = windows.id[0].unk10 = CalcEntriesTotalHeight(HINTS_COUNT_RED_VERSION, DEFAULT_MENU_ENTRY_HEIGHT) + 2;
+    windows.id[0].height = windows.id[0].heightInTiles = CalcEntriesTotalHeight(HINTS_COUNT_RED_VERSION, DEFAULT_MENU_ENTRY_HEIGHT) + 2;
     header.width = 10;
     windows.id[0].pos.x = 2;
     DungeonShowWindows(&windows, TRUE);
@@ -933,17 +933,17 @@ static void ShowChosenHintWindow(s32 hintId)
 {
     bool8 dsControls = (gGameOptionsRef->controls != CONTROLS_GBA);
 
-    while (1) {
+    while (TRUE) {
         bool8 dpadPressed = FALSE;
         WindowHeader header;
         WindowTemplates windows = {
             .id = {
                 [0] = {
                     .type = WINDOW_TYPE_WITH_HEADER,
-                    .pos = {2, 2},
+                    .pos = { 2, 2 },
                     .width = 12,
                     .height = 16,
-                    .unk10 = 16,
+                    .heightInTiles = 16,
                     .unk12 = 0,
                     .header = &header,
                 },
@@ -967,7 +967,7 @@ static void ShowChosenHintWindow(s32 hintId)
         gDungeonMenu.windowId = 0;
         ResetTouchScreenMenuInput(&gDungeonMenu.touchScreen);
         windows.id[0].width = 24;
-        windows.id[0].height = windows.id[0].unk10 = CalcEntriesTotalHeight(HINTS_COUNT, DEFAULT_MENU_ENTRY_HEIGHT) + 2;
+        windows.id[0].height = windows.id[0].heightInTiles = CalcEntriesTotalHeight(HINTS_COUNT, DEFAULT_MENU_ENTRY_HEIGHT) + 2;
         header.width = 10;
         windows.id[0].pos.x = 2;
         DungeonShowWindows(&windows, TRUE);
@@ -978,7 +978,7 @@ static void ShowChosenHintWindow(s32 hintId)
         PrintFormattedStringOnWindow(8, 16, gHintsDescriptions[dsControls][hintId], 0, '\0');
         sub_80073E0(0);
 
-        while (1) {
+        while (TRUE) {
             AddMenuCursorSprite(&gDungeonMenu);
             DungeonRunFrameActions(0x24);
             if ((gRealInputs.pressed & DPAD_RIGHT) || gDungeonMenu.touchScreen.dpad_right) {
diff --git a/src/dungeon_menu_recruitment.c b/src/dungeon_menu_recruitment.c
index 3da86c88f..e71a6001c 100644
--- a/src/dungeon_menu_recruitment.c
+++ b/src/dungeon_menu_recruitment.c
@@ -51,10 +51,10 @@ static const WindowTemplates sRecruitmentSearchWindows = {
     .id = {
             [0] = {
                 .type = WINDOW_TYPE_WITH_HEADER,
-                .pos = {2, 2},
+                .pos = { 2, 2 },
                 .width = 18,
                 .height = 14,
-                .unk10 = 18,
+                .heightInTiles = 18,
                 .unk12 = 2,
                 .header = &sRecruitmentWindowHeader,
             },
@@ -80,7 +80,7 @@ void ShowRecruitmentSearchMenu(void)
         struct MonRecruitList tabsData[2];
 
         SetRecruitableMons(tabsData);
-        while (1) {
+        while (TRUE) {
             bool8 closeWindow = FALSE;
             struct MonRecruitList *currTabData = &tabsData[currTabId];
 
@@ -102,7 +102,7 @@ void ShowRecruitmentSearchMenu(void)
             gDungeonMenu.leftRightArrowsPos.x = (gWindows[0].x + 16) * 8;
             gDungeonMenu.leftRightArrowsPos.y = ((gWindows[0].y + 1) * 8) - 2;
 
-            while (1) {
+            while (TRUE) {
                 s32 touchScreenArrow;
                 bool8 scroll = FALSE;
 
diff --git a/src/dungeon_menu_stairs.c b/src/dungeon_menu_stairs.c
index 899cf8b6d..79937e4bd 100644
--- a/src/dungeon_menu_stairs.c
+++ b/src/dungeon_menu_stairs.c
@@ -29,17 +29,17 @@ static void ShowStairsDescription(DungeonPos *pos);
 // Pretty much a copy of ShowDungeonTileMenu
 void ShowDungeonStairsMenu(Entity *mon)
 {
-    while (1) {
+    while (TRUE) {
         s32 inputAction = 0;
         WindowHeader header;
         WindowTemplates windows = {
             .id = {
                 [0] = {
                     .type = WINDOW_TYPE_WITH_HEADER,
-                    .pos = {2, 2},
+                    .pos = { 2, 2 },
                     .width = 18,
                     .height = 4,
-                    .unk10 = 16,
+                    .heightInTiles = 16,
                     .unk12 = 0,
                     .header = &header,
                 },
@@ -57,7 +57,7 @@ void ShowDungeonStairsMenu(Entity *mon)
         gDungeonMenu.cursorArrowPos.y = 0;
         CreateDungeonMenuSubWindow(&windows.id[0], 22);
 
-        while (1) {
+        while (TRUE) {
             AddMenuCursorSprite(&gDungeonMenu);
             DungeonRunFrameActions(0x2E);
             if (gRealInputs.repeated & DPAD_DOWN) {
@@ -146,7 +146,7 @@ static void AddStairsSubMenuOptions(Entity *mon)
 // Again, almost identical to its Tile counterpart.
 static void ShowStairsDescription(DungeonPos *pos)
 {
-    while (1) {
+    while (TRUE) {
         u8 floorType;
         bool8 bPress;
         STATUSTEXTS(statuses);
@@ -156,10 +156,10 @@ static void ShowStairsDescription(DungeonPos *pos)
             .id = {
                 [0] = {
                     .type = WINDOW_TYPE_WITH_HEADER,
-                    .pos = {2, 2},
+                    .pos = { 2, 2 },
                     .width = 26,
                     .height = 12,
-                    .unk10 = 12,
+                    .heightInTiles = 12,
                     .unk12 = 0,
                     .header = &header,
                 },
@@ -183,7 +183,7 @@ static void ShowStairsDescription(DungeonPos *pos)
         PrintStringOnWindow(8, 24, gUnknown_80F7F70[floorType], 0, '\0');
         sub_80073E0(0);
         statusesCount = PrepareStatusStringArrays(gUnknown_80F7F70[floorType], statuses);
-        while (1) {
+        while (TRUE) {
             if (statusesCount != 0) {
                 ShowStatusDescriptionMenuArrow();
             }
@@ -205,7 +205,7 @@ static void ShowStairsDescription(DungeonPos *pos)
 
         for (i = 0; i < statusesCount; i++) {
             ShowStatusDescriptionMenu(statuses[i], &menuSub);
-            while (1) {
+            while (TRUE) {
                 if (i < statusesCount - 1) {
                     ShowStatusDescriptionMenuArrow();
                 }
diff --git a/src/dungeon_menu_team.c b/src/dungeon_menu_team.c
index 016c3f590..be82ea671 100644
--- a/src/dungeon_menu_team.c
+++ b/src/dungeon_menu_team.c
@@ -83,10 +83,10 @@ bool8 ShowDungeonTeamMenu(Entity *a0)
         .id = {
             [0] = {
                 .type = WINDOW_TYPE_WITH_HEADER,
-                .pos = {2, 2},
+                .pos = { 2, 2 },
                 .width = 14,
                 .height = 16,
-                .unk10 = 16,
+                .heightInTiles = 16,
                 .unk12 = 0,
                 .header = &sTeamWindowHeader,
             },
@@ -108,14 +108,14 @@ bool8 ShowDungeonTeamMenu(Entity *a0)
         windows.id[0].pos.y++;
     }
 
-    while (1) {
+    while (TRUE) {
         s32 id;
         bool32 r4;
 
         ret = FALSE;
         PrintOnDungeonTeamMenu(&sp, &windows, TRUE);
         r10 = FALSE;
-        while (1) {
+        while (TRUE) {
             s32 id = sp.unk4[gDungeonMenu.menuIndex];
             if (id >= 0) {
                 Entity *teamMon = gDungeon->teamPokemon[id];
@@ -182,7 +182,7 @@ bool8 ShowDungeonTeamMenu(Entity *a0)
         }
 
         CreateDungeonMenuSubWindow(&windows.id[0], 0x12);
-        while (1) {
+        while (TRUE) {
             AddMenuCursorSprite(&gDungeonMenu);
             DungeonRunFrameActions(0x1B);
             if (gRealInputs.repeated & DPAD_DOWN) {
@@ -278,7 +278,7 @@ static void PrintOnDungeonTeamMenu(struct UnkFieldTeamMenuStruct *a0, WindowTemp
     if (withHeader) {
         height += 2;
     }
-    windows->id[0].unk10 = height;
+    windows->id[0].heightInTiles = height;
     windows->id[0].height = height;
     sTeamWindowHeader.width = 8;
     if (a2) {
@@ -415,10 +415,10 @@ void ShowDungeonTacticsMenu(ActionContainer *a0)
         .id = {
             [0] = {
                 .type = WINDOW_TYPE_WITH_HEADER,
-                .pos = {2, 2},
+                .pos = { 2, 2 },
                 .width = 18,
                 .height = 14,
-                .unk10 = 18,
+                .heightInTiles = 18,
                 .unk12 = 2,
                 .header = &sTeamWindowHeader,
             },
@@ -437,7 +437,7 @@ void ShowDungeonTacticsMenu(ActionContainer *a0)
     monInfo = GetEntInfo(teamMon);
     menuIndex = 0;
     scrollFirstId = 0;
-    while (1) {
+    while (TRUE) {
         s32 i;
         bool32 addCursor = TRUE;
         bool32 loopBreak = FALSE;
@@ -465,7 +465,7 @@ void ShowDungeonTacticsMenu(ActionContainer *a0)
         ResetTouchScreenMenuInput(&gDungeonMenu.touchScreen);
         sub_80137B0(&gDungeonMenu, 0);
         gDungeonMenu.menuIndex = menuIndex;
-        while (1) {
+        while (TRUE) {
             s32 i;
 
             AddMenuCursorSprite(&gDungeonMenu);
@@ -528,7 +528,7 @@ void ShowDungeonTacticsMenu(ActionContainer *a0)
                     SetActionUnusableInDungeonSubMenu(0x2F);
                 }
                 CreateDungeonMenuSubWindow(&windows.id[0], 0x16);
-                while (1) {
+                while (TRUE) {
                     changed = FALSE;
                     AddMenuCursorSprite(&gDungeonMenu);
                     DungeonRunFrameActions(0x3D);
@@ -640,10 +640,10 @@ void ShowDungeonSummaryOrIQMenu(ActionContainer *a0, bool8 showIq)
         .id = {
             [0] = {
                 .type = WINDOW_TYPE_WITH_HEADER,
-                .pos = {2, 2},
+                .pos = { 2, 2 },
                 .width = 18,
                 .height = 14,
-                .unk10 = 18,
+                .heightInTiles = 18,
                 .unk12 = 2,
                 .header = &sTeamWindowHeader,
             },
@@ -695,7 +695,7 @@ void ShowDungeonSummaryOrIQMenu(ActionContainer *a0, bool8 showIq)
     monSummaryInfo.unk56 = 0;
     gDungeonMenu.menuIndex = 0;
 
-    while (1) {
+    while (TRUE) {
         bool8 loopBreak = FALSE;
         bool8 hasIqSkills = FALSE;
         bool8 hasStatusProblems = FALSE;
@@ -757,7 +757,7 @@ void ShowDungeonSummaryOrIQMenu(ActionContainer *a0, bool8 showIq)
             gDungeonMenu.menuIndex = r8;
         }
 
-        while (1) {
+        while (TRUE) {
             s32 touchScreenArrow;
             bool8 downArrowShown, upArrowShown;
 
@@ -973,7 +973,7 @@ void ShowDungeonSummaryOrIQMenu(ActionContainer *a0, bool8 showIq)
                     PlayDungeonConfirmationSE();
                     AddActionToDungeonSubMenu(0xC, 0);
                     CreateDungeonMenuSubWindow(&windows.id[0], 0x16);
-                    while (1) {
+                    while (TRUE) {
                         AddMenuCursorSprite(&gDungeonMenu);
                         DungeonRunFrameActions(0x1C);
                         if (gRealInputs.repeated & DPAD_DOWN) {
@@ -1013,7 +1013,7 @@ void ShowDungeonSummaryOrIQMenu(ActionContainer *a0, bool8 showIq)
                         SetActionUnusableInDungeonSubMenu(0x28);
                     }
                     CreateDungeonMenuSubWindow(&windows.id[0], 0x16);
-                    while (1) {
+                    while (TRUE) {
                         AddMenuCursorSprite(&gDungeonMenu);
                         DungeonRunFrameActions(0x1C);
                         if (gRealInputs.repeated & DPAD_DOWN) {
@@ -1162,7 +1162,7 @@ void ShowStatusesDescriptionMenu(s32 count, STATUSTEXTS(statuses))
     ResetTouchScreenMenuInput(&menuSub);
     for (i = 0; i < count; i++) {
         ShowStatusDescriptionMenu(statuses[i], &menuSub);
-        while (1) {
+        while (TRUE) {
             if (i < count - 1) {
                 ShowStatusDescriptionMenuArrow();
             }
@@ -1187,7 +1187,7 @@ static void ShowIqDescriptionWindow(u8 iqSkillId)
     WindowHeader header;
     STATUSTEXTS(result);
 
-    while (1) {
+    while (TRUE) {
         s32 count;
         bool8 bPress;
 
@@ -1206,7 +1206,7 @@ static void ShowIqDescriptionWindow(u8 iqSkillId)
         PrintFormattedStringOnWindow(8, 16, GetIQSkillDescription(iqSkillId), 0, '\0');
         sub_80073E0(0);
         count = PrepareStatusStringArrays(GetIQSkillDescription(iqSkillId), result);
-        while (1) {
+        while (TRUE) {
             if (count != 0) {
                 ShowStatusDescriptionMenuArrow();
             }
@@ -1259,7 +1259,7 @@ static void ShowTacticDescriptionWindow(u8 tacticId)
         PrintFormattedStringOnWindow(8, 16, GetTacticsDescription(tacticId), 0, '\0');
         sub_80073E0(0);
         count = PrepareStatusStringArrays(GetTacticsDescription(tacticId), result);
-        while (1) {
+        while (TRUE) {
             if (count != 0) {
                 ShowStatusDescriptionMenuArrow();
             }
@@ -1295,10 +1295,10 @@ static void ShowStatusInfoWindow(s32 statusId)
         .id = {
             [0] = {
                 .type = WINDOW_TYPE_WITH_HEADER,
-                .pos = {2, 2},
+                .pos = { 2, 2 },
                 .width = 26,
                 .height = 12,
-                .unk10 = 12,
+                .heightInTiles = 12,
                 .unk12 = 0,
                 .header = &header,
             },
@@ -1321,7 +1321,7 @@ static void ShowStatusInfoWindow(s32 statusId)
     PrintFormattedStringOnWindow(8, 16, sub_808E51C(statusId), 0, '\0');
     sub_80073E0(0);
 
-    while (1) {
+    while (TRUE) {
         GetTouchScreenMenuInput(&menuSub, 0);
         DungeonRunFrameActions(22);
         if ((gRealInputs.pressed & A_BUTTON) || menuSub.a_button) {
@@ -1340,19 +1340,19 @@ static void ShowStatusInfoWindow(s32 statusId)
 static const WindowHeader sBottomWindowHeader = {1, 0, 15, 0};
 static const WindowTemplate sMovesSubMenu = {
     .type = WINDOW_TYPE_WITH_HEADER,
-    .pos = {2, 10},
+    .pos = { 2, 10 },
     .width = 18,
     .height = 8,
-    .unk10 = 8,
+    .heightInTiles = 8,
     .unk12 = 0,
     .header = &sBottomWindowHeader,
 };
 static const WindowTemplate sItemSubMenu = {
     .type = WINDOW_TYPE_WITH_HEADER,
-    .pos = {2, 10},
+    .pos = { 2, 10 },
     .width = 18,
     .height = 4,
-    .unk10 = 4,
+    .heightInTiles = 4,
     .unk12 = 0,
     .header = &sBottomWindowHeader,
 };
@@ -1364,19 +1364,19 @@ Entity *ShowDungeonToWhichMonMenu(s32 *teamId, s32 caseId)
         .id = {
             [0] = {
                 .type = WINDOW_TYPE_NORMAL, // Since the window has a header, it should probably be WINDOW_TYPE_WTIH_HEADER.
-                .pos = {14, 2},
+                .pos = { 14, 2 },
                 .width = 14,
                 .height = 16,
-                .unk10 = 16,
+                .heightInTiles = 16,
                 .unk12 = 0,
                 .header = &sTeamWindowHeader,
             },
             [1] = {
                 .type = WINDOW_TYPE_NORMAL,
-                .pos = {2, 2},
+                .pos = { 2, 2 },
                 .width = 10,
                 .height = 2,
-                .unk10 = 2,
+                .heightInTiles = 2,
                 .unk12 = 0,
                 .header = NULL,
             },
@@ -1404,7 +1404,7 @@ Entity *ShowDungeonToWhichMonMenu(s32 *teamId, s32 caseId)
     sub_80073E0(1);
     prevId = -985; // Magic number or does it actually mean anything?
 
-    while (1) {
+    while (TRUE) {
         currId = unkStruct.unk4[gDungeonMenu.menuIndex];
 
         if (currId >= 0) {
diff --git a/src/dungeon_menu_tile.c b/src/dungeon_menu_tile.c
index 7e37fbdce..b76bfab74 100644
--- a/src/dungeon_menu_tile.c
+++ b/src/dungeon_menu_tile.c
@@ -27,17 +27,17 @@ static void ShowTileDescription(DungeonPos *pos);
 
 void ShowDungeonTileMenu(Entity *mon)
 {
-    while (1) {
+    while (TRUE) {
         s32 inputAction = 0;
         WindowHeader header;
         WindowTemplates windows = {
             .id = {
                 [0] = {
                     .type = WINDOW_TYPE_WITH_HEADER,
-                    .pos = {2, 2},
+                    .pos = { 2, 2 },
                     .width = 18,
                     .height = 4,
-                    .unk10 = 16,
+                    .heightInTiles = 16,
                     .unk12 = 0,
                     .header = &header,
                 },
@@ -55,7 +55,7 @@ void ShowDungeonTileMenu(Entity *mon)
         gDungeonMenu.cursorArrowPos.y = 0;
         CreateDungeonMenuSubWindow(&windows.id[0], 22);
 
-        while (1) {
+        while (TRUE) {
             AddMenuCursorSprite(&gDungeonMenu);
             DungeonRunFrameActions(0x2D);
             if (gRealInputs.repeated & DPAD_DOWN) {
@@ -137,7 +137,7 @@ static void AddTileSubMenuOptions(Entity *mon)
 
 static void ShowTileDescription(DungeonPos *pos)
 {
-    while (1) {
+    while (TRUE) {
         const Tile *tile;
         Entity *object;
         Trap *trap;
@@ -149,10 +149,10 @@ static void ShowTileDescription(DungeonPos *pos)
             .id = {
                 [0] = {
                     .type = WINDOW_TYPE_WITH_HEADER,
-                    .pos = {2, 2},
+                    .pos = { 2, 2 },
                     .width = 26,
                     .height = 12,
-                    .unk10 = 12,
+                    .heightInTiles = 12,
                     .unk12 = 0,
                     .header = &header,
                 },
@@ -185,7 +185,7 @@ static void ShowTileDescription(DungeonPos *pos)
         PrintStringOnWindow(8, 24, gTrapDescriptions[trap->id], 0, '\0');
         sub_80073E0(0);
         statusesCount = PrepareStatusStringArrays(gTrapDescriptions[trap->id], statuses);
-        while (1) {
+        while (TRUE) {
             if (statusesCount != 0) {
                 ShowStatusDescriptionMenuArrow();
             }
@@ -207,7 +207,7 @@ static void ShowTileDescription(DungeonPos *pos)
 
         for (i = 0; i < statusesCount; i++) {
             ShowStatusDescriptionMenu(statuses[i], &menuSub);
-            while (1) {
+            while (TRUE) {
                 if (i < statusesCount - 1) {
                     ShowStatusDescriptionMenuArrow();
                 }
diff --git a/src/dungeon_message.c b/src/dungeon_message.c
index d9e8f6558..8da0e6852 100644
--- a/src/dungeon_message.c
+++ b/src/dungeon_message.c
@@ -229,7 +229,7 @@ void xxx_draw_string_80524F0(void)
                     AddDoubleUnderScoreHighlight(0, 0, strPtr->unk1C066 - 1, 0xE0, 7);
                 }
 
-                while (1) {
+                while (TRUE) {
                     txtPtr = HandleSpecialCharFormat(txtPtr, &sp);
                     if (*txtPtr == '\0' || *txtPtr == '\r' || *txtPtr == '\n')
                         break;
@@ -426,7 +426,7 @@ void DisplayDungeonDialogue_Async(const struct DungeonDialogueStruct *dialogueIn
         InlineStrcpy(gSpeakerNameBuffer, _("{COLOR YELLOW}{SPEECH_BUBBLE}{RESET}"));
     }
 
-    while (1) {
+    while (TRUE) {
         if (dialogueInfo->allowType == DIALOGUE_ALLOW_ALL)
             break;
         if (dialogueInfo->allowType == DIALOGUE_ONLY_SQUIRTLE_TOTODILE   && (dialogueMonId == MONSTER_SQUIRTLE || dialogueMonId == MONSTER_TOTODILE))
@@ -682,7 +682,7 @@ void sub_8052FB8(const u8 *str)
 
     CreateMenuDialogueBoxAndPortrait(str, 0, 0, NULL, NULL, 2, 0, NULL, 0x30);
     r9 = 0;
-    while (1) {
+    while (TRUE) {
         if (r8 < 62) {
             r8++;
             for (j = 0; j < 8; j++) {
diff --git a/src/dungeon_message_log.c b/src/dungeon_message_log.c
index d0cc19949..91b37b6cd 100644
--- a/src/dungeon_message_log.c
+++ b/src/dungeon_message_log.c
@@ -94,7 +94,7 @@ bool32 DisplayMessageLog(void)
     sMessageLogFlags = 0;
     PutStringsOnMessageLog();
 
-    while (1) {
+    while (TRUE) {
         s32 touchScreenArrow;
         bool32 scroll = FALSE;
 
@@ -170,7 +170,7 @@ static bool8 TryScrollLogUp(s32 touchScreenArrow)
     s32 y;
     s32 arrId;
 
-    while (1)
+    while (TRUE)
     {
         arrId = gDungeon->unk16 + sMessageLogCursor;
         y = 2;
@@ -221,7 +221,7 @@ static bool8 TryScrollLogDown(s32 touchScreenArrow)
     s32 y;
     s32 arrId;
 
-    while (1)
+    while (TRUE)
     {
         arrId = gDungeon->unk16 + sMessageLogCursor;
         y = 128;
diff --git a/src/dungeon_misc.c b/src/dungeon_misc.c
index 727e706df..8a63b3ff0 100644
--- a/src/dungeon_misc.c
+++ b/src/dungeon_misc.c
@@ -371,7 +371,7 @@ void sub_8068BDC(bool8 a0)
         else {
             WriteFriendAreaName(gFormatBuffer_Items[0], friendAreaId, FALSE);
             DisplayDungeonMessage_Async(NULL, gUnknown_80FE1A4, TRUE); // The Friend Area is full, a friend must be released.
-            while (1) {
+            while (TRUE) {
                 ShowRecruitReleaseMenu(friendAreaId, j - areaCapacity.maxPokemon, j, monPointers);
                 for (id = 0; id < j; id++) {
                     Pokemon *monPtr = monPointers[id];
diff --git a/src/dungeon_mon_spawn.c b/src/dungeon_mon_spawn.c
index 6d86d908e..ea3d9760c 100644
--- a/src/dungeon_mon_spawn.c
+++ b/src/dungeon_mon_spawn.c
@@ -292,7 +292,7 @@ void sub_806B168(void)
 
             skipSecondLoop = FALSE;
             j = 0;
-            while (1) {
+            while (TRUE) {
                 unkPosition = gUnknown_80F4598[j];
                 if (unkPosition.x == 99)
                     break;
@@ -310,7 +310,7 @@ void sub_806B168(void)
                 continue;
 
             j = 0;
-            while (1) {
+            while (TRUE) {
                 unkPosition = gUnknown_80F4598[j];
                 if (unkPosition.x == 99)
                     break;
@@ -371,7 +371,7 @@ void sub_806B404(void)
             currMonPtr->recruitedPokemonId = UNK_RECRUITED_POKEMON_ID_5AA5;
             skipNextLoop = FALSE;
             j = 0;
-            while (1) {
+            while (TRUE) {
                 unkPosition = gUnknown_80F4598[j];
                 if (unkPosition.x == 99)
                     break;
@@ -390,7 +390,7 @@ void sub_806B404(void)
 
             skipNextLoop = FALSE;
             j = 0;
-            while (1) {
+            while (TRUE) {
                 unkPosition = gUnknown_80F4598[j];
                 if (unkPosition.x == 99)
                     break;
diff --git a/src/dungeon_move_util.c b/src/dungeon_move_util.c
index 87dcc92dc..5884eede7 100644
--- a/src/dungeon_move_util.c
+++ b/src/dungeon_move_util.c
@@ -100,7 +100,7 @@ bool32 sub_8055A00(Entity *attacker, s32 firstMoveId, s32 var_34, s32 itemId, s3
     isLinkedMove = (j > 1);
     moveId = firstMoveId;
 
-    while (1) {
+    while (TRUE) {
         Move *currMove = &attackerInfo->moves.moves[moveId];
         if (!EntityIsValid(attacker) || IsFloorOver())
             break;
diff --git a/src/dungeon_name_banner.c b/src/dungeon_name_banner.c
index f6df7d8b9..7a4e7b57c 100644
--- a/src/dungeon_name_banner.c
+++ b/src/dungeon_name_banner.c
@@ -41,7 +41,7 @@ struct DungeonNameFontFileData
 
 struct DungeonNamePaletteFileData
 {
-    RGB pal[16];
+    RGB_Struct pal[16];
 };
 
 void ShowDungeonNameBanner_Async(void)
diff --git a/src/dungeon_projectile_throw.c b/src/dungeon_projectile_throw.c
index 9821ea177..0eb7af0fe 100644
--- a/src/dungeon_projectile_throw.c
+++ b/src/dungeon_projectile_throw.c
@@ -65,7 +65,7 @@ void HandleStraightProjectileThrow(Entity *thrower, Item *item, DungeonPos *pos,
 
     SetUnk1C05E(TRUE);
 
-    while (1) {
+    while (TRUE) {
         s32 i;
         DungeonPos prevPos = projectile->pos;
 
diff --git a/src/dungeon_recruit_release_menu.c b/src/dungeon_recruit_release_menu.c
index 2e8005d0a..adc45d4bf 100644
--- a/src/dungeon_recruit_release_menu.c
+++ b/src/dungeon_recruit_release_menu.c
@@ -57,21 +57,21 @@ static const WindowTemplates sReleaseMenuWindowTemplates = {
         {
             .unk0 = 0,
             .type = WINDOW_TYPE_WITH_HEADER,
-            .pos = {0x02, 0x02},
-            .width = 0x11,
-            .height = 0x0E,
-            .unk10 = 0x12,
-            .unk12 = 0x02,
+            .pos = { 2, 2 },
+            .width = 17,
+            .height = 14,
+            .heightInTiles = 18,
+            .unk12 = 2,
             .header = &sReleaseMenuWinHeader
         },
         [1] =
         {
             .unk0 = 0,
             .type = WINDOW_TYPE_NORMAL,
-            .pos = {0x15, 0x04},
-            .width = 0x07,
-            .height = 0x04,
-            .unk10 = 0x04,
+            .pos = { 21, 4 },
+            .width = 7,
+            .height = 4,
+            .heightInTiles = 4,
             .unk12 = 0,
             .header = NULL
         },
@@ -92,11 +92,11 @@ void ShowRecruitReleaseMenu(u8 a0, s32 a1, s32 a2, Pokemon **a3)
         a3[i]->flags &= ~(POKEMON_FLAG_x8000);
     }
 
-    while (1) {
+    while (TRUE) {
         sub_8068310(a2, a3);
         if (gUnknown_202F310 >= a1)
             break;
-        while (1) {
+        while (TRUE) {
             s32 r7 = 0, r5 = 0;
 
             sReleaseMenuWinHeader.count = 1;
@@ -121,7 +121,7 @@ void ShowRecruitReleaseMenu(u8 a0, s32 a1, s32 a2, Pokemon **a3)
             gDungeonMenu.windowId = 0;
             ResetTouchScreenMenuInput(&gDungeonMenu.touchScreen);
             sub_80137B0(&gDungeonMenu, 0);
-            while (1) {
+            while (TRUE) {
                 s32 touchScreenArrow;
 
                 AddMenuCursorSprite(&gDungeonMenu);
@@ -270,7 +270,7 @@ void ShowRecruitReleaseMenu(u8 a0, s32 a1, s32 a2, Pokemon **a3)
                 sub_8045064();
                 CreateDungeonMenuSubWindow(&winTemplates.id[0], 0x15);
 
-                while (1) {
+                while (TRUE) {
                     AddMenuCursorSprite(&gDungeonMenu);
                     DungeonRunFrameActions(0x37);
 
@@ -383,13 +383,16 @@ static void ShowPokemonSummary(Pokemon *a0)
     winTemplates.id[0].type = WINDOW_TYPE_WITH_HEADER;
     winTemplates.id[0].pos.x = 2;
     winTemplates.id[0].pos.y = 2;
-    winTemplates.id[0].width = 0x12;
-    winTemplates.id[0].height = 0xE;
-    winTemplates.id[0].unk10 = 0x12;
+    winTemplates.id[0].width = 18;
+    winTemplates.id[0].height = 14;
+    winTemplates.id[0].heightInTiles = 18;
     winTemplates.id[0].unk12 = 2;
     winTemplates.id[0].header = &sReleaseMenuWinHeader;
+
     winTemplates.id[1].type = WINDOW_TYPE_NORMAL;
+
     winTemplates.id[2].type = WINDOW_TYPE_NORMAL;
+
     winTemplates.id[3].type = WINDOW_TYPE_NORMAL;
 
     r7 = 0;
@@ -397,7 +400,7 @@ static void ShowPokemonSummary(Pokemon *a0)
     unkStruct.unk56 = 0;
     gDungeonMenu.menuIndex = 0;
 
-    while (1) {
+    while (TRUE) {
         bool32 loopBreak = FALSE;
         s32 spF8[4] = {2, 3, 4, 5};
 
@@ -424,7 +427,7 @@ static void ShowPokemonSummary(Pokemon *a0)
         gDungeonMenu.leftRightArrowsPos.x = (gWindows[0].x + 15) * 8;
         gDungeonMenu.leftRightArrowsPos.y = ((gWindows[0].y + 1) * 8) - 2;
 
-        while (1) {
+        while (TRUE) {
             s32 r5;
 
             AddMenuCursorSprite(&gDungeonMenu);
diff --git a/src/dungeon_submenu.c b/src/dungeon_submenu.c
index cda890277..a0e5ec7de 100644
--- a/src/dungeon_submenu.c
+++ b/src/dungeon_submenu.c
@@ -19,11 +19,14 @@ void CreateDungeonMenuSubWindow(WindowTemplate *mainWindow, s32 subWindowX)
         .id = {
             [0] = WIN_TEMPLATE_DUMMY,
             [1] = {
+                .unk0 = 0,
                 .type = WINDOW_TYPE_NORMAL,
-                .pos = {22, 4},
+                .pos = { 22, 4 },
                 .width = 6,
                 .height = 4,
-                .unk10 = 4,
+                .heightInTiles = 4,
+                .unk12 = 0,
+                .header = NULL,
             },
             [2] = WIN_TEMPLATE_DUMMY,
             [3] = WIN_TEMPLATE_DUMMY,
@@ -49,7 +52,7 @@ void CreateDungeonMenuSubWindow(WindowTemplate *mainWindow, s32 subWindowX)
 
     windows.id[1].pos.x = subWindowX;
     windows.id[1].width = 28 - subWindowX;
-    windows.id[1].height = windows.id[1].unk10 = CalcEntriesTotalHeight(gDungeonMenu.entriesPerPage, 0);
+    windows.id[1].height = windows.id[1].heightInTiles = CalcEntriesTotalHeight(gDungeonMenu.entriesPerPage, 0);
     DungeonShowWindows(&windows, FALSE);
     sub_80137B0(&gDungeonMenu, windows.id[1].height * 8);
     sub_80073B8(1);
diff --git a/src/dungeon_vram.c b/src/dungeon_vram.c
index dc3d96722..26a9405fb 100644
--- a/src/dungeon_vram.c
+++ b/src/dungeon_vram.c
@@ -46,7 +46,7 @@ struct DungeonPalFile
 
 extern struct DungeonPalFile *gDungeonPaletteFile;
 extern struct DungeonPalFile *gUnknown_202EC94;
-extern RGB gUnknown_202ECA4[];
+extern RGB_Struct gUnknown_202ECA4[33];
 extern OpenedFile *gUnknown_202EC9C;
 
 static void sub_803E490(u32);
@@ -354,12 +354,12 @@ void sub_803E830(void)
     gUnknown_203B40D = 0;
 }
 
-static const RGB sBlackRgb = {0, 0, 0};
+static const RGB_Struct sBlackRgb = {0, 0, 0};
 
 void sub_803E874(bool8 r10, s32 r9)
 {
     s32 i, index, count;
-    const RGB *color;
+    const RGB_Struct *color;
 
     color = gDungeonPaletteFile->unk4;
     SetBGPaletteBufferColorRGB(0, &sBlackRgb, gDungeonBrightness, gDungeon->colorRamp);
@@ -412,7 +412,7 @@ void sub_803E874(bool8 r10, s32 r9)
 void BgColorCallNullsub4(void)
 {
     s32 i, index, count;
-    const RGB *color;
+    const RGB_Struct *color;
 
     color = ((struct DungeonPalFile*) gDungeon->paletFile)->unk4;
     index = 256;
@@ -427,7 +427,7 @@ void BgColorCallNullsub4(void)
 void sub_803EA10(void)
 {
     s32 i, index, count;
-    const RGB *color;
+    const RGB_Struct *color;
 
     color= gDungeonPaletteFile->unk4;
     SetBGPaletteBufferColorRGB(0, &sBlackRgb, gDungeonBrightness, gDungeon->colorRamp);
@@ -461,10 +461,10 @@ static const WindowTemplates gUnknown_80F62B0 =
     .id = {
         [0] = {
             .type = WINDOW_TYPE_0,
-            .pos = {2, 15},
+            .pos = { 2, 15 },
             .width = 26,
             .height = 5,
-            .unk10 = 7,
+            .heightInTiles = 7,
             .unk12 = 0,
             .header = NULL,
         },
@@ -479,10 +479,10 @@ static const WindowTemplates gUnknown_80F6310 =
     .id = {
         [0] = {
             .type = WINDOW_TYPE_NORMAL,
-            .pos = {2, 3},
+            .pos = { 2, 3 },
             .width = 6,
             .height = 7,
-            .unk10 = 7,
+            .heightInTiles = 7,
             .unk12 = 0,
             .header = NULL,
         },
@@ -497,28 +497,28 @@ static const WindowTemplates gUnknown_80F6370 =
     .id = {
         [0] = {
             .type = WINDOW_TYPE_NORMAL,
-            .pos = {2, 3},
+            .pos = { 2, 3 },
             .width = 6,
             .height = 7,
-            .unk10 = 7,
+            .heightInTiles = 7,
             .unk12 = 0,
             .header = NULL,
         },
         [1] = {
             .type = WINDOW_TYPE_NORMAL,
-            .pos = {10, 4},
+            .pos = { 10, 4 },
             .width = 17,
             .height = 2,
-            .unk10 = 2,
+            .heightInTiles = 2,
             .unk12 = 0,
             .header = NULL,
         },
         [2] = {
             .type = WINDOW_TYPE_NORMAL,
-            .pos = {2, 13},
+            .pos = { 2, 13 },
             .width = 26,
             .height = 6,
-            .unk10 = 6,
+            .heightInTiles = 6,
             .unk12 = 0,
             .header = NULL,
         },
@@ -531,10 +531,10 @@ static const WindowTemplates gUnknown_80F63D0 =
     .id = {
         [0] = {
             .type = WINDOW_TYPE_NORMAL,
-            .pos = {2, 3},
+            .pos = { 2, 3 },
             .width = 26,
             .height = 14,
-            .unk10 = 18,
+            .heightInTiles = 18,
             .unk12 = 2,
             .header = NULL,
         },
diff --git a/src/effect_main.c b/src/effect_main.c
index dd3e245ed..de4f96b00 100644
--- a/src/effect_main.c
+++ b/src/effect_main.c
@@ -81,7 +81,7 @@ extern s16 gUnknown_2026E4E;
 
 
 extern void sub_8009BE4(void);
-extern void sub_809971C(u16 a0, const RGB *a1, int a2);
+extern void sub_809971C(u16 a0, const RGB_Struct *a1, int a2);
 
 static s32 sub_800E900(s32 a0);
 static s32 sub_800E2C0(s32);
diff --git a/src/effect_sub_1.c b/src/effect_sub_1.c
index 1337f5b5b..76f761d4a 100644
--- a/src/effect_sub_1.c
+++ b/src/effect_sub_1.c
@@ -27,7 +27,7 @@ struct unkStruct_203B0D0_sub
     s32 unk14;
     s32 unk18;
     s32 unk1C;
-    const RGB *ramp;
+    const RGB_Struct *ramp;
 };
 
 struct unkStruct_203B0D0 {
@@ -38,7 +38,7 @@ struct unkStruct_203B0D0 {
 
 static EWRAM_INIT struct unkStruct_203B0D0 *gUnknown_203B0D0 = NULL;
 
-extern void sub_809971C(u16 a0, const RGB *a1, int a2);
+extern void sub_809971C(u16 a0, const RGB_Struct *a1, int a2);
 
 void sub_800ED38(s32 r0)
 {
@@ -197,7 +197,7 @@ void sub_800EF64(void)
                 sub_8005674(sub->fileData, sub->unk18);
                 switch (gUnknown_203B0D0->unk0) {
                     case 1: {
-                        const RGB *pal = sub->fileData->pal;
+                        const RGB_Struct *pal = sub->fileData->pal;
                         sub_809971C((sub->unkC + 16) * 16, pal, 0x10);
                         break;
                     }
diff --git a/src/friend_areas_map_util.c b/src/friend_areas_map_util.c
index ac3eeb9bd..53c1fa257 100644
--- a/src/friend_areas_map_util.c
+++ b/src/friend_areas_map_util.c
@@ -180,7 +180,7 @@ static bool8 FadeScreen(void)
 
     if (gFriendAreasMapPtr->brightness < 31) {
         s32 i;
-        RGB *color = (void *) gFriendAreasMapPtr->unk0[0]->data;
+        RGB_Struct *color = (void *)gFriendAreasMapPtr->unk0[0]->data;
 
         if (++gFriendAreasMapPtr->brightness >= 31) {
             gFriendAreasMapPtr->brightness = 31;
@@ -190,7 +190,7 @@ static bool8 FadeScreen(void)
             SetBGPaletteBufferColorRGB(i, color, gFriendAreasMapPtr->brightness, NULL);
         }
 
-        color = (void *) gFriendAreasMapPtr->unk0[1]->data;
+        color = (void *)gFriendAreasMapPtr->unk0[1]->data;
         for (i = 0; i < 240; color++, i++) {
             SetBGPaletteBufferColorRGB(i + 256, color, gFriendAreasMapPtr->brightness, NULL);
         }
@@ -259,17 +259,18 @@ void FriendAreasMap_PrintCurrAreaName(void)
     windows.id[0].pos.y = 2;
     windows.id[0].width = 21;
     windows.id[0].height = 2;
-    windows.id[0].unk10 = 2;
+    windows.id[0].heightInTiles = 2;
+
     windows.id[1].type = WINDOW_TYPE_NORMAL;
+
     windows.id[2].type = WINDOW_TYPE_NORMAL;
+
     windows.id[3].type = WINDOW_TYPE_NORMAL;
 
-    if (gFriendAreasMapPtr->monSpritePos.y - gFriendAreasMapPtr->bgPos.y <= 80) {
+    if (gFriendAreasMapPtr->monSpritePos.y - gFriendAreasMapPtr->bgPos.y <= 80)
         windows.id[0].pos.y = 17;
-    }
-    else {
+    else
         windows.id[0].pos.y = 1;
-    }
 
     ShowWindows(&windows, TRUE, TRUE);
     sub_80073B8(0);
@@ -296,7 +297,7 @@ void FriendAreasMap_PrintAvailableSubAreas(void)
                 .pos = {7, 2},
                 .width = 21,
                 .height = 2,
-                .unk10 = 2,
+                .heightInTiles = 2,
                 .header = &header,
             },
             [1] = WIN_TEMPLATE_DUMMY,
@@ -334,7 +335,7 @@ void FriendAreasMap_PrintAvailableSubAreas(void)
     menuInput->cursorArrowPos.y = 8;
     ResetTouchScreenMenuInput(&menuInput->touchScreen);
     var = CalcEntriesTotalHeight(menuInput->entriesPerPage, 0);
-    windows.id[0].unk10 = windows.id[0].height = var + 2;
+    windows.id[0].heightInTiles = windows.id[0].height = var + 2;
     sub_80137B0(menuInput, var * 8);
 
     ShowWindows(&windows, TRUE, TRUE);
diff --git a/src/friend_list.c b/src/friend_list.c
index 5f2c5d3c6..f7fdc25fd 100644
--- a/src/friend_list.c
+++ b/src/friend_list.c
@@ -38,10 +38,10 @@ static const WindowTemplate sDummyWinTemplate = WIN_TEMPLATE_DUMMY;
 static const WindowTemplate sUnknown_80DC968 = {
     .unk0 = 0,
     .type = WINDOW_TYPE_WITH_HEADER,
-    .pos = {2, 2},
+    .pos = { 2, 2 },
     .width = 15,
     .height = 14,
-    .unk10 = 14,
+    .heightInTiles = 14,
     .unk12 = 0,
     .header = NULL
 };
diff --git a/src/game_options.c b/src/game_options.c
index de390e08d..4d138409b 100644
--- a/src/game_options.c
+++ b/src/game_options.c
@@ -185,11 +185,11 @@ void ReadGameOptionsBits(DataSerializer *param_1)
 
 void SetWindowBGColor(void)
 {
-    struct RGB winColors[] = {
-        {0x20, 0x48, 0x68}, // Blue
-        {0x80, 0x38, 0x20}, // Red
-        {0x28, 0x80, 0x48}, // Green
-        {0x28, 0x80, 0x48} // Green
+    struct RGB_Struct winColors[4] = {
+        { .r = 0x20, .g = 0x48, .b = 0x68, .unk4 = 0x00}, // Blue
+        { .r = 0x80, .g = 0x38, .b = 0x20, .unk4 = 0x00}, // Red
+        { .r = 0x28, .g = 0x80, .b = 0x48, .unk4 = 0x00}, // Green
+        { .r = 0x28, .g = 0x80, .b = 0x48, .unk4 = 0x00} // Green
     };
 
     SetFontsBaseColor(winColors[gGameOptionsRef->windowColor & NUM_WINDOW_COLORS]);
diff --git a/src/graphics_memory.c b/src/graphics_memory.c
index ca79ce728..b8ec22716 100644
--- a/src/graphics_memory.c
+++ b/src/graphics_memory.c
@@ -24,7 +24,7 @@ struct MemCopyData
 
 #define MAX_MEM_COPIES 8
 
-EWRAM_DATA RGB gFontPalette[128] = {0};
+EWRAM_DATA RGB_Struct gFontPalette[128] = {0};
 static EWRAM_DATA bool8 sTilemapCopyScheduled[4] = {FALSE};
 static EWRAM_DATA s32 sNumMemCopies = 0;
 static EWRAM_DATA struct MemCopyData sMemCopies[MAX_MEM_COPIES] = {0};
@@ -40,7 +40,7 @@ void InitGraphics(void)
     s32 i;
     OpenedFile *file;
     u32 *dest;
-    const RGB *rgbColors;
+    const RGB_Struct *rgbColors;
     struct FontData *font;
     #ifdef NONMATCHING
     const FileArchive *sysFileArchieve;
@@ -81,7 +81,7 @@ void InitGraphics(void)
 
     InitFontPalette();
     file = OpenFileAndGetFileDataPtr("fontsppa", sysFileArchieve);
-    rgbColors = (RGB *)file->data;
+    rgbColors = (RGB_Struct *)file->data;
 
     for (i = 0; i < 16; rgbColors++, i++) {
         SetBGPaletteBufferColorArray(0x1F0 + i, rgbColors);
@@ -95,7 +95,7 @@ void InitFontPalette(void)
 {
     OpenedFile *fontpalFile;
     s32 i;
-    RGB *ptr;
+    RGB_Struct *ptr;
 
     fontpalFile = OpenFileAndGetFileDataPtr("fontpal", &gSystemFileArchive);
     CpuCopy(gFontPalette, fontpalFile->data, sizeof(gFontPalette));
@@ -212,7 +212,7 @@ void CopyBgTilemaps0And1(void)
     CpuCopy(BG_SCREEN_ADDR(13), gBgTilemaps[1], BG_SCREEN_SIZE);
 }
 
-void SetFontsBaseColor(RGB a0)
+void SetFontsBaseColor(RGB_Struct a0)
 {
     s32 i;
 
diff --git a/src/ground_script.c b/src/ground_script.c
index e5613b1c9..772e4d22b 100644
--- a/src/ground_script.c
+++ b/src/ground_script.c
@@ -3726,7 +3726,7 @@ static s32 sub_80A14E8(Action *action, u8 idx, u32 r2, s32 r3)
                 s32 r7 = 0x1A4;
                 s32 r6 = 0;
 
-                while (1)
+                while (TRUE)
                 {
                     s16 indexS16;
                     index = (s16)(index + 1);
diff --git a/src/items.c b/src/items.c
index d164cacd8..78b3b0727 100644
--- a/src/items.c
+++ b/src/items.c
@@ -539,7 +539,7 @@ void FillInventoryGaps(void)
     }
     slot_checking++;
     last_filled++;
-  } while (1);
+  } while (TRUE);
 
   // clear out the rest of the slots
   for (; last_filled < INVENTORY_SIZE; last_filled++) {
diff --git a/src/load_screen.c b/src/load_screen.c
index 817c6f2e9..e7af267d6 100644
--- a/src/load_screen.c
+++ b/src/load_screen.c
@@ -18,6 +18,7 @@
 #include "menu_input.h"
 #include "play_time.h"
 #include "pokemon.h"
+#include "rescue_team_info.h"
 #include "save.h"
 #include "string_format.h"
 #include "text_1.h"
@@ -25,199 +26,210 @@
 #include "text_3.h"
 #include "text_util.h"
 
+// Size: 0x8
+typedef struct ClmkFileData
+{
+    /* 0x0 */ /*const */u32 (*pics)[8 * 4];
+    /* 0x4 */ /*const */RGB_Struct (*palette)[16 * 4];
+} ClmkFileData;
+
+enum
+{
+    LEGEND_ICON_ZAPDOS,
+    LEGEND_ICON_MOLTRES,
+    LEGEND_ICON_ARTICUNO,
+    LEGEND_ICON_GROUDON,
+    LEGEND_ICON_RAYQUAZA,
+    LEGEND_ICON_KYOGRE,
+    LEGEND_ICON_MEW,
+    LEGEND_ICON_HO_OH,
+    LEGEND_ICON_CELEBI,
+    LEGEND_ICON_LUGIA,
+    LEGEND_ICON_MEWTWO,
+    LEGEND_ICON_DEOXYS,
+    NUM_LEGEND_ICONS
+};
+
 // Size: 0x27C
 struct LoadScreen
 {
     /* 0x000 */ u32 currMenu;
-    MenuStruct unk4[4];
-    WindowTemplates unk144;
-    /* 0x1A4 */ u8 formattedTeamName[0x24];
-    /* 0x1C8 */ u8 formattedPlayerName[0x24];
-    /* 0x1EC */ u8 formattedLocation[0x24];
-    /* 0x210 */ u8 formattedPlayTime[0x24];
-    /* 0x234 */ u8 formattedAdventures[0x24];
-    /* 0x258 */ u8 formattedHelperInfo[0x24];
+    /* 0x004 */ MenuStruct unk4[4];
+    /* 0x144 */ WindowTemplates unk144;
+    /* 0x1A4 */ u8 formattedTeamName[36];
+    /* 0x1C8 */ u8 formattedPlayerName[36];
+    /* 0x1EC */ u8 formattedLocation[36];
+    /* 0x210 */ u8 formattedPlayTime[36];
+    /* 0x234 */ u8 formattedAdventures[36];
+    /* 0x258 */ u8 formattedHelperInfo[36];
 };
 
-EWRAM_INIT struct LoadScreen *gLoadScreen = {NULL};
+EWRAM_INIT struct LoadScreen *gLoadScreen = { NULL };
 
 extern unkStruct_203B484 *gUnknown_203B484;
 
-u8 IsQuickSave(void);
-void DrawLoadScreenText(void);
-static void DrawQuestIcons(void);
-
-extern void sub_80920D8(u8 *);
-
-const WindowTemplate gUnknown_80E75F8 = {
-    0,
-    0x03,
-    0x00, 0x00,
-    0x00, 0x00,
-    0x00, 0x00,
-    NULL
-};
+const WindowTemplate gUnknown_80E75F8 = WIN_TEMPLATE_DUMMY;
 
 const WindowTemplate gUnknown_80E7610 = {
-    0,
-    0x03,
-    0x02, 0x02,
-    0x1A, 0x0B,
-    0x0B, 0x00,
-    NULL
+    .unk0 = 0,
+    .type = WINDOW_TYPE_NORMAL,
+    .pos = { 2, 2 },
+    .width = 26,
+    .height = 11,
+    .heightInTiles = 11,
+    .unk12 = 0,
+    .header = NULL
 };
 
-EWRAM_INIT MenuItem gUnknown_203B378[2] = {
-    [0] = {
-        .text = " ",
-        .menuAction = 5,
-    },
-    [1] = {
-        .text = NULL,
-        .menuAction = 3,
-    }
+static EWRAM_INIT MenuItem gUnknown_203B378[] = {
+    { " ", 5 },
+    { NULL, 3 },
 };
 
-EWRAM_INIT u32 gUnknown_203B388[12] = { 0xC, 0xC, 0xE, 0xE, 0xD, 0xE, 0xC, 0xD, 0xD, 0xB, 0xB, 0xB };
+static EWRAM_INIT u32 sLegendaryQuestIconPalNums[NUM_LEGEND_ICONS] = {
+    [LEGEND_ICON_ZAPDOS] =   12,
+    [LEGEND_ICON_MOLTRES] =  12,
+    [LEGEND_ICON_ARTICUNO] = 14,
+    [LEGEND_ICON_GROUDON] =  14,
+    [LEGEND_ICON_RAYQUAZA] = 13,
+    [LEGEND_ICON_KYOGRE] =   14,
+    [LEGEND_ICON_MEW] =      12,
+    [LEGEND_ICON_HO_OH] =    13,
+    [LEGEND_ICON_CELEBI] =   13,
+    [LEGEND_ICON_LUGIA] =    11,
+    [LEGEND_ICON_MEWTWO] =   11,
+    [LEGEND_ICON_DEOXYS] =   11,
+};
 
-static EWRAM_INIT u32 sLegendaryQuestIDs[12] = {
-    QUEST_LEGEND_ZAPDOS,
-    QUEST_LEGEND_MOLTRES,
-    QUEST_LEGEND_ARTICUNO,
-    QUEST_LEGEND_GROUDON,
-    QUEST_LEGEND_RAYQUAZA,
-    QUEST_LEGEND_KYOGRE,
-    QUEST_LEGEND_MEW,
-    QUEST_LEGEND_HO_OH,
-    QUEST_LEGEND_CELEBI,
-    QUEST_LEGEND_LUGIA,
-    QUEST_LEGEND_MEWTWO,
-    QUEST_LEGEND_DEOXYS,
+static EWRAM_INIT u32 sLegendaryQuestIDs[NUM_LEGEND_ICONS] = {
+    [LEGEND_ICON_ZAPDOS] =   QUEST_LEGEND_ZAPDOS,
+    [LEGEND_ICON_MOLTRES] =  QUEST_LEGEND_MOLTRES,
+    [LEGEND_ICON_ARTICUNO] = QUEST_LEGEND_ARTICUNO,
+    [LEGEND_ICON_GROUDON] =  QUEST_LEGEND_GROUDON,
+    [LEGEND_ICON_RAYQUAZA] = QUEST_LEGEND_RAYQUAZA,
+    [LEGEND_ICON_KYOGRE] =   QUEST_LEGEND_KYOGRE,
+    [LEGEND_ICON_MEW] =      QUEST_LEGEND_MEW,
+    [LEGEND_ICON_HO_OH] =    QUEST_LEGEND_HO_OH,
+    [LEGEND_ICON_CELEBI] =   QUEST_LEGEND_CELEBI,
+    [LEGEND_ICON_LUGIA] =    QUEST_LEGEND_LUGIA,
+    [LEGEND_ICON_MEWTWO] =   QUEST_LEGEND_MEWTWO,
+    [LEGEND_ICON_DEOXYS] =   QUEST_LEGEND_DEOXYS,
 };
 
 const WindowTemplate gUnknown_80E762C = {
-    0,
-    0x03,
-    0x02, 0x0F,
-    0x13, 0x03,
-    0x03, 0x00,
-    NULL
+    .unk0 = 0,
+    .type = WINDOW_TYPE_NORMAL,
+    .pos = { 2, 15 },
+    .width = 19,
+    .height = 3,
+    .heightInTiles = 3,
+    .unk12 = 0,
+    .header = NULL
 };
 
-const MenuItem gResumeQuicksaveMenuItems[3] =
-{
-    {"Resuming from quicksave.", 5},
-    {"Is that OK?", 5},
-    {NULL, 3},
+const MenuItem gResumeQuicksaveMenuItems[] = {
+    { "Resuming from quicksave.", 5 },
+    { "Is that OK?", 5 },
+    { NULL, 3 },
 };
 
-const MenuItem gResumeAdventureMenuItems[3] =
-{
-    {"Resuming saved adventure.", 5},
-    {"Is that OK?", 5},
-    {NULL, 3},
+const MenuItem gResumeAdventureMenuItems[] = {
+    { "Resuming saved adventure.", 5 },
+    { "Is that OK?", 5 },
+    { NULL, 3 },
 };
 
-const MenuItem gQuitWaitingRescueMenuItems[3] =
-{
-    {"Quit awaiting rescue?", 5},
-    {"Is that OK?", 5},
-    {NULL, 3},
+const MenuItem gQuitWaitingRescueMenuItems[] = {
+    { "Quit awaiting rescue?", 5 },
+    { "Is that OK?", 5 },
+    { NULL, 3 },
 };
 
-const MenuItem gDeleteSavePromptMenuItems[3] =
-{
-    {"Your saved data will be", 5},
-    {"deleted. Is that OK?", 5},
-    {NULL, 3},
+const MenuItem gDeleteSavePromptMenuItems[] = {
+    { "Your saved data will be", 5 },
+    { "deleted. Is that OK?", 5 },
+    { NULL, 3 },
 };
 
-const MenuItem gDeleteSaveConfirmMenuItems[3] =
-{
-    {"Are you sure you want to", 5},
-    {"delete all of your saved data?", 5},
-    {NULL, 3},
+const MenuItem gDeleteSaveConfirmMenuItems[] = {
+    { "Are you sure you want to", 5 },
+    { "delete all of your saved data?", 5 },
+    { NULL, 3 },
 };
 
-const WindowTemplate gUnknown_80E7784 =
-{
-    0,
-    0x03,
-    0x17, 0x0F,
-    0x05, 0x03,
-    0x03, 0x00,
-    NULL
+const WindowTemplate gUnknown_80E7784 = {
+    .unk0 = 0,
+    .type = WINDOW_TYPE_NORMAL,
+    .pos = { 23, 15 },
+    .width = 5,
+    .height = 3,
+    .heightInTiles = 3,
+    .unk12 = 0,
+    .header = NULL
 };
 
-const MenuItem gLoadScreenYesNoMenu[3] =
-{
-    {"Yes", 1},
-    {"No", 2},
-    {NULL, 3},
+const MenuItem gLoadScreenYesNoMenu[] = {
+    { "Yes", 1 },
+    { "No", 2 },
+    { NULL, 3 },
 };
 
-ALIGNED(4) const char gTeamHeadingText[] = "Team:";
-ALIGNED(4) const char gNameHeadingText[] = "Name:";
-ALIGNED(4) const char gLocationHeadingText[] = "Location:";
-ALIGNED(4) const char gPlayTimeHeadingText[] = "Play time:";
-ALIGNED(4) const char gAdventuresHeadingText[] = "Adventures:";
-ALIGNED(4) const char gHelperHeadingText[] = "Helper:";
-ALIGNED(4) const char gNoTeamNamePlaceholder[] = _("？？？？");
-ALIGNED(4) const char gUnknown_80E7804[] = "%s ";
-ALIGNED(4) const char gNoNamePlaceholder[] = "???";
-ALIGNED(4) const char gQuicksaveDataDeletedText[] = "Quicksave data deleted.";
-ALIGNED(4) const char gLocationUnknownText[] = "Location unknown.";
-ALIGNED(4) const char gPlayTimePlaceholder[] = "%d:%02d:%02d ";
-ALIGNED(4) const char gNumAdventurePlaceholder[] = "%d";
-ALIGNED(4) const char gHelperInfoPlaceholder[] = "%s (%s)";
-ALIGNED(4) const char gNoHelperText[] = "-----";
-ALIGNED(4) const char gClmkpatFileName[] = "clmkpat"; // clmkpat
+static void DrawLoadScreenText(void);
+static void DrawQuestIcons(void);
+static u8 IsQuickSave(void);
 
 void CreateLoadScreen(u32 currMenu)
 {
-  int index;
+    s32 i;
 
-  if (gLoadScreen == NULL) {
-    gLoadScreen = MemoryAlloc(sizeof(struct LoadScreen), 8);
-    MemoryFill8(gLoadScreen, 0, sizeof(struct LoadScreen));
-  }
-  gLoadScreen->currMenu = currMenu;
-  for(index = 0; index < 4; index++){
-    gLoadScreen->unk144.id[index] = gUnknown_80E75F8;
-  }
-  ResetUnusedInputStruct();
-  ShowWindows(&gLoadScreen->unk144, TRUE, TRUE);
-  SetMenuItems(gLoadScreen->unk4,&gLoadScreen->unk144,0,&gUnknown_80E7610,gUnknown_203B378,FALSE,6,FALSE);
-  switch(gLoadScreen->currMenu){
-    case MENU_CONTINUE:
-        if (IsQuickSave())
-            SetMenuItems(gLoadScreen->unk4,&gLoadScreen->unk144,1,&gUnknown_80E762C,gResumeQuicksaveMenuItems,FALSE,6,FALSE);
-        else
-            SetMenuItems(gLoadScreen->unk4,&gLoadScreen->unk144,1,&gUnknown_80E762C,gResumeAdventureMenuItems,FALSE,6,FALSE);
-        break;
-    case MENU_AWAITING_RESCUE:
-        SetMenuItems(gLoadScreen->unk4,&gLoadScreen->unk144,1,&gUnknown_80E762C,gQuitWaitingRescueMenuItems,FALSE,6,FALSE);
-        break;
-    case MENU_DELETE_SAVE_PROMPT:
-        SetMenuItems(gLoadScreen->unk4,&gLoadScreen->unk144,1,&gUnknown_80E762C,gDeleteSavePromptMenuItems,FALSE,6,FALSE);
-        break;
-    case MENU_DELETE_SAVE_CONFIRM:
-        SetMenuItems(gLoadScreen->unk4,&gLoadScreen->unk144,1,&gUnknown_80E762C, gDeleteSaveConfirmMenuItems,FALSE,6,FALSE);
-        break;
-  }
-  SetMenuItems(gLoadScreen->unk4,&gLoadScreen->unk144,2,&gUnknown_80E7784,gLoadScreenYesNoMenu,TRUE,2,FALSE);
-  sub_8035CF4(gLoadScreen->unk4,0,0);
-  sub_8035CF4(gLoadScreen->unk4,1,0);
-  sub_8035CF4(gLoadScreen->unk4,2,1);
-  DrawLoadScreenText();
+    if (gLoadScreen == NULL) {
+        gLoadScreen = MemoryAlloc(sizeof(struct LoadScreen), 8);
+        MemoryFill8(gLoadScreen, 0, sizeof(struct LoadScreen));
+    }
+
+    gLoadScreen->currMenu = currMenu;
+    for (i = 0; i < MAX_WINDOWS; i++)
+        gLoadScreen->unk144.id[i] = gUnknown_80E75F8;
+
+    ResetUnusedInputStruct();
+    ShowWindows(&gLoadScreen->unk144, TRUE, TRUE);
+    SetMenuItems(gLoadScreen->unk4, &gLoadScreen->unk144, 0, &gUnknown_80E7610, gUnknown_203B378, FALSE, 6, FALSE);
+
+    switch (gLoadScreen->currMenu) {
+        case MENU_CONTINUE: {
+            if (IsQuickSave())
+                SetMenuItems(gLoadScreen->unk4, &gLoadScreen->unk144, 1, &gUnknown_80E762C, gResumeQuicksaveMenuItems, FALSE, 6, FALSE);
+            else
+                SetMenuItems(gLoadScreen->unk4, &gLoadScreen->unk144, 1, &gUnknown_80E762C, gResumeAdventureMenuItems, FALSE, 6, FALSE);
+            break;
+        }
+        case MENU_AWAITING_RESCUE: {
+            SetMenuItems(gLoadScreen->unk4, &gLoadScreen->unk144, 1, &gUnknown_80E762C, gQuitWaitingRescueMenuItems, FALSE, 6, FALSE);
+            break;
+        }
+        case MENU_DELETE_SAVE_PROMPT: {
+            SetMenuItems(gLoadScreen->unk4, &gLoadScreen->unk144, 1, &gUnknown_80E762C, gDeleteSavePromptMenuItems, FALSE, 6, FALSE);
+            break;
+        }
+        case MENU_DELETE_SAVE_CONFIRM: {
+            SetMenuItems(gLoadScreen->unk4, &gLoadScreen->unk144, 1, &gUnknown_80E762C, gDeleteSaveConfirmMenuItems, FALSE, 6, FALSE);
+            break;
+        }
+    }
+
+    SetMenuItems(gLoadScreen->unk4, &gLoadScreen->unk144, 2, &gUnknown_80E7784, gLoadScreenYesNoMenu, TRUE, 2, FALSE);
+    sub_8035CF4(gLoadScreen->unk4, 0, FALSE);
+    sub_8035CF4(gLoadScreen->unk4, 1, FALSE);
+    sub_8035CF4(gLoadScreen->unk4, 2, TRUE);
+    DrawLoadScreenText();
 }
 
 void CleanLoadScreen(void)
 {
     ResetUnusedInputStruct();
     ShowWindows(NULL, TRUE, TRUE);
-    if(gLoadScreen != NULL)
-    {
+
+    if (gLoadScreen != NULL) {
         MemoryFree(gLoadScreen);
         gLoadScreen = NULL;
     }
@@ -225,167 +237,170 @@ void CleanLoadScreen(void)
 
 u32 UpdateLoadScreenMenu(void)
 {
-  u32 nextMenu;
-  u32 menuAction;
+    u32 nextMenu;
+    u32 menuAction;
 
-  nextMenu = MENU_NO_SCREEN_CHANGE;
-  menuAction = 4;
-  sub_8012FD8(&gLoadScreen->unk4[1]);
-  if (sub_8012FD8(&gLoadScreen->unk4[2]) == '\0') {
-    sub_8013114(&gLoadScreen->unk4[2],&menuAction);
-  }
+    nextMenu = MENU_NO_SCREEN_CHANGE;
+    menuAction = 4;
+    sub_8012FD8(&gLoadScreen->unk4[1]);
 
-  switch(menuAction)
-  {
-      case 3:
-      case 2:
-        nextMenu =  MENU_MAIN_SCREEN;
-        break;
-      case 1:
-        switch(gLoadScreen->currMenu)
-        {
-            case MENU_CONTINUE:
-                nextMenu = 2; // MENU_???
-                break;
-            case MENU_AWAITING_RESCUE:
-                DeleteMailAtIndex(0);
-                nextMenu = 4; // MENU_???
-                break;
-            case MENU_DELETE_SAVE_PROMPT:
-                nextMenu = MENU_DELETE_SAVE_CONFIRM;
-                break;
-            case MENU_DELETE_SAVE_CONFIRM:
-                sub_80122A8();
-                nextMenu = MENU_DELETE_SAVE;
-                break;
+    if (!sub_8012FD8(&gLoadScreen->unk4[2]))
+        sub_8013114(&gLoadScreen->unk4[2], &menuAction);
+
+    switch (menuAction) {
+        case 3:
+        case 2: {
+            nextMenu =  MENU_MAIN_SCREEN;
+            break;
         }
-        break;
-      case 5:
-      default:
-        break;
-  }
-  return nextMenu;
-}
-
-void DrawLoadScreenText(void)
-{
-  int iVar2;
-  u32 numAdventures;
-  u8 auStack356 [100];
-  u8 teamNameBuffer [40];
-  u8 playerName [80];
-  u8 nameHelper [80];
-  u8 speciesHelper [20];
-  u32 hours;
-  u32 minutes;
-  u32 seconds;
-  Pokemon *playerInfo;
-  unkStruct_203B484 *temp2;
-
-  iVar2 = sub_8011FA8();
-  CallPrepareTextbox_8008C54(0);
-  sub_80073B8(0);
-  PrintStringOnWindow(8,0, gTeamHeadingText,0,0); // Team:
-  PrintStringOnWindow(8,12,gNameHeadingText,0,0); // Name:
-  PrintStringOnWindow(8,24,gLocationHeadingText,0,0); // Location:
-  PrintStringOnWindow(8,36,gPlayTimeHeadingText,0,0); // Play time:
-  PrintStringOnWindow(8,48,gAdventuresHeadingText,0,0); // Adventures:
-  PrintStringOnWindow(8,60,gHelperHeadingText,0,0); // Helper:
-
-  // Draw Team Name
-  if (CheckQuest(QUEST_SET_TEAM_NAME)) {
-    sub_80920D8(teamNameBuffer);
-  }
-  else {
-    InlineStrcpy(teamNameBuffer,gNoTeamNamePlaceholder);
-  }
-
-  sprintfStatic(gLoadScreen->formattedTeamName,gUnknown_80E7804,teamNameBuffer);
-  PrintStringOnWindow(64,0,gLoadScreen->formattedTeamName,0,0);
-
-  // Draw Player Name
-  playerInfo = GetLeaderMon1();
-  if (playerInfo == NULL)
-        StrncpyCustom(playerName, gNoNamePlaceholder, POKEMON_NAME_LENGTH);
-  else
-        StrncpyCustom(playerName, playerInfo->name, POKEMON_NAME_LENGTH);
-  sprintfStatic(gLoadScreen->formattedPlayerName,gUnknown_80E7804,playerName);
-  PrintStringOnWindow(64,12,gLoadScreen->formattedPlayerName,0,0);
-
-  // Draw Location Info
-  if ((CountMailType(WONDER_MAIL_TYPE_SOS) != 0) || (CountMailType(WONDER_MAIL_TYPE_OKD) != 0)) {
-    if (iVar2 == 0xf1207)
-        PrintDungeonLocationtoBuffer(gLoadScreen->formattedLocation,GetDungeonLocationInfo());
-    else
-        sprintfStatic(gLoadScreen->formattedLocation,gQuicksaveDataDeletedText); // Quicksave data deleted
-  }
-  else {
-    switch(sub_8011C1C())
-    {
-        case 1:
-            switch(GetScriptVarValue(NULL,START_MODE))
-            {
-                default:
-                    sprintfStatic(auStack356,gUnknown_80E7804,GetCurrentGroundPlaceName());
-                    FormatString(auStack356,gLoadScreen->formattedLocation,gLoadScreen->formattedPlayTime,0);
+        case 1: {
+            switch (gLoadScreen->currMenu) {
+                case MENU_CONTINUE: {
+                    nextMenu = 2; // MENU_???
                     break;
-                case 0x7:
-                case 0xB:
-                    sprintfStatic(gLoadScreen->formattedLocation,gQuicksaveDataDeletedText); // Quicksave data deleted
+                }
+                case MENU_AWAITING_RESCUE: {
+                    DeleteMailAtIndex(0);
+                    nextMenu = 4; // MENU_???
                     break;
+                }
+                case MENU_DELETE_SAVE_PROMPT: {
+                    nextMenu = MENU_DELETE_SAVE_CONFIRM;
+                    break;
+                }
+                case MENU_DELETE_SAVE_CONFIRM: {
+                    sub_80122A8();
+                    nextMenu = MENU_DELETE_SAVE;
+                    break;
+                }
             }
             break;
-        case 2:
-            if (iVar2 == 0xf1207)
-                PrintDungeonLocationtoBuffer(gLoadScreen->formattedLocation,GetDungeonLocationInfo());
-            else
-                sprintfStatic(gLoadScreen->formattedLocation,gQuicksaveDataDeletedText); // Quicksave data deleted
-            break;
-        default:
-            sprintfStatic(gLoadScreen->formattedLocation,gLocationUnknownText); // Location unknown
+        }
+        case 5:
+        default: {
             break;
+        }
     }
-  }
-  PrintStringOnWindow(64,24,gLoadScreen->formattedLocation,0,0);
 
-  // Draw Play Time
-  DeconstructPlayTime(gPlayTimeRef,&hours,&minutes,&seconds);
-  sprintfStatic(gLoadScreen->formattedPlayTime,gPlayTimePlaceholder,hours,minutes,seconds);
-  PrintStringOnWindow(64,36,gLoadScreen->formattedPlayTime,0,0);
-
-  // Draw Adventures Info
-  numAdventures = GetNumAdventures();
-  sprintfStatic(gLoadScreen->formattedAdventures,gNumAdventurePlaceholder,numAdventures); // %d
-  PrintStringOnWindow(64,48,gLoadScreen->formattedAdventures,0,0);
-
-  // Draw Helper Info
-  if (iVar2 == 0xf1207){
-       // NOTE: very hacky match here but needed var here to match
-       temp2 =  gUnknown_203B484;
-       if(temp2->unk4.speciesNum != MONSTER_NONE) {
-            sub_808D930(speciesHelper,temp2->unk4.speciesNum);
-            StrncpyCustom(nameHelper,temp2->unk4.name,POKEMON_NAME_LENGTH);
-            sprintfStatic(gLoadScreen->formattedHelperInfo,gHelperInfoPlaceholder,nameHelper,speciesHelper); // %s (%s)
-       }
-       else
-            goto print_helper_placeholder;
-  }
-  else {
-    print_helper_placeholder:
-        sprintfStatic(gLoadScreen->formattedHelperInfo,gNoHelperText); // -----
-  }
-  PrintStringOnWindow(64,60,gLoadScreen->formattedHelperInfo,0,0);
-
-  DrawQuestIcons();
-  sub_80073E0(0);
+    return nextMenu;
 }
 
-// Think structure of clmkFile is like Team Rank Badges except each pic has a diff palette
-struct ClmkFileData
+static void DrawLoadScreenText(void)
 {
-    /* 0x0 */ u32 *pics;
-    /* 0x4 */ RGB *palette;
-};
+    s32 iVar2;
+    u32 numAdventures;
+    u8 auStack356[100];
+    u8 teamNameBuffer[40];
+    u8 playerName[80];
+    u8 nameHelper[80];
+    u8 speciesHelper[20];
+    u32 hours;
+    u32 minutes;
+    u32 seconds;
+    Pokemon *playerInfo;
+    unkStruct_203B484 *temp2;
+
+    iVar2 = sub_8011FA8();
+    CallPrepareTextbox_8008C54(0);
+    sub_80073B8(0);
+    PrintStringOnWindow(8, 0, _("Team:"), 0, 0);
+    PrintStringOnWindow(8, 12, _("Name:"), 0, 0);
+    PrintStringOnWindow(8, 24, _("Location:"), 0, 0);
+    PrintStringOnWindow(8, 36, _("Play time:"), 0, 0);
+    PrintStringOnWindow(8, 48, _("Adventures:"), 0, 0);
+    PrintStringOnWindow(8, 60, _("Helper:"), 0, 0);
+
+    // Draw Team Name
+    if (CheckQuest(QUEST_SET_TEAM_NAME))
+        sub_80920D8(teamNameBuffer);
+    else
+        InlineStrcpy(teamNameBuffer, _("？？？？"));
+
+    sprintfStatic(gLoadScreen->formattedTeamName, "%s ", teamNameBuffer);
+    PrintStringOnWindow(64, 0, gLoadScreen->formattedTeamName, 0, 0);
+
+    // Draw Player Name
+    playerInfo = GetLeaderMon1();
+    if (playerInfo == NULL)
+        StrncpyCustom(playerName, _("???"), POKEMON_NAME_LENGTH);
+    else
+        StrncpyCustom(playerName, playerInfo->name, POKEMON_NAME_LENGTH);
+
+    sprintfStatic(gLoadScreen->formattedPlayerName, "%s ", playerName);
+    PrintStringOnWindow(64, 12, gLoadScreen->formattedPlayerName, 0, 0);
+
+    // Draw Location Info
+    if (CountMailType(WONDER_MAIL_TYPE_SOS) != 0 || CountMailType(WONDER_MAIL_TYPE_OKD) != 0) {
+        if (iVar2 == 0xF1207)
+            PrintDungeonLocationtoBuffer(gLoadScreen->formattedLocation,GetDungeonLocationInfo());
+        else
+            sprintfStatic(gLoadScreen->formattedLocation, _("Quicksave data deleted."));
+    }
+    else {
+        switch (sub_8011C1C()) {
+            case 1: {
+                switch (GetScriptVarValue(NULL, START_MODE)) {
+                    default: {
+                        sprintfStatic(auStack356, "%s ", GetCurrentGroundPlaceName());
+                        FormatString(auStack356, gLoadScreen->formattedLocation, gLoadScreen->formattedPlayTime, 0);
+                        break;
+                    }
+                    case STARTMODE_CONTINUE_QUICKSAVE:
+                    case STARTMODE_11: {
+                        sprintfStatic(gLoadScreen->formattedLocation, _("Quicksave data deleted."));
+                        break;
+                    }
+                }
+                break;
+            }
+            case 2: {
+                if (iVar2 == 0xF1207)
+                    PrintDungeonLocationtoBuffer(gLoadScreen->formattedLocation, GetDungeonLocationInfo());
+                else
+                    sprintfStatic(gLoadScreen->formattedLocation, _("Quicksave data deleted."));
+                break;
+            }
+            default: {
+                sprintfStatic(gLoadScreen->formattedLocation, _("Location unknown."));
+                break;
+            }
+        }
+    }
+
+    PrintStringOnWindow(64, 24, gLoadScreen->formattedLocation, 0, 0);
+
+    // Draw Play Time
+    DeconstructPlayTime(gPlayTimeRef, &hours, &minutes, &seconds);
+    sprintfStatic(gLoadScreen->formattedPlayTime, "%d:%02d:%02d ", hours, minutes, seconds);
+    PrintStringOnWindow(64, 36, gLoadScreen->formattedPlayTime, 0, 0);
+
+    // Draw Adventures Info
+    numAdventures = GetNumAdventures();
+    sprintfStatic(gLoadScreen->formattedAdventures, "%d", numAdventures);
+    PrintStringOnWindow(64, 48, gLoadScreen->formattedAdventures, 0, 0);
+
+    // Draw Helper Info
+    if (iVar2 == 0xF1207) {
+        // NOTE: very hacky match here but needed var here to match
+        temp2 = gUnknown_203B484;
+        if (temp2->unk4.speciesNum != MONSTER_NONE) {
+            sub_808D930(speciesHelper, temp2->unk4.speciesNum);
+            StrncpyCustom(nameHelper, temp2->unk4.name, POKEMON_NAME_LENGTH);
+            sprintfStatic(gLoadScreen->formattedHelperInfo, "%s (%s)", nameHelper, speciesHelper);
+        }
+        else
+            goto print_helper_placeholder; // TODO: Fix
+    }
+    else {
+print_helper_placeholder:
+        sprintfStatic(gLoadScreen->formattedHelperInfo, "-----");
+    }
+
+    PrintStringOnWindow(64, 60, gLoadScreen->formattedHelperInfo, 0, 0);
+
+    DrawQuestIcons();
+    sub_80073E0(0);
+}
 
 static void DrawQuestIcons(void)
 {
@@ -394,44 +409,48 @@ static void DrawQuestIcons(void)
     s32 x;
     s32 y;
 
-    clmkFile = OpenFileAndGetFileDataPtr(gClmkpatFileName, &gTitleMenuFileArchive); // clmkpat
+    clmkFile = OpenFileAndGetFileDataPtr("clmkpat", &gTitleMenuFileArchive);
+#define CLMKPAT_DATA ((ClmkFileData *)clmkFile->data)
 
-    for (i = 0; i < 64; i++) {
-        SetBGPaletteBufferColorArray(i + 176, &((struct ClmkFileData *)(clmkFile->data))->palette[i]);
+    // Load all 4 palettes
+    for (i = 0; i < 16 * 4; i++) {
+        SetBGPaletteBufferColorArray(i + 0xB0, &(*CLMKPAT_DATA->palette)[i]);
     }
 
     x = 8;
-    y = 73;
+    y = 73; // Shouldn't this be 72?
 
-    // Draw the 12 legendary icons
-    for (i = 0; i < ARRAY_COUNT_INT(sLegendaryQuestIDs); i++) {
+    // Draw the legendary icons
+    for (i = 0; i < NUM_LEGEND_ICONS; i++) {
         if (CheckQuest(sLegendaryQuestIDs[i])) {
-          sub_8007E20(0, x, y, 16, 16, (&((struct ClmkFileData *)(clmkFile->data))->pics[i * 32]), gUnknown_203B388[i]);
-          x += 16;
+            sub_8007E20(0, x, y, 16, 16, CLMKPAT_DATA->pics[i], sLegendaryQuestIconPalNums[i]);
+            x += 16;
         }
     }
 
+#undef CLMKPAT_DATA
     CloseFile(clmkFile);
 }
 
-bool8 IsQuickSave(void)
+static bool8 IsQuickSave(void)
 {
-  s32 iVar1;
-  bool8 isQuicksave;
+    s32 iVar1;
+    bool8 isQuicksave;
 
-  iVar1 = sub_8011FA8();
-  isQuicksave = FALSE;
-  if (CountMailType(WONDER_MAIL_TYPE_SOS) != 0 || CountMailType(WONDER_MAIL_TYPE_OKD) != 0)
-  {
-      if (iVar1 == 0xf1207)
-        isQuicksave  = TRUE;
-  }
-  else if (sub_8011C1C() == 2 && iVar1 == 0xf1207)
-    isQuicksave = TRUE;
-  return isQuicksave;
+    iVar1 = sub_8011FA8();
+    isQuicksave = FALSE;
+
+    if (CountMailType(WONDER_MAIL_TYPE_SOS) != 0 || CountMailType(WONDER_MAIL_TYPE_OKD) != 0) {
+        if (iVar1 == 0xF1207)
+            isQuicksave  = TRUE;
+    }
+    else if (sub_8011C1C() == 2 && iVar1 == 0xF1207)
+        isQuicksave = TRUE;
+
+    return isQuicksave;
 }
 
 bool8 sub_8039880(void)
 {
-  return (CountMailType(WONDER_MAIL_TYPE_SOS) != 0 || CountMailType(WONDER_MAIL_TYPE_OKD) != 0 || sub_8011C1C() == 2);
+    return (CountMailType(WONDER_MAIL_TYPE_SOS) != 0 || CountMailType(WONDER_MAIL_TYPE_OKD) != 0 || sub_8011C1C() == 2);
 }
diff --git a/src/main_loops.c b/src/main_loops.c
index fad073f4b..72f4c4975 100644
--- a/src/main_loops.c
+++ b/src/main_loops.c
@@ -180,7 +180,7 @@ void GameLoop_Async(void)
             sTitleBrightness++;
 
             for (i = 0; i < 240; i++) {
-                SetBGPaletteBufferColorRGB(i, &((RGB*)sTitlePaletteFile->data)[i], sTitleBrightness, NULL);
+                SetBGPaletteBufferColorRGB(i, &((RGB_Struct*)sTitlePaletteFile->data)[i], sTitleBrightness, NULL);
             }
 
             MainLoops_RunFrameActions(0);
@@ -237,7 +237,7 @@ void GameLoop_Async(void)
             sTitleBrightness--;
 
             for (i = 0; i < 240; i++) {
-                SetBGPaletteBufferColorRGB(i, &((RGB*)sTitlePaletteFile->data)[i], sTitleBrightness, NULL);
+                SetBGPaletteBufferColorRGB(i, &((RGB_Struct*)sTitlePaletteFile->data)[i], sTitleBrightness, NULL);
             }
 
             MainLoops_RunFrameActions(0);
@@ -564,7 +564,7 @@ static u32 RunGameMode_Async(u32 a0)
     }
 
     ClearScriptVarArray(NULL, EVENT_S08E01);
-    while (1) {
+    while (TRUE) {
         s32 r5;
         struct FriendAreasMapSetupStruct friendAreasSetup;
         struct WorldMapSetupStruct worldMapSetup;
diff --git a/src/menu_input.c b/src/menu_input.c
index 0a939789c..d1ecbfcac 100644
--- a/src/menu_input.c
+++ b/src/menu_input.c
@@ -237,7 +237,7 @@ void sub_8012D08(WindowTemplate *winTemplate, s32 entriesCount)
 
     sVar3 = sVar2;
     winTemplate->height = sVar3;
-    winTemplate->unk10 = sVar3;
+    winTemplate->heightInTiles = sVar3;
 }
 
 void sub_8012D34(WindowTemplate *winTemplate, s32 entriesCount)
@@ -251,7 +251,7 @@ void sub_8012D34(WindowTemplate *winTemplate, s32 entriesCount)
 
     sVar3 = sVar2;
     winTemplate->height = sVar3;
-    winTemplate->unk10 = sVar3;
+    winTemplate->heightInTiles = sVar3;
 }
 
 // arm9.bin::0201C26C
diff --git a/src/monster_sbin_palet.c b/src/monster_sbin_palet.c
index d29c707db..2380c4a68 100644
--- a/src/monster_sbin_palet.c
+++ b/src/monster_sbin_palet.c
@@ -2,7 +2,7 @@
 #include "structs/rgb.h"
 
 // These correspond to the 'overworldPalette' field in the monster data. Only slots 0-12 are actually used, slot 13 seems to be a placeholder.
-const RGB gAxMonsPalette[] = {
+const RGB_Struct gAxMonsPalette[] = {
     INCBIN_RGB("graphics/ax/pal/0.pmdpal",
                "graphics/ax/pal/1.pmdpal",
                "graphics/ax/pal/2.pmdpal",
diff --git a/src/naming_screen.c b/src/naming_screen.c
index 1b0f7c4ed..c655cd73e 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -285,10 +285,10 @@ static const WindowTemplate sWindowTemplateDummy = WIN_TEMPLATE_DUMMY;
 static const WindowTemplate sInputWindowTemplate = {
     .unk0 = 0,
     .type = WINDOW_TYPE_WITHOUT_BORDER,
-    .pos = {1, 10},
+    .pos = { 1, 10 },
     .width = 28,
     .height = 9,
-    .unk10 = 9,
+    .heightInTiles = 9,
     .unk12 = 0,
     .header = NULL,
 };
@@ -296,10 +296,10 @@ static const WindowTemplate sInputWindowTemplate = {
 static const WindowTemplate sNameWindowTemplate = {
     .unk0 = 0,
     .type = WINDOW_TYPE_WITHOUT_BORDER,
-    .pos = {4, 3},
+    .pos = { 4, 3 },
     .width = 22,
     .height = 5,
-    .unk10 = 5,
+    .heightInTiles = 5,
     .unk12 = 0,
     .header = NULL,
 };
@@ -307,10 +307,10 @@ static const WindowTemplate sNameWindowTemplate = {
 static const WindowTemplate sPasswordNameWindowTemplate = {
     .unk0 = 0,
     .type = WINDOW_TYPE_WITHOUT_BORDER,
-    .pos = {1, 2},
+    .pos = { 1, 2 },
     .width = 28,
     .height = 7,
-    .unk10 = 7,
+    .heightInTiles = 7,
     .unk12 = 0,
     .header = NULL,
 };
diff --git a/src/other_menus2.c b/src/other_menus2.c
index 6bf512e41..5eb2ab3ca 100644
--- a/src/other_menus2.c
+++ b/src/other_menus2.c
@@ -263,7 +263,7 @@ s32 sub_8037D64(u32 mode, void * param_2, void *param_3)
     sub_800D494();
     sub_8037C44(mode, param_2);
 
-    while (1) {
+    while (TRUE) {
         sub_80373C4();
         iVar2 = sub_800D33C();
         sub_800D570();
@@ -578,7 +578,7 @@ s32 sub_80381F4(u32 mode, void *param_2, void *param_3)
     sub_800D494();
     sub_800D59C(&linkStatus, 4);
 
-    while (1) {
+    while (TRUE) {
         sub_80373C4();
         iVar2 = sub_800D33C();
         sub_800D570();
diff --git a/src/personality_test2.c b/src/personality_test2.c
index 12183e53e..8186fbf3b 100644
--- a/src/personality_test2.c
+++ b/src/personality_test2.c
@@ -143,22 +143,30 @@ static void PersonalityTest_DisplayPartnerSprite(void)
 {
     s32 partnerID;
     struct OpenedFile *faceFile;
-    s32 paletteIndex;
     const u8 *gfx;
     s32 emotionId;
+    s32 i;
 
     partnerID = gUnknown_203B404->PartnerArray[gUnknown_203B404->s18.m.input.menuIndex];
+
     CallPrepareTextbox_8008C54(1);
     sub_80073B8(1);
+
     faceFile = GetDialogueSpriteDataPtr(partnerID);
-    gfx = ((PortraitGfx *)(faceFile->data))->sprites[EMOTION_NORMAL].gfx;
+#define FACE_DATA ((PortraitGfx *)faceFile->data)
+
+    gfx = FACE_DATA->sprites[EMOTION_NORMAL].gfx;
     emotionId = EMOTION_NORMAL;
-    for (paletteIndex = 0; paletteIndex < 0x10; paletteIndex++) {
-        SetBGPaletteBufferColorArray(paletteIndex + 0xE0, &((PortraitGfx *)(faceFile->data))->sprites[emotionId].pal[paletteIndex]);
+
+    for (i = 0; i < 16; i++) {
+        SetBGPaletteBufferColorArray(i + 0xE0, &FACE_DATA->sprites[emotionId].pal[i]);
     }
 
     DisplayMonPortraitSpriteFlipped(1, gfx, 14);
+
+#undef FACE_DATA
     CloseFile(faceFile);
+
     sub_80073E0(1);
     gUnknown_203B404->unk16 = 1;
 }
diff --git a/src/pokemon_summary_window.c b/src/pokemon_summary_window.c
index 7ee1592c2..dea9302e0 100644
--- a/src/pokemon_summary_window.c
+++ b/src/pokemon_summary_window.c
@@ -22,143 +22,160 @@ void ShowPokemonSummaryWindow(s32 which, s32 currSubWindowId, struct MonSummaryI
     s32 j;
 
     sub_80073B8(windowId);
-    strncpy(gFormatBuffer_Monsters[0],monInfo->nameBuffer,0x14);
-    y = 0x20;
+    strncpy(gFormatBuffer_Monsters[0], monInfo->nameBuffer, 20);
+
+    y = 32;
+
     switch (which) {
-        case SUB_WINDOW_NONE:
+        case SUB_WINDOW_NONE: {
             break;
+        }
         case SUB_WINDOW_STATS: {
             const u8 *str;
             s32 iVar8;
             LevelData levelData;
 
-            PrintFormattedStringOnWindow(currSubWindowId * 8 + 0x10,0,_("Stats"),windowId,'\0');
+            PrintFormattedStringOnWindow((currSubWindowId * 8) + 16, 0, _("Stats"), windowId, '\0');
+
             gFormatArgs[0] = monInfo->level;
             gFormatArgs[1] = monInfo->exp;
-            PrintFormattedStringOnWindow(4,y,gText_LevelUnkMacro,windowId,'\0');
-            y += 0xA;
-            PrintFormattedStringOnWindow(4,y,gText_ExpPtsUnkMacro,windowId,'\0');
-            y += 0xA;
+            PrintFormattedStringOnWindow(4, y, gText_LevelUnkMacro, windowId, '\0');
+
+            y += 10;
+            PrintFormattedStringOnWindow(4, y,gText_ExpPtsUnkMacro, windowId, '\0');
+
+            y += 10;
             if (monInfo->level < 100) {
-                GetLvlUpEntry(&levelData,monInfo->species,monInfo->level + 1);
+                GetLvlUpEntry(&levelData, monInfo->species, monInfo->level + 1);
                 gFormatArgs[0] = levelData.expRequired - monInfo->exp;
-                PrintFormattedStringOnWindow(4,y,gText_ToNextLevel,windowId,'\0');
+                PrintFormattedStringOnWindow(4, y, gText_ToNextLevel, windowId, '\0');
             }
-            y += 0xC;
+
+            y += 12;
             gFormatArgs[0] = monInfo->HP1;
             gFormatArgs[1] = monInfo->HP2;
-            PrintFormattedStringOnWindow(4,y,gUnknown_810DDD0,windowId,'\0');
-            y += 0xA;
-            PrintFormattedStringOnWindow(4,y,gUnknown_810DDE4,windowId,'\0');
+            PrintFormattedStringOnWindow(4, y, gUnknown_810DDD0, windowId, '\0');
+
+            y += 10;
+            PrintFormattedStringOnWindow(4, y, gUnknown_810DDE4, windowId, '\0');
+
             str = gUnknown_810DE0C;
             gFormatArgs[0] = monInfo->offense.att[0];
             if (monInfo->atkBoost != 0) {
-                gFormatArgs[0] = gFormatArgs[0] + monInfo->atkBoost;
+                gFormatArgs[0] += monInfo->atkBoost;
                 str = gUnknown_810DE20;
             }
-            PrintFormattedStringOnWindow(4,y,str,windowId,'\0');
+            PrintFormattedStringOnWindow(4, y, str, windowId, '\0');
+
             if (monInfo->defBoost != 0) {
                 gFormatArgs[0] = monInfo->offense.def[0] + monInfo->defBoost;
-                PrintFormattedStringOnWindow(4,y,gUnknown_810DE4C,windowId,'\0');
+                PrintFormattedStringOnWindow(4, y, gUnknown_810DE4C, windowId, '\0');
             }
             else {
                 gFormatArgs[0] = monInfo->offense.def[0];
-                PrintFormattedStringOnWindow(4,y,gUnknown_810DE38,windowId,'\0');
+                PrintFormattedStringOnWindow(4, y, gUnknown_810DE38, windowId, '\0');
             }
-            y += 0xA;
-            PrintFormattedStringOnWindow(4,y,gUnknown_810DDFC,windowId,'\0');
+
+            y += 10;
+            PrintFormattedStringOnWindow(4, y, gUnknown_810DDFC, windowId, '\0');
+
             str = gUnknown_810DE24;
             gFormatArgs[0] = monInfo->offense.att[1];
             if (monInfo->spAtkBoost != 0) {
-                gFormatArgs[0] = gFormatArgs[0] + monInfo->spAtkBoost;
+                gFormatArgs[0] += monInfo->spAtkBoost;
                 str = gUnknown_810DE28;
             }
-            PrintFormattedStringOnWindow(4,y,str,windowId,'\0');
+            PrintFormattedStringOnWindow(4, y, str, windowId, '\0');
+
             if (monInfo->spDefBoost != 0) {
                 gFormatArgs[0] = monInfo->offense.def[1] + monInfo->spDefBoost;
-                PrintFormattedStringOnWindow(4,y,gUnknown_810DE54,windowId,'\0');
+                PrintFormattedStringOnWindow(4, y, gUnknown_810DE54, windowId, '\0');
             }
             else {
                 gFormatArgs[0] = monInfo->offense.def[1];
-                PrintFormattedStringOnWindow(4,y,gUnknown_810DE50,windowId,'\0');
-            }
-            y += 0xA;
-            if (ItemExists(&monInfo->item)) {
-                 sub_8090E14(gFormatBuffer_Items[0],&monInfo->item,0);
-            }
-            else {
-                strcpy(gFormatBuffer_Items[0],gUnknown_810DE58);
-            }
-            PrintFormattedStringOnWindow(4,y,gUnknown_810DE6C,windowId,'\0');
-            y += 0xC;
-            gFormatArgs[0] = monInfo->IQ;
-            iVar8 = monInfo->IQ / 10;
-            if (iVar8 < 0) {
-                iVar8 = 0;
-            }
-            if (0x62 < iVar8) {
-                iVar8 = 99;
+                PrintFormattedStringOnWindow(4, y, gUnknown_810DE50, windowId, '\0');
             }
 
-            InlineStrcpy(gFormatBuffer_Monsters[0],gUnknown_8115718[iVar8]);
-            PrintFormattedStringOnWindow(4,y,gUnknown_810DE80,windowId,'\0');
-            y += 0xA;
-            if (!monInfo->isTeamLeader)
-            {
-                CopyTacticsNameToBuffer(gFormatBuffer_Monsters[0],monInfo->tactic);
-                PrintFormattedStringOnWindow(4,y,gUnknown_810DE98,windowId,'\0');
+            y += 10;
+            if (ItemExists(&monInfo->item))
+                 sub_8090E14(gFormatBuffer_Items[0], &monInfo->item, NULL);
+            else
+                strcpy(gFormatBuffer_Items[0], gUnknown_810DE58);
+            PrintFormattedStringOnWindow(4, y, gUnknown_810DE6C, windowId, '\0');
+
+            y += 12;
+            gFormatArgs[0] = monInfo->IQ;
+            //iVar8 = clamp(monInfo->IQ / 10, 0, 99);
+            iVar8 = monInfo->IQ / 10;
+            if (iVar8 < 0)
+                iVar8 = 0;
+            if (iVar8 >= 99)
+                iVar8 = 99;
+            InlineStrcpy(gFormatBuffer_Monsters[0], gUnknown_8115718[iVar8]);
+            PrintFormattedStringOnWindow(4, y, gUnknown_810DE80, windowId, '\0');
+
+            y += 10;
+            if (!monInfo->isTeamLeader) {
+                CopyTacticsNameToBuffer(gFormatBuffer_Monsters[0], monInfo->tactic);
+                PrintFormattedStringOnWindow(4, y, gUnknown_810DE98, windowId, '\0');
             }
-            y += 0xA;
+
+            y += 10;
             break;
         }
         case SUB_WINDOW_FEATUERS: {
-            PrintFormattedStringOnWindow(currSubWindowId * 8 + 0x10,0,_("Features"),windowId,'\0');
-            PrintFormattedStringOnWindow(4,y,_("Type:"),windowId,'\0');
-            PrintFormattedStringOnWindow(0x38,y,GetFormattedTypeString(monInfo->types[0]),windowId,'\0');
-            if (monInfo->types[1] != TYPE_NONE) {
-                PrintFormattedStringOnWindow(0x60,y,GetFormattedTypeString(monInfo->types[1]),windowId,'\0');
-            }
-            y += 0xC;
-            PrintFormattedStringOnWindow(4,y,_("Special Abilities:"),windowId,'\0');
-            y += 0xC;
-            PrintFormattedStringOnWindow2(4,y,GetAbilityDescription(monInfo->abilities[0]),windowId,'\0',0xb);
-            y += 0x21;
-            if (monInfo->abilities[1] != ABILITY_UNKNOWN) {
-                PrintFormattedStringOnWindow2(4,y,GetAbilityDescription(monInfo->abilities[1]),windowId,'\0',0xb);
-            }
+            PrintFormattedStringOnWindow((currSubWindowId * 8) + 16, 0, _("Features"), windowId, '\0');
+
+            PrintFormattedStringOnWindow(4, y, _("Type:"), windowId, '\0');
+
+            PrintFormattedStringOnWindow(56, y, GetFormattedTypeString(monInfo->types[0]), windowId, '\0');
+
+            if (monInfo->types[1] != TYPE_NONE)
+                PrintFormattedStringOnWindow(96, y, GetFormattedTypeString(monInfo->types[1]), windowId, '\0');
+
+            y += 12;
+            PrintFormattedStringOnWindow(4, y, _("Special Abilities:"), windowId, '\0');
+
+            y += 12;
+            PrintFormattedStringOnWindow2(4, y, GetAbilityDescription(monInfo->abilities[0]), windowId, '\0', 11);
+
+            y += 33;
+            if (monInfo->abilities[1] != ABILITY_UNKNOWN)
+                PrintFormattedStringOnWindow2(4, y, GetAbilityDescription(monInfo->abilities[1]), windowId, '\0', 11);
+
             break;
         }
         case SUB_WINDOW_STATUS: {
             s32 iVar11;
             bool8 bVar10;
 
-            PrintFormattedStringOnWindow(currSubWindowId * 8 + 0x10,0,gUnknown_810DD58,windowId,'\0');
+            PrintFormattedStringOnWindow((currSubWindowId * 8) + 16, 0, gUnknown_810DD58, windowId, '\0');
+
             iVar11 = monInfo->unk56 - 1;
-            y -= 0xC;
+            y -= 12;
             bVar10 = FALSE;
 
-            for (i = 0; i < 9; i++) {
+            for (i = 0; i < 9; i++)
                 param_4->unkC[i] = 0;
-            }
 
-            for (j = 0; j < 10; j++, iVar11++, y += 0xC) {
-                if (-1 < iVar11) {
-                    if (0xb < iVar11)
+            for (j = 0; j < 10; j++, iVar11++, y += 12) {
+                if (iVar11 > -1) {
+                    if (iVar11 >= 12)
                         break;
+
                     if (monInfo->unk58[iVar11] != 0) {
                         bVar10 = TRUE;
-                        InlineStrncpy(gFormatBuffer_Items[1],gStatusNames[monInfo->unk58[iVar11]],0x50);
-                        PrintFormattedStringOnWindow(0xc,y,_("{MOVE_ITEM_1}"),windowId,'\0');
-                        if (0 < j) {
+                        InlineStrncpy(gFormatBuffer_Items[1], gStatusNames[monInfo->unk58[iVar11]], 80);
+                        PrintFormattedStringOnWindow(12, y, _("{MOVE_ITEM_1}"), windowId, '\0');
+                        if (0 < j)
                             param_4->unkC[j - 1] = monInfo->unk58[iVar11];
-                        }
                     }
                 }
             }
 
-            if (!bVar10) {
-                PrintFormattedStringOnWindow(0xc,0x20,gUnknown_810DF78,windowId,'\0');
-            }
+            if (!bVar10)
+                PrintFormattedStringOnWindow(12, 32, gUnknown_810DF78, windowId, '\0');
+
             break;
         }
         case SUB_WINDOW_IQ: {
diff --git a/src/pounce_orb.c b/src/pounce_orb.c
index 43ed7d06d..9deda5b57 100644
--- a/src/pounce_orb.c
+++ b/src/pounce_orb.c
@@ -51,7 +51,7 @@ void HandlePounceOrb(Entity *pokemon, Entity *target, u8 r2)
     sub_806CDD4(target, 6, direction);
 
 
-    while (1)
+    while (TRUE)
     {
         pos.x = target->pos.x + gAdjacentTileOffsets[direction].x;
         pos.y = target->pos.y + gAdjacentTileOffsets[direction].y;
diff --git a/src/reg_control.c b/src/reg_control.c
index 17fdb8f17..38cbfe0ae 100644
--- a/src/reg_control.c
+++ b/src/reg_control.c
@@ -165,7 +165,7 @@ UNUSED static s32 sub_800B720(s32 a0, IntrCallback a1)
     asS16 = (s16) a0;
     sp4 = DisableInterrupts();
 
-    while (1) {
+    while (TRUE) {
         bool8 sp10 = FALSE;
         for (i = 0, strPtr = gUnknown_202D608; i < gUnknown_203B0AA; i++, strPtr++) {
             if (strPtr->unk0 == gUnknown_203B0A8) {
diff --git a/src/run_dungeon.c b/src/run_dungeon.c
index ebf8a4f6c..50bcab3ce 100644
--- a/src/run_dungeon.c
+++ b/src/run_dungeon.c
@@ -110,7 +110,7 @@ void RunDungeon_Async(DungeonSetupStruct *setupPtr)
     bool8 r9;
     bool8 r10;
     u8 sp;
-    RGB color;
+    RGB_Struct color;
 
     gUnknown_203B40C = 0;
     r6 = setupPtr->info.sub0.unk4;
diff --git a/src/sprite.c b/src/sprite.c
index 46a298941..812df38d2 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -28,7 +28,7 @@ EWRAM_INIT static unkStruct_20266B0 *sUnknown_203B074 = {0};
 
 static void AxResInitUnoriented(axdata *, EfoFileData *, u32, u32, u32, bool8);
 static void RegisterSpriteParts_80052BC(const ax_sprite *spritesPtr);
-static void sub_800561C(const EfoFileData *, s32 vramIdx, s32 brightness, const RGB *ramp);
+static void sub_800561C(const EfoFileData *, s32 vramIdx, s32 brightness, const RGB_Struct *ramp);
 
 // arm9.bin::0200265C
 void InitSprites(void)
@@ -603,13 +603,13 @@ void DoAxFrame_800558C(axdata *a0, s32 spriteX, s32 spriteY, u32 a3, u32 palette
 }
 
 // arm9.bin::020019E4
-void sub_8005610(OpenedFile *a0, s32 vramIdx, s32 brightness, const RGB *ramp)
+void sub_8005610(OpenedFile *a0, s32 vramIdx, s32 brightness, const RGB_Struct *ramp)
 {
     sub_800561C((const EfoFileData *)a0->data, vramIdx, brightness, ramp);
 }
 
 // arm9.bin::02001970
-static void sub_800561C(const EfoFileData *a0, s32 vramIdx, s32 brightness, const RGB *ramp)
+static void sub_800561C(const EfoFileData *a0, s32 vramIdx, s32 brightness, const RGB_Struct *ramp)
 {
     s32 i;
 
@@ -623,14 +623,14 @@ static void sub_800561C(const EfoFileData *a0, s32 vramIdx, s32 brightness, cons
 }
 
 #if (GAME_VERSION == VERSION_RED)
-UNUSED static const RGB *sub_8005668(OpenedFile *a0, s32 vramIdx)
+UNUSED static const RGB_Struct *sub_8005668(OpenedFile *a0, s32 vramIdx)
 {
     return sub_8005674((const EfoFileData *)a0->data, vramIdx);
 }
 #endif
 
 // arm9.bin::0200193C
-const RGB *sub_8005674(const EfoFileData *a0, s32 vramIdx)
+const RGB_Struct *sub_8005674(const EfoFileData *a0, s32 vramIdx)
 {
     if (a0->tiles != NULL)
         CpuCopy(OBJ_VRAM0 + vramIdx * 0x20, a0->tiles, a0->tileCount * 0x20);
@@ -696,14 +696,14 @@ void sub_8005700(DungeonPos *dstPos, axdata *axData)
 }
 
 #if (GAME_VERSION == VERSION_RED)
-UNUSED static void sub_8005764(s32 a0, OpenedFile *file, s32 a2, const RGB *a3)
+UNUSED static void sub_8005764(s32 a0, OpenedFile *file, s32 a2, const RGB_Struct *a3)
 {
-    sub_8005770(a0, (const RGB*)file->data, a2, a3);
+    sub_8005770(a0, (const RGB_Struct*)file->data, a2, a3);
 }
 #endif
 
 // arm9.bin::02001794
-void sub_8005770(s32 param_1, const RGB *color, s32 brightness, const RGB *ramp)
+void sub_8005770(s32 param_1, const RGB_Struct *color, s32 brightness, const RGB_Struct *ramp)
 {
     s32 i;
 
diff --git a/src/string_format.c b/src/string_format.c
index 9de336278..9085cb9ac 100644
--- a/src/string_format.c
+++ b/src/string_format.c
@@ -16,30 +16,28 @@
 #include "text_2.h"
 #include "text_3.h"
 
-static const MenuItem sYesNoMenuItems[] =
-{
-        {_("*Yes"), 1},
-        {_("No"), 0},
-        {NULL, -1}
+static const MenuItem sYesNoMenuItems[] = {
+        { _("*Yes"), 1 },
+        { _("No"), 0 },
+        { NULL, -1 }
 };
 
-static const MenuItem sYesNoMenuItems_DefaultNo[] =
-{
-        {_("Yes"), 1},
-        {_("*No"), 0},
-        {NULL, -1}
+static const MenuItem sYesNoMenuItems_DefaultNo[] = {
+        { _("Yes"), 1 },
+        { _("*No"), 0 },
+        { NULL, -1 }
 };
 
-static const u32 gUnknown_80D48A0[] = {0x7, 0x2, 0x2};
+static const u32 gUnknown_80D48A0[3] = { 0x7, 0x2, 0x2 };
 static const WindowTemplate sWinTemplateDummy = WIN_TEMPLATE_DUMMY;
 
 static const WindowTemplate sDialogueBoxWindowTemplate = {
     .unk0 = 0,
     .type = WINDOW_TYPE_0,
-    .pos = {2, 15},
+    .pos = { 2, 15 },
     .width = 26,
     .height = 5,
-    .unk10 = 7,
+    .heightInTiles = 7,
     .unk12 = 0,
     .header = NULL,
 };
@@ -47,10 +45,10 @@ static const WindowTemplate sDialogueBoxWindowTemplate = {
 static const WindowTemplate sOnlyTextDialogueBoxWindowTemplate = {
     .unk0 = 0,
     .type = WINDOW_TYPE_ONLY_TEXT,
-    .pos = {2, 8},
+    .pos = { 2, 8 },
     .width = 26,
     .height = 5,
-    .unk10 = 7,
+    .heightInTiles = 7,
     .unk12 = 0,
     .header = NULL,
 };
@@ -117,20 +115,20 @@ static EWRAM_INIT WindowTemplates sDialogueBoxWinTemplates = {
         [0] = {
             .unk0 = 0,
             .type = WINDOW_TYPE_0,
-            .pos = { .x = 2, .y = 15 },
+            .pos = { 2, 15 },
             .width = 26,
             .height = 5,
-            .unk10 = 7,
+            .heightInTiles = 7,
             .unk12 = 0,
             .header = NULL,
         },
         [1] = {
             .unk0 = 0x40,
             .type = WINDOW_TYPE_7,
-            .pos = { .x = 0, .y = 0 },
+            .pos = { 0, 0 },
             .width = 0,
             .height = 0,
-            .unk10 = 0,
+            .heightInTiles = 0,
             .unk12 = 0,
             .header = NULL,
         },
@@ -216,7 +214,7 @@ void CreateMenuDialogueBoxAndPortrait(const u8 *text, void *a1, u32 r9, const Me
 
     sDialogueBoxWinTemplates.id[1].width = 0;
     sDialogueBoxWinTemplates.id[1].height = 0;
-    sDialogueBoxWinTemplates.id[1].unk10 = 0;
+    sDialogueBoxWinTemplates.id[1].heightInTiles = 0;
     sDialogueBoxWinTemplates.id[1].unk0 = 0x40;
 
     if (monPortraitPtr != NULL && monPortraitPtr->faceData != NULL && monPortraitPtr->faceData->sprites[monPortraitPtr->spriteId].gfx != 0) {
@@ -226,7 +224,8 @@ void CreateMenuDialogueBoxAndPortrait(const u8 *text, void *a1, u32 r9, const Me
         sDialogueBoxWinTemplates.id[1].pos.y = monPortraitPtr->pos.y;
         sDialogueBoxWinTemplates.id[1].width = 5;
         sDialogueBoxWinTemplates.id[1].height = 5;
-        sDialogueBoxWinTemplates.id[1].unk10 = 5;
+        sDialogueBoxWinTemplates.id[1].heightInTiles = 5;
+
         for (i = 0; i < 16; i++) {
             SetBGPaletteBufferColorArray(224 + i, &monPortraitPtr->faceData->sprites[monPortraitPtr->spriteId].pal[i]);
         }
@@ -273,10 +272,10 @@ void CreateMenuDialogueBoxAndPortrait(const u8 *text, void *a1, u32 r9, const Me
 
         sub_80073B8(1);
         if (!monPortraitPtr->flip) {
-            DisplayMonPortraitSprite(1, data, 0xE);
+            DisplayMonPortraitSprite(1, data, 14);
         }
         else {
-            DisplayMonPortraitSpriteFlipped(1, data, 0xE);
+            DisplayMonPortraitSpriteFlipped(1, data, 14);
         }
         sub_80073E0(1);
     }
@@ -605,7 +604,7 @@ static void sub_8014A88(void)
     r1 = r7 / 8;
     r1 += 2;
     sDialogueBoxWinTemplates.id[2].width = r1;
-    sDialogueBoxWinTemplates.id[2].unk10 = r2;
+    sDialogueBoxWinTemplates.id[2].heightInTiles = r2;
     sDialogueBoxWinTemplates.id[2].height = r2;
     sDialogueBoxWinTemplates.id[2].pos.x = 28 - r1;
     sDialogueBoxWinTemplates.id[2].pos.y = 14 - r2;
@@ -647,7 +646,7 @@ const u8 *FormatString(const u8 *str, u8 *dst, u8 *dstMax, u16 flags)
     bool8 r9 = TRUE;
     dstMax--;
 
-    while (1) {
+    while (TRUE) {
         u8 currChar = *str;
 
         if (currChar == '\0')
diff --git a/src/text_1.c b/src/text_1.c
index 902857bb9..b3076b18c 100644
--- a/src/text_1.c
+++ b/src/text_1.c
@@ -135,14 +135,14 @@ void LoadCharmaps(void)
     gCurrentCharmap = 0;
     sCharmapFiles[0] = OpenFileAndGetFileDataPtr(sKanjiA_file_string, &gSystemFileArchive);
     sCharmapFiles[1] = OpenFileAndGetFileDataPtr(sKanjiB_file_string, &gSystemFileArchive);
-    gCharmaps[0] = (CharMapStruct *) sCharmapFiles[0]->data;
-    gCharmaps[1] = (CharMapStruct *) sCharmapFiles[1]->data;
+    gCharmaps[0] = (CharMapStruct *)sCharmapFiles[0]->data;
+    gCharmaps[1] = (CharMapStruct *)sCharmapFiles[1]->data;
     gCharHeight[0] = 11;
     gCharHeight[1] = 12;
 
-    for (k = 0; k < 4; k++) {
+    for (k = 0; k < MAX_WINDOWS; k++) {
         gWindows[k].width = 0;
-        gWindows[k].unk8 = 0;
+        gWindows[k].heightInTiles = 0;
         gWindows[k].unk46 = 0;
     }
 
@@ -267,7 +267,7 @@ static void ShowWindowsInternal(const WindowTemplates *winTemplates, bool8 a1, b
         if (winTemplates->id[i].width != 0) {
             AddWindow(gWindows, (u32 *)VRAM, sUnknown_20274B4, gBgTilemaps, sUnknown_80B8804[i], &winTemplates->id[i], a1, area, positionModifier, 0);
             sub_80089AC(&winTemplates->id[i], positionModifier);
-            area += winTemplates->id[i].width * winTemplates->id[i].unk10;
+            area += winTemplates->id[i].width * winTemplates->id[i].heightInTiles;
         }
     }
 
@@ -321,7 +321,7 @@ static void AddWindow(Window *windows, u32 *vram, u32 *a2, u16 tilemaps[4][32][3
     newWindow->x = x;
     newWindow->y = y;
     newWindow->width = winTemplate->width;
-    newWindow->unk8 = winTemplate->unk10;
+    newWindow->heightInTiles = winTemplate->heightInTiles;
     newWindow->height = winTemplate->height;
     newWindow->type = winTemplate->type;
     newWindow->unk10 = firstBlockId;
@@ -347,7 +347,7 @@ static void AddWindow(Window *windows, u32 *vram, u32 *a2, u16 tilemaps[4][32][3
     newWindow->unk20 = (newWindow->width * 8) - 8;
     newWindow->unk45 = newWindow->type == WINDOW_TYPE_0;
 
-    if (newWindow->unk8 == 0)
+    if (newWindow->heightInTiles == 0)
         return;
 
     if ((winTemplate->unk0 & 0xA0) != 0x80) {
diff --git a/src/text_2.c b/src/text_2.c
index d68c8f04f..a544462c1 100644
--- a/src/text_2.c
+++ b/src/text_2.c
@@ -6,15 +6,15 @@
 #include "text_2.h"
 
 static void AddUnderScoreHighlightInternal(Window *windows, u32 windowId, s32 x, s32 y, s32 width, u32 color);
-static void DisplayMonPortrait(Window *a0, u16 a1[32][32], s32 a2, const u8 *compressedData, u32 a4);
-static void DisplayMonPortraitFlipped(Window *windows, s32 windowId, const u8 *compressedData, s32 a3);
+static void DisplayMonPortrait(Window *windows, u16 dst[32][32], s32 winID, const u8 *compressedData, u32 palNum);
+static void DisplayMonPortraitFlipped(Window *windows, s32 winID, const u8 *compressedData, s32 palNum);
 static u32 FlipPixelsHorizontally(u32 a0);
 static s32 HexDigitValue(u8 chr);
 static void nullsub_129(u32 windowId, s32 x, s32 y, s32 width, u32 color);
 static void sub_8007AA4(Window *windows, u32 windowId, s32 x, s32 y, s32 a4, u32 color);
 static void sub_8007BA8(Window *windows, u32 windowId, s32 x, s32 y, s32 a4, s32 color);
 static void sub_8007D00(Window *windows, u32 windowId, s32 x, s32 y, s32 a4, s32 color);
-static void sub_8007E64(Window *a0, u16 a1[32][32], u32 a2, s32 a3, s32 a4, s32 a5, s32 a6, u32 *a7, u32 a8);
+static void sub_8007E64(Window *windows, u16 dst[32][32], u32 winID, s32 x, s32 y, s32 w, s32 h, u32 *src, u32 palNum);
 static void sub_8008030(Window *a0, u16 a1[32][32], u32 a2, s32 a3, s32 a4, s32 a5, s32 a6, u32 *a7, u32 a8);
 static void sub_8008334(u32 *r7, u32 *r12);
 static void sub_80084A4(Window *a0, u16 a1[32][32], u32 a2, s32 a3, s32 a4, s32 a5, s32 a6, u32 a8);
@@ -78,7 +78,7 @@ u32 DrawCharOnWindowInternal(Window *windows, s32 x, s32 y, u32 chr, u32 color,
         xDiv8 = x / 8;
         yDiv8 = y / 8;
 
-        if (yDiv8 < window->unk8) {
+        if (yDiv8 < window->heightInTiles) {
             for (i = 0; i < gCharHeight[gCurrentCharmap]; i++) {
                 r2 = (local_44[1] << 0x10) | (local_44[0]);
                 if (r2 != 0) {
@@ -123,7 +123,7 @@ u32 DrawCharOnWindowInternal(Window *windows, s32 x, s32 y, u32 chr, u32 color,
                 if (y % 8 == 0) {
                     r3 += window->unk20;
                     yDiv8++;
-                    if (yDiv8 >= window->unk8)
+                    if (yDiv8 >= window->heightInTiles)
                         break;
                 }
             }
@@ -139,7 +139,7 @@ u32 DrawCharOnWindowInternal(Window *windows, s32 x, s32 y, u32 chr, u32 color,
         xDiv8 = x / 8;
         yDiv8 = y / 8;
 
-        if (yDiv8 < window->unk8) {
+        if (yDiv8 < window->heightInTiles) {
             for (i = 0; i < gCharHeight[gCurrentCharmap]; i++) {
                 r4 = (local_44[1] << 0x10) | (local_44[0]);
                 r2 = (0x11111111 & r4) + (sp18 & r4);
@@ -216,7 +216,7 @@ u32 DrawCharOnWindowInternal(Window *windows, s32 x, s32 y, u32 chr, u32 color,
                 if (y % 8 == 0) {
                     r3 += window->unk20;
                     yDiv8++;
-                    if (yDiv8 >= window->unk8)
+                    if (yDiv8 >= window->heightInTiles)
                         break;
                 }
             }
@@ -267,7 +267,7 @@ static void AddUnderScoreHighlightInternal(Window *windows, u32 windowId, s32 x,
     dest += (r4 * -8) + y;
     r6 = x / 8;
 
-    if (y / 8 >= window->unk8) {
+    if (y / 8 >= window->heightInTiles) {
         return;
     }
     else {
@@ -333,7 +333,7 @@ static void sub_8007AA4(Window *windows, u32 windowId, s32 x, s32 y, s32 a4, u32
     if (r2 < window->width) {
         // This goto looks like a fakematch, but I couldn't get it to work otherwise.
         goto LOOP_MIDDLE;
-        while (1) {
+        while (TRUE) {
             y++;
             dest++;
             if ((y % 8) == 0)
@@ -343,7 +343,7 @@ static void sub_8007AA4(Window *windows, u32 windowId, s32 x, s32 y, s32 a4, u32
         LOOP_MIDDLE:
             if (a4 <= 0)
                 return;
-            if (r3 >= window->unk8)
+            if (r3 >= window->heightInTiles)
                 return;
 
             dest[0] |= ip;
@@ -374,7 +374,7 @@ static void sub_8007BA8(Window *windows, u32 windowId, s32 x, s32 y, s32 a4, s32
 
     Window *window = &windows[windowId];
     yDiv8 = y / 8;
-    if (yDiv8 >= window->unk8)
+    if (yDiv8 >= window->heightInTiles)
         return;
 
     dst = window->unk18 + (((yDiv8 * window->width) + x / 8) * 8);
@@ -418,7 +418,7 @@ static void sub_8007BA8(Window *windows, u32 windowId, s32 x, s32 y, s32 a4, s32
         if ((y % 8) == 0) {
             dst += window->unk20;
             yDiv8++;
-            if (yDiv8 >= window->unk8)
+            if (yDiv8 >= window->heightInTiles)
                 return;
         }
     }
@@ -443,7 +443,7 @@ static void sub_8007D00(Window *windows, u32 windowId, s32 x, s32 y, s32 a4, s32
 
     Window *window = &windows[windowId];
     yDiv8 = y / 8;
-    if (yDiv8 >= window->unk8)
+    if (yDiv8 >= window->heightInTiles)
         return;
 
     dst = window->unk18 + (((yDiv8 * window->width) + x / 8) * 8);
@@ -487,68 +487,75 @@ static void sub_8007D00(Window *windows, u32 windowId, s32 x, s32 y, s32 a4, s32
         if ((y % 8) == 0) {
             dst += window->unk20;
             yDiv8++;
-            if (yDiv8 >= window->unk8)
+            if (yDiv8 >= window->heightInTiles)
                 return;
         }
     }
 }
 
-void sub_8007E20(u32 a0, u32 a1, u32 a2, u32 a3, u32 a4, u32 *a5, u32 a6)
+void sub_8007E20(u32 winID, u32 x, u32 y, u32 w, u32 h, u32* src, u32 palNum)
 {
-    sub_8007E64(gWindows, gBgTilemaps[0], a0, a1, a2, a3, a4, a5, a6);
+    sub_8007E64(gWindows, gBgTilemaps[0], winID, x, y, w, h, src, palNum);
 }
 
 UNUSED static void nullsub_160(void)
 {
 }
 
-static void sub_8007E64(Window *a0, u16 a1[32][32], u32 a2, s32 a3, s32 a4, s32 a5, s32 a6, u32 *a7, u32 a8)
+static void sub_8007E64(Window *windows, u16 dst[32][32], u32 winID, s32 x, s32 y, s32 w, s32 h, u32* src, u32 palNum)
 {
-    s32 i, j;
-    Window *window = &a0[a2];
+    s32 iterY;
+    s32 iterX;
+    Window *win = &windows[winID];
 
-    a3 /= 8;
-    a4 /= 8;
-    a5 /= 8;
-    a6 /= 8;
-    a8 *= 4096;
-    if (a4 < window->unk8) {
-        s32 id = (window->width * a4) + a3;
-        u32 *unk18Ptr = &window->unk18[id * 8];
+    x /= 8;
+    y /= 8;
+    w /= 8;
+    h /= 8;
+    palNum <<= 12; // Pal shift
 
-        for (i = 0; i < a6; i++) {
-            s32 xMaybe = a3;
+    if (y < win->heightInTiles) {
+        s32 id = (win->width * y) + x;
+        u32 *unk18Ptr = &win->unk18[id * 8];
+
+        for (iterY = 0; iterY < h; iterY++) {
+            s32 curX = x;
             u32 *loopUnk18Ptr = unk18Ptr;
-            for (j = 0; j < a5; j++) {
-                if (xMaybe < window->width) {
-                    if (window->unk3C > loopUnk18Ptr) {
-                        window->unk3C = loopUnk18Ptr;
-                    }
-                    *(loopUnk18Ptr++) = *(a7++);
-                    *(loopUnk18Ptr++) = *(a7++);
-                    *(loopUnk18Ptr++) = *(a7++);
-                    *(loopUnk18Ptr++) = *(a7++);
-                    *(loopUnk18Ptr++) = *(a7++);
-                    *(loopUnk18Ptr++) = *(a7++);
-                    *(loopUnk18Ptr++) = *(a7++);
-                    *(loopUnk18Ptr++) = *a7;
-                    if (window->unk40 < loopUnk18Ptr) {
-                        window->unk40 = loopUnk18Ptr;
-                    }
-                    a7++;
-                    a1[window->y + a4][window->x + xMaybe] &= 0xFFF;
-                    a1[window->y + a4][window->x + xMaybe] |= a8;
+
+            for (iterX = 0; iterX < w; iterX++) {
+                if (curX < win->width) {
+                    if (win->unk3C > loopUnk18Ptr)
+                        win->unk3C = loopUnk18Ptr;
+
+                    *(loopUnk18Ptr++) = *(src++);
+                    *(loopUnk18Ptr++) = *(src++);
+                    *(loopUnk18Ptr++) = *(src++);
+                    *(loopUnk18Ptr++) = *(src++);
+                    *(loopUnk18Ptr++) = *(src++);
+                    *(loopUnk18Ptr++) = *(src++);
+                    *(loopUnk18Ptr++) = *(src++);
+                    *(loopUnk18Ptr++) = *src;
+
+                    if (win->unk40 < loopUnk18Ptr)
+                        win->unk40 = loopUnk18Ptr;
+
+                    src++;
+                    dst[win->y + y][win->x + curX] &= 0xFFF;
+                    dst[win->y + y][win->x + curX] |= palNum;
                 }
                 else {
                     loopUnk18Ptr += 8;
-                    a7 += 8;
+                    src += 8;
                 }
-                xMaybe++;
+
+                curX++;
             }
-            a4++;
-            unk18Ptr += window->unk20;
+
+            y++;
+            unk18Ptr += win->unk20;
             unk18Ptr += 8;
-            if (a4 >= window->unk8)
+
+            if (y >= win->heightInTiles)
                 break;
         }
     }
@@ -589,8 +596,9 @@ static void sub_8008030(Window *a0, u16 a1[32][32], u32 a2, s32 a3, s32 a4, s32
     a4 /= 8;
     a5 /= 8;
     a6 /= 8;
-    a8 *= 4096;
-    if (a4 < window->unk8) {
+    a8 <<= 12; // Pal shift
+
+    if (a4 < window->heightInTiles) {
         u32 *unk18Ptr = &window->unk18[((window->width * a4) + (a3 + a5)) * 8];
         for (i = 0; i < a6; i++) {
             s32 xMaybe = a3 + a5;
@@ -623,7 +631,7 @@ static void sub_8008030(Window *a0, u16 a1[32][32], u32 a2, s32 a3, s32 a4, s32
             a4++;
             unk18Ptr += window->unk20;
             unk18Ptr += 8;
-            if (a4 >= window->unk8)
+            if (a4 >= window->heightInTiles)
                 break;
         }
     }
@@ -640,7 +648,8 @@ UNUSED static void sub_80081A4(s32 a0, s32 a3, s32 a4, s32 a7Id)
     a4 /= 8;
     a5 = 2;
     a6 = 2;
-    if (a4 < window->unk8) {
+
+    if (a4 < window->heightInTiles) {
         s32 id = (window->width * a4) + a3;
         u32 *unk18Ptr = &window->unk28[id * 8];
 
@@ -668,34 +677,39 @@ UNUSED static void sub_80081A4(s32 a0, s32 a3, s32 a4, s32 a7Id)
             a4++;
             unk18Ptr += window->unk20;
             unk18Ptr += 8;
-            if (a4 >= window->unk8)
+
+            if (a4 >= window->heightInTiles)
                 break;
         }
     }
 }
 
-void DisplayMonPortraitSprite(s32 a0, const u8 *compressedData, s32 a2)
+void DisplayMonPortraitSprite(s32 winID, const u8 *compressedData, s32 palNum)
 {
-    DisplayMonPortrait(gWindows, gBgTilemaps[0], a0, compressedData, a2);
+    DisplayMonPortrait(gWindows, gBgTilemaps[0], winID, compressedData, palNum);
 }
 
 UNUSED static void nullsub_162(void)
 {
 }
 
-static void DisplayMonPortrait(Window *a0, u16 a1[32][32], s32 a2, const u8 *compressedData, u32 a4)
+static void DisplayMonPortrait(Window *windows, u16 dst[32][32], s32 winID, const u8 *compressedData, u32 palNum)
 {
-    s32 i, j;
-    Window *window = &a0[a2];
+    s32 iterY;
+    s32 iterX;
+    Window *window = &windows[winID];
 
-    a4 *= 4096;
-    DecompressAT((u8 *)window->unk18, (window->width * 32) * window->unk8, compressedData);
-    for (i = 0; i < window->unk8; i++) {
-        for (j = 0; j < window->width; j++) {
-            a1[window->y + i][window->x + j] &= 0xFFF;
-            a1[window->y + i][window->x + j] |= a4;
+    palNum <<= 12; // Pal shift
+
+    DecompressAT((u8 *)window->unk18, (window->width * 32) * window->heightInTiles, compressedData);
+
+    for (iterY = 0; iterY < window->heightInTiles; iterY++) {
+        for (iterX = 0; iterX < window->width; iterX++) {
+            dst[window->y + iterY][window->x + iterX] &= 0xFFF;
+            dst[window->y + iterY][window->x + iterX] |= palNum;
         }
     }
+
     window->unk30 = window->unk28;
     window->unk34 = window->unk1C;
     window->unk38 = window->unk2C;
@@ -726,32 +740,37 @@ static void sub_8008334(u32 *r7, u32 *r12)
     *r12 = r2;
 }
 
-void DisplayMonPortraitSpriteFlipped(s32 a0, const u8 *compressedData, s32 a1)
+void DisplayMonPortraitSpriteFlipped(s32 winID, const u8 *compressedData, s32 palNum)
 {
-    DisplayMonPortraitFlipped(gWindows, a0, compressedData, a1);
+    DisplayMonPortraitFlipped(gWindows, winID, compressedData, palNum);
 }
 
 UNUSED static void nullsub_163(void)
 {
 }
 
-static void DisplayMonPortraitFlipped(Window *windows, s32 windowId, const u8 *compressedData, s32 a3)
+static void DisplayMonPortraitFlipped(Window *windows, s32 winID, const u8 *compressedData, s32 palNum)
 {
-    s32 i, j;
-    Window *window = &windows[windowId];
+    s32 iterY;
+    s32 iterX;
+    Window *window = &windows[winID];
 
-    DisplayMonPortraitSprite(windowId, compressedData, a3);
-    for (i = 0; i < window->unk8; i++) {
+    DisplayMonPortraitSprite(winID, compressedData, palNum);
+
+    for (iterY = 0; iterY < window->heightInTiles; iterY++) {
         s32 r8 = window->width / 2;
+
         if (window->width & 1)
             r8++;
-        for (j = 0; j < r8; j++) {
-            u32 *r4, *r5;
-            s32 unk4Mul = window->width * i;
 
-            r4 = &window->unk18[(unk4Mul + j) * 8];
-            unk4Mul--;
-            r5 = &window->unk18[(unk4Mul + (window->width - j)) * 8];
+        for (iterX = 0; iterX < r8; iterX++) {
+            u32 *r4;
+            u32 *r5;
+            s32 baseVal = window->width * iterY;
+
+            r4 = &window->unk18[(baseVal + iterX) * 8];
+            baseVal--;
+            r5 = &window->unk18[(baseVal + (window->width - iterX)) * 8];
 
             sub_8008334(r4++, r5++);
             sub_8008334(r4++, r5++);
@@ -784,8 +803,9 @@ static void sub_80084A4(Window *a0, u16 a1[32][32], u32 a2, s32 a3, s32 a4, s32
     a4 /= 8;
     a5 /= 8;
     a6 /= 8;
-    a8 *= 4096;
-    if (a4 < window->unk8) {
+    a8 <<= 12; // Pal shift
+
+    if (a4 < window->heightInTiles) {
         for (i = 0; i < a6; i++) {
             s32 xMaybe = a3;
             for (j = 0; j < a5; j++) {
@@ -796,7 +816,8 @@ static void sub_80084A4(Window *a0, u16 a1[32][32], u32 a2, s32 a3, s32 a4, s32
                 xMaybe++;
             }
             a4++;
-            if (a4 >= window->unk8)
+
+            if (a4 >= window->heightInTiles)
                 break;
         }
     }
@@ -923,8 +944,8 @@ UNUSED static void sub_80086C8(Window *windows, s32 windowId, s32 a2, s32 a3, s3
     if (a4 + a2 > window->width * 8) {
         a4 = (window->width * 8) - a2;
     }
-    if (a3 + a5 > window->unk8 * 8) {
-        a5 = (window->unk8 * 8) - a3;
+    if (a3 + a5 > window->heightInTiles * 8) {
+        a5 = (window->heightInTiles * 8) - a3;
     }
 
     r2 = window->width * (a3 / 8);
@@ -1255,13 +1276,13 @@ void PrepareTextbox_8008C6C(Window *windows, u32 windowId)
     Window *window = &windows[windowId];
 
     if (!window->unk45) {
-        s32 count = (window->width * window->unk8) * 32;
+        s32 count = (window->width * window->heightInTiles) * 32;
         for (i = 0; i < count; i += 32) {
             CpuClear(&window->unk18[i / 4u], 32);
         }
     }
     else {
-        s32 count = (window->width * (window->unk8 - 1)) * 32;
+        s32 count = (window->width * (window->heightInTiles - 1)) * 32;
         u32 *ptr = window->unk18;
         for (i = 0; i < window->width; i++) {
             *(ptr++) = 0xFFFFFFFF;
diff --git a/src/text_4.c b/src/text_4.c
index e7d88e12e..839a71fe4 100644
--- a/src/text_4.c
+++ b/src/text_4.c
@@ -19,7 +19,7 @@ IWRAM_INIT static void ScrollDownWindowInternal(Window *windows, s32 windowId)
 {
     Window *window = &windows[windowId];
 
-    if (window->unk8 > 0) {
+    if (window->heightInTiles > 0) {
         s32 i, j;
         u32 *dstPtr;
         s32 n;
@@ -30,11 +30,11 @@ IWRAM_INIT static void ScrollDownWindowInternal(Window *windows, s32 windowId)
             s32 dstAdd = ((window->unk24 + 2) * 8);
             dstAdd *= unk4;
             dstPtr = window->unk18 + dstAdd;
-            n = window->unk8 - 2;
+            n = window->heightInTiles - 2;
         }
         else {
             dstPtr = window->unk18;
-            n = window->unk8;
+            n = window->heightInTiles;
         }
 
         id8 = window->unk20 + 8;
@@ -82,21 +82,24 @@ IWRAM_INIT static void ScrollUpWindowInternal(Window *windows, s32 windowId)
 {
     Window *window = &windows[windowId];
 
-    if (window->unk8 > 0) {
-        s32 i, j;
+    if (window->heightInTiles > 0) {
+        s32 i;
+        s32 j;
         u32 *dstPtr;
         s32 n;
         s32 id8;
-        s32 unk4, unk8, dstAdd;
+        s32 unk4;
+        s32 unk8;
+        s32 dstAdd;
 
         if (window->type == WINDOW_TYPE_WITH_HEADER) {
-            n = window->unk8 - 2;
+            n = window->heightInTiles - 2;
         }
         else {
-            n = window->unk8;
+            n = window->heightInTiles;
         }
 
-        unk8 = window->unk8 - 1;
+        unk8 = window->heightInTiles - 1;
         unk4 = window->width;
         dstAdd = (unk8 * unk4) * 8;
         dstPtr = window->unk18 + dstAdd;
diff --git a/src/text_util.c b/src/text_util.c
index 358931698..cf9b1ce59 100644
--- a/src/text_util.c
+++ b/src/text_util.c
@@ -24,7 +24,7 @@ UNUSED static void sub_8092290(u8 *buffer, u8 *string)
 
 void StrncpyCustom(u8 *buffer, const u8 *string, s32 n)
 {
-    while(1) {
+    while (TRUE) {
         if (n-- <= 0 || *string == '\0') {
             break;
         }
diff --git a/src/weather.c b/src/weather.c
index 53267af76..0ecf0ded7 100644
--- a/src/weather.c
+++ b/src/weather.c
@@ -86,7 +86,7 @@ static void sub_807E698(bool8 arg0)
 {
     s32 i, j;
     s32 weatherArrId = GetApparentWeather(NULL) * COLOR_RAMP_COUNT;
-    RGB *fileData = (void *) gUnknown_202ECA0->data;
+    RGB_Struct *fileData = (void *) gUnknown_202ECA0->data;
     u8 savedByte;
 
     sub_8042818(GetApparentWeather(NULL), arg0);
@@ -177,7 +177,7 @@ void sub_807E88C(void)
 {
     s32 i;
     s32 weatherArrId = GetApparentWeather(0) * COLOR_RAMP_COUNT;
-    RGB *fileData = (void *) gUnknown_202ECA0->data;
+    RGB_Struct *fileData = (void *) gUnknown_202ECA0->data;
 
     for (i = 0; i < COLOR_RAMP_COUNT; i++) {
         gDungeon->colorRamp[i].r = fileData[weatherArrId + i].r;
diff --git a/src/wonder_mail_2.c b/src/wonder_mail_2.c
index f492a5900..18cf6a651 100644
--- a/src/wonder_mail_2.c
+++ b/src/wonder_mail_2.c
@@ -14,6 +14,7 @@
 #include "menu_input.h"
 #include "pokemon.h"
 #include "pokemon_mail.h"
+#include "rescue_team_info.h"
 #include "save.h"
 #include "save_write.h"
 #include "string_format.h"
@@ -40,7 +41,6 @@ enum States {
 
 static EWRAM_INIT struct unkStruct_203B2C8 *sUnknown_203B2C8 = {NULL};
 
-extern void sub_80920D8(u8 *buffer);
 extern void sub_802B548(u32);
 
 extern void sub_802B560(void);
diff --git a/src/world_map.c b/src/world_map.c
index 2750f7e90..d3da0a9a0 100644
--- a/src/world_map.c
+++ b/src/world_map.c
@@ -30,18 +30,24 @@ static EWRAM_INIT struct WorldMap *sWorldMapPtr = NULL;
 static EWRAM_INIT WindowTemplates sWorldMapWindows = {
     .id = {
         [0] = {
+            .unk0 = 0,
             .type = WINDOW_TYPE_NORMAL,
-            .pos = {2, 10},
+            .pos = { 2, 10 },
             .width = 26,
             .height = 9,
-            .unk10 = 9,
+            .heightInTiles = 9,
+            .unk12 = 0,
+            .header = NULL,
         },
         [1] = {
+            .unk0 = 0,
             .type = WINDOW_TYPE_NORMAL,
-            .pos = {23, 6},
+            .pos = { 23, 6 },
             .width = 5,
             .height = 3,
-            .unk10 = 3,
+            .heightInTiles = 3,
+            .unk12 = 0,
+            .header = NULL,
         },
         [2] = WIN_TEMPLATE_DUMMY,
         [3] = WIN_TEMPLATE_DUMMY,
@@ -424,7 +430,7 @@ static bool8 FadeScreen(void)
 
     if (sWorldMapPtr->brightness < 31) {
         s32 i;
-        RGB *color = (void *) sWorldMapPtr->unk1100[0]->data;
+        RGB_Struct *color = (void *) sWorldMapPtr->unk1100[0]->data;
 
         if (++sWorldMapPtr->brightness >= 31) {
             sWorldMapPtr->brightness = 31;
@@ -478,11 +484,14 @@ static void PrintDungeonName(DungeonLocation *dungLocation)
     WindowTemplates windows = {
         .id = {
             [0] = {
+                .unk0 = 0,
                 .type = WINDOW_TYPE_NORMAL,
-                .pos = {12, 2},
+                .pos = { 12, 2 },
                 .width = 16,
                 .height = 2,
-                .unk10 = 2,
+                .heightInTiles = 2,
+                .unk12 = 0,
+                .header = NULL,
             },
             [1] = WIN_TEMPLATE_DUMMY,
             [2] = WIN_TEMPLATE_DUMMY,
@@ -533,7 +542,7 @@ static bool8 PlayerEnterDungeonPrompt_Async(u8 *str)
     height /= 8;
 
     sWorldMapWindows.id[0].pos.y = 19 - height;
-    sWorldMapWindows.id[0].unk10 = height;
+    sWorldMapWindows.id[0].heightInTiles = height;
     sWorldMapWindows.id[0].height = height;
     sWorldMapWindows.id[1].pos.y = 14 - height;
     ShowWindows(&sWorldMapWindows, TRUE, TRUE);