1 files changed, 49 insertions, 14 deletions

diff --git a/src/fldeff_escalator.c b/src/fldeff_escalator.c
index 7ab2db4db..10fb78ee2 100644
--- a/src/fldeff_escalator.c
+++ b/src/fldeff_escalator.c
@@ -4,6 +4,7 @@
 #include "fieldmap.h"
 #include "fldeff.h"
 #include "task.h"
+#include "constants/metatile_labels.h"
 
 static EWRAM_DATA u8 sEscalatorAnim_TaskId = 0;
 
@@ -53,13 +54,47 @@ static void sub_80E12E8(u8 taskId, const s16 *list, u16 isImpassableFlag)
     }
 }
 
-static const u16 gUnknown_08589ABA[] = {0x284, 0x282, 0x280};
-static const u16 gUnknown_08589AC0[] = {0x285, 0x283, 0x281};
-static const u16 gUnknown_08589AC6[] = {0x28C, 0x28A, 0x288};
-static const u16 gUnknown_08589ACC[] = {0x28D, 0x28B, 0x289};
-static const u16 gUnknown_08589AD2[] = {0x2A0, 0x2A2, 0x2A4};
-static const u16 gUnknown_08589AD8[] = {0x2A1, 0x2A3, 0x2A5};
-static const u16 gUnknown_08589ADE[] = {0x2A8, 0x2AA, 0x2AC};
+static const u16 sElevatorMetatiles_1F_0[] = {
+    METATILE_ID(PokemonCenter, Elevator1F_Tile0_Frame2),
+    METATILE_ID(PokemonCenter, Elevator1F_Tile0_Frame1),
+    METATILE_ID(PokemonCenter, Elevator1F_Tile0_Frame0)
+};
+
+static const u16 sElevatorMetatiles_1F_1[] = {
+    METATILE_ID(PokemonCenter, Elevator1F_Tile1_Frame2),
+    METATILE_ID(PokemonCenter, Elevator1F_Tile1_Frame1),
+    METATILE_ID(PokemonCenter, Elevator1F_Tile1_Frame0)
+};
+
+static const u16 sElevatorMetatiles_1F_2[] = {
+    METATILE_ID(PokemonCenter, Elevator1F_Tile2_Frame2),
+    METATILE_ID(PokemonCenter, Elevator1F_Tile2_Frame1),
+    METATILE_ID(PokemonCenter, Elevator1F_Tile2_Frame0)
+};
+
+static const u16 sElevatorMetatiles_1F_3[] = {
+    METATILE_ID(PokemonCenter, Elevator1F_Tile3_Frame2),
+    METATILE_ID(PokemonCenter, Elevator1F_Tile3_Frame1),
+    METATILE_ID(PokemonCenter, Elevator1F_Tile3_Frame0)
+};
+
+static const u16 sElevatorMetatiles_2F_0[] = {
+    METATILE_ID(PokemonCenter, Elevator2F_Tile0_Frame0),
+    METATILE_ID(PokemonCenter, Elevator2F_Tile0_Frame1),
+    METATILE_ID(PokemonCenter, Elevator2F_Tile0_Frame2)
+};
+
+static const u16 sElevatorMetatiles_2F_1[] = {
+    METATILE_ID(PokemonCenter, Elevator2F_Tile1_Frame0),
+    METATILE_ID(PokemonCenter, Elevator2F_Tile1_Frame1),
+    METATILE_ID(PokemonCenter, Elevator2F_Tile1_Frame2)
+};
+
+static const u16 sElevatorMetatiles_2F_2[] = {
+    METATILE_ID(PokemonCenter, Elevator2F_Tile2_Frame0),
+    METATILE_ID(PokemonCenter, Elevator2F_Tile2_Frame1),
+    METATILE_ID(PokemonCenter, Elevator2F_Tile2_Frame2)
+};
 
 static void sub_80E1444(u8 taskId)
 {
@@ -70,25 +105,25 @@ static void sub_80E1444(u8 taskId)
     switch (data[0])
     {
         case 0:
-            sub_80E12E8(taskId, gUnknown_08589ABA, 0);
+            sub_80E12E8(taskId, sElevatorMetatiles_1F_0, 0);
             break;
         case 1:
-            sub_80E12E8(taskId, gUnknown_08589AC0, 0);
+            sub_80E12E8(taskId, sElevatorMetatiles_1F_1, 0);
             break;
         case 2:
-            sub_80E12E8(taskId, gUnknown_08589AC6, METATILE_COLLISION_MASK);
+            sub_80E12E8(taskId, sElevatorMetatiles_1F_2, METATILE_COLLISION_MASK);
             break;
         case 3:
-            sub_80E12E8(taskId, gUnknown_08589ACC, 0);
+            sub_80E12E8(taskId, sElevatorMetatiles_1F_3, 0);
             break;
         case 4:
-            sub_80E12E8(taskId, gUnknown_08589AD2, METATILE_COLLISION_MASK);
+            sub_80E12E8(taskId, sElevatorMetatiles_2F_0, METATILE_COLLISION_MASK);
             break;
         case 5:
-            sub_80E12E8(taskId, gUnknown_08589AD8, 0);
+            sub_80E12E8(taskId, sElevatorMetatiles_2F_1, 0);
             break;
         case 6:
-            sub_80E12E8(taskId, gUnknown_08589ADE, 0);
+            sub_80E12E8(taskId, sElevatorMetatiles_2F_2, 0);
             break;
     }