Fixed overlapping fish (npc) and a lilypad tile (116,122).

1 files changed, 2 insertions, 2 deletions

diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index d279622b..3be31abc 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -410,7 +410,7 @@
 0,0,211,212,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,404,192,190,192,0,174,95,224,211,197,196,213,0,243,181,196,212,212,197,0,180,181,1361,1362,243,1364,1365,0,0,227,0,0,0,180,244,181,0,196,212,213,191,191,191,211,197,0,0,0,196,213,192,174,0,208,160,0,0,0,0,0,0,174,176,0,0,0,211,197,0,828,0,0,0,0,0,1078,1079,1080,0,760,0,0,888,774,775,901,0,0,0,0,0,1178,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,737,738,738,739,738,738,740,837,0,0,0,0,0,0,0,0,0,0,0,0,1097,1050,1051,1052,1081,0,0,0,0,0,0,0,1097,1082,1083,1084,1081,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,211,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,440,0,0,0,0,190,191,192,227,0,0,196,212,213,243,244,181,0,0,95,229,243,181,196,213,1380,1381,1382,211,197,180,181,0,97,18,243,244,244,181,196,212,212,212,197,0,0,0,0,0,229,158,207,0,224,192,0,0,0,0,0,158,207,176,0,0,0,227,0,0,820,0,0,0,0,1073,1074,1075,1076,1077,902,775,775,901,0,0,0,0,2282,0,0,0,1178,0,0,0,0,582,0,0,0,0,0,0,0,0,0,585,0,0,0,0,0,0,0,0,837,0,0,0,0,0,0,0,0,0,0,0,0,1073,1066,1067,1068,1077,0,0,0,0,0,0,0,1073,1066,1067,1068,1077,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 211,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,440,0,0,0,0,0,211,213,243,244,181,0,180,245,158,159,243,181,0,180,245,1328,227,0,196,212,212,212,197,53,245,243,181,0,229,115,18,67,243,244,244,244,181,0,0,0,0,180,244,245,207,224,191,211,213,0,0,0,0,0,174,224,192,0,0,211,197,0,0,874,0,0,0,0,1097,1090,1091,1092,1081,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,829,0,705,0,0,0,0,0,0,0,0,0,708,0,0,0,0,0,0,0,0,822,766,797,800,0,0,0,0,0,0,0,0,0,1097,1082,1083,1084,1081,0,0,0,0,0,0,0,1097,1082,1083,1084,1081,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,440,0,0,0,211,212,197,229,0,0,243,244,245,53,190,223,176,227,180,245,211,1344,243,244,244,181,95,53,68,149,116,196,197,0,196,213,114,18,50,115,116,18,243,244,181,0,180,245,0,174,0,176,211,197,196,213,0,0,0,0,190,192,0,0,0,227,828,0,0,0,0,0,0,0,1073,1074,1075,1076,1077,0,0,0,0,0,2281,0,0,0,0,0,0,0,0,0,857,0,705,1475,0,0,1475,0,1475,0,0,1475,708,0,0,0,0,0,0,0,0,763,754,756,816,0,0,0,0,0,0,0,0,0,1073,1066,1067,1068,1077,0,0,0,0,0,0,0,1073,1066,1067,1068,1077,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,440,0,0,0,211,212,197,229,0,0,243,244,245,53,190,223,176,227,180,245,211,1344,243,244,244,181,95,53,68,149,116,196,197,0,196,213,114,18,50,115,116,18,243,244,181,0,180,245,0,174,0,176,211,197,196,213,0,0,0,0,190,192,0,0,0,227,828,0,0,0,0,0,0,0,1073,1074,1075,1076,1077,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,857,0,705,1475,0,0,1475,0,1475,0,0,1475,708,0,0,0,0,0,0,0,0,763,754,756,816,0,0,0,0,0,0,0,0,0,1073,1066,1067,1068,1077,0,0,0,0,0,0,0,1073,1066,1067,1068,1077,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,440,0,0,0,243,181,0,229,0,0,0,53,68,21,0,190,212,197,229,96,227,1306,0,53,67,243,68,149,116,117,0,0,0,0,0,229,95,114,18,68,68,114,99,18,243,244,245,0,0,190,191,192,227,0,0,229,0,0,545,546,547,548,212,213,0,243,181,0,0,0,0,2282,0,0,1097,1090,1091,1092,1062,1095,1063,1064,1094,0,0,0,0,0,0,0,0,0,2281,0,833,0,721,1491,0,0,1491,0,1491,0,0,1491,724,0,0,0,0,0,0,0,0,0,0,0,837,0,0,0,0,0,0,0,0,0,1097,1050,1051,1052,1081,0,0,0,0,0,0,0,1089,1050,1051,1052,1093,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,440,0,0,0,0,243,181,0,0,0,0,20,116,117,0,197,0,0,196,213,1372,1373,53,21,116,116,116,117,0,387,0,0,0,0,389,196,213,0,114,115,116,211,213,118,18,50,545,0,0,0,0,0,595,0,595,0,595,0,673,562,1493,564,676,196,213,0,821,0,0,0,0,0,0,0,1073,1074,1075,1076,1066,1067,1068,1066,1067,0,0,0,0,0,0,0,0,0,799,766,823,0,737,739,739,738,738,738,739,738,739,739,740,0,0,0,0,0,0,0,0,0,0,0,853,0,0,0,0,0,0,0,0,0,1073,1066,1067,1068,1077,0,0,0,0,0,0,0,1105,1106,1107,1108,1109,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,440,158,159,159,159,160,227,0,213,0,0,211,212,1340,181,1341,1343,0,0,229,0,53,21,117,0,0,0,387,0,0,0,0,0,0,0,0,196,213,0,0,0,197,196,212,0,103,545,0,0,0,537,0,611,0,611,0,611,0,673,1475,0,1475,708,0,229,0,227,0,0,0,0,0,0,0,1097,1090,1091,1092,1050,1051,1052,1082,1083,0,0,0,0,0,0,0,0,0,833,756,762,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,828,0,0,869,0,0,0,0,0,0,0,0,0,1097,1082,1083,1084,1081,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -418,7 +418,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,229,755,759,762,176,211,212,213,191,211,197,0,229,0,763,756,754,196,197,0,0,0,0,119,117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,180,245,52,755,224,762,566,0,0,0,569,1486,1491,0,1491,0,1491,0,0,1475,0,1475,0,0,0,211,1194,0,0,0,0,0,0,0,1089,1090,1091,1092,1093,0,0,0,0,0,0,0,0,0,0,0,0,0,849,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,874,0,0,0,0,0,0,0,0,0,0,0,0,1089,1050,1051,1052,1093,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,190,191,223,224,192,243,181,196,212,197,244,244,196,213,158,159,160,243,244,1328,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,229,0,190,223,208,160,582,0,595,0,585,739,1503,739,739,738,738,739,741,1488,0,1490,708,0,211,197,1194,0,0,0,0,0,0,0,1105,1106,1107,1108,1109,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,829,0,0,828,0,0,0,0,0,0,0,0,0,0,829,0,0,828,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1105,1106,1107,1108,1109,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,229,0,190,192,0,0,227,0,91,196,213,0,0,0,190,223,176,813,0,1312,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,229,0,796,174,0,208,705,0,611,0,708,0,0,0,0,0,0,0,721,1504,0,1506,196,212,197,0,1194,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,857,0,0,858,0,0,0,0,0,0,0,0,0,0,857,0,0,858,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,779,0,0,829,0,0,243,76,0,0,196,213,0,0,828,0,0,778,0,1369,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,229,49,827,804,804,845,705,1475,0,1475,708,0,0,0,0,0,0,0,737,739,1521,739,740,0,0,0,1194,766,800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,873,0,0,874,0,0,0,0,0,0,0,0,0,0,842,0,0,874,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,779,0,0,829,0,0,243,76,0,0,196,213,0,0,828,0,0,778,0,1369,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,229,49,827,804,804,845,705,1475,0,1475,708,0,0,0,0,0,0,0,737,739,1521,739,740,0,0,0,1194,766,800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2281,0,0,0,0,0,0,0,0,0,0,0,873,0,0,874,0,0,0,0,0,0,0,0,0,0,842,0,0,874,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,827,804,804,440,0,0,0,243,181,0,180,245,0,0,227,801,802,176,211,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,180,245,97,18,67,50,831,721,1491,0,1491,724,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,763,754,442,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,440,158,159,160,158,243,244,245,0,0,0,227,224,0,176,197,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,419,244,181,0,229,158,159,114,115,18,54,737,211,739,738,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,442,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,440,190,191,192,174,208,160,0,0,0,0,190,211,1372,1340,1343,1342,0,0,0,0,0,0,0,0,0,0,0,0,0,418,801,801,402,419,245,160,243,181,196,213,223,176,0,114,103,0,227,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,442,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,