From 94578d5f17e7c074bd39ffe9d5f869b0f2915ad0 Mon Sep 17 00:00:00 2001
From: sparky4 <sparky4@cock.li>
Date: Sun, 19 Apr 2015 17:47:38 -0500
Subject: [PATCH] added proper collision detection!! ^^ 	modified:  
 data/test.map 	modified:   data/test.tmx 	modified:   scroll.exe 
 modified:   src/scroll.c

---
 data/test.map |   2 +-
 data/test.tmx |  22 +++++++++++-----------
 scroll.exe    | Bin 67740 -> 67836 bytes
 src/scroll.c  |  29 ++++++++++++++++-------------
 4 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/data/test.map b/data/test.map
index 477bcf45..5e15ec1d 100644
--- a/data/test.map
+++ b/data/test.map
@@ -2,7 +2,7 @@
  "height":30,
  "layers":[
         {
-         "data":[1, 2, 3, 4, 0, 3, 3, 3, 3, 3, 3, 3, 3, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 6, 7, 8, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 10, 11, 12, 0, 1, 5, 1, 1, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 0, 1, 1, 1, 5, 8, 1, 11, 11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 1, 11, 11, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 8, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 12, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 1, 2, 3, 4, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 5, 6, 7, 8, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 9, 10, 11, 12, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10],
+         "data":[1, 2, 3, 4, 0, 3, 3, 3, 3, 3, 3, 3, 3, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 6, 7, 8, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 10, 11, 12, 4, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 0, 1, 1, 1, 5, 8, 1, 11, 11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 4, 0, 0, 0, 0, 0, 8, 8, 1, 11, 11, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 8, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 1, 2, 3, 4, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 5, 6, 7, 8, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 9, 10, 11, 12, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10],
          "height":30,
          "name":"bg",
          "opacity":1,
diff --git a/data/test.tmx b/data/test.tmx
index 4c5c441b..a0f3cd01 100644
--- a/data/test.tmx
+++ b/data/test.tmx
@@ -6,14 +6,14 @@
  <layer name="bg" width="40" height="30">
   <data encoding="csv">
 1,2,3,4,0,3,3,3,3,3,3,3,3,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-5,6,7,8,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-9,10,11,12,0,1,5,1,1,8,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+5,6,7,8,0,1,0,1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+9,10,11,12,4,1,0,1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
 13,14,15,16,0,1,1,1,5,8,1,11,11,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-0,0,0,0,0,0,0,0,8,8,1,11,11,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+0,0,4,0,0,0,0,0,8,8,1,11,11,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
 1,1,1,1,0,0,0,0,8,8,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
 1,1,1,1,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
 1,1,1,1,0,0,0,0,1,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-1,1,1,1,1,1,1,1,1,12,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
 1,1,1,1,1,1,1,1,1,1,1,1,3,3,3,3,1,2,3,4,3,3,3,3,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
@@ -26,13 +26,13 @@
 1,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,3,3,3,3,6,6,6,6,6,6,6,3,1,1,1,
 1,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,3,3,3,3,3,3,3,1,1,1,
 1,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-1,1,1,1,1,1,1,1,1,3,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-1,1,1,1,1,1,1,1,1,1,1,3,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-1,1,1,1,1,1,1,1,1,1,1,1,1,3,3,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,3,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,3,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,3,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,0,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,3,3,3,1,1,1,1,1,1,1,1,1,1,1,0,1,0,0,0,1,0,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,3,3,1,1,1,1,1,1,1,1,0,1,0,1,1,1,0,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,0,0,0,0,0,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,1,1,1,1,1,
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,10,10,
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,10,10
 </data>
diff --git a/scroll.exe b/scroll.exe
index 793263620f946ad162d99e18536c9c3b8f82b2b4..db1e57709fb9d6b9aa00ea4141dc4ad9d3b7b638 100644
GIT binary patch
delta 11116
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
a8}sUzr+7>IxrSlf8N7%6ypUyhi~j@fhTVDq

delta 10930
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

diff --git a/src/scroll.c b/src/scroll.c
index 367b7f25..7e04266a 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -371,7 +371,7 @@ void main() {
 	{
 		if(player.d == 0){ player.d = 2; }
 		if(bg->tx >= 0 && bg->tx+20 < map.width && player.tx == bg->tx + 10 &&
-		!(bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0))//!(player.tx+1 == TRIGGX && player.ty == TRIGGY))	//collision detection!
+		!(bg->map->data[(player.tx)+(map.width*(player.ty-1))] == 0))//!(player.tx+1 == TRIGGX && player.ty == TRIGGY))	//collision detection!
 		{
 			if(player.q<=(TILEWH/SPEED))
 			{
@@ -385,7 +385,7 @@ void main() {
 				player.q++;
 			} else { player.q = 1; player.d = 0; player.tx++; }
 		}
-		else if(player.tx < map.width && !(bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0))//!(player.tx+1 == TRIGGX && player.ty == TRIGGY))
+		else if(player.tx < map.width && !(bg->map->data[(player.tx)+(map.width*(player.ty-1))] == 0))//!(player.tx+1 == TRIGGX && player.ty == TRIGGY))
 		{
 			if(player.q<=(TILEWH/SPEED))
 			{
@@ -413,7 +413,7 @@ void main() {
 	{
 		if(player.d == 0){ player.d = 4; }
 		if(bg->tx > 0 && bg->tx+20 <= map.width && player.tx == bg->tx + 10 &&
-		!(bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0))//!(player.tx-1 == TRIGGX && player.ty == TRIGGY))	//collision detection!
+		!(bg->map->data[(player.tx-2)+(map.width*(player.ty-1))] == 0))//!(player.tx-1 == TRIGGX && player.ty == TRIGGY))	//collision detection!
 		{
 			if(player.q<=(TILEWH/SPEED))
 			{
@@ -427,7 +427,7 @@ void main() {
 				player.q++;
 			} else { player.q = 1; player.d = 0; player.tx--; }
 		}
-		else if(player.tx > 1 && !(bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0))//!(player.tx-1 == TRIGGX && player.ty == TRIGGY))
+		else if(player.tx > 1 && !(bg->map->data[(player.tx-2)+(map.width*(player.ty-1))] == 0))//!(player.tx-1 == TRIGGX && player.ty == TRIGGY))
 		{
 			if(player.q<=(TILEWH/SPEED))
 			{
@@ -455,7 +455,7 @@ void main() {
 	{
 		if(player.d == 0){ player.d = 3; }
 		if(bg->ty >= 0 && bg->ty+15 < map.height && player.ty == bg->ty + 8 &&
-		!(bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0))//!(player.tx == TRIGGX && player.ty+1 == TRIGGY))	//collision detection!
+		!(bg->map->data[(player.tx-1)+(map.width*(player.ty))] == 0))//!(player.tx == TRIGGX && player.ty+1 == TRIGGY))	//collision detection!
 		{
 			if(player.q<=(TILEWH/SPEED))
 			{
@@ -469,7 +469,7 @@ void main() {
 				player.q++;
 			} else { player.q = 1; player.d = 0; player.ty++; }
 		}
-		else if(player.ty < map.height && !(bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0))//!(player.tx == TRIGGX && player.ty+1 == TRIGGY))
+		else if(player.ty < map.height && !(bg->map->data[(player.tx-1)+(map.width*(player.ty))] == 0))//!(player.tx == TRIGGX && player.ty+1 == TRIGGY))
 		{
 			if(player.q<=(TILEWH/SPEED))
 			{
@@ -497,7 +497,7 @@ void main() {
 	{
 		if(player.d == 0){ player.d = 1; }
 		if(bg->ty > 0 && bg->ty+15 <= map.height && player.ty == bg->ty + 8 &&
-		!(bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0))//!(player.tx == TRIGGX && player.ty-1 == TRIGGY))	//collision detection!
+		!(bg->map->data[(player.tx-1)+(map.width*(player.ty-2))] == 0))//!(player.tx == TRIGGX && player.ty-1 == TRIGGY))	//collision detection!
 		{
 			if(player.q<=(TILEWH/SPEED))
 			{
@@ -511,7 +511,7 @@ void main() {
 				player.q++;
 			} else { player.q = 1; player.d = 0; player.ty--; }
 		}
-		else if(player.ty > 1 && !(bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0))//!(player.tx == TRIGGX &&  player.ty-1 == TRIGGY))
+		else if(player.ty > 1 && !(bg->map->data[(player.tx-1)+(map.width*(player.ty-2))] == 0))//!(player.tx == TRIGGX &&  player.ty-1 == TRIGGY))
 		{
 			if(player.q<=(TILEWH/SPEED))
 			{
@@ -533,7 +533,6 @@ void main() {
 		player.triggerx = player.tx;
 		player.triggery = player.ty-1;
 	}
-	//modexClearRegion(mask->page, 66, 66, 2, 40, 0);
 }else{
 //88 switch!
 	//right movement
@@ -589,7 +588,8 @@ void main() {
 			} else { panq = 1; pand = 0; }
 	}
 }
-	if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))
+	//if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))
+	if(((bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))
 	{
 		short i;
 		for(i=800; i>=400; i--)
@@ -619,7 +619,10 @@ void main() {
 			mov ah,31h
 			int 21h
 		}
-	}
+	}
+
+	if((player.q==1) && !(player.x%TILEWH==0 && player.y%TILEWH==0)) break;	//incase things go out of sync!
+
 	}
 
 	/* fade back to text mode */
@@ -629,7 +632,6 @@ void main() {
 	modexFadeOff(4, gpal);
 	modexLeave();
 	setkb(0);
-	//system("mem /E /P");
 	printf("Project 16 scroll.exe\n");
 	printf("tx: %d\n", bg->tx);
 	printf("ty: %d\n", bg->ty);
@@ -878,7 +880,8 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y) {
 	//if(i==0) i=2;
 	if(i==0)
 	{
-		//wwww
+		//wwww
+		modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, 0); //currently the over scan color!
 	}
 	else
 	{
-- 
2.39.2