From 7229ccb81b8a53683d0158477fc3b8916416c35f Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Thu, 26 May 2016 10:17:33 -0400
Subject: Include route 7 and link club headers/data

---
 data/mapObjects/route7.asm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/route7.asm b/data/mapObjects/route7.asm
index 485a8694..b84fa190 100755
--- a/data/mapObjects/route7.asm
+++ b/data/mapObjects/route7.asm
@@ -3,9 +3,9 @@ Route7Object: ; 0x48022 (size=47)
 
 	db $5 ; warps
 	db $9, $12, $2, ROUTE_7_GATE
-	db $a, $12, $3, ROUTE_7_GATE
+	db $a, $12, $2, ROUTE_7_GATE
 	db $9, $b, $0, ROUTE_7_GATE
-	db $a, $b, $1, ROUTE_7_GATE
+	db $a, $b, $0, ROUTE_7_GATE
 	db $d, $5, $0, PATH_ENTRANCE_ROUTE_7
 
 	db $1 ; signs
-- 
cgit v1.2.3


From d9d9354e11afbde77ae510920c498d4143f37013 Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Thu, 26 May 2016 10:48:36 -0400
Subject: Include Saffron City

---
 data/mapObjects/saffroncity.asm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/saffroncity.asm b/data/mapObjects/saffroncity.asm
index 69e76ee7..5980659b 100755
--- a/data/mapObjects/saffroncity.asm
+++ b/data/mapObjects/saffroncity.asm
@@ -1,4 +1,4 @@
-SaffronCityObject: ; 0x509dc (size=188)
+SaffronCityObject: ; 0x509e2 (size=188)
 	db $f ; border block
 
 	db $8 ; warps
@@ -23,7 +23,7 @@ SaffronCityObject: ; 0x509dc (size=188)
 	db $1d, $1b, $18 ; SaffronCityText24
 	db $13, $1, $19 ; SaffronCityText25
 
-	db $f ; objects
+	db $e ; objects
 	object SPRITE_ROCKET, $7, $6, STAY, NONE, $1 ; person
 	object SPRITE_ROCKET, $14, $8, WALK, $2, $2 ; person
 	object SPRITE_ROCKET, $22, $4, STAY, NONE, $3 ; person
@@ -38,7 +38,6 @@ SaffronCityObject: ; 0x509dc (size=188)
 	object SPRITE_BIRD, $1f, $c, STAY, DOWN, $c ; person
 	object SPRITE_ROCKER, $12, $8, STAY, UP, $d ; person
 	object SPRITE_ROCKET, $12, $16, STAY, DOWN, $e ; person
-	object SPRITE_ROCKET, $13, $16, STAY, DOWN, $f ; person
 
 	; warp-to
 	EVENT_DISP SAFFRON_CITY_WIDTH, $5, $7 ; COPYCATS_HOUSE_1F
-- 
cgit v1.2.3


From 054cb312c7a8f64b7b1d842aae774115a62509cd Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Thu, 26 May 2016 11:09:15 -0400
Subject: Include Route 5

---
 data/mapObjects/route5.asm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/route5.asm b/data/mapObjects/route5.asm
index d11f8417..7ace428a 100755
--- a/data/mapObjects/route5.asm
+++ b/data/mapObjects/route5.asm
@@ -1,8 +1,8 @@
-Route5Object: ; 0x545a3 (size=47)
+Route5Object: ; 0x545ab (size=47)
 	db $a ; border block
 
 	db $5 ; warps
-	db $1d, $a, $3, ROUTE_5_GATE
+	db $1d, $a, $2, ROUTE_5_GATE
 	db $1d, $9, $2, ROUTE_5_GATE
 	db $21, $a, $0, ROUTE_5_GATE
 	db $1b, $11, $0, PATH_ENTRANCE_ROUTE_5
-- 
cgit v1.2.3


From d3c9c0650289728d107c3cdade5956f0f4a2a02a Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Thu, 26 May 2016 11:20:12 -0400
Subject: Merge map ID and dimension constants into a single file

---
 data/mapObjects/ceruleancity.asm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/ceruleancity.asm
index 8c429695..248a8e83 100755
--- a/data/mapObjects/ceruleancity.asm
+++ b/data/mapObjects/ceruleancity.asm
@@ -3,15 +3,15 @@ CeruleanCityObject: ; 0x18786 (size=170)
 
 	db $a ; warps
 	db $b, $1b, $0, TRASHED_HOUSE
-	db $f, $d, $0, CERULEAN_HOUSE
+	db $f, $d, $0, CERULEAN_HOUSE_1
 	db $11, $13, $0, CERULEAN_POKECENTER
 	db $13, $1e, $0, CERULEAN_GYM
 	db $19, $d, $0, BIKE_SHOP
 	db $19, $19, $0, CERULEAN_MART
 	db $b, $4, $0, UNKNOWN_DUNGEON_1
 	db $9, $1b, $2, TRASHED_HOUSE
-	db $b, $9, $1, CERULEAN_HOUSE_3
-	db $9, $9, $0, CERULEAN_HOUSE_3
+	db $b, $9, $1, CERULEAN_HOUSE_2
+	db $9, $9, $0, CERULEAN_HOUSE_2
 
 	db $6 ; signs
 	db $13, $17, $c ; CeruleanCityText12
@@ -36,12 +36,12 @@ CeruleanCityObject: ; 0x18786 (size=170)
 
 	; warp-to
 	EVENT_DISP CERULEAN_CITY_WIDTH, $b, $1b ; TRASHED_HOUSE
-	EVENT_DISP CERULEAN_CITY_WIDTH, $f, $d ; CERULEAN_HOUSE
+	EVENT_DISP CERULEAN_CITY_WIDTH, $f, $d ; CERULEAN_HOUSE_1
 	EVENT_DISP CERULEAN_CITY_WIDTH, $11, $13 ; CERULEAN_POKECENTER
 	EVENT_DISP CERULEAN_CITY_WIDTH, $13, $1e ; CERULEAN_GYM
 	EVENT_DISP CERULEAN_CITY_WIDTH, $19, $d ; BIKE_SHOP
 	EVENT_DISP CERULEAN_CITY_WIDTH, $19, $19 ; CERULEAN_MART
 	EVENT_DISP CERULEAN_CITY_WIDTH, $b, $4 ; UNKNOWN_DUNGEON_1
 	EVENT_DISP CERULEAN_CITY_WIDTH, $9, $1b ; TRASHED_HOUSE
-	EVENT_DISP CERULEAN_CITY_WIDTH, $b, $9 ; CERULEAN_HOUSE_3
-	EVENT_DISP CERULEAN_CITY_WIDTH, $9, $9 ; CERULEAN_HOUSE_3
+	EVENT_DISP CERULEAN_CITY_WIDTH, $b, $9 ; CERULEAN_HOUSE_2
+	EVENT_DISP CERULEAN_CITY_WIDTH, $9, $9 ; CERULEAN_HOUSE_2
-- 
cgit v1.2.3


