Label all metatile behaviors and functions

20 files changed, 730 insertions, 645 deletions

diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c
index 47211b718..f53959cc2 100644
--- a/src/battle/battle_setup.c
+++ b/src/battle/battle_setup.c
@@ -663,7 +663,7 @@ s8 BattleSetup_GetTerrain(void)
     case MAP_TYPE_ROUTE:
         break;
     case MAP_TYPE_UNDERGROUND:
-        if (sub_80574C4(tileBehavior))
+        if (MetatileBehavior_IsIndoorEncounter(tileBehavior))
             return BATTLE_TERRAIN_BUILDING;
         if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior))
             return BATTLE_TERRAIN_POND;
@@ -678,15 +678,15 @@ s8 BattleSetup_GetTerrain(void)
             return BATTLE_TERRAIN_WATER;
         return BATTLE_TERRAIN_PLAIN;
     }
-    if (sub_8057568(tileBehavior))
+    if (MetatileBehavior_IsOceanWater(tileBehavior))
         return BATTLE_TERRAIN_WATER;
     if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior))
         return BATTLE_TERRAIN_POND;
-    if (sub_80574D8(tileBehavior))
+    if (MetatileBehavior_IsMountainTop(tileBehavior))
         return BATTLE_TERRAIN_MOUNTAIN;
     if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
     {
-        if (sub_8057450(tileBehavior))
+        if (MetatileBehavior_GetBridgeType(tileBehavior))
             return BATTLE_TERRAIN_POND;
         if (MetatileBehavior_IsBridge(tileBehavior) == TRUE)
             return BATTLE_TERRAIN_WATER;
diff --git a/src/bike.c b/src/bike.c
index e1539ab7d..db37167f3 100644
--- a/src/bike.c
+++ b/src/bike.c
@@ -577,7 +577,7 @@ static void AcroBikeTransition_Moving(u8 direction)
     }
     else
     {
-        npc_use_some_d2s(direction);
+        PlayerRideWaterCurrent(direction);
     }
 }
 
