diff --git a/cirnofarm.p64 b/cirnofarm.p64
index 244f983..60c9b07 100644
--- a/cirnofarm.p64
+++ b/cirnofarm.p64
@@ -6,18 +6,18 @@ version 2
 :: sfx/
 :: gfx/0.gfx
 b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjM0Iixtb2RpZmllZD0iMjAyNC0w
-NC0xNCAxNDoxOToxNCIscmV2aXNpb249NjRdXWx6NAAwAQAApzEAAPMUe1swXT17Ym1wPXB4dQBD
+NC0xNCAxNToxMDoxMiIscmV2aXNpb249OTBdXWx6NABmAQAA9DEAAPMUe1swXT17Ym1wPXB4dQBD
 IBAQBPDwLGZsYWdzPTAscGFuX3gIAMp5PTAsem9vbT03fSwxAPEIrxsj3gN_A94j3gP_CRNuA04T
 biNOA34TAP8DjgM_A04DLiN_Iy4DngP_FAMuXQAc8AnwRU2ALSYtUB1mHQUgHYYNFQAdlh0VDaYE
-AMMNFQANlh0FEL0F8BNXAB8xVwAGD_UABQ8xAP--------------m-9DUDWgBT8cFXAFbgVQBR48
-HgVgFUwFgAUMBwwHHAVQJUwFUAU8BwwHFVAFTAcsBVAVTBVwBUwFcAUsBSwFYAUcBQAFHAVgBQwF
-IAUMBXAFQAXwBbIAHg8xAP-----------------------------------------------4tQbT03
-fX0=
+AMMNFQANlh0FEL0F8BNXAB8xVwAU-xVQRIAUTx8UUA8Ujx8EQC8UTx8kQA8UHx9EHgRADxReDR4E
+QA0GAA_fUBQ_DRSARPAVfgAOD2MBBQ8xAP--------------av9DUDWgBT8cFXAFbgVQBR48HgVg
+FUwFgAUMBwwHHAVQJUwFUAU8BwwHFVAFTAcsBVAVTBVwBUwFcAUsBSwFYAUcBQAFHAVgBQwFIAUM
+BXAFQAXwBbIAHg8xAP-----------------------------------------------4tQbT03fX0=
 :: gfx/.info.pod
 b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixzdG9yZWQ9IjIwMjQtMDQt
 MDQgMDc6MTk6MzMiXV1sejQABAAAAAMAAAAwbmls
 :: main.lua
---[[pod_format="raw",created="2024-04-04 07:19:33",modified="2024-04-14 14:19:14",revision=126]]
+--[[pod_format="raw",created="2024-04-04 07:19:33",modified="2024-04-14 15:10:12",revision=152]]
 --cd("/cirnofarm/src")
 include("/cirnofarm/src/cirno.lua")
 --function _init()
@@ -48,27 +48,31 @@ include("/cirnofarm/src/cirno.lua")
 --end
 :: map/0.map
 b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixtb2RpZmllZD0iMjAyNC0w
-NC0xNCAxNDoxOToxNCIscmV2aXNpb249NzFdXWx6NADoAAAA0iAAAPAIe3tibXA9dXNlcmRhdGEo
-ImkxNiIsMzIDAC8iMAEA---JLzIwTAA5D3wC--9pD_AAlR8yXABID0QAHw8BANcfMmgAWC8yMAEA
--xAfMkgASC8yMAEAaA_QAJIPAQD-TB8ytADQLzIwAQD-CC8yMAEA-73xFSIpLGhpZGRlbj1mYWxz
-ZSxuYW1lPSJzb2xpZCIscGFuX3g9MAgA0nk9MCx0aWxlX2g9MTYKABB3CgCvem9vbT0wLjV9LGYQ
-Cx8xBAD--------------------4D2YQA59iYWNrZ3JvdW5rEBlQMC41fX0=
+NC0xNCAxNToxMDoxMiIscmV2aXNpb249OTddXWx6NAAyAQAA1iAAAPAIe3tibXA9dXNlcmRhdGEo
+ImkxNiIsMzIDACIiMAEALzMwAQB-HzOQAP9pLzMwAQCvLzIw3AAED-QAIC8yMAEAew-EAAcPAQCQ
+D7wAwA4wAg8UAcsfMvQASB8yRAAyD9gC1w-sAFUfMmwADQ-0AsgfMxwAFQ8kATgPSAABLzIwAQBo
+D5AA0A-oAQkfMFwALg8BAK8fMtwAEQ8UAqwfMrwBAg8BAPMPTAENLzMwAQD-nfEYIiksaGlkZGVu
+PWZhbHNlLG5hbWU9InNvbGlkIixwYW5feD0tMTE2CwDzAHk9LTE1Nix0aWxlX2g9MQoAEHcKAI96
+b29tPTF9LGoQCx8xBAD--------------------4D2oQA5ViYWNrZ3JvdW5vEBMwbBAfMGkQB1Aw
+LjV9fQ==
 :: map/.info.pod
 b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixzdG9yZWQ9IjIwMjQtMDQt
 MDQgMDc6MTk6MzMiXV1sejQABAAAAAMAAAAwbmls
 :: sfx/0.sfx
 b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjM0Iixtb2RpZmllZD0iMjAyNC0w
