Use metatile labels for decor gfx

1 files changed, 132 insertions, 16 deletions

diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h
index 4bcf47ea8..586107687 100644
--- a/include/constants/metatile_labels.h
+++ b/include/constants/metatile_labels.h
@@ -524,33 +524,64 @@
 #define METATILE_SecretBase_MudBall                     0x228
 #define METATILE_SecretBase_Fence_Horizontal            0x22C
 #define METATILE_SecretBase_Fence_Vertical              0x233
-#define METATILE_SecretBase_Board_Top                   0x234
-#define METATILE_SecretBase_Board_Bottom                0x23C
+#define METATILE_SecretBase_SolidBoard_Top              0x234
+#define METATILE_SecretBase_SolidBoard_Bottom           0x23C
+#define METATILE_SecretBase_RedTent_TopLeft             0x230
+#define METATILE_SecretBase_RedTent_TopMid              0x231
+#define METATILE_SecretBase_RedTent_TopRight            0x232
+#define METATILE_SecretBase_RedTent_MidLeft             0x238
 #define METATILE_SecretBase_RedTent_DoorTop             0x239
+#define METATILE_SecretBase_RedTent_MidRight            0x23A
+#define METATILE_SecretBase_RedTent_BottomLeft          0x240
 #define METATILE_SecretBase_RedTent_Door                0x241
+#define METATILE_SecretBase_RedTent_BottomRight         0x23B
+#define METATILE_SecretBase_BlueTent_TopLeft            0x248
+#define METATILE_SecretBase_BlueTent_TopMid             0x249
+#define METATILE_SecretBase_BlueTent_TopRight           0x268
+#define METATILE_SecretBase_BlueTent_MidLeft            0x250
 #define METATILE_SecretBase_BlueTent_DoorTop            0x251
+#define METATILE_SecretBase_BlueTent_MidRight           0x270
+#define METATILE_SecretBase_BlueTent_BottomLeft         0x258
 #define METATILE_SecretBase_BlueTent_Door               0x259
-#define METATILE_SecretBase_Slide_Stairs                0x23D
-#define METATILE_SecretBase_Slide                       0x23E
-#define METATILE_SecretBase_Stand_LeftCorner            0x26A
-#define METATILE_SecretBase_Stand_RightCorner           0x26D
+#define METATILE_SecretBase_BlueTent_BottomRight        0x269
+#define METATILE_SecretBase_Slide_TopLeft               0x235
+#define METATILE_SecretBase_Slide_TopRight              0x236
+#define METATILE_SecretBase_Slide_StairLanding          0x23D
+#define METATILE_SecretBase_Slide_SlideTop              0x23E
+#define METATILE_SecretBase_Slide_Stairs                0x263
+#define METATILE_SecretBase_Slide_SlideBottom           0x264
+#define METATILE_SecretBase_Slide_MatLeft               0x26F
+#define METATILE_SecretBase_Slide_MatRight              0x277
+#define METATILE_SecretBase_Stand_CornerLeft            0x26A
+#define METATILE_SecretBase_Stand_MidLeft               0x26B
+#define METATILE_SecretBase_Stand_MidRight              0x26C
+#define METATILE_SecretBase_Stand_CornerRight           0x26D
+#define METATILE_SecretBase_Stand_StairsLeft            0x272
+#define METATILE_SecretBase_Stand_BaseLeft              0x273
+#define METATILE_SecretBase_Stand_BaseRight             0x274
+#define METATILE_SecretBase_Stand_StairsRight           0x275
 #define METATILE_SecretBase_BreakableDoor_TopClosed     0x237
 #define METATILE_SecretBase_BreakableDoor_BottomClosed  0x23F
 #define METATILE_SecretBase_BreakableDoor_TopOpen       0x26E
 #define METATILE_SecretBase_BreakableDoor_BottomOpen    0x276