From 8abddd138c6aac54b3e1eb5c16d24fe6ce4b9c29 Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Thu, 26 May 2016 11:51:19 -0400
Subject: Include Cerulean City

---
 data/mapObjects/ceruleancity.asm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/ceruleancity.asm
index 248a8e83..ff0f2c66 100755
--- a/data/mapObjects/ceruleancity.asm
+++ b/data/mapObjects/ceruleancity.asm
@@ -1,5 +1,5 @@
 CeruleanCityObject: ; 0x18786 (size=170)
-	db $f ; border block
+	db $a ; border block
 
 	db $a ; warps
 	db $b, $1b, $0, TRASHED_HOUSE
@@ -27,12 +27,12 @@ CeruleanCityObject: ; 0x18786 (size=170)
 	object SPRITE_BLACK_HAIR_BOY_1, $1f, $14, STAY, DOWN, $3 ; person
 	object SPRITE_BLACK_HAIR_BOY_2, $f, $12, WALK, $1, $4 ; person
 	object SPRITE_BLACK_HAIR_BOY_2, $9, $15, WALK, $2, $5 ; person
-	object SPRITE_GUARD, $1c, $c, STAY, DOWN, $6 ; person
+	object SPRITE_OFFICER_JENNY, $1c, $c, STAY, DOWN, $6 ; person
 	object SPRITE_LASS, $1d, $1a, STAY, LEFT, $7 ; person
-	object SPRITE_SLOWBRO, $1c, $1a, STAY, DOWN, $8 ; person
+	object SPRITE_BALL, $1c, $1a, STAY, DOWN, $8 ; person
 	object SPRITE_LASS, $9, $1b, WALK, $2, $9 ; person
 	object SPRITE_BLACK_HAIR_BOY_2, $4, $c, STAY, DOWN, $a ; person
-	object SPRITE_GUARD, $1b, $c, STAY, DOWN, $b ; person
+	object SPRITE_OFFICER_JENNY, $1b, $c, STAY, DOWN, $b ; person
 
 	; warp-to
 	EVENT_DISP CERULEAN_CITY_WIDTH, $b, $1b ; TRASHED_HOUSE
-- 
cgit v1.2.3


From 25cadbde5bcbdc39ee294bb419fb0e30de3b1411 Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Thu, 26 May 2016 15:25:28 -0400
Subject: Route 2

---
 data/mapObjects/route2.asm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/route2.asm b/data/mapObjects/route2.asm
index 0e6784b2..9731f450 100755
--- a/data/mapObjects/route2.asm
+++ b/data/mapObjects/route2.asm
@@ -1,13 +1,14 @@
 Route2Object: ; 0x54022 (size=72)
 	db $f ; border block
 
-	db $6 ; warps
+	db $7 ; warps
 	db $9, $c, $0, DIGLETTS_CAVE_EXIT
 	db $b, $3, $1, VIRIDIAN_FOREST_EXIT
 	db $13, $f, $0, ROUTE_2_HOUSE
 	db $23, $10, $1, ROUTE_2_GATE
 	db $27, $f, $2, ROUTE_2_GATE
 	db $2b, $3, $2, VIRIDIAN_FOREST_ENTRANCE
+	db $23, $11, $1, ROUTE_2_GATE
 
 	db $2 ; signs
 	db $41, $5, $3 ; Route2Text3
@@ -24,10 +25,12 @@ Route2Object: ; 0x54022 (size=72)
 	EVENT_DISP ROUTE_2_WIDTH, $23, $10 ; ROUTE_2_GATE
 	EVENT_DISP ROUTE_2_WIDTH, $27, $f ; ROUTE_2_GATE
 	EVENT_DISP ROUTE_2_WIDTH, $2b, $3 ; VIRIDIAN_FOREST_ENTRANCE
+	EVENT_DISP ROUTE_2_WIDTH, $23, $11 ; ROUTE_2_GATE
 
 	; unused
 	EVENT_DISP $4, $7, $2
-	db   $12, $c7, $9, $7
+	dw      $c712
+	db             $9, $7
 	EVENT_DISP $4, $7, $2
 	EVENT_DISP $4, $7, $2
 	EVENT_DISP $4, $7, $2
-- 
cgit v1.2.3


From b53be53ba38ccae62b450e48b2501bea43000ddd Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Thu, 26 May 2016 15:46:46 -0400
Subject: Phase 1 of viridian city script disassembly

---
 data/mapObjects/viridiancity.asm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/viridiancity.asm b/data/mapObjects/viridiancity.asm
index a2d2815f..79b177f4 100755
--- a/data/mapObjects/viridiancity.asm
+++ b/data/mapObjects/viridiancity.asm
@@ -9,14 +9,14 @@ ViridianCityObject: ; 0x18384 (size=104)
 	db $7, $20, $0, VIRIDIAN_GYM
 
 	db $6 ; signs
-	db $11, $11, $8 ; ViridianCityText8
-	db $1, $13, $9 ; ViridianCityText9
-	db $1d, $15, $a ; ViridianCityText10
-	db $13, $1e, $b ; MartSignText
-	db $19, $18, $c ; PokeCenterSignText
-	db $7, $1b, $d ; ViridianCityText13
+	db $11, $11, $9 ; ViridianCityText8
+	db $1, $13, $a ; ViridianCityText9
+	db $1d, $15, $b ; ViridianCityText10
+	db $13, $1e, $c ; MartSignText
+	db $19, $18, $d ; PokeCenterSignText
+	db $7, $1b, $e ; ViridianCityText13
 
-	db $7 ; objects
+	db $8 ; objects
 	object SPRITE_BUG_CATCHER, $d, $14, WALK, $0, $1 ; person
 	object SPRITE_GAMBLER, $1e, $8, STAY, NONE, $2 ; person
 	object SPRITE_BUG_CATCHER, $1e, $19, WALK, $0, $3 ; person
@@ -24,6 +24,7 @@ ViridianCityObject: ; 0x18384 (size=104)
 	object SPRITE_LYING_OLD_MAN, $12, $9, STAY, NONE, $5 ; person
 	object SPRITE_FISHER2, $6, $17, STAY, DOWN, $6 ; person
 	object SPRITE_GAMBLER, $11, $5, WALK, $2, $7 ; person
+	object SPRITE_GAMBLER, $12, $9, STAY, NONE, $8
 
 	; warp-to
 	EVENT_DISP VIRIDIAN_CITY_WIDTH, $19, $17 ; VIRIDIAN_POKECENTER
-- 
cgit v1.2.3


From edafbab453e53564e1826fb6b73bbc72e7f9edd3 Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Thu, 26 May 2016 22:02:52 -0400
Subject: Disassemble Pallet Town