diff --git a/src/debug/nakamura_debug_menu.c b/src/debug/nakamura_debug_menu.c
index 760b10d01..a20d58319 100644
--- a/src/debug/nakamura_debug_menu.c
+++ b/src/debug/nakamura_debug_menu.c
@@ -761,7 +761,7 @@ static u16 FishingPoints_CountFishingTilesInMapThird(u8 a0)
     {
         for (x = 0; x < gMapHeader.mapData->width; x++)
         {
-            if (sub_805759C(MapGridGetMetatileBehaviorAt(x + 7, y + 7)) == TRUE)
+            if (MetatileBehavior_IsFeebasEncounterable(MapGridGetMetatileBehaviorAt(x + 7, y + 7)) == TRUE)
             {
                 retval++;
             }
@@ -787,7 +787,7 @@ static u16 FishingPoints_GetIndexOfCurrentFishingSpot(void)
     {
         for (xx = 0; xx < gMapHeader.mapData->width; xx++)
         {
-            if (sub_805759C(MapGridGetMetatileBehaviorAt(xx + 7, yy + 7)) == TRUE)
+            if (MetatileBehavior_IsFeebasEncounterable(MapGridGetMetatileBehaviorAt(xx + 7, yy + 7)) == TRUE)
             {
                 retval++;
                 if (x == xx && y == yy)
diff --git a/src/decoration.c b/src/decoration.c
index 448e684ad..47dcae2dc 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -2074,9 +2074,9 @@ u16 sub_80FF1B0(u8 decoId, u8 a1)
 void sub_80FF1EC(u16 mapX, u16 mapY, u8 decWidth, u8 decHeight, u16 decIdx)
 {
     u16 i;
-    u16 j; // r10
+    u16 j;
     u16 behavior;
-    u16 flags; // r8
+    u16 collision;
     u16 v0;
     u16 v1;
     s16 x;
@@ -2089,27 +2089,23 @@ void sub_80FF1EC(u16 mapX, u16 mapY, u8 decWidth, u8 decHeight, u16 decIdx)
         {
             x = mapX + j;
             behavior = GetBehaviorByMetatileId(0x200 + gDecorations[decIdx].tiles[i * decWidth + j]);
-            if (sub_8057288(behavior) == 1 || (gDecorations[decIdx].permission != DECORPERM_PASS_FLOOR && (behavior >> 12)))
-            {
-                flags = 0xc00;
-            } else
-            {
-                flags = 0x000;
-            }
-            if (gDecorations[decIdx].permission != DECORPERM_NA_WALL && sub_80572B0(MapGridGetMetatileBehaviorAt(x, decBottom)) == 1)
-            {
+            if (MetatileBehavior_IsSecretBaseImpassable(behavior) == TRUE || (gDecorations[decIdx].permission != DECORPERM_PASS_FLOOR && (behavior >> 12) != 0))
+                collision = 0xc00; // impassable collision
+            else
+                collision = 0x000; // passable collision
+
+            if (gDecorations[decIdx].permission != DECORPERM_NA_WALL && MetatileBehavior_IsSecretBaseNorthWall(MapGridGetMetatileBehaviorAt(x, decBottom)) == 1)
                 v0 = 1;
-            } else
-            {
+            else
                 v0 = 0;
-            }
+
             v1 = sub_80FF1B0(gDecorations[decIdx].id, i * decWidth + j);
             if (v1 != 0xffff)
             {
-                MapGridSetMetatileEntryAt(x, decBottom, (gDecorations[decIdx].tiles[i * decWidth + j] + (0x200 | v0)) | flags | v1);
+                MapGridSetMetatileEntryAt(x, decBottom, (gDecorations[decIdx].tiles[i * decWidth + j] + (0x200 | v0)) | collision | v1);
             } else
             {
-                MapGridSetMetatileIdAt(x, decBottom, (gDecorations[decIdx].tiles[i * decWidth + j] + (0x200 | v0)) | flags);
+                MapGridSetMetatileIdAt(x, decBottom, (gDecorations[decIdx].tiles[i * decWidth + j] + (0x200 | v0)) | collision);
             }
         }
     }
@@ -2372,9 +2368,9 @@ void sub_80FFB08(u8 taskId)
     DisplayItemMessageOnField(taskId, gSecretBaseText_CancelDecorating, sub_8100248, 0);
 }
 
-bool8 sub_80FFB6C(u8 a0, u16 a1)
+bool8 sub_80FFB6C(u8 metatileBehavior, u16 layerType)
 {
-    if (sub_8057274(a0) != 1 || a1 != 0)
+    if (MetatileBehavior_IsBlockDecoration(metatileBehavior) != TRUE || layerType != 0)
     {
         return FALSE;
     }
@@ -2390,15 +2386,15 @@ bool8 sub_80FFB94(u8 taskId, s16 x, s16 y, u16 decoId)
     return TRUE;
 }
 
-bool8 sub_80FFBDC(u16 a0, const struct Decoration *decoration)
+bool8 sub_80FFBDC(u16 metatileBehavior, const struct Decoration *decoration)
 {
-    if (sub_8057274(a0) != 1)
+    if (MetatileBehavior_IsBlockDecoration(metatileBehavior) != TRUE)
     {
-        if (decoration->id == DECOR_SOLID_BOARD && sub_8057300(a0) == 1)
+        if (decoration->id == DECOR_SOLID_BOARD && MetatileBehavior_IsSecretBaseHole(metatileBehavior) == TRUE)
         {
             return TRUE;
         }
-        if (sub_805729C(a0))
+        if (MetatileBehavior_IsNormal(metatileBehavior))
         {
             return TRUE;
         }
@@ -2413,7 +2409,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
     u8 i;
     u8 j;
     u8 behaviorAt;
-    u16 behaviorBy;
+    u16 layerType;
     u8 mapY;
     u8 mapX;
     s16 curY;
@@ -2431,12 +2427,12 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
                 {
                     curX = gTasks[taskId].data[0] + j;
                     behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY);
-                    behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & 0xf000;
+                    layerType = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & 0xf000;
                     if (!sub_80FFBDC(behaviorAt, decoration))
                     {
                         return FALSE;
                     }
-                    if (!sub_80FFB94(taskId, curX, curY, behaviorBy))
+                    if (!sub_80FFB94(taskId, curX, curY, layerType))
                     {
                         return FALSE;
                     }
@@ -2456,12 +2452,12 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
                 {
                     curX = gTasks[taskId].data[0] + j;
                     behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY);
-                    behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & 0xf000;
-                    if (!sub_805729C(behaviorAt) && !sub_80FFB6C(behaviorAt, behaviorBy))
+                    layerType = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & 0xf000;
+                    if (!MetatileBehavior_IsNormal(behaviorAt) && !sub_80FFB6C(behaviorAt, layerType))
                     {
                         return FALSE;
                     }
-                    if (!sub_80FFB94(taskId, curX, curY, behaviorBy))
+                    if (!sub_80FFB94(taskId, curX, curY, layerType))
                     {
                         return FALSE;
                     }
@@ -2476,12 +2472,12 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
             {
                 curX = gTasks[taskId].data[0] + j;
                 behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY);
-                behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[j]) & 0xf000;
-                if (!sub_805729C(behaviorAt) && !sub_80572B0(behaviorAt))
+                layerType = GetBehaviorByMetatileId(0x200 + decoration->tiles[j]) & 0xf000;
+                if (!MetatileBehavior_IsNormal(behaviorAt) && !MetatileBehavior_IsSecretBaseNorthWall(behaviorAt))
                 {
                     return FALSE;
                 }
-                if (!sub_80FFB94(taskId, curX, curY, behaviorBy))
+                if (!sub_80FFB94(taskId, curX, curY, layerType))
                 {
                     return FALSE;
                 }
@@ -2499,7 +2495,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
                 for (j=0; j<mapX; j++)
                 {
                     curX = gTasks[taskId].data[0] + j;
-                    if (!sub_80572B0(MapGridGetMetatileBehaviorAt(curX, curY)))
+                    if (!MetatileBehavior_IsSecretBaseNorthWall(MapGridGetMetatileBehaviorAt(curX, curY)))
                     {
                         return FALSE;
                     }
@@ -2518,14 +2514,14 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
                 behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY);
                 if (decoration->shape == DECORSHAPE_1x2)
                 {
-                    if (!sub_80572EC(behaviorAt))
+                    if (!MetatileBehavior_IsLargeMatCenter(behaviorAt))
                     {
                         return FALSE;
                     }
                 }
-                else if (!sub_80572D8(behaviorAt))
+                else if (!MetatileBehavior_IsSecretBaseLargeMatEdge(behaviorAt))
                 {
-                    if (!sub_80572EC(behaviorAt))
+                    if (!MetatileBehavior_IsLargeMatCenter(behaviorAt))
                     {
                         return FALSE;
                     }
@@ -2776,7 +2772,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
     "\tadds r5, r1, 0\n"
     "\tands r5, r0\n"
     "\tadds r0, r4, 0\n"
-    "\tbl sub_805729C\n"
+    "\tbl MetatileBehavior_IsNormal\n"
     "\tlsls r0, 24\n"
     "\tcmp r0, 0\n"
     "\tbne _080FFE0C\n"
@@ -2881,12 +2877,12 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
     "\tadds r5, r1, 0\n"
     "\tands r5, r0\n"
     "\tadds r0, r4, 0\n"
-    "\tbl sub_805729C\n"
+    "\tbl MetatileBehavior_IsNormal\n"
     "\tlsls r0, 24\n"
     "\tcmp r0, 0\n"
     "\tbne _080FFEDA\n"
     "\tadds r0, r4, 0\n"
-    "\tbl sub_80572B0\n"
+    "\tbl MetatileBehavior_IsSecretBaseNorthWall\n"
     "\tlsls r0, 24\n"
     "\tcmp r0, 0\n"
     "\tbne _080FFEDA\n"
@@ -2964,7 +2960,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
     "\tbl MapGridGetMetatileBehaviorAt\n"
     "\tlsls r0, 24\n"
     "\tlsrs r0, 24\n"
-    "\tbl sub_80572B0\n"
+    "\tbl MetatileBehavior_IsSecretBaseNorthWall\n"
     "\tlsls r0, 24\n"
     "\tcmp r0, 0\n"
     "\tbeq _080FFFF4\n"
@@ -3030,7 +3026,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
     "\tbne _080FFFF8\n"
     "_080FFFE8:\n"
     "\tadds r0, r4, 0\n"
-    "\tbl sub_80572EC\n"
+    "\tbl MetatileBehavior_IsLargeMatCenter\n"
     "\tlsls r0, 24\n"
     "\tcmp r0, 0\n"
     "\tbne _08100004\n"
@@ -3039,7 +3035,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
     "\tb _08100026\n"
     "_080FFFF8:\n"
     "\tadds r0, r4, 0\n"
-    "\tbl sub_80572D8\n"
+    "\tbl MetatileBehavior_IsSecretBaseLargeMatEdge\n"
     "\tlsls r0, 24\n"
     "\tcmp r0, 0\n"
     "\tbeq _080FFFE8\n"
@@ -3804,7 +3800,7 @@ void sub_8100FB4(u8 taskId)
 
 void sub_8101024(u8 taskId)
 {
-    u8 mtBehavior;
+    u8 metatileBehavior;
     s16 *data;
     sub_8101460(taskId);
     if (gUnknown_02039234 != 0)
@@ -3813,8 +3809,9 @@ void sub_8101024(u8 taskId)
     } else
     {
         data = gTasks[taskId].data;
-        mtBehavior = MapGridGetMetatileBehaviorAt(data[0], data[1]);
-        if (MetatileBehavior_IsSecretBasePC(mtBehavior) == TRUE || sub_805738C(mtBehavior) == TRUE)
+        metatileBehavior = MapGridGetMetatileBehaviorAt(data[0], data[1]);
+        if (MetatileBehavior_IsSecretBasePC(metatileBehavior) == TRUE
+         || MetatileBehavior_IsPlayerRoomPCOn(metatileBehavior) == TRUE)
         {
             gSprites[gUnknown_020391A8].invisible = 0;
             gSprites[gUnknown_020391A8].callback = SpriteCallbackDummy;
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index d128bf30f..0b2e66f25 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -7174,7 +7174,7 @@ void GetGroundEffectFlags_Tracks(struct EventObject *eventObj, u32 *flags)
         *flags |= GROUND_EFFECT_FLAG_DEEP_SAND;
     }
     else if (MetatileBehavior_IsSandOrDeepSand(eventObj->previousMetatileBehavior)
-             || MetatileBehavior_IsUnusedFootprintMetatile(eventObj->previousMetatileBehavior))
+             || MetatileBehavior_IsFootprints(eventObj->previousMetatileBehavior))
     {
         *flags |= GROUND_EFFECT_FLAG_SAND;
     }
diff --git a/src/field_camera.c b/src/field_camera.c
index 2d4d4eabd..6eae4e1b9 100644
--- a/src/field_camera.c
+++ b/src/field_camera.c
@@ -204,13 +204,13 @@ static void RedrawMapSliceWest(struct UnknownStruct *a, struct MapData *mapData)
     }
 }
 
-void CurrentMapDrawMetatileAt(int a, int b)
+void CurrentMapDrawMetatileAt(int x, int y)
 {
-    int offset = MapPosToBgTilemapOffset(&gUnknown_03000590, a, b);
+    int offset = MapPosToBgTilemapOffset(&gUnknown_03000590, x, y);
 
     if (offset >= 0)
     {
-        DrawMetatileAt(gMapHeader.mapData, offset, a, b);
+        DrawMetatileAt(gMapHeader.mapData, offset, x, y);
         gUnknown_03000590.unk4 = TRUE;
     }
 }
@@ -226,74 +226,87 @@ void DrawDoorMetatileAt(int x, int y, u16 *arr)
     }
 }
 
-static void DrawMetatileAt(struct MapData *mapData, u16 b, int c, int d)
+static void DrawMetatileAt(struct MapData *mapData, u16 offset, int x, int y)
 {
-    u16 metatileId = MapGridGetMetatileIdAt(c, d);
     u16 *metatiles;
+    u16 metatileId = MapGridGetMetatileIdAt(x, y);
 
-    if (metatileId > 1024)
+    if (metatileId > 0x400)
         metatileId = 0;
-    if (metatileId < 512)
+
+    if (metatileId < 0x200)
+    {
         metatiles = mapData->primaryTileset->metatiles;
+    }
     else
     {
         metatiles = mapData->secondaryTileset->metatiles;
-        metatileId -= 512;
+        metatileId -= 0x200;
     }
-    DrawMetatile(MapGridGetMetatileLayerTypeAt(c, d), metatiles + metatileId * 8, b);
+
+    DrawMetatile(MapGridGetMetatileLayerTypeAt(x, y), metatiles + metatileId * 8, offset);
 }
 
-static void DrawMetatile(s32 a, u16 *b, u16 c)
+static void DrawMetatile(s32 metatileLayerType, u16 *metatiles, u16 offset)
 {
-    switch (a)
+    switch (metatileLayerType)
     {
-    case 2:
-        gBGTilemapBuffers[3][c] = b[0];
-        gBGTilemapBuffers[3][c + 1] = b[1];
-        gBGTilemapBuffers[3][c + 0x20] = b[2];
-        gBGTilemapBuffers[3][c + 0x21] = b[3];
-
-        gBGTilemapBuffers[2][c] = 0;
-        gBGTilemapBuffers[2][c + 1] = 0;
-        gBGTilemapBuffers[2][c + 0x20] = 0;
-        gBGTilemapBuffers[2][c + 0x21] = 0;
-
-        gBGTilemapBuffers[1][c] = b[4];
-        gBGTilemapBuffers[1][c + 1] = b[5];
-        gBGTilemapBuffers[1][c + 0x20] = b[6];
-        gBGTilemapBuffers[1][c + 0x21] = b[7];
+    case 2: // LAYER_TYPE_
+        // Draw metatile's bottom layer to the bottom background layer.
+        gBGTilemapBuffers[3][offset] = metatiles[0];
+        gBGTilemapBuffers[3][offset + 1] = metatiles[1];
+        gBGTilemapBuffers[3][offset + 0x20] = metatiles[2];
+        gBGTilemapBuffers[3][offset + 0x21] = metatiles[3];
+
+        // Draw transparent tiles to the middle background layer.
+        gBGTilemapBuffers[2][offset] = 0;
+        gBGTilemapBuffers[2][offset + 1] = 0;
+        gBGTilemapBuffers[2][offset + 0x20] = 0;
+        gBGTilemapBuffers[2][offset + 0x21] = 0;
+
+        // Draw metatile's top layer to the top background layer.
+        gBGTilemapBuffers[1][offset] = metatiles[4];
+        gBGTilemapBuffers[1][offset + 1] = metatiles[5];
+        gBGTilemapBuffers[1][offset + 0x20] = metatiles[6];
+        gBGTilemapBuffers[1][offset + 0x21] = metatiles[7];
         break;
-    case 1:
-        gBGTilemapBuffers[3][c] = b[0];
-        gBGTilemapBuffers[3][c + 1] = b[1];
-        gBGTilemapBuffers[3][c + 0x20] = b[2];
-        gBGTilemapBuffers[3][c + 0x21] = b[3];
-
-        gBGTilemapBuffers[2][c] = b[4];
-        gBGTilemapBuffers[2][c + 1] = b[5];
-        gBGTilemapBuffers[2][c + 0x20] = b[6];
-        gBGTilemapBuffers[2][c + 0x21] = b[7];
-
-        gBGTilemapBuffers[1][c] = 0;
-        gBGTilemapBuffers[1][c + 1] = 0;
-        gBGTilemapBuffers[1][c + 0x20] = 0;
-        gBGTilemapBuffers[1][c + 0x21] = 0;
+    case 1: // LAYER_TYPE_COVERED_BY_OBJECTS
+        // Draw metatile's bottom layer to the bottom background layer.
+        gBGTilemapBuffers[3][offset] = metatiles[0];
+        gBGTilemapBuffers[3][offset + 1] = metatiles[1];
+        gBGTilemapBuffers[3][offset + 0x20] = metatiles[2];
+        gBGTilemapBuffers[3][offset + 0x21] = metatiles[3];
+
+        // Draw metatile's top layer to the middle background layer.
+        gBGTilemapBuffers[2][offset] = metatiles[4];
+        gBGTilemapBuffers[2][offset + 1] = metatiles[5];
+        gBGTilemapBuffers[2][offset + 0x20] = metatiles[6];
+        gBGTilemapBuffers[2][offset + 0x21] = metatiles[7];
+
+        // Draw transparent tiles to the top background layer.
+        gBGTilemapBuffers[1][offset] = 0;
+        gBGTilemapBuffers[1][offset + 1] = 0;
+        gBGTilemapBuffers[1][offset + 0x20] = 0;
+        gBGTilemapBuffers[1][offset + 0x21] = 0;
         break;
-    case 0:
-        gBGTilemapBuffers[3][c] = 0x3014;
-        gBGTilemapBuffers[3][c + 1] = 0x3014;
-        gBGTilemapBuffers[3][c + 0x20] = 0x3014;
-        gBGTilemapBuffers[3][c + 0x21] = 0x3014;
-
-        gBGTilemapBuffers[2][c] = b[0];
-        gBGTilemapBuffers[2][c + 1] = b[1];
-        gBGTilemapBuffers[2][c + 0x20] = b[2];
-        gBGTilemapBuffers[2][c + 0x21] = b[3];
-
-        gBGTilemapBuffers[1][c] = b[4];
-        gBGTilemapBuffers[1][c + 1] = b[5];
-        gBGTilemapBuffers[1][c + 0x20] = b[6];
-        gBGTilemapBuffers[1][c + 0x21] = b[7];
+    case 0: // LAYER_TYPE_NORMAL
+        // Draw garbage to the bottom background layer.
+        gBGTilemapBuffers[3][offset] = 0x3014;
+        gBGTilemapBuffers[3][offset + 1] = 0x3014;
+        gBGTilemapBuffers[3][offset + 0x20] = 0x3014;
+        gBGTilemapBuffers[3][offset + 0x21] = 0x3014;
+
+        // Draw metatile's bottom layer to the middle background layer.
+        gBGTilemapBuffers[2][offset] = metatiles[0];
+        gBGTilemapBuffers[2][offset + 1] = metatiles[1];
+        gBGTilemapBuffers[2][offset + 0x20] = metatiles[2];
+        gBGTilemapBuffers[2][offset + 0x21] = metatiles[3];
+
+        // Draw metatile's top layer to the top background layer, which covers event object sprites.
+        gBGTilemapBuffers[1][offset] = metatiles[4];
+        gBGTilemapBuffers[1][offset + 1] = metatiles[5];
+        gBGTilemapBuffers[1][offset + 0x20] = metatiles[6];
+        gBGTilemapBuffers[1][offset + 0x21] = metatiles[7];
         break;
     }
 }
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index dc35d6fb5..273378c14 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -54,7 +54,7 @@ extern u8 gUnknown_081C6C02[];
 extern u8 HiddenItemScript[];
 extern u8 Event_TV[];
 extern u8 gUnknown_081A0009[];
-extern u8 ClosedSootopolisGymDoorScript[];
+extern u8 ClosedSootopolisDoorScript[];
 extern u8 gUnknown_081A4363[];
 extern u8 gUnknown_081C346A[];
 extern u8 gUnknown_081616E1[];
@@ -132,7 +132,7 @@ void GetPlayerFieldInput(struct FieldInput *input, u16 newKeys, u16 heldKeys)
 {
     u8 tileTransitionState = gPlayerAvatar.tileTransitionState;
     u8 runningState = gPlayerAvatar.runningState;
-    bool8 forcedMove = MetatileBehavior_IsMoveTile(GetPlayerCurMetatileBehavior(runningState));
+    bool8 forcedMove = MetatileBehavior_IsForcedMovementTile(GetPlayerCurMetatileBehavior(runningState));
 
     if ((tileTransitionState == T_TILE_CENTER && forcedMove == FALSE) || tileTransitionState == T_NOT_MOVING)
     {
@@ -457,9 +457,9 @@ static u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 metatile
         return Event_TV;
     if (MetatileBehavior_IsPC(metatileBehavior) == TRUE)
         return gUnknown_081A0009;
-    if (MetatileBehavior_IsClosedSootopolisGymDoor(metatileBehavior) == TRUE)
-        return ClosedSootopolisGymDoorScript;
-    if (is_tile_x84(metatileBehavior) == TRUE)
+    if (MetatileBehavior_IsClosedSootopolisDoor(metatileBehavior) == TRUE)
+        return ClosedSootopolisDoorScript;
+    if (MetatileBehavior_IsLinkBattleRecords(metatileBehavior) == TRUE)
         return gUnknown_081A4363;
     if (MetatileBehavior_IsPokeblockFeeder(metatileBehavior) == TRUE)
         return gUnknown_081C346A;
@@ -467,7 +467,7 @@ static u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 metatile
         return gUnknown_081616E1;
     if (MetatileBehavior_IsRegionMap(metatileBehavior) == TRUE)
         return Event_WorldMap;
-    if (sub_805791C(metatileBehavior) == TRUE)
+    if (MetatileBehavior_IsRunningShoesManual(metatileBehavior) == TRUE)
         return S_RunningShoesManual;
     if (MetatileBehavior_IsPictureBookShelf(metatileBehavior) == TRUE)
         return PictureBookShelfScript;
@@ -489,11 +489,11 @@ static u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 metatile
     {
         if (MetatileBehavior_IsSecretBasePC(metatileBehavior) == TRUE)
             return gUnknown_0815F36C;
-        if (sub_805724C(metatileBehavior) == TRUE)
+        if (MetatileBehavior_IsRecordMixingSecretBasePC(metatileBehavior) == TRUE)
             return gUnknown_0815F43A;
-        if (sub_8057364(metatileBehavior) == TRUE)
+        if (MetatileBehavior_IsSecretBaseSandOrnament(metatileBehavior) == TRUE)
             return gUnknown_0815F523;
-        if (sub_8057378(metatileBehavior) == TRUE)
+        if (MetatileBehavior_IsSecretBaseShieldOrToyTV(metatileBehavior) == TRUE)
             return gUnknown_0815F528;
     }
 
@@ -788,7 +788,7 @@ static bool8 map_warp_consider_2_to_inside(struct MapPosition *position, u16 met
 
     if (direction == DIR_NORTH)
     {
-        if (sub_80571C0(metatileBehavior) == TRUE)
+        if (MetatileBehavior_IsOpenSecretBaseDoor(metatileBehavior) == TRUE)
         {
             sub_80BC038(position, gMapHeader.events);
             return TRUE;
diff --git a/src/field_effect.c b/src/field_effect.c
index 2005f88be..93a97aa7f 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -2836,7 +2836,7 @@ void sub_80889E4(struct Task *task)
     if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject))
     {
         sub_8059BF4();
-        EventObjectSetHeldMovement(eventObject, 0x39);
+        EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION);
         task->data[0]++;
     }
 }
@@ -2968,7 +2968,7 @@ void sub_8088CA0(struct Task *task)
         gPlayerAvatar.preventStep = TRUE;
         SetPlayerAvatarStateMask(1);
         sub_8059BF4();
-        EventObjectSetHeldMovement(eventObject, 0x39);
+        EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION);
         task->data[0]++;
     }
 }
@@ -3008,7 +3008,7 @@ void sub_8088D94(struct Task *task)
         task->data[0]++;
         task->data[2] = 16;
         SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT);
-        EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], 0x02);
+        EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], MOVEMENT_ACTION_FACE_LEFT);
     }
 }
 
@@ -3033,7 +3033,7 @@ void sub_8088E2C(struct Task *task)
         sub_805B980(eventObject, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING));
         StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16);
         eventObject->inanimate = 1;
-        EventObjectSetHeldMovement(eventObject, 0x48);
+        EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT);
         if (task->data[15] & 0x08)
         {
             DestroySprite(&gSprites[eventObject->fieldEffectSpriteId]);
@@ -3343,7 +3343,7 @@ void sub_8089414(struct Task *task)
         sprite->pos2.y = 0;
         sprite->coordOffsetEnabled = 1;
         sub_8059BF4();
-        EventObjectSetHeldMovement(eventObject, 0x39);
+        EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION);
         task->data[0]++;
     }
 }
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index 11f6e12b2..73082bdb7 100644
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -62,7 +62,7 @@ static void npc_pal_op(struct EventObject *eventObject, struct Sprite *sprite)
     u8 whichElement;
     u16 unk_8041e2c[] = {0x0c, 0x1c, 0x2c};
     sprite->data[2] = 0;
