diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-02 00:17:14 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-07-02 00:17:14 -0400 |
| commit | 8589e138a82b74bbfdaec6008cb389e5d5e8cce8 (patch) | |
| tree | 97b33c5fcdbb90a08a26ea9ec0f24a389dafcf56 /src/fldeff_escalator.c | |
| parent | c84f98a7ff229ab8b09053fae8d66506764ce099 (diff) | |
Eliminate METATILE_ID() macro
Diffstat (limited to 'src/fldeff_escalator.c')
| -rw-r--r-- | src/fldeff_escalator.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/fldeff_escalator.c b/src/fldeff_escalator.c index d1f262b5c..13edda57d 100644 --- a/src/fldeff_escalator.c +++ b/src/fldeff_escalator.c @@ -17,45 +17,45 @@ static void Task_DrawTeleporterCable(u8 taskId); #define LAST_ESCALATOR_STAGE (ESCALATOR_STAGES - 1) static const u16 sElevatorMetatiles_1F_0[ESCALATOR_STAGES] = { - METATILE_ID(PokemonCenter, Elevator1F_Tile0_Frame2), - METATILE_ID(PokemonCenter, Elevator1F_Tile0_Frame1), - METATILE_ID(PokemonCenter, Elevator1F_Tile0_Frame0) + METATILE_PokemonCenter_Elevator1F_Tile0_Frame2, + METATILE_PokemonCenter_Elevator1F_Tile0_Frame1, + METATILE_PokemonCenter_Elevator1F_Tile0_Frame0 }; static const u16 sElevatorMetatiles_1F_1[ESCALATOR_STAGES] = { - METATILE_ID(PokemonCenter, Elevator1F_Tile1_Frame2), - METATILE_ID(PokemonCenter, Elevator1F_Tile1_Frame1), - METATILE_ID(PokemonCenter, Elevator1F_Tile1_Frame0) + METATILE_PokemonCenter_Elevator1F_Tile1_Frame2, + METATILE_PokemonCenter_Elevator1F_Tile1_Frame1, + METATILE_PokemonCenter_Elevator1F_Tile1_Frame0 }; static const u16 sElevatorMetatiles_1F_2[ESCALATOR_STAGES] = { - METATILE_ID(PokemonCenter, Elevator1F_Tile2_Frame2), - METATILE_ID(PokemonCenter, Elevator1F_Tile2_Frame1), - METATILE_ID(PokemonCenter, Elevator1F_Tile2_Frame0) + METATILE_PokemonCenter_Elevator1F_Tile2_Frame2, + METATILE_PokemonCenter_Elevator1F_Tile2_Frame1, + METATILE_PokemonCenter_Elevator1F_Tile2_Frame0 }; static const u16 sElevatorMetatiles_1F_3[ESCALATOR_STAGES] = { - METATILE_ID(PokemonCenter, Elevator1F_Tile3_Frame2), - METATILE_ID(PokemonCenter, Elevator1F_Tile3_Frame1), - METATILE_ID(PokemonCenter, Elevator1F_Tile3_Frame0) + METATILE_PokemonCenter_Elevator1F_Tile3_Frame2, + METATILE_PokemonCenter_Elevator1F_Tile3_Frame1, + METATILE_PokemonCenter_Elevator1F_Tile3_Frame0 }; static const u16 sElevatorMetatiles_2F_0[ESCALATOR_STAGES] = { - METATILE_ID(PokemonCenter, Elevator2F_Tile0_Frame0), - METATILE_ID(PokemonCenter, Elevator2F_Tile0_Frame1), - METATILE_ID(PokemonCenter, Elevator2F_Tile0_Frame2) + METATILE_PokemonCenter_Elevator2F_Tile0_Frame0, + METATILE_PokemonCenter_Elevator2F_Tile0_Frame1, + METATILE_PokemonCenter_Elevator2F_Tile0_Frame2 }; static const u16 sElevatorMetatiles_2F_1[ESCALATOR_STAGES] = { - METATILE_ID(PokemonCenter, Elevator2F_Tile1_Frame0), - METATILE_ID(PokemonCenter, Elevator2F_Tile1_Frame1), - METATILE_ID(PokemonCenter, Elevator2F_Tile1_Frame2) + METATILE_PokemonCenter_Elevator2F_Tile1_Frame0, + METATILE_PokemonCenter_Elevator2F_Tile1_Frame1, + METATILE_PokemonCenter_Elevator2F_Tile1_Frame2 }; static const u16 sElevatorMetatiles_2F_2[ESCALATOR_STAGES] = { - METATILE_ID(PokemonCenter, Elevator2F_Tile2_Frame0), - METATILE_ID(PokemonCenter, Elevator2F_Tile2_Frame1), - METATILE_ID(PokemonCenter, Elevator2F_Tile2_Frame2) + METATILE_PokemonCenter_Elevator2F_Tile2_Frame0, + METATILE_PokemonCenter_Elevator2F_Tile2_Frame1, + METATILE_PokemonCenter_Elevator2F_Tile2_Frame2 }; #define tState data[0] |