diff --git a/src/CommonDefines.h b/src/CommonDefines.h
index a3350f01..d0e72807 100644
--- a/src/CommonDefines.h
+++ b/src/CommonDefines.h
@@ -3,12 +3,13 @@
 #define WINDOW_WIDTH 320
 #define WINDOW_HEIGHT 240
 
-#define TILES_TO_UNITS(x) ((x) * 0x2000)
-#define UNITS_TO_TILES(x) ((x) / 0x2000)
 #define TILES_TO_PIXELS(x) ((x) * 0x10)
 #define PIXELS_TO_TILES(x) ((x) / 0x10)
 #define PIXELS_TO_UNITS(x) ((x) * 0x200)
 #define UNITS_TO_PIXELS(x) ((x) / 0x200)
+#define TILES_TO_UNITS(x) (PIXELS_TO_UNITS(TILES_TO_PIXELS(x)))	// * 0x2000
+#define UNITS_TO_TILES(x) (PIXELS_TO_TILES(UNITS_TO_PIXELS(x)))	// / 0x2000
+
 #define SECONDS_TO_FRAMES(x) ((x) * 50)
 #define FRAMES_TO_SECONDS(x) ((x) / 50)