-    if (!GetEventObjectGraphicsInfo(eventObject->graphicsId)->disableReflectionPaletteLoad && ((whichElement = sub_8057450(eventObject->previousMetatileBehavior)) || (whichElement = sub_8057450(eventObject->currentMetatileBehavior))))
+    if (!GetEventObjectGraphicsInfo(eventObject->graphicsId)->disableReflectionPaletteLoad && ((whichElement = MetatileBehavior_GetBridgeType(eventObject->previousMetatileBehavior)) || (whichElement = MetatileBehavior_GetBridgeType(eventObject->currentMetatileBehavior))))
     {
         sprite->data[2] = unk_8041e2c[whichElement - 1];
         npc_pal_op_A(eventObject, sprite->oam.paletteNum);
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index 8610edca2..a9dc78dfa 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -231,7 +231,7 @@ void sub_8080B9C(u8 taskId)
             u8 eventObjId;
             sub_8080958(1);
             eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0);
-            EventObjectSetHeldMovement(&gEventObjects[eventObjId], 8);
+            EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_DOWN);
             task->data[0] = 2;
         }
         break;
@@ -573,7 +573,7 @@ void sub_808115C(u8 taskId)
             eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0);
             EventObjectClearHeldMovementIfActive(&gEventObjects[eventObjId]);
             eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0);
-            EventObjectSetHeldMovement(&gEventObjects[eventObjId], 9);
+            EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_UP);
             task->data[0] = 2;
         }
         break;
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index f17cd9bc6..dac26ff32 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -50,11 +50,11 @@ static void PlayCollisionSoundIfNotFacingWarp(u8 a);
 static void sub_8059D60(struct EventObject *a);
 static void StartStrengthAnim(u8 a, u8 b);
 static void DoPlayerMatJump(void);
-static void sub_805A06C(void);
+static void DoPlayerMatSpin(void);
 u8 debug_sub_805F2B0(u8);
 u8 debug_sub_805F2DC(u8);
 
-static bool8 (*const gUnknown_0830FB58[])(u8) =
+static bool8 (*const sForcedMovementTestFuncs[])(u8) =
 {
     MetatileBehavior_IsTrickHouseSlipperyFloor,
     MetatileBehavior_IsIce_2,
@@ -71,30 +71,30 @@ static bool8 (*const gUnknown_0830FB58[])(u8) =
     MetatileBehavior_IsSlideWest,
     MetatileBehavior_IsSlideEast,
     MetatileBehavior_IsWaterfall,
-    MetatileBehavior_0xBB,
-    MetatileBehavior_0xBC,
+    MetatileBehavior_IsSecretBaseJumpMat,
+    MetatileBehavior_IsSecretBaseSpinMat,
     MetatileBehavior_IsMuddySlope,
 };
-static bool8 (*const gUnknown_0830FBA0[])(void) =
+static bool8 (*const sForcedMovementFuncs[])(void) =
 {
     ForcedMovement_None,
     ForcedMovement_Slip,
     ForcedMovement_Slip,
-    sub_8058AAC,
-    sub_8058AC4,
-    sub_8058ADC,
-    sub_8058AF4,
-    sub_8058B0C,
-    sub_8058B24,
-    sub_8058B3C,
-    sub_8058B54,
+    ForcedMovement_WalkSouth,
+    ForcedMovement_WalkNorth,
+    ForcedMovement_WalkWest,
+    ForcedMovement_WalkEast,
+    ForcedMovement_RideCurrentSouth,
+    ForcedMovement_RideCurrentNorth,
+    ForcedMovement_RideCurrentWest,
+    ForcedMovement_RideCurrentEast,
     ForcedMovement_SlideSouth,
     ForcedMovement_SlideNorth,
     ForcedMovement_SlideWest,
     ForcedMovement_SlideEast,
-    sub_8058B0C,
-    ForcedMovement_MatJump,
-    sub_8058C10,
+    ForcedMovement_RideCurrentSouth,
+    ForcedMovement_SecretBaseJumpMat,
+    ForcedMovement_SecretBaseSpinMat,
     ForcedMovement_MuddySlope,
 };
 static void (*const gUnknown_0830FBEC[])(u8, u16) =
@@ -188,12 +188,12 @@ static u8 (*const sPlayerAvatarSecretBaseMatJump[])(struct Task *, struct EventO
 {
     PlayerAvatar_DoSecretBaseMatJump,
 };
-static u8 (*const gUnknown_0830FC98[])(struct Task *, struct EventObject *) =
+static u8 (*const sPlayerAvatarSecretBaseMatSpin[])(struct Task *, struct EventObject *) =
 {
-    sub_805A0D8,
-    sub_805A100,
-    sub_805A178,
-    sub_805A1B8,
+    PlayerAvatar_SecretBaseMatSpinStep0,
+    PlayerAvatar_SecretBaseMatSpinStep1,
+    PlayerAvatar_SecretBaseMatSpinStep2,
+    PlayerAvatar_SecretBaseMatSpinStep3,
 };
 
 movement_type_empty_callback(MovementType_Player);
@@ -267,7 +267,7 @@ static bool8 TryDoMetatileBehaviorForcedMovement(void)
     if (gUnknown_020297ED != 0 && (gMain.heldKeys & R_BUTTON))
         return 0;
 #endif
-    return gUnknown_0830FBA0[GetForcedMovementByMetatileBehavior()]();
+    return sForcedMovementFuncs[GetForcedMovementByMetatileBehavior()]();
 }
 
 static u8 GetForcedMovementByMetatileBehavior(void)
@@ -276,11 +276,11 @@ static u8 GetForcedMovementByMetatileBehavior(void)
 
     if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_5))
     {
-        u8 r5 = gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior;
+        u8 metatileBehavior = gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior;
 
         for (i = 0; i < 18; i++)
         {
-            if (gUnknown_0830FB58[i](r5))
+            if (sForcedMovementTestFuncs[i](metatileBehavior))
                 return i + 1;
         }
     }
@@ -344,44 +344,44 @@ bool8 ForcedMovement_Slip(void)
     return DoForcedMovementInCurrentDirection(PlayerGoSpeed2);
 }
 
-bool8 sub_8058AAC(void)
+bool8 ForcedMovement_WalkSouth(void)
 {
     return DoForcedMovement(DIR_SOUTH, PlayerGoSpeed1);
 }
 
-bool8 sub_8058AC4(void)
+bool8 ForcedMovement_WalkNorth(void)
 {
     return DoForcedMovement(DIR_NORTH, PlayerGoSpeed1);
 }
 
-bool8 sub_8058ADC(void)
+bool8 ForcedMovement_WalkWest(void)
 {
     return DoForcedMovement(DIR_WEST, PlayerGoSpeed1);
 }
 
-bool8 sub_8058AF4(void)
+bool8 ForcedMovement_WalkEast(void)
 {
     return DoForcedMovement(DIR_EAST, PlayerGoSpeed1);
 }
 
-bool8 sub_8058B0C(void)
+bool8 ForcedMovement_RideCurrentSouth(void)
 {
-    return DoForcedMovement(DIR_SOUTH, npc_use_some_d2s);
+    return DoForcedMovement(DIR_SOUTH, PlayerRideWaterCurrent);
 }
 
-bool8 sub_8058B24(void)
+bool8 ForcedMovement_RideCurrentNorth(void)
 {
-    return DoForcedMovement(DIR_NORTH, npc_use_some_d2s);
+    return DoForcedMovement(DIR_NORTH, PlayerRideWaterCurrent);
 }
 
-bool8 sub_8058B3C(void)
+bool8 ForcedMovement_RideCurrentWest(void)
 {
-    return DoForcedMovement(DIR_WEST, npc_use_some_d2s);
+    return DoForcedMovement(DIR_WEST, PlayerRideWaterCurrent);
 }
 
-bool8 sub_8058B54(void)
+bool8 ForcedMovement_RideCurrentEast(void)
 {
-    return DoForcedMovement(DIR_EAST, npc_use_some_d2s);
+    return DoForcedMovement(DIR_EAST, PlayerRideWaterCurrent);
 }
 
 static u8 ForcedMovement_Slide(u8 direction, void (*b)(u8))
@@ -413,15 +413,15 @@ bool8 ForcedMovement_SlideEast(void)
     return ForcedMovement_Slide(DIR_EAST, PlayerGoSpeed2);
 }
 
-bool8 ForcedMovement_MatJump(void)
+bool8 ForcedMovement_SecretBaseJumpMat(void)
 {
     DoPlayerMatJump();
     return TRUE;
 }
 
-bool8 sub_8058C10(void)
+bool8 ForcedMovement_SecretBaseSpinMat(void)
 {
-    sub_805A06C();
+    DoPlayerMatSpin();
     return TRUE;
 }
 
@@ -783,7 +783,7 @@ void PlayerGoSpeed2(u8 a)
     PlayerSetAnimId(GetWalkFastMovementAction(a), 2);
 }
 
-void npc_use_some_d2s(u8 a)
+void PlayerRideWaterCurrent(u8 a)
 {
     PlayerSetAnimId(GetRideWaterCurrentMovementAction(a), 2);
 }
@@ -1305,22 +1305,22 @@ u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct EventObject *event
 
 /* Some field effect */
 
-static void sub_805A08C(u8 taskId);
+static void PlayerAvatar_DoSecretBaseMatSpin(u8 taskId);
 
-static void sub_805A06C(void)
+static void DoPlayerMatSpin(void)
 {
-    u8 taskId = CreateTask(sub_805A08C, 0xFF);
+    u8 taskId = CreateTask(PlayerAvatar_DoSecretBaseMatSpin, 0xFF);
 
-    sub_805A08C(taskId);
+    PlayerAvatar_DoSecretBaseMatSpin(taskId);
 }
 
-static void sub_805A08C(u8 taskId)
+static void PlayerAvatar_DoSecretBaseMatSpin(u8 taskId)
 {
-    while (gUnknown_0830FC98[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId]))
+    while (sPlayerAvatarSecretBaseMatSpin[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId]))
         ;
 }
 
-u8 sub_805A0D8(struct Task *task, struct EventObject *eventObject)
+u8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct EventObject *eventObject)
 {
     task->data[0]++;
     task->data[1] = eventObject->movementDirection;
@@ -1330,7 +1330,7 @@ u8 sub_805A0D8(struct Task *task, struct EventObject *eventObject)
     return 1;
 }
 
-u8 sub_805A100(struct Task *task, struct EventObject *eventObject)
+u8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct EventObject *eventObject)
 {
     u8 directions[] = {DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
 
@@ -1348,26 +1348,32 @@ u8 sub_805A100(struct Task *task, struct EventObject *eventObject)
     return 0;
 }
 
-u8 sub_805A178(struct Task *task, struct EventObject *eventObject)
+u8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct EventObject *eventObject)
 {
-    const u8 arr[] = {16, 16, 17, 18, 19};
+    const u8 actions[] = {
+        MOVEMENT_ACTION_DELAY_1,
+        MOVEMENT_ACTION_DELAY_1,
+        MOVEMENT_ACTION_DELAY_2,
+        MOVEMENT_ACTION_DELAY_4,
+        MOVEMENT_ACTION_DELAY_8,
+    };
 
     if (EventObjectClearHeldMovementIfFinished(eventObject))
     {
-        EventObjectSetHeldMovement(eventObject, arr[task->data[2]]);
+        EventObjectSetHeldMovement(eventObject, actions[task->data[2]]);
         task->data[0] = 1;
     }
     return 0;
 }
 
-u8 sub_805A1B8(struct Task *task, struct EventObject *eventObject)
+u8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct EventObject *eventObject)
 {
     if (EventObjectClearHeldMovementIfFinished(eventObject))
     {
         EventObjectSetHeldMovement(eventObject, GetWalkSlowMovementAction(GetOppositeDirection(task->data[1])));
         ScriptContext2_Disable();
         gPlayerAvatar.preventStep = FALSE;
-        DestroyTask(FindTaskIdByFunc(sub_805A08C));
+        DestroyTask(FindTaskIdByFunc(PlayerAvatar_DoSecretBaseMatSpin));
     }
     return 0;
 }
diff --git a/src/field_specials.c b/src/field_specials.c
index 829a933bf..cb400dc2d 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -54,7 +54,7 @@ EWRAM_DATA bool8 gBikeCyclingChallenge = FALSE;
 EWRAM_DATA u8 gBikeCollisions = 0;
 EWRAM_DATA u32 gBikeCyclingTimer = 0;
 EWRAM_DATA u8 gUnknown_02039258 = 0;
-EWRAM_DATA u8 gUnknown_02039259 = 0;
+EWRAM_DATA u8 gPetalburgGymSlidingDoorIndex = 0;
 EWRAM_DATA u8 gUnknown_0203925A = 0;
 EWRAM_DATA u8 gUnknown_0203925B = 0;
 EWRAM_DATA u8 gUnknown_0203925C = 0;
@@ -552,26 +552,26 @@ void MauvilleGymSpecial3(void)
     }
 }
 
-static void Task_PetalburgGym(u8);
-static void PetalburgGymFunc(u8, u16);
+static void Task_SlideOpenPetalburgGymDoors(u8);
+static void SetPetalburgGymDoorTiles(u8, u16);
 const u8 gUnknown_083F8370[] = {0, 1, 1, 1, 1};
-const u16 gUnknown_083F8376[] = {0x218, 0x219, 0x21a, 0x21b, 0x21c};
+const u16 gPetalburgGymSlidingDoorMetatiles[] = {0x218, 0x219, 0x21a, 0x21b, 0x21c};
 
-void PetalburgGymSpecial1(void)
+void PetalburgGymSlideOpenDoors(void)
 {
     gUnknown_02039258 = 0;
-    gUnknown_02039259 = 0;
+    gPetalburgGymSlidingDoorIndex = 0;
     PlaySE(SE_KI_GASYAN);
-    CreateTask(Task_PetalburgGym, 8);
+    CreateTask(Task_SlideOpenPetalburgGymDoors, 8);
 }
 
