From 4efb3e307cd6b4bf267ab0d509f8e5ab498f798e Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 6 Nov 2020 10:34:05 -0500 Subject: Sync more with pokered --- data/maps/objects/CeruleanCity.asm | 2 +- data/maps/objects/CeruleanMelaniesHouse.asm | 16 ++++++++++++++++ data/maps/objects/CeruleanTradeHouse.asm | 16 ---------------- 3 files changed, 17 insertions(+), 17 deletions(-) create mode 100755 data/maps/objects/CeruleanMelaniesHouse.asm delete mode 100755 data/maps/objects/CeruleanTradeHouse.asm (limited to 'data/maps/objects') diff --git a/data/maps/objects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm index fae56fc1..2d155e25 100755 --- a/data/maps/objects/CeruleanCity.asm +++ b/data/maps/objects/CeruleanCity.asm @@ -3,7 +3,7 @@ CeruleanCity_Object: def_warps warp 27, 11, 0, CERULEAN_TRASHED_HOUSE - warp 13, 15, 0, CERULEAN_TRADE_HOUSE + warp 13, 15, 0, CERULEAN_MELANIES_HOUSE warp 19, 17, 0, CERULEAN_POKECENTER warp 30, 19, 0, CERULEAN_GYM warp 13, 25, 0, BIKE_SHOP diff --git a/data/maps/objects/CeruleanMelaniesHouse.asm b/data/maps/objects/CeruleanMelaniesHouse.asm new file mode 100755 index 00000000..cbd25533 --- /dev/null +++ b/data/maps/objects/CeruleanMelaniesHouse.asm @@ -0,0 +1,16 @@ +CeruleanMelaniesHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 1, LAST_MAP + warp 3, 7, 1, LAST_MAP + + def_signs + + def_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 + + def_warps_to CERULEAN_MELANIES_HOUSE diff --git a/data/maps/objects/CeruleanTradeHouse.asm b/data/maps/objects/CeruleanTradeHouse.asm deleted file mode 100755 index a52548fe..00000000 --- a/data/maps/objects/CeruleanTradeHouse.asm +++ /dev/null @@ -1,16 +0,0 @@ -CeruleanTradeHouse_Object: - db $a ; border block - - def_warps - warp 2, 7, 1, LAST_MAP - warp 3, 7, 1, LAST_MAP - - def_signs - - def_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 - - def_warps_to CERULEAN_TRADE_HOUSE -- cgit v1.3.1-sl0p