revert merge coz its bugged

5 files changed, 0 insertions, 2698 deletions

diff --git a/include/data/decoration/description.h b/include/data/decoration/description.h
deleted file mode 100644
index ba4c3dd54..000000000
--- a/include/data/decoration/description.h
+++ /dev/null
@@ -1,581 +0,0 @@
-//
-// Created by scott on 10/21/2017.
-//
-
-#ifndef GUARD_DATA_DECORATION_DESCRIPTION_H
-#define GUARD_DATA_DECORATION_DESCRIPTION_H
-
-const u8 DecorDesc_SMALL_DESK[] = _(
-    "A small desk built\n"
-        "for one.");
-
-const u8 DecorDesc_POKEMON_DESK[] = _(
-    "A small desk built in\n"
-        "the shape of a POKé\n"
-        "BALL.");
-
-const u8 DecorDesc_HEAVY_DESK[] = _(
-    "A large desk made\n"
-        "of steel. Put some\n"
-        "decorations on it.");
-
-const u8 DecorDesc_RAGGED_DESK[] = _(
-    "A large desk made\n"
-        "of wood. Put some\n"
-        "decorations on it.");
-
-const u8 DecorDesc_COMFORT_DESK[] = _(
-    "A large desk made\n"
-        "of leaves. Put some\n"
-        "decorations on it.");
-
-const u8 DecorDesc_PRETTY_DESK[] = _(
-    "A huge desk made\n"
-        "of glass. Holds lots\n"
-        "of decorations.");
-
-const u8 DecorDesc_BRICK_DESK[] = _(
-    "A huge desk made\n"
-        "of brick. Holds lots\n"
-        "of decorations.");
-
-const u8 DecorDesc_CAMP_DESK[] = _(
-    "A huge desk made\n"
-        "of logs. Put lots of\n"
-        "decorations on it.");
-
-const u8 DecorDesc_HARD_DESK[] = _(
-    "A huge desk made\n"
-        "of rocks. Holds\n"
-        "many decorations.");
-
-const u8 DecorDesc_SMALL_CHAIR[] = _(
-    "A small chair made\n"
-        "for one.");
-
-const u8 DecorDesc_POKEMON_CHAIR[] = _(
-    "A small chair built\n"
-        "in the shape of a\n"
-        "POKé BALL.");
-
-const u8 DecorDesc_HEAVY_CHAIR[] = _(
-    "A small chair made\n"
-        "of steel.");
-
-const u8 DecorDesc_PRETTY_CHAIR[] = _(
-    "A small chair made\n"
-        "of glass.");
-
-const u8 DecorDesc_COMFORT_CHAIR[] = _(
-    "A small chair made\n"
-        "of leaves.");
-
-const u8 DecorDesc_RAGGED_CHAIR[] = _(
-    "A small chair made\n"
-        "of wood.");
-
-const u8 DecorDesc_BRICK_CHAIR[] = _(
-    "A small chair made\n"
-        "of brick.");
-
-const u8 DecorDesc_CAMP_CHAIR[] = _(
-    "A small chair made\n"
-        "of logs.");
-
-const u8 DecorDesc_HARD_CHAIR[] = _(
-    "A small chair made\n"
-        "of rock.");
-
-const u8 DecorDesc_RED_PLANT[] = _(
-    "A vivid red potted\n"
-        "plant.");
-
-const u8 DecorDesc_TROPICAL_PLANT[] = _(
-    "A flowering tropical\n"
-        "plant in a pot.");
-
-const u8 DecorDesc_PRETTY_FLOWERS[] = _(
-    "A pot of cute\n"
-        "flowers.");
-
-const u8 DecorDesc_COLORFUL_PLANT[] = _(
-    "A large pot with\n"
-        "many colorful\n"
-        "flowers.");
-
-const u8 DecorDesc_BIG_PLANT[] = _(
-    "A large, umbrella-\n"
-        "shaped plant in a\n"
-        "big pot.");
-
-const u8 DecorDesc_GORGEOUS_PLANT[] = _(
-    "A large, impressive\n"
-        "plant in a big pot.");
-
-const u8 DecorDesc_RED_BRICK[] = _(
-    "A red-colored brick.\n"
-        "Decorations can be\n"
-        "placed on top.");
-
-const u8 DecorDesc_YELLOW_BRICK[] = _(
-    "A yellow-colored\n"
-        "brick. Put some\n"
-        "decorations on top.");
-
-const u8 DecorDesc_BLUE_BRICK[] = _(
-    "A blue-colored\n"
-        "brick. Put some\n"
-        "decorations on top.");
-
-const u8 DecorDesc_RED_BALLOON[] = _(
-    "A red balloon filled\n"
-        "with water. Bursts\n"
-        "if stepped on.");
-
-const u8 DecorDesc_BLUE_BALLOON[] = _(
-    "A blue balloon filled\n"
-        "with water. Bursts\n"
-        "if stepped on.");
-
-const u8 DecorDesc_YELLOW_BALLOON[] = _(
-    "A yellow balloon\n"
-        "filled with water.\n"
-        "Pops if stepped on.");
-
-const u8 DecorDesc_RED_TENT[] = _(
-    "A large red tent.\n"
-        "You can hide inside\n"
-        "it.");
-
-const u8 DecorDesc_BLUE_TENT[] = _(
-    "A large blue tent.\n"
-        "You can hide inside\n"
-        "it.");
-
-const u8 DecorDesc_SOLID_BOARD[] = _(
-    "Place over a hole to\n"
-        "cross to the other\n"
-        "side.");
-
-const u8 DecorDesc_SLIDE[] = _(
-    "Use to slide down\n"
-        "from the platform.");
-
-const u8 DecorDesc_FENCE_LENGTH[] = _(
-    "A small fence that\n"
-        "blocks passage.");
-
-const u8 DecorDesc_FENCE_WIDTH[] = _(
-    "A small fence that\n"
-        "blocks passage.");
-
-const u8 DecorDesc_TIRE[] = _(
-    "An old large tire.\n"
-        "Decorations can be\n"
-        "placed on top.");
-
-const u8 DecorDesc_STAND[] = _(
-    "A large pedestal\n"
-        "with steps.");
-
-const u8 DecorDesc_MUD_BALL[] = _(
-    "A large ball of mud.\n"
-        "Crumbles if stepped\n"
-        "on.");
-
-const u8 DecorDesc_BREAKABLE_DOOR[] = _(
-    "A weird door that\n"
-        "people can walk\n"
-        "right through.");
-
-const u8 DecorDesc_SAND_ORNAMENT[] = _(
-    "An ornament made\n"
-        "of sand. Crumbles if\n"
-        "touched.");
-
-const u8 DecorDesc_SILVER_SHIELD[] = _(
-    "Awarded for 50\n"
-        "straight wins at\n"
-        "the BATTLE TOWER.");
-
-const u8 DecorDesc_GOLD_SHIELD[] = _(
-    "Awarded for 100\n"
-        "straight wins at\n"
-        "the BATTLE TOWER.");
-
-const u8 DecorDesc_GLASS_ORNAMENT[] = _(
-    "A glass replica of\n"
-        "a famous sculpture\n"
-        "at the ART MUSEUM.");
-
-const u8 DecorDesc_TV[] = _(
-    "A small, gray-\n"
-        "colored toy TV.");
-
-const u8 DecorDesc_ROUND_TV[] = _(
-    "A toy TV modeled\n"
-        "in the image of a\n"
-        "SEEDOT.");
-
-const u8 DecorDesc_CUTE_TV[] = _(
-    "A toy TV modeled\n"
-        "in the image of a\n"
-        "SKITTY.");
-
-const u8 DecorDesc_GLITTER_MAT[] = _(
-    "An odd mat that\n"
-        "glitters if stepped\n"
-        "on.");
-
-const u8 DecorDesc_JUMP_MAT[] = _(
-    "A trick mat that\n"
-        "jumps when it is\n"
-        "stepped on.");
-
-const u8 DecorDesc_SPIN_MAT[] = _(
-    "A trick mat that\n"
-        "spins around when\n"
-        "stepped on.");
-
-const u8 DecorDesc_C_LOW_NOTE_MAT[] = _(
-    "A mat that plays\n"
-        "a low C note when\n"
-        "stepped on.");
-
-const u8 DecorDesc_D_NOTE_MAT[] = _(
-    "A mat that plays\n"
-        "a D note when\n"
-        "stepped on.");
-
-const u8 DecorDesc_E_NOTE_MAT[] = _(
-    "A mat that plays\n"
-        "an E note when\n"
-        "stepped on.");
-
-const u8 DecorDesc_F_NOTE_MAT[] = _(
-    "A mat that plays\n"
-        "an F note when\n"
-        "stepped on.");
-
-const u8 DecorDesc_G_NOTE_MAT[] = _(
-    "A mat that plays\n"
-        "a G note when\n"
-        "stepped on.");
-
-const u8 DecorDesc_A_NOTE_MAT[] = _(
-    "A mat that plays\n"
-        "an A note when\n"
-        "stepped on.");
-
-const u8 DecorDesc_B_NOTE_MAT[] = _(
-    "A mat that plays\n"
-        "a B note when\n"
-        "stepped on.");
-
-const u8 DecorDesc_C_HIGH_NOTE_MAT[] = _(
-    "A mat that plays\n"
-        "a high C note when\n"
-        "stepped on.");
-
-const u8 DecorDesc_SURF_MAT[] = _(
-    "A mat designed with\n"
-        "a SURF image.\n"
-        "Put items on top.");
-
-const u8 DecorDesc_THUNDER_MAT[] = _(
-    "A mat designed with\n"
-        "a THUNDER image.\n"
-        "Put items on top.");
-
-const u8 DecorDesc_FIRE_BLAST_MAT[] = _(
-    "A mat designed with\n"
-        "a FIRE BLAST image.\n"
-        "Put items on top.");
-
-const u8 DecorDesc_POWDER_SNOW_MAT[] = _(
-    "A mat with a POWDER\n"
-        "SNOW image design.\n"
-        "Put items on top.");
-
-const u8 DecorDesc_ATTRACT_MAT[] = _(
-    "A mat designed with\n"
-        "an ATTRACT image.\n"
-        "Put items on top.");
-
-const u8 DecorDesc_FISSURE_MAT[] = _(
-    "A mat designed with\n"
-        "a FISSURE image.\n"
-        "Put items on top.");
-
-const u8 DecorDesc_SPIKES_MAT[] = _(
-    "A mat designed with\n"
-        "a SPIKES image.\n"
-        "Put items on top.");
-
-const u8 DecorDesc_BALL_POSTER[] = _(
-    "A small poster\n"
-        "printed with POKé\n"
-        "BALLS.");
-
-const u8 DecorDesc_GREEN_POSTER[] = _(
-    "A small poster with\n"
-        "a TREECKO print.");
-
-const u8 DecorDesc_RED_POSTER[] = _(
-    "A small poster with\n"
-        "a TORCHIC print.");
-
-const u8 DecorDesc_BLUE_POSTER[] = _(
-    "A small poster with\n"
-        "a MUDKIP print.");
-
-const u8 DecorDesc_CUTE_POSTER[] = _(
-    "A small poster with\n"
-        "an AZURILL print.");
-
-const u8 DecorDesc_PIKA_POSTER[] = _(
-    "A large poster with\n"
-        "a PIKACHU and\n"
-        "PICHU print.");
-
-const u8 DecorDesc_LONG_POSTER[] = _(
-    "A large poster with\n"
-        "a SEVIPER print.");
-
-const u8 DecorDesc_SEA_POSTER[] = _(
-    "A large poster with\n"
-        "a RELICANTH print.");
-
-const u8 DecorDesc_SKY_POSTER[] = _(
-    "A large poster with\n"
-        "a WINGULL print.");
-
-const u8 DecorDesc_KISS_POSTER[] = _(
-    "A large poster with\n"
-        "a SMOOCHUM print.");
-
-const u8 DecorDesc_PICHU_DOLL[] = _(
-    "A PICHU doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_PIKACHU_DOLL[] = _(
-    "A PIKACHU doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_MARILL_DOLL[] = _(
-    "A MARILL doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_TOGEPI_DOLL[] = _(
-    "A TOGEPI doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_CYNDAQUIL_DOLL[] = _(
-    "A CYNDAQUIL doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_CHIKORITA_DOLL[] = _(
-    "A CHIKORITA doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_TOTODILE_DOLL[] = _(
-    "A TOTODILE doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_JIGGLYPUFF_DOLL[] = _(
-    "A JIGGLYPUFF doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_MEOWTH_DOLL[] = _(
-    "A MEOWTH doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_CLEFAIRY_DOLL[] = _(
-    "A CLEFAIRY doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_DITTO_DOLL[] = _(
-    "A DITTO doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_SMOOCHUM_DOLL[] = _(
-    "A SMOOCHUM doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_TREECKO_DOLL[] = _(
-    "A TREECKO doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_TORCHIC_DOLL[] = _(
-    "A TORCHIC doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_MUDKIP_DOLL[] = _(
-    "A MUDKIP doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_DUSKULL_DOLL[] = _(
-    "A DUSKULL doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_WYNAUT_DOLL[] = _(
-    "A WYNAUT doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_BALTOY_DOLL[] = _(
-    "A BALTOY doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_KECLEON_DOLL[] = _(
-    "A KECLEON doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_AZURILL_DOLL[] = _(
-    "An AZURILL doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_SKITTY_DOLL[] = _(
-    "A SKITTY doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_SWABLU_DOLL[] = _(
-    "A SWABLU doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_GULPIN_DOLL[] = _(
-    "A GULPIN doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_LOTAD_DOLL[] = _(
-    "A LOTAD doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_SEEDOT_DOLL[] = _(
-    "A SEEDOT doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_PIKA_CUSHION[] = _(
-    "A PIKACHU cushion.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_ROUND_CUSHION[] = _(
-    "A MARILL cushion.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_KISS_CUSHION[] = _(
-    "A SMOOCHUM\n"
-        "cushion. Place it on\n"
-        "a mat or a desk.");
-
-const u8 DecorDesc_ZIGZAG_CUSHION[] = _(
-    "A ZIGZAGOON\n"
-        "cushion. Place it on\n"
-        "a mat or a desk.");
-
-const u8 DecorDesc_SPIN_CUSHION[] = _(
-    "A SPINDA cushion.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_DIAMOND_CUSHION[] = _(
-    "A SABLEYE cushion.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_BALL_CUSHION[] = _(
-    "A BALL cushion.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_GRASS_CUSHION[] = _(
-    "A grass-mark\n"
-        "cushion. Place it on\n"
-        "a mat or a desk.");
-
-const u8 DecorDesc_FIRE_CUSHION[] = _(
-    "A fire-mark\n"
-        "cushion. Place it on\n"
-        "a mat or a desk.");
-
-const u8 DecorDesc_WATER_CUSHION[] = _(
-    "A water-mark\n"
-        "cushion. Place it on\n"
-        "a mat or a desk.");
-
-const u8 DecorDesc_SNORLAX_DOLL[] = _(
-    "A large doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_RHYDON_DOLL[] = _(
-    "A large doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_LAPRAS_DOLL[] = _(
-    "A large doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_VENUSAUR_DOLL[] = _(
-    "A large doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_CHARIZARD_DOLL[] = _(
-    "A large doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_BLASTOISE_DOLL[] = _(
-    "A large doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_WAILMER_DOLL[] = _(
-    "A large doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_REGIROCK_DOLL[] = _(
-    "A large doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_REGICE_DOLL[] = _(
-    "A large doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-
-const u8 DecorDesc_REGISTEEL_DOLL[] = _(
-    "A large doll.\n"
-        "Place it on a mat\n"
-        "or a desk.");
-#endif //GUARD_DATA_DECORATION_DESCRIPTION_H
diff --git a/include/data/decoration/header.h b/include/data/decoration/header.h
deleted file mode 100644
index 64bed1c7e..000000000
--- a/include/data/decoration/header.h
+++ /dev/null
@@ -1,1100 +0,0 @@
-//
-// Created by scott on 10/21/2017.
-//
-
-#ifndef GUARD_DATA_DECORATION_HEADER_H
-#define GUARD_DATA_DECORATION_HEADER_H
-
-const struct Decoration gDecorations[] = {
-    {
-        DECOR_NONE,
-        _("SMALL DESK"),
-        DECORPERM_SOLID_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_DESK,
-        0,
-        DecorDesc_SMALL_DESK,
-        DecorGfx_SMALL_DESK
-    }, {
-        DECOR_SMALL_DESK,
-        _("SMALL DESK"),
-        DECORPERM_SOLID_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_DESK,
-        3000,
-        DecorDesc_SMALL_DESK,
-        DecorGfx_SMALL_DESK
-    }, {
-        DECOR_POKEMON_DESK,
-        _("POKéMON DESK"),
-        DECORPERM_SOLID_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_DESK,
-        3000,
-        DecorDesc_POKEMON_DESK,
-        DecorGfx_POKEMON_DESK
-    }, {
-        DECOR_HEAVY_DESK,
-        _("HEAVY DESK"),
-        DECORPERM_SOLID_FLOOR,
-        DECORSHAPE_3x2,
-        DECORCAT_DESK,
-        6000,
-        DecorDesc_HEAVY_DESK,
-        DecorGfx_HEAVY_DESK
-    }, {
-        DECOR_RAGGED_DESK,
-        _("RAGGED DESK"),
-        DECORPERM_SOLID_FLOOR,
-        DECORSHAPE_3x2,
-        DECORCAT_DESK,
-        6000,
-        DecorDesc_RAGGED_DESK,
-        DecorGfx_RAGGED_DESK
-    }, {
-        DECOR_COMFORT_DESK,
-        _("COMFORT DESK"),
-        DECORPERM_SOLID_FLOOR,
-        DECORSHAPE_3x2,
-        DECORCAT_DESK,
-        6000,
-        DecorDesc_COMFORT_DESK,
-        DecorGfx_COMFORT_DESK
-    }, {
-        DECOR_PRETTY_DESK,
-        _("PRETTY DESK"),
-        DECORPERM_SOLID_FLOOR,
-        DECORSHAPE_3x3,
-        DECORCAT_DESK,
-        9000,
-        DecorDesc_PRETTY_DESK,
-        DecorGfx_PRETTY_DESK
-    }, {
-        DECOR_BRICK_DESK,
-        _("BRICK DESK"),
-        DECORPERM_SOLID_FLOOR,
-        DECORSHAPE_3x3,
-        DECORCAT_DESK,
-        9000,
-        DecorDesc_BRICK_DESK,
-        DecorGfx_BRICK_DESK
-    }, {
-        DECOR_CAMP_DESK,
-        _("CAMP DESK"),
-        DECORPERM_SOLID_FLOOR,
-        DECORSHAPE_3x3,
-        DECORCAT_DESK,
-        9000,
-        DecorDesc_CAMP_DESK,
-        DecorGfx_CAMP_DESK
-    }, {
-        DECOR_HARD_DESK,
-        _("HARD DESK"),
-        DECORPERM_SOLID_FLOOR,
-        DECORSHAPE_3x3,
-        DECORCAT_DESK,
-        9000,
-        DecorDesc_HARD_DESK,
-        DecorGfx_HARD_DESK
-    }, {
-        DECOR_SMALL_CHAIR,
-        _("SMALL CHAIR"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_CHAIR,
-        2000,
-        DecorDesc_SMALL_CHAIR,
-        DecorGfx_SMALL_CHAIR
-    }, {
-        DECOR_POKEMON_CHAIR,
-        _("POKéMON CHAIR"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_CHAIR,
-        2000,
-        DecorDesc_POKEMON_CHAIR,
-        DecorGfx_POKEMON_CHAIR
-    }, {
-        DECOR_HEAVY_CHAIR,
-        _("HEAVY CHAIR"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_CHAIR,
-        2000,
-        DecorDesc_HEAVY_CHAIR,
-        DecorGfx_HEAVY_CHAIR
-    }, {
-        DECOR_PRETTY_CHAIR,
-        _("PRETTY CHAIR"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_CHAIR,
-        2000,
-        DecorDesc_PRETTY_CHAIR,
-        DecorGfx_PRETTY_CHAIR
-    }, {
-        DECOR_COMFORT_CHAIR,
-        _("COMFORT CHAIR"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_CHAIR,
-        2000,
-        DecorDesc_COMFORT_CHAIR,
-        DecorGfx_COMFORT_CHAIR
-    }, {
-        DECOR_RAGGED_CHAIR,
-        _("RAGGED CHAIR"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_CHAIR,
-        2000,
-        DecorDesc_RAGGED_CHAIR,
-        DecorGfx_RAGGED_CHAIR
-    }, {
-        DECOR_BRICK_CHAIR,
-        _("BRICK CHAIR"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_CHAIR,
-        2000,
-        DecorDesc_BRICK_CHAIR,
-        DecorGfx_BRICK_CHAIR
-    }, {
-        DECOR_CAMP_CHAIR,
-        _("CAMP CHAIR"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_CHAIR,
-        2000,
-        DecorDesc_CAMP_CHAIR,
-        DecorGfx_CAMP_CHAIR
-    }, {
-        DECOR_HARD_CHAIR,
-        _("HARD CHAIR"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_CHAIR,
-        2000,
-        DecorDesc_HARD_CHAIR,
-        DecorGfx_HARD_CHAIR
-    }, {
-        DECOR_RED_PLANT,
-        _("RED PLANT"),
-        DECORPERM_BEHIND_FLOOR,
-        DECORSHAPE_1x2,
-        DECORCAT_PLANT,
-        3000,
-        DecorDesc_RED_PLANT,
-        DecorGfx_RED_PLANT
-    }, {
-        DECOR_TROPICAL_PLANT,
-        _("TROPICAL PLANT"),
-        DECORPERM_BEHIND_FLOOR,
-        DECORSHAPE_1x2,
-        DECORCAT_PLANT,
-        3000,
-        DecorDesc_TROPICAL_PLANT,
-        DecorGfx_TROPICAL_PLANT
-    }, {
-        DECOR_PRETTY_FLOWERS,
-        _("PRETTY FLOWERS"),
-        DECORPERM_BEHIND_FLOOR,
-        DECORSHAPE_1x2,
-        DECORCAT_PLANT,
-        3000,
-        DecorDesc_PRETTY_FLOWERS,
-        DecorGfx_PRETTY_FLOWERS
-    }, {
-        DECOR_COLORFUL_PLANT,
-        _("COLORFUL PLANT"),
-        DECORPERM_BEHIND_FLOOR,
-        DECORSHAPE_2x2,
-        DECORCAT_PLANT,
-        5000,
-        DecorDesc_COLORFUL_PLANT,
-        DecorGfx_COLORFUL_PLANT
-    }, {
-        DECOR_BIG_PLANT,
-        _("BIG PLANT"),
-        DECORPERM_BEHIND_FLOOR,
-        DECORSHAPE_2x2,
-        DECORCAT_PLANT,
-        5000,
-        DecorDesc_BIG_PLANT,
-        DecorGfx_BIG_PLANT
-    }, {
-        DECOR_GORGEOUS_PLANT,
-        _("GORGEOUS PLANT"),
-        DECORPERM_BEHIND_FLOOR,
-        DECORSHAPE_2x2,
-        DECORCAT_PLANT,
-        5000,
-        DecorDesc_GORGEOUS_PLANT,
-        DecorGfx_GORGEOUS_PLANT
-    }, {
-        DECOR_RED_BRICK,
-        _("RED BRICK"),
-        DECORPERM_SOLID_FLOOR,
-        DECORSHAPE_1x2,
-        DECORCAT_ORNAMENT,
-        500,
-        DecorDesc_RED_BRICK,
-        DecorGfx_RED_BRICK
-    }, {
-        DECOR_YELLOW_BRICK,
-        _("YELLOW BRICK"),
-        DECORPERM_SOLID_FLOOR,
-        DECORSHAPE_1x2,
-        DECORCAT_ORNAMENT,
-        500,
-        DecorDesc_YELLOW_BRICK,
-        DecorGfx_YELLOW_BRICK
-    }, {
-        DECOR_BLUE_BRICK,
-        _("BLUE BRICK"),
-        DECORPERM_SOLID_FLOOR,
-        DECORSHAPE_1x2,
-        DECORCAT_ORNAMENT,
-        500,
-        DecorDesc_BLUE_BRICK,
-        DecorGfx_BLUE_BRICK
-    }, {
-        DECOR_RED_BALLOON,
-        _("RED BALLOON"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_ORNAMENT,
-        500,
-        DecorDesc_RED_BALLOON,
-        DecorGfx_RED_BALLOON
-    }, {
-        DECOR_BLUE_BALLOON,
-        _("BLUE BALLOON"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_ORNAMENT,
-        500,
-        DecorDesc_BLUE_BALLOON,
-        DecorGfx_BLUE_BALLOON
-    }, {
-        DECOR_YELLOW_BALLOON,
-        _("YELLOW BALLOON"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_ORNAMENT,
-        500,
-        DecorDesc_YELLOW_BALLOON,
-        DecorGfx_YELLOW_BALLOON
-    }, {
-        DECOR_RED_TENT,
-        _("RED TENT"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_3x3,
-        DECORCAT_ORNAMENT,
-        10000,
-        DecorDesc_RED_TENT,
-        DecorGfx_RED_TENT
-    }, {
-        DECOR_BLUE_TENT,
-        _("BLUE TENT"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_3x3,
-        DECORCAT_ORNAMENT,
-        10000,
-        DecorDesc_BLUE_TENT,
-        DecorGfx_BLUE_TENT
-    }, {
-        DECOR_SOLID_BOARD,
-        _("SOLID BOARD"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x2,
-        DECORCAT_ORNAMENT,
-        3000,
-        DecorDesc_SOLID_BOARD,
-        DecorGfx_SOLID_BOARD
-    }, {
-        DECOR_SLIDE,
-        _("SLIDE"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_2x4,
-        DECORCAT_ORNAMENT,
-        8000,
-        DecorDesc_SLIDE,
-        DecorGfx_SLIDE
-    }, {
-        DECOR_FENCE_LENGTH,
-        _("FENCE LENGTH"),
-        DECORPERM_SOLID_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_ORNAMENT,
-        500,
-        DecorDesc_FENCE_LENGTH,
-        DecorGfx_FENCE_LENGTH
-    }, {
-        DECOR_FENCE_WIDTH,
-        _("FENCE WIDTH"),
-        DECORPERM_SOLID_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_ORNAMENT,
-        500,
-        DecorDesc_FENCE_WIDTH,
-        DecorGfx_FENCE_WIDTH
-    }, {
-        DECOR_TIRE,
-        _("TIRE"),
-        DECORPERM_SOLID_FLOOR,
-        DECORSHAPE_2x2,
-        DECORCAT_ORNAMENT,
-        800,
-        DecorDesc_TIRE,
-        DecorGfx_TIRE
-    }, {
-        DECOR_STAND,
-        _("STAND"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_4x2,
-        DECORCAT_ORNAMENT,
-        7000,
-        DecorDesc_STAND,
-        DecorGfx_STAND
-    }, {
-        DECOR_MUD_BALL,
-        _("MUD BALL"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_ORNAMENT,
-        200,
-        DecorDesc_MUD_BALL,
-        DecorGfx_MUD_BALL
-    }, {
-        DECOR_BREAKABLE_DOOR,
-        _("BREAKABLE DOOR"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x2,
-        DECORCAT_ORNAMENT,
-        3000,
-        DecorDesc_BREAKABLE_DOOR,
-        DecorGfx_BREAKABLE_DOOR
-    }, {
-        DECOR_SAND_ORNAMENT,
-        _("SAND ORNAMENT"),
-        DECORPERM_BEHIND_FLOOR,
-        DECORSHAPE_1x2,
-        DECORCAT_ORNAMENT,
-        3000,
-        DecorDesc_SAND_ORNAMENT,
-        DecorGfx_SAND_ORNAMENT
-    }, {
-        DECOR_SILVER_SHIELD,
-        _("SILVER SHIELD"),
-        DECORPERM_BEHIND_FLOOR,
-        DECORSHAPE_1x2,
-        DECORCAT_ORNAMENT,
-        0,
-        DecorDesc_SILVER_SHIELD,
-        DecorGfx_SILVER_SHIELD
-    }, {
-        DECOR_GOLD_SHIELD,
-        _("GOLD SHIELD"),
-        DECORPERM_BEHIND_FLOOR,
-        DECORSHAPE_1x2,
-        DECORCAT_ORNAMENT,
-        0,
-        DecorDesc_GOLD_SHIELD,
-        DecorGfx_GOLD_SHIELD
-    }, {
-        DECOR_GLASS_ORNAMENT,
-        _("GLASS ORNAMENT"),
-        DECORPERM_BEHIND_FLOOR,
-        DECORSHAPE_1x2,
-        DECORCAT_ORNAMENT,
-        0,
-        DecorDesc_GLASS_ORNAMENT,
-        DecorGfx_GLASS_ORNAMENT
-    }, {
-        DECOR_TV,
-        _("TV"),
-        DECORPERM_SOLID_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_ORNAMENT,
-        3000,
-        DecorDesc_TV,
-        DecorGfx_TV
-    }, {
-        DECOR_ROUND_TV,
-        _("ROUND TV"),
-        DECORPERM_SOLID_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_ORNAMENT,
-        4000,
-        DecorDesc_ROUND_TV,
-        DecorGfx_ROUND_TV
-    }, {
-        DECOR_CUTE_TV,
-        _("CUTE TV"),
-        DECORPERM_SOLID_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_ORNAMENT,
-        4000,
-        DecorDesc_CUTE_TV,
-        DecorGfx_CUTE_TV
-    }, {
-        DECOR_GLITTER_MAT,
-        _("GLITTER MAT"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_MAT,
-        2000,
-        DecorDesc_GLITTER_MAT,
-        DecorGfx_GLITTER_MAT
-    }, {
-        DECOR_JUMP_MAT,
-        _("JUMP MAT"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_MAT,
-        2000,
-        DecorDesc_JUMP_MAT,
-        DecorGfx_JUMP_MAT
-    }, {
-        DECOR_SPIN_MAT,
-        _("SPIN MAT"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_MAT,
-        2000,
-        DecorDesc_SPIN_MAT,
-        DecorGfx_SPIN_MAT
-    }, {
-        DECOR_C_LOW_NOTE_MAT,
-        _("C Low NOTE MAT"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_MAT,
-        500,
-        DecorDesc_C_LOW_NOTE_MAT,
-        DecorGfx_C_LOW_NOTE_MAT
-    }, {
-        DECOR_D_NOTE_MAT,
-        _("D NOTE MAT"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_MAT,
-        500,
-        DecorDesc_D_NOTE_MAT,
-        DecorGfx_D_NOTE_MAT
-    }, {
-        DECOR_E_NOTE_MAT,
-        _("E NOTE MAT"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_MAT,
-        500,
-        DecorDesc_E_NOTE_MAT,
-        DecorGfx_E_NOTE_MAT
-    }, {
-        DECOR_F_NOTE_MAT,
-        _("F NOTE MAT"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_MAT,
-        500,
-        DecorDesc_F_NOTE_MAT,
-        DecorGfx_F_NOTE_MAT
-    }, {
-        DECOR_G_NOTE_MAT,
-        _("G NOTE MAT"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_MAT,
-        500,
-        DecorDesc_G_NOTE_MAT,
-        DecorGfx_G_NOTE_MAT
-    }, {
-        DECOR_A_NOTE_MAT,
-        _("A NOTE MAT"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_MAT,
-        500,
-        DecorDesc_A_NOTE_MAT,
-        DecorGfx_A_NOTE_MAT
-    }, {
-        DECOR_B_NOTE_MAT,
-        _("B NOTE MAT"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_MAT,
-        500,
-        DecorDesc_B_NOTE_MAT,
-        DecorGfx_B_NOTE_MAT
-    }, {
-        DECOR_C_HIGH_NOTE_MAT,
-        _("C High NOTE MAT"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_1x1,
-        DECORCAT_MAT,
-        500,
-        DecorDesc_C_HIGH_NOTE_MAT,
-        DecorGfx_C_HIGH_NOTE_MAT
-    }, {
-        DECOR_SURF_MAT,
-        _("SURF MAT"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_3x3,
-        DECORCAT_MAT,
-        4000,
-        DecorDesc_SURF_MAT,
-        DecorGfx_SURF_MAT
-    }, {
-        DECOR_THUNDER_MAT,
-        _("THUNDER MAT"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_3x3,
-        DECORCAT_MAT,
-        4000,
-        DecorDesc_THUNDER_MAT,
-        DecorGfx_THUNDER_MAT
-    }, {
-        DECOR_FIRE_BLAST_MAT,
-        _("FIRE BLAST MAT"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_3x3,
-        DECORCAT_MAT,
-        4000,
-        DecorDesc_FIRE_BLAST_MAT,
-        DecorGfx_FIRE_BLAST_MAT
-    }, {
-        DECOR_POWDER_SNOW_MAT,
-        _("POWDER SNOW MAT"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_3x3,
-        DECORCAT_MAT,
-        4000,
-        DecorDesc_POWDER_SNOW_MAT,
-        DecorGfx_POWDER_SNOW_MAT
-    }, {
-        DECOR_ATTRACT_MAT,
-        _("ATTRACT MAT"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_3x3,
-        DECORCAT_MAT,
-        4000,
-        DecorDesc_ATTRACT_MAT,
-        DecorGfx_ATTRACT_MAT
-    }, {
-        DECOR_FISSURE_MAT,
-        _("FISSURE MAT"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_3x3,
-        DECORCAT_MAT,
-        4000,
-        DecorDesc_FISSURE_MAT,
-        DecorGfx_FISSURE_MAT
-    }, {
-        DECOR_SPIKES_MAT,
-        _("SPIKES MAT"),
-        DECORPERM_PASS_FLOOR,
-        DECORSHAPE_3x3,
-        DECORCAT_MAT,
-        4000,
-        DecorDesc_SPIKES_MAT,
-        DecorGfx_SPIKES_MAT
-    }, {
-        DECOR_BALL_POSTER,
-        _("BALL POSTER"),
-        DECORPERM_NA_WALL,
-        DECORSHAPE_1x1,
-        DECORCAT_POSTER,
-        1000,
-        DecorDesc_BALL_POSTER,
-        DecorGfx_BALL_POSTER
-    }, {
-        DECOR_GREEN_POSTER,
-        _("GREEN POSTER"),
-        DECORPERM_NA_WALL,
-        DECORSHAPE_1x1,
-        DECORCAT_POSTER,
-        1000,
-        DecorDesc_GREEN_POSTER,
-        DecorGfx_GREEN_POSTER
-    }, {
-        DECOR_RED_POSTER,
-        _("RED POSTER"),
-        DECORPERM_NA_WALL,
-        DECORSHAPE_1x1,
-        DECORCAT_POSTER,
-        1000,
-        DecorDesc_RED_POSTER,
-        DecorGfx_RED_POSTER
-    }, {
-        DECOR_BLUE_POSTER,
-        _("BLUE POSTER"),
-        DECORPERM_NA_WALL,
-        DECORSHAPE_1x1,
-        DECORCAT_POSTER,
-        1000,
-        DecorDesc_BLUE_POSTER,
-        DecorGfx_BLUE_POSTER
-    }, {
-        DECOR_CUTE_POSTER,
-        _("CUTE POSTER"),
-        DECORPERM_NA_WALL,
-        DECORSHAPE_1x1,
-        DECORCAT_POSTER,
-        1000,
-        DecorDesc_CUTE_POSTER,
-        DecorGfx_CUTE_POSTER
-    }, {
-        DECOR_PIKA_POSTER,
-        _("PIKA POSTER"),
-        DECORPERM_NA_WALL,
-        DECORSHAPE_2x1,
-        DECORCAT_POSTER,
-        1500,
-        DecorDesc_PIKA_POSTER,
-        DecorGfx_PIKA_POSTER
-    }, {
-        DECOR_LONG_POSTER,
-        _("LONG POSTER"),
-        DECORPERM_NA_WALL,
-        DECORSHAPE_2x1,
-        DECORCAT_POSTER,
-        1500,
-        DecorDesc_LONG_POSTER,
-        DecorGfx_LONG_POSTER
-    }, {
-        DECOR_SEA_POSTER,
-        _("SEA POSTER"),
-        DECORPERM_NA_WALL,
-        DECORSHAPE_2x1,
-        DECORCAT_POSTER,
-        1500,
-        DecorDesc_SEA_POSTER,
-        DecorGfx_SEA_POSTER
-    }, {
-        DECOR_SKY_POSTER,
-        _("SKY POSTER"),
-        DECORPERM_NA_WALL,
-        DECORSHAPE_2x1,
-        DECORCAT_POSTER,
-        1500,
-        DecorDesc_SKY_POSTER,
-        DecorGfx_SKY_POSTER
-    }, {
-        DECOR_KISS_POSTER,
-        _("KISS POSTER"),
-        DECORPERM_NA_WALL,
-        DECORSHAPE_2x1,
-        DECORCAT_POSTER,
-        1500,
-        DecorDesc_KISS_POSTER,
-        DecorGfx_KISS_POSTER
-    }, {
-        DECOR_PICHU_DOLL,
-        _("PICHU DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_DOLL,
-        3000,
-        DecorDesc_PICHU_DOLL,
-        DecorGfx_PICHU_DOLL
-    }, {
-        DECOR_PIKACHU_DOLL,
-        _("PIKACHU DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_DOLL,
-        3000,
-        DecorDesc_PIKACHU_DOLL,
-        DecorGfx_PIKACHU_DOLL
-    }, {
-        DECOR_MARILL_DOLL,
-        _("MARILL DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_DOLL,
-        3000,
-        DecorDesc_MARILL_DOLL,
-        DecorGfx_MARILL_DOLL
-    }, {
-        DECOR_TOGEPI_DOLL,
-        _("TOGEPI DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_DOLL,
-        3000,
-        DecorDesc_TOGEPI_DOLL,
-        DecorGfx_TOGEPI_DOLL
-    }, {
-        DECOR_CYNDAQUIL_DOLL,
-        _("CYNDAQUIL DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_DOLL,
-        3000,
-        DecorDesc_CYNDAQUIL_DOLL,
-        DecorGfx_CYNDAQUIL_DOLL
-    }, {
-        DECOR_CHIKORITA_DOLL,
-        _("CHIKORITA DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_DOLL,
-        3000,
-        DecorDesc_CHIKORITA_DOLL,
-        DecorGfx_CHIKORITA_DOLL
-    }, {
-        DECOR_TOTODILE_DOLL,
-        _("TOTODILE DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_DOLL,
-        3000,
-        DecorDesc_TOTODILE_DOLL,
-        DecorGfx_TOTODILE_DOLL
-    }, {
-        DECOR_JIGGLYPUFF_DOLL,
-        _("JIGGLYPUFF DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_DOLL,
-        3000,
-        DecorDesc_JIGGLYPUFF_DOLL,
-        DecorGfx_JIGGLYPUFF_DOLL
-    }, {
-        DECOR_MEOWTH_DOLL,
-        _("MEOWTH DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_DOLL,
-        3000,
-        DecorDesc_MEOWTH_DOLL,
-        DecorGfx_MEOWTH_DOLL
-    }, {
-        DECOR_CLEFAIRY_DOLL,
-        _("CLEFAIRY DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_DOLL,
-        3000,
-        DecorDesc_CLEFAIRY_DOLL,
-        DecorGfx_CLEFAIRY_DOLL
-    }, {
-        DECOR_DITTO_DOLL,
-        _("DITTO DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_DOLL,
-        3000,
-        DecorDesc_DITTO_DOLL,
-        DecorGfx_DITTO_DOLL
-    }, {
-        DECOR_SMOOCHUM_DOLL,
-        _("SMOOCHUM DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_DOLL,
-        3000,
-        DecorDesc_SMOOCHUM_DOLL,
-        DecorGfx_SMOOCHUM_DOLL
-    }, {
-        DECOR_TREECKO_DOLL,
-        _("TREECKO DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_DOLL,
-        3000,
-        DecorDesc_TREECKO_DOLL,
-        DecorGfx_TREECKO_DOLL
-    }, {
-        DECOR_TORCHIC_DOLL,
-        _("TORCHIC DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_DOLL,
-        3000,
-        DecorDesc_TORCHIC_DOLL,
-        DecorGfx_TORCHIC_DOLL
-    }, {
-        DECOR_MUDKIP_DOLL,
-        _("MUDKIP DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_DOLL,
-        3000,
-        DecorDesc_MUDKIP_DOLL,
-        DecorGfx_MUDKIP_DOLL
-    }, {
-        DECOR_DUSKULL_DOLL,
-        _("DUSKULL DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_DOLL,
-        3000,
-        DecorDesc_DUSKULL_DOLL,
-        DecorGfx_DUSKULL_DOLL
-    }, {
-        DECOR_WYNAUT_DOLL,
-        _("WYNAUT DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_DOLL,
-        3000,
-        DecorDesc_WYNAUT_DOLL,
-        DecorGfx_WYNAUT_DOLL
-    }, {
-        DECOR_BALTOY_DOLL,
-        _("BALTOY DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_DOLL,
-        3000,
-        DecorDesc_BALTOY_DOLL,
-        DecorGfx_BALTOY_DOLL
-    }, {
-        DECOR_KECLEON_DOLL,
-        _("KECLEON DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_DOLL,
-        3000,
-        DecorDesc_KECLEON_DOLL,
-        DecorGfx_KECLEON_DOLL
-    }, {
-        DECOR_AZURILL_DOLL,
-        _("AZURILL DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_DOLL,
-        3000,
-        DecorDesc_AZURILL_DOLL,
-        DecorGfx_AZURILL_DOLL
-    }, {
-        DECOR_SKITTY_DOLL,
-        _("SKITTY DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_DOLL,
-        3000,
-        DecorDesc_SKITTY_DOLL,
-        DecorGfx_SKITTY_DOLL
-    }, {
-        DECOR_SWABLU_DOLL,
-        _("SWABLU DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_DOLL,
-        3000,
-        DecorDesc_SWABLU_DOLL,
-        DecorGfx_SWABLU_DOLL
-    }, {
-        DECOR_GULPIN_DOLL,
-        _("GULPIN DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_DOLL,
-        3000,
-        DecorDesc_GULPIN_DOLL,
-        DecorGfx_GULPIN_DOLL
-    }, {
-        DECOR_LOTAD_DOLL,
-        _("LOTAD DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_DOLL,
-        3000,
-        DecorDesc_LOTAD_DOLL,
-        DecorGfx_LOTAD_DOLL
-    }, {
-        DECOR_SEEDOT_DOLL,
-        _("SEEDOT DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_DOLL,
-        3000,
-        DecorDesc_SEEDOT_DOLL,
-        DecorGfx_SEEDOT_DOLL
-    }, {
-        DECOR_PIKA_CUSHION,
-        _("PIKA CUSHION"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_CUSHION,
-        2000,
-        DecorDesc_PIKA_CUSHION,
-        DecorGfx_PIKA_CUSHION
-    }, {
-        DECOR_ROUND_CUSHION,
-        _("ROUND CUSHION"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_CUSHION,
-        2000,
-        DecorDesc_ROUND_CUSHION,
-        DecorGfx_ROUND_CUSHION
-    }, {
-        DECOR_KISS_CUSHION,
-        _("KISS CUSHION"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_CUSHION,
-        2000,
-        DecorDesc_KISS_CUSHION,
-        DecorGfx_KISS_CUSHION
-    }, {
-        DECOR_ZIGZAG_CUSHION,
-        _("ZIGZAG CUSHION"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_CUSHION,
-        2000,
-        DecorDesc_ZIGZAG_CUSHION,
-        DecorGfx_ZIGZAG_CUSHION
-    }, {
-        DECOR_SPIN_CUSHION,
-        _("SPIN CUSHION"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_CUSHION,
-        2000,
-        DecorDesc_SPIN_CUSHION,
-        DecorGfx_SPIN_CUSHION
-    }, {
-        DECOR_DIAMOND_CUSHION,
-        _("DIAMOND CUSHION"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_CUSHION,
-        2000,
-        DecorDesc_DIAMOND_CUSHION,
-        DecorGfx_DIAMOND_CUSHION
-    }, {
-        DECOR_BALL_CUSHION,
-        _("BALL CUSHION"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_CUSHION,
-        2000,
-        DecorDesc_BALL_CUSHION,
-        DecorGfx_BALL_CUSHION
-    }, {
-        DECOR_GRASS_CUSHION,
-        _("GRASS CUSHION"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_CUSHION,
-        2000,
-        DecorDesc_GRASS_CUSHION,
-        DecorGfx_GRASS_CUSHION
-    }, {
-        DECOR_FIRE_CUSHION,
-        _("FIRE CUSHION"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_CUSHION,
-        2000,
-        DecorDesc_FIRE_CUSHION,
-        DecorGfx_FIRE_CUSHION
-    }, {
-        DECOR_WATER_CUSHION,
-        _("WATER CUSHION"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x1,
-        DECORCAT_CUSHION,
-        2000,
-        DecorDesc_WATER_CUSHION,
-        DecorGfx_WATER_CUSHION
-    }, {
-        DECOR_SNORLAX_DOLL,
-        _("SNORLAX DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x2,
-        DECORCAT_DOLL,
-        10000,
-        DecorDesc_SNORLAX_DOLL,
-        DecorGfx_SNORLAX_DOLL
-    }, {
-        DECOR_RHYDON_DOLL,
-        _("RHYDON DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x2,
-        DECORCAT_DOLL,
-        10000,
-        DecorDesc_RHYDON_DOLL,
-        DecorGfx_RHYDON_DOLL
-    }, {
-        DECOR_LAPRAS_DOLL,
-        _("LAPRAS DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x2,
-        DECORCAT_DOLL,
-        10000,
-        DecorDesc_LAPRAS_DOLL,
-        DecorGfx_LAPRAS_DOLL
-    }, {
-        DECOR_VENUSAUR_DOLL,
-        _("VENUSAUR DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x2,
-        DECORCAT_DOLL,
-        10000,
-        DecorDesc_VENUSAUR_DOLL,
-        DecorGfx_VENUSAUR_DOLL
-    }, {
-        DECOR_CHARIZARD_DOLL,
-        _("CHARIZARD DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x2,
-        DECORCAT_DOLL,
-        10000,
-        DecorDesc_CHARIZARD_DOLL,
-        DecorGfx_CHARIZARD_DOLL
-    }, {
-        DECOR_BLASTOISE_DOLL,
-        _("BLASTOISE DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x2,
-        DECORCAT_DOLL,
-        10000,
-        DecorDesc_BLASTOISE_DOLL,
-        DecorGfx_BLASTOISE_DOLL
-    }, {
-        DECOR_WAILMER_DOLL,
-        _("WAILMER DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x2,
-        DECORCAT_DOLL,
-        10000,
-        DecorDesc_WAILMER_DOLL,
-        DecorGfx_WAILMER_DOLL
-    }, {
-        DECOR_REGIROCK_DOLL,
-        _("REGIROCK DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x2,
-        DECORCAT_DOLL,
-        10000,
-        DecorDesc_REGIROCK_DOLL,
-        DecorGfx_REGIROCK_DOLL
-    }, {
-        DECOR_REGICE_DOLL,
-        _("REGICE DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x2,
-        DECORCAT_DOLL,
-        10000,
-        DecorDesc_REGICE_DOLL,
-        DecorGfx_REGICE_DOLL
-    }, {
-        DECOR_REGISTEEL_DOLL,
-        _("REGISTEEL DOLL"),
-        DECORPERM_SOLID_MAT,
-        DECORSHAPE_1x2,
-        DECORCAT_DOLL,
-        10000,
-        DecorDesc_REGISTEEL_DOLL,
-        DecorGfx_REGISTEEL_DOLL}
-};
-
-#endif //GUARD_DATA_DECORATION_HEADER_H
diff --git a/include/data/decoration/icon.h b/include/data/decoration/icon.h
deleted file mode 100644
index 1f11bc19f..000000000
--- a/include/data/decoration/icon.h
+++ /dev/null
@@ -1,132 +0,0 @@
-//
-// Created by scott on 10/21/2017.
-//
-
-#ifndef GUARD_ICON_H
-#define GUARD_ICON_H
-
-const u8 *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}
-};
-
-#endif //GUARD_ICON_H
diff --git a/include/data/decoration/tilemaps.h b/include/data/decoration/tilemaps.h
deleted file mode 100644
index 1cca7ae0b..000000000
--- a/include/data/decoration/tilemaps.h
+++ /dev/null
@@ -1,239 +0,0 @@
-//
-// Created by scott on 10/21/2017.
-//
-
-#ifndef GUARD_TILEMAPS_H
-#define GUARD_TILEMAPS_H
-
-const u8 Unknown_085A6FB0[] = {
-    0x00, 0x01, 0x02, 0x03
-};
-
-const u8 Unknown_085A6FB4[] = {
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d
-};
-
-const u8 Unknown_085A6FC0[] = {
-    0x00, 0x01, 0x02, 0x03,
-    0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b,
-    0x0c, 0x0d, 0x0e, 0x0f
-};
-
-const u8 Unknown_085A6FD0[] = {
-    0x00, 0x01, 0x04, 0x05,
-    0x08, 0x09, 0x0c, 0x0d,
-    0x10, 0x11, 0x14, 0x15
-};
-
-const u8 Unknown_085A6FDC[] = {
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
-};
-
-const u8 Unknown_085A6FE4[] = {
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f
-};
-
-const u8 Unknown_085A7004[] = {
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d,
-    0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
-    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d,
-    0x20, 0x21, 0x22, 0x23, 0x24, 0x25,
-    0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d
-};
-
-const u8 Unknown_085A7028[] = {
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d,
-    0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
-    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d
-};
-
-const u8 Unknown_085A7040[] = {
-    0x00, 0x00, 0x00, 0x00
-};
-
-const u8 Unknown_085A7044[] = {
-    0x00, 0x00, 0x01, 0x01,
-    0x00, 0x00, 0x01, 0x01
-};
-
-const u8 Unknown_085A704C[] = {
-    0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
-    0x00, 0x00, 0x01, 0x01, 0x02, 0x02
-};
-
-const u8 Unknown_085A7058[] = {
-    0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03,
-    0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03,
-    0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07,
-    0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07
-};
-
-const u8 Unknown_085A7078[] = {
-    0x00, 0x00, 0x01, 0x01,
-    0x00, 0x00, 0x01, 0x01,
-    0x02, 0x02, 0x03, 0x03,
-    0x02, 0x02, 0x03, 0x03
-};
-
-const u8 Unknown_085A7088[] = {
-    0x00, 0x00, 0x00, 0x00,
-    0x01, 0x01, 0x01, 0x01
-};
-
-const u8 Unknown_085A7090[] = {
-    0x00, 0x00, 0x00, 0x00,
-    0x01, 0x01, 0x01, 0x01,
-    0x02, 0x02, 0x02, 0x02
-};
-
-const u8 Unknown_085A709C[] = {
-    0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01,
-    0x02, 0x02, 0x03, 0x03, 0x02, 0x02, 0x03, 0x03,
-    0x04, 0x04, 0x05, 0x05, 0x04, 0x04, 0x05, 0x05,
-    0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 0x07, 0x07
-};
-
-const u8 Unknown_085A70BC[] = {
-    0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
-    0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
-    0x03, 0x03, 0x04, 0x04, 0x05, 0x05,
-    0x03, 0x03, 0x04, 0x04, 0x05, 0x05,
-    0x06, 0x06, 0x07, 0x07, 0x08, 0x08,
-    0x06, 0x06, 0x07, 0x07, 0x08, 0x08
-};
-
-const u8 Unknown_085A70E0[] = {
-    0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
-    0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
-    0x03, 0x03, 0x04, 0x04, 0x05, 0x05,
-    0x03, 0x03, 0x04, 0x04, 0x05, 0x05
-};
-
-const u8 Unknown_085A70F8[] = {
-    0x04, 0x05, 0x06, 0x07
-};
-
-const u8 Unknown_085A70FC[] = {
-    0x04, 0x05, 0x04, 0x05,
-    0x06, 0x07, 0x06, 0x07
-};
-
-const u8 Unknown_085A7104[] = {
-    0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-    0x06, 0x07, 0x06, 0x07, 0x06, 0x07
-};
-
-const u8 Unknown_085A7110[] = {
-    0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-    0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07,
-    0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-    0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07
-};
-
-const u8 Unknown_085A7130[] = {
-    0x04, 0x05, 0x04, 0x05,
-    0x06, 0x07, 0x06, 0x07,
-    0x04, 0x05, 0x04, 0x05,
-    0x06, 0x07, 0x06, 0x07
-};
-
-const u8 Unknown_085A7140[] = {
-    0x04, 0x05, 0x06, 0x07,
-    0x04, 0x05, 0x06, 0x07
-};
-
-const u8 Unknown_085A7148[] = {
-    0x04, 0x05, 0x06, 0x07,
-    0x04, 0x05, 0x06, 0x07,
-    0x04, 0x05, 0x06, 0x07
-};
-
-const u8 Unknown_085A7154[] = {
-    0x04, 0x05, 0x04, 0x05, 0x06, 0x07, 0x06, 0x07,
-    0x04, 0x05, 0x04, 0x05, 0x06, 0x07, 0x06, 0x07,
-    0x04, 0x05, 0x04, 0x05, 0x06, 0x07, 0x06, 0x07,
-    0x04, 0x05, 0x04, 0x05, 0x06, 0x07, 0x06, 0x07
-};
-
-const u8 Unknown_085A7174[] = {
-    0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-    0x06, 0x07, 0x06, 0x07, 0x06, 0x07,
-    0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-    0x06, 0x07, 0x06, 0x07, 0x06, 0x07,
-    0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-    0x06, 0x07, 0x06, 0x07, 0x06, 0x07
-};
-
-const u8 Unknown_085A7198[] = {
-    0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-    0x06, 0x07, 0x06, 0x07, 0x06, 0x07,
-    0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-    0x06, 0x07, 0x06, 0x07, 0x06, 0x07
-};
-
-const struct {
-    const u8 *tiles;
-    const u8 *y;
-    const u8 *x;
-    u8 size;
-} gUnknown_085A71B0[] = {
-    {
-        Unknown_085A6FB0,
-        Unknown_085A7040,
-        Unknown_085A70F8,
-        0x04
-    }, {
-        Unknown_085A6FDC,
-        Unknown_085A7044,
-        Unknown_085A70FC,
-        0x08
-    }, {
-        Unknown_085A6FB4,
-        Unknown_085A704C,
-        Unknown_085A7104,
-        0x0c
-    }, {
-        Unknown_085A6FE4,
-        Unknown_085A7058,
-        Unknown_085A7110,
-        0x20
-    }, {
-        Unknown_085A6FC0,
-        Unknown_085A7078,
-        Unknown_085A7130,
-        0x10
-    }, {
-        Unknown_085A6FDC,
-        Unknown_085A7088,
-        Unknown_085A7140,
-        0x08
-    }, {
-        Unknown_085A6FD0,
-        Unknown_085A7090,
-        Unknown_085A7148,
-        0x0c
-    }, {
-        Unknown_085A6FE4,
-        Unknown_085A709C,
-        Unknown_085A7154,
-        0x20
-    }, {
-        Unknown_085A7004,
-        Unknown_085A70BC,
-        Unknown_085A7174,
-        0x24
-    }, {
-        Unknown_085A7028,
-        Unknown_085A70E0,
-        Unknown_085A7198,
-        0x18
-    }};
-
-#endif //GUARD_TILEMAPS_H
diff --git a/include/data/decoration/tiles.h b/include/data/decoration/tiles.h
deleted file mode 100644
index 9a3f8a222..000000000
--- a/include/data/decoration/tiles.h
+++ /dev/null
@@ -1,646 +0,0 @@
-#ifndef GUARD_DATA_DECORATION_TILES
-#define GUARD_DATA_DECORATION_TILES
-
-const u16 DecorGfx_SMALL_DESK[] = {
-    0x87
-};
-
-const u16 DecorGfx_POKEMON_DESK[] = {
-    0x8F
-};
-
-const u16 DecorGfx_HEAVY_DESK[] = {
-    0x90,
-    0x91,
-    0x92,
-    0x98,
-    0x99,
-    0x9A
-};
-
-const u16 DecorGfx_RAGGED_DESK[] = {
-    0x93,
-    0x94,
-    0x95,
-    0x9B,
-    0x9C,
-    0x9D
-};
-
-const u16 DecorGfx_COMFORT_DESK[] = {
-    0x96,
-    0x97,
-    0xA3,
-    0x9E,
-    0x9F,
-    0xAB
-};
-
-const u16 DecorGfx_PRETTY_DESK[] = {
-    0xBD,
-    0xBE,
-    0xBF,
-    0xC5,
-    0xC6,
-    0xC7,
-    0xCD,
-    0xCE,
-    0xCF
-};
-
-const u16 DecorGfx_BRICK_DESK[] = {
-    0xA0,
-    0xA1,
-    0xA2,
-    0xA8,
-    0xA9,
-    0xAA,
-    0xB0,
-    0xB1,
-    0xB2
-};
-
-const u16 DecorGfx_CAMP_DESK[] = {
-    0xA4,
-    0xA5,
-    0xA6,
-    0xAC,
-    0xAD,
-    0xAE,
-    0xB4,
-    0xB5,
-    0xB6
-};
-
-const u16 DecorGfx_HARD_DESK[] = {
-    0xA7,
-    0xBB,
-    0xBC,
-    0xAF,
-    0xC3,
-    0xC4,
-    0xB7,
-    0xCB,
-    0xCC
-};
-
-const u16 DecorGfx_SMALL_CHAIR[] = {
-    0xB8
-};
-
-const u16 DecorGfx_POKEMON_CHAIR[] = {
-    0xB9
-};
-
-const u16 DecorGfx_HEAVY_CHAIR[] = {
-    0xBA
-};
-
-const u16 DecorGfx_PRETTY_CHAIR[] = {
-    0xC0
-};
-
-const u16 DecorGfx_COMFORT_CHAIR[] = {
-    0xC1
-};
-
-const u16 DecorGfx_RAGGED_CHAIR[] = {
-    0xC2
-};
-
-const u16 DecorGfx_BRICK_CHAIR[] = {
-    0xC8
-};
-
-const u16 DecorGfx_CAMP_CHAIR[] = {
-    0xC9
-};
-
-const u16 DecorGfx_HARD_CHAIR[] = {
-    0xCA
-};
-
-const u16 DecorGfx_RED_PLANT[] = {
-    0xD0,
-    0xD8
-};
-
-const u16 DecorGfx_TROPICAL_PLANT[] = {
-    0xD2,
-    0xDA
-};
-
-const u16 DecorGfx_PRETTY_FLOWERS[] = {
-    0xD4,
-    0xDC
-};
-
-const u16 DecorGfx_COLORFUL_PLANT[] = {
-    0xE0,
-    0xE2,
-    0xE8,
-    0xE9
-};
-
-const u16 DecorGfx_BIG_PLANT[] = {
-    0xE4,
-    0xE6,
-    0xEC,
-    0xED
-};
-
-const u16 DecorGfx_GORGEOUS_PLANT[] = {
-    0xF0,
-    0xF2,
-    0xF8,
-    0xF9
-};
-
-const u16 DecorGfx_RED_BRICK[] = {
-    0x25,
-    0x2D
-};
-
-const u16 DecorGfx_YELLOW_BRICK[] = {
-    0x26,
-    0x2E
-};
-
-const u16 DecorGfx_BLUE_BRICK[] = {
-    0x27,
-    0x2F
-};
-
-const u16 DecorGfx_RED_BALLOON[] = {
-    0x138
-};
-
-const u16 DecorGfx_BLUE_BALLOON[] = {
-    0x13C
-};
-
-const u16 DecorGfx_YELLOW_BALLOON[] = {
-    0x140
-};
-
-const u16 DecorGfx_RED_TENT[] = {
-    0x30,
-    0x31,
-    0x32,
-    0x38,
-    0x39,
-    0x3A,
-    0x40,
-    0x41,
-    0x3B
-};
-
-const u16 DecorGfx_BLUE_TENT[] = {
-    0x48,
-    0x49,
-    0x68,
-    0x50,
-    0x51,
-    0x70,
-    0x58,
-    0x59,
-    0x69
-};
-
-const u16 DecorGfx_SOLID_BOARD[] = {
-    0x34,
-    0x3C
-};
-
-const u16 DecorGfx_SLIDE[] = {
-    0x35,
-    0x36,
-    0x3D,
-    0x3E,
-    0x63,
-    0x64,
-    0x6F,
-    0x77
-};
-
-const u16 DecorGfx_FENCE_LENGTH[] = {
-    0x33
-};
-
-const u16 DecorGfx_FENCE_WIDTH[] = {
-    0x2C
-};
-
-const u16 DecorGfx_TIRE[] = {
-    0x80,
-    0x81,
-    0x88,
-    0x89
-};
-
-const u16 DecorGfx_STAND[] = {
-    0x6A,
-    0x6B,
-    0x6C,
-    0x6D,
-    0x72,
-    0x73,
-    0x74,
-    0x75
-};
-
-const u16 DecorGfx_MUD_BALL[] = {
-    0x28
-};
-
-const u16 DecorGfx_BREAKABLE_DOOR[] = {
-    0x37,
-    0x3F
-};
-
-const u16 DecorGfx_SAND_ORNAMENT[] = {
-    0x85,
-    0x8D
-};
-
-const u16 DecorGfx_SILVER_SHIELD[] = {
-    0xD6,
-    0xDE
-};
-
-const u16 DecorGfx_GOLD_SHIELD[] = {
-    0x12E,
-    0x136
-};
-
-const u16 DecorGfx_GLASS_ORNAMENT[] = {
-    0x82,
-    0x8A
-};
-
-const u16 DecorGfx_TV[] = {
-    0xF4
-};
-
-const u16 DecorGfx_ROUND_TV[] = {
-    0xF5
-};
-
-const u16 DecorGfx_CUTE_TV[] = {
-    0xF6
-};
-
-const u16 DecorGfx_GLITTER_MAT[] = {
-    0x60
-};
-
-const u16 DecorGfx_JUMP_MAT[] = {
-    0x61
-};
-
-const u16 DecorGfx_SPIN_MAT[] = {
-    0x62
-};
-
-const u16 DecorGfx_C_LOW_NOTE_MAT[] = {
-    0x78
-};
-
-const u16 DecorGfx_D_NOTE_MAT[] = {
-    0x79
-};
-
-const u16 DecorGfx_E_NOTE_MAT[] = {
-    0x7A
-};
-
-const u16 DecorGfx_F_NOTE_MAT[] = {
-    0x7B
-};
-
-const u16 DecorGfx_G_NOTE_MAT[] = {
-    0x7C
-};
-
-const u16 DecorGfx_A_NOTE_MAT[] = {
-    0x7D
-};
-
-const u16 DecorGfx_B_NOTE_MAT[] = {
-    0x7E
-};
-
-const u16 DecorGfx_C_HIGH_NOTE_MAT[] = {
-    0xB3
-};
-
-const u16 DecorGfx_SURF_MAT[] = {
-    0x42,
-    0x43,
-    0x44,
-    0x4A,
-    0x4B,
-    0x4C,
-    0x52,
-    0x53,
-    0x54
-};
-
-const u16 DecorGfx_THUNDER_MAT[] = {
-    0x45,
-    0x46,
-    0x47,
-    0x4D,
-    0x4E,
-    0x4F,
-    0x55,
-    0x56,
-    0x57
-};
-
-const u16 DecorGfx_FIRE_BLAST_MAT[] = {
-    0x5A,
-    0x5B,
-    0x5C,
-    0x5D,
-    0x5E,
-    0x5F,
-    0x65,
-    0x66,
-    0x67
-};
-
-const u16 DecorGfx_POWDER_SNOW_MAT[] = {
-    0x100,
-    0x101,
-    0x102,
-    0x108,
-    0x109,
-    0x10A,
-    0x110,
-    0x111,
-    0x112
-};
-
-const u16 DecorGfx_ATTRACT_MAT[] = {
-    0x103,
-    0x104,
-    0x105,
-    0x10B,
-    0x10C,
-    0x10D,
-    0x113,
-    0x114,
-    0x115
-};
-
-const u16 DecorGfx_FISSURE_MAT[] = {
-    0x106,
-    0x107,
-    0x118,
-    0x10E,
-    0x10F,
-    0x120,
-    0x116,
-    0x117,
-    0x128
-};
-
-const u16 DecorGfx_SPIKES_MAT[] = {
-    0x119,
-    0x11A,
-    0x11B,
-    0x121,
-    0x122,
-    0x123,
-    0x129,
-    0x12A,
-    0x12B
-};
-
-const u16 DecorGfx_BALL_POSTER[] = {
-    0x130
-};
-
-const u16 DecorGfx_GREEN_POSTER[] = {
-    0x131
-};
-
-const u16 DecorGfx_RED_POSTER[] = {
-    0x132
-};
-
-const u16 DecorGfx_BLUE_POSTER[] = {
-    0x133
-};
-
-const u16 DecorGfx_CUTE_POSTER[] = {
-    0x134
-};
-
-const u16 DecorGfx_PIKA_POSTER[] = {
-    0x11C,
-    0x11D
-};
-
-const u16 DecorGfx_LONG_POSTER[] = {
-    0x11E,
-    0x11F
-};
-
-const u16 DecorGfx_SEA_POSTER[] = {
-    0x124,
-    0x125
-};
-
-const u16 DecorGfx_SKY_POSTER[] = {
-    0x126,
-    0x127
-};
-
-const u16 DecorGfx_KISS_POSTER[] = {
-    0x12C,
-    0x12D
-};
-
-const u16 DecorGfx_PICHU_DOLL[] = {
-    MAP_OBJ_GFX_PICHU_DOLL
-};
-
-const u16 DecorGfx_PIKACHU_DOLL[] = {
-    MAP_OBJ_GFX_PIKACHU_DOLL
-};
-
-const u16 DecorGfx_MARILL_DOLL[] = {
-    MAP_OBJ_GFX_MARILL_DOLL
-};
-
-const u16 DecorGfx_TOGEPI_DOLL[] = {
-    MAP_OBJ_GFX_TOGEPI_DOLL
-};
-
-const u16 DecorGfx_CYNDAQUIL_DOLL[] = {
-    MAP_OBJ_GFX_CYNDAQUIL_DOLL
-};
-
-const u16 DecorGfx_CHIKORITA_DOLL[] = {
-    MAP_OBJ_GFX_CHIKORITA_DOLL
-};
-
-const u16 DecorGfx_TOTODILE_DOLL[] = {
-    MAP_OBJ_GFX_TOTODILE_DOLL
-};
-
-const u16 DecorGfx_JIGGLYPUFF_DOLL[] = {
-    MAP_OBJ_GFX_JIGGLYPUFF_DOLL
-};
-
-const u16 DecorGfx_MEOWTH_DOLL[] = {
-    MAP_OBJ_GFX_MEOWTH_DOLL
-};
-
-const u16 DecorGfx_CLEFAIRY_DOLL[] = {
-    MAP_OBJ_GFX_CLEFAIRY_DOLL
-};
-
-const u16 DecorGfx_DITTO_DOLL[] = {
-    MAP_OBJ_GFX_DITTO_DOLL
-};
-
-const u16 DecorGfx_SMOOCHUM_DOLL[] = {
-    MAP_OBJ_GFX_SMOOCHUM_DOLL
-};
-
-const u16 DecorGfx_TREECKO_DOLL[] = {
-    MAP_OBJ_GFX_TREECKO_DOLL
-};
-
-const u16 DecorGfx_TORCHIC_DOLL[] = {
-    MAP_OBJ_GFX_TORCHIC_DOLL
-};
-
-const u16 DecorGfx_MUDKIP_DOLL[] = {
-    MAP_OBJ_GFX_MUDKIP_DOLL
-};
-
-const u16 DecorGfx_DUSKULL_DOLL[] = {
-    MAP_OBJ_GFX_DUSKULL_DOLL
-};
-
-const u16 DecorGfx_WYNAUT_DOLL[] = {
-    MAP_OBJ_GFX_WYNAUT_DOLL
-};
-
-const u16 DecorGfx_BALTOY_DOLL[] = {
-    MAP_OBJ_GFX_BALTOY_DOLL
-};
-
-const u16 DecorGfx_KECLEON_DOLL[] = {
-    MAP_OBJ_GFX_KECLEON_DOLL
-};
-
-const u16 DecorGfx_AZURILL_DOLL[] = {
-    MAP_OBJ_GFX_AZURILL_DOLL
-};
-
-const u16 DecorGfx_SKITTY_DOLL[] = {
-    MAP_OBJ_GFX_SKITTY_DOLL
-};
-
-const u16 DecorGfx_SWABLU_DOLL[] = {
-    MAP_OBJ_GFX_SWABLU_DOLL
-};
-
-const u16 DecorGfx_GULPIN_DOLL[] = {
-    MAP_OBJ_GFX_GULPIN_DOLL
-};
-
-const u16 DecorGfx_LOTAD_DOLL[] = {
-    MAP_OBJ_GFX_LOTAD_DOLL
-};
-
-const u16 DecorGfx_SEEDOT_DOLL[] = {
-    MAP_OBJ_GFX_SEEDOT_DOLL
-};
-
-const u16 DecorGfx_PIKA_CUSHION[] = {
-    MAP_OBJ_GFX_PIKA_CUSHION
-};
-
-const u16 DecorGfx_ROUND_CUSHION[] = {
-    MAP_OBJ_GFX_ROUND_CUSHION
-};
-
-const u16 DecorGfx_KISS_CUSHION[] = {
-    MAP_OBJ_GFX_KISS_CUSHION
-};
-
-const u16 DecorGfx_ZIGZAG_CUSHION[] = {
-    MAP_OBJ_GFX_ZIGZAG_CUSHION
-};
-
-const u16 DecorGfx_SPIN_CUSHION[] = {
-    MAP_OBJ_GFX_SPIN_CUSHION
-};
-
-const u16 DecorGfx_DIAMOND_CUSHION[] = {
-    MAP_OBJ_GFX_DIAMOND_CUSHION
-};
-
-const u16 DecorGfx_BALL_CUSHION[] = {
-    MAP_OBJ_GFX_BALL_CUSHION
-};
-
-const u16 DecorGfx_GRASS_CUSHION[] = {
-    MAP_OBJ_GFX_GRASS_CUSHION
-};
-
-const u16 DecorGfx_FIRE_CUSHION[] = {
-    MAP_OBJ_GFX_FIRE_CUSHION
-};
-
-const u16 DecorGfx_WATER_CUSHION[] = {
-    MAP_OBJ_GFX_WATER_CUSHION
-};
-
-const u16 DecorGfx_SNORLAX_DOLL[] = {
-    MAP_OBJ_GFX_BIG_SNORLAX_DOLL
-};
-
-const u16 DecorGfx_RHYDON_DOLL[] = {
-    MAP_OBJ_GFX_BIG_RHYDON_DOLL
-};
-
-const u16 DecorGfx_LAPRAS_DOLL[] = {
-    MAP_OBJ_GFX_BIG_LAPRAS_DOLL
-};
-
-const u16 DecorGfx_VENUSAUR_DOLL[] = {
-    MAP_OBJ_GFX_BIG_VENUSAUR_DOLL
-};
-
-const u16 DecorGfx_CHARIZARD_DOLL[] = {
-    MAP_OBJ_GFX_BIG_CHARIZARD_DOLL
-};
-
-const u16 DecorGfx_BLASTOISE_DOLL[] = {
-    MAP_OBJ_GFX_BIG_BLASTOISE_DOLL
-};
-
-const u16 DecorGfx_WAILMER_DOLL[] = {
-    MAP_OBJ_GFX_BIG_WAILMER_DOLL
-};
-
-const u16 DecorGfx_REGIROCK_DOLL[] = {
-    MAP_OBJ_GFX_BIG_REGIROCK_DOLL
-};
-
-const u16 DecorGfx_REGICE_DOLL[] = {
-    MAP_OBJ_GFX_BIG_REGICE_DOLL
-};
-
-const u16 DecorGfx_REGISTEEL_DOLL[] = {
-    MAP_OBJ_GFX_BIG_REGISTEEL_DOLL
-};
-
-#endif // GUARD_DATA_DECORATION_TILES