---
 data/mapObjects/pallettown.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/pallettown.asm b/data/mapObjects/pallettown.asm
index 4832246f..0d45fea3 100755
--- a/data/mapObjects/pallettown.asm
+++ b/data/mapObjects/pallettown.asm
@@ -13,7 +13,7 @@ PalletTownObject: ; 0x182c3 (size=58)
 	db $5, $b, $7 ; PalletTownText7
 
 	db $3 ; objects
-	object SPRITE_OAK, $8, $5, STAY, NONE, $1 ; person
+	object SPRITE_OAK, $a, $4, STAY, NONE, $1 ; person
 	object SPRITE_GIRL, $3, $8, WALK, $0, $2 ; person
 	object SPRITE_FISHER2, $b, $e, WALK, $0, $3 ; person
 
-- 
cgit v1.2.3


From 40f0dba6c17116c61ce4935663bf1a79485edee9 Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Fri, 27 May 2016 09:22:38 -0400
Subject: Route 24 scripts

---
 data/mapObjects/route24.asm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/route24.asm b/data/mapObjects/route24.asm
index f8173c9d..115f08d3 100755
--- a/data/mapObjects/route24.asm
+++ b/data/mapObjects/route24.asm
@@ -5,7 +5,7 @@ Route24Object: ; 0x506a4 (size=67)
 
 	db $0 ; signs
 
-	db $8 ; objects
+	db $9 ; objects
 	object SPRITE_BLACK_HAIR_BOY_1, $b, $f, STAY, LEFT, $1, OPP_ROCKET, $6
 	object SPRITE_BLACK_HAIR_BOY_1, $5, $14, STAY, UP, $2, OPP_JR_TRAINER_M, $2
 	object SPRITE_BLACK_HAIR_BOY_1, $b, $13, STAY, LEFT, $3, OPP_JR_TRAINER_M, $3
@@ -14,3 +14,4 @@ Route24Object: ; 0x506a4 (size=67)
 	object SPRITE_LASS, $a, $1c, STAY, RIGHT, $6, OPP_LASS, $8
 	object SPRITE_BUG_CATCHER, $b, $1f, STAY, LEFT, $7, OPP_BUG_CATCHER, $9
 	object SPRITE_BALL, $a, $5, STAY, NONE, $8, TM_45
+	object SPRITE_BLACK_HAIR_BOY_1, $6, $5, STAY, DOWN, $9
-- 
cgit v1.2.3


From 2b96f4165f01fb41cb8c302a8da9d9a3131ab92e Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Fri, 27 May 2016 12:32:34 -0400
Subject: Vermilion City scripts

---
 data/mapObjects/vermilioncity.asm | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/vermilioncity.asm b/data/mapObjects/vermilioncity.asm
index c5602be1..3bfbc947 100755
--- a/data/mapObjects/vermilioncity.asm
+++ b/data/mapObjects/vermilioncity.asm
@@ -13,21 +13,22 @@ VermilionCityObject: ; 0x189ba (size=133)
 	db $3, $7, $0, VERMILION_HOUSE_2
 
 	db $7 ; signs
-	db $3, $1b, $7 ; VermilionCityText7
-	db $d, $25, $8 ; VermilionCityText8
-	db $d, $18, $9 ; MartSignText
-	db $3, $c, $a ; PokeCenterSignText
-	db $d, $7, $b ; VermilionCityText11
-	db $13, $7, $c ; VermilionCityText12
-	db $f, $1d, $d ; VermilionCityText13
+	db $3, $1b, $8 ; VermilionCityText7
+	db $d, $25, $9 ; VermilionCityText8
+	db $d, $18, $a ; MartSignText
+	db $3, $c, $b ; PokeCenterSignText
+	db $d, $7, $c ; VermilionCityText11
+	db $13, $7, $d ; VermilionCityText12
+	db $f, $1d, $e ; VermilionCityText13
 
-	db $6 ; objects
-	object SPRITE_FOULARD_WOMAN, $13, $7, WALK, $2, $1 ; person
+	db $7 ; objects
+	object SPRITE_LASS, $13, $7, WALK, $2, $1 ; person
 	object SPRITE_GAMBLER, $e, $6, STAY, NONE, $2 ; person
 	object SPRITE_SAILOR, $13, $1e, STAY, UP, $3 ; person
 	object SPRITE_GAMBLER, $1e, $7, STAY, NONE, $4 ; person
 	object SPRITE_SLOWBRO, $1d, $9, WALK, $1, $5 ; person
 	object SPRITE_SAILOR, $19, $1b, WALK, $2, $6 ; person
+	object SPRITE_OFFICER_JENNY, $13, $f, STAY, NONE, $7 ; person
 
 	; warp-to
 	EVENT_DISP VERMILION_CITY_WIDTH, $3, $b ; VERMILION_POKECENTER
-- 
cgit v1.2.3


From 35ab6056cae9e69b557dffac762ef68c55c8d286 Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Fri, 27 May 2016 12:46:48 -0400
Subject: Route 6 scripts

---
 data/mapObjects/route6.asm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/route6.asm b/data/mapObjects/route6.asm
index 19ac2a8a..c854c91f 100755
--- a/data/mapObjects/route6.asm
+++ b/data/mapObjects/route6.asm
@@ -11,8 +11,8 @@ Route6Object: ; 0x58022 (size=87)
 	db $f, $13, $7 ; Route6Text7
 
 	db $6 ; objects
-	object SPRITE_BLACK_HAIR_BOY_1, $a, $15, STAY, RIGHT, $1, OPP_JR_TRAINER_M, $4
-	object SPRITE_LASS, $b, $15, STAY, LEFT, $2, OPP_JR_TRAINER_F, $2
+	object SPRITE_BLACK_HAIR_BOY_1, $a, $15, STAY, RIGHT, $1, OPP_JR_TRAINER_M, $a
+	object SPRITE_LASS, $b, $15, STAY, LEFT, $2, OPP_JR_TRAINER_F, $19
 	object SPRITE_BUG_CATCHER, $0, $f, STAY, RIGHT, $3, OPP_BUG_CATCHER, $a
 	object SPRITE_BLACK_HAIR_BOY_1, $b, $1f, STAY, LEFT, $4, OPP_JR_TRAINER_M, $5
 	object SPRITE_LASS, $b, $1e, STAY, LEFT, $5, OPP_JR_TRAINER_F, $3
-- 
cgit v1.2.3


From 7caa8c4be0a77083a445a1b1d2ace4031f5cb4f0 Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Fri, 27 May 2016 18:33:42 -0400
Subject: Route 19

---
 data/mapObjects/route19.asm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm
index 7377e1e6..ec2b8774 100755
--- a/data/mapObjects/route19.asm
+++ b/data/mapObjects/route19.asm
@@ -9,13 +9,16 @@ Route19Object: ; 0x54e9a (size=87)
 
 	db $a ; objects
 	
