Drop unnecessary decor prefix

43 files changed, 84 insertions, 84 deletions

diff --git a/graphics/decorations/decor_attract_mat.png b/graphics/decorations/attract_mat.png
index 77e077a71..77e077a71 100644
--- a/graphics/decorations/decor_attract_mat.png
+++ b/graphics/decorations/attract_mat.png
diff --git a/graphics/decorations/decor_big_plant.png b/graphics/decorations/big_plant.png
index 5f5cac3b3..5f5cac3b3 100644
--- a/graphics/decorations/decor_big_plant.png
+++ b/graphics/decorations/big_plant.png
diff --git a/graphics/decorations/decor_blastoise_doll.png b/graphics/decorations/blastoise_doll.png
index a7b0ee6e4..a7b0ee6e4 100644
--- a/graphics/decorations/decor_blastoise_doll.png
+++ b/graphics/decorations/blastoise_doll.png
diff --git a/graphics/decorations/decor_blue_brick.png b/graphics/decorations/blue_brick.png
index cb187beb1..cb187beb1 100644
--- a/graphics/decorations/decor_blue_brick.png
+++ b/graphics/decorations/blue_brick.png
diff --git a/graphics/decorations/decor_blue_tent.png b/graphics/decorations/blue_tent.png
index f94a61e36..f94a61e36 100644
--- a/graphics/decorations/decor_blue_tent.png
+++ b/graphics/decorations/blue_tent.png
diff --git a/graphics/decorations/decor_breakable_door.png b/graphics/decorations/breakable_door.png
index b96bfe96b..b96bfe96b 100644
--- a/graphics/decorations/decor_breakable_door.png
+++ b/graphics/decorations/breakable_door.png
diff --git a/graphics/decorations/decor_brick_desk.png b/graphics/decorations/brick_desk.png
index c81082bf8..c81082bf8 100644
--- a/graphics/decorations/decor_brick_desk.png
+++ b/graphics/decorations/brick_desk.png
diff --git a/graphics/decorations/decor_camp_desk.png b/graphics/decorations/camp_desk.png
index 6a1bf68c9..6a1bf68c9 100644
--- a/graphics/decorations/decor_camp_desk.png
+++ b/graphics/decorations/camp_desk.png
diff --git a/graphics/decorations/decor_charizard_doll.png b/graphics/decorations/charizard_doll.png
index cb1acc728..cb1acc728 100644
--- a/graphics/decorations/decor_charizard_doll.png
+++ b/graphics/decorations/charizard_doll.png
diff --git a/graphics/decorations/decor_colorful_plant.png b/graphics/decorations/colorful_plant.png
index fdbb43c33..fdbb43c33 100644
--- a/graphics/decorations/decor_colorful_plant.png
+++ b/graphics/decorations/colorful_plant.png
diff --git a/graphics/decorations/decor_comfort_desk.png b/graphics/decorations/comfort_desk.png
index 3e81301df..3e81301df 100644
--- a/graphics/decorations/decor_comfort_desk.png
+++ b/graphics/decorations/comfort_desk.png
diff --git a/graphics/decorations/decor_fire_blast_mat.png b/graphics/decorations/fire_blast_mat.png
index df6c2bfe0..df6c2bfe0 100644
--- a/graphics/decorations/decor_fire_blast_mat.png
+++ b/graphics/decorations/fire_blast_mat.png
diff --git a/graphics/decorations/decor_fissure_mat.png b/graphics/decorations/fissure_mat.png
index 1a0212487..1a0212487 100644
--- a/graphics/decorations/decor_fissure_mat.png
+++ b/graphics/decorations/fissure_mat.png
diff --git a/graphics/decorations/decor_glass_ornament.png b/graphics/decorations/glass_ornament.png
index c85ae769b..c85ae769b 100644
--- a/graphics/decorations/decor_glass_ornament.png
+++ b/graphics/decorations/glass_ornament.png
diff --git a/graphics/decorations/decor_gorgeous_plant.png b/graphics/decorations/gorgeous_plant.png
index ed8947ebd..ed8947ebd 100644
--- a/graphics/decorations/decor_gorgeous_plant.png
+++ b/graphics/decorations/gorgeous_plant.png
diff --git a/graphics/decorations/decor_hard_desk.png b/graphics/decorations/hard_desk.png
index b85b098f9..b85b098f9 100644
--- a/graphics/decorations/decor_hard_desk.png
+++ b/graphics/decorations/hard_desk.png
diff --git a/graphics/decorations/decor_heavy_desk.png b/graphics/decorations/heavy_desk.png
index 3e9e74683..3e9e74683 100644
--- a/graphics/decorations/decor_heavy_desk.png
+++ b/graphics/decorations/heavy_desk.png
diff --git a/graphics/decorations/decor_lapras_doll.png b/graphics/decorations/lapras_doll.png
index 8a98a6cf4..8a98a6cf4 100644
--- a/graphics/decorations/decor_lapras_doll.png
+++ b/graphics/decorations/lapras_doll.png
diff --git a/graphics/decorations/decor_powder_snow_mat.png b/graphics/decorations/powder_snow_mat.png
index 22be19f9d..22be19f9d 100644
--- a/graphics/decorations/decor_powder_snow_mat.png
+++ b/graphics/decorations/powder_snow_mat.png
diff --git a/graphics/decorations/decor_pretty_desk.png b/graphics/decorations/pretty_desk.png
index 69d439cfe..69d439cfe 100644
--- a/graphics/decorations/decor_pretty_desk.png
+++ b/graphics/decorations/pretty_desk.png
diff --git a/graphics/decorations/decor_pretty_flowers.png b/graphics/decorations/pretty_flowers.png
index 6b7b8565f..6b7b8565f 100644
--- a/graphics/decorations/decor_pretty_flowers.png
+++ b/graphics/decorations/pretty_flowers.png
diff --git a/graphics/decorations/decor_ragged_desk.png b/graphics/decorations/ragged_desk.png
index 1bb800267..1bb800267 100644
--- a/graphics/decorations/decor_ragged_desk.png
+++ b/graphics/decorations/ragged_desk.png
diff --git a/graphics/decorations/decor_red_brick.png b/graphics/decorations/red_brick.png
index 249ad8f7a..249ad8f7a 100644
--- a/graphics/decorations/decor_red_brick.png
+++ b/graphics/decorations/red_brick.png
diff --git a/graphics/decorations/decor_red_plant.png b/graphics/decorations/red_plant.png
index 7f3792c97..7f3792c97 100644
--- a/graphics/decorations/decor_red_plant.png
+++ b/graphics/decorations/red_plant.png
diff --git a/graphics/decorations/decor_red_tent.png b/graphics/decorations/red_tent.png
index a70d9bc0a..a70d9bc0a 100644
--- a/graphics/decorations/decor_red_tent.png
+++ b/graphics/decorations/red_tent.png
diff --git a/graphics/decorations/decor_regice_doll.png b/graphics/decorations/regice_doll.png
index e7c118659..e7c118659 100644
--- a/graphics/decorations/decor_regice_doll.png
+++ b/graphics/decorations/regice_doll.png
diff --git a/graphics/decorations/decor_regirock_doll.png b/graphics/decorations/regirock_doll.png
index 6bf520573..6bf520573 100644
--- a/graphics/decorations/decor_regirock_doll.png
+++ b/graphics/decorations/regirock_doll.png
diff --git a/graphics/decorations/decor_registeel_doll.png b/graphics/decorations/registeel_doll.png
index bfe01d75c..bfe01d75c 100644
--- a/graphics/decorations/decor_registeel_doll.png
+++ b/graphics/decorations/registeel_doll.png
diff --git a/graphics/decorations/decor_rhydon_doll.png b/graphics/decorations/rhydon_doll.png
index 2937d372f..2937d372f 100644
--- a/graphics/decorations/decor_rhydon_doll.png
+++ b/graphics/decorations/rhydon_doll.png
diff --git a/graphics/decorations/decor_sand_ornament.png b/graphics/decorations/sand_ornament.png
index d94673c96..d94673c96 100644
--- a/graphics/decorations/decor_sand_ornament.png
+++ b/graphics/decorations/sand_ornament.png
diff --git a/graphics/decorations/decor_slide.png b/graphics/decorations/slide.png
index ebfc24cad..ebfc24cad 100644
--- a/graphics/decorations/decor_slide.png
+++ b/graphics/decorations/slide.png
diff --git a/graphics/decorations/decor_snorlax_doll.png b/graphics/decorations/snorlax_doll.png
index 48f9248ac..48f9248ac 100644
--- a/graphics/decorations/decor_snorlax_doll.png
+++ b/graphics/decorations/snorlax_doll.png
diff --git a/graphics/decorations/decor_solid_board.png b/graphics/decorations/solid_board.png
index 1eef712e2..1eef712e2 100644
--- a/graphics/decorations/decor_solid_board.png
+++ b/graphics/decorations/solid_board.png
diff --git a/graphics/decorations/decor_spikes_mat.png b/graphics/decorations/spikes_mat.png
index a69b003e7..a69b003e7 100644
--- a/graphics/decorations/decor_spikes_mat.png
+++ b/graphics/decorations/spikes_mat.png
diff --git a/graphics/decorations/decor_stand.png b/graphics/decorations/stand.png
index 09e4d26bd..09e4d26bd 100644
--- a/graphics/decorations/decor_stand.png
+++ b/graphics/decorations/stand.png
diff --git a/graphics/decorations/decor_surf_mat.png b/graphics/decorations/surf_mat.png
index f85498e66..f85498e66 100644
--- a/graphics/decorations/decor_surf_mat.png
+++ b/graphics/decorations/surf_mat.png
diff --git a/graphics/decorations/decor_thunder_mat.png b/graphics/decorations/thunder_mat.png
index 82a1787f6..82a1787f6 100644
--- a/graphics/decorations/decor_thunder_mat.png
+++ b/graphics/decorations/thunder_mat.png
diff --git a/graphics/decorations/decor_tire.png b/graphics/decorations/tire.png
index 562532356..562532356 100644
--- a/graphics/decorations/decor_tire.png
+++ b/graphics/decorations/tire.png
diff --git a/graphics/decorations/decor_tropical_plant.png b/graphics/decorations/tropical_plant.png
index f674d6418..f674d6418 100644
--- a/graphics/decorations/decor_tropical_plant.png
+++ b/graphics/decorations/tropical_plant.png
diff --git a/graphics/decorations/decor_venusaur_doll.png b/graphics/decorations/venusaur_doll.png
index ca6bbea76..ca6bbea76 100644
--- a/graphics/decorations/decor_venusaur_doll.png
+++ b/graphics/decorations/venusaur_doll.png
diff --git a/graphics/decorations/decor_wailmer_doll.png b/graphics/decorations/wailmer_doll.png
index b5d723bc8..b5d723bc8 100644
--- a/graphics/decorations/decor_wailmer_doll.png
+++ b/graphics/decorations/wailmer_doll.png
diff --git a/graphics/decorations/decor_yellow_brick.png b/graphics/decorations/yellow_brick.png
index 33b41be22..33b41be22 100644
--- a/graphics/decorations/decor_yellow_brick.png
+++ b/graphics/decorations/yellow_brick.png
diff --git a/src/data/graphics/decorations.h b/src/data/graphics/decorations.h
index d8b865fcf..b18c87348 100644
--- a/src/data/graphics/decorations.h
+++ b/src/data/graphics/decorations.h
@@ -1,125 +1,125 @@
-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 gDecorIcon_HeavyDesk[] = INCBIN_U32("graphics/decorations/heavy_desk.4bpp.lz");
+const u32 gDecorIconPalette_HeavyDesk[] = INCBIN_U32("graphics/decorations/heavy_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 gDecorIcon_RaggedDesk[] = INCBIN_U32("graphics/decorations/ragged_desk.4bpp.lz");
+const u32 gDecorIconPalette_RaggedDesk[] = INCBIN_U32("graphics/decorations/ragged_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 gDecorIcon_ComfortDesk[] = INCBIN_U32("graphics/decorations/comfort_desk.4bpp.lz");
+const u32 gDecorIconPalette_ComfortDesk[] = INCBIN_U32("graphics/decorations/comfort_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 gDecorIcon_PrettyDesk[] = INCBIN_U32("graphics/decorations/pretty_desk.4bpp.lz");
+const u32 gDecorIconPalette_PrettyDesk[] = INCBIN_U32("graphics/decorations/pretty_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 gDecorIcon_BrickDesk[] = INCBIN_U32("graphics/decorations/brick_desk.4bpp.lz");
+const u32 gDecorIconPalette_BrickDesk[] = INCBIN_U32("graphics/decorations/brick_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 gDecorIcon_CampDesk[] = INCBIN_U32("graphics/decorations/camp_desk.4bpp.lz");
+const u32 gDecorIconPalette_CampDesk[] = INCBIN_U32("graphics/decorations/camp_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 gDecorIcon_HardDesk[] = INCBIN_U32("graphics/decorations/hard_desk.4bpp.lz");
+const u32 gDecorIconPalette_HardDesk[] = INCBIN_U32("graphics/decorations/hard_desk.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 gDecorIcon_RedPlant[] = INCBIN_U32("graphics/decorations/red_plant.4bpp.lz");
+const u32 gDecorIconPalette_RedPlant[] = INCBIN_U32("graphics/decorations/red_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 gDecorIcon_TropicalPlant[] = INCBIN_U32("graphics/decorations/tropical_plant.4bpp.lz");
+const u32 gDecorIconPalette_TropicalPlant[] = INCBIN_U32("graphics/decorations/tropical_plant.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 gDecorIcon_PrettyFlowers[] = INCBIN_U32("graphics/decorations/pretty_flowers.4bpp.lz");
+const u32 gDecorIconPalette_PrettyFlowers[] = INCBIN_U32("graphics/decorations/pretty_flowers.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 gDecorIcon_ColorfulPlant[] = INCBIN_U32("graphics/decorations/colorful_plant.4bpp.lz");
+const u32 gDecorIconPalette_ColorfulPlant[] = INCBIN_U32("graphics/decorations/colorful_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 gDecorIcon_BigPlant[] = INCBIN_U32("graphics/decorations/big_plant.4bpp.lz");
+const u32 gDecorIconPalette_BigPlant[] = INCBIN_U32("graphics/decorations/big_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 gDecorIcon_GorgeousPlant[] = INCBIN_U32("graphics/decorations/gorgeous_plant.4bpp.lz");
+const u32 gDecorIconPalette_GorgeousPlant[] = INCBIN_U32("graphics/decorations/gorgeous_plant.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 gDecorIcon_RedBrick[] = INCBIN_U32("graphics/decorations/red_brick.4bpp.lz");
+const u32 gDecorIconPalette_RedBrick[] = INCBIN_U32("graphics/decorations/red_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 gDecorIcon_YellowBrick[] = INCBIN_U32("graphics/decorations/yellow_brick.4bpp.lz");
+const u32 gDecorIconPalette_YellowBrick[] = INCBIN_U32("graphics/decorations/yellow_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 gDecorIcon_BlueBrick[] = INCBIN_U32("graphics/decorations/blue_brick.4bpp.lz");
+const u32 gDecorIconPalette_BlueBrick[] = INCBIN_U32("graphics/decorations/blue_brick.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 gDecorIcon_RedTent[] = INCBIN_U32("graphics/decorations/red_tent.4bpp.lz");
+const u32 gDecorIconPalette_RedTent[] = INCBIN_U32("graphics/decorations/red_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 gDecorIcon_BlueTent[] = INCBIN_U32("graphics/decorations/blue_tent.4bpp.lz");
+const u32 gDecorIconPalette_BlueTent[] = INCBIN_U32("graphics/decorations/blue_tent.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 gDecorIcon_SolidBoard[] = INCBIN_U32("graphics/decorations/solid_board.4bpp.lz");
+const u32 gDecorIconPalette_SolidBoard[] = INCBIN_U32("graphics/decorations/solid_board.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 gDecorIcon_Slide[] = INCBIN_U32("graphics/decorations/slide.4bpp.lz");
+const u32 gDecorIconPalette_Slide[] = INCBIN_U32("graphics/decorations/slide.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 gDecorIcon_Tire[] = INCBIN_U32("graphics/decorations/tire.4bpp.lz");
+const u32 gDecorIconPalette_Tire[] = INCBIN_U32("graphics/decorations/tire.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 gDecorIcon_Stand[] = INCBIN_U32("graphics/decorations/stand.4bpp.lz");
+const u32 gDecorIconPalette_Stand[] = INCBIN_U32("graphics/decorations/stand.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 gDecorIcon_BreakableDoor[] = INCBIN_U32("graphics/decorations/breakable_door.4bpp.lz");
+const u32 gDecorIconPalette_BreakableDoor[] = INCBIN_U32("graphics/decorations/breakable_door.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 gDecorIcon_SandOrnament[] = INCBIN_U32("graphics/decorations/sand_ornament.4bpp.lz");
+const u32 gDecorIconPalette_SandOrnament[] = INCBIN_U32("graphics/decorations/sand_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 gDecorIcon_GlassOrnament[] = INCBIN_U32("graphics/decorations/glass_ornament.4bpp.lz");
+const u32 gDecorIconPalette_GlassOrnament[] = INCBIN_U32("graphics/decorations/glass_ornament.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 gDecorIcon_SurfMat[] = INCBIN_U32("graphics/decorations/surf_mat.4bpp.lz");
+const u32 gDecorIconPalette_SurfMat[] = INCBIN_U32("graphics/decorations/surf_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 gDecorIcon_ThunderMat[] = INCBIN_U32("graphics/decorations/thunder_mat.4bpp.lz");
+const u32 gDecorIconPalette_ThunderMat[] = INCBIN_U32("graphics/decorations/thunder_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 gDecorIcon_FireBlastMat[] = INCBIN_U32("graphics/decorations/fire_blast_mat.4bpp.lz");
+const u32 gDecorIconPalette_FireBlastMat[] = INCBIN_U32("graphics/decorations/fire_blast_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 gDecorIcon_PowderSnowMat[] = INCBIN_U32("graphics/decorations/powder_snow_mat.4bpp.lz");
+const u32 gDecorIconPalette_PowderSnowMat[] = INCBIN_U32("graphics/decorations/powder_snow_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 gDecorIcon_AttractMat[] = INCBIN_U32("graphics/decorations/attract_mat.4bpp.lz");
+const u32 gDecorIconPalette_AttractMat[] = INCBIN_U32("graphics/decorations/attract_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 gDecorIcon_FissureMat[] = INCBIN_U32("graphics/decorations/fissure_mat.4bpp.lz");
+const u32 gDecorIconPalette_FissureMat[] = INCBIN_U32("graphics/decorations/fissure_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 gDecorIcon_SpikesMat[] = INCBIN_U32("graphics/decorations/spikes_mat.4bpp.lz");
+const u32 gDecorIconPalette_SpikesMat[] = INCBIN_U32("graphics/decorations/spikes_mat.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 gDecorIcon_SnorlaxDoll[] = INCBIN_U32("graphics/decorations/snorlax_doll.4bpp.lz");
+const u32 gDecorIconPalette_SnorlaxDoll[] = INCBIN_U32("graphics/decorations/snorlax_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 gDecorIcon_RhydonDoll[] = INCBIN_U32("graphics/decorations/rhydon_doll.4bpp.lz");
+const u32 gDecorIconPalette_RhydonDoll[] = INCBIN_U32("graphics/decorations/rhydon_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 gDecorIcon_LaprasDoll[] = INCBIN_U32("graphics/decorations/lapras_doll.4bpp.lz");
+const u32 gDecorIconPalette_LaprasDoll[] = INCBIN_U32("graphics/decorations/lapras_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 gDecorIcon_VenusaurDoll[] = INCBIN_U32("graphics/decorations/venusaur_doll.4bpp.lz");
+const u32 gDecorIconPalette_VenusaurDoll[] = INCBIN_U32("graphics/decorations/venusaur_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 gDecorIcon_CharizardDoll[] = INCBIN_U32("graphics/decorations/charizard_doll.4bpp.lz");
+const u32 gDecorIconPalette_CharizardDoll[] = INCBIN_U32("graphics/decorations/charizard_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 gDecorIcon_BlastoiseDoll[] = INCBIN_U32("graphics/decorations/blastoise_doll.4bpp.lz");
+const u32 gDecorIconPalette_BlastoiseDoll[] = INCBIN_U32("graphics/decorations/blastoise_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 gDecorIcon_WailmerDoll[] = INCBIN_U32("graphics/decorations/wailmer_doll.4bpp.lz");
+const u32 gDecorIconPalette_WailmerDoll[] = INCBIN_U32("graphics/decorations/wailmer_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 gDecorIcon_RegiceDoll[] = INCBIN_U32("graphics/decorations/regice_doll.4bpp.lz");
+const u32 gDecorIconPalette_RegiceDoll[] = INCBIN_U32("graphics/decorations/regice_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 gDecorIcon_RegirockDoll[] = INCBIN_U32("graphics/decorations/regirock_doll.4bpp.lz");
+const u32 gDecorIconPalette_RegirockDoll[] = INCBIN_U32("graphics/decorations/regirock_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");
+const u32 gDecorIcon_RegisteelDoll[] = INCBIN_U32("graphics/decorations/registeel_doll.4bpp.lz");
+const u32 gDecorIconPalette_RegisteelDoll[] = INCBIN_U32("graphics/decorations/registeel_doll.gbapal.lz");