-static void Task_PetalburgGym(u8 taskId)
+static void Task_SlideOpenPetalburgGymDoors(u8 taskId)
 {
-    if (gUnknown_083F8370[gUnknown_02039259] == gUnknown_02039258)
+    if (gUnknown_083F8370[gPetalburgGymSlidingDoorIndex] == gUnknown_02039258)
     {
-        PetalburgGymFunc(gSpecialVar_0x8004, gUnknown_083F8376[gUnknown_02039259]);
+        SetPetalburgGymDoorTiles(gSpecialVar_0x8004, gPetalburgGymSlidingDoorMetatiles[gPetalburgGymSlidingDoorIndex]);
         gUnknown_02039258 = 0;
-        if ((++gUnknown_02039259) == 5)
+        if ((++gPetalburgGymSlidingDoorIndex) == 5)
         {
             DestroyTask(taskId);
             EnableBothScriptContexts();
@@ -583,74 +583,76 @@ static void Task_PetalburgGym(u8 taskId)
     }
 }
 
-static void PetalburgGymFunc(u8 a0, u16 a1)
+static void SetPetalburgGymDoorTiles(u8 roomIndex, u16 metatile)
 {
     u16 x[4];
     u16 y[4];
     u8 i;
-    u8 nDoors = 0;
-    switch (a0)
+    u8 numDoors = 0;
+    switch (roomIndex)
     {
         case 1:
-            nDoors = 2;
+            numDoors = 2;
             x[0] = 1;
             x[1] = 7;
             y[0] = 0x68;
             y[1] = 0x68;
             break;
         case 2:
-            nDoors = 2;
+            numDoors = 2;
             x[0] = 1;
             x[1] = 7;
             y[0] = 0x4e;
             y[1] = 0x4e;
             break;
         case 3:
-            nDoors = 2;
+            numDoors = 2;
             x[0] = 1;
             x[1] = 7;
             y[0] = 0x5b;
             y[1] = 0x5b;
             break;
         case 4:
-            nDoors = 1;
+            numDoors = 1;
             x[0] = 7;
             y[0] = 0x27;
             break;
         case 5:
-            nDoors = 2;
+            numDoors = 2;
             x[0] = 1;
             x[1] = 7;
             y[0] = 0x34;
             y[1] = 0x34;
             break;
         case 6:
-            nDoors = 1;
+            numDoors = 1;
             x[0] = 1;
             y[0] = 0x41;
             break;
         case 7:
-            nDoors = 1;
+            numDoors = 1;
             x[0] = 7;
             y[0] = 0xd;
             break;
         case 8:
-            nDoors = 1;
+            numDoors = 1;
             x[0] = 1;
             y[0] = 0x1a;
             break;
     }
-    for (i=0; i<nDoors; i++)
+
+    for (i = 0; i < numDoors; i++)
     {
-        MapGridSetMetatileIdAt(x[i] + 7, y[i] + 7, a1 | 0xc00);
-        MapGridSetMetatileIdAt(x[i] + 7, y[i] + 8, (a1 + 8) | 0xc00);
+        MapGridSetMetatileIdAt(x[i] + 7, y[i] + 7, metatile | 0xc00);
+        MapGridSetMetatileIdAt(x[i] + 7, y[i] + 8, (metatile + 8) | 0xc00);
     }
+
     DrawWholeMapView();
 }
 
-void PetalburgGymSpecial2(void)
+void PetalburgGymOpenDoorsInstantly(void)
 {
-    PetalburgGymFunc(gSpecialVar_0x8004, gUnknown_083F8376[4]);
+    SetPetalburgGymDoorTiles(gSpecialVar_0x8004, gPetalburgGymSlidingDoorMetatiles[4]);
 }
 
 void ShowFieldMessageStringVar4(void)
diff --git a/src/field_tasks.c b/src/field_tasks.c
index e4f1aadf2..25a4efc58 100644
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -171,19 +171,19 @@ void DummyPerStepCallback(u8 taskId) {}
 
 const struct MetatileOffset *sub_80695E0(const struct MetatileOffset a0[][2], s8 a1)
 {
-    if (sub_80576A0(a1))
+    if (MetatileBehavior_IsPacifidlogVerticalLog1(a1))
     {
         return a0[0];
     }
-    else if (sub_80576B4(a1))
+    else if (MetatileBehavior_IsPacifidlogVerticalLog2(a1))
     {
         return a0[1];
     }
-    else if (sub_80576C8(a1))
+    else if (MetatileBehavior_IsPacifidlogHorizontalLog1(a1))
     {
         return a0[2];
     }
-    else if (sub_80576DC(a1))
+    else if (MetatileBehavior_IsPacifidlogHorizontalLog2(a1))
     {
         return a0[3];
     }
@@ -301,28 +301,28 @@ void sub_8069708(s16 x, s16 y, bool32 flag)
 bool32 sub_806972C(s16 x1, s16 y1, s16 x2, s16 y2)
 {
     s8 metatileBehavior = MapGridGetMetatileBehaviorAt(x2, y2);
-    if (sub_80576A0(metatileBehavior))
+    if (MetatileBehavior_IsPacifidlogVerticalLog1(metatileBehavior))
     {
         if (y1 > y2)
         {
             return FALSE;
         }
     }
-    else if (sub_80576B4(metatileBehavior))
+    else if (MetatileBehavior_IsPacifidlogVerticalLog2(metatileBehavior))
     {
         if (y1 < y2)
         {
             return FALSE;
         }
     }
-    else if (sub_80576C8(metatileBehavior))
+    else if (MetatileBehavior_IsPacifidlogHorizontalLog1(metatileBehavior))
     {
         if (x1 > x2)
         {
             return FALSE;
         }
     }
-    else if (sub_80576DC(metatileBehavior))
+    else if (MetatileBehavior_IsPacifidlogHorizontalLog2(metatileBehavior))
     {
         if (x1 < x2)
         {
@@ -335,28 +335,28 @@ bool32 sub_806972C(s16 x1, s16 y1, s16 x2, s16 y2)
 bool32 sub_80697C8(s16 x1, s16 y1, s16 x2, s16 y2)
 {
     s8 metatileBehavior = MapGridGetMetatileBehaviorAt(x1, y1);
-    if (sub_80576A0(metatileBehavior))
+    if (MetatileBehavior_IsPacifidlogVerticalLog1(metatileBehavior))
     {
         if (y1 < y2)
         {
             return FALSE;
         }
     }
-    else if (sub_80576B4(metatileBehavior))
+    else if (MetatileBehavior_IsPacifidlogVerticalLog2(metatileBehavior))
     {
         if (y1 > y2)
         {
             return FALSE;
         }
     }
-    else if (sub_80576C8(metatileBehavior))
+    else if (MetatileBehavior_IsPacifidlogHorizontalLog1(metatileBehavior))
     {
         if (x1 < x2)
         {
             return FALSE;
         }
     }
-    else if (sub_80576DC(metatileBehavior))
+    else if (MetatileBehavior_IsPacifidlogHorizontalLog2(metatileBehavior))
     {
         if (x1 > x2)
         {
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index c8c3325df..14c4ea018 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -90,7 +90,7 @@ void Debug_SetUpFieldMove_Cut(void)
 {
     s16 x, y;
     u8 i, j;
-    u8 metatile;
+    u8 metatileBehavior;
 
     if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_CUTTABLE_TREE) == TRUE)
     {
@@ -108,9 +108,9 @@ void Debug_SetUpFieldMove_Cut(void)
             x = j - 1 + gPlayerFacingPosition.x;
             if (MapGridGetZCoordAt(x, y) == gPlayerFacingPosition.height)
             {
-                metatile = MapGridGetMetatileBehaviorAt(x, y);
-                if (MetatileBehavior_IsPokeGrass(metatile) == TRUE
-                 || MetatileBehavior_IsAshGrass(metatile) == TRUE)
+                metatileBehavior = MapGridGetMetatileBehaviorAt(x, y);
+                if (MetatileBehavior_IsPokeGrass(metatileBehavior) == TRUE
+                 || MetatileBehavior_IsAshGrass(metatileBehavior) == TRUE)
                 {
                     gLastFieldPokeMenuOpened = 0;
                     FieldCallback_CutGrass();
diff --git a/src/fldeff_decoration.c b/src/fldeff_decoration.c
index ea0eb96c5..d65a23e95 100644
--- a/src/fldeff_decoration.c
+++ b/src/fldeff_decoration.c
@@ -78,7 +78,7 @@ extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[36]
 static void sub_80C68EC(u8);
 static void DoBalloonSoundEffect(s16);
 
-void sub_80C68A4(s16 metatileId, s16 x, s16 y)
+void PopSecretBaseBalloon(s16 metatileId, s16 x, s16 y)
 {
     u8 taskId = CreateTask(sub_80C68EC, 0);
 
@@ -162,7 +162,7 @@ static void sub_80C6A14(u8 taskId)
     }
 }
 
-void sub_80C6A54(s16 x, s16 y)
+void ShatterSecretBaseBreakableDoor(s16 x, s16 y)
 {
     u8 dir = GetPlayerFacingDirection();
     if (dir == DIR_SOUTH)
@@ -178,11 +178,11 @@ void sub_80C6A54(s16 x, s16 y)
     }
 }
 
-static void Task_DecorationSoundEffect(u8 taskId)
+static void Task_SecretBaseMusicNoteMatSound(u8 taskId)
 {
     if (gTasks[taskId].data[1] == 7)
     {
-        switch (gTasks[taskId].data[0])
+        switch (gTasks[taskId].data[0]) // metatileId
         {
         case 632:
             PlaySE(SE_TOY_C);
@@ -218,14 +218,14 @@ static void Task_DecorationSoundEffect(u8 taskId)
     }
 }
 
-void DoDecorationSoundEffect(s16 arg)
+void PlaySecretBaseMusicNoteMatSound(s16 metatileId)
 {
-    u8 taskId = CreateTask(Task_DecorationSoundEffect, 5);
-    gTasks[taskId].data[0] = arg;
+    u8 taskId = CreateTask(Task_SecretBaseMusicNoteMatSound, 5);
+    gTasks[taskId].data[0] = metatileId;
     gTasks[taskId].data[1] = 0;
 }
 
-void SpriteCB_YellowCave4Sparkle(struct Sprite *sprite)
+void SpriteCB_GlitterMatSparkle(struct Sprite *sprite)
 {
     sprite->data[0]++;
     if (sprite->data[0] == 8)
@@ -234,7 +234,7 @@ void SpriteCB_YellowCave4Sparkle(struct Sprite *sprite)
         DestroySprite(sprite);
 }
 
-void DoYellowCave4Sparkle(void)
+void DoSecretBaseGlitterMatSparkle(void)
 {
     s16 x = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x;
     s16 y = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y;
@@ -247,7 +247,7 @@ void DoYellowCave4Sparkle(void)
         gSprites[spriteId].coordOffsetEnabled = TRUE;
         gSprites[spriteId].oam.priority = 1;
         gSprites[spriteId].oam.paletteNum = 5;
-        gSprites[spriteId].callback = SpriteCB_YellowCave4Sparkle;
+        gSprites[spriteId].callback = SpriteCB_GlitterMatSparkle;
         gSprites[spriteId].data[0] = 0;
     }
 }
diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c
index 04e7d8102..c941310fb 100644
--- a/src/metatile_behavior.c
+++ b/src/metatile_behavior.c
@@ -2,58 +2,58 @@
 #include "metatile_behavior.h"
 #include "constants/metatile_behaviors.h"
 
-#define TILE_ATTRIBUTES(three, two, one) (((one) ? 1 : 0) | ((two) ? 2 : 0) | ((three) ? 4 : 0))
+#define TILE_ATTRIBUTES(unused, surfable, wildEncounter) (((wildEncounter) ? 1 : 0) | ((surfable) ? 2 : 0) | ((unused) ? 4 : 0))
 
 static const u8 sTileBitAttributes[] =
 {
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_NORMAL
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_01
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_WALL
     TILE_ATTRIBUTES(TRUE, FALSE, TRUE),   // MB_TALL_GRASS
     TILE_ATTRIBUTES(TRUE, FALSE, TRUE),   // MB_LONG_GRASS
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_04
-    TILE_ATTRIBUTES(FALSE, FALSE, TRUE),  // MB_05
-    TILE_ATTRIBUTES(TRUE, FALSE, TRUE),   // MB_DEEP_SAND
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_04
+    TILE_ATTRIBUTES(FALSE, FALSE, TRUE),  // MB_UNUSED_05
+    TILE_ATTRIBUTES(TRUE, FALSE, TRUE),   // MB_UNUSED_DEEP_SAND
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SHORT_GRASS
-    TILE_ATTRIBUTES(TRUE, FALSE, TRUE),   // MB_CAVE
+    TILE_ATTRIBUTES(TRUE, FALSE, TRUE),   // MB_UNUSED_CAVE
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_LONG_GRASS_SOUTH_EDGE
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_NO_RUNNING
-    TILE_ATTRIBUTES(TRUE, FALSE, TRUE),   // MB_0B
+    TILE_ATTRIBUTES(TRUE, FALSE, TRUE),   // MB_INDOOR_ENCOUNTER
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_MOUNTAIN_TOP
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_BATTLE_PYRAMID_WARP
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_GLITTER_MATTTLE_PYRAMID_WARP
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_MOSSDEEP_GYM_WARP
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_MT_PYRE_HOLE
     TILE_ATTRIBUTES(TRUE, TRUE, TRUE),    // MB_POND_WATER
     TILE_ATTRIBUTES(TRUE, TRUE, TRUE),    // MB_SEMI_DEEP_WATER
-    TILE_ATTRIBUTES(TRUE, TRUE, TRUE),    // MB_DEEP_WATER
+    TILE_ATTRIBUTES(TRUE, TRUE, TRUE),    // MB_UNUSED_DEEP_WATER
     TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_WATERFALL
     TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_SOOTOPOLIS_DEEP_WATER
     TILE_ATTRIBUTES(TRUE, TRUE, TRUE),    // MB_OCEAN_WATER
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_PUDDLE
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SHALLOW_WATER
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_18
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_SOOTOPOLIS_DEEP_WATER
     TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_NO_SURFACING
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_1A
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_SOOTOPOLIS_DEEP_WATER_2
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_STAIRS_OUTSIDE_ABANDONED_SHIP
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SHOAL_CAVE_ENTRANCE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_1D
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_1E
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_1F
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_1D
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_1E
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_1F
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ICE
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SAND
     TILE_ATTRIBUTES(TRUE, TRUE, TRUE),    // MB_SEAWEED
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_23
+    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_UNUSED_23
     TILE_ATTRIBUTES(TRUE, FALSE, TRUE),   // MB_ASHGRASS
-    TILE_ATTRIBUTES(TRUE, FALSE, TRUE),   // MB_25
+    TILE_ATTRIBUTES(TRUE, FALSE, TRUE),   // MB_FOOTPRINTS
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_THIN_ICE
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_CRACKED_ICE
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_HOT_SPRINGS
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_LAVARIDGE_GYM_B1F_WARP
     TILE_ATTRIBUTES(TRUE, TRUE, TRUE),    // MB_SEAWEED_NO_SURFACING
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_REFLECTION_UNDER_BRIDGE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_2C
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_2D
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_2E
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_2F
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_2C
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_2D
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_2E
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_2F
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_IMPASSABLE_EAST
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_IMPASSABLE_WEST
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_IMPASSABLE_NORTH
@@ -66,8 +66,8 @@ static const u8 sTileBitAttributes[] =
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_JUMP_WEST
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_JUMP_NORTH
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_JUMP_SOUTH
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_3C
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_3D
+    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_JUMP_NORTHEAST
+    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_JUMP_NORTHWEST
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_JUMP_SOUTHEAST
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_JUMP_SOUTHWEST
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_WALK_EAST
@@ -79,32 +79,32 @@ static const u8 sTileBitAttributes[] =
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SLIDE_NORTH
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SLIDE_SOUTH
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_TRICK_HOUSE_PUZZLE_8_FLOOR
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_49
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_4A
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_4B
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_4C
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_4D
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_4E
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_4F
-    TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_EASTWARD_CURRENT
+    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_UNUSED_49
+    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_UNUSED_4A
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4B
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4C
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4D
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4E
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_4F
+    TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_UNUSED_EASTWARD_CURRENT
     TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_WESTWARD_CURRENT
     TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_NORTHWARD_CURRENT
     TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_SOUTHWARD_CURRENT
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_54
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_55
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_56
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_57
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_58
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_59
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_5A
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_5B
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_5C
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_5D
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_5E
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_5F
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_54
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_55
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_56
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_57
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_58
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_59
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5A
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5B
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5C
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5D
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5E
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_5F
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_NON_ANIMATED_DOOR
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_LADDER
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_EAST_ARROW_WARP
+    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_UNUSED_EAST_ARROW_WARP
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_WEST_ARROW_WARP
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_NORTH_ARROW_WARP
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SOUTH_ARROW_WARP
@@ -116,10 +116,10 @@ static const u8 sTileBitAttributes[] =
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_DOWN_ESCALATOR
     TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_WATER_DOOR
     TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_WATER_SOUTH_ARROW_WARP
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_DEEP_SOUTH_WARP
-    TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_6F
+    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_UNUSED_DEEP_SOUTH_WARP
+    TILE_ATTRIBUTES(TRUE, TRUE, FALSE),   // MB_UNUSED_6F
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_WARP_OR_BRIDGE
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_71
+    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_UNUSED_71
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ROUTE120_NORTH_BRIDGE_1
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ROUTE120_NORTH_BRIDGE_2
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_PACIFIDLOG_VERTICAL_LOG_1
@@ -127,93 +127,93 @@ static const u8 sTileBitAttributes[] =
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_PACIFIDLOG_HORIZONTAL_LOG_1
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_PACIFIDLOG_HORIZONTAL_LOG_2
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_FORTREE_BRIDGE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_79
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_79
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_ROUTE120_SOUTH_BRIDGE_1
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_ROUTE120_SOUTH_BRIDGE_2
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_ROUTE120_NORTH_BRIDGE_3
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_ROUTE120_NORTH_BRIDGE_4
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_7E
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_7E
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_ROUTE110_BRIDGE
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_COUNTER
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_81
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_82
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_81
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_82
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_PC
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_84
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_LINK_BATTLE_RECORDS
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_REGION_MAP
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_TELEVISION
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_POKEBLOCK_FEEDER
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_88
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_88
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SLOT_MACHINE
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_ROULETTE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_CLOSED_SOOTOPOLIS_GYM_DOOR
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_CLOSED_SOOTOPOLIS_DOOR
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_TRICK_HOUSE_PUZZLE_DOOR
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_8D
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_8E
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_PETALBURG_GYM_DOOR
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_RUNNING_SHOES_MANUAL
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_QUESTIONNAIRE
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_RED_CAVE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_91
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_RED_CAVE_OPEN
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_BROWN_CAVE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_93
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_BROWN_CAVE_OPEN
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_YELLOW_CAVE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_95
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_YELLOW_CAVE_OPEN
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_TREE_1
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_97
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_TREE_1_OPEN
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_SHRUB
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_99
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_SHRUB_OPEN
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_BLUE_CAVE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_9B
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_BLUE_CAVE_OPEN
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_TREE_2
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_9D
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_9E
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_9F
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_BERRY_TREE_SOIL
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_A1
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_A2
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_A3
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_A4
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_A5
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_A6
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_A7
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_A8
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_A9
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_AA
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_AB
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_AC
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_AD
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_AE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_AF
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SPOT_TREE_2_OPEN
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_9E
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_9F
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_BREAKABLE_DOORRRY_TREE_SOIL
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A1
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A2
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A3
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A4
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A5
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A6
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A7
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A8
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_A9
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AA
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AB
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AC
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AD
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AE
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_AF
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_PC
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_B1
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_B2
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_B3
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_B4
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_B5
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_B6
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_B7
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_B8
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_B9
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_BA
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_BB
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_BC
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_BD
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_BE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_BF
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_BED
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_C1
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_C2
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_C3
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_C4
-    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_C5
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_C6
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_C7
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_C8
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_C9
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_CA
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_CB
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_CC
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_CD
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_CE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_CF
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_RECORD_MIXING_SECRET_BASE_PC
+    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_UNUSED
+    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_BLOCK_DECORATION
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_DECORATION
+    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_LARGE_MAT_EDGE
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_B6
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_NORTH_WALL
+    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_BALLOON
+    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_IMPASSABLE
+    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_GLITTER_MAT
+    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_JUMP_MAT
+    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_SPIN_MAT
+    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_MUSIC_NOTE_MAT
+    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_BREAKABLE_DOOR
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SECRET_BASE_SAND_ORNAMENT
+    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_IMPASSABLE_SOUTH_AND_NORTH
+    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_IMPASSABLE_WEST_AND_EAST
+    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_HOLE
+    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_LARGE_MAT_CENTER
+    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_SECRET_BASE_SHIELD_OR_TOY_TV
+    TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_PLAYER_ROOM_PC_ON
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_C6
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_C7
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_C8
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_C9
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CA
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CB
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CC
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CD
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CE
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_CF
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_MUDDY_SLOPE
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_BUMPY_SLOPE
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_CRACKED_FLOOR
@@ -221,15 +221,15 @@ static const u8 sTileBitAttributes[] =
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_ISOLATED_HORIZONTAL_RAIL
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_VERTICAL_RAIL
     TILE_ATTRIBUTES(TRUE, FALSE, FALSE),  // MB_HORIZONTAL_RAIL
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_D7
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_D8
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_D9
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_DA
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_DB
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_DC
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_DD
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_DE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_DF
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_D7
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_D8
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_D9
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DA
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DB
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DC
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DD
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DE
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_DF
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_PICTURE_BOOK_SHELF
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_BOOKSHELF
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_POKEMON_CENTER_BOOKSHELF
@@ -237,621 +237,652 @@ static const u8 sTileBitAttributes[] =
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_TRASH_CAN
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_SHOP_SHELF
     TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_BLUEPRINT
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_E7
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_E8
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_E9
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_EA
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_EB
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_EC
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_EE
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_EF
-    TILE_ATTRIBUTES(FALSE, FALSE, FALSE)  // MB_F0
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_E7
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_E8
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_E9
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_EA
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_EB
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_EC
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_ED
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE), // MB_UNUSED_EE
+    TILE_ATTRIBUTES(FALSE, FALSE, FALSE)  // MB_UNUSED_EF
 };
 
 // only used as default case for checking jump landing in field_ground_effect.
-bool8 MetatileBehavior_IsATile(u8 var)
+bool8 MetatileBehavior_IsATile(u8 metatileBehavior)
 {
     return TRUE;
 }
 
-bool8 MetatileBehavior_IsEncounterTile(u8 var)
+bool8 MetatileBehavior_IsEncounterTile(u8 metatileBehavior)
 {
-    if ((sTileBitAttributes[var] & 1) != 0)
+    if (sTileBitAttributes[metatileBehavior] & 1)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsJumpEast(u8 var)
+bool8 MetatileBehavior_IsJumpEast(u8 metatileBehavior)
 {
-    if (var == MB_JUMP_EAST)
+    if (metatileBehavior == MB_JUMP_EAST)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsJumpWest(u8 var)
+bool8 MetatileBehavior_IsJumpWest(u8 metatileBehavior)
 {
-    if (var == MB_JUMP_WEST)
+    if (metatileBehavior == MB_JUMP_WEST)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsJumpNorth(u8 var)
+bool8 MetatileBehavior_IsJumpNorth(u8 metatileBehavior)
 {
-    if (var == MB_JUMP_NORTH)
+    if (metatileBehavior == MB_JUMP_NORTH)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsJumpSouth(u8 var)
+bool8 MetatileBehavior_IsJumpSouth(u8 metatileBehavior)
 {
-    if (var == MB_JUMP_SOUTH)
+    if (metatileBehavior == MB_JUMP_SOUTH)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsPokeGrass(u8 var)
+bool8 MetatileBehavior_IsPokeGrass(u8 metatileBehavior)
 {
-    if (var == MB_TALL_GRASS || var == MB_LONG_GRASS)
+    if (metatileBehavior == MB_TALL_GRASS || metatileBehavior == MB_LONG_GRASS)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsSandOrDeepSand(u8 var)
+bool8 MetatileBehavior_IsSandOrDeepSand(u8 metatileBehavior)
 {
-    if (var == MB_SAND || var == MB_DEEP_SAND)
+    if (metatileBehavior == MB_SAND || metatileBehavior == MB_UNUSED_DEEP_SAND)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsDeepSand(u8 var)
+bool8 MetatileBehavior_IsDeepSand(u8 metatileBehavior)
 {
-    if (var == MB_DEEP_SAND)
+    if (metatileBehavior == MB_UNUSED_DEEP_SAND)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsReflective(u8 var)
+bool8 MetatileBehavior_IsReflective(u8 metatileBehavior)
 {
-    if (var == MB_POND_WATER || var == MB_PUDDLE || var == MB_1A || var == MB_ICE || var == MB_SOOTOPOLIS_DEEP_WATER || var == MB_REFLECTION_UNDER_BRIDGE)
+    if (metatileBehavior == MB_POND_WATER
+     || metatileBehavior == MB_PUDDLE
+     || metatileBehavior == MB_UNUSED_SOOTOPOLIS_DEEP_WATER_2
+     || metatileBehavior == MB_ICE
+     || metatileBehavior == MB_SOOTOPOLIS_DEEP_WATER
+     || metatileBehavior == MB_REFLECTION_UNDER_BRIDGE)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsIce(u8 var)
+bool8 MetatileBehavior_IsIce(u8 metatileBehavior)
 {
-    if (var == MB_ICE)
+    if (metatileBehavior == MB_ICE)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsWarpDoor(u8 var)
+bool8 MetatileBehavior_IsWarpDoor(u8 metatileBehavior)
 {
-    if (var == MB_ANIMATED_DOOR)
+    if (metatileBehavior == MB_ANIMATED_DOOR)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsDoor(u8 var)
+bool8 MetatileBehavior_IsDoor(u8 metatileBehavior)
 {
-    if (var == MB_8D || var == MB_ANIMATED_DOOR)
+    if (metatileBehavior == MB_PETALBURG_GYM_DOOR
+     || metatileBehavior == MB_ANIMATED_DOOR)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsEscalator(u8 var)
+bool8 MetatileBehavior_IsEscalator(u8 metatileBehavior)
 {
-    if (var == MB_UP_ESCALATOR || var == MB_DOWN_ESCALATOR)
+    if (metatileBehavior == MB_UP_ESCALATOR
+     || metatileBehavior == MB_DOWN_ESCALATOR)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 unref_sub_8056EE0(u8 var)
+bool8 Unref_MetatileBehavior_IsUnused04(u8 metatileBehavior)
 {
-    if (var == MB_04)
+    if (metatileBehavior == MB_UNUSED_04)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsLadder(u8 var)
+bool8 MetatileBehavior_IsLadder(u8 metatileBehavior)
 {
-    if (var == MB_LADDER)
+    if (metatileBehavior == MB_LADDER)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsNonAnimDoor(u8 var)
+bool8 MetatileBehavior_IsNonAnimDoor(u8 metatileBehavior)
 {
-    if (var == MB_NON_ANIMATED_DOOR || var == MB_WATER_DOOR || var == MB_DEEP_SOUTH_WARP)
+    if (metatileBehavior == MB_NON_ANIMATED_DOOR
+     || metatileBehavior == MB_WATER_DOOR
+     || metatileBehavior == MB_UNUSED_DEEP_SOUTH_WARP)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsDeepSouthWarp(u8 var)
+bool8 MetatileBehavior_IsDeepSouthWarp(u8 metatileBehavior)
 {
-    if (var == MB_DEEP_SOUTH_WARP)
+    if (metatileBehavior == MB_UNUSED_DEEP_SOUTH_WARP)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsSurfableWaterOrUnderwater(u8 var)
+bool8 MetatileBehavior_IsSurfableWaterOrUnderwater(u8 metatileBehavior)
 {
-    if ((sTileBitAttributes[var] & 2) != 0)
+    if ((sTileBitAttributes[metatileBehavior] & 2) != 0)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsEastArrowWarp(u8 var)
+bool8 MetatileBehavior_IsEastArrowWarp(u8 metatileBehavior)
 {
-    if (var == MB_EAST_ARROW_WARP)
+    if (metatileBehavior == MB_UNUSED_EAST_ARROW_WARP)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsWestArrowWarp(u8 var)
+bool8 MetatileBehavior_IsWestArrowWarp(u8 metatileBehavior)
 {
-    if (var == MB_WEST_ARROW_WARP)
+    if (metatileBehavior == MB_WEST_ARROW_WARP)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsNorthArrowWarp(u8 var)
+bool8 MetatileBehavior_IsNorthArrowWarp(u8 metatileBehavior)
 {
-    if (var == MB_NORTH_ARROW_WARP || var == MB_STAIRS_OUTSIDE_ABANDONED_SHIP)
+    if (metatileBehavior == MB_NORTH_ARROW_WARP
+     || metatileBehavior == MB_STAIRS_OUTSIDE_ABANDONED_SHIP)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsSouthArrowWarp(u8 var)
+bool8 MetatileBehavior_IsSouthArrowWarp(u8 metatileBehavior)
 {
-    if (var == MB_SOUTH_ARROW_WARP || var == MB_WATER_SOUTH_ARROW_WARP || var == MB_SHOAL_CAVE_ENTRANCE)
+    if (metatileBehavior == MB_SOUTH_ARROW_WARP
+     || metatileBehavior == MB_WATER_SOUTH_ARROW_WARP
+     || metatileBehavior == MB_SHOAL_CAVE_ENTRANCE)
         return TRUE;
     else
         return FALSE;
 }
 
-// unused
-bool8 MetatileBehavior_IsArrowWarp(u8 var)
+bool8 Unref_MetatileBehavior_IsArrowWarp(u8 metatileBehavior)
 {
-    u8 var2 = 0;
+    u8 isArrowWarp = FALSE;
 
-    if (MetatileBehavior_IsEastArrowWarp(var)
-        || MetatileBehavior_IsWestArrowWarp(var)
-        || MetatileBehavior_IsNorthArrowWarp(var)
-        || MetatileBehavior_IsSouthArrowWarp(var))
+    if (MetatileBehavior_IsEastArrowWarp(metatileBehavior)
+     || MetatileBehavior_IsWestArrowWarp(metatileBehavior)
+     || MetatileBehavior_IsNorthArrowWarp(metatileBehavior)
+     || MetatileBehavior_IsSouthArrowWarp(metatileBehavior))
     {
-        var2 = 1;
+        isArrowWarp = TRUE;
     }
-        return var2;
+
+    return isArrowWarp;
 }
 
-bool8 MetatileBehavior_IsMoveTile(u8 var)
+bool8 MetatileBehavior_IsForcedMovementTile(u8 metatileBehavior)
 {
-    if ((var >= MB_WALK_EAST && var <= MB_TRICK_HOUSE_PUZZLE_8_FLOOR) || (var >= MB_EASTWARD_CURRENT && var <= MB_SOUTHWARD_CURRENT)
-    || var == MB_MUDDY_SLOPE || var == MB_CRACKED_FLOOR || var == MB_WATERFALL || var == MB_ICE || var == MB_BB || var == MB_BC)
+    if ((metatileBehavior >= MB_WALK_EAST && metatileBehavior <= MB_TRICK_HOUSE_PUZZLE_8_FLOOR)
+     || (metatileBehavior >= MB_UNUSED_EASTWARD_CURRENT && metatileBehavior <= MB_SOUTHWARD_CURRENT)
+     || metatileBehavior == MB_MUDDY_SLOPE
+     || metatileBehavior == MB_CRACKED_FLOOR
+     || metatileBehavior == MB_WATERFALL
+     || metatileBehavior == MB_ICE
+     || metatileBehavior == MB_SECRET_BASE_JUMP_MAT
+     || metatileBehavior == MB_SECRET_BASE_SPIN_MAT)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsIce_2(u8 var)
+bool8 MetatileBehavior_IsIce_2(u8 metatileBehavior)
 {
-    if (var == MB_ICE)
+    if (metatileBehavior == MB_ICE)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsTrickHouseSlipperyFloor(u8 var)
+bool8 MetatileBehavior_IsTrickHouseSlipperyFloor(u8 metatileBehavior)
 {
-    if (var == MB_TRICK_HOUSE_PUZZLE_8_FLOOR)
+    if (metatileBehavior == MB_TRICK_HOUSE_PUZZLE_8_FLOOR)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_0x05(u8 var)
+bool8 Unref_MetatileBehavior_IsUnused05(u8 metatileBehavior)
 {
-    if (var == MB_05)
+    if (metatileBehavior == MB_UNUSED_05)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsWalkNorth(u8 var)
+bool8 MetatileBehavior_IsWalkNorth(u8 metatileBehavior)
 {
-    if (var == MB_WALK_NORTH)
+    if (metatileBehavior == MB_WALK_NORTH)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsWalkSouth(u8 var)
+bool8 MetatileBehavior_IsWalkSouth(u8 metatileBehavior)
 {
-    if (var == MB_WALK_SOUTH)
+    if (metatileBehavior == MB_WALK_SOUTH)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsWalkWest(u8 var)
+bool8 MetatileBehavior_IsWalkWest(u8 metatileBehavior)
 {
-    if (var == MB_WALK_WEST)
+    if (metatileBehavior == MB_WALK_WEST)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsWalkEast(u8 var)
+bool8 MetatileBehavior_IsWalkEast(u8 metatileBehavior)
 {
-    if (var == MB_WALK_EAST)
+    if (metatileBehavior == MB_WALK_EAST)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsNorthwardCurrent(u8 var)
+bool8 MetatileBehavior_IsNorthwardCurrent(u8 metatileBehavior)
 {
-    if (var == MB_NORTHWARD_CURRENT)
+    if (metatileBehavior == MB_NORTHWARD_CURRENT)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsSouthwardCurrent(u8 var)
+bool8 MetatileBehavior_IsSouthwardCurrent(u8 metatileBehavior)
 {
-    if (var == MB_SOUTHWARD_CURRENT)
+    if (metatileBehavior == MB_SOUTHWARD_CURRENT)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsWestwardCurrent(u8 var)
+bool8 MetatileBehavior_IsWestwardCurrent(u8 metatileBehavior)
 {
-    if (var == MB_WESTWARD_CURRENT)
+    if (metatileBehavior == MB_WESTWARD_CURRENT)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsEastwardCurrent(u8 var)
+bool8 MetatileBehavior_IsEastwardCurrent(u8 metatileBehavior)
 {
-    if (var == MB_EASTWARD_CURRENT)
+    if (metatileBehavior == MB_UNUSED_EASTWARD_CURRENT)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsSlideNorth(u8 var)
+bool8 MetatileBehavior_IsSlideNorth(u8 metatileBehavior)
 {
-    if (var == MB_SLIDE_NORTH)
+    if (metatileBehavior == MB_SLIDE_NORTH)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsSlideSouth(u8 var)
+bool8 MetatileBehavior_IsSlideSouth(u8 metatileBehavior)
 {
-    if (var == MB_SLIDE_SOUTH)
+    if (metatileBehavior == MB_SLIDE_SOUTH)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsSlideWest(u8 var)
+bool8 MetatileBehavior_IsSlideWest(u8 metatileBehavior)
 {
-    if (var == MB_SLIDE_WEST)
+    if (metatileBehavior == MB_SLIDE_WEST)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsSlideEast(u8 var)
+bool8 MetatileBehavior_IsSlideEast(u8 metatileBehavior)
 {
-    if (var == MB_SLIDE_EAST)
+    if (metatileBehavior == MB_SLIDE_EAST)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsCounter(u8 var)
+bool8 MetatileBehavior_IsCounter(u8 metatileBehavior)
 {
-    if (var == MB_COUNTER)
+    if (metatileBehavior == MB_COUNTER)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsPlayerFacingTVScreen(u8 tile, u8 playerDir)
+bool8 MetatileBehavior_IsPlayerFacingTVScreen(u8 metatileBehavior, u8 playerDir)
 {
-    if (playerDir != CONNECTION_NORTH) // if the player isn't facing north, forget about it.
+    if (playerDir != DIR_NORTH)
         return FALSE;
-    else if (tile == MB_TELEVISION) // is the player's north tile a TV?
+    else if (metatileBehavior == MB_TELEVISION)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsPC(u8 var)
+bool8 MetatileBehavior_IsPC(u8 metatileBehavior)
 {
-    if (var == MB_PC)
+    if (metatileBehavior == MB_PC)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 is_tile_x84(u8 var)
+bool8 MetatileBehavior_IsLinkBattleRecords(u8 metatileBehavior)
 {
-    if (var == MB_84)
+    if (metatileBehavior == MB_LINK_BATTLE_RECORDS)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 sub_80571C0(u8 var)
+bool8 MetatileBehavior_IsOpenSecretBaseDoor(u8 metatileBehavior)
 {
-    if (var == MB_91 || var == MB_93 || var == MB_95 || var == MB_97
-    || var == MB_99 || var == MB_9B || var == MB_9D)
+    if (metatileBehavior == MB_SECRET_BASE_SPOT_RED_CAVE_OPEN
+     || metatileBehavior == MB_SECRET_BASE_SPOT_BROWN_CAVE_OPEN
+     || metatileBehavior == MB_SECRET_BASE_SPOT_YELLOW_CAVE_OPEN
+     || metatileBehavior == MB_SECRET_BASE_SPOT_TREE_1_OPEN
+     || metatileBehavior == MB_SECRET_BASE_SPOT_SHRUB_OPEN
+     || metatileBehavior == MB_SECRET_BASE_SPOT_BLUE_CAVE_OPEN
+     || metatileBehavior == MB_SECRET_BASE_SPOT_TREE_2_OPEN)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsSecretBaseCave(u8 var)
+bool8 MetatileBehavior_IsSecretBaseCave(u8 metatileBehavior)
 {
-    if (var == MB_SECRET_BASE_SPOT_RED_CAVE || var == MB_SECRET_BASE_SPOT_BROWN_CAVE || var == MB_SECRET_BASE_SPOT_YELLOW_CAVE || var == MB_SECRET_BASE_SPOT_BLUE_CAVE)
+    if (metatileBehavior == MB_SECRET_BASE_SPOT_RED_CAVE
+     || metatileBehavior == MB_SECRET_BASE_SPOT_BROWN_CAVE
+     || metatileBehavior == MB_SECRET_BASE_SPOT_YELLOW_CAVE
+     || metatileBehavior == MB_SECRET_BASE_SPOT_BLUE_CAVE)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsSecretBaseTree(u8 var)
+bool8 MetatileBehavior_IsSecretBaseTree(u8 metatileBehavior)
 {
-    if (var == MB_SECRET_BASE_SPOT_TREE_1 || var == MB_SECRET_BASE_SPOT_TREE_2)
+    if (metatileBehavior == MB_SECRET_BASE_SPOT_TREE_1
+     || metatileBehavior == MB_SECRET_BASE_SPOT_TREE_2)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsSecretBaseShrub(u8 var)
+bool8 MetatileBehavior_IsSecretBaseShrub(u8 metatileBehavior)
 {
-    if (var == MB_SECRET_BASE_SPOT_SHRUB)
+    if (metatileBehavior == MB_SECRET_BASE_SPOT_SHRUB)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsSecretBasePC(u8 var)
+bool8 MetatileBehavior_IsSecretBasePC(u8 metatileBehavior)
 {
-    if (var == MB_SECRET_BASE_PC)
+    if (metatileBehavior == MB_SECRET_BASE_PC)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 sub_805724C(u8 var)
+bool8 MetatileBehavior_IsRecordMixingSecretBasePC(u8 metatileBehavior)
 {
-    if (var == MB_B1)
+    if (metatileBehavior == MB_RECORD_MIXING_SECRET_BASE_PC)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 unref_sub_8057260(u8 var)
+bool8 Unref_MetatileBehavior_IsSecretBaseUnused_B2(u8 metatileBehavior)
 {
-    if (var == MB_B2)
+    if (metatileBehavior == MB_SECRET_BASE_UNUSED)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 sub_8057274(u8 var)
+bool8 MetatileBehavior_IsBlockDecoration(u8 metatileBehavior)
 {
-    if (var == MB_B3)
+    if (metatileBehavior == MB_BLOCK_DECORATION)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 sub_8057288(u8 var)
+bool8 MetatileBehavior_IsSecretBaseImpassable(u8 metatileBehavior)
 {
-    if (var == MB_B9)
+    if (metatileBehavior == MB_SECRET_BASE_IMPASSABLE)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 sub_805729C(u8 var)
+bool8 MetatileBehavior_IsNormal(u8 metatileBehavior)
 {
-    if (var == MB_NORMAL)
+    if (metatileBehavior == MB_NORMAL)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 sub_80572B0(u8 var)
+bool8 MetatileBehavior_IsSecretBaseNorthWall(u8 metatileBehavior)
 {
-    if (var == MB_B7)
+    if (metatileBehavior == MB_SECRET_BASE_NORTH_WALL)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 unref_sub_80572C4(u8 var)
+bool8 Unref_MetatileBehavior_IsSecretBaseUnused_B2_2(u8 metatileBehavior)
 {
-    if (var == MB_B2)
+    if (metatileBehavior == MB_SECRET_BASE_UNUSED)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 sub_80572D8(u8 var)
+bool8 MetatileBehavior_IsSecretBaseLargeMatEdge(u8 metatileBehavior)
 {
-    if (var == MB_B5)
+    if (metatileBehavior == MB_SECRET_BASE_LARGE_MAT_EDGE)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 sub_80572EC(u8 var)
+bool8 MetatileBehavior_IsLargeMatCenter(u8 metatileBehavior)
 {
-    if (var == MB_C3)
+    if (metatileBehavior == MB_LARGE_MAT_CENTER)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 sub_8057300(u8 var)
+bool8 MetatileBehavior_IsSecretBaseHole(u8 metatileBehavior)
 {
-    if (var == MB_C2)
+    if (metatileBehavior == MB_SECRET_BASE_HOLE)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 sub_8057314(u8 var)
+bool8 MetatileBehavior_IsSecretBaseBalloon(u8 metatileBehavior)
 {
-    if (var == MB_B8)
+    if (metatileBehavior == MB_SECRET_BASE_BALLOON)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 sub_8057328(u8 var)
+bool8 MetatileBehavior_IsSecretBaseBreakableDoor(u8 metatileBehavior)
 {
-    if (var == MB_BE)
+    if (metatileBehavior == MB_SECRET_BASE_BREAKABLE_DOOR)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 sub_805733C(u8 var)
+bool8 MetatileBehavior_IsSecretBaseMusicNoteMat(u8 metatileBehavior)
 {
-    if (var == MB_BD)
+    if (metatileBehavior == MB_SECRET_BASE_MUSIC_NOTE_MAT)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 sub_8057350(u8 var)
+bool8 MetatileBehavior_IsSecretBaseGlitterMat(u8 metatileBehavior)
 {
-    if (var == MB_BA)
+    if (metatileBehavior == MB_SECRET_BASE_GLITTER_MAT)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 sub_8057364(u8 var)
+bool8 MetatileBehavior_IsSecretBaseSandOrnament(u8 metatileBehavior)
 {
-    if (var == MB_BF)
+    if (metatileBehavior == MB_SECRET_BASE_SAND_ORNAMENT)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 sub_8057378(u8 var)
+bool8 MetatileBehavior_IsSecretBaseShieldOrToyTV(u8 metatileBehavior)
 {
-    if (var == MB_C4)
+    if (metatileBehavior == MB_SECRET_BASE_SHIELD_OR_TOY_TV)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 sub_805738C(u8 var)
+bool8 MetatileBehavior_IsPlayerRoomPCOn(u8 metatileBehavior)
 {
-    if (var == MB_C5)
+    if (metatileBehavior == MB_PLAYER_ROOM_PC_ON)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_HasRipples(u8 var)
+bool8 MetatileBehavior_HasRipples(u8 metatileBehavior)
 {
-    if (var == MB_POND_WATER || var == MB_PUDDLE || var == MB_SOOTOPOLIS_DEEP_WATER)
+    if (metatileBehavior == MB_POND_WATER
+     || metatileBehavior == MB_PUDDLE
+     || metatileBehavior == MB_SOOTOPOLIS_DEEP_WATER)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsPuddle(u8 var)
+bool8 MetatileBehavior_IsPuddle(u8 metatileBehavior)
 {
-    if (var == MB_PUDDLE)
+    if (metatileBehavior == MB_PUDDLE)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsTallGrass(u8 var)
+bool8 MetatileBehavior_IsTallGrass(u8 metatileBehavior)
 {
-    if (var == MB_TALL_GRASS)
+    if (metatileBehavior == MB_TALL_GRASS)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsLongGrass(u8 var)
+bool8 MetatileBehavior_IsLongGrass(u8 metatileBehavior)
 {
-    if (var == MB_LONG_GRASS)
+    if (metatileBehavior == MB_LONG_GRASS)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsBerryTreeSoil(u8 var)
+bool8 MetatileBehavior_IsBerryTreeSoil(u8 metatileBehavior)
 {
-    if (var == MB_BERRY_TREE_SOIL)
+    if (metatileBehavior == MB_SECRET_BASE_BREAKABLE_DOORRRY_TREE_SOIL)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsAshGrass(u8 var)
+bool8 MetatileBehavior_IsAshGrass(u8 metatileBehavior)
 {
-    if (var == MB_ASHGRASS)
+    if (metatileBehavior == MB_ASHGRASS)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsUnusedFootprintMetatile(u8 var)
+bool8 MetatileBehavior_IsFootprints(u8 metatileBehavior)
 {
-    if (var == MB_25)
+    // MB_FOOTPRINTS is not used by any metatiles.
+    if (metatileBehavior == MB_FOOTPRINTS)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsBridge(u8 var)
+bool8 MetatileBehavior_IsBridge(u8 metatileBehavior)
 {
-    if (var >= MB_WARP_OR_BRIDGE && var <= MB_ROUTE120_NORTH_BRIDGE_2)
+    if (metatileBehavior >= MB_WARP_OR_BRIDGE
+     && metatileBehavior <= MB_ROUTE120_NORTH_BRIDGE_2)
         return TRUE;
     else
         return FALSE;
 }
 
-u8 sub_8057450(u8 var)
+u8 MetatileBehavior_GetBridgeType(u8 metatileBehavior)
 {
-    u8 result = var - MB_WARP_OR_BRIDGE;
+    u8 result = metatileBehavior - MB_WARP_OR_BRIDGE;
 
     if (result > 3)
         result = 0;
@@ -859,33 +890,35 @@ u8 sub_8057450(u8 var)
     return result;
 }
 
-bool8 MetatileBehavior_IsLandWildEncounter(u8 var)
+bool8 MetatileBehavior_IsLandWildEncounter(u8 metatileBehavior)
 {
-    if (MetatileBehavior_IsSurfableWaterOrUnderwater(var) == FALSE && MetatileBehavior_IsEncounterTile(var) == TRUE)
+    if (MetatileBehavior_IsSurfableWaterOrUnderwater(metatileBehavior) == FALSE
+     && MetatileBehavior_IsEncounterTile(metatileBehavior) == TRUE)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsWaterWildEncounter(u8 var)
+bool8 MetatileBehavior_IsWaterWildEncounter(u8 metatileBehavior)
 {
-    if (MetatileBehavior_IsSurfableWaterOrUnderwater(var) == TRUE && MetatileBehavior_IsEncounterTile(var) == TRUE)
+    if (MetatileBehavior_IsSurfableWaterOrUnderwater(metatileBehavior) == TRUE
+     && MetatileBehavior_IsEncounterTile(metatileBehavior) == TRUE)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 sub_80574C4(u8 var)
+bool8 MetatileBehavior_IsIndoorEncounter(u8 metatileBehavior)
 {
-    if (var == MB_0B)
+    if (metatileBehavior == MB_INDOOR_ENCOUNTER)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 sub_80574D8(u8 var)
+bool8 MetatileBehavior_IsMountainTop(u8 metatileBehavior)
 {
-    if (var == MB_MOUNTAIN_TOP)
+    if (metatileBehavior == MB_MOUNTAIN_TOP)
         return TRUE;
     else
         return FALSE;
@@ -894,416 +927,450 @@ bool8 sub_80574D8(u8 var)
 bool8 MetatileBehavior_IsDiveable(u8 metatileBehavior)
 {
     if (metatileBehavior == MB_SEMI_DEEP_WATER
-     || metatileBehavior == MB_DEEP_WATER
+     || metatileBehavior == MB_UNUSED_DEEP_WATER
      || metatileBehavior == MB_SOOTOPOLIS_DEEP_WATER)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsNotSurfacable(u8 var)
+bool8 MetatileBehavior_IsNotSurfacable(u8 metatileBehavior)
 {
-    if (var == MB_NO_SURFACING || var == MB_SEAWEED_NO_SURFACING)
+    if (metatileBehavior == MB_NO_SURFACING
+     || metatileBehavior == MB_SEAWEED_NO_SURFACING)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsShallowFlowingWater(u8 var)
+bool8 MetatileBehavior_IsShallowFlowingWater(u8 metatileBehavior)
 {
-    if (var == MB_SHALLOW_WATER || var == MB_STAIRS_OUTSIDE_ABANDONED_SHIP || var == MB_SHOAL_CAVE_ENTRANCE)
+    if (metatileBehavior == MB_SHALLOW_WATER
+     || metatileBehavior == MB_STAIRS_OUTSIDE_ABANDONED_SHIP
+     || metatileBehavior == MB_SHOAL_CAVE_ENTRANCE)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsThinIce(u8 var)
+bool8 MetatileBehavior_IsThinIce(u8 metatileBehavior)
 {
-    if (var == MB_THIN_ICE)
+    if (metatileBehavior == MB_THIN_ICE)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsCrackedIce(u8 var)
+bool8 MetatileBehavior_IsCrackedIce(u8 metatileBehavior)
 {
-    if (var == MB_CRACKED_ICE)
+    if (metatileBehavior == MB_CRACKED_ICE)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 sub_8057568(u8 var)
+bool8 MetatileBehavior_IsOceanWater(u8 metatileBehavior)
 {
-    if (var == MB_OCEAN_WATER || var == MB_SEMI_DEEP_WATER || var == MB_DEEP_WATER)
+    if (metatileBehavior == MB_OCEAN_WATER
+     || metatileBehavior == MB_SEMI_DEEP_WATER
+     || metatileBehavior == MB_UNUSED_DEEP_WATER)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 unref_sub_8057584(u8 var)
+bool8 Unref_MetatileBehavior_IsUnusedSootopolisWater(u8 metatileBehavior)
 {
-    if (var == MB_18 || var == MB_1A)
+    if (metatileBehavior == MB_UNUSED_SOOTOPOLIS_DEEP_WATER
+     || metatileBehavior == MB_UNUSED_SOOTOPOLIS_DEEP_WATER_2)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 sub_805759C(u8 var)
+bool8 MetatileBehavior_IsFeebasEncounterable(u8 metatileBehavior)
 {
-    if (MetatileBehavior_IsSurfableWaterOrUnderwater(var) && MetatileBehavior_IsWaterfall(var) == FALSE)
+    if (MetatileBehavior_IsSurfableWaterOrUnderwater(metatileBehavior)
+     && MetatileBehavior_IsWaterfall(metatileBehavior) == FALSE)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsEastBlocked(u8 var)
+bool8 MetatileBehavior_IsEastBlocked(u8 metatileBehavior)
 {
-    if (var == MB_IMPASSABLE_EAST || var == MB_IMPASSABLE_NORTHEAST || var == MB_IMPASSABLE_SOUTHEAST || var == MB_C1 || var == MB_BE)
+    if (metatileBehavior == MB_IMPASSABLE_EAST
+     || metatileBehavior == MB_IMPASSABLE_NORTHEAST
+     || metatileBehavior == MB_IMPASSABLE_SOUTHEAST
+     || metatileBehavior == MB_IMPASSABLE_WEST_AND_EAST
+     || metatileBehavior == MB_SECRET_BASE_BREAKABLE_DOOR)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsWestBlocked(u8 var)
+bool8 MetatileBehavior_IsWestBlocked(u8 metatileBehavior)
 {
-    if (var == MB_IMPASSABLE_WEST || var == MB_IMPASSABLE_NORTHWEST || var == MB_IMPASSABLE_SOUTHWEST || var == MB_C1 || var == MB_BE)
+    if (metatileBehavior == MB_IMPASSABLE_WEST
+     || metatileBehavior == MB_IMPASSABLE_NORTHWEST
+     || metatileBehavior == MB_IMPASSABLE_SOUTHWEST
+     || metatileBehavior == MB_IMPASSABLE_WEST_AND_EAST
+     || metatileBehavior == MB_SECRET_BASE_BREAKABLE_DOOR)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsNorthBlocked(u8 var)
+bool8 MetatileBehavior_IsNorthBlocked(u8 metatileBehavior)
 {
-    if (var == MB_IMPASSABLE_NORTH || var == MB_IMPASSABLE_NORTHEAST || var == MB_IMPASSABLE_NORTHWEST || var == MB_BED)
+    if (metatileBehavior == MB_IMPASSABLE_NORTH
+     || metatileBehavior == MB_IMPASSABLE_NORTHEAST
+     || metatileBehavior == MB_IMPASSABLE_NORTHWEST
+     || metatileBehavior == MB_IMPASSABLE_SOUTH_AND_NORTH)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsSouthBlocked(u8 var)
+bool8 MetatileBehavior_IsSouthBlocked(u8 metatileBehavior)
 {
-    if (var == MB_IMPASSABLE_SOUTH || var == MB_IMPASSABLE_SOUTHEAST || var == MB_IMPASSABLE_SOUTHWEST || var == MB_BED)
+    if (metatileBehavior == MB_IMPASSABLE_SOUTH
+     || metatileBehavior == MB_IMPASSABLE_SOUTHEAST
+     || metatileBehavior == MB_IMPASSABLE_SOUTHWEST
+     || metatileBehavior == MB_IMPASSABLE_SOUTH_AND_NORTH)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsShortGrass(u8 var)
+bool8 MetatileBehavior_IsShortGrass(u8 metatileBehavior)
 {
-    if (var == MB_SHORT_GRASS)
+    if (metatileBehavior == MB_SHORT_GRASS)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsHotSprings(u8 var)
+bool8 MetatileBehavior_IsHotSprings(u8 metatileBehavior)
 {
-    if (var == MB_HOT_SPRINGS)
+    if (metatileBehavior == MB_HOT_SPRINGS)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsWaterfall(u8 var)
+bool8 MetatileBehavior_IsWaterfall(u8 metatileBehavior)
 {
-    if (var == MB_WATERFALL)
+    if (metatileBehavior == MB_WATERFALL)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsFortreeBridge(u8 var)
+bool8 MetatileBehavior_IsFortreeBridge(u8 metatileBehavior)
 {
-    if (var == MB_FORTREE_BRIDGE)
+    if (metatileBehavior == MB_FORTREE_BRIDGE)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 sub_80576A0(u8 var)
+bool8 MetatileBehavior_IsPacifidlogVerticalLog1(u8 metatileBehavior)
 {
-    if (var == MB_PACIFIDLOG_VERTICAL_LOG_1)
+    if (metatileBehavior == MB_PACIFIDLOG_VERTICAL_LOG_1)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 sub_80576B4(u8 var)
+bool8 MetatileBehavior_IsPacifidlogVerticalLog2(u8 metatileBehavior)
 {
-    if (var == MB_PACIFIDLOG_VERTICAL_LOG_2)
+    if (metatileBehavior == MB_PACIFIDLOG_VERTICAL_LOG_2)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 sub_80576C8(u8 var)
+bool8 MetatileBehavior_IsPacifidlogHorizontalLog1(u8 metatileBehavior)
 {
-    if (var == MB_PACIFIDLOG_HORIZONTAL_LOG_1)
+    if (metatileBehavior == MB_PACIFIDLOG_HORIZONTAL_LOG_1)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 sub_80576DC(u8 var)
+bool8 MetatileBehavior_IsPacifidlogHorizontalLog2(u8 metatileBehavior)
 {
-    if (var == MB_PACIFIDLOG_HORIZONTAL_LOG_2)
+    if (metatileBehavior == MB_PACIFIDLOG_HORIZONTAL_LOG_2)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsPacifidlogLog(u8 var)
+bool8 MetatileBehavior_IsPacifidlogLog(u8 metatileBehavior)
 {
-    if (var >= MB_PACIFIDLOG_VERTICAL_LOG_1 && var <= MB_PACIFIDLOG_HORIZONTAL_LOG_2)
+    if (metatileBehavior >= MB_PACIFIDLOG_VERTICAL_LOG_1
+     && metatileBehavior <= MB_PACIFIDLOG_HORIZONTAL_LOG_2)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsTrickHousePuzzleDoor(u8 var)
+bool8 MetatileBehavior_IsTrickHousePuzzleDoor(u8 metatileBehavior)
 {
-    if (var == MB_TRICK_HOUSE_PUZZLE_DOOR)
+    if (metatileBehavior == MB_TRICK_HOUSE_PUZZLE_DOOR)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsRegionMap(u8 var)
+bool8 MetatileBehavior_IsRegionMap(u8 metatileBehavior)
 {
-    if (var == MB_REGION_MAP)
+    if (metatileBehavior == MB_REGION_MAP)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsClosedSootopolisGymDoor(u8 var)
+bool8 MetatileBehavior_IsClosedSootopolisDoor(u8 metatileBehavior)
 {
-    if (var == MB_CLOSED_SOOTOPOLIS_GYM_DOOR)
+    if (metatileBehavior == MB_CLOSED_SOOTOPOLIS_DOOR)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsRoulette(u8 var)
+bool8 MetatileBehavior_IsRoulette(u8 metatileBehavior)
 {
-    if (var == MB_ROULETTE)
+    if (metatileBehavior == MB_ROULETTE)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsPokeblockFeeder(u8 var)
+bool8 MetatileBehavior_IsPokeblockFeeder(u8 metatileBehavior)
 {
-    if (var == MB_POKEBLOCK_FEEDER)
+    if (metatileBehavior == MB_POKEBLOCK_FEEDER)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_0xBB(u8 var)
+bool8 MetatileBehavior_IsSecretBaseJumpMat(u8 metatileBehavior)
 {
-    if (var == MB_BB)
+    if (metatileBehavior == MB_SECRET_BASE_JUMP_MAT)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_0xBC(u8 var)
+bool8 MetatileBehavior_IsSecretBaseSpinMat(u8 metatileBehavior)
 {
-    if (var == MB_BC)
+    if (metatileBehavior == MB_SECRET_BASE_SPIN_MAT)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsLavaridgeB1FWarp(u8 var)
+bool8 MetatileBehavior_IsLavaridgeB1FWarp(u8 metatileBehavior)
 {
-    if (var == MB_LAVARIDGE_GYM_B1F_WARP)
+    if (metatileBehavior == MB_LAVARIDGE_GYM_B1F_WARP)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsLavaridge1FWarp(u8 var)
+bool8 MetatileBehavior_IsLavaridge1FWarp(u8 metatileBehavior)
 {
-    if (var == MB_LAVARIDGE_GYM_1F_WARP)
+    if (metatileBehavior == MB_LAVARIDGE_GYM_1F_WARP)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsAquaHideoutWarp(u8 var)
+bool8 MetatileBehavior_IsAquaHideoutWarp(u8 metatileBehavior)
 {
-    if (var == MB_AQUA_HIDEOUT_WARP)
+    if (metatileBehavior == MB_AQUA_HIDEOUT_WARP)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsSurfableFishableWater(u8 var)
+bool8 MetatileBehavior_IsSurfableFishableWater(u8 metatileBehavior)
 {
-    if (var == MB_POND_WATER || var == MB_OCEAN_WATER || var == MB_SEMI_DEEP_WATER || var == MB_DEEP_WATER || var == MB_SOOTOPOLIS_DEEP_WATER || (var >= MB_EASTWARD_CURRENT && var <= MB_SOUTHWARD_CURRENT))
+    if (metatileBehavior == MB_POND_WATER
+     || metatileBehavior == MB_OCEAN_WATER
+     || metatileBehavior == MB_SEMI_DEEP_WATER
+     || metatileBehavior == MB_UNUSED_DEEP_WATER
+     || metatileBehavior == MB_SOOTOPOLIS_DEEP_WATER
+     || (metatileBehavior >= MB_UNUSED_EASTWARD_CURRENT && metatileBehavior <= MB_SOUTHWARD_CURRENT))
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsMtPyreHole(u8 var)
+bool8 MetatileBehavior_IsMtPyreHole(u8 metatileBehavior)
 {
-    if (var == MB_MT_PYRE_HOLE)
+    if (metatileBehavior == MB_MT_PYRE_HOLE)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsCrackedFloorHole(u8 var)
+bool8 MetatileBehavior_IsCrackedFloorHole(u8 metatileBehavior)
 {
-    if (var == MB_CRACKED_FLOOR_HOLE)
+    if (metatileBehavior == MB_CRACKED_FLOOR_HOLE)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsCrackedFloor(u8 var)
+bool8 MetatileBehavior_IsCrackedFloor(u8 metatileBehavior)
 {
-    if (var == MB_CRACKED_FLOOR)
+    if (metatileBehavior == MB_CRACKED_FLOOR)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsMuddySlope(u8 var)
+bool8 MetatileBehavior_IsMuddySlope(u8 metatileBehavior)
 {
-    if (var == MB_MUDDY_SLOPE)
+    if (metatileBehavior == MB_MUDDY_SLOPE)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsBumpySlope(u8 var)
+bool8 MetatileBehavior_IsBumpySlope(u8 metatileBehavior)
 {
-    if (var == MB_BUMPY_SLOPE)
+    if (metatileBehavior == MB_BUMPY_SLOPE)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsIsolatedVerticalRail(u8 var)
+bool8 MetatileBehavior_IsIsolatedVerticalRail(u8 metatileBehavior)
 {
-    if (var == MB_ISOLATED_VERTICAL_RAIL)
+    if (metatileBehavior == MB_ISOLATED_VERTICAL_RAIL)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsIsolatedHorizontalRail(u8 var)
+bool8 MetatileBehavior_IsIsolatedHorizontalRail(u8 metatileBehavior)
 {
-    if (var == MB_ISOLATED_HORIZONTAL_RAIL)
+    if (metatileBehavior == MB_ISOLATED_HORIZONTAL_RAIL)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsVerticalRail(u8 var)
+bool8 MetatileBehavior_IsVerticalRail(u8 metatileBehavior)
 {
-    if (var == MB_VERTICAL_RAIL)
+    if (metatileBehavior == MB_VERTICAL_RAIL)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsHorizontalRail(u8 var)
+bool8 MetatileBehavior_IsHorizontalRail(u8 metatileBehavior)
 {
-    if (var == MB_HORIZONTAL_RAIL)
+    if (metatileBehavior == MB_HORIZONTAL_RAIL)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsSeaweed(u8 var)
+bool8 MetatileBehavior_IsSeaweed(u8 metatileBehavior)
 {
-    if (var == MB_SEAWEED || var == MB_SEAWEED_NO_SURFACING)
+    if (metatileBehavior == MB_SEAWEED
+     || metatileBehavior == MB_SEAWEED_NO_SURFACING)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsRunningDisallowed(u8 var)
+bool8 MetatileBehavior_IsRunningDisallowed(u8 metatileBehavior)
 {
-    if (var == MB_NO_RUNNING || var == MB_LONG_GRASS || var == MB_HOT_SPRINGS || MetatileBehavior_IsPacifidlogLog(var) != FALSE)
+    if (metatileBehavior == MB_NO_RUNNING
+     || metatileBehavior == MB_LONG_GRASS
+     || metatileBehavior == MB_HOT_SPRINGS
+     || MetatileBehavior_IsPacifidlogLog(metatileBehavior))
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsCuttableGrass(u8 var)
+bool8 MetatileBehavior_IsCuttableGrass(u8 metatileBehavior)
 {
-    if (var == MB_TALL_GRASS || var == MB_LONG_GRASS || var == MB_ASHGRASS || var == MB_LONG_GRASS_SOUTH_EDGE)
+    if (metatileBehavior == MB_TALL_GRASS
+     || metatileBehavior == MB_LONG_GRASS
+     || metatileBehavior == MB_ASHGRASS
+     || metatileBehavior == MB_LONG_GRASS_SOUTH_EDGE)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 sub_805791C(u8 var)
+bool8 MetatileBehavior_IsRunningShoesManual(u8 metatileBehavior)
 {
-    if (var == MB_8E)
+    if (metatileBehavior == MB_RUNNING_SHOES_MANUAL)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsPictureBookShelf(u8 var)
+bool8 MetatileBehavior_IsPictureBookShelf(u8 metatileBehavior)
 {
-    if (var == MB_PICTURE_BOOK_SHELF)
+    if (metatileBehavior == MB_PICTURE_BOOK_SHELF)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsBookShelf(u8 var)
+bool8 MetatileBehavior_IsBookShelf(u8 metatileBehavior)
 {
-    if (var == MB_BOOKSHELF)
+    if (metatileBehavior == MB_BOOKSHELF)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsPokeCenterBookShelf(u8 var)
+bool8 MetatileBehavior_IsPokeCenterBookShelf(u8 metatileBehavior)
 {
-    if (var == MB_POKEMON_CENTER_BOOKSHELF)
+    if (metatileBehavior == MB_POKEMON_CENTER_BOOKSHELF)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsVase(u8 var)
+bool8 MetatileBehavior_IsVase(u8 metatileBehavior)
 {
-    if (var == MB_VASE)
+    if (metatileBehavior == MB_VASE)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsTrashCan(u8 var)
+bool8 MetatileBehavior_IsTrashCan(u8 metatileBehavior)
 {
-    if (var == MB_TRASH_CAN)
+    if (metatileBehavior == MB_TRASH_CAN)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsShopShelf(u8 var)
+bool8 MetatileBehavior_IsShopShelf(u8 metatileBehavior)
 {
-    if (var == MB_SHOP_SHELF)
+    if (metatileBehavior == MB_SHOP_SHELF)
         return TRUE;
     else
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsBlueprint(u8 var)
+bool8 MetatileBehavior_IsBlueprint(u8 metatileBehavior)
 {
-    if (var == MB_BLUEPRINT)
+    if (metatileBehavior == MB_BLUEPRINT)
         return TRUE;
     else
         return FALSE;
diff --git a/src/rom6.c b/src/rom6.c
index 7fcd9808a..be14f1731 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -74,7 +74,7 @@ static void task08_080C9820(u8 taskId)
         else
         {
             sub_8059BF4();
-            EventObjectSetHeldMovement(&gEventObjects[eventObjId], 0x39);
+            EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_START_ANIM_IN_DIRECTION);
             gTasks[taskId].func = sub_810B3DC;
         }
     }
diff --git a/src/secret_base.c b/src/secret_base.c
index deee1ade0..1a4b765a0 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -510,7 +510,7 @@ void sub_80BBDD0(void)
                     gSpecialVar_0x8006 = roomdecorpos[decidx] >> 4;
                     gSpecialVar_0x8007 = roomdecorpos[decidx] & 0xF;
                     metatile = MapGridGetMetatileBehaviorAt(gSpecialVar_0x8006 + 7, gSpecialVar_0x8007 + 7);
-                    if (sub_80572D8(metatile) == TRUE || sub_80572EC(metatile) == TRUE)
+                    if (MetatileBehavior_IsSecretBaseLargeMatEdge(metatile) == TRUE || MetatileBehavior_IsLargeMatCenter(metatile) == TRUE)
                     {
                         gSpecialVar_Result = gMapHeader.events->eventObjects[objid].graphicsId + VAR_0x3F20;
                         VarSet(gSpecialVar_Result, gDecorations[roomdecor[decidx]].tiles[0]);
@@ -1309,7 +1309,7 @@ void sub_80BCE90()
 void sub_80BCF1C(u8 taskId)
 {
     s16 x, y;
-    u32 behavior;
+    u32 metatileBehavior;
     s16 *taskData = gTasks[taskId].data;
 
     switch (taskData[1])
@@ -1325,15 +1325,15 @@ void sub_80BCF1C(u8 taskId)
             taskData[2] = x;
             taskData[3] = y;
 
-            behavior = MapGridGetMetatileBehaviorAt(x, y);
-            if (sub_8057350(behavior) == TRUE)
-                DoYellowCave4Sparkle();
-            else if (sub_8057314(behavior) == TRUE)
-                sub_80C68A4(MapGridGetMetatileIdAt(x, y), x, y);
-            else if (sub_8057328(behavior) == TRUE)
-                sub_80C6A54(x, y);
-            else if (sub_805733C(behavior) == TRUE)
-                DoDecorationSoundEffect(MapGridGetMetatileIdAt(x, y));
+            metatileBehavior = MapGridGetMetatileBehaviorAt(x, y);
+            if (MetatileBehavior_IsSecretBaseGlitterMat(metatileBehavior) == TRUE)
+                DoSecretBaseGlitterMatSparkle();
+            else if (MetatileBehavior_IsSecretBaseBalloon(metatileBehavior) == TRUE)
+                PopSecretBaseBalloon(MapGridGetMetatileIdAt(x, y), x, y);
+            else if (MetatileBehavior_IsSecretBaseBreakableDoor(metatileBehavior) == TRUE)
+                ShatterSecretBaseBreakableDoor(x, y);
+            else if (MetatileBehavior_IsSecretBaseMusicNoteMat(metatileBehavior) == TRUE)
+                PlaySecretBaseMusicNoteMatSound(MapGridGetMetatileIdAt(x, y));
         }
         break;
     case 2:
diff --git a/src/trainer_see.c b/src/trainer_see.c
index c03295540..902a67fdf 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -299,7 +299,7 @@ static bool8 sub_808441C(u8 taskId, struct Task *task, struct EventObject *train
         }
         else
         {
-            EventObjectSetHeldMovement(trainerObj, 0x3E);
+            EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACITON_FACE_PLAYER);
             task->data[0]++;
         }
     }
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 99594d3f2..ad11bf566 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -3727,7 +3727,7 @@ static u16 GetRoute119WaterTileNum(s16 x, s16 y, u8 section)
     {
         for (xCur = 0; xCur < gMapHeader.mapData->width; xCur++)
         {
-            if (sub_805759C(MapGridGetMetatileBehaviorAt(xCur + 7, yCur + 7)) == TRUE)
+            if (MetatileBehavior_IsFeebasEncounterable(MapGridGetMetatileBehaviorAt(xCur + 7, yCur + 7)) == TRUE)
             {
                 tileNum++;
                 if (x == xCur && y == yCur)