-	object SPRITE_BLACK_HAIR_BOY_1, $9, $7, STAY, RIGHT, 1, OPP_SWIMMER, 2
-	object SPRITE_BLACK_HAIR_BOY_1, $c, $9, STAY, LEFT, 2, OPP_SWIMMER, 3
-	object SPRITE_SWIMMER, $9, $d, STAY, DOWN, $6, OPP_SWIMMER, $7
-	object SPRITE_SWIMMER, $8, $2b, STAY, LEFT, $7, OPP_BEAUTY, $c
-	object SPRITE_SWIMMER, $b, $2b, STAY, RIGHT, $8, OPP_BEAUTY, $d
-	object SPRITE_SWIMMER, $9, $2a, STAY, UP, $9, OPP_SWIMMER, $8
-	object SPRITE_SWIMMER, $a, $2c, STAY, DOWN, $a, OPP_BEAUTY, $e
+	object SPRITE_BLACK_HAIR_BOY_1, $09, $07, STAY, RIGHT,  $1, OPP_SWIMMER, $2
+	object SPRITE_BLACK_HAIR_BOY_1, $0c, $09, STAY, LEFT,   $2, OPP_SWIMMER, $3
+	object SPRITE_SWIMMER,          $0d, $19, STAY, LEFT,   $3, OPP_SWIMMER, $4
+	object SPRITE_SWIMMER,          $04, $1b, STAY, RIGHT,  $4, OPP_SWIMMER, $5
+	object SPRITE_SWIMMER,          $10, $1f, STAY, UP,     $5, OPP_SWIMMER, $6
+	object SPRITE_SWIMMER,          $09, $0d, STAY, DOWN,   $6, OPP_SWIMMER, $7
+	object SPRITE_SWIMMER,          $08, $2b, STAY, LEFT,   $7, OPP_BEAUTY,  $c
+	object SPRITE_SWIMMER,          $0b, $2b, STAY, RIGHT,  $8, OPP_BEAUTY,  $d
+	object SPRITE_SWIMMER,          $09, $2a, STAY, UP,     $9, OPP_SWIMMER, $8
+	object SPRITE_SWIMMER,          $0a, $2c, STAY, DOWN,   $a, OPP_BEAUTY,  $e
 
 	; warp-to
 	EVENT_DISP ROUTE_19_WIDTH, $9, $5 ; BEACH_HOUSE
-- 
cgit v1.2.3


From f23133ddcc6cb4ec5f974139cd8193b27d146733 Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Fri, 27 May 2016 18:57:15 -0400
Subject: Fuchsia City

---
 data/mapObjects/fuchsiacity.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/fuchsiacity.asm b/data/mapObjects/fuchsiacity.asm
index 85f801d9..c64760c0 100755
--- a/data/mapObjects/fuchsiacity.asm
+++ b/data/mapObjects/fuchsiacity.asm
@@ -33,7 +33,7 @@ FuchsiaCityObject: ; 0x18bd4 (size=178)
 	object SPRITE_GAMBLER, $1c, $11, WALK, $2, $2 ; person
 	object SPRITE_FISHER2, $1e, $e, STAY, DOWN, $3 ; person
 	object SPRITE_BUG_CATCHER, $18, $8, STAY, UP, $4 ; person
-	object SPRITE_CLEFAIRY, $1f, $5, WALK, $0, $5 ; person
+	object SPRITE_CHANSEY, $1f, $5, STAY, DOWN, $5 ; person
 	object SPRITE_BALL, $19, $6, STAY, NONE, $6 ; person
 	object SPRITE_SLOWBRO, $c, $6, WALK, $2, $7 ; person
 	object SPRITE_SLOWBRO, $1e, $c, WALK, $2, $8 ; person
-- 
cgit v1.2.3


From f0125912eaf67644a7c32c18a0ba6940469ee1bb Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Fri, 27 May 2016 19:11:47 -0400
Subject: Route 18 scripts

---
 data/mapObjects/route18.asm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/route18.asm b/data/mapObjects/route18.asm
index 88547941..40b50b08 100755
--- a/data/mapObjects/route18.asm
+++ b/data/mapObjects/route18.asm
@@ -3,9 +3,9 @@ Route18Object: ; 0x58c5a (size=66)
 
 	db $4 ; warps
 	db $8, $21, $0, ROUTE_18_GATE_1F
-	db $9, $21, $1, ROUTE_18_GATE_1F
+	db $9, $21, $0, ROUTE_18_GATE_1F
 	db $8, $28, $2, ROUTE_18_GATE_1F
-	db $9, $28, $3, ROUTE_18_GATE_1F
+	db $9, $28, $2, ROUTE_18_GATE_1F
 
 	db $2 ; signs
 	db $7, $2b, $4 ; Route18Text4
-- 
cgit v1.2.3


From d4a0fe908ffae83fd0be6f820df0780f727f2e4b Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Fri, 27 May 2016 19:18:01 -0400
Subject: Route 16

---
 data/mapObjects/route16.asm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/route16.asm b/data/mapObjects/route16.asm
index 600dbbf1..529b59bf 100755
--- a/data/mapObjects/route16.asm
+++ b/data/mapObjects/route16.asm
@@ -3,13 +3,13 @@ Route16Object: ; 0x58afc (size=136)
 
 	db $9 ; warps
 	db $a, $11, $0, ROUTE_16_GATE_1F
-	db $b, $11, $1, ROUTE_16_GATE_1F
+	db $b, $11, $0, ROUTE_16_GATE_1F
 	db $a, $18, $2, ROUTE_16_GATE_1F
-	db $b, $18, $3, ROUTE_16_GATE_1F
+	db $b, $18, $2, ROUTE_16_GATE_1F
 	db $4, $11, $4, ROUTE_16_GATE_1F
-	db $5, $11, $5, ROUTE_16_GATE_1F
+	db $5, $11, $4, ROUTE_16_GATE_1F
 	db $4, $18, $6, ROUTE_16_GATE_1F
-	db $5, $18, $7, ROUTE_16_GATE_1F
+	db $5, $18, $6, ROUTE_16_GATE_1F
 	db $5, $7, $0, ROUTE_16_HOUSE
 
 	db $2 ; signs
-- 
cgit v1.2.3


From 02fc3889b255aece1c02a673f7239a03e7a2396f Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Fri, 27 May 2016 19:29:01 -0400
Subject: Route 15

---
 data/mapObjects/route15.asm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/route15.asm b/data/mapObjects/route15.asm
index e0d19e5c..bd6283b0 100755
--- a/data/mapObjects/route15.asm
+++ b/data/mapObjects/route15.asm
@@ -3,9 +3,9 @@ Route15Object: ; 0x5894e (size=126)
 
 	db $4 ; warps
 	db $8, $7, $0, ROUTE_15_GATE_1F
