From 77f2d4fa0e179db0086412dbc6656fa424b42135 Mon Sep 17 00:00:00 2001
From: TheFakeMateo <skeetendomateo@gmail.com>
Date: Sat, 3 Nov 2018 17:39:46 -0500
Subject: [PATCH] Player and Rival house layouts better match v4

---
 constants/map_constants.asm     |   4 ++--
 data/mapObjects/BluesHouse.asm  |  10 +++++-----
 data/mapObjects/RedsHouse1F.asm |  10 +++++-----
 gfx/blocksets/reds_house.bst    | Bin 544 -> 544 bytes
 maps/BluesHouse.blk             |   2 +-
 maps/RedsHouse1F.blk            |   2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index 812611d90..661a7adb6 100755
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -42,9 +42,9 @@ ENDM
 	mapconst ROUTE_23,                   72, 10 ; $22
 	mapconst ROUTE_24,                   18, 10 ; $23
 	mapconst ROUTE_25,                    9, 30 ; $24
-	mapconst REDS_HOUSE_1F,               4,  7 ; $25
+	mapconst REDS_HOUSE_1F,               4,  4 ; $25
 	mapconst REDS_HOUSE_2F,               4,  4 ; $26
-	mapconst BLUES_HOUSE,                 4,  7 ; $27
+	mapconst BLUES_HOUSE,                 4,  4 ; $27
 	mapconst OAKS_LAB,                    6,  5 ; $28
 	mapconst VIRIDIAN_POKECENTER,         4,  7 ; $29
 	mapconst VIRIDIAN_MART,               4,  4 ; $2A
diff --git a/data/mapObjects/BluesHouse.asm b/data/mapObjects/BluesHouse.asm
index 06acedb7a..c914307e2 100755
--- a/data/mapObjects/BluesHouse.asm
+++ b/data/mapObjects/BluesHouse.asm
@@ -8,13 +8,13 @@ BluesHouseObject:
 	db $4 ; signs
 	db $1, $0, $4 ; Stove
 	db $1, $1, $5 ; Sink
-	db $1, $4, $6 ; Fridge
-	db $1, $9, $7 ; TV
+	db $1, $2, $6 ; Fridge
+	db $1, $5, $7 ; TV
 
 	db $3 ; objects
-	object SPRITE_DAISY, $8, $4, $FF, $D3, $1 ; Daisy, sitting by map
-	object SPRITE_DAISY, $3, $2, $FE, $1, $2, $0 ; Daisy, walking around
-	object SPRITE_TOWN_MAP, $9, $4, $FF, $FF, $3, $0 ; map on table
+	object SPRITE_DAISY, $2, $4, $FF, $D3, $1 ; Daisy, sitting by map
+	object SPRITE_DAISY, $2, $2, $FE, $1, $2, $0 ; Daisy, walking around
+	object SPRITE_TOWN_MAP, $3, $4, $FF, $FF, $3, $0 ; map on table
 
 	; warp-to
 	EVENT_DISP BLUES_HOUSE_WIDTH, $7, $2
diff --git a/data/mapObjects/RedsHouse1F.asm b/data/mapObjects/RedsHouse1F.asm
index b10859998..57587dd2a 100755
--- a/data/mapObjects/RedsHouse1F.asm
+++ b/data/mapObjects/RedsHouse1F.asm
@@ -4,18 +4,18 @@ RedsHouse1FObject:
 	db $3 ; warps
 	db $7, $2, $0, $FF ; exit1
 	db $7, $3, $0, $FF ; exit2
-	db $0, $D, $0, REDS_HOUSE_2F ; staircase
+	db $0, $7, $0, REDS_HOUSE_2F ; staircase
 
 	db $4 ; signs
-	db $1, $9, $2 ; TV
-	db $1, $4, $3 ; Fridge
+	db $1, $5, $2 ; TV
+	db $1, $2, $3 ; Fridge
 	db $1, $0, $4 ; Stove
 	db $1, $1, $5 ; Sink
 
 	db $1 ; objects
-	object SPRITE_MOM, $B, $4, $FF, $D2, $1 ; Mom
+	object SPRITE_MOM, $5, $4, $FF, $D2, $1 ; Mom
 
 	; warp-to
 	EVENT_DISP REDS_HOUSE_1F_WIDTH, $7, $2
 	EVENT_DISP REDS_HOUSE_1F_WIDTH, $7, $3
-	EVENT_DISP REDS_HOUSE_1F_WIDTH, $0, $D
+	EVENT_DISP REDS_HOUSE_1F_WIDTH, $0, $7
diff --git a/gfx/blocksets/reds_house.bst b/gfx/blocksets/reds_house.bst
index 804e83cdfc2b0bbe2a094a1e678b9e65f3baefe5..d933025b8392c0aa08d8489590a3a08d31ce27fa 100755
GIT binary patch
delta 39
vcmZ3$vVdj6G%hxFMn*AlMn)Ici3=w2F)#!KGB5-MGctyRGBQqfV0-`oty2iN

delta 39
vcmZ3$vVdj6G%f}PMn*PvMn*C5i3=w22?zuP3J3%R3kZaS3J6SgV0-`orFsaf

diff --git a/maps/BluesHouse.blk b/maps/BluesHouse.blk
index 6712c7ba1..cdf8bcd98 100755
--- a/maps/BluesHouse.blk
+++ b/maps/BluesHouse.blk
@@ -1 +1 @@
-	 
\ No newline at end of file
+	 !
\ No newline at end of file
diff --git a/maps/RedsHouse1F.blk b/maps/RedsHouse1F.blk
index 182d40741..52cb9518b 100755
--- a/maps/RedsHouse1F.blk
+++ b/maps/RedsHouse1F.blk
@@ -1 +1 @@
-	

\ No newline at end of file
+	
!
\ No newline at end of file