From dee8fda6bfb41fa773817166dbbaa033ac3254fa Mon Sep 17 00:00:00 2001
From: Josh Goldberg <diogenesthecynic@hotmail.com>
Date: Tue, 6 Jan 2015 04:51:04 -0500
Subject: [PATCH] Fixed doors, added directions to overlapping check

---
 FullScreenPokemon.js | 34 ++++++++++++++++++++++++++++------
 settings/maps.js     |  5 ++---
 settings/objects.js  | 10 ++++++----
 settings/sprites.js  |  4 ++--
 4 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/FullScreenPokemon.js b/FullScreenPokemon.js
index d69d3074..d57e5b8d 100644
--- a/FullScreenPokemon.js
+++ b/FullScreenPokemon.js
@@ -895,14 +895,16 @@ var FullScreenPokemon = (function (GameStartr) {
      */
     function isThingOverlappingOther(thing, other) {
         if (
-            Math.abs(thing.top - other.top) < thing.EightBitter.unitsize
+            thing.direction % 2 === 0
+            && Math.abs(thing.top - other.top) < thing.EightBitter.unitsize
             && Math.abs(thing.bottom - other.bottom) < thing.EightBitter.unitsize
         ) {
             return true;
         }
 
         if (
-            Math.abs(thing.left - other.left) < thing.EightBitter.unitsize
+            thing.direction % 2 === 1
+            && Math.abs(thing.left - other.left) < thing.EightBitter.unitsize
             && Math.abs(thing.right - other.right) < thing.EightBitter.unitsize
         ) {
             return true;
@@ -1245,15 +1247,35 @@ var FullScreenPokemon = (function (GameStartr) {
             door, i;
 
         y += 16;
-        for (i = 1; i < stories; i += 1) {
+        for (i = 2; i < stories; i += 1) {
             output.push({
-                "thing": "HouseCenter",
+                "thing": "HouseCenterLeft",
                 "x": x,
                 "y": y,
-                "width": width
-            })
+                // "width": width
+            });
+            output.push({
+                "thing": "HouseCenterRight",
+                "x": x + 16,
+                "y": y,
+                "width": width - 16
+            });
             y += 8;
         }
+        
+        output.push({
+            "thing": "HouseCenterLeft",
+            "x": x,
+            "y": y,
+            // "width": width
+        });
+        output.push({
+            "thing": "HouseCenterRight",
+            "x": x + 16,
+            "y": y,
+            "width": width - 16
+        });
+        y += 8;
 
         if (!reference.noDoor) {
             door = {
diff --git a/settings/maps.js b/settings/maps.js
index 93770d1f..f8e8b674 100644
--- a/settings/maps.js
+++ b/settings/maps.js
@@ -1,7 +1,6 @@
 FullScreenPokemon.prototype.settings.maps = {
-    //"mapDefault": "Pallet Town",
-    //"locationDefault": "Player's House Door",
-    "mapDefault": "Oak's Lab",
+    "mapDefault": "Pallet Town",
+    "locationDefault": "Player's House Door",
     "groupTypes": ["Character", "Solid", "Scenery", "Terrain"],
     "requireEntrance": true,
     "screenAttributes": [],
diff --git a/settings/objects.js b/settings/objects.js
index b21af3d7..9031e27b 100644
--- a/settings/objects.js
+++ b/settings/objects.js
@@ -26,8 +26,10 @@
                     "Grass": {},
                     "HouseBase": {
                         "HouseTop": {},
-                        "HouseCenter": {}
                     },
+                    "HouseCenterLeft": {},
+                    "HouseCenterMiddle": {},
+                    "HouseCenterRight": {},
                     "HouseLargeBase": {
                         "HouseLargeTopLeft": {},
                         "HouseLargeTopMiddle": {},
@@ -171,9 +173,9 @@
                 "height": 16,
                 "spritewidth": 16
             },
-            "HouseCenter": {
-                "spritewidth": 8
-            },
+            // "HouseCenter": {
+                // "spritewidth": 8
+            // },
             "HouseLargeBase": {
                 "width": 48,
                 "height": 20,
diff --git a/settings/sprites.js b/settings/sprites.js
index d74a5b63..956bc618 100644
--- a/settings/sprites.js
+++ b/settings/sprites.js
@@ -53,8 +53,8 @@ FullScreenPokemon.prototype.settings.sprites = {
                 "middle": "p[1,2,3,4]x132,x032,x264,x332,x296,x332,x2128,x132,x332,x132,x08,x216,x016,3x16,33x16,3x016,1000020110000201x016,1000203110002031x016,1002032110020321x016,1020323110203231x016,1203233112032331x016,3x16,33x16,3x08,x264,x032,x232,x364,x132,x232,",
                 "right": "p[0,1,2,3,4]x217,x015,x116,422x013,x316,44122x011,x316,4414422x09,x418,1441422x07,x316,44144144122x05,x316,4414414414422000x316,4414414414414220x418,14414414414412x316,4414414414414412x316,4414414414414412x316,4414414414414412x316,441441441441441x218,414414414414412x417,22441441441441x218,442214414414412x317,2244224144144124x26,44x26,433322442244144122111131221111312x35,224422144122111314221113142x37,2244224122113143221131432111x36,22442222131434221314342x15,x36,224422314344223143442x17,3333222204x26,44x26,4x19,3320000x326,233330x324,11233330x126,233330x326,233330x425,3233330x425,3233330x226,x35,0x331,0"
             }],
-            "HouseCenter": ["multiple", "horizontal", {
-                "left": "p[0,1,2,3,4]033332114x37,033332x110,033332x110,033332x110,03333211x38,033332x110,033332x110,033332x110,033332x310,03333211x38,033332x110,033332x310,0333323x49,0333323x49,0x35,x210,0x315,",
+            "HouseCenterLeft": "p[0,1,2,3,4]033332114x37,033332x110,033332x110,033332x110,03333211x38,033332x110,033332x110,033332x110,033332x310,03333211x38,033332x110,033332x310,0333323x49,0333323x49,0x35,x210,0x315,",
+            "HouseCenterRight": ["multiple", "horizontal", {
                 "middle": "p[1,2,3,4]x216,3x16,33x16,3100002011000020110002031100020311002032110020321102032311020323112032331120323313x16,33x16,3x232,x016,x216,x332,x116,x216,",
                 "right": "p[0,1,2,3,4]4x37,11233330x110,233330x110,233330x110,233330x38,11233330x110,233330x110,233330x110,233330x310,233330x38,11233330x110,233330x310,233330x49,3233330x49,3233330x210,x35,0x315,0"
             }],