diff --git a/cirnofarm.p64 b/cirnofarm.p64
index 5f467f3..244f983 100644
--- a/cirnofarm.p64
+++ b/cirnofarm.p64
@@ -6,19 +6,20 @@ version 2
 :: sfx/
 :: gfx/0.gfx
 b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjM0Iixtb2RpZmllZD0iMjAyNC0w
-NC0xNCAxMzo1MToyMSIscmV2aXNpb249NDNdXWx6NAApAQAApzEAAPMUe1swXT17Ym1wPXB4dQBD
+NC0xNCAxNDoxOToxNCIscmV2aXNpb249NjRdXWx6NAAwAQAApzEAAPMUe1swXT17Ym1wPXB4dQBD
 IBAQBPDwLGZsYWdzPTAscGFuX3gIAMp5PTAsem9vbT03fSwxAPEIrxsj3gN_A94j3gP_CRNuA04T
 biNOA34TAP8DjgM_A04DLiN_Iy4DngP_FAMuXQAc8AnwRU2ALSYtUB1mHQUgHYYNFQAdlh0VDaYE
-AM8NFQANlh0FEL0F8BNXAB0f8DEA--------------_j-0NQNaAFPxwVcAVuBVAFHjweBWAVTAWA
-BQwHDAccBVAlTAVQBTwHDAcVUAVMBywFUBVMFXAFTAVwBSwFLAVgBRwFAAUcBWAFDAUgBQwFcAVA
-BfAFsgAeDzEA------------------------------------------------i1BtPTd9fQ==
+AMMNFQANlh0FEL0F8BNXAB8xVwAGD_UABQ8xAP--------------m-9DUDWgBT8cFXAFbgVQBR48
+HgVgFUwFgAUMBwwHHAVQJUwFUAU8BwwHFVAFTAcsBVAVTBVwBUwFcAUsBSwFYAUcBQAFHAVgBQwF
+IAUMBXAFQAXwBbIAHg8xAP-----------------------------------------------4tQbT03
+fX0=
 :: gfx/.info.pod
 b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixzdG9yZWQ9IjIwMjQtMDQt
 MDQgMDc6MTk6MzMiXV1sejQABAAAAAMAAAAwbmls
 :: main.lua
---[[pod_format="raw",created="2024-04-04 07:19:33",modified="2024-04-14 13:51:21",revision=88]]
-cd("/cirnofarm/src")
-include("cirno.lua")
+--[[pod_format="raw",created="2024-04-04 07:19:33",modified="2024-04-14 14:19:14",revision=126]]
+--cd("/cirnofarm/src")
+include("/cirnofarm/src/cirno.lua")
 --function _init()
 --	x = 128
 --	y = 128
@@ -39,12 +40,6 @@ include("cirno.lua")
 
 --end
 
-function drawMap()
-	for i=2,1,-1 do
-		map(fetch"map/0.map"[i].bmp)
-	end
-end
-
 --function _update()
 --	if (btn(0)) x -= 2 hflip = true
 --	if (btn(1)) x += 2 hflip = false
@@ -53,17 +48,17 @@ end
 --end
 :: map/0.map
 b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixtb2RpZmllZD0iMjAyNC0w
-NC0xNCAxMzo1MToyMSIscmV2aXNpb249NTBdXWx6NADPAAAA0iAAAPAIe3tibXA9dXNlcmRhdGEo
-ImkxNiIsMzIDAC8iMAEA----Fi8yMDAC---9HzL0AIwPjABOD_wA4B4ybAAPAQD-Ax8ySABILzIw
-AQBoD5AAkg8BAP------IfEVIiksaGlkZGVuPWZhbHNlLG5hbWU9InNvbGlkIixwYW5feD0wCADS
-eT0wLHRpbGVfaD0xNgoAEHcKAK96b29tPTAuNX0sZhALHzEEAP--------------------gPZhAD
-n2JhY2tncm91bmsQGVAwLjV9fQ==
+NC0xNCAxNDoxOToxNCIscmV2aXNpb249NzFdXWx6NADoAAAA0iAAAPAIe3tibXA9dXNlcmRhdGEo
+ImkxNiIsMzIDAC8iMAEA---JLzIwTAA5D3wC--9pD_AAlR8yXABID0QAHw8BANcfMmgAWC8yMAEA
+-xAfMkgASC8yMAEAaA_QAJIPAQD-TB8ytADQLzIwAQD-CC8yMAEA-73xFSIpLGhpZGRlbj1mYWxz
+ZSxuYW1lPSJzb2xpZCIscGFuX3g9MAgA0nk9MCx0aWxlX2g9MTYKABB3CgCvem9vbT0wLjV9LGYQ
+Cx8xBAD--------------------4D2YQA59iYWNrZ3JvdW5rEBlQMC41fX0=
 :: map/.info.pod
 b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixzdG9yZWQ9IjIwMjQtMDQt
 MDQgMDc6MTk6MzMiXV1sejQABAAAAAMAAAAwbmls
 :: sfx/0.sfx
 b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjM0Iixtb2RpZmllZD0iMjAyNC0w
