Merge branch 'master' into decompile_battle_controllers

1 files changed, 53 insertions, 0 deletions

diff --git a/include/decoration.h b/include/decoration.h
index bbb77d127..adefb2fd1 100644
--- a/include/decoration.h
+++ b/include/decoration.h
@@ -125,6 +125,47 @@ enum DecoId {
     /*120*/ DECOR_REGISTEEL_DOLL
 };
 
+enum DecorPerm {
+    /*
+     * The nomenclature here describes collision and placement permissions, in that order.
+     */
+    DECORPERM_SOLID_FLOOR,
+    DECORPERM_PASS_FLOOR,
+    DECORPERM_BEHIND_FLOOR,
+    DECORPERM_NA_WALL,
+    DECORPERM_SOLID_MAT
+};
+
+enum DecorShape {
+    /*
+     * Width-x-height
+     */
+    DECORSHAPE_1x1,
+    DECORSHAPE_2x1,
+    DECORSHAPE_3x1, // unused
+    DECORSHAPE_4x2,
+    DECORSHAPE_2x2,
+    DECORSHAPE_1x2,
+    DECORSHAPE_1x3, // unused
+    DECORSHAPE_2x4,
+    DECORSHAPE_3x3,
+    DECORSHAPE_3x2
+};
+
+enum DecorCat {
+    /*
+     * In which category you can find the decoration in the PC.
+     */
+    /*0*/ DECORCAT_DESK,
+    /*1*/ DECORCAT_CHAIR,
+    /*2*/ DECORCAT_PLANT,
+    /*3*/ DECORCAT_ORNAMENT,
+    /*4*/ DECORCAT_MAT,
+    /*5*/ DECORCAT_POSTER,
+    /*6*/ DECORCAT_DOLL,
+    /*7*/ DECORCAT_CUSHION
+};
+
 struct Decoration
 {
     /*0x00*/ u8 id;
@@ -137,6 +178,18 @@ struct Decoration
     /*0x1c*/ const u16 *tiles;
 };
 
+struct DecorPCPointers
+{
+    /* 0x00 */ u8 *items;
+    /* 0x04 */ u8 *pos;
+    /* 0x08 */ u8 size;
+    /* 0x09 */ u8 isPlayerRoom;
+};
+
 extern const struct Decoration gDecorations[];
+extern EWRAM_DATA u8 *gCurDecorInventoryItems;
+extern EWRAM_DATA u8 gCurDecorationIndex;
+
+void sub_8126968(void);
 
 #endif //GUARD_DECORATION_H