-	db $9, $7, $1, ROUTE_15_GATE_1F
+	db $9, $7, $0, ROUTE_15_GATE_1F
 	db $8, $e, $2, ROUTE_15_GATE_1F
-	db $9, $e, $3, ROUTE_15_GATE_1F
+	db $9, $e, $2, ROUTE_15_GATE_1F
 
 	db $1 ; signs
 	db $9, $27, $c ; Route15Text12
-- 
cgit v1.2.3


From 807323ed1cc2231d3df93edfaab22dde5de191ea Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Fri, 27 May 2016 19:39:40 -0400
Subject: Route 12

---
 data/mapObjects/route12.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/route12.asm b/data/mapObjects/route12.asm
index 8ed43ff4..783fd49b 100755
--- a/data/mapObjects/route12.asm
+++ b/data/mapObjects/route12.asm
@@ -3,7 +3,7 @@ Route12Object: ; 0x5869a (size=118)
 
 	db $4 ; warps
 	db $f, $a, $0, ROUTE_12_GATE_1F
-	db $f, $b, $1, ROUTE_12_GATE_1F
+	db $f, $b, $0, ROUTE_12_GATE_1F
 	db $15, $a, $2, ROUTE_12_GATE_1F
 	db $4d, $b, $0, ROUTE_12_HOUSE
 
-- 
cgit v1.2.3


From 8de636993d6d26f2b8a9557a55ce1a96fc29e01b Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Fri, 27 May 2016 19:43:06 -0400
Subject: Route 11

---
 data/mapObjects/route11.asm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/route11.asm b/data/mapObjects/route11.asm
index 4e196b20..d0c9af20 100755
--- a/data/mapObjects/route11.asm
+++ b/data/mapObjects/route11.asm
@@ -3,9 +3,9 @@ Route11Object: ; 0x584e0 (size=127)
 
 	db $5 ; warps
 	db $8, $31, $0, ROUTE_11_GATE_1F
-	db $9, $31, $1, ROUTE_11_GATE_1F
+	db $9, $31, $0, ROUTE_11_GATE_1F
 	db $8, $3a, $2, ROUTE_11_GATE_1F
-	db $9, $3a, $3, ROUTE_11_GATE_1F
+	db $9, $3a, $2, ROUTE_11_GATE_1F
 	db $5, $4, $0, DIGLETTS_CAVE_ENTRANCE
 
 	db $1 ; signs
-- 
cgit v1.2.3


From dc8677aa1c1ef9ef8cc3fb217641ae6619a3dae6 Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Fri, 27 May 2016 19:59:12 -0400
Subject: Route 9 incl. AJ fight

---
 data/mapObjects/route9.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/route9.asm b/data/mapObjects/route9.asm
index 79d0d5ed..6a759608 100755
--- a/data/mapObjects/route9.asm
+++ b/data/mapObjects/route9.asm
@@ -8,7 +8,7 @@ Route9Object: ; 0x546a8 (size=86)
 
 	db $a ; objects
 	object SPRITE_LASS, $d, $a, STAY, LEFT, $1, OPP_JR_TRAINER_F, $5
-	object SPRITE_BLACK_HAIR_BOY_1, $18, $7, STAY, LEFT, $2, OPP_JR_TRAINER_M, $7
+	object SPRITE_BLACK_HAIR_BOY_1, $18, $7, STAY, LEFT, $2, OPP_YOUNGSTER, $e
 	object SPRITE_BLACK_HAIR_BOY_1, $1f, $7, STAY, RIGHT, $3, OPP_JR_TRAINER_M, $8
 	object SPRITE_LASS, $30, $8, STAY, RIGHT, $4, OPP_JR_TRAINER_F, $6
 	object SPRITE_HIKER, $10, $f, STAY, LEFT, $5, OPP_HIKER, $b
-- 
cgit v1.2.3


From 38d57913867d66d30bca12070d2cbc2bc5fc25ba Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Fri, 27 May 2016 20:01:27 -0400
Subject: Route 8; all outdoor maps completed

---
 data/mapObjects/route8.asm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/route8.asm b/data/mapObjects/route8.asm
index 5863129b..38bcca5e 100755
--- a/data/mapObjects/route8.asm
+++ b/data/mapObjects/route8.asm
@@ -3,9 +3,9 @@ Route8Object: ; 0x5814f (size=119)
 
 	db $5 ; warps
 	db $9, $1, $0, ROUTE_8_GATE
-	db $a, $1, $1, ROUTE_8_GATE
+	db $a, $1, $0, ROUTE_8_GATE
 	db $9, $8, $2, ROUTE_8_GATE
-	db $a, $8, $3, ROUTE_8_GATE
+	db $a, $8, $2, ROUTE_8_GATE
 	db $3, $d, $0, PATH_ENTRANCE_ROUTE_8
 
 	db $1 ; signs
-- 
cgit v1.2.3


From 9835d77c286b51adbe9cd1606f7a6f06d0ebaf2d Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Fri, 27 May 2016 23:08:50 -0400
Subject: Blue's House

---
 data/mapObjects/blueshouse.asm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/blueshouse.asm b/data/mapObjects/blueshouse.asm
index 43ba02e4..3dfce6e1 100755
--- a/data/mapObjects/blueshouse.asm
+++ b/data/mapObjects/blueshouse.asm
@@ -8,9 +8,9 @@ BluesHouseObject: ; 19bce (6:5bce)
 	db $0 ; signs
 
 	db $3 ; objects
-	object SPRITE_DAISY, $2, $3, STAY, RIGHT, $1 ; Daisy, sitting by map
-	object SPRITE_DAISY, $6, $4, WALK, $1, $2, $0 ; Daisy, walking around
-	object SPRITE_BOOK_MAP_DEX, $3, $3, STAY, NONE, $3, $0 ; map on table
+	object SPRITE_DAISY, $2, $3, STAY, RIGHT, $81, $0 ; Daisy, sitting by map
+	object SPRITE_DAISY, $6, $4, WALK, $1, $82, $0 ; Daisy, walking around
+	object SPRITE_BOOK_MAP_DEX, $3, $3, STAY, NONE, $83, $0 ; map on table
 
 	; warp-to
 	EVENT_DISP BLUES_HOUSE_WIDTH, $7, $2
-- 
cgit v1.2.3


From dcd1ecc18f40a8bd2c8e8bcc903153070518fd70 Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Sat, 28 May 2016 09:28:59 -0400
Subject: Oak's Lab Rewrite part 1

---
 data/mapObjects/oakslab.asm | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/oakslab.asm
index 53d6b85b..779b458f 100755
--- a/data/mapObjects/oakslab.asm
+++ b/data/mapObjects/oakslab.asm
@@ -7,18 +7,16 @@ OaksLabObject: ; 0x1d40a (size=88)
 
 	db $0 ; signs
 
