diff --git a/src/battle/entities.c b/src/battle/entities.c
index e50b059..e868ef5 100644
--- a/src/battle/entities.c
+++ b/src/battle/entities.c
@@ -31,7 +31,7 @@ static void doEntity(void);
 static void alignComponents(void);
 static void drawEntity(Entity *e);
 static void activateEpicFighters(int n, int side);
-static void restrictToGrid(Entity *e);
+static void restrictToBattleArea(Entity *e);
 static void drawTargetRects(Entity *e);
 static int drawComparator(const void *a, const void *b);
 static void notifyNewArrivals(void);
@@ -155,7 +155,7 @@ void doEntities(void)
 				
 				doRope(e);
 				
-				restrictToGrid(e);
+				restrictToBattleArea(e);
 				
 				if (!e->speed)
 				{
@@ -254,7 +254,7 @@ void doEntities(void)
 	}
 }
 
-static void restrictToGrid(Entity *e)
+static void restrictToBattleArea(Entity *e)
 {
 	float force;
 	
diff --git a/src/battle/radar.c b/src/battle/radar.c
index 2b3c383..b6b585a 100644
--- a/src/battle/radar.c
+++ b/src/battle/radar.c
@@ -101,21 +101,21 @@ void drawRadarRangeWarning(void)
 		leaving = 1;
 	}
 	
-	if (y <= 2 && player->dy < 0)
+	if (y <= 3 && player->dy < 0)
 	{
 		blitRotated(radarWarningTexture, SCREEN_WIDTH - 85, SCREEN_HEIGHT - 85, 0);
 		
 		leaving = 1;
 	}
 	
-	if (x >= (SCREEN_WIDTH / 2) - 2 && player->dx > 0)
+	if (x >= BATTLE_AREA_CELLS - 2 && player->dx > 0)
 	{
 		blitRotated(radarWarningTexture, SCREEN_WIDTH - 85, SCREEN_HEIGHT - 85, 90);
 		
 		leaving = 1;
 	}
 	
-	if (y >= (SCREEN_HEIGHT / 2) - 2 && player->dy > 0)
+	if (y >= BATTLE_AREA_CELLS - 3 && player->dy > 0)
 	{
 		blitRotated(radarWarningTexture, SCREEN_WIDTH - 85, SCREEN_HEIGHT - 85, 180);