Merge branch 'master' of https://github.com/pret/pokeemerald

1 files changed, 7 insertions, 4 deletions

diff --git a/src/field_tasks.c b/src/field_tasks.c
index 002977a10..676a9cfc7 100644
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -174,7 +174,7 @@ void SetUpFieldTasks(void)
 void ActivatePerStepCallback(u8 callbackId)
 {
     u8 taskId = FindTaskIdByFunc(Task_RunPerStepCallback);
-    if (taskId != 0xff)
+    if (taskId != TASK_NONE)
     {
         s32 i;
         s16 *data = gTasks[taskId].data;
@@ -199,12 +199,12 @@ void ResetFieldTasksArgs(void)
     s16 *data;
 
     taskId = FindTaskIdByFunc(Task_RunPerStepCallback);
-    if (taskId != 0xff)
+    if (taskId != TASK_NONE)
     {
         data = gTasks[taskId].data;
     }
     taskId = FindTaskIdByFunc(Task_RunTimeBasedEvents);
-    if (taskId != 0xff)
+    if (taskId != TASK_NONE)
     {
         data = gTasks[taskId].data;
         data[1] = 0;
@@ -635,9 +635,12 @@ static void AshGrassPerStepCallback(u8 taskId)
     }
 }
 
+// This function uses the constants for gTileset_Cave's metatile labels, but other tilesets with
+// the CrackedFloorPerStepCallback callback use the same metatile numbers for the cracked floor
+// and hole metatiles, such as gTileset_MirageTower.
 static void SetCrackedFloorHoleMetatile(s16 x, s16 y)
 {
-    MapGridSetMetatileIdAt(x, y, MapGridGetMetatileIdAt(x, y) == 0x22f ? 0x206 : 0x237);// unsure what these are referring to
+    MapGridSetMetatileIdAt(x, y, MapGridGetMetatileIdAt(x, y) == METATILE_Cave_CrackedFloor ? METATILE_Cave_CrackedFloor_Hole : METATILE_Pacifidlog_SkyPillar_CrackedFloor_Hole);
     CurrentMapDrawMetatileAt(x, y);
 }