diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-14 15:16:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-14 15:16:42 -0400 |
| commit | c21175d6b867b99af56625db04594731cc919664 (patch) | |
| tree | 6ee488f38b0e09015a539ac54b96810c8c100d54 | |
| parent | 8a317787336453de51becf840bad5603e015d69e (diff) | |
| parent | 8d3b7bd0b1ea64855595b4ebd95c38b615901ffa (diff) | |
Merge pull request #1023 from GriffinRichards/fix-decor
Misc decoration gfx fixes
89 files changed, 468 insertions, 350 deletions
diff --git a/graphics/decorations/attract_mat.png b/graphics/decorations/attract_mat.png Binary files differnew file mode 100644 index 000000000..77e077a71 --- /dev/null +++ b/graphics/decorations/attract_mat.png diff --git a/graphics/decorations/big_plant.png b/graphics/decorations/big_plant.png Binary files differnew file mode 100644 index 000000000..5f5cac3b3 --- /dev/null +++ b/graphics/decorations/big_plant.png diff --git a/graphics/decorations/blastoise_doll.png b/graphics/decorations/blastoise_doll.png Binary files differnew file mode 100644 index 000000000..a7b0ee6e4 --- /dev/null +++ b/graphics/decorations/blastoise_doll.png diff --git a/graphics/decorations/blue_brick.png b/graphics/decorations/blue_brick.png Binary files differnew file mode 100644 index 000000000..cb187beb1 --- /dev/null +++ b/graphics/decorations/blue_brick.png diff --git a/graphics/decorations/blue_tent.png b/graphics/decorations/blue_tent.png Binary files differnew file mode 100644 index 000000000..f94a61e36 --- /dev/null +++ b/graphics/decorations/blue_tent.png diff --git a/graphics/decorations/breakable_door.png b/graphics/decorations/breakable_door.png Binary files differnew file mode 100644 index 000000000..b96bfe96b --- /dev/null +++ b/graphics/decorations/breakable_door.png diff --git a/graphics/decorations/brick_desk.png b/graphics/decorations/brick_desk.png Binary files differnew file mode 100644 index 000000000..c81082bf8 --- /dev/null +++ b/graphics/decorations/brick_desk.png diff --git a/graphics/decorations/camp_desk.png b/graphics/decorations/camp_desk.png Binary files differnew file mode 100644 index 000000000..6a1bf68c9 --- /dev/null +++ b/graphics/decorations/camp_desk.png diff --git a/graphics/decorations/charizard_doll.png b/graphics/decorations/charizard_doll.png Binary files differnew file mode 100644 index 000000000..cb1acc728 --- /dev/null +++ b/graphics/decorations/charizard_doll.png diff --git a/graphics/decorations/colorful_plant.png b/graphics/decorations/colorful_plant.png Binary files differnew file mode 100644 index 000000000..fdbb43c33 --- /dev/null +++ b/graphics/decorations/colorful_plant.png diff --git a/graphics/decorations/comfort_desk.png b/graphics/decorations/comfort_desk.png Binary files differnew file mode 100644 index 000000000..3e81301df --- /dev/null +++ b/graphics/decorations/comfort_desk.png diff --git a/graphics/decorations/decor_attract_mat.png b/graphics/decorations/decor_attract_mat.png Binary files differdeleted file mode 100644 index 16528d9f3..000000000 --- a/graphics/decorations/decor_attract_mat.png +++ /dev/null diff --git a/graphics/decorations/decor_big_plant.png b/graphics/decorations/decor_big_plant.png Binary files differdeleted file mode 100644 index e5eedd859..000000000 --- a/graphics/decorations/decor_big_plant.png +++ /dev/null diff --git a/graphics/decorations/decor_blastoise_doll.png b/graphics/decorations/decor_blastoise_doll.png Binary files differdeleted file mode 100644 index 00c55f229..000000000 --- a/graphics/decorations/decor_blastoise_doll.png +++ /dev/null diff --git a/graphics/decorations/decor_blue_brick.png b/graphics/decorations/decor_blue_brick.png Binary files differdeleted file mode 100644 index 88e058712..000000000 --- a/graphics/decorations/decor_blue_brick.png +++ /dev/null diff --git a/graphics/decorations/decor_blue_tent.png b/graphics/decorations/decor_blue_tent.png Binary files differdeleted file mode 100644 index 575b35241..000000000 --- a/graphics/decorations/decor_blue_tent.png +++ /dev/null diff --git a/graphics/decorations/decor_breakable_door.png b/graphics/decorations/decor_breakable_door.png Binary files differdeleted file mode 100644 index 01ba82d28..000000000 --- a/graphics/decorations/decor_breakable_door.png +++ /dev/null diff --git a/graphics/decorations/decor_brick_desk.png b/graphics/decorations/decor_brick_desk.png Binary files differdeleted file mode 100644 index 829e45349..000000000 --- a/graphics/decorations/decor_brick_desk.png +++ /dev/null diff --git a/graphics/decorations/decor_camp_desk.png b/graphics/decorations/decor_camp_desk.png Binary files differdeleted file mode 100644 index b40429229..000000000 --- a/graphics/decorations/decor_camp_desk.png +++ /dev/null diff --git a/graphics/decorations/decor_charizard_doll.png b/graphics/decorations/decor_charizard_doll.png Binary files differdeleted file mode 100644 index ffc3dfcef..000000000 --- a/graphics/decorations/decor_charizard_doll.png +++ /dev/null diff --git a/graphics/decorations/decor_colorful_plant.png b/graphics/decorations/decor_colorful_plant.png Binary files differdeleted file mode 100644 index cc0efecc7..000000000 --- a/graphics/decorations/decor_colorful_plant.png +++ /dev/null diff --git a/graphics/decorations/decor_comfort_desk.png b/graphics/decorations/decor_comfort_desk.png Binary files differdeleted file mode 100644 index e7a72ff08..000000000 --- a/graphics/decorations/decor_comfort_desk.png +++ /dev/null diff --git a/graphics/decorations/decor_fire_blast_mat.png b/graphics/decorations/decor_fire_blast_mat.png Binary files differdeleted file mode 100644 index 510675ee6..000000000 --- a/graphics/decorations/decor_fire_blast_mat.png +++ /dev/null diff --git a/graphics/decorations/decor_fissure_mat.png b/graphics/decorations/decor_fissure_mat.png Binary files differdeleted file mode 100644 index 6de66ef9d..000000000 --- a/graphics/decorations/decor_fissure_mat.png +++ /dev/null diff --git a/graphics/decorations/decor_glass_ornament.png b/graphics/decorations/decor_glass_ornament.png Binary files differdeleted file mode 100644 index fcc895eb9..000000000 --- a/graphics/decorations/decor_glass_ornament.png +++ /dev/null diff --git a/graphics/decorations/decor_gorgeous_plant.png b/graphics/decorations/decor_gorgeous_plant.png Binary files differdeleted file mode 100644 index dc8639c65..000000000 --- a/graphics/decorations/decor_gorgeous_plant.png +++ /dev/null diff --git a/graphics/decorations/decor_hard_desk.png b/graphics/decorations/decor_hard_desk.png Binary files differdeleted file mode 100644 index aa0c7feea..000000000 --- a/graphics/decorations/decor_hard_desk.png +++ /dev/null diff --git a/graphics/decorations/decor_heavy_desk.png b/graphics/decorations/decor_heavy_desk.png Binary files differdeleted file mode 100644 index 141bcd831..000000000 --- a/graphics/decorations/decor_heavy_desk.png +++ /dev/null diff --git a/graphics/decorations/decor_lapras_doll.png b/graphics/decorations/decor_lapras_doll.png Binary files differdeleted file mode 100644 index 517553a4a..000000000 --- a/graphics/decorations/decor_lapras_doll.png +++ /dev/null diff --git a/graphics/decorations/decor_powder_snow_mat.png b/graphics/decorations/decor_powder_snow_mat.png Binary files differdeleted file mode 100644 index 82dbbfa66..000000000 --- a/graphics/decorations/decor_powder_snow_mat.png +++ /dev/null diff --git a/graphics/decorations/decor_pretty_desk.png b/graphics/decorations/decor_pretty_desk.png Binary files differdeleted file mode 100644 index 5be05ebcb..000000000 --- a/graphics/decorations/decor_pretty_desk.png +++ /dev/null diff --git a/graphics/decorations/decor_pretty_flowers.png b/graphics/decorations/decor_pretty_flowers.png Binary files differdeleted file mode 100644 index b9fc0f5de..000000000 --- a/graphics/decorations/decor_pretty_flowers.png +++ /dev/null diff --git a/graphics/decorations/decor_ragged_desk.png b/graphics/decorations/decor_ragged_desk.png Binary files differdeleted file mode 100644 index 953c1862f..000000000 --- a/graphics/decorations/decor_ragged_desk.png +++ /dev/null diff --git a/graphics/decorations/decor_red_brick.png b/graphics/decorations/decor_red_brick.png Binary files differdeleted file mode 100644 index 3481044dd..000000000 --- a/graphics/decorations/decor_red_brick.png +++ /dev/null diff --git a/graphics/decorations/decor_red_plant.png b/graphics/decorations/decor_red_plant.png Binary files differdeleted file mode 100644 index c12e656f7..000000000 --- a/graphics/decorations/decor_red_plant.png +++ /dev/null diff --git a/graphics/decorations/decor_red_tent.png b/graphics/decorations/decor_red_tent.png Binary files differdeleted file mode 100644 index 22e435691..000000000 --- a/graphics/decorations/decor_red_tent.png +++ /dev/null diff --git a/graphics/decorations/decor_regice_doll.png b/graphics/decorations/decor_regice_doll.png Binary files differdeleted file mode 100644 index 88a28df6d..000000000 --- a/graphics/decorations/decor_regice_doll.png +++ /dev/null diff --git a/graphics/decorations/decor_regirock_doll.png b/graphics/decorations/decor_regirock_doll.png Binary files differdeleted file mode 100644 index 16372281c..000000000 --- a/graphics/decorations/decor_regirock_doll.png +++ /dev/null diff --git a/graphics/decorations/decor_registeel_doll.png b/graphics/decorations/decor_registeel_doll.png Binary files differdeleted file mode 100644 index f06de37ab..000000000 --- a/graphics/decorations/decor_registeel_doll.png +++ /dev/null diff --git a/graphics/decorations/decor_rhydon_doll.png b/graphics/decorations/decor_rhydon_doll.png Binary files differdeleted file mode 100644 index ac4714c35..000000000 --- a/graphics/decorations/decor_rhydon_doll.png +++ /dev/null diff --git a/graphics/decorations/decor_sand_ornament.png b/graphics/decorations/decor_sand_ornament.png Binary files differdeleted file mode 100644 index 9eafc8644..000000000 --- a/graphics/decorations/decor_sand_ornament.png +++ /dev/null diff --git a/graphics/decorations/decor_slide.png b/graphics/decorations/decor_slide.png Binary files differdeleted file mode 100644 index 8a5dbada5..000000000 --- a/graphics/decorations/decor_slide.png +++ /dev/null diff --git a/graphics/decorations/decor_snorlax_doll.png b/graphics/decorations/decor_snorlax_doll.png Binary files differdeleted file mode 100644 index 6ff891c13..000000000 --- a/graphics/decorations/decor_snorlax_doll.png +++ /dev/null diff --git a/graphics/decorations/decor_solid_board.png b/graphics/decorations/decor_solid_board.png Binary files differdeleted file mode 100644 index d0251d847..000000000 --- a/graphics/decorations/decor_solid_board.png +++ /dev/null diff --git a/graphics/decorations/decor_spikes_mat.png b/graphics/decorations/decor_spikes_mat.png Binary files differdeleted file mode 100644 index 67f023a0a..000000000 --- a/graphics/decorations/decor_spikes_mat.png +++ /dev/null diff --git a/graphics/decorations/decor_stand.png b/graphics/decorations/decor_stand.png Binary files differdeleted file mode 100644 index 86b1e4d1f..000000000 --- a/graphics/decorations/decor_stand.png +++ /dev/null diff --git a/graphics/decorations/decor_surf_mat.png b/graphics/decorations/decor_surf_mat.png Binary files differdeleted file mode 100644 index d74cb97bb..000000000 --- a/graphics/decorations/decor_surf_mat.png +++ /dev/null diff --git a/graphics/decorations/decor_thunder_mat.png b/graphics/decorations/decor_thunder_mat.png Binary files differdeleted file mode 100644 index 1c5c56e33..000000000 --- a/graphics/decorations/decor_thunder_mat.png +++ /dev/null diff --git a/graphics/decorations/decor_tire.png b/graphics/decorations/decor_tire.png Binary files differdeleted file mode 100644 index e394ebbd4..000000000 --- a/graphics/decorations/decor_tire.png +++ /dev/null diff --git a/graphics/decorations/decor_tropical_plant.png b/graphics/decorations/decor_tropical_plant.png Binary files differdeleted file mode 100644 index 12e43df47..000000000 --- a/graphics/decorations/decor_tropical_plant.png +++ /dev/null diff --git a/graphics/decorations/decor_venusaur_doll.png b/graphics/decorations/decor_venusaur_doll.png Binary files differdeleted file mode 100644 index 57fbdd93a..000000000 --- a/graphics/decorations/decor_venusaur_doll.png +++ /dev/null diff --git a/graphics/decorations/decor_wailmer_doll.png b/graphics/decorations/decor_wailmer_doll.png Binary files differdeleted file mode 100644 index ceedfa6fb..000000000 --- a/graphics/decorations/decor_wailmer_doll.png +++ /dev/null diff --git a/graphics/decorations/decor_yellow_brick.png b/graphics/decorations/decor_yellow_brick.png Binary files differdeleted file mode 100644 index cb865760c..000000000 --- a/graphics/decorations/decor_yellow_brick.png +++ /dev/null diff --git a/graphics/decorations/fire_blast_mat.png b/graphics/decorations/fire_blast_mat.png Binary files differnew file mode 100644 index 000000000..df6c2bfe0 --- /dev/null +++ b/graphics/decorations/fire_blast_mat.png diff --git a/graphics/decorations/fissure_mat.png b/graphics/decorations/fissure_mat.png Binary files differnew file mode 100644 index 000000000..1a0212487 --- /dev/null +++ b/graphics/decorations/fissure_mat.png diff --git a/graphics/decorations/glass_ornament.png b/graphics/decorations/glass_ornament.png Binary files differnew file mode 100644 index 000000000..c85ae769b --- /dev/null +++ b/graphics/decorations/glass_ornament.png diff --git a/graphics/decorations/gorgeous_plant.png b/graphics/decorations/gorgeous_plant.png Binary files differnew file mode 100644 index 000000000..ed8947ebd --- /dev/null +++ b/graphics/decorations/gorgeous_plant.png diff --git a/graphics/decorations/hard_desk.png b/graphics/decorations/hard_desk.png Binary files differnew file mode 100644 index 000000000..b85b098f9 --- /dev/null +++ b/graphics/decorations/hard_desk.png diff --git a/graphics/decorations/heavy_desk.png b/graphics/decorations/heavy_desk.png Binary files differnew file mode 100644 index 000000000..3e9e74683 --- /dev/null +++ b/graphics/decorations/heavy_desk.png diff --git a/graphics/decorations/lapras_doll.png b/graphics/decorations/lapras_doll.png Binary files differnew file mode 100644 index 000000000..8a98a6cf4 --- /dev/null +++ b/graphics/decorations/lapras_doll.png diff --git a/graphics/decorations/powder_snow_mat.png b/graphics/decorations/powder_snow_mat.png Binary files differnew file mode 100644 index 000000000..22be19f9d --- /dev/null +++ b/graphics/decorations/powder_snow_mat.png diff --git a/graphics/decorations/pretty_desk.png b/graphics/decorations/pretty_desk.png Binary files differnew file mode 100644 index 000000000..69d439cfe --- /dev/null +++ b/graphics/decorations/pretty_desk.png diff --git a/graphics/decorations/pretty_flowers.png b/graphics/decorations/pretty_flowers.png Binary files differnew file mode 100644 index 000000000..6b7b8565f --- /dev/null +++ b/graphics/decorations/pretty_flowers.png diff --git a/graphics/decorations/ragged_desk.png b/graphics/decorations/ragged_desk.png Binary files differnew file mode 100644 index 000000000..1bb800267 --- /dev/null +++ b/graphics/decorations/ragged_desk.png diff --git a/graphics/decorations/red_brick.png b/graphics/decorations/red_brick.png Binary files differnew file mode 100644 index 000000000..249ad8f7a --- /dev/null +++ b/graphics/decorations/red_brick.png diff --git a/graphics/decorations/red_plant.png b/graphics/decorations/red_plant.png Binary files differnew file mode 100644 index 000000000..7f3792c97 --- /dev/null +++ b/graphics/decorations/red_plant.png diff --git a/graphics/decorations/red_tent.png b/graphics/decorations/red_tent.png Binary files differnew file mode 100644 index 000000000..a70d9bc0a --- /dev/null +++ b/graphics/decorations/red_tent.png diff --git a/graphics/decorations/regice_doll.png b/graphics/decorations/regice_doll.png Binary files differnew file mode 100644 index 000000000..e7c118659 --- /dev/null +++ b/graphics/decorations/regice_doll.png diff --git a/graphics/decorations/regirock_doll.png b/graphics/decorations/regirock_doll.png Binary files differnew file mode 100644 index 000000000..6bf520573 --- /dev/null +++ b/graphics/decorations/regirock_doll.png diff --git a/graphics/decorations/registeel_doll.png b/graphics/decorations/registeel_doll.png Binary files differnew file mode 100644 index 000000000..bfe01d75c --- /dev/null +++ b/graphics/decorations/registeel_doll.png diff --git a/graphics/decorations/rhydon_doll.png b/graphics/decorations/rhydon_doll.png Binary files differnew file mode 100644 index 000000000..2937d372f --- /dev/null +++ b/graphics/decorations/rhydon_doll.png diff --git a/graphics/decorations/sand_ornament.png b/graphics/decorations/sand_ornament.png Binary files differnew file mode 100644 index 000000000..d94673c96 --- /dev/null +++ b/graphics/decorations/sand_ornament.png diff --git a/graphics/decorations/slide.png b/graphics/decorations/slide.png Binary files differnew file mode 100644 index 000000000..ebfc24cad --- /dev/null +++ b/graphics/decorations/slide.png diff --git a/graphics/decorations/snorlax_doll.png b/graphics/decorations/snorlax_doll.png Binary files differnew file mode 100644 index 000000000..48f9248ac --- /dev/null +++ b/graphics/decorations/snorlax_doll.png diff --git a/graphics/decorations/solid_board.png b/graphics/decorations/solid_board.png Binary files differnew file mode 100644 index 000000000..1eef712e2 --- /dev/null +++ b/graphics/decorations/solid_board.png diff --git a/graphics/decorations/spikes_mat.png b/graphics/decorations/spikes_mat.png Binary files differnew file mode 100644 index 000000000..a69b003e7 --- /dev/null +++ b/graphics/decorations/spikes_mat.png diff --git a/graphics/decorations/stand.png b/graphics/decorations/stand.png Binary files differnew file mode 100644 index 000000000..09e4d26bd --- /dev/null +++ b/graphics/decorations/stand.png diff --git a/graphics/decorations/surf_mat.png b/graphics/decorations/surf_mat.png Binary files differnew file mode 100644 index 000000000..f85498e66 --- /dev/null +++ b/graphics/decorations/surf_mat.png diff --git a/graphics/decorations/thunder_mat.png b/graphics/decorations/thunder_mat.png Binary files differnew file mode 100644 index 000000000..82a1787f6 --- /dev/null +++ b/graphics/decorations/thunder_mat.png diff --git a/graphics/decorations/tire.png b/graphics/decorations/tire.png Binary files differnew file mode 100644 index 000000000..562532356 --- /dev/null +++ b/graphics/decorations/tire.png diff --git a/graphics/decorations/tropical_plant.png b/graphics/decorations/tropical_plant.png Binary files differnew file mode 100644 index 000000000..f674d6418 --- /dev/null +++ b/graphics/decorations/tropical_plant.png diff --git a/graphics/decorations/venusaur_doll.png b/graphics/decorations/venusaur_doll.png Binary files differnew file mode 100644 index 000000000..ca6bbea76 --- /dev/null +++ b/graphics/decorations/venusaur_doll.png diff --git a/graphics/decorations/wailmer_doll.png b/graphics/decorations/wailmer_doll.png Binary files differnew file mode 100644 index 000000000..b5d723bc8 --- /dev/null +++ b/graphics/decorations/wailmer_doll.png diff --git a/graphics/decorations/yellow_brick.png b/graphics/decorations/yellow_brick.png Binary files differnew file mode 100644 index 000000000..33b41be22 --- /dev/null +++ b/graphics/decorations/yellow_brick.png 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 diff --git a/src/data/decoration/tiles.h b/src/data/decoration/tiles.h index f11520511..de5c43575 100644 --- a/src/data/decoration/tiles.h +++ b/src/data/decoration/tiles.h @@ -1,463 +1,465 @@ +#define DECOR_TILE(name) (METATILE_SecretBase_##name - 0x200) + const u16 DecorGfx_SMALL_DESK[] = { - 0x87 + DECOR_TILE(SmallDesk) }; const u16 DecorGfx_POKEMON_DESK[] = { - 0x8F + DECOR_TILE(PokemonDesk) }; const u16 DecorGfx_HEAVY_DESK[] = { - 0x90, - 0x91, - 0x92, - 0x98, - 0x99, - 0x9A + DECOR_TILE(HeavyDesk_TopLeft), + DECOR_TILE(HeavyDesk_TopMid), + DECOR_TILE(HeavyDesk_TopRight), + DECOR_TILE(HeavyDesk_BottomLeft), + DECOR_TILE(HeavyDesk_BottomMid), + DECOR_TILE(HeavyDesk_BottomRight) }; const u16 DecorGfx_RAGGED_DESK[] = { - 0x93, - 0x94, - 0x95, - 0x9B, - 0x9C, - 0x9D + DECOR_TILE(RaggedDesk_TopLeft), + DECOR_TILE(RaggedDesk_TopMid), + DECOR_TILE(RaggedDesk_TopRight), + DECOR_TILE(RaggedDesk_BottomLeft), + DECOR_TILE(RaggedDesk_BottomMid), + DECOR_TILE(RaggedDesk_BottomRight) }; const u16 DecorGfx_COMFORT_DESK[] = { - 0x96, - 0x97, - 0xA3, - 0x9E, - 0x9F, - 0xAB + DECOR_TILE(ComfortDesk_TopLeft), + DECOR_TILE(ComfortDesk_TopMid), + DECOR_TILE(ComfortDesk_TopRight), + DECOR_TILE(ComfortDesk_BottomLeft), + DECOR_TILE(ComfortDesk_BottomMid), + DECOR_TILE(ComfortDesk_BottomRight) }; const u16 DecorGfx_PRETTY_DESK[] = { - 0xBD, - 0xBE, - 0xBF, - 0xC5, - 0xC6, - 0xC7, - 0xCD, - 0xCE, - 0xCF + DECOR_TILE(PrettyDesk_TopLeft), + DECOR_TILE(PrettyDesk_TopMid), + DECOR_TILE(PrettyDesk_TopRight), + DECOR_TILE(PrettyDesk_MidLeft), + DECOR_TILE(PrettyDesk_Center), + DECOR_TILE(PrettyDesk_MidRight), + DECOR_TILE(PrettyDesk_BottomLeft), + DECOR_TILE(PrettyDesk_BottomMid), + DECOR_TILE(PrettyDesk_BottomRight) }; const u16 DecorGfx_BRICK_DESK[] = { - 0xA0, - 0xA1, - 0xA2, - 0xA8, - 0xA9, - 0xAA, - 0xB0, - 0xB1, - 0xB2 + DECOR_TILE(BrickDesk_TopLeft), + DECOR_TILE(BrickDesk_TopMid), + DECOR_TILE(BrickDesk_TopRight), + DECOR_TILE(BrickDesk_MidLeft), + DECOR_TILE(BrickDesk_Center), + DECOR_TILE(BrickDesk_MidRight), + DECOR_TILE(BrickDesk_BottomLeft), + DECOR_TILE(BrickDesk_BottomMid), + DECOR_TILE(BrickDesk_BottomRight) }; const u16 DecorGfx_CAMP_DESK[] = { - 0xA4, - 0xA5, - 0xA6, - 0xAC, - 0xAD, - 0xAE, - 0xB4, - 0xB5, - 0xB6 + DECOR_TILE(CampDesk_TopLeft), + DECOR_TILE(CampDesk_TopMid), + DECOR_TILE(CampDesk_TopRight), + DECOR_TILE(CampDesk_MidLeft), + DECOR_TILE(CampDesk_Center), + DECOR_TILE(CampDesk_MidRight), + DECOR_TILE(CampDesk_BottomLeft), + DECOR_TILE(CampDesk_BottomMid), + DECOR_TILE(CampDesk_BottomRight) }; const u16 DecorGfx_HARD_DESK[] = { - 0xA7, - 0xBB, - 0xBC, - 0xAF, - 0xC3, - 0xC4, - 0xB7, - 0xCB, - 0xCC + DECOR_TILE(HardDesk_TopLeft), + DECOR_TILE(HardDesk_TopMid), + DECOR_TILE(HardDesk_TopRight), + DECOR_TILE(HardDesk_MidLeft), + DECOR_TILE(HardDesk_Center), + DECOR_TILE(HardDesk_MidRight), + DECOR_TILE(HardDesk_BottomLeft), + DECOR_TILE(HardDesk_BottomMid), + DECOR_TILE(HardDesk_BottomRight) }; const u16 DecorGfx_SMALL_CHAIR[] = { - 0xB8 + DECOR_TILE(SmallChair) }; const u16 DecorGfx_POKEMON_CHAIR[] = { - 0xB9 + DECOR_TILE(PokemonChair) }; const u16 DecorGfx_HEAVY_CHAIR[] = { - 0xBA + DECOR_TILE(HeavyChair) }; const u16 DecorGfx_PRETTY_CHAIR[] = { - 0xC0 + DECOR_TILE(PrettyChair) }; const u16 DecorGfx_COMFORT_CHAIR[] = { - 0xC1 + DECOR_TILE(ComfortChair) }; const u16 DecorGfx_RAGGED_CHAIR[] = { - 0xC2 + DECOR_TILE(RaggedChair) }; const u16 DecorGfx_BRICK_CHAIR[] = { - 0xC8 + DECOR_TILE(BrickChair) }; const u16 DecorGfx_CAMP_CHAIR[] = { - 0xC9 + DECOR_TILE(CampChair) }; const u16 DecorGfx_HARD_CHAIR[] = { - 0xCA + DECOR_TILE(HardChair) }; const u16 DecorGfx_RED_PLANT[] = { - 0xD0, - 0xD8 + DECOR_TILE(RedPlant_Top), + DECOR_TILE(RedPlant_Base1) }; const u16 DecorGfx_TROPICAL_PLANT[] = { - 0xD2, - 0xDA + DECOR_TILE(TropicalPlant_Top), + DECOR_TILE(TropicalPlant_Base1) }; const u16 DecorGfx_PRETTY_FLOWERS[] = { - 0xD4, - 0xDC + DECOR_TILE(PrettyFlowers_Top), + DECOR_TILE(PrettyFlowers_Base1) }; const u16 DecorGfx_COLORFUL_PLANT[] = { - 0xE0, - 0xE2, - 0xE8, - 0xE9 + DECOR_TILE(ColorfulPlant_TopLeft), + DECOR_TILE(ColorfulPlant_TopRight), + DECOR_TILE(ColorfulPlant_BaseLeft1), + DECOR_TILE(ColorfulPlant_BaseRight1) }; const u16 DecorGfx_BIG_PLANT[] = { - 0xE4, - 0xE6, - 0xEC, - 0xED + DECOR_TILE(BigPlant_TopLeft), + DECOR_TILE(BigPlant_TopRight), + DECOR_TILE(BigPlant_BaseLeft1), + DECOR_TILE(BigPlant_BaseRight1) }; const u16 DecorGfx_GORGEOUS_PLANT[] = { - 0xF0, - 0xF2, - 0xF8, - 0xF9 + DECOR_TILE(GorgeousPlant_TopLeft), + DECOR_TILE(GorgeousPlant_TopRight), + DECOR_TILE(GorgeousPlant_BaseLeft1), + DECOR_TILE(GorgeousPlant_BaseRight1) }; const u16 DecorGfx_RED_BRICK[] = { - 0x25, - 0x2D + DECOR_TILE(RedBrick_Top), + DECOR_TILE(RedBrick_Bottom) }; const u16 DecorGfx_YELLOW_BRICK[] = { - 0x26, - 0x2E + DECOR_TILE(YellowBrick_Top), + DECOR_TILE(YellowBrick_Bottom) }; const u16 DecorGfx_BLUE_BRICK[] = { - 0x27, - 0x2F + DECOR_TILE(BlueBrick_Top), + DECOR_TILE(BlueBrick_Bottom) }; const u16 DecorGfx_RED_BALLOON[] = { - 0x138 + DECOR_TILE(RedBalloon) }; const u16 DecorGfx_BLUE_BALLOON[] = { - 0x13C + DECOR_TILE(BlueBalloon) }; const u16 DecorGfx_YELLOW_BALLOON[] = { - 0x140 + DECOR_TILE(YellowBalloon) }; const u16 DecorGfx_RED_TENT[] = { - 0x30, - 0x31, - 0x32, - 0x38, - 0x39, - 0x3A, - 0x40, - 0x41, - 0x3B + DECOR_TILE(RedTent_TopLeft), + DECOR_TILE(RedTent_TopMid), + DECOR_TILE(RedTent_TopRight), + DECOR_TILE(RedTent_MidLeft), + DECOR_TILE(RedTent_DoorTop), + DECOR_TILE(RedTent_MidRight), + DECOR_TILE(RedTent_BottomLeft), + DECOR_TILE(RedTent_Door), + DECOR_TILE(RedTent_BottomRight) }; const u16 DecorGfx_BLUE_TENT[] = { - 0x48, - 0x49, - 0x68, - 0x50, - 0x51, - 0x70, - 0x58, - 0x59, - 0x69 + DECOR_TILE(BlueTent_TopLeft), + DECOR_TILE(BlueTent_TopMid), + DECOR_TILE(BlueTent_TopRight), + DECOR_TILE(BlueTent_MidLeft), + DECOR_TILE(BlueTent_DoorTop), + DECOR_TILE(BlueTent_MidRight), + DECOR_TILE(BlueTent_BottomLeft), + DECOR_TILE(BlueTent_Door), + DECOR_TILE(BlueTent_BottomRight) }; const u16 DecorGfx_SOLID_BOARD[] = { - 0x34, - 0x3C + DECOR_TILE(SolidBoard_Top), + DECOR_TILE(SolidBoard_Bottom) }; const u16 DecorGfx_SLIDE[] = { - 0x35, - 0x36, - 0x3D, - 0x3E, - 0x63, - 0x64, - 0x6F, - 0x77 + DECOR_TILE(Slide_TopLeft), + DECOR_TILE(Slide_TopRight), + DECOR_TILE(Slide_StairLanding), + DECOR_TILE(Slide_SlideTop), + DECOR_TILE(Slide_Stairs), + DECOR_TILE(Slide_SlideBottom), + DECOR_TILE(Slide_MatLeft), + DECOR_TILE(Slide_MatRight) }; const u16 DecorGfx_FENCE_LENGTH[] = { - 0x33 + DECOR_TILE(Fence_Vertical) }; const u16 DecorGfx_FENCE_WIDTH[] = { - 0x2C + DECOR_TILE(Fence_Horizontal) }; const u16 DecorGfx_TIRE[] = { - 0x80, - 0x81, - 0x88, - 0x89 + DECOR_TILE(Tire_TopLeft), + DECOR_TILE(Tire_TopRight), + DECOR_TILE(Tire_BottomLeft), + DECOR_TILE(Tire_BottomRight) }; const u16 DecorGfx_STAND[] = { - 0x6A, - 0x6B, - 0x6C, - 0x6D, - 0x72, - 0x73, - 0x74, - 0x75 + DECOR_TILE(Stand_CornerLeft), + DECOR_TILE(Stand_MidLeft), + DECOR_TILE(Stand_MidRight), + DECOR_TILE(Stand_CornerRight), + DECOR_TILE(Stand_StairsLeft), + DECOR_TILE(Stand_BaseLeft), + DECOR_TILE(Stand_BaseRight), + DECOR_TILE(Stand_StairsRight) }; const u16 DecorGfx_MUD_BALL[] = { - 0x28 + DECOR_TILE(MudBall) }; const u16 DecorGfx_BREAKABLE_DOOR[] = { - 0x37, - 0x3F + DECOR_TILE(BreakableDoor_TopClosed), + DECOR_TILE(BreakableDoor_BottomClosed) }; const u16 DecorGfx_SAND_ORNAMENT[] = { - 0x85, - 0x8D + DECOR_TILE(SandOrnament_Top), + DECOR_TILE(SandOrnament_Base1) }; const u16 DecorGfx_SILVER_SHIELD[] = { - 0xD6, - 0xDE + DECOR_TILE(SilverShield_Top), + DECOR_TILE(SilverShield_Base1) }; const u16 DecorGfx_GOLD_SHIELD[] = { - 0x12E, - 0x136 + DECOR_TILE(GoldShield_Top), + DECOR_TILE(GoldShield_Base1) }; const u16 DecorGfx_GLASS_ORNAMENT[] = { - 0x82, - 0x8A + DECOR_TILE(GlassOrnament_Top), + DECOR_TILE(GlassOrnament_Base1) }; const u16 DecorGfx_TV[] = { - 0xF4 + DECOR_TILE(TV) }; const u16 DecorGfx_ROUND_TV[] = { - 0xF5 + DECOR_TILE(RoundTV) }; const u16 DecorGfx_CUTE_TV[] = { - 0xF6 + DECOR_TILE(CuteTV) }; const u16 DecorGfx_GLITTER_MAT[] = { - 0x60 + DECOR_TILE(GlitterMat) }; const u16 DecorGfx_JUMP_MAT[] = { - 0x61 + DECOR_TILE(JumpMat) }; const u16 DecorGfx_SPIN_MAT[] = { - 0x62 + DECOR_TILE(SpinMat) }; const u16 DecorGfx_C_LOW_NOTE_MAT[] = { - 0x78 + DECOR_TILE(NoteMat_C_Low) }; const u16 DecorGfx_D_NOTE_MAT[] = { - 0x79 + DECOR_TILE(NoteMat_D) }; const u16 DecorGfx_E_NOTE_MAT[] = { - 0x7A + DECOR_TILE(NoteMat_E) }; const u16 DecorGfx_F_NOTE_MAT[] = { - 0x7B + DECOR_TILE(NoteMat_F) }; const u16 DecorGfx_G_NOTE_MAT[] = { - 0x7C + DECOR_TILE(NoteMat_G) }; const u16 DecorGfx_A_NOTE_MAT[] = { - 0x7D + DECOR_TILE(NoteMat_A) }; const u16 DecorGfx_B_NOTE_MAT[] = { - 0x7E + DECOR_TILE(NoteMat_B) }; const u16 DecorGfx_C_HIGH_NOTE_MAT[] = { - 0xB3 + DECOR_TILE(NoteMat_C_High) }; const u16 DecorGfx_SURF_MAT[] = { - 0x42, - 0x43, - 0x44, - 0x4A, - 0x4B, - 0x4C, - 0x52, - 0x53, - 0x54 + DECOR_TILE(SurfMat_TopLeft), + DECOR_TILE(SurfMat_TopMid), + DECOR_TILE(SurfMat_TopRight), + DECOR_TILE(SurfMat_MidLeft), + DECOR_TILE(SurfMat_Center), + DECOR_TILE(SurfMat_MidRight), + DECOR_TILE(SurfMat_BottomLeft), + DECOR_TILE(SurfMat_BottomMid), + DECOR_TILE(SurfMat_BottomRight) }; const u16 DecorGfx_THUNDER_MAT[] = { - 0x45, - 0x46, - 0x47, - 0x4D, - 0x4E, - 0x4F, - 0x55, - 0x56, - 0x57 + DECOR_TILE(ThunderMat_TopLeft), + DECOR_TILE(ThunderMat_TopMid), + DECOR_TILE(ThunderMat_TopRight), + DECOR_TILE(ThunderMat_MidLeft), + DECOR_TILE(ThunderMat_Center), + DECOR_TILE(ThunderMat_MidRight), + DECOR_TILE(ThunderMat_BottomLeft), + DECOR_TILE(ThunderMat_BottomMid), + DECOR_TILE(ThunderMat_BottomRight) }; const u16 DecorGfx_FIRE_BLAST_MAT[] = { - 0x5A, - 0x5B, - 0x5C, - 0x5D, - 0x5E, - 0x5F, - 0x65, - 0x66, - 0x67 + DECOR_TILE(FireBlastMat_TopLeft), + DECOR_TILE(FireBlastMat_TopMid), + DECOR_TILE(FireBlastMat_TopRight), + DECOR_TILE(FireBlastMat_MidLeft), + DECOR_TILE(FireBlastMat_Center), + DECOR_TILE(FireBlastMat_MidRight), + DECOR_TILE(FireBlastMat_BottomLeft), + DECOR_TILE(FireBlastMat_BottomMid), + DECOR_TILE(FireBlastMat_BottomRight) }; const u16 DecorGfx_POWDER_SNOW_MAT[] = { - 0x100, - 0x101, - 0x102, - 0x108, - 0x109, - 0x10A, - 0x110, - 0x111, - 0x112 + DECOR_TILE(PowderSnowMat_TopLeft), + DECOR_TILE(PowderSnowMat_TopMid), + DECOR_TILE(PowderSnowMat_TopRight), + DECOR_TILE(PowderSnowMat_MidLeft), + DECOR_TILE(PowderSnowMat_Center), + DECOR_TILE(PowderSnowMat_MidRight), + DECOR_TILE(PowderSnowMat_BottomLeft), + DECOR_TILE(PowderSnowMat_BottomMid), + DECOR_TILE(PowderSnowMat_BottomRight) }; const u16 DecorGfx_ATTRACT_MAT[] = { - 0x103, - 0x104, - 0x105, - 0x10B, - 0x10C, - 0x10D, - 0x113, - 0x114, - 0x115 + DECOR_TILE(AttractMat_TopLeft), + DECOR_TILE(AttractMat_TopMid), + DECOR_TILE(AttractMat_TopRight), + DECOR_TILE(AttractMat_MidLeft), + DECOR_TILE(AttractMat_Center), + DECOR_TILE(AttractMat_MidRight), + DECOR_TILE(AttractMat_BottomLeft), + DECOR_TILE(AttractMat_BottomMid), + DECOR_TILE(AttractMat_BottomRight) }; const u16 DecorGfx_FISSURE_MAT[] = { - 0x106, - 0x107, - 0x118, - 0x10E, - 0x10F, - 0x120, - 0x116, - 0x117, - 0x128 + DECOR_TILE(FissureMat_TopLeft), + DECOR_TILE(FissureMat_TopMid), + DECOR_TILE(FissureMat_TopRight), + DECOR_TILE(FissureMat_MidLeft), + DECOR_TILE(FissureMat_Center), + DECOR_TILE(FissureMat_MidRight), + DECOR_TILE(FissureMat_BottomLeft), + DECOR_TILE(FissureMat_BottomMid), + DECOR_TILE(FissureMat_BottomRight) }; const u16 DecorGfx_SPIKES_MAT[] = { - 0x119, - 0x11A, - 0x11B, - 0x121, - 0x122, - 0x123, - 0x129, - 0x12A, - 0x12B + DECOR_TILE(SpikesMat_TopLeft), + DECOR_TILE(SpikesMat_TopMid), + DECOR_TILE(SpikesMat_TopRight), + DECOR_TILE(SpikesMat_MidLeft), + DECOR_TILE(SpikesMat_Center), + DECOR_TILE(SpikesMat_MidRight), + DECOR_TILE(SpikesMat_BottomLeft), + DECOR_TILE(SpikesMat_BottomMid), + DECOR_TILE(SpikesMat_BottomRight) }; const u16 DecorGfx_BALL_POSTER[] = { - 0x130 + DECOR_TILE(BallPoster) }; const u16 DecorGfx_GREEN_POSTER[] = { - 0x131 + DECOR_TILE(GreenPoster) }; const u16 DecorGfx_RED_POSTER[] = { - 0x132 + DECOR_TILE(RedPoster) }; const u16 DecorGfx_BLUE_POSTER[] = { - 0x133 + DECOR_TILE(BluePoster) }; const u16 DecorGfx_CUTE_POSTER[] = { - 0x134 + DECOR_TILE(CutePoster) }; const u16 DecorGfx_PIKA_POSTER[] = { - 0x11C, - 0x11D + DECOR_TILE(PikaPoster_Left), + DECOR_TILE(PikaPoster_Right) }; const u16 DecorGfx_LONG_POSTER[] = { - 0x11E, - 0x11F + DECOR_TILE(LongPoster_Left), + DECOR_TILE(LongPoster_Right) }; const u16 DecorGfx_SEA_POSTER[] = { - 0x124, - 0x125 + DECOR_TILE(SeaPoster_Left), + DECOR_TILE(SeaPoster_Right) }; const u16 DecorGfx_SKY_POSTER[] = { - 0x126, - 0x127 + DECOR_TILE(SkyPoster_Left), + DECOR_TILE(SkyPoster_Right) }; const u16 DecorGfx_KISS_POSTER[] = { - 0x12C, - 0x12D + DECOR_TILE(KissPoster_Left), + DECOR_TILE(KissPoster_Right) }; const u16 DecorGfx_PICHU_DOLL[] = { diff --git a/src/data/graphics/decorations.h b/src/data/graphics/decorations.h index d8b865fcf..b18c87348 100644 --- a/src/data/graphics/decorations.h +++ b/src/data/graphics/decorations.h @@ -1,125 +1,125 @@ -const u32 gDecorIcon_HeavyDesk[] = INCBIN_U32("graphics/decorations/decor_heavy_desk.4bpp.lz"); -const u32 gDecorIconPalette_HeavyDesk[] = INCBIN_U32("graphics/decorations/decor_heavy_desk.gbapal.lz"); +const u32 gDecorIcon_HeavyDesk[] = INCBIN_U32("graphics/decorations/heavy_desk.4bpp.lz"); +const u32 gDecorIconPalette_HeavyDesk[] = INCBIN_U32("graphics/decorations/heavy_desk.gbapal.lz"); -const u32 gDecorIcon_RaggedDesk[] = INCBIN_U32("graphics/decorations/decor_ragged_desk.4bpp.lz"); -const u32 gDecorIconPalette_RaggedDesk[] = INCBIN_U32("graphics/decorations/decor_ragged_desk.gbapal.lz"); +const u32 gDecorIcon_RaggedDesk[] = INCBIN_U32("graphics/decorations/ragged_desk.4bpp.lz"); +const u32 gDecorIconPalette_RaggedDesk[] = INCBIN_U32("graphics/decorations/ragged_desk.gbapal.lz"); -const u32 gDecorIcon_ComfortDesk[] = INCBIN_U32("graphics/decorations/decor_comfort_desk.4bpp.lz"); -const u32 gDecorIconPalette_ComfortDesk[] = INCBIN_U32("graphics/decorations/decor_comfort_desk.gbapal.lz"); +const u32 gDecorIcon_ComfortDesk[] = INCBIN_U32("graphics/decorations/comfort_desk.4bpp.lz"); +const u32 gDecorIconPalette_ComfortDesk[] = INCBIN_U32("graphics/decorations/comfort_desk.gbapal.lz"); -const u32 gDecorIcon_PrettyDesk[] = INCBIN_U32("graphics/decorations/decor_pretty_desk.4bpp.lz"); -const u32 gDecorIconPalette_PrettyDesk[] = INCBIN_U32("graphics/decorations/decor_pretty_desk.gbapal.lz"); +const u32 gDecorIcon_PrettyDesk[] = INCBIN_U32("graphics/decorations/pretty_desk.4bpp.lz"); +const u32 gDecorIconPalette_PrettyDesk[] = INCBIN_U32("graphics/decorations/pretty_desk.gbapal.lz"); -const u32 gDecorIcon_BrickDesk[] = INCBIN_U32("graphics/decorations/decor_brick_desk.4bpp.lz"); -const u32 gDecorIconPalette_BrickDesk[] = INCBIN_U32("graphics/decorations/decor_brick_desk.gbapal.lz"); +const u32 gDecorIcon_BrickDesk[] = INCBIN_U32("graphics/decorations/brick_desk.4bpp.lz"); +const u32 gDecorIconPalette_BrickDesk[] = INCBIN_U32("graphics/decorations/brick_desk.gbapal.lz"); -const u32 gDecorIcon_CampDesk[] = INCBIN_U32("graphics/decorations/decor_camp_desk.4bpp.lz"); -const u32 gDecorIconPalette_CampDesk[] = INCBIN_U32("graphics/decorations/decor_camp_desk.gbapal.lz"); +const u32 gDecorIcon_CampDesk[] = INCBIN_U32("graphics/decorations/camp_desk.4bpp.lz"); +const u32 gDecorIconPalette_CampDesk[] = INCBIN_U32("graphics/decorations/camp_desk.gbapal.lz"); -const u32 gDecorIcon_HardDesk[] = INCBIN_U32("graphics/decorations/decor_hard_desk.4bpp.lz"); -const u32 gDecorIconPalette_HardDesk[] = INCBIN_U32("graphics/decorations/decor_hard_desk.gbapal.lz"); +const u32 gDecorIcon_HardDesk[] = INCBIN_U32("graphics/decorations/hard_desk.4bpp.lz"); +const u32 gDecorIconPalette_HardDesk[] = INCBIN_U32("graphics/decorations/hard_desk.gbapal.lz"); -const u32 gDecorIcon_RedPlant[] = INCBIN_U32("graphics/decorations/decor_red_plant.4bpp.lz"); -const u32 gDecorIconPalette_RedPlant[] = INCBIN_U32("graphics/decorations/decor_red_plant.gbapal.lz"); +const u32 gDecorIcon_RedPlant[] = INCBIN_U32("graphics/decorations/red_plant.4bpp.lz"); +const u32 gDecorIconPalette_RedPlant[] = INCBIN_U32("graphics/decorations/red_plant.gbapal.lz"); -const u32 gDecorIcon_TropicalPlant[] = INCBIN_U32("graphics/decorations/decor_tropical_plant.4bpp.lz"); -const u32 gDecorIconPalette_TropicalPlant[] = INCBIN_U32("graphics/decorations/decor_tropical_plant.gbapal.lz"); +const u32 gDecorIcon_TropicalPlant[] = INCBIN_U32("graphics/decorations/tropical_plant.4bpp.lz"); +const u32 gDecorIconPalette_TropicalPlant[] = INCBIN_U32("graphics/decorations/tropical_plant.gbapal.lz"); -const u32 gDecorIcon_PrettyFlowers[] = INCBIN_U32("graphics/decorations/decor_pretty_flowers.4bpp.lz"); -const u32 gDecorIconPalette_PrettyFlowers[] = INCBIN_U32("graphics/decorations/decor_pretty_flowers.gbapal.lz"); +const u32 gDecorIcon_PrettyFlowers[] = INCBIN_U32("graphics/decorations/pretty_flowers.4bpp.lz"); +const u32 gDecorIconPalette_PrettyFlowers[] = INCBIN_U32("graphics/decorations/pretty_flowers.gbapal.lz"); -const u32 gDecorIcon_ColorfulPlant[] = INCBIN_U32("graphics/decorations/decor_colorful_plant.4bpp.lz"); -const u32 gDecorIconPalette_ColorfulPlant[] = INCBIN_U32("graphics/decorations/decor_colorful_plant.gbapal.lz"); +const u32 gDecorIcon_ColorfulPlant[] = INCBIN_U32("graphics/decorations/colorful_plant.4bpp.lz"); +const u32 gDecorIconPalette_ColorfulPlant[] = INCBIN_U32("graphics/decorations/colorful_plant.gbapal.lz"); -const u32 gDecorIcon_BigPlant[] = INCBIN_U32("graphics/decorations/decor_big_plant.4bpp.lz"); -const u32 gDecorIconPalette_BigPlant[] = INCBIN_U32("graphics/decorations/decor_big_plant.gbapal.lz"); +const u32 gDecorIcon_BigPlant[] = INCBIN_U32("graphics/decorations/big_plant.4bpp.lz"); +const u32 gDecorIconPalette_BigPlant[] = INCBIN_U32("graphics/decorations/big_plant.gbapal.lz"); -const u32 gDecorIcon_GorgeousPlant[] = INCBIN_U32("graphics/decorations/decor_gorgeous_plant.4bpp.lz"); -const u32 gDecorIconPalette_GorgeousPlant[] = INCBIN_U32("graphics/decorations/decor_gorgeous_plant.gbapal.lz"); +const u32 gDecorIcon_GorgeousPlant[] = INCBIN_U32("graphics/decorations/gorgeous_plant.4bpp.lz"); +const u32 gDecorIconPalette_GorgeousPlant[] = INCBIN_U32("graphics/decorations/gorgeous_plant.gbapal.lz"); -const u32 gDecorIcon_RedBrick[] = INCBIN_U32("graphics/decorations/decor_red_brick.4bpp.lz"); -const u32 gDecorIconPalette_RedBrick[] = INCBIN_U32("graphics/decorations/decor_red_brick.gbapal.lz"); +const u32 gDecorIcon_RedBrick[] = INCBIN_U32("graphics/decorations/red_brick.4bpp.lz"); +const u32 gDecorIconPalette_RedBrick[] = INCBIN_U32("graphics/decorations/red_brick.gbapal.lz"); -const u32 gDecorIcon_YellowBrick[] = INCBIN_U32("graphics/decorations/decor_yellow_brick.4bpp.lz"); -const u32 gDecorIconPalette_YellowBrick[] = INCBIN_U32("graphics/decorations/decor_yellow_brick.gbapal.lz"); +const u32 gDecorIcon_YellowBrick[] = INCBIN_U32("graphics/decorations/yellow_brick.4bpp.lz"); +const u32 gDecorIconPalette_YellowBrick[] = INCBIN_U32("graphics/decorations/yellow_brick.gbapal.lz"); -const u32 gDecorIcon_BlueBrick[] = INCBIN_U32("graphics/decorations/decor_blue_brick.4bpp.lz"); -const u32 gDecorIconPalette_BlueBrick[] = INCBIN_U32("graphics/decorations/decor_blue_brick.gbapal.lz"); +const u32 gDecorIcon_BlueBrick[] = INCBIN_U32("graphics/decorations/blue_brick.4bpp.lz"); +const u32 gDecorIconPalette_BlueBrick[] = INCBIN_U32("graphics/decorations/blue_brick.gbapal.lz"); -const u32 gDecorIcon_RedTent[] = INCBIN_U32("graphics/decorations/decor_red_tent.4bpp.lz"); -const u32 gDecorIconPalette_RedTent[] = INCBIN_U32("graphics/decorations/decor_red_tent.gbapal.lz"); +const u32 gDecorIcon_RedTent[] = INCBIN_U32("graphics/decorations/red_tent.4bpp.lz"); +const u32 gDecorIconPalette_RedTent[] = INCBIN_U32("graphics/decorations/red_tent.gbapal.lz"); -const u32 gDecorIcon_BlueTent[] = INCBIN_U32("graphics/decorations/decor_blue_tent.4bpp.lz"); -const u32 gDecorIconPalette_BlueTent[] = INCBIN_U32("graphics/decorations/decor_blue_tent.gbapal.lz"); +const u32 gDecorIcon_BlueTent[] = INCBIN_U32("graphics/decorations/blue_tent.4bpp.lz"); +const u32 gDecorIconPalette_BlueTent[] = INCBIN_U32("graphics/decorations/blue_tent.gbapal.lz"); -const u32 gDecorIcon_SolidBoard[] = INCBIN_U32("graphics/decorations/decor_solid_board.4bpp.lz"); -const u32 gDecorIconPalette_SolidBoard[] = INCBIN_U32("graphics/decorations/decor_solid_board.gbapal.lz"); +const u32 gDecorIcon_SolidBoard[] = INCBIN_U32("graphics/decorations/solid_board.4bpp.lz"); +const u32 gDecorIconPalette_SolidBoard[] = INCBIN_U32("graphics/decorations/solid_board.gbapal.lz"); -const u32 gDecorIcon_Slide[] = INCBIN_U32("graphics/decorations/decor_slide.4bpp.lz"); -const u32 gDecorIconPalette_Slide[] = INCBIN_U32("graphics/decorations/decor_slide.gbapal.lz"); +const u32 gDecorIcon_Slide[] = INCBIN_U32("graphics/decorations/slide.4bpp.lz"); +const u32 gDecorIconPalette_Slide[] = INCBIN_U32("graphics/decorations/slide.gbapal.lz"); -const u32 gDecorIcon_Tire[] = INCBIN_U32("graphics/decorations/decor_tire.4bpp.lz"); -const u32 gDecorIconPalette_Tire[] = INCBIN_U32("graphics/decorations/decor_tire.gbapal.lz"); +const u32 gDecorIcon_Tire[] = INCBIN_U32("graphics/decorations/tire.4bpp.lz"); +const u32 gDecorIconPalette_Tire[] = INCBIN_U32("graphics/decorations/tire.gbapal.lz"); -const u32 gDecorIcon_Stand[] = INCBIN_U32("graphics/decorations/decor_stand.4bpp.lz"); -const u32 gDecorIconPalette_Stand[] = INCBIN_U32("graphics/decorations/decor_stand.gbapal.lz"); +const u32 gDecorIcon_Stand[] = INCBIN_U32("graphics/decorations/stand.4bpp.lz"); +const u32 gDecorIconPalette_Stand[] = INCBIN_U32("graphics/decorations/stand.gbapal.lz"); -const u32 gDecorIcon_BreakableDoor[] = INCBIN_U32("graphics/decorations/decor_breakable_door.4bpp.lz"); -const u32 gDecorIconPalette_BreakableDoor[] = INCBIN_U32("graphics/decorations/decor_breakable_door.gbapal.lz"); +const u32 gDecorIcon_BreakableDoor[] = INCBIN_U32("graphics/decorations/breakable_door.4bpp.lz"); +const u32 gDecorIconPalette_BreakableDoor[] = INCBIN_U32("graphics/decorations/breakable_door.gbapal.lz"); -const u32 gDecorIcon_SandOrnament[] = INCBIN_U32("graphics/decorations/decor_sand_ornament.4bpp.lz"); -const u32 gDecorIconPalette_SandOrnament[] = INCBIN_U32("graphics/decorations/decor_sand_ornament.gbapal.lz"); +const u32 gDecorIcon_SandOrnament[] = INCBIN_U32("graphics/decorations/sand_ornament.4bpp.lz"); +const u32 gDecorIconPalette_SandOrnament[] = INCBIN_U32("graphics/decorations/sand_ornament.gbapal.lz"); -const u32 gDecorIcon_GlassOrnament[] = INCBIN_U32("graphics/decorations/decor_glass_ornament.4bpp.lz"); -const u32 gDecorIconPalette_GlassOrnament[] = INCBIN_U32("graphics/decorations/decor_glass_ornament.gbapal.lz"); +const u32 gDecorIcon_GlassOrnament[] = INCBIN_U32("graphics/decorations/glass_ornament.4bpp.lz"); +const u32 gDecorIconPalette_GlassOrnament[] = INCBIN_U32("graphics/decorations/glass_ornament.gbapal.lz"); -const u32 gDecorIcon_SurfMat[] = INCBIN_U32("graphics/decorations/decor_surf_mat.4bpp.lz"); -const u32 gDecorIconPalette_SurfMat[] = INCBIN_U32("graphics/decorations/decor_surf_mat.gbapal.lz"); +const u32 gDecorIcon_SurfMat[] = INCBIN_U32("graphics/decorations/surf_mat.4bpp.lz"); +const u32 gDecorIconPalette_SurfMat[] = INCBIN_U32("graphics/decorations/surf_mat.gbapal.lz"); -const u32 gDecorIcon_ThunderMat[] = INCBIN_U32("graphics/decorations/decor_thunder_mat.4bpp.lz"); -const u32 gDecorIconPalette_ThunderMat[] = INCBIN_U32("graphics/decorations/decor_thunder_mat.gbapal.lz"); +const u32 gDecorIcon_ThunderMat[] = INCBIN_U32("graphics/decorations/thunder_mat.4bpp.lz"); +const u32 gDecorIconPalette_ThunderMat[] = INCBIN_U32("graphics/decorations/thunder_mat.gbapal.lz"); -const u32 gDecorIcon_FireBlastMat[] = INCBIN_U32("graphics/decorations/decor_fire_blast_mat.4bpp.lz"); -const u32 gDecorIconPalette_FireBlastMat[] = INCBIN_U32("graphics/decorations/decor_fire_blast_mat.gbapal.lz"); +const u32 gDecorIcon_FireBlastMat[] = INCBIN_U32("graphics/decorations/fire_blast_mat.4bpp.lz"); +const u32 gDecorIconPalette_FireBlastMat[] = INCBIN_U32("graphics/decorations/fire_blast_mat.gbapal.lz"); -const u32 gDecorIcon_PowderSnowMat[] = INCBIN_U32("graphics/decorations/decor_powder_snow_mat.4bpp.lz"); -const u32 gDecorIconPalette_PowderSnowMat[] = INCBIN_U32("graphics/decorations/decor_powder_snow_mat.gbapal.lz"); +const u32 gDecorIcon_PowderSnowMat[] = INCBIN_U32("graphics/decorations/powder_snow_mat.4bpp.lz"); +const u32 gDecorIconPalette_PowderSnowMat[] = INCBIN_U32("graphics/decorations/powder_snow_mat.gbapal.lz"); -const u32 gDecorIcon_AttractMat[] = INCBIN_U32("graphics/decorations/decor_attract_mat.4bpp.lz"); -const u32 gDecorIconPalette_AttractMat[] = INCBIN_U32("graphics/decorations/decor_attract_mat.gbapal.lz"); +const u32 gDecorIcon_AttractMat[] = INCBIN_U32("graphics/decorations/attract_mat.4bpp.lz"); +const u32 gDecorIconPalette_AttractMat[] = INCBIN_U32("graphics/decorations/attract_mat.gbapal.lz"); -const u32 gDecorIcon_FissureMat[] = INCBIN_U32("graphics/decorations/decor_fissure_mat.4bpp.lz"); -const u32 gDecorIconPalette_FissureMat[] = INCBIN_U32("graphics/decorations/decor_fissure_mat.gbapal.lz"); +const u32 gDecorIcon_FissureMat[] = INCBIN_U32("graphics/decorations/fissure_mat.4bpp.lz"); +const u32 gDecorIconPalette_FissureMat[] = INCBIN_U32("graphics/decorations/fissure_mat.gbapal.lz"); -const u32 gDecorIcon_SpikesMat[] = INCBIN_U32("graphics/decorations/decor_spikes_mat.4bpp.lz"); -const u32 gDecorIconPalette_SpikesMat[] = INCBIN_U32("graphics/decorations/decor_spikes_mat.gbapal.lz"); +const u32 gDecorIcon_SpikesMat[] = INCBIN_U32("graphics/decorations/spikes_mat.4bpp.lz"); +const u32 gDecorIconPalette_SpikesMat[] = INCBIN_U32("graphics/decorations/spikes_mat.gbapal.lz"); -const u32 gDecorIcon_SnorlaxDoll[] = INCBIN_U32("graphics/decorations/decor_snorlax_doll.4bpp.lz"); -const u32 gDecorIconPalette_SnorlaxDoll[] = INCBIN_U32("graphics/decorations/decor_snorlax_doll.gbapal.lz"); +const u32 gDecorIcon_SnorlaxDoll[] = INCBIN_U32("graphics/decorations/snorlax_doll.4bpp.lz"); +const u32 gDecorIconPalette_SnorlaxDoll[] = INCBIN_U32("graphics/decorations/snorlax_doll.gbapal.lz"); -const u32 gDecorIcon_RhydonDoll[] = INCBIN_U32("graphics/decorations/decor_rhydon_doll.4bpp.lz"); -const u32 gDecorIconPalette_RhydonDoll[] = INCBIN_U32("graphics/decorations/decor_rhydon_doll.gbapal.lz"); +const u32 gDecorIcon_RhydonDoll[] = INCBIN_U32("graphics/decorations/rhydon_doll.4bpp.lz"); +const u32 gDecorIconPalette_RhydonDoll[] = INCBIN_U32("graphics/decorations/rhydon_doll.gbapal.lz"); -const u32 gDecorIcon_LaprasDoll[] = INCBIN_U32("graphics/decorations/decor_lapras_doll.4bpp.lz"); -const u32 gDecorIconPalette_LaprasDoll[] = INCBIN_U32("graphics/decorations/decor_lapras_doll.gbapal.lz"); +const u32 gDecorIcon_LaprasDoll[] = INCBIN_U32("graphics/decorations/lapras_doll.4bpp.lz"); +const u32 gDecorIconPalette_LaprasDoll[] = INCBIN_U32("graphics/decorations/lapras_doll.gbapal.lz"); -const u32 gDecorIcon_VenusaurDoll[] = INCBIN_U32("graphics/decorations/decor_venusaur_doll.4bpp.lz"); -const u32 gDecorIconPalette_VenusaurDoll[] = INCBIN_U32("graphics/decorations/decor_venusaur_doll.gbapal.lz"); +const u32 gDecorIcon_VenusaurDoll[] = INCBIN_U32("graphics/decorations/venusaur_doll.4bpp.lz"); +const u32 gDecorIconPalette_VenusaurDoll[] = INCBIN_U32("graphics/decorations/venusaur_doll.gbapal.lz"); -const u32 gDecorIcon_CharizardDoll[] = INCBIN_U32("graphics/decorations/decor_charizard_doll.4bpp.lz"); -const u32 gDecorIconPalette_CharizardDoll[] = INCBIN_U32("graphics/decorations/decor_charizard_doll.gbapal.lz"); +const u32 gDecorIcon_CharizardDoll[] = INCBIN_U32("graphics/decorations/charizard_doll.4bpp.lz"); +const u32 gDecorIconPalette_CharizardDoll[] = INCBIN_U32("graphics/decorations/charizard_doll.gbapal.lz"); -const u32 gDecorIcon_BlastoiseDoll[] = INCBIN_U32("graphics/decorations/decor_blastoise_doll.4bpp.lz"); -const u32 gDecorIconPalette_BlastoiseDoll[] = INCBIN_U32("graphics/decorations/decor_blastoise_doll.gbapal.lz"); +const u32 gDecorIcon_BlastoiseDoll[] = INCBIN_U32("graphics/decorations/blastoise_doll.4bpp.lz"); +const u32 gDecorIconPalette_BlastoiseDoll[] = INCBIN_U32("graphics/decorations/blastoise_doll.gbapal.lz"); -const u32 gDecorIcon_WailmerDoll[] = INCBIN_U32("graphics/decorations/decor_wailmer_doll.4bpp.lz"); -const u32 gDecorIconPalette_WailmerDoll[] = INCBIN_U32("graphics/decorations/decor_wailmer_doll.gbapal.lz"); +const u32 gDecorIcon_WailmerDoll[] = INCBIN_U32("graphics/decorations/wailmer_doll.4bpp.lz"); +const u32 gDecorIconPalette_WailmerDoll[] = INCBIN_U32("graphics/decorations/wailmer_doll.gbapal.lz"); -const u32 gDecorIcon_RegiceDoll[] = INCBIN_U32("graphics/decorations/decor_regice_doll.4bpp.lz"); -const u32 gDecorIconPalette_RegiceDoll[] = INCBIN_U32("graphics/decorations/decor_regice_doll.gbapal.lz"); +const u32 gDecorIcon_RegiceDoll[] = INCBIN_U32("graphics/decorations/regice_doll.4bpp.lz"); +const u32 gDecorIconPalette_RegiceDoll[] = INCBIN_U32("graphics/decorations/regice_doll.gbapal.lz"); -const u32 gDecorIcon_RegirockDoll[] = INCBIN_U32("graphics/decorations/decor_regirock_doll.4bpp.lz"); -const u32 gDecorIconPalette_RegirockDoll[] = INCBIN_U32("graphics/decorations/decor_regirock_doll.gbapal.lz"); +const u32 gDecorIcon_RegirockDoll[] = INCBIN_U32("graphics/decorations/regirock_doll.4bpp.lz"); +const u32 gDecorIconPalette_RegirockDoll[] = INCBIN_U32("graphics/decorations/regirock_doll.gbapal.lz"); -const u32 gDecorIcon_RegisteelDoll[] = INCBIN_U32("graphics/decorations/decor_registeel_doll.4bpp.lz"); -const u32 gDecorIconPalette_RegisteelDoll[] = INCBIN_U32("graphics/decorations/decor_registeel_doll.gbapal.lz"); +const u32 gDecorIcon_RegisteelDoll[] = INCBIN_U32("graphics/decorations/registeel_doll.4bpp.lz"); +const u32 gDecorIconPalette_RegisteelDoll[] = INCBIN_U32("graphics/decorations/registeel_doll.gbapal.lz"); diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c index def86ab1b..9574ac563 100644 --- a/src/fldeff_misc.c +++ b/src/fldeff_misc.c @@ -948,7 +948,7 @@ static void Task_SecretBaseMusicNoteMatSound(u8 taskId) { switch (gTasks[taskId].tMetatileID) { - case METATILE_SecretBase_NoteMat_C: + case METATILE_SecretBase_NoteMat_C_Low: PlaySE(SE_TOY_C); break; case METATILE_SecretBase_NoteMat_D: @@ -969,7 +969,7 @@ static void Task_SecretBaseMusicNoteMatSound(u8 taskId) case METATILE_SecretBase_NoteMat_B: PlaySE(SE_TOY_B); break; - case METATILE_SecretBase_NoteMat_C_Sharp: + case METATILE_SecretBase_NoteMat_C_High: PlaySE(SE_TOY_C1); break; } diff --git a/src/secret_base.c b/src/secret_base.c index ec48e9b51..24644d0ec 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -1176,7 +1176,7 @@ void SecretBasePerStepCallback(u8 taskId) VarSet(VAR_SECRET_BASE_STEP_COUNTER, VarGet(VAR_SECRET_BASE_STEP_COUNTER) + 1); behavior = MapGridGetMetatileBehaviorAt(x, y); tileId = MapGridGetMetatileIdAt(x, y); - if (tileId == METATILE_SecretBase_Board_Top || tileId == METATILE_SecretBase_Board_Bottom) + if (tileId == METATILE_SecretBase_SolidBoard_Top || tileId == METATILE_SecretBase_SolidBoard_Bottom) { if (sInFriendSecretBase == TRUE) { @@ -1204,13 +1204,13 @@ void SecretBasePerStepCallback(u8 taskId) if (sInFriendSecretBase == TRUE) VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | SECRET_BASE_USED_TENT); } - else if ((behavior == MB_IMPASSABLE_NORTHEAST && tileId == METATILE_SecretBase_Stand_RightCorner) - || (behavior == MB_IMPASSABLE_NORTHWEST && MapGridGetMetatileIdAt(x, y) == METATILE_SecretBase_Stand_LeftCorner)) + else if ((behavior == MB_IMPASSABLE_NORTHEAST && tileId == METATILE_SecretBase_Stand_CornerRight) + || (behavior == MB_IMPASSABLE_NORTHWEST && MapGridGetMetatileIdAt(x, y) == METATILE_SecretBase_Stand_CornerLeft)) { if (sInFriendSecretBase == TRUE) VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | SECRET_BASE_USED_STAND); } - else if (behavior == MB_IMPASSABLE_WEST_AND_EAST && tileId == METATILE_SecretBase_Slide_Stairs) + else if (behavior == MB_IMPASSABLE_WEST_AND_EAST && tileId == METATILE_SecretBase_Slide_StairLanding) { if (sInFriendSecretBase == TRUE) { @@ -1218,7 +1218,7 @@ void SecretBasePerStepCallback(u8 taskId) VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | SECRET_BASE_DECLINED_SLIDE); } } - else if (behavior == MB_SLIDE_SOUTH && tileId == METATILE_SecretBase_Slide) + else if (behavior == MB_SLIDE_SOUTH && tileId == METATILE_SecretBase_Slide_SlideTop) { if (sInFriendSecretBase == TRUE) { @@ -1846,12 +1846,12 @@ void CheckInteractedWithFriendsFurnitureBottom(void) case METATILE_SecretBase_RedPlant_Base2: case METATILE_SecretBase_TropicalPlant_Base1: case METATILE_SecretBase_TropicalPlant_Base2: - case METATILE_SecretBase_PrettyFlower_Base1: - case METATILE_SecretBase_PrettyFlower_Base2: - case METATILE_SecretBase_ColorfulFlowers_BaseLeft1: - case METATILE_SecretBase_ColorfulFlowers_BaseRight1: - case METATILE_SecretBase_ColorfulFlowers_BaseLeft2: - case METATILE_SecretBase_ColorfulFlowers_BaseRight2: + case METATILE_SecretBase_PrettyFlowers_Base1: + case METATILE_SecretBase_PrettyFlowers_Base2: + case METATILE_SecretBase_ColorfulPlant_BaseLeft1: + case METATILE_SecretBase_ColorfulPlant_BaseRight1: + case METATILE_SecretBase_ColorfulPlant_BaseLeft2: + case METATILE_SecretBase_ColorfulPlant_BaseRight2: case METATILE_SecretBase_BigPlant_BaseLeft1: case METATILE_SecretBase_BigPlant_BaseRight1: case METATILE_SecretBase_BigPlant_BaseLeft2: |
