Document decor icons

3 files changed, 209 insertions, 208 deletions

diff --git a/src/data/decoration/icon.h b/src/data/decoration/icon.h
index 58d9cea7b..b29dab20f 100644
--- a/src/data/decoration/icon.h
+++ b/src/data/decoration/icon.h
@@ -1,123 +1,124 @@
-const u32 *const gUnknown_085A6BE8[][2] = {
-    {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
-    {NULL, NULL},
-    {NULL, NULL},
-    {gUnknown_08DB7AA0, gUnknown_08DB7B34},
-    {gUnknown_08DB7B5C, gUnknown_08DB7BEC},
-    {gUnknown_08DB7C08, gUnknown_08DB7CE8},
-    {gUnknown_08DB7D08, gUnknown_08DB7DCC},
-    {gUnknown_08DB7DF4, gUnknown_08DB7EA0},
-    {gUnknown_08DB7EC4, gUnknown_08DB7F60},
-    {gUnknown_08DB7F7C, gUnknown_08DB8070},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {gUnknown_08DB808C, gUnknown_08DB8138},
-    {gUnknown_08DB8160, gUnknown_08DB8218},
-    {gUnknown_08DB823C, gUnknown_08DB8300},
-    {gUnknown_08DB8328, gUnknown_08DB8430},
-    {gUnknown_08DB8458, gUnknown_08DB8528},
-    {gUnknown_08DB854C, gUnknown_08DB862C},
-    {gUnknown_08DB8654, gUnknown_08DB86C4},
-    {gUnknown_08DB86E0, gUnknown_08DB8750},
-    {gUnknown_08DB876C, gUnknown_08DB87DC},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {gUnknown_08DB87F8, gUnknown_08DB88D8},
-    {gUnknown_08DB8900, gUnknown_08DB89E0},
-    {gUnknown_08DB8A08, gUnknown_08DB8A68},
-    {gUnknown_08DB8A84, gUnknown_08DB8B40},
-    {NULL, NULL},
-    {NULL, NULL},
-    {gUnknown_08DB8B68, gUnknown_08DB8C40},
-    {gUnknown_08DB8C5C, gUnknown_08DB8CF4},
-    {NULL, NULL},
-    {gUnknown_08DB8D18, gUnknown_08DB8DB0},
-    {gUnknown_08DB8DD4, gUnknown_08DB8E80},
-    {NULL, NULL},
-    {NULL, NULL},
-    {gUnknown_08DB8EA0, gUnknown_08DB8F58},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {gUnknown_08DB8F7C, gUnknown_08DB9038},
-    {gUnknown_08DB9058, gUnknown_08DB9130},
-    {gUnknown_08DB9154, gUnknown_08DB9218},
-    {gUnknown_08DB9234, gUnknown_08DB92FC},
-    {gUnknown_08DB931C, gUnknown_08DB93E8},
-    {gUnknown_08DB940C, gUnknown_08DB94CC},
-    {gUnknown_08DB94E8, gUnknown_08DB95AC},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {NULL, NULL},
-    {gUnknown_08DB95D0, gUnknown_08DB96C4},
-    {gUnknown_08DB96EC, gUnknown_08DB97F4},
-    {gUnknown_08DB981C, gUnknown_08DB9908},
-    {gUnknown_08DB9930, gUnknown_08DB9A54},
-    {gUnknown_08DB9A7C, gUnknown_08DB9B7C},
-    {gUnknown_08DB9BA4, gUnknown_08DB9CB0},
-    {gUnknown_08DB9CD8, gUnknown_08DB9DAC},
-    {gUnknown_08DB9F08, gUnknown_08DB9FFC},
-    {gUnknown_08DB9DD4, gUnknown_08DB9EE4},
-    {gUnknown_08DBA020, gUnknown_08DBA12C}
+const u32 *const gDecorIconTable[][2] = 
+{
+    [DECOR_NONE]            = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [DECOR_SMALL_DESK]      = {NULL, NULL},
+    [DECOR_POKEMON_DESK]    = {NULL, NULL},
+    [DECOR_HEAVY_DESK]      = {gDecorIcon_HeavyDesk, gDecorIconPalette_HeavyDesk},
+    [DECOR_RAGGED_DESK]     = {gDecorIcon_RaggedDesk, gDecorIconPalette_RaggedDesk},
+    [DECOR_COMFORT_DESK]    = {gDecorIcon_ComfortDesk, gDecorIconPalette_ComfortDesk},
+    [DECOR_PRETTY_DESK]     = {gDecorIcon_PrettyDesk, gDecorIconPalette_PrettyDesk},
+    [DECOR_BRICK_DESK]      = {gDecorIcon_BrickDesk, gDecorIconPalette_BrickDesk},
+    [DECOR_CAMP_DESK]       = {gDecorIcon_CampDesk, gDecorIconPalette_CampDesk},
+    [DECOR_HARD_DESK]       = {gDecorIcon_HardDesk, gDecorIconPalette_HardDesk},
+    [DECOR_SMALL_CHAIR]     = {NULL, NULL},
+    [DECOR_POKEMON_CHAIR]   = {NULL, NULL},
+    [DECOR_HEAVY_CHAIR]     = {NULL, NULL},
+    [DECOR_PRETTY_CHAIR]    = {NULL, NULL},
+    [DECOR_COMFORT_CHAIR]   = {NULL, NULL},
+    [DECOR_RAGGED_CHAIR]    = {NULL, NULL},
+    [DECOR_BRICK_CHAIR]     = {NULL, NULL},
+    [DECOR_CAMP_CHAIR]      = {NULL, NULL},
+    [DECOR_HARD_CHAIR]      = {NULL, NULL},
+    [DECOR_RED_PLANT]       = {gDecorIcon_RedPlant, gDecorIconPalette_RedPlant},
+    [DECOR_TROPICAL_PLANT]  = {gDecorIcon_TropicalPlant, gDecorIconPalette_TropicalPlant},
+    [DECOR_PRETTY_FLOWERS]  = {gDecorIcon_PrettyFlowers, gDecorIconPalette_PrettyFlowers},
+    [DECOR_COLORFUL_PLANT]  = {gDecorIcon_ColorfulPlant, gDecorIconPalette_ColorfulPlant},
+    [DECOR_BIG_PLANT]       = {gDecorIcon_BigPlant, gDecorIconPalette_BigPlant},
+    [DECOR_GORGEOUS_PLANT]  = {gDecorIcon_GorgeousPlant, gDecorIconPalette_GorgeousPlant},
+    [DECOR_RED_BRICK]       = {gDecorIcon_RedBrick, gDecorIconPalette_RedBrick},
+    [DECOR_YELLOW_BRICK]    = {gDecorIcon_YellowBrick, gDecorIconPalette_YellowBrick},
+    [DECOR_BLUE_BRICK]      = {gDecorIcon_BlueBrick, gDecorIconPalette_BlueBrick},
+    [DECOR_RED_BALLOON]     = {NULL, NULL},
+    [DECOR_BLUE_BALLOON]    = {NULL, NULL},
+    [DECOR_YELLOW_BALLOON]  = {NULL, NULL},
+    [DECOR_RED_TENT]        = {gDecorIcon_RedTent, gDecorIconPalette_RedTent},
+    [DECOR_BLUE_TENT]       = {gDecorIcon_BlueTent, gDecorIconPalette_BlueTent},
+    [DECOR_SOLID_BOARD]     = {gDecorIcon_SolidBoard, gDecorIconPalette_SolidBoard},
+    [DECOR_SLIDE]           = {gDecorIcon_Slide, gDecorIconPalette_Slide},
+    [DECOR_FENCE_LENGTH]    = {NULL, NULL},
+    [DECOR_FENCE_WIDTH]     = {NULL, NULL},
+    [DECOR_TIRE]            = {gDecorIcon_Tire, gDecorIconPalette_Tire},
+    [DECOR_STAND]           = {gDecorIcon_Stand, gDecorIconPalette_Stand},
+    [DECOR_MUD_BALL]        = {NULL, NULL},
+    [DECOR_BREAKABLE_DOOR]  = {gDecorIcon_BreakableDoor, gDecorIconPalette_BreakableDoor},
+    [DECOR_SAND_ORNAMENT]   = {gDecorIcon_SandOrnament, gDecorIconPalette_SandOrnament},
+    [DECOR_SILVER_SHIELD]   = {NULL, NULL},
+    [DECOR_GOLD_SHIELD]     = {NULL, NULL},
+    [DECOR_GLASS_ORNAMENT]  = {gDecorIcon_GlassOrnament, gDecorIconPalette_GlassOrnament},
+    [DECOR_TV]              = {NULL, NULL},
+    [DECOR_ROUND_TV]        = {NULL, NULL},
+    [DECOR_CUTE_TV]         = {NULL, NULL},
+    [DECOR_GLITTER_MAT]     = {NULL, NULL},
+    [DECOR_JUMP_MAT]        = {NULL, NULL},
+    [DECOR_SPIN_MAT]        = {NULL, NULL},
+    [DECOR_C_LOW_NOTE_MAT]  = {NULL, NULL},
+    [DECOR_D_NOTE_MAT]      = {NULL, NULL},
+    [DECOR_E_NOTE_MAT]      = {NULL, NULL},
+    [DECOR_F_NOTE_MAT]      = {NULL, NULL},
+    [DECOR_G_NOTE_MAT]      = {NULL, NULL},
+    [DECOR_A_NOTE_MAT]      = {NULL, NULL},
+    [DECOR_B_NOTE_MAT]      = {NULL, NULL},
+    [DECOR_C_HIGH_NOTE_MAT] = {NULL, NULL},
+    [DECOR_SURF_MAT]        = {gDecorIcon_SurfMat, gDecorIconPalette_SurfMat},
+    [DECOR_THUNDER_MAT]     = {gDecorIcon_ThunderMat, gDecorIconPalette_ThunderMat},
+    [DECOR_FIRE_BLAST_MAT]  = {gDecorIcon_FireBlastMat, gDecorIconPalette_FireBlastMat},
+    [DECOR_POWDER_SNOW_MAT] = {gDecorIcon_PowderSnowMat, gDecorIconPalette_PowderSnowMat},
+    [DECOR_ATTRACT_MAT]     = {gDecorIcon_AttractMat, gDecorIconPalette_AttractMat},
+    [DECOR_FISSURE_MAT]     = {gDecorIcon_FissureMat, gDecorIconPalette_FissureMat},
+    [DECOR_SPIKES_MAT]      = {gDecorIcon_SpikesMat, gDecorIconPalette_SpikesMat},
+    [DECOR_BALL_POSTER]     = {NULL, NULL},
+    [DECOR_GREEN_POSTER]    = {NULL, NULL},
+    [DECOR_RED_POSTER]      = {NULL, NULL},
+    [DECOR_BLUE_POSTER]     = {NULL, NULL},
+    [DECOR_CUTE_POSTER]     = {NULL, NULL},
+    [DECOR_PIKA_POSTER]     = {NULL, NULL},
+    [DECOR_LONG_POSTER]     = {NULL, NULL},
+    [DECOR_SEA_POSTER]      = {NULL, NULL},
+    [DECOR_SKY_POSTER]      = {NULL, NULL},
+    [DECOR_KISS_POSTER]     = {NULL, NULL},
+    [DECOR_PICHU_DOLL]      = {NULL, NULL},
+    [DECOR_PIKACHU_DOLL]    = {NULL, NULL},
+    [DECOR_MARILL_DOLL]     = {NULL, NULL},
+    [DECOR_TOGEPI_DOLL]     = {NULL, NULL},
+    [DECOR_CYNDAQUIL_DOLL]  = {NULL, NULL},
+    [DECOR_CHIKORITA_DOLL]  = {NULL, NULL},
+    [DECOR_TOTODILE_DOLL]   = {NULL, NULL},
+    [DECOR_JIGGLYPUFF_DOLL] = {NULL, NULL},
+    [DECOR_MEOWTH_DOLL]     = {NULL, NULL},
+    [DECOR_CLEFAIRY_DOLL]   = {NULL, NULL},
+    [DECOR_DITTO_DOLL]      = {NULL, NULL},
+    [DECOR_SMOOCHUM_DOLL]   = {NULL, NULL},
+    [DECOR_TREECKO_DOLL]    = {NULL, NULL},
+    [DECOR_TORCHIC_DOLL]    = {NULL, NULL},
+    [DECOR_MUDKIP_DOLL]     = {NULL, NULL},
+    [DECOR_DUSKULL_DOLL]    = {NULL, NULL},
+    [DECOR_WYNAUT_DOLL]     = {NULL, NULL},
+    [DECOR_BALTOY_DOLL]     = {NULL, NULL},
+    [DECOR_KECLEON_DOLL]    = {NULL, NULL},
+    [DECOR_AZURILL_DOLL]    = {NULL, NULL},
+    [DECOR_SKITTY_DOLL]     = {NULL, NULL},
+    [DECOR_SWABLU_DOLL]     = {NULL, NULL},
+    [DECOR_GULPIN_DOLL]     = {NULL, NULL},
+    [DECOR_LOTAD_DOLL]      = {NULL, NULL},
+    [DECOR_SEEDOT_DOLL]     = {NULL, NULL},
+    [DECOR_PIKA_CUSHION]    = {NULL, NULL},
+    [DECOR_ROUND_CUSHION]   = {NULL, NULL},
+    [DECOR_KISS_CUSHION]    = {NULL, NULL},
+    [DECOR_ZIGZAG_CUSHION]  = {NULL, NULL},
+    [DECOR_SPIN_CUSHION]    = {NULL, NULL},
+    [DECOR_DIAMOND_CUSHION] = {NULL, NULL},
+    [DECOR_BALL_CUSHION]    = {NULL, NULL},
+    [DECOR_GRASS_CUSHION]   = {NULL, NULL},
+    [DECOR_FIRE_CUSHION]    = {NULL, NULL},
+    [DECOR_WATER_CUSHION]   = {NULL, NULL},
+    [DECOR_SNORLAX_DOLL]    = {gDecorIcon_SnorlaxDoll, gDecorIconPalette_SnorlaxDoll},
+    [DECOR_RHYDON_DOLL]     = {gDecorIcon_RhydonDoll, gDecorIconPalette_RhydonDoll},
+    [DECOR_LAPRAS_DOLL]     = {gDecorIcon_LaprasDoll, gDecorIconPalette_LaprasDoll},
+    [DECOR_VENUSAUR_DOLL]   = {gDecorIcon_VenusaurDoll, gDecorIconPalette_VenusaurDoll},
+    [DECOR_CHARIZARD_DOLL]  = {gDecorIcon_CharizardDoll, gDecorIconPalette_CharizardDoll},
+    [DECOR_BLASTOISE_DOLL]  = {gDecorIcon_BlastoiseDoll, gDecorIconPalette_BlastoiseDoll},
+    [DECOR_WAILMER_DOLL]    = {gDecorIcon_WailmerDoll, gDecorIconPalette_WailmerDoll},
+    [DECOR_REGIROCK_DOLL]   = {gDecorIcon_RegirockDoll, gDecorIconPalette_RegirockDoll},
+    [DECOR_REGICE_DOLL]     = {gDecorIcon_RegiceDoll, gDecorIconPalette_RegiceDoll},
+    [DECOR_REGISTEEL_DOLL]  = {gDecorIcon_RegisteelDoll, gDecorIconPalette_RegisteelDoll}
 };
diff --git a/src/data/graphics/decorations.h b/src/data/graphics/decorations.h
index 62d86d48e..d8b865fcf 100644
--- a/src/data/graphics/decorations.h
+++ b/src/data/graphics/decorations.h
@@ -1,125 +1,125 @@
-const u32 gUnknown_08DB7AA0[] = INCBIN_U32("graphics/decorations/decor_heavy_desk.4bpp.lz");
-const u32 gUnknown_08DB7B34[] = INCBIN_U32("graphics/decorations/decor_heavy_desk.gbapal.lz");
+const u32 gDecorIcon_HeavyDesk[] = INCBIN_U32("graphics/decorations/decor_heavy_desk.4bpp.lz");
+const u32 gDecorIconPalette_HeavyDesk[] = INCBIN_U32("graphics/decorations/decor_heavy_desk.gbapal.lz");
 
-const u32 gUnknown_08DB7B5C[] = INCBIN_U32("graphics/decorations/decor_ragged_desk.4bpp.lz");
-const u32 gUnknown_08DB7BEC[] = INCBIN_U32("graphics/decorations/decor_ragged_desk.gbapal.lz");
+const u32 gDecorIcon_RaggedDesk[] = INCBIN_U32("graphics/decorations/decor_ragged_desk.4bpp.lz");
+const u32 gDecorIconPalette_RaggedDesk[] = INCBIN_U32("graphics/decorations/decor_ragged_desk.gbapal.lz");
 
-const u32 gUnknown_08DB7C08[] = INCBIN_U32("graphics/decorations/decor_comfort_desk.4bpp.lz");
-const u32 gUnknown_08DB7CE8[] = INCBIN_U32("graphics/decorations/decor_comfort_desk.gbapal.lz");
+const u32 gDecorIcon_ComfortDesk[] = INCBIN_U32("graphics/decorations/decor_comfort_desk.4bpp.lz");
+const u32 gDecorIconPalette_ComfortDesk[] = INCBIN_U32("graphics/decorations/decor_comfort_desk.gbapal.lz");
 
-const u32 gUnknown_08DB7D08[] = INCBIN_U32("graphics/decorations/decor_pretty_desk.4bpp.lz");
-const u32 gUnknown_08DB7DCC[] = INCBIN_U32("graphics/decorations/decor_pretty_desk.gbapal.lz");
+const u32 gDecorIcon_PrettyDesk[] = INCBIN_U32("graphics/decorations/decor_pretty_desk.4bpp.lz");
+const u32 gDecorIconPalette_PrettyDesk[] = INCBIN_U32("graphics/decorations/decor_pretty_desk.gbapal.lz");
 
-const u32 gUnknown_08DB7DF4[] = INCBIN_U32("graphics/decorations/decor_brick_desk.4bpp.lz");
-const u32 gUnknown_08DB7EA0[] = INCBIN_U32("graphics/decorations/decor_brick_desk.gbapal.lz");
+const u32 gDecorIcon_BrickDesk[] = INCBIN_U32("graphics/decorations/decor_brick_desk.4bpp.lz");
+const u32 gDecorIconPalette_BrickDesk[] = INCBIN_U32("graphics/decorations/decor_brick_desk.gbapal.lz");
 
-const u32 gUnknown_08DB7EC4[] = INCBIN_U32("graphics/decorations/decor_camp_desk.4bpp.lz");
-const u32 gUnknown_08DB7F60[] = INCBIN_U32("graphics/decorations/decor_camp_desk.gbapal.lz");
+const u32 gDecorIcon_CampDesk[] = INCBIN_U32("graphics/decorations/decor_camp_desk.4bpp.lz");
+const u32 gDecorIconPalette_CampDesk[] = INCBIN_U32("graphics/decorations/decor_camp_desk.gbapal.lz");
 
-const u32 gUnknown_08DB7F7C[] = INCBIN_U32("graphics/decorations/decor_hard_desk.4bpp.lz");
-const u32 gUnknown_08DB8070[] = INCBIN_U32("graphics/decorations/decor_hard_desk.gbapal.lz");
+const u32 gDecorIcon_HardDesk[] = INCBIN_U32("graphics/decorations/decor_hard_desk.4bpp.lz");
+const u32 gDecorIconPalette_HardDesk[] = INCBIN_U32("graphics/decorations/decor_hard_desk.gbapal.lz");
 
-const u32 gUnknown_08DB808C[] = INCBIN_U32("graphics/decorations/decor_red_plant.4bpp.lz");
-const u32 gUnknown_08DB8138[] = INCBIN_U32("graphics/decorations/decor_red_plant.gbapal.lz");
+const u32 gDecorIcon_RedPlant[] = INCBIN_U32("graphics/decorations/decor_red_plant.4bpp.lz");
+const u32 gDecorIconPalette_RedPlant[] = INCBIN_U32("graphics/decorations/decor_red_plant.gbapal.lz");
 
-const u32 gUnknown_08DB8160[] = INCBIN_U32("graphics/decorations/decor_tropical_plant.4bpp.lz");
-const u32 gUnknown_08DB8218[] = INCBIN_U32("graphics/decorations/decor_tropical_plant.gbapal.lz");
+const u32 gDecorIcon_TropicalPlant[] = INCBIN_U32("graphics/decorations/decor_tropical_plant.4bpp.lz");
+const u32 gDecorIconPalette_TropicalPlant[] = INCBIN_U32("graphics/decorations/decor_tropical_plant.gbapal.lz");
 
-const u32 gUnknown_08DB823C[] = INCBIN_U32("graphics/decorations/decor_pretty_flowers.4bpp.lz");
-const u32 gUnknown_08DB8300[] = INCBIN_U32("graphics/decorations/decor_pretty_flowers.gbapal.lz");
+const u32 gDecorIcon_PrettyFlowers[] = INCBIN_U32("graphics/decorations/decor_pretty_flowers.4bpp.lz");
+const u32 gDecorIconPalette_PrettyFlowers[] = INCBIN_U32("graphics/decorations/decor_pretty_flowers.gbapal.lz");
 
-const u32 gUnknown_08DB8328[] = INCBIN_U32("graphics/decorations/decor_colorful_plant.4bpp.lz");
-const u32 gUnknown_08DB8430[] = INCBIN_U32("graphics/decorations/decor_colorful_plant.gbapal.lz");
+const u32 gDecorIcon_ColorfulPlant[] = INCBIN_U32("graphics/decorations/decor_colorful_plant.4bpp.lz");
+const u32 gDecorIconPalette_ColorfulPlant[] = INCBIN_U32("graphics/decorations/decor_colorful_plant.gbapal.lz");
 
-const u32 gUnknown_08DB8458[] = INCBIN_U32("graphics/decorations/decor_big_plant.4bpp.lz");
-const u32 gUnknown_08DB8528[] = INCBIN_U32("graphics/decorations/decor_big_plant.gbapal.lz");
+const u32 gDecorIcon_BigPlant[] = INCBIN_U32("graphics/decorations/decor_big_plant.4bpp.lz");
+const u32 gDecorIconPalette_BigPlant[] = INCBIN_U32("graphics/decorations/decor_big_plant.gbapal.lz");
 
-const u32 gUnknown_08DB854C[] = INCBIN_U32("graphics/decorations/decor_gorgeous_plant.4bpp.lz");
-const u32 gUnknown_08DB862C[] = INCBIN_U32("graphics/decorations/decor_gorgeous_plant.gbapal.lz");
+const u32 gDecorIcon_GorgeousPlant[] = INCBIN_U32("graphics/decorations/decor_gorgeous_plant.4bpp.lz");
+const u32 gDecorIconPalette_GorgeousPlant[] = INCBIN_U32("graphics/decorations/decor_gorgeous_plant.gbapal.lz");
 
-const u32 gUnknown_08DB8654[] = INCBIN_U32("graphics/decorations/decor_red_brick.4bpp.lz");
-const u32 gUnknown_08DB86C4[] = INCBIN_U32("graphics/decorations/decor_red_brick.gbapal.lz");
+const u32 gDecorIcon_RedBrick[] = INCBIN_U32("graphics/decorations/decor_red_brick.4bpp.lz");
+const u32 gDecorIconPalette_RedBrick[] = INCBIN_U32("graphics/decorations/decor_red_brick.gbapal.lz");
 
-const u32 gUnknown_08DB86E0[] = INCBIN_U32("graphics/decorations/decor_yellow_brick.4bpp.lz");
-const u32 gUnknown_08DB8750[] = INCBIN_U32("graphics/decorations/decor_yellow_brick.gbapal.lz");
+const u32 gDecorIcon_YellowBrick[] = INCBIN_U32("graphics/decorations/decor_yellow_brick.4bpp.lz");
+const u32 gDecorIconPalette_YellowBrick[] = INCBIN_U32("graphics/decorations/decor_yellow_brick.gbapal.lz");
 
-const u32 gUnknown_08DB876C[] = INCBIN_U32("graphics/decorations/decor_blue_brick.4bpp.lz");
-const u32 gUnknown_08DB87DC[] = INCBIN_U32("graphics/decorations/decor_blue_brick.gbapal.lz");
+const u32 gDecorIcon_BlueBrick[] = INCBIN_U32("graphics/decorations/decor_blue_brick.4bpp.lz");
+const u32 gDecorIconPalette_BlueBrick[] = INCBIN_U32("graphics/decorations/decor_blue_brick.gbapal.lz");
 
-const u32 gUnknown_08DB87F8[] = INCBIN_U32("graphics/decorations/decor_red_tent.4bpp.lz");
-const u32 gUnknown_08DB88D8[] = INCBIN_U32("graphics/decorations/decor_red_tent.gbapal.lz");
+const u32 gDecorIcon_RedTent[] = INCBIN_U32("graphics/decorations/decor_red_tent.4bpp.lz");
+const u32 gDecorIconPalette_RedTent[] = INCBIN_U32("graphics/decorations/decor_red_tent.gbapal.lz");
 
-const u32 gUnknown_08DB8900[] = INCBIN_U32("graphics/decorations/decor_blue_tent.4bpp.lz");
-const u32 gUnknown_08DB89E0[] = INCBIN_U32("graphics/decorations/decor_blue_tent.gbapal.lz");
+const u32 gDecorIcon_BlueTent[] = INCBIN_U32("graphics/decorations/decor_blue_tent.4bpp.lz");
+const u32 gDecorIconPalette_BlueTent[] = INCBIN_U32("graphics/decorations/decor_blue_tent.gbapal.lz");
 
-const u32 gUnknown_08DB8A08[] = INCBIN_U32("graphics/decorations/decor_solid_board.4bpp.lz");
-const u32 gUnknown_08DB8A68[] = INCBIN_U32("graphics/decorations/decor_solid_board.gbapal.lz");
+const u32 gDecorIcon_SolidBoard[] = INCBIN_U32("graphics/decorations/decor_solid_board.4bpp.lz");
+const u32 gDecorIconPalette_SolidBoard[] = INCBIN_U32("graphics/decorations/decor_solid_board.gbapal.lz");
 
-const u32 gUnknown_08DB8A84[] = INCBIN_U32("graphics/decorations/decor_slide.4bpp.lz");
-const u32 gUnknown_08DB8B40[] = INCBIN_U32("graphics/decorations/decor_slide.gbapal.lz");
+const u32 gDecorIcon_Slide[] = INCBIN_U32("graphics/decorations/decor_slide.4bpp.lz");
+const u32 gDecorIconPalette_Slide[] = INCBIN_U32("graphics/decorations/decor_slide.gbapal.lz");
 
-const u32 gUnknown_08DB8B68[] = INCBIN_U32("graphics/decorations/decor_tire.4bpp.lz");
-const u32 gUnknown_08DB8C40[] = INCBIN_U32("graphics/decorations/decor_tire.gbapal.lz");
+const u32 gDecorIcon_Tire[] = INCBIN_U32("graphics/decorations/decor_tire.4bpp.lz");
+const u32 gDecorIconPalette_Tire[] = INCBIN_U32("graphics/decorations/decor_tire.gbapal.lz");
 
-const u32 gUnknown_08DB8C5C[] = INCBIN_U32("graphics/decorations/decor_stand.4bpp.lz");
-const u32 gUnknown_08DB8CF4[] = INCBIN_U32("graphics/decorations/decor_stand.gbapal.lz");
+const u32 gDecorIcon_Stand[] = INCBIN_U32("graphics/decorations/decor_stand.4bpp.lz");
+const u32 gDecorIconPalette_Stand[] = INCBIN_U32("graphics/decorations/decor_stand.gbapal.lz");
 
-const u32 gUnknown_08DB8D18[] = INCBIN_U32("graphics/decorations/decor_breakable_door.4bpp.lz");
-const u32 gUnknown_08DB8DB0[] = INCBIN_U32("graphics/decorations/decor_breakable_door.gbapal.lz");
+const u32 gDecorIcon_BreakableDoor[] = INCBIN_U32("graphics/decorations/decor_breakable_door.4bpp.lz");
+const u32 gDecorIconPalette_BreakableDoor[] = INCBIN_U32("graphics/decorations/decor_breakable_door.gbapal.lz");
 
-const u32 gUnknown_08DB8DD4[] = INCBIN_U32("graphics/decorations/decor_sand_ornament.4bpp.lz");
-const u32 gUnknown_08DB8E80[] = INCBIN_U32("graphics/decorations/decor_sand_ornament.gbapal.lz");
+const u32 gDecorIcon_SandOrnament[] = INCBIN_U32("graphics/decorations/decor_sand_ornament.4bpp.lz");
+const u32 gDecorIconPalette_SandOrnament[] = INCBIN_U32("graphics/decorations/decor_sand_ornament.gbapal.lz");
 
-const u32 gUnknown_08DB8EA0[] = INCBIN_U32("graphics/decorations/decor_glass_ornament.4bpp.lz");
-const u32 gUnknown_08DB8F58[] = INCBIN_U32("graphics/decorations/decor_glass_ornament.gbapal.lz");
+const u32 gDecorIcon_GlassOrnament[] = INCBIN_U32("graphics/decorations/decor_glass_ornament.4bpp.lz");
+const u32 gDecorIconPalette_GlassOrnament[] = INCBIN_U32("graphics/decorations/decor_glass_ornament.gbapal.lz");
 
-const u32 gUnknown_08DB8F7C[] = INCBIN_U32("graphics/decorations/decor_surf_mat.4bpp.lz");
-const u32 gUnknown_08DB9038[] = INCBIN_U32("graphics/decorations/decor_surf_mat.gbapal.lz");
+const u32 gDecorIcon_SurfMat[] = INCBIN_U32("graphics/decorations/decor_surf_mat.4bpp.lz");
+const u32 gDecorIconPalette_SurfMat[] = INCBIN_U32("graphics/decorations/decor_surf_mat.gbapal.lz");
 
-const u32 gUnknown_08DB9058[] = INCBIN_U32("graphics/decorations/decor_thunder_mat.4bpp.lz");
-const u32 gUnknown_08DB9130[] = INCBIN_U32("graphics/decorations/decor_thunder_mat.gbapal.lz");
+const u32 gDecorIcon_ThunderMat[] = INCBIN_U32("graphics/decorations/decor_thunder_mat.4bpp.lz");
+const u32 gDecorIconPalette_ThunderMat[] = INCBIN_U32("graphics/decorations/decor_thunder_mat.gbapal.lz");
 
-const u32 gUnknown_08DB9154[] = INCBIN_U32("graphics/decorations/decor_fire_blast_mat.4bpp.lz");
-const u32 gUnknown_08DB9218[] = INCBIN_U32("graphics/decorations/decor_fire_blast_mat.gbapal.lz");
+const u32 gDecorIcon_FireBlastMat[] = INCBIN_U32("graphics/decorations/decor_fire_blast_mat.4bpp.lz");
+const u32 gDecorIconPalette_FireBlastMat[] = INCBIN_U32("graphics/decorations/decor_fire_blast_mat.gbapal.lz");
 
-const u32 gUnknown_08DB9234[] = INCBIN_U32("graphics/decorations/decor_powder_snow_mat.4bpp.lz");
-const u32 gUnknown_08DB92FC[] = INCBIN_U32("graphics/decorations/decor_powder_snow_mat.gbapal.lz");
+const u32 gDecorIcon_PowderSnowMat[] = INCBIN_U32("graphics/decorations/decor_powder_snow_mat.4bpp.lz");
+const u32 gDecorIconPalette_PowderSnowMat[] = INCBIN_U32("graphics/decorations/decor_powder_snow_mat.gbapal.lz");
 
-const u32 gUnknown_08DB931C[] = INCBIN_U32("graphics/decorations/decor_attract_mat.4bpp.lz");
-const u32 gUnknown_08DB93E8[] = INCBIN_U32("graphics/decorations/decor_attract_mat.gbapal.lz");
+const u32 gDecorIcon_AttractMat[] = INCBIN_U32("graphics/decorations/decor_attract_mat.4bpp.lz");
+const u32 gDecorIconPalette_AttractMat[] = INCBIN_U32("graphics/decorations/decor_attract_mat.gbapal.lz");
 
-const u32 gUnknown_08DB940C[] = INCBIN_U32("graphics/decorations/decor_fissure_mat.4bpp.lz");
-const u32 gUnknown_08DB94CC[] = INCBIN_U32("graphics/decorations/decor_fissure_mat.gbapal.lz");
+const u32 gDecorIcon_FissureMat[] = INCBIN_U32("graphics/decorations/decor_fissure_mat.4bpp.lz");
+const u32 gDecorIconPalette_FissureMat[] = INCBIN_U32("graphics/decorations/decor_fissure_mat.gbapal.lz");
 
-const u32 gUnknown_08DB94E8[] = INCBIN_U32("graphics/decorations/decor_spikes_mat.4bpp.lz");
-const u32 gUnknown_08DB95AC[] = INCBIN_U32("graphics/decorations/decor_spikes_mat.gbapal.lz");
+const u32 gDecorIcon_SpikesMat[] = INCBIN_U32("graphics/decorations/decor_spikes_mat.4bpp.lz");
+const u32 gDecorIconPalette_SpikesMat[] = INCBIN_U32("graphics/decorations/decor_spikes_mat.gbapal.lz");
 
-const u32 gUnknown_08DB95D0[] = INCBIN_U32("graphics/decorations/decor_snorlax_doll.4bpp.lz");
-const u32 gUnknown_08DB96C4[] = INCBIN_U32("graphics/decorations/decor_snorlax_doll.gbapal.lz");
+const u32 gDecorIcon_SnorlaxDoll[] = INCBIN_U32("graphics/decorations/decor_snorlax_doll.4bpp.lz");
+const u32 gDecorIconPalette_SnorlaxDoll[] = INCBIN_U32("graphics/decorations/decor_snorlax_doll.gbapal.lz");
 
-const u32 gUnknown_08DB96EC[] = INCBIN_U32("graphics/decorations/decor_rhydon_doll.4bpp.lz");
-const u32 gUnknown_08DB97F4[] = INCBIN_U32("graphics/decorations/decor_rhydon_doll.gbapal.lz");
+const u32 gDecorIcon_RhydonDoll[] = INCBIN_U32("graphics/decorations/decor_rhydon_doll.4bpp.lz");
+const u32 gDecorIconPalette_RhydonDoll[] = INCBIN_U32("graphics/decorations/decor_rhydon_doll.gbapal.lz");
 
-const u32 gUnknown_08DB981C[] = INCBIN_U32("graphics/decorations/decor_lapras_doll.4bpp.lz");
-const u32 gUnknown_08DB9908[] = INCBIN_U32("graphics/decorations/decor_lapras_doll.gbapal.lz");
+const u32 gDecorIcon_LaprasDoll[] = INCBIN_U32("graphics/decorations/decor_lapras_doll.4bpp.lz");
+const u32 gDecorIconPalette_LaprasDoll[] = INCBIN_U32("graphics/decorations/decor_lapras_doll.gbapal.lz");
 
-const u32 gUnknown_08DB9930[] = INCBIN_U32("graphics/decorations/decor_venusaur_doll.4bpp.lz");
-const u32 gUnknown_08DB9A54[] = INCBIN_U32("graphics/decorations/decor_venusaur_doll.gbapal.lz");
+const u32 gDecorIcon_VenusaurDoll[] = INCBIN_U32("graphics/decorations/decor_venusaur_doll.4bpp.lz");
+const u32 gDecorIconPalette_VenusaurDoll[] = INCBIN_U32("graphics/decorations/decor_venusaur_doll.gbapal.lz");
 
-const u32 gUnknown_08DB9A7C[] = INCBIN_U32("graphics/decorations/decor_charizard_doll.4bpp.lz");
-const u32 gUnknown_08DB9B7C[] = INCBIN_U32("graphics/decorations/decor_charizard_doll.gbapal.lz");
+const u32 gDecorIcon_CharizardDoll[] = INCBIN_U32("graphics/decorations/decor_charizard_doll.4bpp.lz");
+const u32 gDecorIconPalette_CharizardDoll[] = INCBIN_U32("graphics/decorations/decor_charizard_doll.gbapal.lz");
 
-const u32 gUnknown_08DB9BA4[] = INCBIN_U32("graphics/decorations/decor_blastoise_doll.4bpp.lz");
-const u32 gUnknown_08DB9CB0[] = INCBIN_U32("graphics/decorations/decor_blastoise_doll.gbapal.lz");
+const u32 gDecorIcon_BlastoiseDoll[] = INCBIN_U32("graphics/decorations/decor_blastoise_doll.4bpp.lz");
+const u32 gDecorIconPalette_BlastoiseDoll[] = INCBIN_U32("graphics/decorations/decor_blastoise_doll.gbapal.lz");
 
-const u32 gUnknown_08DB9CD8[] = INCBIN_U32("graphics/decorations/decor_wailmer_doll.4bpp.lz");
-const u32 gUnknown_08DB9DAC[] = INCBIN_U32("graphics/decorations/decor_wailmer_doll.gbapal.lz");
+const u32 gDecorIcon_WailmerDoll[] = INCBIN_U32("graphics/decorations/decor_wailmer_doll.4bpp.lz");
+const u32 gDecorIconPalette_WailmerDoll[] = INCBIN_U32("graphics/decorations/decor_wailmer_doll.gbapal.lz");
 
-const u32 gUnknown_08DB9DD4[] = INCBIN_U32("graphics/decorations/decor_regice_doll.4bpp.lz");
-const u32 gUnknown_08DB9EE4[] = INCBIN_U32("graphics/decorations/decor_regice_doll.gbapal.lz");
+const u32 gDecorIcon_RegiceDoll[] = INCBIN_U32("graphics/decorations/decor_regice_doll.4bpp.lz");
+const u32 gDecorIconPalette_RegiceDoll[] = INCBIN_U32("graphics/decorations/decor_regice_doll.gbapal.lz");
 
-const u32 gUnknown_08DB9F08[] = INCBIN_U32("graphics/decorations/decor_regirock_doll.4bpp.lz");
-const u32 gUnknown_08DB9FFC[] = INCBIN_U32("graphics/decorations/decor_regirock_doll.gbapal.lz");
+const u32 gDecorIcon_RegirockDoll[] = INCBIN_U32("graphics/decorations/decor_regirock_doll.4bpp.lz");
+const u32 gDecorIconPalette_RegirockDoll[] = INCBIN_U32("graphics/decorations/decor_regirock_doll.gbapal.lz");
 
-const u32 gUnknown_08DBA020[] = INCBIN_U32("graphics/decorations/decor_registeel_doll.4bpp.lz");
-const u32 gUnknown_08DBA12C[] = INCBIN_U32("graphics/decorations/decor_registeel_doll.gbapal.lz");
+const u32 gDecorIcon_RegisteelDoll[] = INCBIN_U32("graphics/decorations/decor_registeel_doll.4bpp.lz");
+const u32 gDecorIconPalette_RegisteelDoll[] = INCBIN_U32("graphics/decorations/decor_registeel_doll.gbapal.lz");
diff --git a/src/decoration.c b/src/decoration.c
index 974859c88..4efeb19b1 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -2043,7 +2043,7 @@ const u32 *GetDecorationIconPicOrPalette(u16 decor, u8 mode)
     if (decor > NUM_DECORATIONS)
         decor = DECOR_NONE;
 
-    return gUnknown_085A6BE8[decor][mode];
+    return gDecorIconTable[decor][mode];
 }
 
 u8 AddDecorationIconObjectFromEventObject(u16 tilesTag, u16 paletteTag, u8 decor)
@@ -2095,7 +2095,7 @@ u8 AddDecorationIconObject(u8 decor, s16 x, s16 y, u8 priority, u16 tilesTag, u1
         gSprites[spriteId].pos2.x = x + 4;
         gSprites[spriteId].pos2.y = y + 4;
     }
-    else if (gUnknown_085A6BE8[decor][0] == NULL)
+    else if (gDecorIconTable[decor][0] == NULL)
     {
         spriteId = AddDecorationIconObjectFromEventObject(tilesTag, paletteTag, decor);
         if (spriteId == MAX_SPRITES)