diff --git a/src/battle/entities.c b/src/battle/entities.c
index f8a9109..714fcf6 100644
--- a/src/battle/entities.c
+++ b/src/battle/entities.c
@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 static void drawEntity(Entity *e);
 static void doEntity(void);
 static void activateEpicFighters(int n, int side);
+static void restrictToGrid(Entity *e);
 
 Entity *spawnEntity(void)
 {
@@ -88,6 +89,8 @@ void doEntities(void)
 					break;
 			}
 			
+			restrictToGrid(e);
+			
 			e->x += e->dx;
 			e->y += e->dy;
 			
@@ -150,6 +153,39 @@ void doEntities(void)
 	}
 }
 
+static void restrictToGrid(Entity *e)
+{
+	float force;
+	
+	if (e->x <= GRID_RESTRICTION_SIZE)
+	{
+		force = GRID_RESTRICTION_SIZE - e->x;
+		e->dx += force * 0.001;
+		e->dx *= 0.95;
+	}
+	
+	if (e->y <= GRID_RESTRICTION_SIZE)
+	{
+		force = GRID_RESTRICTION_SIZE - e->y;
+		e->dy += force * 0.001;
+		e->dy *= 0.95;
+	}
+	
+	if (e->x >= (GRID_SIZE * GRID_CELL_WIDTH) - GRID_RESTRICTION_SIZE)
+	{
+		force = e->x - ((GRID_SIZE * GRID_CELL_WIDTH) - GRID_RESTRICTION_SIZE);
+		e->dx -= force * 0.001;
+		e->dx *= 0.95;
+	}
+	
+	if (e->y >= (GRID_SIZE * GRID_CELL_HEIGHT) - GRID_RESTRICTION_SIZE)
+	{
+		force = e->y - ((GRID_SIZE * GRID_CELL_HEIGHT) - GRID_RESTRICTION_SIZE);
+		e->dy -= force * 0.001;
+		e->dy *= 0.95;
+	}
+}
+
 static void doEntity(void)
 {
 	if (self->health <= 0)
diff --git a/src/defs.h b/src/defs.h
index 372ad4b..9807135 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -51,6 +51,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define GRID_CELL_HEIGHT		360
 #define GRID_SIZE				50
 #define MAX_GRID_CANDIDATES 	1024
+#define GRID_RESTRICTION_SIZE	250
 
 #define BF_NONE				0
 #define BF_ENGINE			(2 << 0)