From ee16bd72ee10da0a80a4c403ebd6d57d3d690dbb Mon Sep 17 00:00:00 2001
From: PokefanMarcel <166040321+PokefanMarcel@users.noreply.github.com>
Date: Mon, 8 Jun 2026 17:50:47 +0200
Subject: [PATCH] Relocate and use `MAP_TILESET_SIZE` (#586)

---
 constants/tileset_constants.asm | 2 ++
 engine/overworld/movement.asm   | 2 --
 home/overworld.asm              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm
index e7fe88f53..c89380dcb 100644
--- a/constants/tileset_constants.asm
+++ b/constants/tileset_constants.asm
@@ -1,3 +1,5 @@
+DEF MAP_TILESET_SIZE EQU $60 ; tiles
+
 ; tileset ids
 ; Tilesets indexes (see data/tilesets/tileset_headers.asm)
 	const_def
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm
index be8d6f62f..73d8ddc8a 100644
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -1,5 +1,3 @@
-DEF MAP_TILESET_SIZE EQU $60
-
 UpdatePlayerSprite:
 	ld a, [wSpritePlayerStateData2WalkAnimationCounter]
 	and a
diff --git a/home/overworld.asm b/home/overworld.asm
index a06a32da3..0cf36b9f3 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -875,7 +875,7 @@ LoadTilesetTilePatternData::
 	ld a, [wTilesetGfxPtr + 1]
 	ld h, a
 	ld de, vTileset
-	ld bc, $600
+	ld bc, MAP_TILESET_SIZE tiles
 	ld a, [wTilesetBank]
 	jp FarCopyData2