-	db $b ; objects
-	object SPRITE_BLUE, $4, $3, STAY, NONE, $1, OPP_SONY1, $1
-	object SPRITE_BALL, $6, $3, STAY, NONE, $2 ; person
-	object SPRITE_BALL, $7, $3, STAY, NONE, $3 ; person
-	object SPRITE_BALL, $8, $3, STAY, NONE, $4 ; person
-	object SPRITE_OAK, $5, $2, STAY, DOWN, $5 ; person
-	object SPRITE_BOOK_MAP_DEX, $2, $1, STAY, NONE, $6 ; person
-	object SPRITE_BOOK_MAP_DEX, $3, $1, STAY, NONE, $7 ; person
-	object SPRITE_OAK, $5, $a, STAY, UP, $8 ; person
-	object SPRITE_GIRL, $1, $9, WALK, $1, $9 ; person
-	object SPRITE_OAK_AIDE, $2, $a, STAY, NONE, $a ; person
-	object SPRITE_OAK_AIDE, $8, $a, STAY, NONE, $b ; person
+	db $9 ; objects
+	object SPRITE_BLUE, $4, $3, STAY, NONE, $41, OPP_SONY1, $1
+	object SPRITE_BALL, $7, $3, STAY, NONE, $2 ; person
+	object SPRITE_OAK, $5, $2, STAY, DOWN, $3 ; person
+	object SPRITE_BOOK_MAP_DEX, $2, $1, STAY, NONE, $4 ; person
+	object SPRITE_BOOK_MAP_DEX, $3, $1, STAY, NONE, $5 ; person
+	object SPRITE_OAK, $5, $a, STAY, UP, $6 ; person
+	object SPRITE_GIRL, $1, $9, WALK, $1, $7 ; person
+	object SPRITE_OAK_AIDE, $2, $a, STAY, NONE, $8 ; person
+	object SPRITE_OAK_AIDE, $8, $a, STAY, NONE, $9 ; person
 
 	; warp-to
 	EVENT_DISP OAKS_LAB_WIDTH, $b, $4
-- 
cgit v1.2.3


From 40fce3a7d2959eaa2eaf38b3b9ff2bfc583c6e8d Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Sat, 28 May 2016 17:16:06 -0400
Subject: Viridian pokecenter

---
 data/mapObjects/viridianpokecenter.asm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/viridianpokecenter.asm b/data/mapObjects/viridianpokecenter.asm
index 652efb97..74c27d46 100755
--- a/data/mapObjects/viridianpokecenter.asm
+++ b/data/mapObjects/viridianpokecenter.asm
@@ -7,11 +7,12 @@ ViridianPokecenterObject: ; 0x44277 (size=44)
 
 	db $0 ; signs
 
-	db $4 ; objects
+	db $5 ; objects
 	object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
 	object SPRITE_GENTLEMAN, $a, $5, WALK, $1, $2 ; person
-	object SPRITE_BLACK_HAIR_BOY_1, $4, $3, STAY, NONE, $3 ; person
+	object SPRITE_BLACK_HAIR_BOY_1, $4, $3, STAY, UP, $3 ; person
 	object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person
+	object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $5 ; person
 
 	; warp-to
 	EVENT_DISP VIRIDIAN_POKECENTER_WIDTH, $7, $3
-- 
cgit v1.2.3


From ba224a0430f829aa3bc7648f3bc7412fd3a0cea1 Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Sat, 28 May 2016 18:39:53 -0400
Subject: Viridian Trainer School

---
 data/mapObjects/school.asm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/school.asm b/data/mapObjects/school.asm
index b60be6c0..4c802e64 100755
--- a/data/mapObjects/school.asm
+++ b/data/mapObjects/school.asm
@@ -7,9 +7,10 @@ SchoolObject: ; 0x1d55d (size=32)
 
 	db $0 ; signs
 
-	db $2 ; objects
+	db $3 ; objects
 	object SPRITE_BRUNETTE_GIRL, $3, $5, STAY, UP, $1 ; person
 	object SPRITE_LASS, $4, $1, STAY, DOWN, $2 ; person
+	object SPRITE_LITTLE_GIRL, $4, $5, STAY, UP, $3 ; person
 
 	; warp-to
 	EVENT_DISP VIRIDIAN_SCHOOL_WIDTH, $7, $2
-- 
cgit v1.2.3


From e48e466f39da7f386417233530c3193249c58d36 Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Sat, 28 May 2016 22:53:44 -0400
Subject: Various interior maps on route 2

---
 data/mapObjects/viridianforestentrance.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/viridianforestentrance.asm b/data/mapObjects/viridianforestentrance.asm
index fc676a6d..891c0636 100755
--- a/data/mapObjects/viridianforestentrance.asm
+++ b/data/mapObjects/viridianforestentrance.asm
@@ -3,7 +3,7 @@ ViridianForestEntranceObject: ; 0x5d66d (size=48)
 
 	db $4 ; warps
 	db $0, $4, $3, VIRIDIAN_FOREST
-	db $0, $5, $4, VIRIDIAN_FOREST
+	db $0, $5, $3, VIRIDIAN_FOREST
 	db $7, $4, $5, $ff
 	db $7, $5, $5, $ff
 
-- 
cgit v1.2.3


From a86cd928c967b6779a56829a36e70c36289769b9 Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Sun, 29 May 2016 00:10:38 -0400
Subject: Viridian Forest and other functions

---
 data/mapObjects/oakslab.asm        |  2 +-
 data/mapObjects/viridianforest.asm | 26 ++++++++++++++------------
 2 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/oakslab.asm
index 779b458f..5b9a01d5 100755
--- a/data/mapObjects/oakslab.asm
+++ b/data/mapObjects/oakslab.asm
@@ -8,7 +8,7 @@ OaksLabObject: ; 0x1d40a (size=88)
 	db $0 ; signs
 
 	db $9 ; objects
-	object SPRITE_BLUE, $4, $3, STAY, NONE, $41, OPP_SONY1, $1
+	object SPRITE_BLUE, $4, $3, STAY, NONE, $1, OPP_SONY1, $1
 	object SPRITE_BALL, $7, $3, STAY, NONE, $2 ; person
 	object SPRITE_OAK, $5, $2, STAY, DOWN, $3 ; person
 	object SPRITE_BOOK_MAP_DEX, $2, $1, STAY, NONE, $4 ; person
diff --git a/data/mapObjects/viridianforest.asm b/data/mapObjects/viridianforest.asm
index a1d52cfe..8f5d6b0b 100755
--- a/data/mapObjects/viridianforest.asm
+++ b/data/mapObjects/viridianforest.asm
@@ -3,29 +3,31 @@ ViridianForestObject: ; 0x611da (size=127)
 
 	db $6 ; warps
 	db $0, $1, $2, VIRIDIAN_FOREST_EXIT
