Merge branch 'decoration'

4 files changed, 228 insertions, 228 deletions

diff --git a/src/decoration.c b/src/decoration.c
index 7595477a3..73a2a6749 100755
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -18,12 +18,12 @@
 #include "field_weather.h"
 #include "decoration.h"
 
-#define DECORATION(_id, _name, _decor_field_11, _shape, _decor_field_13, _price, _description, _tiles) {\
+#define DECORATION(_id, _name, _permission, _shape, _category, _price, _description, _tiles) {\
 .id = _id,\
 .name = _name,\
-.decor_field_11 = _decor_field_11,\
+.permission = _permission,\
 .shape = _shape,\
-.decor_field_13 = _decor_field_13,\
+.category = _category,\
 .price = _price,\
 .description = _description,\
 .tiles = _tiles\
@@ -31,7 +31,7 @@
 
 #define MENUACTION2(_text, _func) {.text = _text, .func = _func}
 #define MENUACTION3(_func1, _func2) {.func1 = _func1, .func2 = _func2}
-#define STRUCT_803EC860(_data1, _data2, _data3, _size) {.var0 = _data1, .var4 = _data2, .var8 = _data3, .size = _size}
+#define STRUCT_803EC860(_data1, _data2, _data3, _size) {.tiles = _data1, .y = _data2, .x = _data3, .size = _size}
 #define DECOSPRITETEMPLATE(_shape, _size, _x, _y) {.shape = _shape, .size = _size, .x = _x, .y = _y}
 
 const u8 DecorDesc_SMALL_DESK[] = _(
@@ -1255,127 +1255,127 @@ const u16 DecorGfx_REGISTEEL_DOLL[] = {
 };
 
 const struct Decoration gDecorations[] = {
-    DECORATION(DECOR_NONE, _("SMALL DESK"), 0, 0, 0, 0, DecorDesc_SMALL_DESK, DecorGfx_SMALL_DESK),
-    DECORATION(DECOR_SMALL_DESK, _("SMALL DESK"), 0, 0, 0, 3000, DecorDesc_SMALL_DESK, DecorGfx_SMALL_DESK),
-    DECORATION(DECOR_POKEMON_DESK, _("POKéMON DESK"), 0, 0, 0, 3000, DecorDesc_POKEMON_DESK, DecorGfx_POKEMON_DESK),
-    DECORATION(DECOR_HEAVY_DESK, _("HEAVY DESK"), 0, 9, 0, 6000, DecorDesc_HEAVY_DESK, DecorGfx_HEAVY_DESK),
-    DECORATION(DECOR_RAGGED_DESK, _("RAGGED DESK"), 0, 9, 0, 6000, DecorDesc_RAGGED_DESK, DecorGfx_RAGGED_DESK),
-    DECORATION(DECOR_COMFORT_DESK, _("COMFORT DESK"), 0, 9, 0, 6000, DecorDesc_COMFORT_DESK, DecorGfx_COMFORT_DESK),
-    DECORATION(DECOR_PRETTY_DESK, _("PRETTY DESK"), 0, 8, 0, 9000, DecorDesc_PRETTY_DESK, DecorGfx_PRETTY_DESK),
-    DECORATION(DECOR_BRICK_DESK, _("BRICK DESK"), 0, 8, 0, 9000, DecorDesc_BRICK_DESK, DecorGfx_BRICK_DESK),
-    DECORATION(DECOR_CAMP_DESK, _("CAMP DESK"), 0, 8, 0, 9000, DecorDesc_CAMP_DESK, DecorGfx_CAMP_DESK),
-    DECORATION(DECOR_HARD_DESK, _("HARD DESK"), 0, 8, 0, 9000, DecorDesc_HARD_DESK, DecorGfx_HARD_DESK),
-    DECORATION(DECOR_SMALL_CHAIR, _("SMALL CHAIR"), 1, 0, 1, 2000, DecorDesc_SMALL_CHAIR, DecorGfx_SMALL_CHAIR),
-    DECORATION(DECOR_POKEMON_CHAIR, _("POKéMON CHAIR"), 1, 0, 1, 2000, DecorDesc_POKEMON_CHAIR, DecorGfx_POKEMON_CHAIR),
-    DECORATION(DECOR_HEAVY_CHAIR, _("HEAVY CHAIR"), 1, 0, 1, 2000, DecorDesc_HEAVY_CHAIR, DecorGfx_HEAVY_CHAIR),
-    DECORATION(DECOR_PRETTY_CHAIR, _("PRETTY CHAIR"), 1, 0, 1, 2000, DecorDesc_PRETTY_CHAIR, DecorGfx_PRETTY_CHAIR),
-    DECORATION(DECOR_COMFORT_CHAIR, _("COMFORT CHAIR"), 1, 0, 1, 2000, DecorDesc_COMFORT_CHAIR, DecorGfx_COMFORT_CHAIR),
-    DECORATION(DECOR_RAGGED_CHAIR, _("RAGGED CHAIR"), 1, 0, 1, 2000, DecorDesc_RAGGED_CHAIR, DecorGfx_RAGGED_CHAIR),
-    DECORATION(DECOR_BRICK_CHAIR, _("BRICK CHAIR"), 1, 0, 1, 2000, DecorDesc_BRICK_CHAIR, DecorGfx_BRICK_CHAIR),
-    DECORATION(DECOR_CAMP_CHAIR, _("CAMP CHAIR"), 1, 0, 1, 2000, DecorDesc_CAMP_CHAIR, DecorGfx_CAMP_CHAIR),
-    DECORATION(DECOR_HARD_CHAIR, _("HARD CHAIR"), 1, 0, 1, 2000, DecorDesc_HARD_CHAIR, DecorGfx_HARD_CHAIR),
-    DECORATION(DECOR_RED_PLANT, _("RED PLANT"), 2, 5, 2, 3000, DecorDesc_RED_PLANT, DecorGfx_RED_PLANT),
-    DECORATION(DECOR_TROPICAL_PLANT, _("TROPICAL PLANT"), 2, 5, 2, 3000, DecorDesc_TROPICAL_PLANT, DecorGfx_TROPICAL_PLANT),
-    DECORATION(DECOR_PRETTY_FLOWERS, _("PRETTY FLOWERS"), 2, 5, 2, 3000, DecorDesc_PRETTY_FLOWERS, DecorGfx_PRETTY_FLOWERS),
-    DECORATION(DECOR_COLORFUL_PLANT, _("COLORFUL PLANT"), 2, 4, 2, 5000, DecorDesc_COLORFUL_PLANT, DecorGfx_COLORFUL_PLANT),
-    DECORATION(DECOR_BIG_PLANT, _("BIG PLANT"), 2, 4, 2, 5000, DecorDesc_BIG_PLANT, DecorGfx_BIG_PLANT),
-    DECORATION(DECOR_GORGEOUS_PLANT, _("GORGEOUS PLANT"), 2, 4, 2, 5000, DecorDesc_GORGEOUS_PLANT, DecorGfx_GORGEOUS_PLANT),
-    DECORATION(DECOR_RED_BRICK, _("RED BRICK"), 0, 5, 3, 500, DecorDesc_RED_BRICK, DecorGfx_RED_BRICK),
-    DECORATION(DECOR_YELLOW_BRICK, _("YELLOW BRICK"), 0, 5, 3, 500, DecorDesc_YELLOW_BRICK, DecorGfx_YELLOW_BRICK),
-    DECORATION(DECOR_BLUE_BRICK, _("BLUE BRICK"), 0, 5, 3, 500, DecorDesc_BLUE_BRICK, DecorGfx_BLUE_BRICK),
-    DECORATION(DECOR_RED_BALLOON, _("RED BALLOON"), 1, 0, 3, 500, DecorDesc_RED_BALLOON, DecorGfx_RED_BALLOON),
-    DECORATION(DECOR_BLUE_BALLOON, _("BLUE BALLOON"), 1, 0, 3, 500, DecorDesc_BLUE_BALLOON, DecorGfx_BLUE_BALLOON),
-    DECORATION(DECOR_YELLOW_BALLOON, _("YELLOW BALLOON"), 1, 0, 3, 500, DecorDesc_YELLOW_BALLOON, DecorGfx_YELLOW_BALLOON),
-    DECORATION(DECOR_RED_TENT, _("RED TENT"), 1, 8, 3, 10000, DecorDesc_RED_TENT, DecorGfx_RED_TENT),
-    DECORATION(DECOR_BLUE_TENT, _("BLUE TENT"), 1, 8, 3, 10000, DecorDesc_BLUE_TENT, DecorGfx_BLUE_TENT),
-    DECORATION(DECOR_SOLID_BOARD, _("SOLID BOARD"), 1, 5, 3, 3000, DecorDesc_SOLID_BOARD, DecorGfx_SOLID_BOARD),
-    DECORATION(DECOR_SLIDE, _("SLIDE"), 1, 7, 3, 8000, DecorDesc_SLIDE, DecorGfx_SLIDE),
-    DECORATION(DECOR_FENCE_LENGTH, _("FENCE LENGTH"), 0, 0, 3, 500, DecorDesc_FENCE_LENGTH, DecorGfx_FENCE_LENGTH),
-    DECORATION(DECOR_FENCE_WIDTH, _("FENCE WIDTH"), 0, 0, 3, 500, DecorDesc_FENCE_WIDTH, DecorGfx_FENCE_WIDTH),
-    DECORATION(DECOR_TIRE, _("TIRE"), 0, 4, 3, 800, DecorDesc_TIRE, DecorGfx_TIRE),
-    DECORATION(DECOR_STAND, _("STAND"), 1, 3, 3, 7000, DecorDesc_STAND, DecorGfx_STAND),
-    DECORATION(DECOR_MUD_BALL, _("MUD BALL"), 1, 0, 3, 200, DecorDesc_MUD_BALL, DecorGfx_MUD_BALL),
-    DECORATION(DECOR_BREAKABLE_DOOR, _("BREAKABLE DOOR"), 1, 5, 3, 3000, DecorDesc_BREAKABLE_DOOR, DecorGfx_BREAKABLE_DOOR),
-    DECORATION(DECOR_SAND_ORNAMENT, _("SAND ORNAMENT"), 2, 5, 3, 3000, DecorDesc_SAND_ORNAMENT, DecorGfx_SAND_ORNAMENT),
-    DECORATION(DECOR_SILVER_SHIELD, _("SILVER SHIELD"), 2, 5, 3, 0, DecorDesc_SILVER_SHIELD, DecorGfx_SILVER_SHIELD),
-    DECORATION(DECOR_GOLD_SHIELD, _("GOLD SHIELD"), 2, 5, 3, 0, DecorDesc_GOLD_SHIELD, DecorGfx_GOLD_SHIELD),
-    DECORATION(DECOR_GLASS_ORNAMENT, _("GLASS ORNAMENT"), 2, 5, 3, 0, DecorDesc_GLASS_ORNAMENT, DecorGfx_GLASS_ORNAMENT),
-    DECORATION(DECOR_TV, _("TV"), 0, 0, 3, 3000, DecorDesc_TV, DecorGfx_TV),
-    DECORATION(DECOR_ROUND_TV, _("ROUND TV"), 0, 0, 3, 4000, DecorDesc_ROUND_TV, DecorGfx_ROUND_TV),
-    DECORATION(DECOR_CUTE_TV, _("CUTE TV"), 0, 0, 3, 4000, DecorDesc_CUTE_TV, DecorGfx_CUTE_TV),
-    DECORATION(DECOR_GLITTER_MAT, _("GLITTER MAT"), 1, 0, 4, 2000, DecorDesc_GLITTER_MAT, DecorGfx_GLITTER_MAT),
-    DECORATION(DECOR_JUMP_MAT, _("JUMP MAT"), 1, 0, 4, 2000, DecorDesc_JUMP_MAT, DecorGfx_JUMP_MAT),
-    DECORATION(DECOR_SPIN_MAT, _("SPIN MAT"), 1, 0, 4, 2000, DecorDesc_SPIN_MAT, DecorGfx_SPIN_MAT),
-    DECORATION(DECOR_C_LOW_NOTE_MAT, _("C Low NOTE MAT"), 1, 0, 4, 500, DecorDesc_C_LOW_NOTE_MAT, DecorGfx_C_LOW_NOTE_MAT),
-    DECORATION(DECOR_D_NOTE_MAT, _("D NOTE MAT"), 1, 0, 4, 500, DecorDesc_D_NOTE_MAT, DecorGfx_D_NOTE_MAT),
-    DECORATION(DECOR_E_NOTE_MAT, _("E NOTE MAT"), 1, 0, 4, 500, DecorDesc_E_NOTE_MAT, DecorGfx_E_NOTE_MAT),
-    DECORATION(DECOR_F_NOTE_MAT, _("F NOTE MAT"), 1, 0, 4, 500, DecorDesc_F_NOTE_MAT, DecorGfx_F_NOTE_MAT),
-    DECORATION(DECOR_G_NOTE_MAT, _("G NOTE MAT"), 1, 0, 4, 500, DecorDesc_G_NOTE_MAT, DecorGfx_G_NOTE_MAT),
-    DECORATION(DECOR_A_NOTE_MAT, _("A NOTE MAT"), 1, 0, 4, 500, DecorDesc_A_NOTE_MAT, DecorGfx_A_NOTE_MAT),
-    DECORATION(DECOR_B_NOTE_MAT, _("B NOTE MAT"), 1, 0, 4, 500, DecorDesc_B_NOTE_MAT, DecorGfx_B_NOTE_MAT),
-    DECORATION(DECOR_C_HIGH_NOTE_MAT, _("C High NOTE MAT"), 1, 0, 4, 500, DecorDesc_C_HIGH_NOTE_MAT, DecorGfx_C_HIGH_NOTE_MAT),
-    DECORATION(DECOR_SURF_MAT, _("SURF MAT"), 1, 8, 4, 4000, DecorDesc_SURF_MAT, DecorGfx_SURF_MAT),
-    DECORATION(DECOR_THUNDER_MAT, _("THUNDER MAT"), 1, 8, 4, 4000, DecorDesc_THUNDER_MAT, DecorGfx_THUNDER_MAT),
-    DECORATION(DECOR_FIRE_BLAST_MAT, _("FIRE BLAST MAT"), 1, 8, 4, 4000, DecorDesc_FIRE_BLAST_MAT, DecorGfx_FIRE_BLAST_MAT),
-    DECORATION(DECOR_POWDER_SNOW_MAT, _("POWDER SNOW MAT"), 1, 8, 4, 4000, DecorDesc_POWDER_SNOW_MAT, DecorGfx_POWDER_SNOW_MAT),
-    DECORATION(DECOR_ATTRACT_MAT, _("ATTRACT MAT"), 1, 8, 4, 4000, DecorDesc_ATTRACT_MAT, DecorGfx_ATTRACT_MAT),
-    DECORATION(DECOR_FISSURE_MAT, _("FISSURE MAT"), 1, 8, 4, 4000, DecorDesc_FISSURE_MAT, DecorGfx_FISSURE_MAT),
-    DECORATION(DECOR_SPIKES_MAT, _("SPIKES MAT"), 1, 8, 4, 4000, DecorDesc_SPIKES_MAT, DecorGfx_SPIKES_MAT),
-    DECORATION(DECOR_BALL_POSTER, _("BALL POSTER"), 3, 0, 5, 1000, DecorDesc_BALL_POSTER, DecorGfx_BALL_POSTER),
-    DECORATION(DECOR_GREEN_POSTER, _("GREEN POSTER"), 3, 0, 5, 1000, DecorDesc_GREEN_POSTER, DecorGfx_GREEN_POSTER),
-    DECORATION(DECOR_RED_POSTER, _("RED POSTER"), 3, 0, 5, 1000, DecorDesc_RED_POSTER, DecorGfx_RED_POSTER),
-    DECORATION(DECOR_BLUE_POSTER, _("BLUE POSTER"), 3, 0, 5, 1000, DecorDesc_BLUE_POSTER, DecorGfx_BLUE_POSTER),
-    DECORATION(DECOR_CUTE_POSTER, _("CUTE POSTER"), 3, 0, 5, 1000, DecorDesc_CUTE_POSTER, DecorGfx_CUTE_POSTER),
-    DECORATION(DECOR_PIKA_POSTER, _("PIKA POSTER"), 3, 1, 5, 1500, DecorDesc_PIKA_POSTER, DecorGfx_PIKA_POSTER),
-    DECORATION(DECOR_LONG_POSTER, _("LONG POSTER"), 3, 1, 5, 1500, DecorDesc_LONG_POSTER, DecorGfx_LONG_POSTER),
-    DECORATION(DECOR_SEA_POSTER, _("SEA POSTER"), 3, 1, 5, 1500, DecorDesc_SEA_POSTER, DecorGfx_SEA_POSTER),
-    DECORATION(DECOR_SKY_POSTER, _("SKY POSTER"), 3, 1, 5, 1500, DecorDesc_SKY_POSTER, DecorGfx_SKY_POSTER),
-    DECORATION(DECOR_KISS_POSTER, _("KISS POSTER"), 3, 1, 5, 1500, DecorDesc_KISS_POSTER, DecorGfx_KISS_POSTER),
-    DECORATION(DECOR_PICHU_DOLL, _("PICHU DOLL"), 4, 0, 6, 3000, DecorDesc_PICHU_DOLL, DecorGfx_PICHU_DOLL),
-    DECORATION(DECOR_PIKACHU_DOLL, _("PIKACHU DOLL"), 4, 0, 6, 3000, DecorDesc_PIKACHU_DOLL, DecorGfx_PIKACHU_DOLL),
-    DECORATION(DECOR_MARILL_DOLL, _("MARILL DOLL"), 4, 0, 6, 3000, DecorDesc_MARILL_DOLL, DecorGfx_MARILL_DOLL),
-    DECORATION(DECOR_TOGEPI_DOLL, _("TOGEPI DOLL"), 4, 0, 6, 3000, DecorDesc_TOGEPI_DOLL, DecorGfx_TOGEPI_DOLL),
-    DECORATION(DECOR_CYNDAQUIL_DOLL, _("CYNDAQUIL DOLL"), 4, 0, 6, 3000, DecorDesc_CYNDAQUIL_DOLL, DecorGfx_CYNDAQUIL_DOLL),
-    DECORATION(DECOR_CHIKORITA_DOLL, _("CHIKORITA DOLL"), 4, 0, 6, 3000, DecorDesc_CHIKORITA_DOLL, DecorGfx_CHIKORITA_DOLL),
-    DECORATION(DECOR_TOTODILE_DOLL, _("TOTODILE DOLL"), 4, 0, 6, 3000, DecorDesc_TOTODILE_DOLL, DecorGfx_TOTODILE_DOLL),
-    DECORATION(DECOR_JIGGLYPUFF_DOLL, _("JIGGLYPUFF DOLL"), 4, 0, 6, 3000, DecorDesc_JIGGLYPUFF_DOLL, DecorGfx_JIGGLYPUFF_DOLL),
-    DECORATION(DECOR_MEOWTH_DOLL, _("MEOWTH DOLL"), 4, 0, 6, 3000, DecorDesc_MEOWTH_DOLL, DecorGfx_MEOWTH_DOLL),
-    DECORATION(DECOR_CLEFAIRY_DOLL, _("CLEFAIRY DOLL"), 4, 0, 6, 3000, DecorDesc_CLEFAIRY_DOLL, DecorGfx_CLEFAIRY_DOLL),
-    DECORATION(DECOR_DITTO_DOLL, _("DITTO DOLL"), 4, 0, 6, 3000, DecorDesc_DITTO_DOLL, DecorGfx_DITTO_DOLL),
-    DECORATION(DECOR_SMOOCHUM_DOLL, _("SMOOCHUM DOLL"), 4, 0, 6, 3000, DecorDesc_SMOOCHUM_DOLL, DecorGfx_SMOOCHUM_DOLL),
-    DECORATION(DECOR_TREECKO_DOLL, _("TREECKO DOLL"), 4, 0, 6, 3000, DecorDesc_TREECKO_DOLL, DecorGfx_TREECKO_DOLL),
-    DECORATION(DECOR_TORCHIC_DOLL, _("TORCHIC DOLL"), 4, 0, 6, 3000, DecorDesc_TORCHIC_DOLL, DecorGfx_TORCHIC_DOLL),
-    DECORATION(DECOR_MUDKIP_DOLL, _("MUDKIP DOLL"), 4, 0, 6, 3000, DecorDesc_MUDKIP_DOLL, DecorGfx_MUDKIP_DOLL),
-    DECORATION(DECOR_DUSKULL_DOLL, _("DUSKULL DOLL"), 4, 0, 6, 3000, DecorDesc_DUSKULL_DOLL, DecorGfx_DUSKULL_DOLL),
-    DECORATION(DECOR_WYNAUT_DOLL, _("WYNAUT DOLL"), 4, 0, 6, 3000, DecorDesc_WYNAUT_DOLL, DecorGfx_WYNAUT_DOLL),
-    DECORATION(DECOR_BALTOY_DOLL, _("BALTOY DOLL"), 4, 0, 6, 3000, DecorDesc_BALTOY_DOLL, DecorGfx_BALTOY_DOLL),
-    DECORATION(DECOR_KECLEON_DOLL, _("KECLEON DOLL"), 4, 0, 6, 3000, DecorDesc_KECLEON_DOLL, DecorGfx_KECLEON_DOLL),
-    DECORATION(DECOR_AZURILL_DOLL, _("AZURILL DOLL"), 4, 0, 6, 3000, DecorDesc_AZURILL_DOLL, DecorGfx_AZURILL_DOLL),
-    DECORATION(DECOR_SKITTY_DOLL, _("SKITTY DOLL"), 4, 0, 6, 3000, DecorDesc_SKITTY_DOLL, DecorGfx_SKITTY_DOLL),
-    DECORATION(DECOR_SWABLU_DOLL, _("SWABLU DOLL"), 4, 0, 6, 3000, DecorDesc_SWABLU_DOLL, DecorGfx_SWABLU_DOLL),
-    DECORATION(DECOR_GULPIN_DOLL, _("GULPIN DOLL"), 4, 0, 6, 3000, DecorDesc_GULPIN_DOLL, DecorGfx_GULPIN_DOLL),
-    DECORATION(DECOR_LOTAD_DOLL, _("LOTAD DOLL"), 4, 0, 6, 3000, DecorDesc_LOTAD_DOLL, DecorGfx_LOTAD_DOLL),
-    DECORATION(DECOR_SEEDOT_DOLL, _("SEEDOT DOLL"), 4, 0, 6, 3000, DecorDesc_SEEDOT_DOLL, DecorGfx_SEEDOT_DOLL),
-    DECORATION(DECOR_PIKA_CUSHION, _("PIKA CUSHION"), 4, 0, 7, 2000, DecorDesc_PIKA_CUSHION, DecorGfx_PIKA_CUSHION),
-    DECORATION(DECOR_ROUND_CUSHION, _("ROUND CUSHION"), 4, 0, 7, 2000, DecorDesc_ROUND_CUSHION, DecorGfx_ROUND_CUSHION),
-    DECORATION(DECOR_KISS_CUSHION, _("KISS CUSHION"), 4, 0, 7, 2000, DecorDesc_KISS_CUSHION, DecorGfx_KISS_CUSHION),
-    DECORATION(DECOR_ZIGZAG_CUSHION, _("ZIGZAG CUSHION"), 4, 0, 7, 2000, DecorDesc_ZIGZAG_CUSHION, DecorGfx_ZIGZAG_CUSHION),
-    DECORATION(DECOR_SPIN_CUSHION, _("SPIN CUSHION"), 4, 0, 7, 2000, DecorDesc_SPIN_CUSHION, DecorGfx_SPIN_CUSHION),
-    DECORATION(DECOR_DIAMOND_CUSHION, _("DIAMOND CUSHION"), 4, 0, 7, 2000, DecorDesc_DIAMOND_CUSHION, DecorGfx_DIAMOND_CUSHION),
-    DECORATION(DECOR_BALL_CUSHION, _("BALL CUSHION"), 4, 0, 7, 2000, DecorDesc_BALL_CUSHION, DecorGfx_BALL_CUSHION),
-    DECORATION(DECOR_GRASS_CUSHION, _("GRASS CUSHION"), 4, 0, 7, 2000, DecorDesc_GRASS_CUSHION, DecorGfx_GRASS_CUSHION),
-    DECORATION(DECOR_FIRE_CUSHION, _("FIRE CUSHION"), 4, 0, 7, 2000, DecorDesc_FIRE_CUSHION, DecorGfx_FIRE_CUSHION),
-    DECORATION(DECOR_WATER_CUSHION, _("WATER CUSHION"), 4, 0, 7, 2000, DecorDesc_WATER_CUSHION, DecorGfx_WATER_CUSHION),
-    DECORATION(DECOR_SNORLAX_DOLL, _("SNORLAX DOLL"), 4, 5, 6, 10000, DecorDesc_SNORLAX_DOLL, DecorGfx_SNORLAX_DOLL),
-    DECORATION(DECOR_RHYDON_DOLL, _("RHYDON DOLL"), 4, 5, 6, 10000, DecorDesc_RHYDON_DOLL, DecorGfx_RHYDON_DOLL),
-    DECORATION(DECOR_LAPRAS_DOLL, _("LAPRAS DOLL"), 4, 5, 6, 10000, DecorDesc_LAPRAS_DOLL, DecorGfx_LAPRAS_DOLL),
-    DECORATION(DECOR_VENUSAUR_DOLL, _("VENUSAUR DOLL"), 4, 5, 6, 10000, DecorDesc_VENUSAUR_DOLL, DecorGfx_VENUSAUR_DOLL),
-    DECORATION(DECOR_CHARIZARD_DOLL, _("CHARIZARD DOLL"), 4, 5, 6, 10000, DecorDesc_CHARIZARD_DOLL, DecorGfx_CHARIZARD_DOLL),
-    DECORATION(DECOR_BLASTOISE_DOLL, _("BLASTOISE DOLL"), 4, 5, 6, 10000, DecorDesc_BLASTOISE_DOLL, DecorGfx_BLASTOISE_DOLL),
-    DECORATION(DECOR_WAILMER_DOLL, _("WAILMER DOLL"), 4, 5, 6, 10000, DecorDesc_WAILMER_DOLL, DecorGfx_WAILMER_DOLL),
-    DECORATION(DECOR_REGIROCK_DOLL, _("REGIROCK DOLL"), 4, 5, 6, 10000, DecorDesc_REGIROCK_DOLL, DecorGfx_REGIROCK_DOLL),
-    DECORATION(DECOR_REGICE_DOLL, _("REGICE DOLL"), 4, 5, 6, 10000, DecorDesc_REGICE_DOLL, DecorGfx_REGICE_DOLL),
-    DECORATION(DECOR_REGISTEEL_DOLL, _("REGISTEEL DOLL"), 4, 5, 6, 10000, DecorDesc_REGISTEEL_DOLL, DecorGfx_REGISTEEL_DOLL)
+    DECORATION(DECOR_NONE,            _("SMALL DESK"),      DECORPERM_SOLID_FLOOR,  DECORSHAPE_1x1, DECORCAT_DESK,         0, DecorDesc_SMALL_DESK, DecorGfx_SMALL_DESK),
+    DECORATION(DECOR_SMALL_DESK,      _("SMALL DESK"),      DECORPERM_SOLID_FLOOR,  DECORSHAPE_1x1, DECORCAT_DESK,      3000, DecorDesc_SMALL_DESK, DecorGfx_SMALL_DESK),
+    DECORATION(DECOR_POKEMON_DESK,    _("POKéMON DESK"),    DECORPERM_SOLID_FLOOR,  DECORSHAPE_1x1, DECORCAT_DESK,      3000, DecorDesc_POKEMON_DESK, DecorGfx_POKEMON_DESK),
+    DECORATION(DECOR_HEAVY_DESK,      _("HEAVY DESK"),      DECORPERM_SOLID_FLOOR,  DECORSHAPE_3x2, DECORCAT_DESK,      6000, DecorDesc_HEAVY_DESK, DecorGfx_HEAVY_DESK),
+    DECORATION(DECOR_RAGGED_DESK,     _("RAGGED DESK"),     DECORPERM_SOLID_FLOOR,  DECORSHAPE_3x2, DECORCAT_DESK,      6000, DecorDesc_RAGGED_DESK, DecorGfx_RAGGED_DESK),
+    DECORATION(DECOR_COMFORT_DESK,    _("COMFORT DESK"),    DECORPERM_SOLID_FLOOR,  DECORSHAPE_3x2, DECORCAT_DESK,      6000, DecorDesc_COMFORT_DESK, DecorGfx_COMFORT_DESK),
+    DECORATION(DECOR_PRETTY_DESK,     _("PRETTY DESK"),     DECORPERM_SOLID_FLOOR,  DECORSHAPE_3x3, DECORCAT_DESK,      9000, DecorDesc_PRETTY_DESK, DecorGfx_PRETTY_DESK),
+    DECORATION(DECOR_BRICK_DESK,      _("BRICK DESK"),      DECORPERM_SOLID_FLOOR,  DECORSHAPE_3x3, DECORCAT_DESK,      9000, DecorDesc_BRICK_DESK, DecorGfx_BRICK_DESK),
+    DECORATION(DECOR_CAMP_DESK,       _("CAMP DESK"),       DECORPERM_SOLID_FLOOR,  DECORSHAPE_3x3, DECORCAT_DESK,      9000, DecorDesc_CAMP_DESK, DecorGfx_CAMP_DESK),
+    DECORATION(DECOR_HARD_DESK,       _("HARD DESK"),       DECORPERM_SOLID_FLOOR,  DECORSHAPE_3x3, DECORCAT_DESK,      9000, DecorDesc_HARD_DESK, DecorGfx_HARD_DESK),
+    DECORATION(DECOR_SMALL_CHAIR,     _("SMALL CHAIR"),     DECORPERM_PASS_FLOOR,   DECORSHAPE_1x1, DECORCAT_CHAIR,     2000, DecorDesc_SMALL_CHAIR, DecorGfx_SMALL_CHAIR),
+    DECORATION(DECOR_POKEMON_CHAIR,   _("POKéMON CHAIR"),   DECORPERM_PASS_FLOOR,   DECORSHAPE_1x1, DECORCAT_CHAIR,     2000, DecorDesc_POKEMON_CHAIR, DecorGfx_POKEMON_CHAIR),
+    DECORATION(DECOR_HEAVY_CHAIR,     _("HEAVY CHAIR"),     DECORPERM_PASS_FLOOR,   DECORSHAPE_1x1, DECORCAT_CHAIR,     2000, DecorDesc_HEAVY_CHAIR, DecorGfx_HEAVY_CHAIR),
+    DECORATION(DECOR_PRETTY_CHAIR,    _("PRETTY CHAIR"),    DECORPERM_PASS_FLOOR,   DECORSHAPE_1x1, DECORCAT_CHAIR,     2000, DecorDesc_PRETTY_CHAIR, DecorGfx_PRETTY_CHAIR),
+    DECORATION(DECOR_COMFORT_CHAIR,   _("COMFORT CHAIR"),   DECORPERM_PASS_FLOOR,   DECORSHAPE_1x1, DECORCAT_CHAIR,     2000, DecorDesc_COMFORT_CHAIR, DecorGfx_COMFORT_CHAIR),
+    DECORATION(DECOR_RAGGED_CHAIR,    _("RAGGED CHAIR"),    DECORPERM_PASS_FLOOR,   DECORSHAPE_1x1, DECORCAT_CHAIR,     2000, DecorDesc_RAGGED_CHAIR, DecorGfx_RAGGED_CHAIR),
+    DECORATION(DECOR_BRICK_CHAIR,     _("BRICK CHAIR"),     DECORPERM_PASS_FLOOR,   DECORSHAPE_1x1, DECORCAT_CHAIR,     2000, DecorDesc_BRICK_CHAIR, DecorGfx_BRICK_CHAIR),
+    DECORATION(DECOR_CAMP_CHAIR,      _("CAMP CHAIR"),      DECORPERM_PASS_FLOOR,   DECORSHAPE_1x1, DECORCAT_CHAIR,     2000, DecorDesc_CAMP_CHAIR, DecorGfx_CAMP_CHAIR),
+    DECORATION(DECOR_HARD_CHAIR,      _("HARD CHAIR"),      DECORPERM_PASS_FLOOR,   DECORSHAPE_1x1, DECORCAT_CHAIR,     2000, DecorDesc_HARD_CHAIR, DecorGfx_HARD_CHAIR),
+    DECORATION(DECOR_RED_PLANT,       _("RED PLANT"),       DECORPERM_BEHIND_FLOOR, DECORSHAPE_1x2, DECORCAT_PLANT,     3000, DecorDesc_RED_PLANT, DecorGfx_RED_PLANT),
+    DECORATION(DECOR_TROPICAL_PLANT,  _("TROPICAL PLANT"),  DECORPERM_BEHIND_FLOOR, DECORSHAPE_1x2, DECORCAT_PLANT,     3000, DecorDesc_TROPICAL_PLANT, DecorGfx_TROPICAL_PLANT),
+    DECORATION(DECOR_PRETTY_FLOWERS,  _("PRETTY FLOWERS"),  DECORPERM_BEHIND_FLOOR, DECORSHAPE_1x2, DECORCAT_PLANT,     3000, DecorDesc_PRETTY_FLOWERS, DecorGfx_PRETTY_FLOWERS),
+    DECORATION(DECOR_COLORFUL_PLANT,  _("COLORFUL PLANT"),  DECORPERM_BEHIND_FLOOR, DECORSHAPE_2x2, DECORCAT_PLANT,     5000, DecorDesc_COLORFUL_PLANT, DecorGfx_COLORFUL_PLANT),
+    DECORATION(DECOR_BIG_PLANT,       _("BIG PLANT"),       DECORPERM_BEHIND_FLOOR, DECORSHAPE_2x2, DECORCAT_PLANT,     5000, DecorDesc_BIG_PLANT, DecorGfx_BIG_PLANT),
+    DECORATION(DECOR_GORGEOUS_PLANT,  _("GORGEOUS PLANT"),  DECORPERM_BEHIND_FLOOR, DECORSHAPE_2x2, DECORCAT_PLANT,     5000, DecorDesc_GORGEOUS_PLANT, DecorGfx_GORGEOUS_PLANT),
+    DECORATION(DECOR_RED_BRICK,       _("RED BRICK"),       DECORPERM_SOLID_FLOOR,  DECORSHAPE_1x2, DECORCAT_ORNAMENT,   500, DecorDesc_RED_BRICK, DecorGfx_RED_BRICK),
+    DECORATION(DECOR_YELLOW_BRICK,    _("YELLOW BRICK"),    DECORPERM_SOLID_FLOOR,  DECORSHAPE_1x2, DECORCAT_ORNAMENT,   500, DecorDesc_YELLOW_BRICK, DecorGfx_YELLOW_BRICK),
+    DECORATION(DECOR_BLUE_BRICK,      _("BLUE BRICK"),      DECORPERM_SOLID_FLOOR,  DECORSHAPE_1x2, DECORCAT_ORNAMENT,   500, DecorDesc_BLUE_BRICK, DecorGfx_BLUE_BRICK),
+    DECORATION(DECOR_RED_BALLOON,     _("RED BALLOON"),     DECORPERM_PASS_FLOOR,   DECORSHAPE_1x1, DECORCAT_ORNAMENT,   500, DecorDesc_RED_BALLOON, DecorGfx_RED_BALLOON),
+    DECORATION(DECOR_BLUE_BALLOON,    _("BLUE BALLOON"),    DECORPERM_PASS_FLOOR,   DECORSHAPE_1x1, DECORCAT_ORNAMENT,   500, DecorDesc_BLUE_BALLOON, DecorGfx_BLUE_BALLOON),
+    DECORATION(DECOR_YELLOW_BALLOON,  _("YELLOW BALLOON"),  DECORPERM_PASS_FLOOR,   DECORSHAPE_1x1, DECORCAT_ORNAMENT,   500, DecorDesc_YELLOW_BALLOON, DecorGfx_YELLOW_BALLOON),
+    DECORATION(DECOR_RED_TENT,        _("RED TENT"),        DECORPERM_PASS_FLOOR,   DECORSHAPE_3x3, DECORCAT_ORNAMENT, 10000, DecorDesc_RED_TENT, DecorGfx_RED_TENT),
+    DECORATION(DECOR_BLUE_TENT,       _("BLUE TENT"),       DECORPERM_PASS_FLOOR,   DECORSHAPE_3x3, DECORCAT_ORNAMENT, 10000, DecorDesc_BLUE_TENT, DecorGfx_BLUE_TENT),
+    DECORATION(DECOR_SOLID_BOARD,     _("SOLID BOARD"),     DECORPERM_PASS_FLOOR,   DECORSHAPE_1x2, DECORCAT_ORNAMENT,  3000, DecorDesc_SOLID_BOARD, DecorGfx_SOLID_BOARD),
+    DECORATION(DECOR_SLIDE,           _("SLIDE"),           DECORPERM_PASS_FLOOR,   DECORSHAPE_2x4, DECORCAT_ORNAMENT,  8000, DecorDesc_SLIDE, DecorGfx_SLIDE),
+    DECORATION(DECOR_FENCE_LENGTH,    _("FENCE LENGTH"),    DECORPERM_SOLID_FLOOR,  DECORSHAPE_1x1, DECORCAT_ORNAMENT,   500, DecorDesc_FENCE_LENGTH, DecorGfx_FENCE_LENGTH),
+    DECORATION(DECOR_FENCE_WIDTH,     _("FENCE WIDTH"),     DECORPERM_SOLID_FLOOR,  DECORSHAPE_1x1, DECORCAT_ORNAMENT,   500, DecorDesc_FENCE_WIDTH, DecorGfx_FENCE_WIDTH),
+    DECORATION(DECOR_TIRE,            _("TIRE"),            DECORPERM_SOLID_FLOOR,  DECORSHAPE_2x2, DECORCAT_ORNAMENT,   800, DecorDesc_TIRE, DecorGfx_TIRE),
+    DECORATION(DECOR_STAND,           _("STAND"),           DECORPERM_PASS_FLOOR,   DECORSHAPE_4x2, DECORCAT_ORNAMENT,  7000, DecorDesc_STAND, DecorGfx_STAND),
+    DECORATION(DECOR_MUD_BALL,        _("MUD BALL"),        DECORPERM_PASS_FLOOR,   DECORSHAPE_1x1, DECORCAT_ORNAMENT,   200, DecorDesc_MUD_BALL, DecorGfx_MUD_BALL),
+    DECORATION(DECOR_BREAKABLE_DOOR,  _("BREAKABLE DOOR"),  DECORPERM_PASS_FLOOR,   DECORSHAPE_1x2, DECORCAT_ORNAMENT,  3000, DecorDesc_BREAKABLE_DOOR, DecorGfx_BREAKABLE_DOOR),
+    DECORATION(DECOR_SAND_ORNAMENT,   _("SAND ORNAMENT"),   DECORPERM_BEHIND_FLOOR, DECORSHAPE_1x2, DECORCAT_ORNAMENT,  3000, DecorDesc_SAND_ORNAMENT, DecorGfx_SAND_ORNAMENT),
+    DECORATION(DECOR_SILVER_SHIELD,   _("SILVER SHIELD"),   DECORPERM_BEHIND_FLOOR, DECORSHAPE_1x2, DECORCAT_ORNAMENT,     0, DecorDesc_SILVER_SHIELD, DecorGfx_SILVER_SHIELD),
+    DECORATION(DECOR_GOLD_SHIELD,     _("GOLD SHIELD"),     DECORPERM_BEHIND_FLOOR, DECORSHAPE_1x2, DECORCAT_ORNAMENT,     0, DecorDesc_GOLD_SHIELD, DecorGfx_GOLD_SHIELD),
+    DECORATION(DECOR_GLASS_ORNAMENT,  _("GLASS ORNAMENT"),  DECORPERM_BEHIND_FLOOR, DECORSHAPE_1x2, DECORCAT_ORNAMENT,     0, DecorDesc_GLASS_ORNAMENT, DecorGfx_GLASS_ORNAMENT),
+    DECORATION(DECOR_TV,              _("TV"),              DECORPERM_SOLID_FLOOR,  DECORSHAPE_1x1, DECORCAT_ORNAMENT,  3000, DecorDesc_TV, DecorGfx_TV),
+    DECORATION(DECOR_ROUND_TV,        _("ROUND TV"),        DECORPERM_SOLID_FLOOR,  DECORSHAPE_1x1, DECORCAT_ORNAMENT,  4000, DecorDesc_ROUND_TV, DecorGfx_ROUND_TV),
+    DECORATION(DECOR_CUTE_TV,         _("CUTE TV"),         DECORPERM_SOLID_FLOOR,  DECORSHAPE_1x1, DECORCAT_ORNAMENT,  4000, DecorDesc_CUTE_TV, DecorGfx_CUTE_TV),
+    DECORATION(DECOR_GLITTER_MAT,     _("GLITTER MAT"),     DECORPERM_PASS_FLOOR,   DECORSHAPE_1x1, DECORCAT_MAT,       2000, DecorDesc_GLITTER_MAT, DecorGfx_GLITTER_MAT),
+    DECORATION(DECOR_JUMP_MAT,        _("JUMP MAT"),        DECORPERM_PASS_FLOOR,   DECORSHAPE_1x1, DECORCAT_MAT,       2000, DecorDesc_JUMP_MAT, DecorGfx_JUMP_MAT),
+    DECORATION(DECOR_SPIN_MAT,        _("SPIN MAT"),        DECORPERM_PASS_FLOOR,   DECORSHAPE_1x1, DECORCAT_MAT,       2000, DecorDesc_SPIN_MAT, DecorGfx_SPIN_MAT),
+    DECORATION(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),
+    DECORATION(DECOR_D_NOTE_MAT,      _("D NOTE MAT"),      DECORPERM_PASS_FLOOR,   DECORSHAPE_1x1, DECORCAT_MAT,        500, DecorDesc_D_NOTE_MAT, DecorGfx_D_NOTE_MAT),
+    DECORATION(DECOR_E_NOTE_MAT,      _("E NOTE MAT"),      DECORPERM_PASS_FLOOR,   DECORSHAPE_1x1, DECORCAT_MAT,        500, DecorDesc_E_NOTE_MAT, DecorGfx_E_NOTE_MAT),
+    DECORATION(DECOR_F_NOTE_MAT,      _("F NOTE MAT"),      DECORPERM_PASS_FLOOR,   DECORSHAPE_1x1, DECORCAT_MAT,        500, DecorDesc_F_NOTE_MAT, DecorGfx_F_NOTE_MAT),
+    DECORATION(DECOR_G_NOTE_MAT,      _("G NOTE MAT"),      DECORPERM_PASS_FLOOR,   DECORSHAPE_1x1, DECORCAT_MAT,        500, DecorDesc_G_NOTE_MAT, DecorGfx_G_NOTE_MAT),
+    DECORATION(DECOR_A_NOTE_MAT,      _("A NOTE MAT"),      DECORPERM_PASS_FLOOR,   DECORSHAPE_1x1, DECORCAT_MAT,        500, DecorDesc_A_NOTE_MAT, DecorGfx_A_NOTE_MAT),
+    DECORATION(DECOR_B_NOTE_MAT,      _("B NOTE MAT"),      DECORPERM_PASS_FLOOR,   DECORSHAPE_1x1, DECORCAT_MAT,        500, DecorDesc_B_NOTE_MAT, DecorGfx_B_NOTE_MAT),
+    DECORATION(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),
+    DECORATION(DECOR_SURF_MAT,        _("SURF MAT"),        DECORPERM_PASS_FLOOR,   DECORSHAPE_3x3, DECORCAT_MAT,       4000, DecorDesc_SURF_MAT, DecorGfx_SURF_MAT),
+    DECORATION(DECOR_THUNDER_MAT,     _("THUNDER MAT"),     DECORPERM_PASS_FLOOR,   DECORSHAPE_3x3, DECORCAT_MAT,       4000, DecorDesc_THUNDER_MAT, DecorGfx_THUNDER_MAT),
+    DECORATION(DECOR_FIRE_BLAST_MAT,  _("FIRE BLAST MAT"),  DECORPERM_PASS_FLOOR,   DECORSHAPE_3x3, DECORCAT_MAT,       4000, DecorDesc_FIRE_BLAST_MAT, DecorGfx_FIRE_BLAST_MAT),
+    DECORATION(DECOR_POWDER_SNOW_MAT, _("POWDER SNOW MAT"), DECORPERM_PASS_FLOOR,   DECORSHAPE_3x3, DECORCAT_MAT,       4000, DecorDesc_POWDER_SNOW_MAT, DecorGfx_POWDER_SNOW_MAT),
+    DECORATION(DECOR_ATTRACT_MAT,     _("ATTRACT MAT"),     DECORPERM_PASS_FLOOR,   DECORSHAPE_3x3, DECORCAT_MAT,       4000, DecorDesc_ATTRACT_MAT, DecorGfx_ATTRACT_MAT),
+    DECORATION(DECOR_FISSURE_MAT,     _("FISSURE MAT"),     DECORPERM_PASS_FLOOR,   DECORSHAPE_3x3, DECORCAT_MAT,       4000, DecorDesc_FISSURE_MAT, DecorGfx_FISSURE_MAT),
+    DECORATION(DECOR_SPIKES_MAT,      _("SPIKES MAT"),      DECORPERM_PASS_FLOOR,   DECORSHAPE_3x3, DECORCAT_MAT,       4000, DecorDesc_SPIKES_MAT, DecorGfx_SPIKES_MAT),
+    DECORATION(DECOR_BALL_POSTER,     _("BALL POSTER"),      DECORPERM_NA_WALL,     DECORSHAPE_1x1, DECORCAT_POSTER,    1000, DecorDesc_BALL_POSTER, DecorGfx_BALL_POSTER),
+    DECORATION(DECOR_GREEN_POSTER,    _("GREEN POSTER"),     DECORPERM_NA_WALL,     DECORSHAPE_1x1, DECORCAT_POSTER,    1000, DecorDesc_GREEN_POSTER, DecorGfx_GREEN_POSTER),
+    DECORATION(DECOR_RED_POSTER,      _("RED POSTER"),       DECORPERM_NA_WALL,     DECORSHAPE_1x1, DECORCAT_POSTER,    1000, DecorDesc_RED_POSTER, DecorGfx_RED_POSTER),
+    DECORATION(DECOR_BLUE_POSTER,     _("BLUE POSTER"),      DECORPERM_NA_WALL,     DECORSHAPE_1x1, DECORCAT_POSTER,    1000, DecorDesc_BLUE_POSTER, DecorGfx_BLUE_POSTER),
+    DECORATION(DECOR_CUTE_POSTER,     _("CUTE POSTER"),      DECORPERM_NA_WALL,     DECORSHAPE_1x1, DECORCAT_POSTER,    1000, DecorDesc_CUTE_POSTER, DecorGfx_CUTE_POSTER),
+    DECORATION(DECOR_PIKA_POSTER,     _("PIKA POSTER"),      DECORPERM_NA_WALL,     DECORSHAPE_2x1, DECORCAT_POSTER,    1500, DecorDesc_PIKA_POSTER, DecorGfx_PIKA_POSTER),
+    DECORATION(DECOR_LONG_POSTER,     _("LONG POSTER"),      DECORPERM_NA_WALL,     DECORSHAPE_2x1, DECORCAT_POSTER,    1500, DecorDesc_LONG_POSTER, DecorGfx_LONG_POSTER),
+    DECORATION(DECOR_SEA_POSTER,      _("SEA POSTER"),       DECORPERM_NA_WALL,     DECORSHAPE_2x1, DECORCAT_POSTER,    1500, DecorDesc_SEA_POSTER, DecorGfx_SEA_POSTER),
+    DECORATION(DECOR_SKY_POSTER,      _("SKY POSTER"),       DECORPERM_NA_WALL,     DECORSHAPE_2x1, DECORCAT_POSTER,    1500, DecorDesc_SKY_POSTER, DecorGfx_SKY_POSTER),
+    DECORATION(DECOR_KISS_POSTER,     _("KISS POSTER"),      DECORPERM_NA_WALL,     DECORSHAPE_2x1, DECORCAT_POSTER,    1500, DecorDesc_KISS_POSTER, DecorGfx_KISS_POSTER),
+    DECORATION(DECOR_PICHU_DOLL,      _("PICHU DOLL"),       DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_DOLL,      3000, DecorDesc_PICHU_DOLL, DecorGfx_PICHU_DOLL),
+    DECORATION(DECOR_PIKACHU_DOLL,    _("PIKACHU DOLL"),     DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_DOLL,      3000, DecorDesc_PIKACHU_DOLL, DecorGfx_PIKACHU_DOLL),
+    DECORATION(DECOR_MARILL_DOLL,     _("MARILL DOLL"),      DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_DOLL,      3000, DecorDesc_MARILL_DOLL, DecorGfx_MARILL_DOLL),
+    DECORATION(DECOR_TOGEPI_DOLL,     _("TOGEPI DOLL"),      DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_DOLL,      3000, DecorDesc_TOGEPI_DOLL, DecorGfx_TOGEPI_DOLL),
+    DECORATION(DECOR_CYNDAQUIL_DOLL,  _("CYNDAQUIL DOLL"),   DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_DOLL,      3000, DecorDesc_CYNDAQUIL_DOLL, DecorGfx_CYNDAQUIL_DOLL),
+    DECORATION(DECOR_CHIKORITA_DOLL,  _("CHIKORITA DOLL"),   DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_DOLL,      3000, DecorDesc_CHIKORITA_DOLL, DecorGfx_CHIKORITA_DOLL),
+    DECORATION(DECOR_TOTODILE_DOLL,   _("TOTODILE DOLL"),    DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_DOLL,      3000, DecorDesc_TOTODILE_DOLL, DecorGfx_TOTODILE_DOLL),
+    DECORATION(DECOR_JIGGLYPUFF_DOLL, _("JIGGLYPUFF DOLL"),  DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_DOLL,      3000, DecorDesc_JIGGLYPUFF_DOLL, DecorGfx_JIGGLYPUFF_DOLL),
+    DECORATION(DECOR_MEOWTH_DOLL,     _("MEOWTH DOLL"),      DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_DOLL,      3000, DecorDesc_MEOWTH_DOLL, DecorGfx_MEOWTH_DOLL),
+    DECORATION(DECOR_CLEFAIRY_DOLL,   _("CLEFAIRY DOLL"),    DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_DOLL,      3000, DecorDesc_CLEFAIRY_DOLL, DecorGfx_CLEFAIRY_DOLL),
+    DECORATION(DECOR_DITTO_DOLL,      _("DITTO DOLL"),       DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_DOLL,      3000, DecorDesc_DITTO_DOLL, DecorGfx_DITTO_DOLL),
+    DECORATION(DECOR_SMOOCHUM_DOLL,   _("SMOOCHUM DOLL"),    DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_DOLL,      3000, DecorDesc_SMOOCHUM_DOLL, DecorGfx_SMOOCHUM_DOLL),
+    DECORATION(DECOR_TREECKO_DOLL,    _("TREECKO DOLL"),     DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_DOLL,      3000, DecorDesc_TREECKO_DOLL, DecorGfx_TREECKO_DOLL),
+    DECORATION(DECOR_TORCHIC_DOLL,    _("TORCHIC DOLL"),     DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_DOLL,      3000, DecorDesc_TORCHIC_DOLL, DecorGfx_TORCHIC_DOLL),
+    DECORATION(DECOR_MUDKIP_DOLL,     _("MUDKIP DOLL"),      DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_DOLL,      3000, DecorDesc_MUDKIP_DOLL, DecorGfx_MUDKIP_DOLL),
+    DECORATION(DECOR_DUSKULL_DOLL,    _("DUSKULL DOLL"),     DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_DOLL,      3000, DecorDesc_DUSKULL_DOLL, DecorGfx_DUSKULL_DOLL),
+    DECORATION(DECOR_WYNAUT_DOLL,     _("WYNAUT DOLL"),      DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_DOLL,      3000, DecorDesc_WYNAUT_DOLL, DecorGfx_WYNAUT_DOLL),
+    DECORATION(DECOR_BALTOY_DOLL,     _("BALTOY DOLL"),      DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_DOLL,      3000, DecorDesc_BALTOY_DOLL, DecorGfx_BALTOY_DOLL),
+    DECORATION(DECOR_KECLEON_DOLL,    _("KECLEON DOLL"),     DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_DOLL,      3000, DecorDesc_KECLEON_DOLL, DecorGfx_KECLEON_DOLL),
+    DECORATION(DECOR_AZURILL_DOLL,    _("AZURILL DOLL"),     DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_DOLL,      3000, DecorDesc_AZURILL_DOLL, DecorGfx_AZURILL_DOLL),
+    DECORATION(DECOR_SKITTY_DOLL,     _("SKITTY DOLL"),      DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_DOLL,      3000, DecorDesc_SKITTY_DOLL, DecorGfx_SKITTY_DOLL),
+    DECORATION(DECOR_SWABLU_DOLL,     _("SWABLU DOLL"),      DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_DOLL,      3000, DecorDesc_SWABLU_DOLL, DecorGfx_SWABLU_DOLL),
+    DECORATION(DECOR_GULPIN_DOLL,     _("GULPIN DOLL"),      DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_DOLL,      3000, DecorDesc_GULPIN_DOLL, DecorGfx_GULPIN_DOLL),
+    DECORATION(DECOR_LOTAD_DOLL,      _("LOTAD DOLL"),       DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_DOLL,      3000, DecorDesc_LOTAD_DOLL, DecorGfx_LOTAD_DOLL),
+    DECORATION(DECOR_SEEDOT_DOLL,     _("SEEDOT DOLL"),      DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_DOLL,      3000, DecorDesc_SEEDOT_DOLL, DecorGfx_SEEDOT_DOLL),
+    DECORATION(DECOR_PIKA_CUSHION,    _("PIKA CUSHION"),     DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_CUSHION,   2000, DecorDesc_PIKA_CUSHION, DecorGfx_PIKA_CUSHION),
+    DECORATION(DECOR_ROUND_CUSHION,   _("ROUND CUSHION"),    DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_CUSHION,   2000, DecorDesc_ROUND_CUSHION, DecorGfx_ROUND_CUSHION),
+    DECORATION(DECOR_KISS_CUSHION,    _("KISS CUSHION"),     DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_CUSHION,   2000, DecorDesc_KISS_CUSHION, DecorGfx_KISS_CUSHION),
+    DECORATION(DECOR_ZIGZAG_CUSHION,  _("ZIGZAG CUSHION"),   DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_CUSHION,   2000, DecorDesc_ZIGZAG_CUSHION, DecorGfx_ZIGZAG_CUSHION),
+    DECORATION(DECOR_SPIN_CUSHION,    _("SPIN CUSHION"),     DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_CUSHION,   2000, DecorDesc_SPIN_CUSHION, DecorGfx_SPIN_CUSHION),
+    DECORATION(DECOR_DIAMOND_CUSHION, _("DIAMOND CUSHION"),  DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_CUSHION,   2000, DecorDesc_DIAMOND_CUSHION, DecorGfx_DIAMOND_CUSHION),
+    DECORATION(DECOR_BALL_CUSHION,    _("BALL CUSHION"),     DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_CUSHION,   2000, DecorDesc_BALL_CUSHION, DecorGfx_BALL_CUSHION),
+    DECORATION(DECOR_GRASS_CUSHION,   _("GRASS CUSHION"),    DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_CUSHION,   2000, DecorDesc_GRASS_CUSHION, DecorGfx_GRASS_CUSHION),
+    DECORATION(DECOR_FIRE_CUSHION,    _("FIRE CUSHION"),     DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_CUSHION,   2000, DecorDesc_FIRE_CUSHION, DecorGfx_FIRE_CUSHION),
+    DECORATION(DECOR_WATER_CUSHION,   _("WATER CUSHION"),    DECORPERM_SOLID_MAT,   DECORSHAPE_1x1, DECORCAT_CUSHION,   2000, DecorDesc_WATER_CUSHION, DecorGfx_WATER_CUSHION),
+    DECORATION(DECOR_SNORLAX_DOLL,    _("SNORLAX DOLL"),     DECORPERM_SOLID_MAT,   DECORSHAPE_1x2, DECORCAT_DOLL,     10000, DecorDesc_SNORLAX_DOLL, DecorGfx_SNORLAX_DOLL),
+    DECORATION(DECOR_RHYDON_DOLL,     _("RHYDON DOLL"),      DECORPERM_SOLID_MAT,   DECORSHAPE_1x2, DECORCAT_DOLL,     10000, DecorDesc_RHYDON_DOLL, DecorGfx_RHYDON_DOLL),
+    DECORATION(DECOR_LAPRAS_DOLL,     _("LAPRAS DOLL"),      DECORPERM_SOLID_MAT,   DECORSHAPE_1x2, DECORCAT_DOLL,     10000, DecorDesc_LAPRAS_DOLL, DecorGfx_LAPRAS_DOLL),
+    DECORATION(DECOR_VENUSAUR_DOLL,   _("VENUSAUR DOLL"),    DECORPERM_SOLID_MAT,   DECORSHAPE_1x2, DECORCAT_DOLL,     10000, DecorDesc_VENUSAUR_DOLL, DecorGfx_VENUSAUR_DOLL),
+    DECORATION(DECOR_CHARIZARD_DOLL,  _("CHARIZARD DOLL"),   DECORPERM_SOLID_MAT,   DECORSHAPE_1x2, DECORCAT_DOLL,     10000, DecorDesc_CHARIZARD_DOLL, DecorGfx_CHARIZARD_DOLL),
+    DECORATION(DECOR_BLASTOISE_DOLL,  _("BLASTOISE DOLL"),   DECORPERM_SOLID_MAT,   DECORSHAPE_1x2, DECORCAT_DOLL,     10000, DecorDesc_BLASTOISE_DOLL, DecorGfx_BLASTOISE_DOLL),
+    DECORATION(DECOR_WAILMER_DOLL,    _("WAILMER DOLL"),     DECORPERM_SOLID_MAT,   DECORSHAPE_1x2, DECORCAT_DOLL,     10000, DecorDesc_WAILMER_DOLL, DecorGfx_WAILMER_DOLL),
+    DECORATION(DECOR_REGIROCK_DOLL,   _("REGIROCK DOLL"),    DECORPERM_SOLID_MAT,   DECORSHAPE_1x2, DECORCAT_DOLL,     10000, DecorDesc_REGIROCK_DOLL, DecorGfx_REGIROCK_DOLL),
+    DECORATION(DECOR_REGICE_DOLL,     _("REGICE DOLL"),      DECORPERM_SOLID_MAT,   DECORSHAPE_1x2, DECORCAT_DOLL,     10000, DecorDesc_REGICE_DOLL, DecorGfx_REGICE_DOLL),
+    DECORATION(DECOR_REGISTEEL_DOLL,  _("REGISTEEL DOLL"),   DECORPERM_SOLID_MAT,   DECORSHAPE_1x2, DECORCAT_DOLL,     10000, DecorDesc_REGISTEEL_DOLL, DecorGfx_REGISTEEL_DOLL)
 };
 
 const u8 *const gUnknown_083EC5E4[] = {
@@ -1421,6 +1421,7 @@ const u8 Unknown_3EC68C[] = {0, 1, 2, 3, 4, 5, 6, 7};
 const u8 Unknown_3EC694[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31};
 const u8 Unknown_3EC6B4[] = {0, 1, 2, 3, 4, 5, 8, 9, 10, 11, 12, 13, 16, 17, 18, 19, 20, 21, 24, 25, 26, 27, 28, 29, 32, 33, 34, 35, 36, 37, 40, 41, 42, 43, 44, 45};
 const u8 Unknown_3EC6D8[] = {0, 1, 2, 3, 4, 5, 8, 9, 10, 11, 12, 13, 16, 17, 18, 19, 20, 21, 24, 25, 26, 27, 28, 29};
+
 const u8 Unknown_3EC6F0[] = {0, 0, 0, 0};
 const u8 Unknown_3EC6F4[] = {0, 0, 1, 1, 0, 0, 1, 1};
 const u8 Unknown_3EC6FC[] = {0, 0, 1, 1, 2, 2, 0, 0, 1, 1, 2, 2};
@@ -1431,6 +1432,7 @@ const u8 Unknown_3EC740[] = {0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2};
 const u8 Unknown_3EC74C[] = {0, 0, 1, 1, 0, 0, 1, 1, 2, 2, 3, 3, 2, 2, 3, 3, 4, 4, 5, 5, 4, 4, 5, 5, 6, 6, 7, 7, 6, 6, 7, 7};
 const u8 Unknown_3EC76C[] = {0, 0, 1, 1, 2, 2, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 6, 6, 7, 7, 8, 8};
 const u8 Unknown_3EC790[] = {0, 0, 1, 1, 2, 2, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 3, 3, 4, 4, 5, 5};
+
 const u8 Unknown_3EC7A8[] = {4, 5, 6, 7};
 const u8 Unknown_3EC7AC[] = {4, 5, 4, 5, 6, 7, 6, 7};
 const u8 Unknown_3EC7B4[] = {4, 5, 4, 5, 4, 5, 6, 7, 6, 7, 6, 7};
@@ -1656,7 +1658,7 @@ void sub_80FE428(u8 taskId)
     gTasks[taskId].func = Task_DecorationPCProcessMenuInput;
 }
 
-void sub_80FE470(u8 decoCat, u8 a1, u8 a2, u8 palIdx)
+void sub_80FE470(u8 decoCat, u8 left, u8 top, u8 palIdx) // PrintDecorationCategorySelectionMenuString
 {
     u8 *strptr;
     u8 v0;
@@ -1675,21 +1677,21 @@ void sub_80FE470(u8 decoCat, u8 a1, u8 a2, u8 palIdx)
     strptr[1] = 5;
     strptr[2] = v0;
     strptr[3] = EOS;
-    MenuPrint(gStringVar4, a1, a2);
+    MenuPrint(gStringVar4, left, top);
 }
 
-void sub_80FE528(u8 taskId)
+void sub_80FE528(u8 taskId) // PrintDecorationCategorySelectionMenuStrings
 {
     u8 decoCat;
     MenuDrawTextWindow(0, 0, 14, 19);
     for (decoCat=0; decoCat<8; decoCat++)
     {
-        if (ewram_1f000.isPlayerRoom == 1 && gTasks[taskId].data[11] == 0 && decoCat != DECOCAT_DOLL && decoCat != DECOCAT_CUSHION)
+        if (ewram_1f000.isPlayerRoom == 1 && gTasks[taskId].data[11] == 0 && decoCat != DECORCAT_DOLL && decoCat != DECORCAT_CUSHION)
         {
-            sub_80FE470(decoCat, 1, 2 * decoCat + 1, 13);
+            sub_80FE470(decoCat, 1, 2 * decoCat + 1, 13); // Selectable
         } else
         {
-            sub_80FE470(decoCat, 1, 2 * decoCat + 1, 255);
+            sub_80FE470(decoCat, 1, 2 * decoCat + 1, 255); // Unselectable
         }
     }
     MenuPrint(gUnknownText_Exit, 1, 17);
@@ -1914,7 +1916,7 @@ void sub_80FEABC(u8 taskId, u8 dummy1)
         }
         if (gUnknown_020388D0[i])
         {
-            if (ewram_1f000.isPlayerRoom == 1 && gUnknown_020388F6 != DECOCAT_DOLL && gUnknown_020388F6 != DECOCAT_CUSHION && gTasks[taskId].data[11] == 0)
+            if (ewram_1f000.isPlayerRoom == 1 && gUnknown_020388F6 != DECORCAT_DOLL && gUnknown_020388F6 != DECORCAT_CUSHION && gTasks[taskId].data[11] == 0)
             {
                 StringCopy(gStringVar1, gDecorations[gUnknown_020388D0[i]].name);
                 sub_8072A18(gUnknown_083EC65A, 0x08, 8 * ni, 0x68, 1);
@@ -2182,14 +2184,14 @@ void sub_80FF1EC(u16 mapX, u16 mapY, u8 decWidth, u8 decHeight, u16 decIdx)
         {
             x = mapX + j;
             behavior = GetBehaviorByMetatileId(0x200 + gDecorations[decIdx].tiles[i * decWidth + j]);
-            if (sub_8057288(behavior) == 1 || (gDecorations[decIdx].decor_field_11 != 1 && (behavior >> 12)))
+            if (sub_8057288(behavior) == 1 || (gDecorations[decIdx].permission != DECORPERM_PASS_FLOOR && (behavior >> 12)))
             {
                 flags = 0xc00;
             } else
             {
                 flags = 0x000;
             }
-            if (gDecorations[decIdx].decor_field_11 != 3 && sub_80572B0(MapGridGetMetatileBehaviorAt(x, decBottom)) == 1)
+            if (gDecorations[decIdx].permission != DECORPERM_NA_WALL && sub_80572B0(MapGridGetMetatileBehaviorAt(x, decBottom)) == 1)
             {
                 v0 = 1;
             } else
@@ -2212,34 +2214,34 @@ void sub_80FF394(u16 mapX, u16 mapY, u16 decIdx)
 {
     switch (gDecorations[decIdx].shape)
     {
-        case 0:
+        case DECORSHAPE_1x1:
             sub_80FF1EC(mapX, mapY, 1, 1, decIdx);
             break;
-        case 1:
+        case DECORSHAPE_2x1:
             sub_80FF1EC(mapX, mapY, 2, 1, decIdx);
             break;
-        case 2:
+        case DECORSHAPE_3x1: // unused
             sub_80FF1EC(mapX, mapY, 3, 1, decIdx);
             break;
-        case 3:
+        case DECORSHAPE_4x2:
             sub_80FF1EC(mapX, mapY, 4, 2, decIdx);
             break;
-        case 4:
+        case DECORSHAPE_2x2:
             sub_80FF1EC(mapX, mapY, 2, 2, decIdx);
             break;
-        case 5:
+        case DECORSHAPE_1x2:
             sub_80FF1EC(mapX, mapY, 1, 2, decIdx);
             break;
-        case 6:
+        case DECORSHAPE_1x3: // unused
             sub_80FF1EC(mapX, mapY, 1, 3, decIdx);
             break;
-        case 7:
+        case DECORSHAPE_2x4:
             sub_80FF1EC(mapX, mapY, 2, 4, decIdx);
             break;
-        case 8:
+        case DECORSHAPE_3x3:
             sub_80FF1EC(mapX, mapY, 3, 3, decIdx);
             break;
-        case 9:
+        case DECORSHAPE_3x2:
             sub_80FF1EC(mapX, mapY, 3, 2, decIdx);
             break;
     }
@@ -2288,7 +2290,7 @@ bool8 sub_80FF58C/*IsThereRoomForMoreDecorations*/(void)
 
 void sub_80FF5BC(u8 taskId)
 {
-    if (ewram_1f000.isPlayerRoom == 1 && gUnknown_020388F6 != DECOCAT_DOLL && gUnknown_020388F6 != DECOCAT_CUSHION)
+    if (ewram_1f000.isPlayerRoom == 1 && gUnknown_020388F6 != DECORCAT_DOLL && gUnknown_020388F6 != DECORCAT_CUSHION)
     {
         sub_80FEF74();
         sub_80FED1C();
@@ -2362,7 +2364,7 @@ void AddDecorationIconObjectFromFieldObject(struct UnkStruct_02038900 * unk_0203
     sub_80FED1C();
     sub_81006D0(unk_02038900);
     unk_02038900->decoration = &gDecorations[decoIdx];
-    if (gDecorations[decoIdx].decor_field_11 != 4)
+    if (gDecorations[decoIdx].permission != DECORPERM_SOLID_MAT)
     {
         sub_81008BC(unk_02038900);
         sub_8100930(unk_02038900->decoration->shape);
@@ -2383,7 +2385,7 @@ void SetUpPlacingDecorationPlayerAvatar(u8 taskId, struct UnkStruct_02038900 *un
 {
     u8 v0;
     v0 = 16 * (u8)gTasks[taskId].data[5] + gUnknown_083EC900[unk_02038900->decoration->shape].x - 8 * ((u8)gTasks[taskId].data[5] - 1);
-    if (unk_02038900->decoration->shape == 2 || unk_02038900->decoration->shape == 8 || unk_02038900->decoration->shape == 9)
+    if (unk_02038900->decoration->shape == DECORSHAPE_3x1 || unk_02038900->decoration->shape == DECORSHAPE_3x3 || unk_02038900->decoration->shape == DECORSHAPE_3x2)
     {
         v0 -= 8;
     }
@@ -2403,44 +2405,44 @@ void sub_80FF960(u8 taskId)
 {
     switch (gDecorations[gUnknown_020388D0[gUnknown_020388F5]].shape)
     {
-        case 0:
+        case DECORSHAPE_1x1:
             gTasks[taskId].data[5] = 1;
             gTasks[taskId].data[6] = 1;
             break;
-        case 1:
+        case DECORSHAPE_2x1:
             gTasks[taskId].data[5] = 2;
             gTasks[taskId].data[6] = 1;
             break;
-        case 2:
+        case DECORSHAPE_3x1:
             gTasks[taskId].data[5] = 3;
             gTasks[taskId].data[6] = 1;
             break;
-        case 3:
+        case DECORSHAPE_4x2:
             gTasks[taskId].data[5] = 4;
             gTasks[taskId].data[6] = 2;
             break;
-        case 4:
+        case DECORSHAPE_2x2:
             gTasks[taskId].data[5] = 2;
             gTasks[taskId].data[6] = 2;
             break;
-        case 5:
+        case DECORSHAPE_1x2:
             gTasks[taskId].data[5] = 1;
             gTasks[taskId].data[6] = 2;
             break;
-        case 6:
+        case DECORSHAPE_1x3:
             gTasks[taskId].data[5] = 1;
             gTasks[taskId].data[6] = 3;
             gTasks[taskId].data[1]++;
             break;
-        case 7:
+        case DECORSHAPE_2x4:
             gTasks[taskId].data[5] = 2;
             gTasks[taskId].data[6] = 4;
             break;
-        case 8:
+        case DECORSHAPE_3x3:
             gTasks[taskId].data[5] = 3;
             gTasks[taskId].data[6] = 3;
             break;
-        case 9:
+        case DECORSHAPE_3x2:
             gTasks[taskId].data[5] = 3;
             gTasks[taskId].data[6] = 2;
             break;
@@ -2483,7 +2485,7 @@ bool8 sub_80FFB94(u8 taskId, s16 x, s16 y, u16 decoId)
     return TRUE;
 }
 
-bool8 sub_80FFBDC(u16 a0, struct Decoration *decoration)
+bool8 sub_80FFBDC(u16 a0, const struct Decoration *decoration)
 {
     if (sub_8057274(a0) != 1)
     {
@@ -2499,6 +2501,7 @@ bool8 sub_80FFBDC(u16 a0, struct Decoration *decoration)
     return FALSE;
 }
 
+// When behaviorBy is set, it is masked by 0xf000.  This is the step that fails to match when built.
 #ifdef NONMATCHING
 bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
 {
@@ -2506,17 +2509,16 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
     u8 j;
     u8 behaviorAt;
     u16 behaviorBy;
-    u8 fieldObjectId;
     u8 mapY;
     u8 mapX;
     s16 curY;
     s16 curX;
     mapY = gTasks[taskId].data[6];
     mapX = gTasks[taskId].data[5];
-    switch (decoration->decor_field_11)
+    switch (decoration->permission)
     {
-        case 0:
-        case 1:
+        case DECORPERM_SOLID_FLOOR:
+        case DECORPERM_PASS_FLOOR:
             for (i=0; i<mapY; i++)
             {
                 curY = gTasks[taskId].data[1] - i;
@@ -2524,7 +2526,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
                 {
                     curX = gTasks[taskId].data[0] + j;
                     behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY);
-                    behaviorBy = 0xf000 & GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]);
+                    behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & 0xf000;
                     if (!sub_80FFBDC(behaviorAt, decoration))
                     {
                         return FALSE;
@@ -2533,15 +2535,15 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
                     {
                         return FALSE;
                     }
-                    fieldObjectId = GetFieldObjectIdByXYZ(curX, curY, 0);
-                    if (fieldObjectId != 0 && fieldObjectId != 16)
+                    behaviorAt = GetFieldObjectIdByXYZ(curX, curY, 0);
+                    if (behaviorAt != 0 && behaviorAt != 16)
                     {
                         return FALSE;
                     }
                 }
             }
             break;
-        case 2:
+        case DECORPERM_BEHIND_FLOOR:
             for (i=0; i<mapY-1; i++)
             {
                 curY = gTasks[taskId].data[1] - i;
@@ -2549,7 +2551,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
                 {
                     curX = gTasks[taskId].data[0] + j;
                     behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY);
-                    behaviorBy = 0xf000 & GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - i) * mapX + j]);
+                    behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & 0xf000;
                     if (!sub_805729C(behaviorAt) && !sub_80FFB6C(behaviorAt, behaviorBy))
                     {
                         return FALSE;
@@ -2558,8 +2560,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
                     {
                         return FALSE;
                     }
-                    fieldObjectId = GetFieldObjectIdByXYZ(curX, curY, 0);
-                    if (fieldObjectId != 16)
+                    if (GetFieldObjectIdByXYZ(curX, curY, 0) != 16)
                     {
                         return FALSE;
                     }
@@ -2570,7 +2571,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
             {
                 curX = gTasks[taskId].data[0] + j;
                 behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY);
-                behaviorBy = 0xf000 & GetBehaviorByMetatileId(0x200 + decoration->tiles[j]);
+                behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[j]) & 0xf000;
                 if (!sub_805729C(behaviorAt) && !sub_80572B0(behaviorAt))
                 {
                     return FALSE;
@@ -2579,34 +2580,38 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
                 {
                     return FALSE;
                 }
-                fieldObjectId = GetFieldObjectIdByXYZ(curX, curY, 0);
-                if (fieldObjectId != 0 && fieldObjectId != 16)
+                behaviorAt = GetFieldObjectIdByXYZ(curX, curY, 0);
+                if (behaviorAt != 0 && behaviorAt != 16)
                 {
                     return FALSE;
                 }
             }
             break;
-        case 3:
+        case DECORPERM_NA_WALL:
             for (i=0; i<mapY; i++)
             {
                 curY = gTasks[taskId].data[1] - i;
                 for (j=0; j<mapX; j++)
                 {
                     curX = gTasks[taskId].data[0] + j;
-                    if (!sub_80572B0(MapGridGetMetatileBehaviorAt(curX, curY)) || MapGridGetMetatileIdAt(curX, curY) == 0x28c)
+                    if (!sub_80572B0(MapGridGetMetatileBehaviorAt(curX, curY)))
+                    {
+                        return FALSE;
+                    }
+                    if (MapGridGetMetatileIdAt(curX, curY + 1) == 0x28c)
                     {
                         return FALSE;
                     }
                 }
             }
             break;
-        case 4:
+        case DECORPERM_SOLID_MAT:
             curY = gTasks[taskId].data[1];
             for (j=0; j<mapX; j++)
             {
                 curX = gTasks[taskId].data[0] + j;
                 behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY);
-                if (decoration->shape == 5)
+                if (decoration->shape == DECORSHAPE_1x2)
                 {
                     if (!sub_80572EC(behaviorAt))
                     {
@@ -2620,8 +2625,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
                         return FALSE;
                     }
                 }
-                fieldObjectId = GetFieldObjectIdByXYZ(curX, curY, 0);
-                if (fieldObjectId != 16)
+                if (GetFieldObjectIdByXYZ(curX, curY, 0) != 16)
                 {
                     return FALSE;
                 }
@@ -3187,7 +3191,7 @@ void sub_81000C4(u8 taskId)
 {
     MenuZeroFillWindowRect(0, 0, 29, 19);
     sub_8100174(taskId);
-    if (gDecorations[gUnknown_020388D0[gUnknown_020388F5]].decor_field_11 != 4)
+    if (gDecorations[gUnknown_020388D0[gUnknown_020388F5]].permission != DECORPERM_SOLID_MAT)
     {
         sub_80FF394(gTasks[taskId].data[0], gTasks[taskId].data[1], gUnknown_020388D0[gUnknown_020388F5]);
     } else
@@ -3421,7 +3425,7 @@ void sub_81006D0(struct UnkStruct_02038900 *unk_02038900)
     }
     for (i=0; i<0x40; i++)
     {
-        unk_02038900->unk_004[i] = 0;
+        unk_02038900->tiles[i] = 0;
     }
 }
 
@@ -3487,7 +3491,7 @@ void sub_8100874(struct UnkStruct_02038900 *unk_02038900)
 {
     u16 i;
     for (i=0; i<0x40; i++)
-        sub_8100740(&unk_02038900->image[i * 32], unk_02038900->unk_004[i]);
+        sub_8100740(&unk_02038900->image[i * 32], unk_02038900->tiles[i]);
 }
 
 u16 sub_810089C(u16 a0)
@@ -3498,19 +3502,15 @@ u16 sub_810089C(u16 a0)
 void sub_81008BC(struct UnkStruct_02038900 *unk_02038900)
 {
     u8 i;
-    u8 idx;
-    idx = unk_02038900->decoration->shape;
-    for (i=0; i<gUnknown_083EC860[idx].size; i++)
+    u8 shape;
+    shape = unk_02038900->decoration->shape;
+    for (i=0; i<gUnknown_083EC860[shape].size; i++)
     {
-        unk_02038900->unk_004[gUnknown_083EC860[idx].var0[i]] = sub_810089C(unk_02038900->decoration->tiles[gUnknown_083EC860[idx].var4[i]] * 8 + gUnknown_083EC860[idx].var8[i]);
+        unk_02038900->tiles[gUnknown_083EC860[shape].tiles[i]] = sub_810089C(unk_02038900->decoration->tiles[gUnknown_083EC860[shape].y[i]] * 8 + gUnknown_083EC860[shape].x[i]);
     }
 }
 
 void sub_8100930(u8 decoShape)
-/*
- * This function sets an OAM object not directly referenced anywhere else
- * in the source.
- */
 {
     gUnknown_020391AC.y = 0;
     gUnknown_020391AC.affineMode = 0;
@@ -3582,10 +3582,10 @@ void sub_8100A7C(void)
     if (gSpecialVar_0x8004 == gUnknown_02039234)
     {
         gScriptResult = 1;
-    } else if (gDecorations[ewram_1f000.items[gUnknown_020391B4[gSpecialVar_0x8004].var00]].decor_field_11 == 4)
+    } else if (gDecorations[ewram_1f000.items[gUnknown_020391B4[gSpecialVar_0x8004].decorId]].permission == DECORPERM_SOLID_MAT)
     {
-        gSpecialVar_0x8005 = gUnknown_020391B4[gSpecialVar_0x8004].var04;
-        sub_8100A60(gUnknown_020391B4[gSpecialVar_0x8004].var00);
+        gSpecialVar_0x8005 = gUnknown_020391B4[gSpecialVar_0x8004].flagId;
+        sub_8100A60(gUnknown_020391B4[gSpecialVar_0x8004].decorId);
         for (i=0; i<gMapHeader.events->mapObjectCount; i++)
         {
             if (gMapHeader.events->mapObjects[i].flagId == gSpecialVar_0x8005)
@@ -3617,15 +3617,15 @@ void sub_8100B6C(void)
     u8 k;
     u8 x;
     u8 y;
-    u8 unk11;
+    u8 permission;
     for (i=0; i<gUnknown_02039234; i++)
     {
-        unk11 = gDecorations[ewram_1f000.items[gUnknown_020391B4[i].var00]].decor_field_11;
-        x = ewram_1f000.pos[gUnknown_020391B4[i].var00] >> 4;
-        y = ewram_1f000.pos[gUnknown_020391B4[i].var00] & 0xf;
-        if (unk11 != 4)
+        permission = gDecorations[ewram_1f000.items[gUnknown_020391B4[i].decorId]].permission;
+        x = ewram_1f000.pos[gUnknown_020391B4[i].decorId] >> 4;
+        y = ewram_1f000.pos[gUnknown_020391B4[i].decorId] & 0xf;
+        if (permission != DECORPERM_SOLID_MAT)
         {
-            if (ewram_1f000.items[gUnknown_020391B4[i].var00] == DECOR_SAND_ORNAMENT && MapGridGetMetatileIdAt(x + 7, y + 7) == 0x28c)
+            if (ewram_1f000.items[gUnknown_020391B4[i].decorId] == DECOR_SAND_ORNAMENT && MapGridGetMetatileIdAt(x + 7, y + 7) == 0x28c)
             {
                 gUnknown_020391B4[i].height++;
             }
@@ -3636,7 +3636,7 @@ void sub_8100B6C(void)
                     MapGridSetMetatileEntryAt(x + 7 + k, y + 7 - j, ((u16 *)gMapHeader.mapData->map)[(x + k) + gMapHeader.mapData->width * (y - j)] | 0x3000);
                 }
             }
-            sub_8100A60(gUnknown_020391B4[i].var00);
+            sub_8100A60(gUnknown_020391B4[i].decorId);
         }
     }
 }
@@ -3801,43 +3801,43 @@ void sub_81010F0(u8 taskId)
 
 void sub_8101118(u8 decorIdx, struct UnkStruct_020391B4 *unk_020391B4)
 {
-    if (gDecorations[decorIdx].shape == 0)
+    if (gDecorations[decorIdx].shape == DECORSHAPE_1x1)
     {
         unk_020391B4->width = 1;
         unk_020391B4->height = 1;
-    } else if (gDecorations[decorIdx].shape == 1)
+    } else if (gDecorations[decorIdx].shape == DECORSHAPE_2x1)
     {
         unk_020391B4->width = 2;
         unk_020391B4->height = 1;
-    } else if (gDecorations[decorIdx].shape == 2)
+    } else if (gDecorations[decorIdx].shape == DECORSHAPE_3x1)
     {
         unk_020391B4->width = 3;
         unk_020391B4->height = 1;
-    } else if (gDecorations[decorIdx].shape == 3)
+    } else if (gDecorations[decorIdx].shape == DECORSHAPE_4x2)
     {
         unk_020391B4->width = 4;
         unk_020391B4->height = 2;
-    } else if (gDecorations[decorIdx].shape == 4)
+    } else if (gDecorations[decorIdx].shape == DECORSHAPE_2x2)
     {
         unk_020391B4->width = 2;
         unk_020391B4->height = 2;
-    } else if (gDecorations[decorIdx].shape == 5)
+    } else if (gDecorations[decorIdx].shape == DECORSHAPE_1x2)
     {
         unk_020391B4->width = 1;
         unk_020391B4->height = 2;
-    } else if (gDecorations[decorIdx].shape == 6)
+    } else if (gDecorations[decorIdx].shape == DECORSHAPE_1x3)
     {
         unk_020391B4->width = 1;
         unk_020391B4->height = 3;
-    } else if (gDecorations[decorIdx].shape == 7)
+    } else if (gDecorations[decorIdx].shape == DECORSHAPE_2x4)
     {
         unk_020391B4->width = 2;
         unk_020391B4->height = 4;
-    } else if (gDecorations[decorIdx].shape == 8)
+    } else if (gDecorations[decorIdx].shape == DECORSHAPE_3x3)
     {
         unk_020391B4->width = 3;
         unk_020391B4->height = 3;
-    } else if (gDecorations[decorIdx].shape == 9)
+    } else if (gDecorations[decorIdx].shape == DECORSHAPE_3x2)
     {
         unk_020391B4->width = 3;
         unk_020391B4->height = 2;
@@ -3879,13 +3879,13 @@ void sub_81012A0(void)
     u8 xOff;
     u8 yOff;
     u16 i;
-    xOff = ewram_1f000.pos[gUnknown_020391B4[gUnknown_02039234].var00] >> 4;
-    yOff = ewram_1f000.pos[gUnknown_020391B4[gUnknown_02039234].var00] & 0xf;
+    xOff = ewram_1f000.pos[gUnknown_020391B4[gUnknown_02039234].decorId] >> 4;
+    yOff = ewram_1f000.pos[gUnknown_020391B4[gUnknown_02039234].decorId] & 0xf;
     for (i=0; i<0x40; i++)
     {
         if (gSaveBlock1.mapObjectTemplates[i].x == xOff && gSaveBlock1.mapObjectTemplates[i].y == yOff && !FlagGet(gSaveBlock1.mapObjectTemplates[i].flagId))
         {
-            gUnknown_020391B4[gUnknown_02039234].var04 = gSaveBlock1.mapObjectTemplates[i].flagId;
+            gUnknown_020391B4[gUnknown_02039234].flagId = gSaveBlock1.mapObjectTemplates[i].flagId;
             break;
         }
     }
@@ -3898,12 +3898,12 @@ bool8 sub_8101340(u8 taskId)
     {
         if (ewram_1f000.items[i] != 0)
         {
-            if (gDecorations[ewram_1f000.items[i]].decor_field_11 == 4)
+            if (gDecorations[ewram_1f000.items[i]].permission == DECORPERM_SOLID_MAT)
             {
                 sub_8101118(ewram_1f000.items[i], gUnknown_020391B4);
                 if (sub_8101200(taskId, i, gUnknown_020391B4) == TRUE)
                 {
-                    gUnknown_020391B4->var00 = i;
+                    gUnknown_020391B4->decorId = i;
                     sub_81012A0();
                     gUnknown_02039234 = 1;
                     return TRUE;
@@ -3925,9 +3925,9 @@ void sub_81013B8(u8 a0, u8 a1, u8 a2, u8 a3)
         decorIdx = ewram_1f000.items[i];
         xOff = ewram_1f000.pos[i] >> 4;
         yOff = ewram_1f000.pos[i] & 0xf;
-        if (decorIdx != 0 && gDecorations[decorIdx].decor_field_11 == 4 && a0 <= xOff && a1 <= yOff && a2 >= xOff && a3 >= yOff)
+        if (decorIdx != 0 && gDecorations[decorIdx].permission == DECORPERM_SOLID_MAT && a0 <= xOff && a1 <= yOff && a2 >= xOff && a3 >= yOff)
         {
-            gUnknown_020391B4[gUnknown_02039234].var00 = i;
+            gUnknown_020391B4[gUnknown_02039234].decorId = i;
             sub_81012A0();
             gUnknown_02039234++;
         }
@@ -3945,28 +3945,28 @@ void sub_8101460(u8 taskId)
     {
         for (i=0; i<ewram_1f000.size; i++)
         {
-            if (ewram_1f000.items[i] != 0) // This is using the wrong register!
+            if (ewram_1f000.items[i] == 0) // This is using the wrong register!
             {
-                sub_8101118(ewram_1f000.items[i], gUnknown_020391B4);
-                if (sub_8101200(taskId, i, gUnknown_020391B4) == TRUE)
-                {
-                    gUnknown_020391B4[0].var00 = i;
-                    gUnknown_02039234++;
-                    break;
-                }
+                continue;
+            }
+            sub_8101118(ewram_1f000.items[i], gUnknown_020391B4);
+            if (sub_8101200(taskId, i, gUnknown_020391B4) == TRUE)
+            {
+                gUnknown_020391B4[0].decorId = i;
+                gUnknown_02039234++;
+                break;
             }
         }
         if (gUnknown_02039234 != 0)
         {
-            xOff = ewram_1f000.pos[gUnknown_020391B4[0].var00] >> 4;
-            yOff = ewram_1f000.pos[gUnknown_020391B4[0].var00] & 0xf;
-            sub_81013B8(xOff, yOff - gUnknown_020391B4[0].var02 + 1, xOff + gUnknown_020391B4[0].var01 - 1, yOff);
+            xOff = ewram_1f000.pos[gUnknown_020391B4[0].decorId] >> 4;
+            yOff = ewram_1f000.pos[gUnknown_020391B4[0].decorId] & 0xf;
+            sub_81013B8(xOff, yOff - gUnknown_020391B4[0].height + 1, xOff + gUnknown_020391B4[0].width - 1, yOff);
         }
     }
 }
 #else
 __attribute__((naked))
-
 void sub_8101460(u8 taskId)
 {
     asm(".syntax unified\n"
diff --git a/src/menu.c b/src/menu.c
index 3acac88a0..3acac88a0 100755..100644
--- a/src/menu.c
+++ b/src/menu.c
diff --git a/src/scrcmd.c b/src/scrcmd.c
index f2b5090af..f2b5090af 100755..100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
diff --git a/src/secret_base.c b/src/secret_base.c
index 4ff0b6b17..4ff0b6b17 100755..100644
--- a/src/secret_base.c
+++ b/src/secret_base.c