-#define METATILE_SecretBase_NoteMat_C                   0x278
+#define METATILE_SecretBase_GlitterMat                  0x260
+#define METATILE_SecretBase_JumpMat                     0x261
+#define METATILE_SecretBase_SpinMat                     0x262
+#define METATILE_SecretBase_NoteMat_C_Low               0x278
 #define METATILE_SecretBase_NoteMat_D                   0x279
 #define METATILE_SecretBase_NoteMat_E                   0x27A
 #define METATILE_SecretBase_NoteMat_F                   0x27B
 #define METATILE_SecretBase_NoteMat_G                   0x27C
 #define METATILE_SecretBase_NoteMat_A                   0x27D
 #define METATILE_SecretBase_NoteMat_B                   0x27E
-#define METATILE_SecretBase_NoteMat_C_Sharp             0x2B3
+#define METATILE_SecretBase_NoteMat_C_High              0x2B3
 #define METATILE_SecretBase_Tire_TopLeft                0x280
 #define METATILE_SecretBase_Tire_TopRight               0x281
 #define METATILE_SecretBase_Tire_BottomLeft             0x288
 #define METATILE_SecretBase_Tire_BottomRight            0x289
+#define METATILE_SecretBase_GlassOrnament_Top           0x282
 #define METATILE_SecretBase_GlassOrnament_Base1         0x28A
+#define METATILE_SecretBase_GlassOrnament_TopWall       0x283
 #define METATILE_SecretBase_GlassOrnament_Base2         0x28B
 #define METATILE_SecretBase_SandOrnament_BrokenTop      0x284
 #define METATILE_SecretBase_SandOrnament_BrokenBase     0x28C
@@ -622,23 +653,41 @@
 #define METATILE_SecretBase_RaggedChair                 0x2C2
 #define METATILE_SecretBase_BrickChair                  0x2C8
 #define METATILE_SecretBase_CampChair                   0x2C9
-#define METATILE_SecretBase_HardChair                   0x2Ca
+#define METATILE_SecretBase_HardChair                   0x2CA
+#define METATILE_SecretBase_RedPlant_Top                0x2D0
 #define METATILE_SecretBase_RedPlant_Base1              0x2D8
+#define METATILE_SecretBase_RedPlant_TopWall            0x2D1
 #define METATILE_SecretBase_RedPlant_Base2              0x2D9
+#define METATILE_SecretBase_TropicalPlant_Top           0x2D2
 #define METATILE_SecretBase_TropicalPlant_Base1         0x2DA
+#define METATILE_SecretBase_TropicalPlant_TopWall       0x2D3
 #define METATILE_SecretBase_TropicalPlant_Base2         0x2DB
-#define METATILE_SecretBase_PrettyFlower_Base1          0x2DC
-#define METATILE_SecretBase_PrettyFlower_Base2          0x2DD
-#define METATILE_SecretBase_ColorfulFlowers_BaseLeft1   0x2E8
-#define METATILE_SecretBase_ColorfulFlowers_BaseRight1  0x2E9
-#define METATILE_SecretBase_ColorfulFlowers_BaseLeft2   0x2EA
-#define METATILE_SecretBase_ColorfulFlowers_BaseRight2  0x2EB
+#define METATILE_SecretBase_PrettyFlowers_Top           0x2D4
+#define METATILE_SecretBase_PrettyFlowers_Base1         0x2DC
+#define METATILE_SecretBase_PrettyFlowers_TopWall       0x2D5
+#define METATILE_SecretBase_PrettyFlowers_Base2         0x2DD
+#define METATILE_SecretBase_ColorfulPlant_TopLeft       0x2E0
+#define METATILE_SecretBase_ColorfulPlant_TopRight      0x2E2
+#define METATILE_SecretBase_ColorfulPlant_BaseLeft1     0x2E8
+#define METATILE_SecretBase_ColorfulPlant_BaseRight1    0x2E9
+#define METATILE_SecretBase_ColorfulPlant_TopLeftWall   0x2E1
+#define METATILE_SecretBase_ColorfulPlant_TopRightWall  0x2E3
+#define METATILE_SecretBase_ColorfulPlant_BaseLeft2     0x2EA
+#define METATILE_SecretBase_ColorfulPlant_BaseRight2    0x2EB
+#define METATILE_SecretBase_BigPlant_TopLeft            0x2E4
+#define METATILE_SecretBase_BigPlant_TopRight           0x2E6
 #define METATILE_SecretBase_BigPlant_BaseLeft1          0x2EC
 #define METATILE_SecretBase_BigPlant_BaseRight1         0x2ED