-	db $0, $2, $3, VIRIDIAN_FOREST_EXIT
+	db $0, $2, $2, VIRIDIAN_FOREST_EXIT
 	db $2f, $f, $1, VIRIDIAN_FOREST_ENTRANCE
 	db $2f, $10, $1, VIRIDIAN_FOREST_ENTRANCE
 	db $2f, $11, $1, VIRIDIAN_FOREST_ENTRANCE
 	db $2f, $12, $1, VIRIDIAN_FOREST_ENTRANCE
 
 	db $6 ; signs
-	db $28, $18, $9 ; ViridianForestText9
-	db $20, $10, $a ; ViridianForestText10
-	db $11, $1a, $b ; ViridianForestText11
-	db $18, $4, $c ; ViridianForestText12
-	db $2d, $12, $d ; ViridianForestText13
-	db $1, $2, $e ; ViridianForestText14
+	db $28, $18, $b ; ViridianForestText9
+	db $20, $10, $c ; ViridianForestText10
+	db $11, $1a, $d ; ViridianForestText11
+	db $18, $4, $e ; ViridianForestText12
+	db $2d, $12, $f ; ViridianForestText13
+	db $1, $2, $10 ; ViridianForestText14
 
-	db $8 ; objects
+	db $a ; objects
 	object SPRITE_BUG_CATCHER, $10, $2b, STAY, NONE, $1 ; person
 	object SPRITE_BUG_CATCHER, $1e, $21, STAY, LEFT, $2, OPP_BUG_CATCHER, $1
 	object SPRITE_BUG_CATCHER, $1e, $13, STAY, LEFT, $3, OPP_BUG_CATCHER, $2
 	object SPRITE_BUG_CATCHER, $2, $12, STAY, LEFT, $4, OPP_BUG_CATCHER, $3
-	object SPRITE_BALL, $19, $b, STAY, NONE, $5, ANTIDOTE
-	object SPRITE_BALL, $c, $1d, STAY, NONE, $6, POTION
-	object SPRITE_BALL, $1, $1f, STAY, NONE, $7, POKE_BALL
-	object SPRITE_BUG_CATCHER, $1b, $28, STAY, NONE, $8 ; person
+	object SPRITE_LASS, $2, $29, STAY, NONE, $5, OPP_LASS, $13
+	object SPRITE_BUG_CATCHER, $d, $11, STAY, RIGHT, $6, OPP_BUG_CATCHER, $f
+	object SPRITE_BALL, $19, $b, STAY, NONE, $7, POTION
+	object SPRITE_BALL, $c, $1d, STAY, NONE, $8, POTION
+	object SPRITE_BALL, $1, $1f, STAY, NONE, $9, POKE_BALL
+	object SPRITE_BUG_CATCHER, $1b, $28, STAY, NONE, $a ; person
 
 	; warp-to
 	EVENT_DISP VIRIDIAN_FOREST_WIDTH, $0, $1 ; VIRIDIAN_FOREST_EXIT
-- 
cgit v1.2.3


From 9abb62033819774d7b256ee0222f7c6ece987bfe Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Sun, 29 May 2016 16:24:41 -0400
Subject: Pewter Pokecenter

---
 data/mapObjects/pewterpokecenter.asm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/pewterpokecenter.asm b/data/mapObjects/pewterpokecenter.asm
index 86757244..d3f87326 100755
--- a/data/mapObjects/pewterpokecenter.asm
+++ b/data/mapObjects/pewterpokecenter.asm
@@ -7,11 +7,13 @@ PewterPokecenterObject: ; 0x5c60d (size=44)
 
 	db $0 ; signs
 
-	db $4 ; objects
+	db $6 ; objects
 	object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
 	object SPRITE_GENTLEMAN, $b, $7, STAY, LEFT, $2 ; person
-	object SPRITE_CLEFAIRY, $1, $3, STAY, DOWN, $3 ; person
+	object SPRITE_JIGGLYPUFF, $1, $3, STAY, DOWN, $3 ; person
 	object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person
+	object SPRITE_LASS, $4, $3, STAY, UP, $5 ; person
+	object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $6 ; person
 
 	; warp-to
 	EVENT_DISP PEWTER_POKECENTER_WIDTH, $7, $3
-- 
cgit v1.2.3


From b8cced19fce2a212f5cb205039382a63821a3762 Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Sun, 29 May 2016 20:52:05 -0400
Subject: Mt Moon B2F

---
 data/mapObjects/mtmoon3.asm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/mtmoon3.asm b/data/mapObjects/mtmoon3.asm
index 4f8f911c..4a9b1946 100755
--- a/data/mapObjects/mtmoon3.asm
+++ b/data/mapObjects/mtmoon3.asm
@@ -9,16 +9,17 @@ MtMoon3Object: ; 0x49fdb (size=102)
 
 	db $0 ; signs
 
-	db $9 ; objects
+	db $a ; objects
 	object SPRITE_BLACK_HAIR_BOY_2, $c, $8, STAY, RIGHT, $1, OPP_SUPER_NERD, $2
-	object SPRITE_ROCKET, $b, $10, STAY, DOWN, $2, OPP_ROCKET, $1
+	object SPRITE_JESSIE, $9, $3, STAY, LEFT, $2
 	object SPRITE_ROCKET, $f, $16, STAY, DOWN, $3, OPP_ROCKET, $2
 	object SPRITE_ROCKET, $1d, $b, STAY, UP, $4, OPP_ROCKET, $3
-	object SPRITE_ROCKET, $1d, $11, STAY, LEFT, $5, OPP_ROCKET, $4
-	object SPRITE_OMANYTE, $c, $6, STAY, NONE, $6 ; person
-	object SPRITE_OMANYTE, $d, $6, STAY, NONE, $7 ; person
-	object SPRITE_BALL, $19, $15, STAY, NONE, $8, HP_UP
-	object SPRITE_BALL, $1d, $5, STAY, NONE, $9, TM_01
+	object SPRITE_ROCKET, $1d, $11, STAY, LEFT, $5, OPP_ROCKET, $1
+	object SPRITE_JAMES, $9, $4, STAY, LEFT, $6
+	object SPRITE_OMANYTE, $c, $6, STAY, NONE, $7 ; person
+	object SPRITE_OMANYTE, $d, $6, STAY, NONE, $8 ; person
+	object SPRITE_BALL, $19, $15, STAY, NONE, $9, HP_UP
+	object SPRITE_BALL, $1d, $5, STAY, NONE, $a, TM_01
 
 	; warp-to
 	EVENT_DISP MT_MOON_3_WIDTH, $9, $19 ; MT_MOON_2
-- 
cgit v1.2.3


From a8b3d3612e43cbcc7e1946c5c1a06f9c54c8d311 Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Sun, 29 May 2016 22:36:26 -0400
Subject: Bulbasaur house in Cerulean

