Eliminate METATILE_ID() macro

This commit is contained in:
GriffinR
2020-07-02 00:17:14 -04:00
parent c84f98a7ff
commit 8589e138a8
7 changed files with 214 additions and 214 deletions

View File

@@ -110,24 +110,24 @@ const struct SpriteSheet gMirageTowerCeilingCrumbleSpriteSheets[] =
static const struct MetatileCoords sInvisibleMirageTowerMetatiles[] =
{
{18, 53, METATILE_ID(Mauville, DeepSand_Center)},
{19, 53, METATILE_ID(Mauville, DeepSand_Center)},
{20, 53, METATILE_ID(Mauville, DeepSand_Center)},
{18, 54, METATILE_ID(Mauville, DeepSand_Center)},
{19, 54, METATILE_ID(Mauville, DeepSand_Center)},
{20, 54, METATILE_ID(Mauville, DeepSand_Center)},
{18, 55, METATILE_ID(Mauville, DeepSand_Center)},
{19, 55, METATILE_ID(Mauville, DeepSand_Center)},
{20, 55, METATILE_ID(Mauville, DeepSand_Center)},
{18, 56, METATILE_ID(Mauville, DeepSand_Center)},
{19, 56, METATILE_ID(Mauville, DeepSand_Center)},
{20, 56, METATILE_ID(Mauville, DeepSand_Center)},
{18, 57, METATILE_ID(Mauville, DeepSand_BottomMid)},
{19, 57, METATILE_ID(Mauville, DeepSand_BottomMid)},
{20, 57, METATILE_ID(Mauville, DeepSand_BottomMid)},
{18, 58, METATILE_ID(General, SandPit_Center)},
{19, 58, METATILE_ID(General, SandPit_Center)},
{20, 58, METATILE_ID(General, SandPit_Center)},
{18, 53, METATILE_Mauville_DeepSand_Center},
{19, 53, METATILE_Mauville_DeepSand_Center},
{20, 53, METATILE_Mauville_DeepSand_Center},
{18, 54, METATILE_Mauville_DeepSand_Center},
{19, 54, METATILE_Mauville_DeepSand_Center},
{20, 54, METATILE_Mauville_DeepSand_Center},
{18, 55, METATILE_Mauville_DeepSand_Center},
{19, 55, METATILE_Mauville_DeepSand_Center},
{20, 55, METATILE_Mauville_DeepSand_Center},
{18, 56, METATILE_Mauville_DeepSand_Center},
{19, 56, METATILE_Mauville_DeepSand_Center},
{20, 56, METATILE_Mauville_DeepSand_Center},
{18, 57, METATILE_Mauville_DeepSand_BottomMid},
{19, 57, METATILE_Mauville_DeepSand_BottomMid},
{20, 57, METATILE_Mauville_DeepSand_BottomMid},
{18, 58, METATILE_General_SandPit_Center},
{19, 58, METATILE_General_SandPit_Center},
{20, 58, METATILE_General_SandPit_Center},
};
static const union AnimCmd gSpriteAnim_8617DEC[] =