-NC0xNCAxMzo1MTowMSIscmV2aXNpb249MzFdXWx6NAARAQAAwQgAAPAncHh1AAMoAAADAAQPQBAC
+NC0xNCAxNDoxNjozNCIscmV2aXNpb249NDldXWx6NAARAQAAwQgAAPAncHh1AAMoAAADAAQPQBAC
 DgABoAEgAqAOAA8QAA3wygECAwQFBgcAD-_QCAkKCw8MDw0PDg8PEADwAA0PEQ8SDxMPFA8VDxYP
 FxMA8QEPGA8ZDxoPGw8cDx0PHg8fFADxACAPIQ8iDyMPJA8lDyYPJxQA8QAoDykPKg8rDywPLQ8u
 Dy8UAPEAMA8xDzIPMw80DzUPNg83FAD-BTgPOQ86DzsPPA89Dz4PPwAP--D-AQDr-ydaARAGDyAQ
@@ -73,9 +68,9 @@ v_gPQAANQP--sPBwCgD--2Qf-wEAl1D-----Hw==
 b64$LS1bW3BvZCxjcmVhdGVkPSIyMDI0LTA0LTA0IDA3OjE5OjMzIixzdG9yZWQ9IjIwMjQtMDQt
 MDQgMDc6MTk6MzMiXV1sejQABAAAAAMAAAAwbmls
 :: .info.pod
-b64$LS1bW3BvZCxydW50aW1lPTUsc3RvcmVkPSIyMDI0LTA0LTE0IDEzOjUxOjIyIix3b3Jrc3Bh
-Y2VzPXt7bG9jYXRpb249Im1haW4ubHVhIzEyIix3b3Jrc3BhY2VfaW5kZXg9MX0se2xvY2F0aW9u
-PSJnZngvMC5nZngiLHdvcmtzcGFjZV9pbmRleD0yfSx7bG9jYXRpb249Im1hcC8wLm1hcCIsd29y
-a3NwYWNlX2luZGV4PTN9LHtsb2NhdGlvbj0ic2Z4LzAuc2Z4Iix3b3Jrc3BhY2VfaW5kZXg9NH19
-XV1sejQABAAAAAMAAAAwbmls
+b64$LS1bW3BvZCxydW50aW1lPTUsc3RvcmVkPSIyMDI0LTA0LTE0IDE0OjE5OjE0Iix3b3Jrc3Bh
+Y2VzPXt7bG9jYXRpb249Im1haW4ubHVhIzIiLHdvcmtzcGFjZV9pbmRleD0xfSx7bG9jYXRpb249
+ImdmeC8wLmdmeCIsd29ya3NwYWNlX2luZGV4PTJ9LHtsb2NhdGlvbj0ibWFwLzAubWFwIix3b3Jr
+c3BhY2VfaW5kZXg9M30se2xvY2F0aW9uPSJzZngvMC5zZngiLHdvcmtzcGFjZV9pbmRleD00fX1d
+XWx6NAAEAAAAAwAAADBuaWw=
 :: [eoc]
diff --git a/src/cirno.lua b/src/cirno.lua
index cab3118..2f58007 100644
--- a/src/cirno.lua
+++ b/src/cirno.lua
@@ -1,3 +1,5 @@
+--[[pod_format="raw",created="2024-04-14 14:05:11",modified="2024-04-14 14:17:48",revision=5]]
+
 function _init()
 	x = 128
 	y = 128
@@ -6,11 +8,23 @@ function _init()
 end
 
 function _draw()
-	camera(x - 240, y - 135)
 	cls(0)
+	camera(x - 240, y - 135)
 	
-	spr(playerSpr,x,y, hflip)
+	drawMap()	
 
+	spr(playerSpr,x,y, hflip)
+	
+	spr(playerSpr,x+32,y, hflip)
+	
+	
+
+end
+
+function drawMap()
+	for i=2,1,-1 do
+		map(fetch"map/0.map"[i].bmp)
+	end
 end
 
 function _update()
@@ -18,4 +32,8 @@ function _update()
 	if (btn(1)) x += 2 hflip = false
 	if (btn(2)) y -= 2
 	if (btn(3)) y += 2
+end
+
+function checkCollision(x,y)
+	
 end
\ No newline at end of file
diff --git a/src/game.lua b/src/game.lua
index f99f9cd..56094a8 100644
--- a/src/game.lua
+++ b/src/game.lua
@@ -1,4 +1,4 @@
---[[pod_format="raw",created="2024-04-14 13:41:07",modified="2024-04-14 13:49:10",revision=1]]
+--[[pod_format="raw",created="2024-04-14 13:41:07",modified="2024-04-14 14:05:57",revision=2]]
 include("cirno.lua")
 
 function _init()