---
 data/mapObjects/ceruleanhouse1.asm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/ceruleanhouse1.asm b/data/mapObjects/ceruleanhouse1.asm
index db0be014..aa9f66a4 100755
--- a/data/mapObjects/ceruleanhouse1.asm
+++ b/data/mapObjects/ceruleanhouse1.asm
@@ -7,9 +7,11 @@ CeruleanHouse1Object: ; 0x1d710 (size=32)
 
 	db $0 ; signs
 
-	db $2 ; objects
-	object SPRITE_OLD_MEDIUM_WOMAN, $5, $4, STAY, LEFT, $1 ; person
-	object SPRITE_GAMBLER, $1, $2, STAY, NONE, $2 ; person
+	db $4 ; objects
+	object SPRITE_GIRL, $3, $1, STAY, DOWN, $1 ; person
+	object SPRITE_BULBASAUR, $4, $1, STAY, DOWN, $2 ; person
+	object SPRITE_ODDISH, $1, $4, STAY, NONE, $3 ; person
+	object SPRITE_SANDSHREW, $5, $3, STAY, LEFT, $4 ; person
 
 	; warp-to
 	EVENT_DISP CERULEAN_HOUSE_1_WIDTH, $7, $2
-- 
cgit v1.2.3


From 5d6f3ec1d4f24bb2598359402c361f2ec47546da Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Mon, 30 May 2016 09:36:57 -0400
Subject: Cerulean Pokemon Center; Func_5c0d4; space after comma in
 engine/menu/pokedex.asm

---
 data/mapObjects/ceruleanpokecenter.asm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/ceruleanpokecenter.asm b/data/mapObjects/ceruleanpokecenter.asm
index 930995dd..4b92f0d8 100755
--- a/data/mapObjects/ceruleanpokecenter.asm
+++ b/data/mapObjects/ceruleanpokecenter.asm
@@ -7,11 +7,12 @@ CeruleanPokecenterObject: ; 0x5c65f (size=44)
 
 	db $0 ; signs
 
-	db $4 ; objects
+	db $5 ; objects
 	object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
 	object SPRITE_BLACK_HAIR_BOY_2, $a, $5, WALK, $0, $2 ; person
-	object SPRITE_GENTLEMAN, $4, $3, STAY, DOWN, $3 ; person
+	object SPRITE_GENTLEMAN, $4, $3, STAY, UP, $3 ; person
 	object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person
+	object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $5 ; person
 
 	; warp-to
 	EVENT_DISP CERULEAN_POKECENTER_WIDTH, $7, $3
-- 
cgit v1.2.3


From 6e3581df4b9cbc8cf14fc7948df5df70002cc062 Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Mon, 30 May 2016 11:38:46 -0400
Subject: Mt Moon Pokemon Center

---
 data/mapObjects/mtmoonpokecenter.asm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/mtmoonpokecenter.asm b/data/mapObjects/mtmoonpokecenter.asm
index d6cd35ba..935c4a40 100755
--- a/data/mapObjects/mtmoonpokecenter.asm
+++ b/data/mapObjects/mtmoonpokecenter.asm
@@ -7,13 +7,14 @@ MtMoonPokecenterObject: ; 0x49376 (size=56)
 
 	db $0 ; signs
 
-	db $6 ; objects
+	db $7 ; objects
 	object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
 	object SPRITE_BUG_CATCHER, $4, $3, STAY, UP, $2 ; person
 	object SPRITE_GENTLEMAN, $7, $3, STAY, UP, $3 ; person
 	object SPRITE_FAT_BALD_GUY, $a, $6, WALK, $2, $4 ; person
 	object SPRITE_CLIPBOARD, $7, $2, STAY, NONE, $5 ; person
 	object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $6 ; person
+	object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $7 ; person
 
 	; warp-to
 	EVENT_DISP MT_MOON_POKECENTER_WIDTH, $7, $3
-- 
cgit v1.2.3


From 5f729c22b5b8bafc520f4f23f8577bcb18a8a452 Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Mon, 30 May 2016 15:16:58 -0400
Subject: Add missing file; route 7/8 gates and route 8 path entrance

---
 data/mapObjects/route7gate.asm | 2 +-
 data/mapObjects/route8gate.asm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/route7gate.asm b/data/mapObjects/route7gate.asm
index 8c618fc1..9e80ca39 100755
--- a/data/mapObjects/route7gate.asm
+++ b/data/mapObjects/route7gate.asm
@@ -4,7 +4,7 @@ Route7GateObject: ; 0x1e185 (size=42)
 	db $4 ; warps
 	db $3, $0, $3, $ff
 	db $4, $0, $3, $ff
-	db $3, $5, $0, $ff
+	db $3, $5, $1, $ff
 	db $4, $5, $1, $ff
 
 	db $0 ; signs
diff --git a/data/mapObjects/route8gate.asm b/data/mapObjects/route8gate.asm
index 8c3fb54f..61d70dfc 100755
--- a/data/mapObjects/route8gate.asm
+++ b/data/mapObjects/route8gate.asm
@@ -2,9 +2,9 @@ Route8GateObject: ; 0x1e247 (size=42)
 	db $a ; border block
 
 	db $4 ; warps
-	db $3, $0, $0, $ff
+	db $3, $0, $1, $ff
 	db $4, $0, $1, $ff
-	db $3, $5, $2, $ff
+	db $3, $5, $3, $ff
 	db $4, $5, $3, $ff
 
 	db $0 ; signs
-- 
cgit v1.2.3


From a443384a21060a1077730b08a8981ef707ba8dfa Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Mon, 30 May 2016 15:53:23 -0400
Subject: Rock Tunnel Pokecenter

---
 data/mapObjects/rocktunnelpokecenter.asm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'data/mapObjects')

diff --git a/data/mapObjects/rocktunnelpokecenter.asm b/data/mapObjects/rocktunnelpokecenter.asm
index d2645165..3cd937cf 100755
--- a/data/mapObjects/rocktunnelpokecenter.asm
+++ b/data/mapObjects/rocktunnelpokecenter.asm
@@ -7,11 +7,12 @@ RockTunnelPokecenterObject: ; 0x493d4 (size=44)
 
 	db $0 ; signs
 
-	db $4 ; objects
+	db $5 ; objects
 	object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
-	object SPRITE_GENTLEMAN, $7, $3, WALK, $2, $2 ; person
+	object SPRITE_GENTLEMAN, $7, $3, STAY, DOWN, $2 ; person
 	object SPRITE_FISHER2, $2, $5, STAY, NONE, $3 ; person
 	object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person
+	object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $5 ; person
 
 	; warp-to
 	EVENT_DISP ROCK_TUNNEL_POKECENTER_WIDTH, $7, $3
-- 
cgit v1.2.3