+#define METATILE_SecretBase_BigPlant_TopLeftWall        0x2E5
+#define METATILE_SecretBase_BigPlant_TopRightWall       0x2E6
 #define METATILE_SecretBase_BigPlant_BaseLeft2          0x2EE
 #define METATILE_SecretBase_BigPlant_BaseRight2         0x2EF
+#define METATILE_SecretBase_GorgeousPlant_TopLeft       0x2F0
+#define METATILE_SecretBase_GorgeousPlant_TopRight      0x2F2
 #define METATILE_SecretBase_GorgeousPlant_BaseLeft1     0x2F8
 #define METATILE_SecretBase_GorgeousPlant_BaseRight1    0x2F9
+#define METATILE_SecretBase_GorgeousPlant_TopLeftWall   0x2F1
+#define METATILE_SecretBase_GorgeousPlant_TopRightWall  0x2F3
 #define METATILE_SecretBase_GorgeousPlant_BaseLeft2     0x2FA
 #define METATILE_SecretBase_GorgeousPlant_BaseRight2    0x2FB
 #define METATILE_SecretBase_TV                          0x2F4
@@ -659,12 +708,79 @@
 #define METATILE_SecretBase_RedPoster                   0x332
 #define METATILE_SecretBase_BluePoster                  0x333
 #define METATILE_SecretBase_CutePoster                  0x334
+#define METATILE_SecretBase_SilverShield_Top            0x2D6
 #define METATILE_SecretBase_SilverShield_Base1          0x2DE
+#define METATILE_SecretBase_SilverShield_TopWall        0x2D7
 #define METATILE_SecretBase_SilverShield_Base2          0x2DF
+#define METATILE_SecretBase_GoldShield_Top              0x32E
 #define METATILE_SecretBase_GoldShield_Base1            0x336
+#define METATILE_SecretBase_GoldShield_TopWall          0x32F
 #define METATILE_SecretBase_GoldShield_Base2            0x337
 #define METATILE_SecretBase_RedBalloon                  0x338
-#define METATILE_SecretBase_BlueBalloon                 0x33c
+#define METATILE_SecretBase_BlueBalloon                 0x33C
 #define METATILE_SecretBase_YellowBalloon               0x340