-NC0xNCAxNDoxNjozNCIscmV2aXNpb249NDldXWx6NAARAQAAwQgAAPAncHh1AAMoAAADAAQPQBAC
+NC0xNCAxNToxMDoxMyIscmV2aXNpb249NzFdXWx6NABsAQAAkQgAAPAncHh1AAMoAAADAAQPQBAC
 DgABoAEgAqAOAA8QAA3wygECAwQFBgcAD-_QCAkKCw8MDw0PDg8PEADwAA0PEQ8SDxMPFA8VDxYP
 FxMA8QEPGA8ZDxoPGw8cDx0PHg8fFADxACAPIQ8iDyMPJA8lDyYPJxQA8QAoDykPKg8rDywPLQ8u
-Dy8UAPEAMA8xDzIPMw80DzUPNg83FAD-BTgPOQ86DzsPPA89Dz4PPwAP--D-AQDr-ydaARAGDyAQ
-ASABIAHwAAIQAgwQASAPISABMA9A8MMPKA--8MYP_AoP-w_AD-cPDQHwCQEQBgwwAP--uh--AQDM
-v_gPQAANQP--sPBwCgD--2Qf-wEAl1D-----Hw==
+Dy8UAPEAMA8xDzIPMw80DzUPNg83FAD-BTgPOQ86DzsPPA89Dz4PPwAP--D-AQDr8idaARAGDyAQ
+ASABIAHwAAIQAgwQASAPISABMA9A8MMPKA--8MYP_AoP-w_AD-cPDQHwCQEQBgwwAD8PD_AxABsv
+8AAwAP--gh--AQDM8BHoD0AADUAPOR86DzwPNh9GDykPLw8wDz4PHQ9CDx8PIgsFYS8oDy0PMykF
+8wIyDzEPPQ87DzkPOA81DzEPLEkF8QE9Dz7--wrxFv4K-Bb_CvBwVgBf-rDwcAMIAP-cH-8BAJdQ
+-----x8=
 :: sfx/.info.pod
 b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixzdG9yZWQ9IjIwMjQtMDQt
 MDQgMDc6MTk6MzMiXV1sejQABAAAAAMAAAAwbmls
 :: .info.pod
-b64$LS1bW3BvZCxydW50aW1lPTUsc3RvcmVkPSIyMDI0LTA0LTE0IDE0OjE5OjE0Iix3b3Jrc3Bh
+b64$LS1bW3BvZCxydW50aW1lPTUsc3RvcmVkPSIyMDI0LTA0LTE0IDE1OjEwOjEzIix3b3Jrc3Bh
 Y2VzPXt7bG9jYXRpb249Im1haW4ubHVhIzIiLHdvcmtzcGFjZV9pbmRleD0xfSx7bG9jYXRpb249
 ImdmeC8wLmdmeCIsd29ya3NwYWNlX2luZGV4PTJ9LHtsb2NhdGlvbj0ibWFwLzAubWFwIix3b3Jr
 c3BhY2VfaW5kZXg9M30se2xvY2F0aW9uPSJzZngvMC5zZngiLHdvcmtzcGFjZV9pbmRleD00fX1d
diff --git a/src/cirno.lua b/src/cirno.lua
index 2f58007..e2454c1 100644
--- a/src/cirno.lua
+++ b/src/cirno.lua
@@ -1,24 +1,23 @@
---[[pod_format="raw",created="2024-04-14 14:05:11",modified="2024-04-14 14:17:48",revision=5]]
+--[[pod_format="raw",created="2024-04-14 14:05:11",modified="2024-04-14 15:22:15",revision=25]]
+mouse_debug = true
 
 function _init()
 	x = 128
 	y = 128
+	speed = 2
 	hflip = false
 	playerSpr = 64
 end
 
 function _draw()
 	cls(0)
-	camera(x - 240, y - 135)
+	--camera(x - 240, y - 135)
 	
 	drawMap()	
 
 	spr(playerSpr,x,y, hflip)
-	
-	spr(playerSpr,x+32,y, hflip)
-	
-	
 
+	debug_mouse()		
 end
 
 function drawMap()
@@ -28,12 +27,49 @@ function drawMap()
 end
 
 function _update()
-	if (btn(0)) x -= 2 hflip = true
-	if (btn(1)) x += 2 hflip = false
-	if (btn(2)) y -= 2
-	if (btn(3)) y += 2
+	local col_x = x
+	local col_y = y
+	if (btn(0)) col_x -= speed hflip = true
+	if (btn(1)) col_x += speed hflip = false
+	if (btn(2)) col_y -= speed
+	if (btn(3)) col_y += speed
+	
+	if (checkCollision(col_x,col_y) == true) then
+		x = col_x
+		y = col_y 
+	end
+
 end
 
 function checkCollision(x,y)
+	return fget(mget(x,y),0)
+end
+
+function debug_mouse()
+	local mx,my = mouse()
+	local x_offset = 5
+	local y_offset = 5
 	
+	-- tile size
+	local tw=16
+	local th=16
+
+	-- window width and height
+	local w=480
+	local h=270
+	
+	-- offset if box leaves screen
+	if mx>w-20 then x_offset=-15 end
+	if my>h-29 then y_offset=-24 end
+	
+	-- draw debug text box
+	local tile_x = mx/tw
+	local tile_y = my/th
+	local sprite = mget(tile_x,tile_y)
+	local flag = fget(sprite)
+	rectfill(mx+x_offset-1,my+y_offset-1,mx+x_offset+14,my+y_offset+23+8,1)
+	print(mx/tw,mx+x_offset,my+y_offset,8)
+	print(my/th,mx+x_offset,my+y_offset+8,9)
+	print(sprite,mx+x_offset,my+y_offset+8*2,10)
+	print(flag,mx+x_offset,my+y_offset+8+8*2,10)
 end
\ No newline at end of file