5 files changed, 10 insertions, 11 deletions
diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h
index 0ceeda33f..da979084a 100644
--- a/include/constants/metatile_behaviors.h
+++ b/include/constants/metatile_behaviors.h
@@ -13,21 +13,21 @@
 #define MB_SEMI_DEEP_WATER 0x11
 #define MB_DEEP_WATER 0x12
 #define MB_WATERFALL 0x13
-#define MB_SPLASHING_WATER 0x15
+#define MB_OCEAN_WATER 0x15
 #define MB_PUDDLE 0x16
-#define MB_WATERFALL_BOTTOM 0x17
+#define MB_SHALLOW_WATER 0x17
 #define MB_19 0x19
 #define MB_1A 0x1A
 #define MB_1B 0x1B
 #define MB_STRENGTH_BUTTON 0x20
-#define MB_21 0x21
+#define MB_SAND 0x21
 #define MB_22 0x22
 #define MB_ICE 0x23
 #define MB_THIN_ICE 0x26
 #define MB_CRACKED_ICE 0x27
 #define MB_HOT_SPRINGS 0x28
 #define MB_ROCK_STAIRS 0x2A
-#define MB_SAND 0x2B
+#define MB_SAND_CAVE 0x2B
 #define MB_IMPASSABLE_EAST 0x30
 #define MB_IMPASSABLE_WEST 0x31
 #define MB_IMPASSABLE_NORTH 0x32
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 4ecfaa27a..ac102d9a9 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -5,7 +5,8 @@
 
 // Exported struct declarations
 
-enum SpinnerRunnerFollowPatterns {
+enum SpinnerRunnerFollowPatterns
+{
     RUNFOLLOW_ANY,
     RUNFOLLOW_NORTH_SOUTH,
     RUNFOLLOW_EAST_WEST,
@@ -191,7 +192,6 @@ extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
 extern const struct SpritePalette gUnknown_83A5348;
 extern const struct SpriteTemplate * const gFieldEffectObjectTemplatePointers[];
 extern const struct OamData gObjectEventBaseOam_32x32;
-extern const struct Coords16 sDirectionToVectors[];
 extern const u16 gUnknown_8398648[];
 extern const u16 gUnknown_8398688[];
 extern const u8 gReflectionEffectPaletteMap[];
diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h
index c2ed96126..4311a2b29 100644
--- a/include/field_control_avatar.h
+++ b/include/field_control_avatar.h
@@ -11,5 +11,4 @@ void SetCableClubWarp(void);
 void sub_806DE28(struct ObjectEvent *);
 void dive_warp(struct MapPosition * pos, u16 behavior);
 
-
 #endif //GUARD_FIELD_CONTROL_AVATAR_H
diff --git a/include/fieldmap.h b/include/fieldmap.h
index 144b73060..cc4a0f7ed 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -11,7 +11,7 @@
 #define NUM_PALS_TOTAL 13
 #define VIRTUAL_MAP_SIZE 0x2800
 
-extern struct BackupMapLayout gBackupMapLayout;
+extern struct BackupMapLayout VMap;
 extern const struct MapLayout Route1_Layout;
 
 u32 MapGridGetMetatileIdAt(int, int);
diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h
index af56ae2be..91a1824e5 100644
--- a/include/metatile_behavior.h
+++ b/include/metatile_behavior.h
@@ -9,8 +9,8 @@ bool8 MetatileBehavior_IsJumpWest(u8 metatileBehavior);
 bool8 MetatileBehavior_IsJumpNorth(u8 metatileBehavior);
 bool8 MetatileBehavior_IsJumpSouth(u8 metatileBehavior);
 bool8 MetatileBehavior_IsPokeGrass(u8 metatileBehavior);
-bool8 MetatileBehavior_IsSandOrDeepSand(u8 metatileBehavior);
-bool8 MetatileBehavior_IsMB21OrWaterfallBottom(u8 metatileBehavior);
+bool8 MetatileBehavior_IsSand(u8 metatileBehavior);
+bool8 MetatileBehavior_IsSandOrShallowFlowingWater(u8 metatileBehavior);
 bool8 MetatileBehavior_IsDeepSand(u8 metatileBehavior);
 bool8 MetatileBehavior_IsReflective(u8 metatileBehavior);
 bool8 MetatileBehavior_IsIce(u8 metatileBehavior);
@@ -64,7 +64,7 @@ bool8 MetatileBehavior_IsIndoorEncounter(u8 metatileBehavior);
 bool8 MetatileBehavior_IsMountain(u8 metatileBehavior);
 bool8 MetatileBehavior_IsDeepOrSemiDeepWater(u8 metatileBehavior);
 bool8 MetatileBehavior_IsMB19(u8 metatileBehavior);
-bool8 MetatileBehavior_IsWaterfallBottom(u8 metatileBehavior);
+bool8 MetatileBehavior_IsShallowFlowingWater(u8 metatileBehavior);
 bool8 MetatileBehavior_IsThinIce(u8 metatileBehavior);
 bool8 MetatileBehavior_IsCrackedIce(u8 metatileBehavior);
 bool8 MetatileBehavior_IsDeepSemiDeepOrSplashingWater(u8 metatileBehavior);