+#define METATILE_SecretBase_SurfMat_TopLeft             0x242
+#define METATILE_SecretBase_SurfMat_TopMid              0x243
+#define METATILE_SecretBase_SurfMat_TopRight            0x244
+#define METATILE_SecretBase_SurfMat_MidLeft             0x24A
+#define METATILE_SecretBase_SurfMat_Center              0x24B
+#define METATILE_SecretBase_SurfMat_MidRight            0x24C
+#define METATILE_SecretBase_SurfMat_BottomLeft          0x252
+#define METATILE_SecretBase_SurfMat_BottomMid           0x253
+#define METATILE_SecretBase_SurfMat_BottomRight         0x254
+#define METATILE_SecretBase_ThunderMat_TopLeft          0x245
+#define METATILE_SecretBase_ThunderMat_TopMid           0x246
+#define METATILE_SecretBase_ThunderMat_TopRight         0x247
+#define METATILE_SecretBase_ThunderMat_MidLeft          0x24D
+#define METATILE_SecretBase_ThunderMat_Center           0x24E
+#define METATILE_SecretBase_ThunderMat_MidRight         0x24F
+#define METATILE_SecretBase_ThunderMat_BottomLeft       0x255
+#define METATILE_SecretBase_ThunderMat_BottomMid        0x256
+#define METATILE_SecretBase_ThunderMat_BottomRight      0x257
+#define METATILE_SecretBase_FireBlastMat_TopLeft        0x25A
+#define METATILE_SecretBase_FireBlastMat_TopMid         0x25B
+#define METATILE_SecretBase_FireBlastMat_TopRight       0x25C
+#define METATILE_SecretBase_FireBlastMat_MidLeft        0x25D
+#define METATILE_SecretBase_FireBlastMat_Center         0x25E
+#define METATILE_SecretBase_FireBlastMat_MidRight       0x25F
+#define METATILE_SecretBase_FireBlastMat_BottomLeft     0x265
+#define METATILE_SecretBase_FireBlastMat_BottomMid      0x266
+#define METATILE_SecretBase_FireBlastMat_BottomRight    0x267
+#define METATILE_SecretBase_PowderSnowMat_TopLeft       0x300
+#define METATILE_SecretBase_PowderSnowMat_TopMid        0x301
+#define METATILE_SecretBase_PowderSnowMat_TopRight      0x302
+#define METATILE_SecretBase_PowderSnowMat_MidLeft       0x308
+#define METATILE_SecretBase_PowderSnowMat_Center        0x309
+#define METATILE_SecretBase_PowderSnowMat_MidRight      0x30A
+#define METATILE_SecretBase_PowderSnowMat_BottomLeft    0x310
+#define METATILE_SecretBase_PowderSnowMat_BottomMid     0x311
+#define METATILE_SecretBase_PowderSnowMat_BottomRight   0x312
+#define METATILE_SecretBase_AttractMat_TopLeft          0x303
+#define METATILE_SecretBase_AttractMat_TopMid           0x304
+#define METATILE_SecretBase_AttractMat_TopRight         0x305
+#define METATILE_SecretBase_AttractMat_MidLeft          0x30B
+#define METATILE_SecretBase_AttractMat_Center           0x30C
+#define METATILE_SecretBase_AttractMat_MidRight         0x30D
+#define METATILE_SecretBase_AttractMat_BottomLeft       0x313
+#define METATILE_SecretBase_AttractMat_BottomMid        0x314
+#define METATILE_SecretBase_AttractMat_BottomRight      0x315
+#define METATILE_SecretBase_FissureMat_TopLeft          0x306
+#define METATILE_SecretBase_FissureMat_TopMid           0x307
+#define METATILE_SecretBase_FissureMat_TopRight         0x318
+#define METATILE_SecretBase_FissureMat_MidLeft          0x30E
+#define METATILE_SecretBase_FissureMat_Center           0x30F
+#define METATILE_SecretBase_FissureMat_MidRight         0x320
+#define METATILE_SecretBase_FissureMat_BottomLeft       0x316
+#define METATILE_SecretBase_FissureMat_BottomMid        0x317
+#define METATILE_SecretBase_FissureMat_BottomRight      0x328
+#define METATILE_SecretBase_SpikesMat_TopLeft           0x319
+#define METATILE_SecretBase_SpikesMat_TopMid            0x31A
+#define METATILE_SecretBase_SpikesMat_TopRight          0x31B
+#define METATILE_SecretBase_SpikesMat_MidLeft           0x321
+#define METATILE_SecretBase_SpikesMat_Center            0x322
+#define METATILE_SecretBase_SpikesMat_MidRight          0x323
+#define METATILE_SecretBase_SpikesMat_BottomLeft        0x329
+#define METATILE_SecretBase_SpikesMat_BottomMid         0x32A
+#define METATILE_SecretBase_SpikesMat_BottomRight       0x32B
 
 #endif // GUARD_METATILE_LABELS_H