diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-29 02:31:32 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-29 02:31:32 -0500 |
| commit | d271d6917549074e721f3e5064b77e1ad1dbe44a (patch) | |
| tree | cee0f1b9a44aa7394dbf36ee3ad3654dde08df06 | |
| parent | c84667c4df36918071bb7487c456d7adafb921ca (diff) | |
Add warp, sign, and warp_to macros for data/mapObjects definitions
220 files changed, 1841 insertions, 1819 deletions
diff --git a/data/mapObjects/agatha.asm b/data/mapObjects/agatha.asm index 22000dde..2651b10a 100755 --- a/data/mapObjects/agatha.asm +++ b/data/mapObjects/agatha.asm @@ -2,10 +2,10 @@ AgathaObject: db $0 ; border block db $4 ; warps - db $b, $4, $2, BRUNOS_ROOM - db $b, $5, $3, BRUNOS_ROOM - db $0, $4, $0, LANCES_ROOM - db $0, $5, $0, LANCES_ROOM + warp $4, $b, $2, BRUNOS_ROOM + warp $5, $b, $3, BRUNOS_ROOM + warp $4, $0, $0, LANCES_ROOM + warp $5, $0, $0, LANCES_ROOM db $0 ; signs @@ -13,7 +13,7 @@ AgathaObject: object SPRITE_AGATHA, $5, $2, STAY, DOWN, $1, OPP_AGATHA, $1 ; warp-to - EVENT_DISP AGATHAS_ROOM_WIDTH, $b, $4 ; BRUNOS_ROOM - EVENT_DISP AGATHAS_ROOM_WIDTH, $b, $5 ; BRUNOS_ROOM - EVENT_DISP AGATHAS_ROOM_WIDTH, $0, $4 ; LANCES_ROOM - EVENT_DISP AGATHAS_ROOM_WIDTH, $0, $5 ; LANCES_ROOM + warp_to $4, $b, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM + warp_to $5, $b, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM + warp_to $4, $0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM + warp_to $5, $0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM diff --git a/data/mapObjects/bikeshop.asm b/data/mapObjects/bikeshop.asm index 5a7e832c..ce5fe9b8 100755 --- a/data/mapObjects/bikeshop.asm +++ b/data/mapObjects/bikeshop.asm @@ -2,8 +2,8 @@ BikeShopObject: db $e ; border block db $2 ; warps - db $7, $2, $4, $ff - db $7, $3, $4, $ff + warp $2, $7, $4, $ff + warp $3, $7, $4, $ff db $0 ; signs @@ -13,5 +13,5 @@ BikeShopObject: object SPRITE_BUG_CATCHER, $1, $3, STAY, UP, $3 ; person ; warp-to - EVENT_DISP BIKE_SHOP_WIDTH, $7, $2 - EVENT_DISP BIKE_SHOP_WIDTH, $7, $3 + warp_to $2, $7, BIKE_SHOP_WIDTH + warp_to $3, $7, BIKE_SHOP_WIDTH diff --git a/data/mapObjects/billshouse.asm b/data/mapObjects/billshouse.asm index ef52e1dd..eb90ed78 100755 --- a/data/mapObjects/billshouse.asm +++ b/data/mapObjects/billshouse.asm @@ -2,8 +2,8 @@ BillsHouseObject: db $d ; border block db $2 ; warps - db $7, $2, $0, $ff - db $7, $3, $0, $ff + warp $2, $7, $0, $ff + warp $3, $7, $0, $ff db $0 ; signs @@ -13,5 +13,5 @@ BillsHouseObject: object SPRITE_BLACK_HAIR_BOY_2, $6, $5, STAY, NONE, $3 ; person ; warp-to - EVENT_DISP BILLS_HOUSE_WIDTH, $7, $2 - EVENT_DISP BILLS_HOUSE_WIDTH, $7, $3 + warp_to $2, $7, BILLS_HOUSE_WIDTH + warp_to $3, $7, BILLS_HOUSE_WIDTH diff --git a/data/mapObjects/blueshouse.asm b/data/mapObjects/blueshouse.asm index 231e852d..3a798562 100755 --- a/data/mapObjects/blueshouse.asm +++ b/data/mapObjects/blueshouse.asm @@ -2,8 +2,8 @@ BluesHouseObject: db $0A ; border block db $2 ; warps - db $7, $2, $1, $FF - db $7, $3, $1, $FF + warp $2, $7, $1, $FF + warp $3, $7, $1, $FF db $0 ; signs @@ -13,5 +13,5 @@ BluesHouseObject: object SPRITE_BOOK_MAP_DEX, $3, $3, STAY, NONE, $3, $0 ; map on table ; warp-to - EVENT_DISP BLUES_HOUSE_WIDTH, $7, $2 - EVENT_DISP BLUES_HOUSE_WIDTH, $7, $3 + warp_to $2, $7, BLUES_HOUSE_WIDTH + warp_to $3, $7, BLUES_HOUSE_WIDTH diff --git a/data/mapObjects/bruno.asm b/data/mapObjects/bruno.asm index a734b07b..b0df7215 100755 --- a/data/mapObjects/bruno.asm +++ b/data/mapObjects/bruno.asm @@ -2,10 +2,10 @@ BrunoObject: db $3 ; border block db $4 ; warps - db $b, $4, $2, LORELEIS_ROOM - db $b, $5, $3, LORELEIS_ROOM - db $0, $4, $0, AGATHAS_ROOM - db $0, $5, $1, AGATHAS_ROOM + warp $4, $b, $2, LORELEIS_ROOM + warp $5, $b, $3, LORELEIS_ROOM + warp $4, $0, $0, AGATHAS_ROOM + warp $5, $0, $1, AGATHAS_ROOM db $0 ; signs @@ -13,7 +13,7 @@ BrunoObject: object SPRITE_BRUNO, $5, $2, STAY, DOWN, $1, OPP_BRUNO, $1 ; warp-to - EVENT_DISP BRUNOS_ROOM_WIDTH, $b, $4 ; LORELEIS_ROOM - EVENT_DISP BRUNOS_ROOM_WIDTH, $b, $5 ; LORELEIS_ROOM - EVENT_DISP BRUNOS_ROOM_WIDTH, $0, $4 ; AGATHAS_ROOM - EVENT_DISP BRUNOS_ROOM_WIDTH, $0, $5 ; AGATHAS_ROOM + warp_to $4, $b, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM + warp_to $5, $b, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM + warp_to $4, $0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM + warp_to $5, $0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM diff --git a/data/mapObjects/celadoncity.asm b/data/mapObjects/celadoncity.asm index c2a7fd78..536b46ee 100755 --- a/data/mapObjects/celadoncity.asm +++ b/data/mapObjects/celadoncity.asm @@ -2,30 +2,30 @@ CeladonCityObject: db $f ; border block db $d ; warps - db $d, $8, $0, CELADON_MART_1 - db $d, $a, $2, CELADON_MART_1 - db $9, $18, $0, CELADON_MANSION_1 - db $3, $18, $2, CELADON_MANSION_1 - db $3, $19, $2, CELADON_MANSION_1 - db $9, $29, $0, CELADON_POKECENTER - db $1b, $c, $0, CELADON_GYM - db $13, $1c, $0, GAME_CORNER - db $13, $27, $0, CELADON_MART_5 ; beta warp! no longer used - db $13, $21, $0, CELADON_PRIZE_ROOM - db $1b, $1f, $0, CELADON_DINER - db $1b, $23, $0, CELADON_HOUSE - db $1b, $2b, $0, CELADON_HOTEL + warp $8, $d, $0, CELADON_MART_1 + warp $a, $d, $2, CELADON_MART_1 + warp $18, $9, $0, CELADON_MANSION_1 + warp $18, $3, $2, CELADON_MANSION_1 + warp $19, $3, $2, CELADON_MANSION_1 + warp $29, $9, $0, CELADON_POKECENTER + warp $c, $1b, $0, CELADON_GYM + warp $1c, $13, $0, GAME_CORNER + warp $27, $13, $0, CELADON_MART_5 ; beta warp! no longer used + warp $21, $13, $0, CELADON_PRIZE_ROOM + warp $1f, $1b, $0, CELADON_DINER + warp $23, $1b, $0, CELADON_HOUSE + warp $2b, $1b, $0, CELADON_HOTEL db $9 ; signs - db $f, $1b, $a ; CeladonCityText10 - db $f, $13, $b ; CeladonCityText11 - db $9, $2a, $c ; PokeCenterSignText - db $1d, $d, $d ; CeladonCityText13 - db $9, $15, $e ; CeladonCityText14 - db $d, $c, $f ; CeladonCityText15 - db $15, $27, $10 ; CeladonCityText16 - db $15, $21, $11 ; CeladonCityText17 - db $15, $1b, $12 ; CeladonCityText18 + sign $1b, $f, $a ; CeladonCityText10 + sign $13, $f, $b ; CeladonCityText11 + sign $2a, $9, $c ; PokeCenterSignText + sign $d, $1d, $d ; CeladonCityText13 + sign $15, $9, $e ; CeladonCityText14 + sign $c, $d, $f ; CeladonCityText15 + sign $27, $15, $10 ; CeladonCityText16 + sign $21, $15, $11 ; CeladonCityText17 + sign $1b, $15, $12 ; CeladonCityText18 db $9 ; objects object SPRITE_LITTLE_GIRL, $8, $11, WALK, $0, $1 ; person @@ -39,16 +39,16 @@ CeladonCityObject: object SPRITE_ROCKET, $2a, $e, WALK, $2, $9 ; person ; warp-to - EVENT_DISP CELADON_CITY_WIDTH, $d, $8 ; CELADON_MART_1 - EVENT_DISP CELADON_CITY_WIDTH, $d, $a ; CELADON_MART_1 - EVENT_DISP CELADON_CITY_WIDTH, $9, $18 ; CELADON_MANSION_1 - EVENT_DISP CELADON_CITY_WIDTH, $3, $18 ; CELADON_MANSION_1 - EVENT_DISP CELADON_CITY_WIDTH, $3, $19 ; CELADON_MANSION_1 - EVENT_DISP CELADON_CITY_WIDTH, $9, $29 ; CELADON_POKECENTER - EVENT_DISP CELADON_CITY_WIDTH, $1b, $c ; CELADON_GYM - EVENT_DISP CELADON_CITY_WIDTH, $13, $1c ; GAME_CORNER - EVENT_DISP CELADON_CITY_WIDTH, $13, $27 ; CELADON_MART_5 - EVENT_DISP CELADON_CITY_WIDTH, $13, $21 ; CELADON_PRIZE_ROOM - EVENT_DISP CELADON_CITY_WIDTH, $1b, $1f ; CELADON_DINER - EVENT_DISP CELADON_CITY_WIDTH, $1b, $23 ; CELADON_HOUSE - EVENT_DISP CELADON_CITY_WIDTH, $1b, $2b ; CELADON_HOTEL + warp_to $8, $d, CELADON_CITY_WIDTH ; CELADON_MART_1 + warp_to $a, $d, CELADON_CITY_WIDTH ; CELADON_MART_1 + warp_to $18, $9, CELADON_CITY_WIDTH ; CELADON_MANSION_1 + warp_to $18, $3, CELADON_CITY_WIDTH ; CELADON_MANSION_1 + warp_to $19, $3, CELADON_CITY_WIDTH ; CELADON_MANSION_1 + warp_to $29, $9, CELADON_CITY_WIDTH ; CELADON_POKECENTER + warp_to $c, $1b, CELADON_CITY_WIDTH ; CELADON_GYM + warp_to $1c, $13, CELADON_CITY_WIDTH ; GAME_CORNER + warp_to $27, $13, CELADON_CITY_WIDTH ; CELADON_MART_5 + warp_to $21, $13, CELADON_CITY_WIDTH ; CELADON_PRIZE_ROOM + warp_to $1f, $1b, CELADON_CITY_WIDTH ; CELADON_DINER + warp_to $23, $1b, CELADON_CITY_WIDTH ; CELADON_HOUSE + warp_to $2b, $1b, CELADON_CITY_WIDTH ; CELADON_HOTEL diff --git a/data/mapObjects/celadondiner.asm b/data/mapObjects/celadondiner.asm index fd202a96..f1327612 100755 --- a/data/mapObjects/celadondiner.asm +++ b/data/mapObjects/celadondiner.asm @@ -2,8 +2,8 @@ CeladonDinerObject: db $f ; border block db $2 ; warps - db $7, $3, $a, $ff - db $7, $4, $a, $ff + warp $3, $7, $a, $ff + warp $4, $7, $a, $ff db $0 ; signs @@ -15,5 +15,5 @@ CeladonDinerObject: object SPRITE_GYM_HELPER, $0, $1, STAY, DOWN, $5 ; person ; warp-to - EVENT_DISP CELADON_DINER_WIDTH, $7, $3 - EVENT_DISP CELADON_DINER_WIDTH, $7, $4 + warp_to $3, $7, CELADON_DINER_WIDTH + warp_to $4, $7, CELADON_DINER_WIDTH diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/celadongamecorner.asm index 46b1c906..f1b91d56 100755 --- a/data/mapObjects/celadongamecorner.asm +++ b/data/mapObjects/celadongamecorner.asm @@ -2,12 +2,12 @@ CeladonGameCornerObject: db $f ; border block db $3 ; warps - db $11, $f, $7, $ff - db $11, $10, $7, $ff - db $4, $11, $1, ROCKET_HIDEOUT_1 + warp $f, $11, $7, $ff + warp $10, $11, $7, $ff + warp $11, $4, $1, ROCKET_HIDEOUT_1 db $1 ; signs - db $4, $9, $c ; CeladonGameCornerText12 + sign $9, $4, $c ; CeladonGameCornerText12 db $b ; objects object SPRITE_FOULARD_WOMAN, $2, $6, STAY, DOWN, $1 ; person @@ -23,6 +23,6 @@ CeladonGameCornerObject: object SPRITE_ROCKET, $9, $5, STAY, UP, $b, OPP_ROCKET, $7 ; warp-to - EVENT_DISP GAME_CORNER_WIDTH, $11, $f - EVENT_DISP GAME_CORNER_WIDTH, $11, $10 - EVENT_DISP GAME_CORNER_WIDTH, $4, $11 ; ROCKET_HIDEOUT_1 + warp_to $f, $11, GAME_CORNER_WIDTH + warp_to $10, $11, GAME_CORNER_WIDTH + warp_to $11, $4, GAME_CORNER_WIDTH ; ROCKET_HIDEOUT_1 diff --git a/data/mapObjects/celadongym.asm b/data/mapObjects/celadongym.asm index 212c389e..b9ebcb93 100755 --- a/data/mapObjects/celadongym.asm +++ b/data/mapObjects/celadongym.asm @@ -2,8 +2,8 @@ CeladonGymObject: db $3 ; border block db $2 ; warps - db $11, $4, $6, $ff - db $11, $5, $6, $ff + warp $4, $11, $6, $ff + warp $5, $11, $6, $ff db $0 ; signs @@ -18,5 +18,5 @@ CeladonGymObject: object SPRITE_LASS, $5, $3, STAY, DOWN, $8, OPP_COOLTRAINER_F, $1 ; warp-to - EVENT_DISP CELADON_GYM_WIDTH, $11, $4 - EVENT_DISP CELADON_GYM_WIDTH, $11, $5 + warp_to $4, $11, CELADON_GYM_WIDTH + warp_to $5, $11, CELADON_GYM_WIDTH diff --git a/data/mapObjects/celadonhotel.asm b/data/mapObjects/celadonhotel.asm index 8d7dcb03..0737304c 100755 --- a/data/mapObjects/celadonhotel.asm +++ b/data/mapObjects/celadonhotel.asm @@ -2,8 +2,8 @@ CeladonHotelObject: db $0 ; border block db $2 ; warps - db $7, $3, $c, $ff - db $7, $4, $c, $ff + warp $3, $7, $c, $ff + warp $4, $7, $c, $ff db $0 ; signs @@ -13,5 +13,5 @@ CeladonHotelObject: object SPRITE_BLACK_HAIR_BOY_2, $8, $4, WALK, $2, $3 ; person ; warp-to - EVENT_DISP CELADON_HOTEL_WIDTH, $7, $3 - EVENT_DISP CELADON_HOTEL_WIDTH, $7, $4 + warp_to $3, $7, CELADON_HOTEL_WIDTH + warp_to $4, $7, CELADON_HOTEL_WIDTH diff --git a/data/mapObjects/celadonhouse.asm b/data/mapObjects/celadonhouse.asm index 6bd847a4..3fc86c40 100755 --- a/data/mapObjects/celadonhouse.asm +++ b/data/mapObjects/celadonhouse.asm @@ -2,8 +2,8 @@ CeladonHouseObject: db $f ; border block db $2 ; warps - db $7, $2, $b, $ff - db $7, $3, $b, $ff + warp $2, $7, $b, $ff + warp $3, $7, $b, $ff db $0 ; signs @@ -13,5 +13,5 @@ CeladonHouseObject: object SPRITE_SAILOR, $5, $6, STAY, LEFT, $3 ; person ; warp-to - EVENT_DISP CELADON_HOUSE_WIDTH, $7, $2 - EVENT_DISP CELADON_HOUSE_WIDTH, $7, $3 + warp_to $2, $7, CELADON_HOUSE_WIDTH + warp_to $3, $7, CELADON_HOUSE_WIDTH diff --git a/data/mapObjects/celadonmansion1.asm b/data/mapObjects/celadonmansion1.asm index 47fbb0e5..bb38825c 100755 --- a/data/mapObjects/celadonmansion1.asm +++ b/data/mapObjects/celadonmansion1.asm @@ -2,14 +2,14 @@ CeladonMansion1Object: db $f ; border block db $5 ; warps - db $b, $4, $2, $ff - db $b, $5, $2, $ff - db $0, $4, $4, $ff - db $1, $7, $1, CELADON_MANSION_2 - db $1, $2, $2, CELADON_MANSION_2 + warp $4, $b, $2, $ff + warp $5, $b, $2, $ff + warp $4, $0, $4, $ff + warp $7, $1, $1, CELADON_MANSION_2 + warp $2, $1, $2, CELADON_MANSION_2 db $1 ; signs - db $9, $4, $5 ; CeladonMansion1Text5 + sign $4, $9, $5 ; CeladonMansion1Text5 db $4 ; objects object SPRITE_SLOWBRO, $0, $5, STAY, RIGHT, $1 ; person @@ -18,8 +18,8 @@ CeladonMansion1Object: object SPRITE_SLOWBRO, $4, $4, WALK, $1, $4 ; person ; warp-to - EVENT_DISP CELADON_MANSION_1_WIDTH, $b, $4 - EVENT_DISP CELADON_MANSION_1_WIDTH, $b, $5 - EVENT_DISP CELADON_MANSION_1_WIDTH, $0, $4 - EVENT_DISP CELADON_MANSION_1_WIDTH, $1, $7 ; CELADON_MANSION_2 - EVENT_DISP CELADON_MANSION_1_WIDTH, $1, $2 ; CELADON_MANSION_2 + warp_to $4, $b, CELADON_MANSION_1_WIDTH + warp_to $5, $b, CELADON_MANSION_1_WIDTH + warp_to $4, $0, CELADON_MANSION_1_WIDTH + warp_to $7, $1, CELADON_MANSION_1_WIDTH ; CELADON_MANSION_2 + warp_to $2, $1, CELADON_MANSION_1_WIDTH ; CELADON_MANSION_2 diff --git a/data/mapObjects/celadonmansion2.asm b/data/mapObjects/celadonmansion2.asm index 883cae36..675afdc7 100755 --- a/data/mapObjects/celadonmansion2.asm +++ b/data/mapObjects/celadonmansion2.asm @@ -2,18 +2,18 @@ CeladonMansion2Object: db $f ; border block db $4 ; warps - db $1, $6, $0, CELADON_MANSION_3 - db $1, $7, $3, CELADON_MANSION_1 - db $1, $2, $4, CELADON_MANSION_1 - db $1, $4, $3, CELADON_MANSION_3 + warp $6, $1, $0, CELADON_MANSION_3 + warp $7, $1, $3, CELADON_MANSION_1 + warp $2, $1, $4, CELADON_MANSION_1 + warp $4, $1, $3, CELADON_MANSION_3 db $1 ; signs - db $9, $4, $1 ; CeladonMansion2Text1 + sign $4, $9, $1 ; CeladonMansion2Text1 db $0 ; objects ; warp-to - EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $6 ; CELADON_MANSION_3 - EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $7 ; CELADON_MANSION_1 - EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $2 ; CELADON_MANSION_1 - EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $4 ; CELADON_MANSION_3 + warp_to $6, $1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3 + warp_to $7, $1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1 + warp_to $2, $1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1 + warp_to $4, $1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3 diff --git a/data/mapObjects/celadonmansion3.asm b/data/mapObjects/celadonmansion3.asm index 0564b1cb..f6e66a1a 100755 --- a/data/mapObjects/celadonmansion3.asm +++ b/data/mapObjects/celadonmansion3.asm @@ -2,16 +2,16 @@ CeladonMansion3Object: db $f ; border block db $4 ; warps - db $1, $6, $0, CELADON_MANSION_2 - db $1, $7, $0, CELADON_MANSION_4 - db $1, $2, $1, CELADON_MANSION_4 - db $1, $4, $3, CELADON_MANSION_2 + warp $6, $1, $0, CELADON_MANSION_2 + warp $7, $1, $0, CELADON_MANSION_4 + warp $2, $1, $1, CELADON_MANSION_4 + warp $4, $1, $3, CELADON_MANSION_2 db $4 ; signs - db $3, $1, $5 ; CeladonMansion3Text5 - db $3, $4, $6 ; CeladonMansion3Text6 - db $6, $1, $7 ; CeladonMansion3Text7 - db $9, $4, $8 ; CeladonMansion3Text8 + sign $1, $3, $5 ; CeladonMansion3Text5 + sign $4, $3, $6 ; CeladonMansion3Text6 + sign $1, $6, $7 ; CeladonMansion3Text7 + sign $4, $9, $8 ; CeladonMansion3Text8 db $4 ; objects object SPRITE_BIKE_SHOP_GUY, $0, $4, STAY, UP, $1 ; person @@ -20,7 +20,7 @@ CeladonMansion3Object: object SPRITE_LAPRAS_GIVER, $2, $3, STAY, NONE, $4 ; person ; warp-to - EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $6 ; CELADON_MANSION_2 - EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $7 ; CELADON_MANSION_4 - EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $2 ; CELADON_MANSION_4 - EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $4 ; CELADON_MANSION_2 + warp_to $6, $1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_2 + warp_to $7, $1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_4 + warp_to $2, $1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_4 + warp_to $4, $1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_2 diff --git a/data/mapObjects/celadonmansion4.asm b/data/mapObjects/celadonmansion4.asm index c4f667fa..4f0fa214 100755 --- a/data/mapObjects/celadonmansion4.asm +++ b/data/mapObjects/celadonmansion4.asm @@ -2,16 +2,16 @@ CeladonMansion4Object: db $9 ; border block db $3 ; warps - db $1, $6, $1, CELADON_MANSION_3 - db $1, $2, $2, CELADON_MANSION_3 - db $7, $2, $0, CELADON_MANSION_5 + warp $6, $1, $1, CELADON_MANSION_3 + warp $2, $1, $2, CELADON_MANSION_3 + warp $2, $7, $0, CELADON_MANSION_5 db $1 ; signs - db $7, $3, $1 ; CeladonMansion4Text1 + sign $3, $7, $1 ; CeladonMansion4Text1 db $0 ; objects ; warp-to - EVENT_DISP CELADON_MANSION_4_WIDTH, $1, $6 ; CELADON_MANSION_3 - EVENT_DISP CELADON_MANSION_4_WIDTH, $1, $2 ; CELADON_MANSION_3 - EVENT_DISP CELADON_MANSION_4_WIDTH, $7, $2 ; CELADON_MANSION_5 + warp_to $6, $1, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_3 + warp_to $2, $1, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_3 + warp_to $2, $7, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_5 diff --git a/data/mapObjects/celadonmansion5.asm b/data/mapObjects/celadonmansion5.asm index 243e345b..438484bf 100755 --- a/data/mapObjects/celadonmansion5.asm +++ b/data/mapObjects/celadonmansion5.asm @@ -2,8 +2,8 @@ CeladonMansion5Object: db $a ; border block db $2 ; warps - db $7, $2, $2, CELADON_MANSION_4 - db $7, $3, $2, CELADON_MANSION_4 + warp $2, $7, $2, CELADON_MANSION_4 + warp $3, $7, $2, CELADON_MANSION_4 db $0 ; signs @@ -12,5 +12,5 @@ CeladonMansion5Object: object SPRITE_BALL, $4, $3, STAY, NONE, $2 ; person ; warp-to - EVENT_DISP CELADON_MANSION_5_WIDTH, $7, $2 ; CELADON_MANSION_4 - EVENT_DISP CELADON_MANSION_5_WIDTH, $7, $3 ; CELADON_MANSION_4 + warp_to $2, $7, CELADON_MANSION_5_WIDTH ; CELADON_MANSION_4 + warp_to $3, $7, CELADON_MANSION_5_WIDTH ; CELADON_MANSION_4 diff --git a/data/mapObjects/celadonmart1.asm b/data/mapObjects/celadonmart1.asm index af647cf2..3442e3cc 100755 --- a/data/mapObjects/celadonmart1.asm +++ b/data/mapObjects/celadonmart1.asm @@ -2,24 +2,24 @@ CeladonMart1Object: db $f ; border block db $6 ; warps - db $7, $2, $0, $ff - db $7, $3, $0, $ff - db $7, $10, $1, $ff - db $7, $11, $1, $ff - db $1, $c, $0, CELADON_MART_2 - db $1, $1, $0, CELADON_MART_ELEVATOR + warp $2, $7, $0, $ff + warp $3, $7, $0, $ff + warp $10, $7, $1, $ff + warp $11, $7, $1, $ff + warp $c, $1, $0, CELADON_MART_2 + warp $1, $1, $0, CELADON_MART_ELEVATOR db $2 ; signs - db $4, $b, $2 ; CeladonMart1Text2 - db $1, $e, $3 ; CeladonMart1Text3 + sign $b, $4, $2 ; CeladonMart1Text2 + sign $e, $1, $3 ; CeladonMart1Text3 db $1 ; objects object SPRITE_CABLE_CLUB_WOMAN, $8, $3, STAY, DOWN, $1 ; person ; warp-to - EVENT_DISP CELADON_MART_1_WIDTH, $7, $2 - EVENT_DISP CELADON_MART_1_WIDTH, $7, $3 - EVENT_DISP CELADON_MART_1_WIDTH, $7, $10 - EVENT_DISP CELADON_MART_1_WIDTH, $7, $11 - EVENT_DISP CELADON_MART_1_WIDTH, $1, $c ; CELADON_MART_2 - EVENT_DISP CELADON_MART_1_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR + warp_to $2, $7, CELADON_MART_1_WIDTH + warp_to $3, $7, CELADON_MART_1_WIDTH + warp_to $10, $7, CELADON_MART_1_WIDTH + warp_to $11, $7, CELADON_MART_1_WIDTH + warp_to $c, $1, CELADON_MART_1_WIDTH ; CELADON_MART_2 + warp_to $1, $1, CELADON_MART_1_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/celadonmart2.asm b/data/mapObjects/celadonmart2.asm index a6c9af59..3b88d49f 100755 --- a/data/mapObjects/celadonmart2.asm +++ b/data/mapObjects/celadonmart2.asm @@ -2,12 +2,12 @@ CeladonMart2Object: db $f ; border block db $3 ; warps - db $1, $c, $4, CELADON_MART_1 - db $1, $10, $1, CELADON_MART_3 - db $1, $1, $0, CELADON_MART_ELEVATOR + warp $c, $1, $4, CELADON_MART_1 + warp $10, $1, $1, CELADON_MART_3 + warp $1, $1, $0, CELADON_MART_ELEVATOR db $1 ; signs - db $1, $e, $5 ; CeladonMart2Text5 + sign $e, $1, $5 ; CeladonMart2Text5 db $4 ; objects object SPRITE_MART_GUY, $5, $3, STAY, DOWN, $1 ; person @@ -16,6 +16,6 @@ CeladonMart2Object: object SPRITE_GIRL, $e, $4, WALK, $1, $4 ; person ; warp-to - EVENT_DISP CELADON_MART_2_WIDTH, $1, $c ; CELADON_MART_1 - EVENT_DISP CELADON_MART_2_WIDTH, $1, $10 ; CELADON_MART_3 - EVENT_DISP CELADON_MART_2_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR + warp_to $c, $1, CELADON_MART_2_WIDTH ; CELADON_MART_1 + warp_to $10, $1, CELADON_MART_2_WIDTH ; CELADON_MART_3 + warp_to $1, $1, CELADON_MART_2_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/celadonmart3.asm b/data/mapObjects/celadonmart3.asm index 41054371..803ff6ff 100755 --- a/data/mapObjects/celadonmart3.asm +++ b/data/mapObjects/celadonmart3.asm @@ -2,23 +2,23 @@ CeladonMart3Object: db $f ; border block db $3 ; warps - db $1, $c, $0, CELADON_MART_4 - db $1, $10, $1, CELADON_MART_2 - db $1, $1, $0, CELADON_MART_ELEVATOR + warp $c, $1, $0, CELADON_MART_4 + warp $10, $1, $1, CELADON_MART_2 + warp $1, $1, $0, CELADON_MART_ELEVATOR db $c ; signs - db $4, $2, $6 ; CeladonMart3Text6 - db $4, $3, $7 ; CeladonMart3Text7 - db $4, $5, $8 ; CeladonMart3Text8 - db $4, $6, $9 ; CeladonMart3Text9 - db $6, $2, $a ; CeladonMart3Text10 - db $6, $3, $b ; CeladonMart3Text11 - db $6, $5, $c ; CeladonMart3Text12 - db $6, $6, $d ; CeladonMart3Text13 - db $1, $e, $e ; CeladonMart3Text14 - db $1, $4, $f ; CeladonMart3Text15 - db $1, $6, $10 ; CeladonMart3Text16 - db $1, $a, $11 ; CeladonMart3Text17 + sign $2, $4, $6 ; CeladonMart3Text6 + sign $3, $4, $7 ; CeladonMart3Text7 + sign $5, $4, $8 ; CeladonMart3Text8 + sign $6, $4, $9 ; CeladonMart3Text9 + sign $2, $6, $a ; CeladonMart3Text10 + sign $3, $6, $b ; CeladonMart3Text11 + sign $5, $6, $c ; CeladonMart3Text12 + sign $6, $6, $d ; CeladonMart3Text13 + sign $e, $1, $e ; CeladonMart3Text14 + sign $4, $1, $f ; CeladonMart3Text15 + sign $6, $1, $10 ; CeladonMart3Text16 + sign $a, $1, $11 ; CeladonMart3Text17 db $5 ; objects object SPRITE_MART_GUY, $10, $5, STAY, NONE, $1 ; person @@ -28,6 +28,6 @@ CeladonMart3Object: object SPRITE_YOUNG_BOY, $2, $5, STAY, UP, $5 ; person ; warp-to - EVENT_DISP CELADON_MART_3_WIDTH, $1, $c ; CELADON_MART_4 - EVENT_DISP CELADON_MART_3_WIDTH, $1, $10 ; CELADON_MART_2 - EVENT_DISP CELADON_MART_3_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR + warp_to $c, $1, CELADON_MART_3_WIDTH ; CELADON_MART_4 + warp_to $10, $1, CELADON_MART_3_WIDTH ; CELADON_MART_2 + warp_to $1, $1, CELADON_MART_3_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/celadonmart4.asm b/data/mapObjects/celadonmart4.asm index 386dba8c..b7e3e68f 100755 --- a/data/mapObjects/celadonmart4.asm +++ b/data/mapObjects/celadonmart4.asm @@ -2,12 +2,12 @@ CeladonMart4Object: db $f ; border block db $3 ; warps - db $1, $c, $0, CELADON_MART_3 - db $1, $10, $1, CELADON_MART_5 - db $1, $1, $0, CELADON_MART_ELEVATOR + warp $c, $1, $0, CELADON_MART_3 + warp $10, $1, $1, CELADON_MART_5 + warp $1, $1, $0, CELADON_MART_ELEVATOR db $1 ; signs - db $1, $e, $4 ; CeladonMart4Text4 + sign $e, $1, $4 ; CeladonMart4Text4 db $3 ; objects object SPRITE_MART_GUY, $5, $7, STAY, NONE, $1 ; person @@ -15,6 +15,6 @@ CeladonMart4Object: object SPRITE_BUG_CATCHER, $5, $2, WALK, $2, $3 ; person ; warp-to - EVENT_DISP CELADON_MART_4_WIDTH, $1, $c ; CELADON_MART_3 - EVENT_DISP CELADON_MART_4_WIDTH, $1, $10 ; CELADON_MART_5 - EVENT_DISP CELADON_MART_4_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR + warp_to $c, $1, CELADON_MART_4_WIDTH ; CELADON_MART_3 + warp_to $10, $1, CELADON_MART_4_WIDTH ; CELADON_MART_5 + warp_to $1, $1, CELADON_MART_4_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/celadonmart5.asm b/data/mapObjects/celadonmart5.asm index df47a70d..f729943d 100755 --- a/data/mapObjects/celadonmart5.asm +++ b/data/mapObjects/celadonmart5.asm @@ -2,12 +2,12 @@ CeladonMart5Object: db $f ; border block db $3 ; warps - db $1, $c, $0, CELADON_MART_ROOF - db $1, $10, $1, CELADON_MART_4 - db $1, $1, $0, CELADON_MART_ELEVATOR + warp $c, $1, $0, CELADON_MART_ROOF + warp $10, $1, $1, CELADON_MART_4 + warp $1, $1, $0, CELADON_MART_ELEVATOR db $1 ; signs - db $1, $e, $5 ; CeladonMart5Text5 + sign $e, $1, $5 ; CeladonMart5Text5 db $4 ; objects object SPRITE_GENTLEMAN, $e, $5, WALK, $1, $1 ; person @@ -16,6 +16,6 @@ CeladonMart5Object: object SPRITE_MART_GUY, $6, $3, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP CELADON_MART_5_WIDTH, $1, $c ; CELADON_MART_ROOF - EVENT_DISP CELADON_MART_5_WIDTH, $1, $10 ; CELADON_MART_4 - EVENT_DISP CELADON_MART_5_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR + warp_to $c, $1, CELADON_MART_5_WIDTH ; CELADON_MART_ROOF + warp_to $10, $1, CELADON_MART_5_WIDTH ; CELADON_MART_4 + warp_to $1, $1, CELADON_MART_5_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/celadonmartelevator.asm b/data/mapObjects/celadonmartelevator.asm index 2db8635a..ca52dcf6 100755 --- a/data/mapObjects/celadonmartelevator.asm +++ b/data/mapObjects/celadonmartelevator.asm @@ -2,14 +2,14 @@ CeladonMartElevatorObject: db $f ; border block db $2 ; warps - db $3, $1, $5, CELADON_MART_1 - db $3, $2, $5, CELADON_MART_1 + warp $1, $3, $5, CELADON_MART_1 + warp $2, $3, $5, CELADON_MART_1 db $1 ; signs - db $0, $3, $1 ; CeladonMartElevatorText1 + sign $3, $0, $1 ; CeladonMartElevatorText1 db $0 ; objects ; warp-to - EVENT_DISP CELADON_MART_ELEVATOR_WIDTH, $3, $1 ; CELADON_MART_1 - EVENT_DISP CELADON_MART_ELEVATOR_WIDTH, $3, $2 ; CELADON_MART_1 + warp_to $1, $3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1 + warp_to $2, $3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1 diff --git a/data/mapObjects/celadonmartroof.asm b/data/mapObjects/celadonmartroof.asm index 63a1b4d7..e6fda0e7 100755 --- a/data/mapObjects/celadonmartroof.asm +++ b/data/mapObjects/celadonmartroof.asm @@ -2,17 +2,17 @@ CeladonMartRoofObject: db $42 ; border block db $1 ; warps - db $2, $f, $0, CELADON_MART_5 + warp $f, $2, $0, CELADON_MART_5 db $4 ; signs - db $1, $a, $3 ; CeladonMartRoofText3 - db $1, $b, $4 ; CeladonMartRoofText4 - db $2, $c, $5 ; CeladonMartRoofText5 - db $2, $d, $6 ; CeladonMartRoofText6 + sign $a, $1, $3 ; CeladonMartRoofText3 + sign $b, $1, $4 ; CeladonMartRoofText4 + sign $c, $2, $5 ; CeladonMartRoofText5 + sign $d, $2, $6 ; CeladonMartRoofText6 db $2 ; objects object SPRITE_BLACK_HAIR_BOY_2, $a, $4, STAY, LEFT, $1 ; person object SPRITE_LITTLE_GIRL, $5, $5, WALK, $0, $2 ; person ; warp-to - EVENT_DISP CELADON_MART_ROOF_WIDTH, $2, $f ; CELADON_MART_5 + warp_to $f, $2, CELADON_MART_ROOF_WIDTH ; CELADON_MART_5 diff --git a/data/mapObjects/celadonpokecenter.asm b/data/mapObjects/celadonpokecenter.asm index c4ce1700..bf08a4aa 100755 --- a/data/mapObjects/celadonpokecenter.asm +++ b/data/mapObjects/celadonpokecenter.asm @@ -2,8 +2,8 @@ CeladonPokecenterObject: db $0 ; border block db $2 ; warps - db $7, $3, $5, $ff - db $7, $4, $5, $ff + warp $3, $7, $5, $ff + warp $4, $7, $5, $ff db $0 ; signs @@ -14,5 +14,5 @@ CeladonPokecenterObject: object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP CELADON_POKECENTER_WIDTH, $7, $3 - EVENT_DISP CELADON_POKECENTER_WIDTH, $7, $4 + warp_to $3, $7, CELADON_POKECENTER_WIDTH + warp_to $4, $7, CELADON_POKECENTER_WIDTH diff --git a/data/mapObjects/celadonprizeroom.asm b/data/mapObjects/celadonprizeroom.asm index c440bad5..8acea80c 100755 --- a/data/mapObjects/celadonprizeroom.asm +++ b/data/mapObjects/celadonprizeroom.asm @@ -2,18 +2,18 @@ CeladonPrizeRoomObject: db $f ; border block db $2 ; warps - db $7, $4, $9, $ff - db $7, $5, $9, $ff + warp $4, $7, $9, $ff + warp $5, $7, $9, $ff db $3 ; signs - db $2, $2, $3 ; CeladonPrizeRoomText3 - db $2, $4, $4 ; CeladonPrizeRoomText4 - db $2, $6, $5 ; CeladonPrizeRoomText5 + sign $2, $2, $3 ; CeladonPrizeRoomText3 + sign $4, $2, $4 ; CeladonPrizeRoomText4 + sign $6, $2, $5 ; CeladonPrizeRoomText5 db $2 ; objects object SPRITE_BALDING_GUY, $1, $4, STAY, NONE, $1 ; person object SPRITE_GAMBLER, $7, $3, WALK, $2, $2 ; person ; warp-to - EVENT_DISP CELADON_PRIZE_ROOM_WIDTH, $7, $4 - EVENT_DISP CELADON_PRIZE_ROOM_WIDTH, $7, $5 + warp_to $4, $7, CELADON_PRIZE_ROOM_WIDTH + warp_to $5, $7, CELADON_PRIZE_ROOM_WIDTH diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/ceruleancity.asm index b6317e2c..a20e6252 100755 --- a/data/mapObjects/ceruleancity.asm +++ b/data/mapObjects/ceruleancity.asm @@ -2,24 +2,24 @@ CeruleanCityObject: db $f ; border block db $a ; warps - db $b, $1b, $0, TRASHED_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_2 - db $9, $9, $0, CERULEAN_HOUSE_2 + warp $1b, $b, $0, TRASHED_HOUSE + warp $d, $f, $0, CERULEAN_HOUSE_1 + warp $13, $11, $0, CERULEAN_POKECENTER + warp $1e, $13, $0, CERULEAN_GYM + warp $d, $19, $0, BIKE_SHOP + warp $19, $19, $0, CERULEAN_MART + warp $4, $b, $0, UNKNOWN_DUNGEON_1 + warp $1b, $9, $2, TRASHED_HOUSE + warp $9, $b, $1, CERULEAN_HOUSE_2 + warp $9, $9, $0, CERULEAN_HOUSE_2 db $6 ; signs - db $13, $17, $c ; CeruleanCityText12 - db $1d, $11, $d ; CeruleanCityText13 - db $19, $1a, $e ; MartSignText - db $11, $14, $f ; PokeCenterSignText - db $19, $b, $10 ; CeruleanCityText16 - db $15, $1b, $11 ; CeruleanCityText17 + sign $17, $13, $c ; CeruleanCityText12 + sign $11, $1d, $d ; CeruleanCityText13 + sign $1a, $19, $e ; MartSignText + sign $14, $11, $f ; PokeCenterSignText + sign $b, $19, $10 ; CeruleanCityText16 + sign $1b, $15, $11 ; CeruleanCityText17 db $b ; objects object SPRITE_BLUE, $14, $2, STAY, DOWN, $1 ; person @@ -35,13 +35,13 @@ CeruleanCityObject: object SPRITE_GUARD, $1b, $c, STAY, DOWN, $b ; person ; warp-to - EVENT_DISP CERULEAN_CITY_WIDTH, $b, $1b ; TRASHED_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_2 - EVENT_DISP CERULEAN_CITY_WIDTH, $9, $9 ; CERULEAN_HOUSE_2 + warp_to $1b, $b, CERULEAN_CITY_WIDTH ; TRASHED_HOUSE + warp_to $d, $f, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_1 + warp_to $13, $11, CERULEAN_CITY_WIDTH ; CERULEAN_POKECENTER + warp_to $1e, $13, CERULEAN_CITY_WIDTH ; CERULEAN_GYM + warp_to $d, $19, CERULEAN_CITY_WIDTH ; BIKE_SHOP + warp_to $19, $19, CERULEAN_CITY_WIDTH ; CERULEAN_MART + warp_to $4, $b, CERULEAN_CITY_WIDTH ; UNKNOWN_DUNGEON_1 + warp_to $1b, $9, CERULEAN_CITY_WIDTH ; TRASHED_HOUSE + warp_to $9, $b, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_2 + warp_to $9, $9, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_2 diff --git a/data/mapObjects/ceruleangym.asm b/data/mapObjects/ceruleangym.asm index 66d22260..5a35e9e7 100755 --- a/data/mapObjects/ceruleangym.asm +++ b/data/mapObjects/ceruleangym.asm @@ -2,8 +2,8 @@ CeruleanGymObject: db $3 ; border block db $2 ; warps - db $d, $4, $3, $ff - db $d, $5, $3, $ff + warp $4, $d, $3, $ff + warp $5, $d, $3, $ff db $0 ; signs @@ -14,5 +14,5 @@ CeruleanGymObject: object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP CERULEAN_GYM_WIDTH, $d, $4 - EVENT_DISP CERULEAN_GYM_WIDTH, $d, $5 + warp_to $4, $d, CERULEAN_GYM_WIDTH + warp_to $5, $d, CERULEAN_GYM_WIDTH diff --git a/data/mapObjects/ceruleanhouse1.asm b/data/mapObjects/ceruleanhouse1.asm index 27373825..08359b80 100755 --- a/data/mapObjects/ceruleanhouse1.asm +++ b/data/mapObjects/ceruleanhouse1.asm @@ -2,8 +2,8 @@ CeruleanHouse1Object: db $a ; border block db $2 ; warps - db $7, $2, $1, $ff - db $7, $3, $1, $ff + warp $2, $7, $1, $ff + warp $3, $7, $1, $ff db $0 ; signs @@ -12,5 +12,5 @@ CeruleanHouse1Object: object SPRITE_GAMBLER, $1, $2, STAY, NONE, $2 ; person ; warp-to - EVENT_DISP CERULEAN_HOUSE_1_WIDTH, $7, $2 - EVENT_DISP CERULEAN_HOUSE_1_WIDTH, $7, $3 + warp_to $2, $7, CERULEAN_HOUSE_1_WIDTH + warp_to $3, $7, CERULEAN_HOUSE_1_WIDTH diff --git a/data/mapObjects/ceruleanhouse2.asm b/data/mapObjects/ceruleanhouse2.asm index 669cd098..c7c4beae 100755 --- a/data/mapObjects/ceruleanhouse2.asm +++ b/data/mapObjects/ceruleanhouse2.asm @@ -2,9 +2,9 @@ CeruleanHouse2Object: db $c ; border block db $3 ; warps - db $0, $2, $9, $ff - db $7, $2, $8, $ff - db $7, $3, $8, $ff + warp $2, $0, $9, $ff + warp $2, $7, $8, $ff + warp $3, $7, $8, $ff db $0 ; signs @@ -12,6 +12,6 @@ CeruleanHouse2Object: object SPRITE_FAT_BALD_GUY, $5, $3, STAY, RIGHT, $1 ; person ; warp-to - EVENT_DISP CERULEAN_HOUSE_2_WIDTH, $0, $2 - EVENT_DISP CERULEAN_HOUSE_2_WIDTH, $7, $2 - EVENT_DISP CERULEAN_HOUSE_2_WIDTH, $7, $3 + warp_to $2, $0, CERULEAN_HOUSE_2_WIDTH + warp_to $2, $7, CERULEAN_HOUSE_2_WIDTH + warp_to $3, $7, CERULEAN_HOUSE_2_WIDTH diff --git a/data/mapObjects/ceruleanhousetrashed.asm b/data/mapObjects/ceruleanhousetrashed.asm index 4f154191..70857293 100755 --- a/data/mapObjects/ceruleanhousetrashed.asm +++ b/data/mapObjects/ceruleanhousetrashed.asm @@ -2,18 +2,18 @@ CeruleanHouseTrashedObject: db $a ; border block db $3 ; warps - db $7, $2, $0, $ff - db $7, $3, $0, $ff - db $0, $3, $7, $ff + warp $2, $7, $0, $ff + warp $3, $7, $0, $ff + warp $3, $0, $7, $ff db $1 ; signs - db $0, $3, $3 ; CeruleanHouseTrashedText3 + sign $3, $0, $3 ; CeruleanHouseTrashedText3 db $2 ; objects object SPRITE_FISHER, $2, $1, STAY, DOWN, $1 ; person object SPRITE_GIRL, $5, $6, WALK, $2, $2 ; person ; warp-to - EVENT_DISP TRASHED_HOUSE_WIDTH, $7, $2 - EVENT_DISP TRASHED_HOUSE_WIDTH, $7, $3 - EVENT_DISP TRASHED_HOUSE_WIDTH, $0, $3 + warp_to $2, $7, TRASHED_HOUSE_WIDTH + warp_to $3, $7, TRASHED_HOUSE_WIDTH + warp_to $3, $0, TRASHED_HOUSE_WIDTH diff --git a/data/mapObjects/ceruleanmart.asm b/data/mapObjects/ceruleanmart.asm index 301d11a2..13e86d81 100755 --- a/data/mapObjects/ceruleanmart.asm +++ b/data/mapObjects/ceruleanmart.asm @@ -2,8 +2,8 @@ CeruleanMartObject: db $0 ; border block db $2 ; warps - db $7, $3, $5, $ff - db $7, $4, $5, $ff + warp $3, $7, $5, $ff + warp $4, $7, $5, $ff db $0 ; signs @@ -13,5 +13,5 @@ CeruleanMartObject: object SPRITE_LASS, $6, $2, WALK, $2, $3 ; person ; warp-to - EVENT_DISP CERULEAN_MART_WIDTH, $7, $3 - EVENT_DISP CERULEAN_MART_WIDTH, $7, $4 + warp_to $3, $7, CERULEAN_MART_WIDTH + warp_to $4, $7, CERULEAN_MART_WIDTH diff --git a/data/mapObjects/ceruleanpokecenter.asm b/data/mapObjects/ceruleanpokecenter.asm index 1e92ec07..45c3c263 100755 --- a/data/mapObjects/ceruleanpokecenter.asm +++ b/data/mapObjects/ceruleanpokecenter.asm @@ -2,8 +2,8 @@ CeruleanPokecenterObject: db $0 ; border block db $2 ; warps - db $7, $3, $2, $ff - db $7, $4, $2, $ff + warp $3, $7, $2, $ff + warp $4, $7, $2, $ff db $0 ; signs @@ -14,5 +14,5 @@ CeruleanPokecenterObject: object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP CERULEAN_POKECENTER_WIDTH, $7, $3 - EVENT_DISP CERULEAN_POKECENTER_WIDTH, $7, $4 + warp_to $3, $7, CERULEAN_POKECENTER_WIDTH + warp_to $4, $7, CERULEAN_POKECENTER_WIDTH diff --git a/data/mapObjects/cinnabargym.asm b/data/mapObjects/cinnabargym.asm index 24bdba3d..509a721e 100755 --- a/data/mapObjects/cinnabargym.asm +++ b/data/mapObjects/cinnabargym.asm @@ -2,8 +2,8 @@ CinnabarGymObject: db $2e ; border block db $2 ; warps - db $11, $10, $1, $ff - db $11, $11, $1, $ff + warp $10, $11, $1, $ff + warp $11, $11, $1, $ff db $0 ; signs @@ -19,5 +19,5 @@ CinnabarGymObject: object SPRITE_GYM_HELPER, $10, $d, STAY, DOWN, $9 ; person ; warp-to - EVENT_DISP CINNABAR_GYM_WIDTH, $11, $10 - EVENT_DISP CINNABAR_GYM_WIDTH, $11, $11 + warp_to $10, $11, CINNABAR_GYM_WIDTH + warp_to $11, $11, CINNABAR_GYM_WIDTH diff --git a/data/mapObjects/cinnabarisland.asm b/data/mapObjects/cinnabarisland.asm index 05f4c06c..27a425f2 100755 --- a/data/mapObjects/cinnabarisland.asm +++ b/data/mapObjects/cinnabarisland.asm @@ -2,26 +2,26 @@ CinnabarIslandObject: db $43 ; border block db $5 ; warps - db $3, $6, $1, MANSION_1 - db $3, $12, $0, CINNABAR_GYM - db $9, $6, $0, CINNABAR_LAB_1 - db $b, $b, $0, CINNABAR_POKECENTER - db $b, $f, $0, CINNABAR_MART + warp $6, $3, $1, MANSION_1 + warp $12, $3, $0, CINNABAR_GYM + warp $6, $9, $0, CINNABAR_LAB_1 + warp $b, $b, $0, CINNABAR_POKECENTER + warp $f, $b, $0, CINNABAR_MART db $5 ; signs - db $5, $9, $3 ; CinnabarIslandText3 - db $b, $10, $4 ; MartSignText - db $b, $c, $5 ; PokeCenterSignText - db $b, $9, $6 ; CinnabarIslandText6 - db $3, $d, $7 ; CinnabarIslandText7 + sign $9, $5, $3 ; CinnabarIslandText3 + sign $10, $b, $4 ; MartSignText + sign $c, $b, $5 ; PokeCenterSignText + sign $9, $b, $6 ; CinnabarIslandText6 + sign $d, $3, $7 ; CinnabarIslandText7 db $2 ; objects object SPRITE_GIRL, $c, $5, WALK, $2, $1 ; person object SPRITE_GAMBLER, $e, $6, STAY, NONE, $2 ; person ; warp-to - EVENT_DISP CINNABAR_ISLAND_WIDTH, $3, $6 ; MANSION_1 - EVENT_DISP CINNABAR_ISLAND_WIDTH, $3, $12 ; CINNABAR_GYM - EVENT_DISP CINNABAR_ISLAND_WIDTH, $9, $6 ; CINNABAR_LAB_1 - EVENT_DISP CINNABAR_ISLAND_WIDTH, $b, $b ; CINNABAR_POKECENTER - EVENT_DISP CINNABAR_ISLAND_WIDTH, $b, $f ; CINNABAR_MART + warp_to $6, $3, CINNABAR_ISLAND_WIDTH ; MANSION_1 + warp_to $12, $3, CINNABAR_ISLAND_WIDTH ; CINNABAR_GYM + warp_to $6, $9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB_1 + warp_to $b, $b, CINNABAR_ISLAND_WIDTH ; CINNABAR_POKECENTER + warp_to $f, $b, CINNABAR_ISLAND_WIDTH ; CINNABAR_MART diff --git a/data/mapObjects/cinnabarmart.asm b/data/mapObjects/cinnabarmart.asm index 79494686..5297930e 100755 --- a/data/mapObjects/cinnabarmart.asm +++ b/data/mapObjects/cinnabarmart.asm @@ -2,8 +2,8 @@ CinnabarMartObject: db $0 ; border block db $2 ; warps - db $7, $3, $4, $ff - db $7, $4, $4, $ff + warp $3, $7, $4, $ff + warp $4, $7, $4, $ff db $0 ; signs @@ -13,5 +13,5 @@ CinnabarMartObject: object SPRITE_OAK_AIDE, $3, $4, STAY, NONE, $3 ; person ; warp-to - EVENT_DISP CINNABAR_MART_WIDTH, $7, $3 - EVENT_DISP CINNABAR_MART_WIDTH, $7, $4 + warp_to $3, $7, CINNABAR_MART_WIDTH + warp_to $4, $7, CINNABAR_MART_WIDTH diff --git a/data/mapObjects/cinnabarpokecenter.asm b/data/mapObjects/cinnabarpokecenter.asm index 7d15f050..6df12279 100755 --- a/data/mapObjects/cinnabarpokecenter.asm +++ b/data/mapObjects/cinnabarpokecenter.asm @@ -2,8 +2,8 @@ CinnabarPokecenterObject: db $0 ; border block db $2 ; warps - db $7, $3, $3, $ff - db $7, $4, $3, $ff + warp $3, $7, $3, $ff + warp $4, $7, $3, $ff db $0 ; signs @@ -14,5 +14,5 @@ CinnabarPokecenterObject: object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP CINNABAR_POKECENTER_WIDTH, $7, $3 - EVENT_DISP CINNABAR_POKECENTER_WIDTH, $7, $4 + warp_to $3, $7, CINNABAR_POKECENTER_WIDTH + warp_to $4, $7, CINNABAR_POKECENTER_WIDTH diff --git a/data/mapObjects/copycatshouse1f.asm b/data/mapObjects/copycatshouse1f.asm index 7d842cad..49eb8168 100755 --- a/data/mapObjects/copycatshouse1f.asm +++ b/data/mapObjects/copycatshouse1f.asm @@ -2,9 +2,9 @@ CopycatsHouse1FObject: db $a ; border block db $3 ; warps - db $7, $2, $0, $ff - db $7, $3, $0, $ff - db $1, $7, $0, COPYCATS_HOUSE_2F + warp $2, $7, $0, $ff + warp $3, $7, $0, $ff + warp $7, $1, $0, COPYCATS_HOUSE_2F db $0 ; signs @@ -14,6 +14,6 @@ CopycatsHouse1FObject: object SPRITE_CLEFAIRY, $1, $4, WALK, $1, $3 ; person ; warp-to - EVENT_DISP COPYCATS_HOUSE_1F_WIDTH, $7, $2 - EVENT_DISP COPYCATS_HOUSE_1F_WIDTH, $7, $3 - EVENT_DISP COPYCATS_HOUSE_1F_WIDTH, $1, $7 ; COPYCATS_HOUSE_2F + warp_to $2, $7, COPYCATS_HOUSE_1F_WIDTH + warp_to $3, $7, COPYCATS_HOUSE_1F_WIDTH + warp_to $7, $1, COPYCATS_HOUSE_1F_WIDTH ; COPYCATS_HOUSE_2F diff --git a/data/mapObjects/copycatshouse2f.asm b/data/mapObjects/copycatshouse2f.asm index 0d53965a..5d2de9ef 100755 --- a/data/mapObjects/copycatshouse2f.asm +++ b/data/mapObjects/copycatshouse2f.asm @@ -2,11 +2,11 @@ CopycatsHouse2FObject: db $a ; border block db $1 ; warps - db $1, $7, $2, COPYCATS_HOUSE_1F + warp $7, $1, $2, COPYCATS_HOUSE_1F db $2 ; signs - db $5, $3, $6 ; CopycatsHouse2FText6 - db $1, $0, $7 ; CopycatsHouse2FText7 + sign $3, $5, $6 ; CopycatsHouse2FText6 + sign $0, $1, $7 ; CopycatsHouse2FText7 db $5 ; objects object SPRITE_BRUNETTE_GIRL, $4, $3, WALK, $0, $1 ; person @@ -16,4 +16,4 @@ CopycatsHouse2FObject: object SPRITE_CLEFAIRY, $1, $6, STAY, RIGHT, $5 ; person ; warp-to - EVENT_DISP COPYCATS_HOUSE_2F_WIDTH, $1, $7 ; COPYCATS_HOUSE_1F + warp_to $7, $1, COPYCATS_HOUSE_2F_WIDTH ; COPYCATS_HOUSE_1F diff --git a/data/mapObjects/daycarem.asm b/data/mapObjects/daycarem.asm index 98d4c184..dfc1d8fb 100755 --- a/data/mapObjects/daycarem.asm +++ b/data/mapObjects/daycarem.asm @@ -2,8 +2,8 @@ DayCareMObject: db $a ; border block db $2 ; warps - db $7, $2, $4, $ff - db $7, $3, $4, $ff + warp $2, $7, $4, $ff + warp $3, $7, $4, $ff db $0 ; signs @@ -11,5 +11,5 @@ DayCareMObject: object SPRITE_GENTLEMAN, $2, $3, STAY, RIGHT, $1 ; person ; warp-to - EVENT_DISP DAYCAREM_WIDTH, $7, $2 - EVENT_DISP DAYCAREM_WIDTH, $7, $3 + warp_to $2, $7, DAYCAREM_WIDTH + warp_to $3, $7, DAYCAREM_WIDTH diff --git a/data/mapObjects/diglettscave.asm b/data/mapObjects/diglettscave.asm index cdcffce0..160a9f43 100755 --- a/data/mapObjects/diglettscave.asm +++ b/data/mapObjects/diglettscave.asm @@ -2,13 +2,13 @@ DiglettsCaveObject: db $19 ; border block db $2 ; warps - db $5, $5, $2, DIGLETTS_CAVE_EXIT - db $1f, $25, $2, DIGLETTS_CAVE_ENTRANCE + warp $5, $5, $2, DIGLETTS_CAVE_EXIT + warp $25, $1f, $2, DIGLETTS_CAVE_ENTRANCE db $0 ; signs db $0 ; objects ; warp-to - EVENT_DISP DIGLETTS_CAVE_WIDTH, $5, $5 ; DIGLETTS_CAVE_EXIT - EVENT_DISP DIGLETTS_CAVE_WIDTH, $1f, $25 ; DIGLETTS_CAVE_ENTRANCE + warp_to $5, $5, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_EXIT + warp_to $25, $1f, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ENTRANCE diff --git a/data/mapObjects/diglettscaveroute11.asm b/data/mapObjects/diglettscaveroute11.asm index e5d6b69f..627f1f5e 100755 --- a/data/mapObjects/diglettscaveroute11.asm +++ b/data/mapObjects/diglettscaveroute11.asm @@ -2,9 +2,9 @@ DiglettsCaveEntranceRoute11Object: db $7d ; border block db $3 ; warps - db $7, $2, $4, $ff - db $7, $3, $4, $ff - db $4, $4, $1, DIGLETTS_CAVE + warp $2, $7, $4, $ff + warp $3, $7, $4, $ff + warp $4, $4, $1, DIGLETTS_CAVE db $0 ; signs @@ -12,6 +12,6 @@ DiglettsCaveEntranceRoute11Object: object SPRITE_GAMBLER, $2, $3, STAY, NONE, $1 ; person ; warp-to - EVENT_DISP DIGLETTS_CAVE_ENTRANCE_WIDTH, $7, $2 - EVENT_DISP DIGLETTS_CAVE_ENTRANCE_WIDTH, $7, $3 - EVENT_DISP DIGLETTS_CAVE_ENTRANCE_WIDTH, $4, $4 ; DIGLETTS_CAVE + warp_to $2, $7, DIGLETTS_CAVE_ENTRANCE_WIDTH + warp_to $3, $7, DIGLETTS_CAVE_ENTRANCE_WIDTH + warp_to $4, $4, DIGLETTS_CAVE_ENTRANCE_WIDTH ; DIGLETTS_CAVE diff --git a/data/mapObjects/diglettscaveroute2.asm b/data/mapObjects/diglettscaveroute2.asm index f1310cce..f52dbe1f 100755 --- a/data/mapObjects/diglettscaveroute2.asm +++ b/data/mapObjects/diglettscaveroute2.asm @@ -2,9 +2,9 @@ DiglettsCaveRoute2Object: db $7d ; border block db $3 ; warps - db $7, $2, $0, $ff - db $7, $3, $0, $ff - db $4, $4, $0, DIGLETTS_CAVE + warp $2, $7, $0, $ff + warp $3, $7, $0, $ff + warp $4, $4, $0, DIGLETTS_CAVE db $0 ; signs @@ -12,6 +12,6 @@ DiglettsCaveRoute2Object: object SPRITE_FISHER, $3, $3, STAY, NONE, $1 ; person ; warp-to - EVENT_DISP DIGLETTS_CAVE_EXIT_WIDTH, $7, $2 - EVENT_DISP DIGLETTS_CAVE_EXIT_WIDTH, $7, $3 - EVENT_DISP DIGLETTS_CAVE_EXIT_WIDTH, $4, $4 ; DIGLETTS_CAVE + warp_to $2, $7, DIGLETTS_CAVE_EXIT_WIDTH + warp_to $3, $7, DIGLETTS_CAVE_EXIT_WIDTH + warp_to $4, $4, DIGLETTS_CAVE_EXIT_WIDTH ; DIGLETTS_CAVE diff --git a/data/mapObjects/fanclub.asm b/data/mapObjects/fanclub.asm index f0f544ef..c310ed53 100755 --- a/data/mapObjects/fanclub.asm +++ b/data/mapObjects/fanclub.asm @@ -2,12 +2,12 @@ FanClubObject: db $d ; border block db $2 ; warps - db $7, $2, $1, $ff - db $7, $3, $1, $ff + warp $2, $7, $1, $ff + warp $3, $7, $1, $ff db $2 ; signs - db $0, $1, $7 ; FanClubText7 - db $0, $6, $8 ; FanClubText8 + sign $1, $0, $7 ; FanClubText7 + sign $6, $0, $8 ; FanClubText8 db $6 ; objects object SPRITE_FISHER2, $6, $3, STAY, LEFT, $1 ; person @@ -18,5 +18,5 @@ FanClubObject: object SPRITE_CABLE_CLUB_WOMAN, $5, $1, STAY, DOWN, $6 ; person ; warp-to - EVENT_DISP POKEMON_FAN_CLUB_WIDTH, $7, $2 - EVENT_DISP POKEMON_FAN_CLUB_WIDTH, $7, $3 + warp_to $2, $7, POKEMON_FAN_CLUB_WIDTH + warp_to $3, $7, POKEMON_FAN_CLUB_WIDTH diff --git a/data/mapObjects/fightingdojo.asm b/data/mapObjects/fightingdojo.asm index 44fed88f..a54a60f4 100755 --- a/data/mapObjects/fightingdojo.asm +++ b/data/mapObjects/fightingdojo.asm @@ -2,8 +2,8 @@ FightingDojoObject: db $3 ; border block db $2 ; warps - db $b, $4, $1, $ff - db $b, $5, $1, $ff + warp $4, $b, $1, $ff + warp $5, $b, $1, $ff db $0 ; signs @@ -17,5 +17,5 @@ FightingDojoObject: object SPRITE_BALL, $5, $1, STAY, NONE, $7 ; person ; warp-to - EVENT_DISP FIGHTING_DOJO_WIDTH, $b, $4 - EVENT_DISP FIGHTING_DOJO_WIDTH, $b, $5 + warp_to $4, $b, FIGHTING_DOJO_WIDTH + warp_to $5, $b, FIGHTING_DOJO_WIDTH diff --git a/data/mapObjects/fuchsiacity.asm b/data/mapObjects/fuchsiacity.asm index bcca4004..71533132 100755 --- a/data/mapObjects/fuchsiacity.asm +++ b/data/mapObjects/fuchsiacity.asm @@ -2,31 +2,31 @@ FuchsiaCityObject: db $f ; border block db $9 ; warps - db $d, $5, $0, FUCHSIA_MART - db $1b, $b, $0, FUCHSIA_HOUSE_1 - db $1b, $13, $0, FUCHSIA_POKECENTER - db $1b, $1b, $0, FUCHSIA_HOUSE_2 - db $3, $12, $0, SAFARI_ZONE_ENTRANCE - db $1b, $5, $0, FUCHSIA_GYM - db $d, $16, $0, FUCHSIA_MEETING_ROOM - db $1b, $1f, $1, FUCHSIA_HOUSE_3 - db $18, $1f, $0, FUCHSIA_HOUSE_3 + warp $5, $d, $0, FUCHSIA_MART + warp $b, $1b, $0, FUCHSIA_HOUSE_1 + warp $13, $1b, $0, FUCHSIA_POKECENTER + warp $1b, $1b, $0, FUCHSIA_HOUSE_2 + warp $12, $3, $0, SAFARI_ZONE_ENTRANCE + warp $5, $1b, $0, FUCHSIA_GYM + warp $16, $d, $0, FUCHSIA_MEETING_ROOM + warp $1f, $1b, $1, FUCHSIA_HOUSE_3 + warp $1f, $18, $0, FUCHSIA_HOUSE_3 db $e ; signs - db $17, $f, $b ; FuchsiaCityText11 - db $f, $19, $c ; FuchsiaCityText12 - db $5, $11, $d ; FuchsiaCityText13 - db $d, $6, $e ; MartSignText - db $1b, $14, $f ; PokeCenterSignText - db $1d, $1b, $10 ; FuchsiaCityText16 - db $f, $15, $11 ; FuchsiaCityText17 - db $1d, $5, $12 ; FuchsiaCityText18 - db $7, $21, $13 ; FuchsiaCityText19 - db $7, $1b, $14 ; FuchsiaCityText20 - db $7, $d, $15 ; FuchsiaCityText21 - db $d, $1f, $16 ; FuchsiaCityText22 - db $f, $d, $17 ; FuchsiaCityText23 - db $7, $7, $18 ; FuchsiaCityText24 + sign $f, $17, $b ; FuchsiaCityText11 + sign $19, $f, $c ; FuchsiaCityText12 + sign $11, $5, $d ; FuchsiaCityText13 + sign $6, $d, $e ; MartSignText + sign $14, $1b, $f ; PokeCenterSignText + sign $1b, $1d, $10 ; FuchsiaCityText16 + sign $15, $f, $11 ; FuchsiaCityText17 + sign $5, $1d, $12 ; FuchsiaCityText18 + sign $21, $7, $13 ; FuchsiaCityText19 + sign $1b, $7, $14 ; FuchsiaCityText20 + sign $d, $7, $15 ; FuchsiaCityText21 + sign $1f, $d, $16 ; FuchsiaCityText22 + sign $d, $f, $17 ; FuchsiaCityText23 + sign $7, $7, $18 ; FuchsiaCityText24 db $a ; objects object SPRITE_BUG_CATCHER, $a, $c, WALK, $2, $1 ; person @@ -41,12 +41,12 @@ FuchsiaCityObject: object SPRITE_OMANYTE, $6, $5, STAY, NONE, $a ; person ; warp-to - EVENT_DISP FUCHSIA_CITY_WIDTH, $d, $5 ; FUCHSIA_MART - EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $b ; FUCHSIA_HOUSE_1 - EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $13 ; FUCHSIA_POKECENTER - EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $1b ; FUCHSIA_HOUSE_2 - EVENT_DISP FUCHSIA_CITY_WIDTH, $3, $12 ; SAFARI_ZONE_ENTRANCE - EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $5 ; FUCHSIA_GYM - EVENT_DISP FUCHSIA_CITY_WIDTH, $d, $16 ; FUCHSIA_MEETING_ROOM - EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $1f ; FUCHSIA_HOUSE_3 - EVENT_DISP FUCHSIA_CITY_WIDTH, $18, $1f ; FUCHSIA_HOUSE_3 + warp_to $5, $d, FUCHSIA_CITY_WIDTH ; FUCHSIA_MART + warp_to $b, $1b, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_1 + warp_to $13, $1b, FUCHSIA_CITY_WIDTH ; FUCHSIA_POKECENTER + warp_to $1b, $1b, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_2 + warp_to $12, $3, FUCHSIA_CITY_WIDTH ; SAFARI_ZONE_ENTRANCE + warp_to $5, $1b, FUCHSIA_CITY_WIDTH ; FUCHSIA_GYM + warp_to $16, $d, FUCHSIA_CITY_WIDTH ; FUCHSIA_MEETING_ROOM + warp_to $1f, $1b, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_3 + warp_to $1f, $18, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_3 diff --git a/data/mapObjects/fuchsiagym.asm b/data/mapObjects/fuchsiagym.asm index 023c23d3..14175052 100755 --- a/data/mapObjects/fuchsiagym.asm +++ b/data/mapObjects/fuchsiagym.asm @@ -2,8 +2,8 @@ FuchsiaGymObject: db $3 ; border block db $2 ; warps - db $11, $4, $5, $ff - db $11, $5, $5, $ff + warp $4, $11, $5, $ff + warp $5, $11, $5, $ff db $0 ; signs @@ -18,5 +18,5 @@ FuchsiaGymObject: object SPRITE_GYM_HELPER, $7, $f, STAY, DOWN, $8 ; person ; warp-to - EVENT_DISP FUCHSIA_GYM_WIDTH, $11, $4 - EVENT_DISP FUCHSIA_GYM_WIDTH, $11, $5 + warp_to $4, $11, FUCHSIA_GYM_WIDTH + warp_to $5, $11, FUCHSIA_GYM_WIDTH diff --git a/data/mapObjects/fuchsiahouse1.asm b/data/mapObjects/fuchsiahouse1.asm index 4d3c3b6e..d528bc00 100755 --- a/data/mapObjects/fuchsiahouse1.asm +++ b/data/mapObjects/fuchsiahouse1.asm @@ -2,8 +2,8 @@ FuchsiaHouse1Object: db $a ; border block db $2 ; warps - db $7, $2, $1, $ff - db $7, $3, $1, $ff + warp $2, $7, $1, $ff + warp $3, $7, $1, $ff db $0 ; signs @@ -13,5 +13,5 @@ FuchsiaHouse1Object: object SPRITE_BUG_CATCHER, $5, $5, STAY, NONE, $3 ; person ; warp-to - EVENT_DISP FUCHSIA_HOUSE_1_WIDTH, $7, $2 - EVENT_DISP FUCHSIA_HOUSE_1_WIDTH, $7, $3 + warp_to $2, $7, FUCHSIA_HOUSE_1_WIDTH + warp_to $3, $7, FUCHSIA_HOUSE_1_WIDTH diff --git a/data/mapObjects/fuchsiahouse2.asm b/data/mapObjects/fuchsiahouse2.asm index 3a3d07c3..3e549857 100755 --- a/data/mapObjects/fuchsiahouse2.asm +++ b/data/mapObjects/fuchsiahouse2.asm @@ -2,12 +2,12 @@ FuchsiaHouse2Object: db $17 ; border block db $2 ; warps - db $7, $4, $3, $ff - db $7, $5, $3, $ff + warp $4, $7, $3, $ff + warp $5, $7, $3, $ff db $2 ; signs - db $3, $4, $4 ; FuchsiaHouse2Text4 - db $3, $5, $5 ; FuchsiaHouse2Text5 + sign $4, $3, $4 ; FuchsiaHouse2Text4 + sign $5, $3, $5 ; FuchsiaHouse2Text5 db $3 ; objects object SPRITE_WARDEN, $2, $3, STAY, NONE, $1 ; person @@ -15,5 +15,5 @@ FuchsiaHouse2Object: object SPRITE_BOULDER, $8, $4, STAY, BOULDER_MOVEMENT_BYTE_2, $3 ; person ; warp-to - EVENT_DISP FUCHSIA_HOUSE_2_WIDTH, $7, $4 - EVENT_DISP FUCHSIA_HOUSE_2_WIDTH, $7, $5 + warp_to $4, $7, FUCHSIA_HOUSE_2_WIDTH + warp_to $5, $7, FUCHSIA_HOUSE_2_WIDTH diff --git a/data/mapObjects/fuchsiahouse3.asm b/data/mapObjects/fuchsiahouse3.asm index aaf05bd6..9f731397 100755 --- a/data/mapObjects/fuchsiahouse3.asm +++ b/data/mapObjects/fuchsiahouse3.asm @@ -2,9 +2,9 @@ FuchsiaHouse3Object: db $c ; border block db $3 ; warps - db $0, $2, $8, $ff - db $7, $2, $7, $ff - db $7, $3, $7, $ff + warp $2, $0, $8, $ff + warp $2, $7, $7, $ff + warp $3, $7, $7, $ff db $0 ; signs @@ -12,6 +12,6 @@ FuchsiaHouse3Object: object SPRITE_FISHER, $5, $3, STAY, RIGHT, $1 ; person ; warp-to - EVENT_DISP FUCHSIA_HOUSE_3_WIDTH, $0, $2 - EVENT_DISP FUCHSIA_HOUSE_3_WIDTH, $7, $2 - EVENT_DISP FUCHSIA_HOUSE_3_WIDTH, $7, $3 + warp_to $2, $0, FUCHSIA_HOUSE_3_WIDTH + warp_to $2, $7, FUCHSIA_HOUSE_3_WIDTH + warp_to $3, $7, FUCHSIA_HOUSE_3_WIDTH diff --git a/data/mapObjects/fuchsiamart.asm b/data/mapObjects/fuchsiamart.asm index 431e7c2f..7b837824 100755 --- a/data/mapObjects/fuchsiamart.asm +++ b/data/mapObjects/fuchsiamart.asm @@ -2,8 +2,8 @@ FuchsiaMartObject: db $0 ; border block db $2 ; warps - db $7, $3, $0, $ff - db $7, $4, $0, $ff + warp $3, $7, $0, $ff + warp $4, $7, $0, $ff db $0 ; signs @@ -13,5 +13,5 @@ FuchsiaMartObject: object SPRITE_LASS, $6, $5, WALK, $1, $3 ; person ; warp-to - EVENT_DISP FUCHSIA_MART_WIDTH, $7, $3 - EVENT_DISP FUCHSIA_MART_WIDTH, $7, $4 + warp_to $3, $7, FUCHSIA_MART_WIDTH + warp_to $4, $7, FUCHSIA_MART_WIDTH diff --git a/data/mapObjects/fuchsiameetingroom.asm b/data/mapObjects/fuchsiameetingroom.asm index 8106b9ec..f8b8bb43 100755 --- a/data/mapObjects/fuchsiameetingroom.asm +++ b/data/mapObjects/fuchsiameetingroom.asm @@ -2,8 +2,8 @@ FuchsiaMeetingRoomObject: db $17 ; border block db $2 ; warps - db $7, $4, $6, $ff - db $7, $5, $6, $ff + warp $4, $7, $6, $ff + warp $5, $7, $6, $ff db $0 ; signs @@ -13,5 +13,5 @@ FuchsiaMeetingRoomObject: object SPRITE_WHITE_PLAYER, $a, $1, STAY, DOWN, $3 ; person ; warp-to - EVENT_DISP FUCHSIA_MEETING_ROOM_WIDTH, $7, $4 - EVENT_DISP FUCHSIA_MEETING_ROOM_WIDTH, $7, $5 + warp_to $4, $7, FUCHSIA_MEETING_ROOM_WIDTH + warp_to $5, $7, FUCHSIA_MEETING_ROOM_WIDTH diff --git a/data/mapObjects/fuchsiapokecenter.asm b/data/mapObjects/fuchsiapokecenter.asm index 8cf103fa..048319fd 100755 --- a/data/mapObjects/fuchsiapokecenter.asm +++ b/data/mapObjects/fuchsiapokecenter.asm @@ -2,8 +2,8 @@ FuchsiaPokecenterObject: db $0 ; border block db $2 ; warps - db $7, $3, $2, $ff - db $7, $4, $2, $ff + warp $3, $7, $2, $ff + warp $4, $7, $2, $ff db $0 ; signs @@ -14,5 +14,5 @@ FuchsiaPokecenterObject: object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP FUCHSIA_POKECENTER_WIDTH, $7, $3 - EVENT_DISP FUCHSIA_POKECENTER_WIDTH, $7, $4 + warp_to $3, $7, FUCHSIA_POKECENTER_WIDTH + warp_to $4, $7, FUCHSIA_POKECENTER_WIDTH diff --git a/data/mapObjects/gary.asm b/data/mapObjects/gary.asm index e0f37b91..f26ed787 100755 --- a/data/mapObjects/gary.asm +++ b/data/mapObjects/gary.asm @@ -2,10 +2,10 @@ GaryObject: db $3 ; border block db $4 ; warps - db $7, $3, $1, LANCES_ROOM - db $7, $4, $2, LANCES_ROOM - db $0, $3, $0, HALL_OF_FAME - db $0, $4, $0, HALL_OF_FAME + warp $3, $7, $1, LANCES_ROOM + warp $4, $7, $2, LANCES_ROOM + warp $3, $0, $0, HALL_OF_FAME + warp $4, $0, $0, HALL_OF_FAME db $0 ; signs @@ -14,7 +14,7 @@ GaryObject: object SPRITE_OAK, $3, $7, STAY, UP, $2 ; person ; warp-to - EVENT_DISP CHAMPIONS_ROOM_WIDTH, $7, $3 ; LANCES_ROOM - EVENT_DISP CHAMPIONS_ROOM_WIDTH, $7, $4 ; LANCES_ROOM - EVENT_DISP CHAMPIONS_ROOM_WIDTH, $0, $3 ; HALL_OF_FAME - EVENT_DISP CHAMPIONS_ROOM_WIDTH, $0, $4 ; HALL_OF_FAME + warp_to $3, $7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM + warp_to $4, $7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM + warp_to $3, $0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME + warp_to $4, $0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME diff --git a/data/mapObjects/halloffameroom.asm b/data/mapObjects/halloffameroom.asm index 8e245c2c..54e284ae 100755 --- a/data/mapObjects/halloffameroom.asm +++ b/data/mapObjects/halloffameroom.asm @@ -2,8 +2,8 @@ HallofFameRoomObject: db $3 ; border block db $2 ; warps - db $7, $4, $2, CHAMPIONS_ROOM - db $7, $5, $3, CHAMPIONS_ROOM + warp $4, $7, $2, CHAMPIONS_ROOM + warp $5, $7, $3, CHAMPIONS_ROOM db $0 ; signs @@ -11,5 +11,5 @@ HallofFameRoomObject: object SPRITE_OAK, $5, $2, STAY, DOWN, $1 ; person ; warp-to - EVENT_DISP HALL_OF_FAME_WIDTH, $7, $4 ; CHAMPIONS_ROOM - EVENT_DISP HALL_OF_FAME_WIDTH, $7, $5 ; CHAMPIONS_ROOM + warp_to $4, $7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM + warp_to $5, $7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM diff --git a/data/mapObjects/indigoplateau.asm b/data/mapObjects/indigoplateau.asm index 145f2f39..45ddc6d6 100755 --- a/data/mapObjects/indigoplateau.asm +++ b/data/mapObjects/indigoplateau.asm @@ -2,13 +2,13 @@ IndigoPlateauObject: db $e ; border block db $2 ; warps - db $5, $9, $0, INDIGO_PLATEAU_LOBBY - db $5, $a, $0, INDIGO_PLATEAU_LOBBY + warp $9, $5, $0, INDIGO_PLATEAU_LOBBY + warp $a, $5, $0, INDIGO_PLATEAU_LOBBY db $0 ; signs db $0 ; objects ; warp-to - EVENT_DISP INDIGO_PLATEAU_WIDTH, $5, $9 ; INDIGO_PLATEAU_LOBBY - EVENT_DISP INDIGO_PLATEAU_WIDTH, $5, $a ; INDIGO_PLATEAU_LOBBY + warp_to $9, $5, INDIGO_PLATEAU_WIDTH ; INDIGO_PLATEAU_LOBBY + warp_to $a, $5, INDIGO_PLATEAU_WIDTH ; INDIGO_PLATEAU_LOBBY diff --git a/data/mapObjects/indigoplateaulobby.asm b/data/mapObjects/indigoplateaulobby.asm index 13438153..94ddab50 100755 --- a/data/mapObjects/indigoplateaulobby.asm +++ b/data/mapObjects/indigoplateaulobby.asm @@ -2,9 +2,9 @@ IndigoPlateauLobbyObject: db $0 ; border block db $3 ; warps - db $b, $7, $0, $ff - db $b, $8, $1, $ff - db $0, $8, $0, LORELEIS_ROOM + warp $7, $b, $0, $ff + warp $8, $b, $1, $ff + warp $8, $0, $0, LORELEIS_ROOM db $0 ; signs @@ -16,6 +16,6 @@ IndigoPlateauLobbyObject: object SPRITE_CABLE_CLUB_WOMAN, $d, $6, STAY, DOWN, $5 ; person ; warp-to - EVENT_DISP INDIGO_PLATEAU_LOBBY_WIDTH, $b, $7 - EVENT_DISP INDIGO_PLATEAU_LOBBY_WIDTH, $b, $8 - EVENT_DISP INDIGO_PLATEAU_LOBBY_WIDTH, $0, $8 ; LORELEIS_ROOM + warp_to $7, $b, INDIGO_PLATEAU_LOBBY_WIDTH + warp_to $8, $b, INDIGO_PLATEAU_LOBBY_WIDTH + warp_to $8, $0, INDIGO_PLATEAU_LOBBY_WIDTH ; LORELEIS_ROOM diff --git a/data/mapObjects/lab1.asm b/data/mapObjects/lab1.asm index e0adaedc..d801b948 100755 --- a/data/mapObjects/lab1.asm +++ b/data/mapObjects/lab1.asm @@ -2,24 +2,24 @@ Lab1Object: db $17 ; border block db $5 ; warps - db $7, $2, $2, $ff - db $7, $3, $2, $ff - db $4, $8, $0, CINNABAR_LAB_2 - db $4, $c, $0, CINNABAR_LAB_3 - db $4, $10, $0, CINNABAR_LAB_4 + warp $2, $7, $2, $ff + warp $3, $7, $2, $ff + warp $8, $4, $0, CINNABAR_LAB_2 + warp $c, $4, $0, CINNABAR_LAB_3 + warp $10, $4, $0, CINNABAR_LAB_4 db $4 ; signs - db $2, $3, $2 ; Lab1Text2 - db $4, $9, $3 ; Lab1Text3 - db $4, $d, $4 ; Lab1Text4 - db $4, $11, $5 ; Lab1Text5 + sign $3, $2, $2 ; Lab1Text2 + sign $9, $4, $3 ; Lab1Text3 + sign $d, $4, $4 ; Lab1Text4 + sign $11, $4, $5 ; Lab1Text5 db $1 ; objects object SPRITE_FISHER, $1, $3, STAY, NONE, $1 ; person ; warp-to - EVENT_DISP CINNABAR_LAB_1_WIDTH, $7, $2 - EVENT_DISP CINNABAR_LAB_1_WIDTH, $7, $3 - EVENT_DISP CINNABAR_LAB_1_WIDTH, $4, $8 ; CINNABAR_LAB_2 - EVENT_DISP CINNABAR_LAB_1_WIDTH, $4, $c ; CINNABAR_LAB_3 - EVENT_DISP CINNABAR_LAB_1_WIDTH, $4, $10 ; CINNABAR_LAB_4 + warp_to $2, $7, CINNABAR_LAB_1_WIDTH + warp_to $3, $7, CINNABAR_LAB_1_WIDTH + warp_to $8, $4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_2 + warp_to $c, $4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_3 + warp_to $10, $4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_4 diff --git a/data/mapObjects/lab2.asm b/data/mapObjects/lab2.asm index ed541ada..77d1eef6 100755 --- a/data/mapObjects/lab2.asm +++ b/data/mapObjects/lab2.asm @@ -2,8 +2,8 @@ Lab2Object: db $17 ; border block db $2 ; warps - db $7, $2, $2, CINNABAR_LAB_1 - db $7, $3, $2, CINNABAR_LAB_1 + warp $2, $7, $2, CINNABAR_LAB_1 + warp $3, $7, $2, CINNABAR_LAB_1 db $0 ; signs @@ -13,5 +13,5 @@ Lab2Object: object SPRITE_FOULARD_WOMAN, $5, $5, STAY, UP, $3 ; person ; warp-to - EVENT_DISP CINNABAR_LAB_2_WIDTH, $7, $2 ; CINNABAR_LAB_1 - EVENT_DISP CINNABAR_LAB_2_WIDTH, $7, $3 ; CINNABAR_LAB_1 + warp_to $2, $7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1 + warp_to $3, $7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1 diff --git a/data/mapObjects/lab3.asm b/data/mapObjects/lab3.asm index c5ee01c3..ebea056c 100755 --- a/data/mapObjects/lab3.asm +++ b/data/mapObjects/lab3.asm @@ -2,18 +2,18 @@ Lab3Object: db $17 ; border block db $2 ; warps - db $7, $2, $3, CINNABAR_LAB_1 - db $7, $3, $3, CINNABAR_LAB_1 + warp $2, $7, $3, CINNABAR_LAB_1 + warp $3, $7, $3, CINNABAR_LAB_1 db $3 ; signs - db $4, $0, $3 ; Lab3Text3 - db $4, $1, $4 ; Lab3Text4 - db $1, $2, $5 ; Lab3Text5 + sign $0, $4, $3 ; Lab3Text3 + sign $1, $4, $4 ; Lab3Text4 + sign $2, $1, $5 ; Lab3Text5 db $2 ; objects object SPRITE_OAK_AIDE, $7, $2, STAY, DOWN, $1 ; person object SPRITE_OAK_AIDE, $2, $3, WALK, $2, $2 ; person ; warp-to - EVENT_DISP CINNABAR_LAB_3_WIDTH, $7, $2 ; CINNABAR_LAB_1 - EVENT_DISP CINNABAR_LAB_3_WIDTH, $7, $3 ; CINNABAR_LAB_1 + warp_to $2, $7, CINNABAR_LAB_3_WIDTH ; CINNABAR_LAB_1 + warp_to $3, $7, CINNABAR_LAB_3_WIDTH ; CINNABAR_LAB_1 diff --git a/data/mapObjects/lab4.asm b/data/mapObjects/lab4.asm index 361f9533..2939142a 100755 --- a/data/mapObjects/lab4.asm +++ b/data/mapObjects/lab4.asm @@ -2,8 +2,8 @@ Lab4Object: db $17 ; border block db $2 ; warps - db $7, $2, $4, CINNABAR_LAB_1 - db $7, $3, $4, CINNABAR_LAB_1 + warp $2, $7, $4, CINNABAR_LAB_1 + warp $3, $7, $4, CINNABAR_LAB_1 db $0 ; signs @@ -12,5 +12,5 @@ Lab4Object: object SPRITE_OAK_AIDE, $7, $6, STAY, UP, $2 ; person ; warp-to - EVENT_DISP CINNABAR_LAB_4_WIDTH, $7, $2 ; CINNABAR_LAB_1 - EVENT_DISP CINNABAR_LAB_4_WIDTH, $7, $3 ; CINNABAR_LAB_1 + warp_to $2, $7, CINNABAR_LAB_4_WIDTH ; CINNABAR_LAB_1 + warp_to $3, $7, CINNABAR_LAB_4_WIDTH ; CINNABAR_LAB_1 diff --git a/data/mapObjects/lance.asm b/data/mapObjects/lance.asm index e7bf0ad6..73ed8e63 100755 --- a/data/mapObjects/lance.asm +++ b/data/mapObjects/lance.asm @@ -2,9 +2,9 @@ LanceObject: db $3 ; border block db $3 ; warps - db $10, $18, $2, AGATHAS_ROOM - db $0, $5, $0, CHAMPIONS_ROOM - db $0, $6, $0, CHAMPIONS_ROOM + warp $18, $10, $2, AGATHAS_ROOM + warp $5, $0, $0, CHAMPIONS_ROOM + warp $6, $0, $0, CHAMPIONS_ROOM db $0 ; signs @@ -12,6 +12,6 @@ LanceObject: object SPRITE_LANCE, $6, $1, STAY, DOWN, $1, OPP_LANCE, $1 ; warp-to - EVENT_DISP LANCES_ROOM_WIDTH, $10, $18 ; AGATHAS_ROOM - EVENT_DISP LANCES_ROOM_WIDTH, $0, $5 ; CHAMPIONS_ROOM - EVENT_DISP LANCES_ROOM_WIDTH, $0, $6 ; CHAMPIONS_ROOM + warp_to $18, $10, LANCES_ROOM_WIDTH ; AGATHAS_ROOM + warp_to $5, $0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM + warp_to $6, $0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM diff --git a/data/mapObjects/lavenderhouse1.asm b/data/mapObjects/lavenderhouse1.asm index 54f57270..4353a192 100755 --- a/data/mapObjects/lavenderhouse1.asm +++ b/data/mapObjects/lavenderhouse1.asm @@ -2,8 +2,8 @@ LavenderHouse1Object: db $a ; border block db $2 ; warps - db $7, $2, $2, $ff - db $7, $3, $2, $ff + warp $2, $7, $2, $ff + warp $3, $7, $2, $ff db $0 ; signs @@ -16,5 +16,5 @@ LavenderHouse1Object: object SPRITE_BOOK_MAP_DEX, $3, $3, STAY, NONE, $6 ; person ; warp-to - EVENT_DISP LAVENDER_HOUSE_1_WIDTH, $7, $2 - EVENT_DISP LAVENDER_HOUSE_1_WIDTH, $7, $3 + warp_to $2, $7, LAVENDER_HOUSE_1_WIDTH + warp_to $3, $7, LAVENDER_HOUSE_1_WIDTH diff --git a/data/mapObjects/lavenderhouse2.asm b/data/mapObjects/lavenderhouse2.asm index 7638ff66..991f1adb 100755 --- a/data/mapObjects/lavenderhouse2.asm +++ b/data/mapObjects/lavenderhouse2.asm @@ -2,8 +2,8 @@ LavenderHouse2Object: db $a ; border block db $2 ; warps - db $7, $2, $4, $ff - db $7, $3, $4, $ff + warp $2, $7, $4, $ff + warp $3, $7, $4, $ff db $0 ; signs @@ -12,5 +12,5 @@ LavenderHouse2Object: object SPRITE_BRUNETTE_GIRL, $2, $4, STAY, RIGHT, $2 ; person ; warp-to - EVENT_DISP LAVENDER_HOUSE_2_WIDTH, $7, $2 - EVENT_DISP LAVENDER_HOUSE_2_WIDTH, $7, $3 + warp_to $2, $7, LAVENDER_HOUSE_2_WIDTH + warp_to $3, $7, LAVENDER_HOUSE_2_WIDTH diff --git a/data/mapObjects/lavendermart.asm b/data/mapObjects/lavendermart.asm index 2d8e7636..1b459d5c 100755 --- a/data/mapObjects/lavendermart.asm +++ b/data/mapObjects/lavendermart.asm @@ -2,8 +2,8 @@ LavenderMartObject: db $0 ; border block db $2 ; warps - db $7, $3, $3, $ff - db $7, $4, $3, $ff + warp $3, $7, $3, $ff + warp $4, $7, $3, $ff db $0 ; signs @@ -13,5 +13,5 @@ LavenderMartObject: object SPRITE_BLACK_HAIR_BOY_1, $7, $2, STAY, NONE, $3 ; person ; warp-to - EVENT_DISP LAVENDER_MART_WIDTH, $7, $3 - EVENT_DISP LAVENDER_MART_WIDTH, $7, $4 + warp_to $3, $7, LAVENDER_MART_WIDTH + warp_to $4, $7, LAVENDER_MART_WIDTH diff --git a/data/mapObjects/lavenderpokecenter.asm b/data/mapObjects/lavenderpokecenter.asm index 617e7fb8..c2d3ee46 100755 --- a/data/mapObjects/lavenderpokecenter.asm +++ b/data/mapObjects/lavenderpokecenter.asm @@ -2,8 +2,8 @@ LavenderPokecenterObject: db $0 ; border block db $2 ; warps - db $7, $3, $0, $ff - db $7, $4, $0, $ff + warp $3, $7, $0, $ff + warp $4, $7, $0, $ff db $0 ; signs @@ -14,5 +14,5 @@ LavenderPokecenterObject: object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP LAVENDER_POKECENTER_WIDTH, $7, $3 - EVENT_DISP LAVENDER_POKECENTER_WIDTH, $7, $4 + warp_to $3, $7, LAVENDER_POKECENTER_WIDTH + warp_to $4, $7, LAVENDER_POKECENTER_WIDTH diff --git a/data/mapObjects/lavendertown.asm b/data/mapObjects/lavendertown.asm index 49347aba..d2d37589 100755 --- a/data/mapObjects/lavendertown.asm +++ b/data/mapObjects/lavendertown.asm @@ -2,20 +2,20 @@ LavenderTownObject: db $2c ; border block db $6 ; warps - db $5, $3, $0, LAVENDER_POKECENTER - db $5, $e, $0, POKEMONTOWER_1 - db $9, $7, $0, LAVENDER_HOUSE_1 - db $d, $f, $0, LAVENDER_MART - db $d, $3, $0, LAVENDER_HOUSE_2 - db $d, $7, $0, NAME_RATERS_HOUSE + warp $3, $5, $0, LAVENDER_POKECENTER + warp $e, $5, $0, POKEMONTOWER_1 + warp $7, $9, $0, LAVENDER_HOUSE_1 + warp $f, $d, $0, LAVENDER_MART + warp $3, $d, $0, LAVENDER_HOUSE_2 + warp $7, $d, $0, NAME_RATERS_HOUSE db $6 ; signs - db $9, $b, $4 ; LavenderTownText4 - db $3, $9, $5 ; LavenderTownText5 - db $d, $10, $6 ; MartSignText - db $5, $4, $7 ; PokeCenterSignText - db $9, $5, $8 ; LavenderTownText8 - db $7, $11, $9 ; LavenderTownText9 + sign $b, $9, $4 ; LavenderTownText4 + sign $9, $3, $5 ; LavenderTownText5 + sign $10, $d, $6 ; MartSignText + sign $4, $5, $7 ; PokeCenterSignText + sign $5, $9, $8 ; LavenderTownText8 + sign $11, $7, $9 ; LavenderTownText9 db $3 ; objects object SPRITE_LITTLE_GIRL, $f, $9, WALK, $0, $1 ; person @@ -23,9 +23,9 @@ LavenderTownObject: object SPRITE_BLACK_HAIR_BOY_2, $8, $7, WALK, $2, $3 ; person ; warp-to - EVENT_DISP LAVENDER_TOWN_WIDTH, $5, $3 ; LAVENDER_POKECENTER - EVENT_DISP LAVENDER_TOWN_WIDTH, $5, $e ; POKEMONTOWER_1 - EVENT_DISP LAVENDER_TOWN_WIDTH, $9, $7 ; LAVENDER_HOUSE_1 - EVENT_DISP LAVENDER_TOWN_WIDTH, $d, $f ; LAVENDER_MART - EVENT_DISP LAVENDER_TOWN_WIDTH, $d, $3 ; LAVENDER_HOUSE_2 - EVENT_DISP LAVENDER_TOWN_WIDTH, $d, $7 ; NAME_RATERS_HOUSE + warp_to $3, $5, LAVENDER_TOWN_WIDTH ; LAVENDER_POKECENTER + warp_to $e, $5, LAVENDER_TOWN_WIDTH ; POKEMONTOWER_1 + warp_to $7, $9, LAVENDER_TOWN_WIDTH ; LAVENDER_HOUSE_1 + warp_to $f, $d, LAVENDER_TOWN_WIDTH ; LAVENDER_MART + warp_to $3, $d, LAVENDER_TOWN_WIDTH ; LAVENDER_HOUSE_2 + warp_to $7, $d, LAVENDER_TOWN_WIDTH ; NAME_RATERS_HOUSE diff --git a/data/mapObjects/lorelei.asm b/data/mapObjects/lorelei.asm index 5b985369..9791b859 100755 --- a/data/mapObjects/lorelei.asm +++ b/data/mapObjects/lorelei.asm @@ -2,10 +2,10 @@ LoreleiObject: db $3 ; border block db $4 ; warps - db $b, $4, $2, INDIGO_PLATEAU_LOBBY - db $b, $5, $2, INDIGO_PLATEAU_LOBBY - db $0, $4, $0, BRUNOS_ROOM - db $0, $5, $1, BRUNOS_ROOM + warp $4, $b, $2, INDIGO_PLATEAU_LOBBY + warp $5, $b, $2, INDIGO_PLATEAU_LOBBY + warp $4, $0, $0, BRUNOS_ROOM + warp $5, $0, $1, BRUNOS_ROOM db $0 ; signs @@ -13,7 +13,7 @@ LoreleiObject: object SPRITE_LORELEI, $5, $2, STAY, DOWN, $1, OPP_LORELEI, $1 ; warp-to - EVENT_DISP LORELEIS_ROOM_WIDTH, $b, $4 ; INDIGO_PLATEAU_LOBBY - EVENT_DISP LORELEIS_ROOM_WIDTH, $b, $5 ; INDIGO_PLATEAU_LOBBY - EVENT_DISP LORELEIS_ROOM_WIDTH, $0, $4 ; BRUNOS_ROOM - EVENT_DISP LORELEIS_ROOM_WIDTH, $0, $5 ; BRUNOS_ROOM + warp_to $4, $b, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY + warp_to $5, $b, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY + warp_to $4, $0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM + warp_to $5, $0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM diff --git a/data/mapObjects/mansion1.asm b/data/mapObjects/mansion1.asm index ed6529f2..ae2c88ca 100755 --- a/data/mapObjects/mansion1.asm +++ b/data/mapObjects/mansion1.asm @@ -2,14 +2,14 @@ Mansion1Object: db $2e ; border block db $8 ; warps - db $1b, $4, $0, $ff - db $1b, $5, $0, $ff - db $1b, $6, $0, $ff - db $1b, $7, $0, $ff - db $a, $5, $0, MANSION_2 - db $17, $15, $0, MANSION_4 - db $1b, $1a, $0, $ff - db $1b, $1b, $0, $ff + warp $4, $1b, $0, $ff + warp $5, $1b, $0, $ff + warp $6, $1b, $0, $ff + warp $7, $1b, $0, $ff + warp $5, $a, $0, MANSION_2 + warp $15, $17, $0, MANSION_4 + warp $1a, $1b, $0, $ff + warp $1b, $1b, $0, $ff db $0 ; signs @@ -19,11 +19,11 @@ Mansion1Object: object SPRITE_BALL, $12, $15, STAY, NONE, $3, CARBOS ; warp-to - EVENT_DISP MANSION_1_WIDTH, $1b, $4 - EVENT_DISP MANSION_1_WIDTH, $1b, $5 - EVENT_DISP MANSION_1_WIDTH, $1b, $6 - EVENT_DISP MANSION_1_WIDTH, $1b, $7 - EVENT_DISP MANSION_1_WIDTH, $a, $5 ; MANSION_2 - EVENT_DISP MANSION_1_WIDTH, $17, $15 ; MANSION_4 - EVENT_DISP MANSION_1_WIDTH, $1b, $1a - EVENT_DISP MANSION_1_WIDTH, $1b, $1b + warp_to $4, $1b, MANSION_1_WIDTH + warp_to $5, $1b, MANSION_1_WIDTH + warp_to $6, $1b, MANSION_1_WIDTH + warp_to $7, $1b, MANSION_1_WIDTH + warp_to $5, $a, MANSION_1_WIDTH ; MANSION_2 + warp_to $15, $17, MANSION_1_WIDTH ; MANSION_4 + warp_to $1a, $1b, MANSION_1_WIDTH + warp_to $1b, $1b, MANSION_1_WIDTH diff --git a/data/mapObjects/mansion2.asm b/data/mapObjects/mansion2.asm index bda2ad27..cbb546c1 100755 --- a/data/mapObjects/mansion2.asm +++ b/data/mapObjects/mansion2.asm @@ -2,10 +2,10 @@ Mansion2Object: db $1 ; border block db $4 ; warps - db $a, $5, $4, MANSION_1 - db $a, $7, $0, MANSION_3 - db $e, $19, $2, MANSION_3 - db $1, $6, $1, MANSION_3 + warp $5, $a, $4, MANSION_1 + warp $7, $a, $0, MANSION_3 + warp $19, $e, $2, MANSION_3 + warp $6, $1, $1, MANSION_3 db $0 ; signs @@ -16,7 +16,7 @@ Mansion2Object: object SPRITE_BOOK_MAP_DEX, $3, $16, STAY, NONE, $4 ; person ; warp-to - EVENT_DISP MANSION_2_WIDTH, $a, $5 ; MANSION_1 - EVENT_DISP MANSION_2_WIDTH, $a, $7 ; MANSION_3 - EVENT_DISP MANSION_2_WIDTH, $e, $19 ; MANSION_3 - EVENT_DISP MANSION_2_WIDTH, $1, $6 ; MANSION_3 + warp_to $5, $a, MANSION_2_WIDTH ; MANSION_1 + warp_to $7, $a, MANSION_2_WIDTH ; MANSION_3 + warp_to $19, $e, MANSION_2_WIDTH ; MANSION_3 + warp_to $6, $1, MANSION_2_WIDTH ; MANSION_3 diff --git a/data/mapObjects/mansion3.asm b/data/mapObjects/mansion3.asm index 72431402..b2b2230c 100755 --- a/data/mapObjects/mansion3.asm +++ b/data/mapObjects/mansion3.asm @@ -2,9 +2,9 @@ Mansion3Object: db $1 ; border block db $3 ; warps - db $a, $7, $1, MANSION_2 - db $1, $6, $3, MANSION_2 - db $e, $19, $2, MANSION_2 + warp $7, $a, $1, MANSION_2 + warp $6, $1, $3, MANSION_2 + warp $19, $e, $2, MANSION_2 db $0 ; signs @@ -16,6 +16,6 @@ Mansion3Object: object SPRITE_BOOK_MAP_DEX, $6, $c, STAY, NONE, $5 ; person ; warp-to - EVENT_DISP MANSION_3_WIDTH, $a, $7 ; MANSION_2 - EVENT_DISP MANSION_3_WIDTH, $1, $6 ; MANSION_2 - EVENT_DISP MANSION_3_WIDTH, $e, $19 ; MANSION_2 + warp_to $7, $a, MANSION_3_WIDTH ; MANSION_2 + warp_to $6, $1, MANSION_3_WIDTH ; MANSION_2 + warp_to $19, $e, MANSION_3_WIDTH ; MANSION_2 diff --git a/data/mapObjects/mansion4.asm b/data/mapObjects/mansion4.asm index 94a6f612..9a333258 100755 --- a/data/mapObjects/mansion4.asm +++ b/data/mapObjects/mansion4.asm @@ -2,7 +2,7 @@ Mansion4Object: db $1 ; border block db $1 ; warps - db $16, $17, $5, MANSION_1 + warp $17, $16, $5, MANSION_1 db $0 ; signs @@ -17,4 +17,4 @@ Mansion4Object: object SPRITE_BALL, $5, $d, STAY, NONE, $8, SECRET_KEY ; warp-to - EVENT_DISP MANSION_4_WIDTH, $16, $17 ; MANSION_1 + warp_to $17, $16, MANSION_4_WIDTH ; MANSION_1 diff --git a/data/mapObjects/mtmoon1.asm b/data/mapObjects/mtmoon1.asm index 42c45016..87697a2e 100755 --- a/data/mapObjects/mtmoon1.asm +++ b/data/mapObjects/mtmoon1.asm @@ -2,14 +2,14 @@ MtMoon1Object: db $3 ; border block db $5 ; warps - db $23, $e, $1, $ff - db $23, $f, $1, $ff - db $5, $5, $0, MT_MOON_2 - db $b, $11, $2, MT_MOON_2 - db $f, $19, $3, MT_MOON_2 + warp $e, $23, $1, $ff + warp $f, $23, $1, $ff + warp $5, $5, $0, MT_MOON_2 + warp $11, $b, $2, MT_MOON_2 + warp $19, $f, $3, MT_MOON_2 db $1 ; signs - db $17, $f, $e ; MtMoon1Text14 + sign $f, $17, $e ; MtMoon1Text14 db $d ; objects object SPRITE_HIKER, $5, $6, STAY, DOWN, $1, OPP_HIKER, $1 @@ -27,8 +27,8 @@ MtMoon1Object: object SPRITE_BALL, $5, $20, STAY, NONE, $d, TM_12 ; warp-to - EVENT_DISP MT_MOON_1_WIDTH, $23, $e - EVENT_DISP MT_MOON_1_WIDTH, $23, $f - EVENT_DISP MT_MOON_1_WIDTH, $5, $5 ; MT_MOON_2 - EVENT_DISP MT_MOON_1_WIDTH, $b, $11 ; MT_MOON_2 - EVENT_DISP MT_MOON_1_WIDTH, $f, $19 ; MT_MOON_2 + warp_to $e, $23, MT_MOON_1_WIDTH + warp_to $f, $23, MT_MOON_1_WIDTH + warp_to $5, $5, MT_MOON_1_WIDTH ; MT_MOON_2 + warp_to $11, $b, MT_MOON_1_WIDTH ; MT_MOON_2 + warp_to $19, $f, MT_MOON_1_WIDTH ; MT_MOON_2 diff --git a/data/mapObjects/mtmoon2.asm b/data/mapObjects/mtmoon2.asm index f39cd4a5..5346d838 100755 --- a/data/mapObjects/mtmoon2.asm +++ b/data/mapObjects/mtmoon2.asm @@ -2,25 +2,25 @@ MtMoon2Object: db $3 ; border block db $8 ; warps - db $5, $5, $2, MT_MOON_1 - db $b, $11, $0, MT_MOON_3 - db $9, $19, $3, MT_MOON_1 - db $f, $19, $4, MT_MOON_1 - db $11, $15, $1, MT_MOON_3 - db $1b, $d, $2, MT_MOON_3 - db $3, $17, $3, MT_MOON_3 - db $3, $1b, $2, $ff + warp $5, $5, $2, MT_MOON_1 + warp $11, $b, $0, MT_MOON_3 + warp $19, $9, $3, MT_MOON_1 + warp $19, $f, $4, MT_MOON_1 + warp $15, $11, $1, MT_MOON_3 + warp $d, $1b, $2, MT_MOON_3 + warp $17, $3, $3, MT_MOON_3 + warp $1b, $3, $2, $ff db $0 ; signs db $0 ; objects ; warp-to - EVENT_DISP MT_MOON_2_WIDTH, $5, $5 ; MT_MOON_1 - EVENT_DISP MT_MOON_2_WIDTH, $b, $11 ; MT_MOON_3 - EVENT_DISP MT_MOON_2_WIDTH, $9, $19 ; MT_MOON_1 - EVENT_DISP MT_MOON_2_WIDTH, $f, $19 ; MT_MOON_1 - EVENT_DISP MT_MOON_2_WIDTH, $11, $15 ; MT_MOON_3 - EVENT_DISP MT_MOON_2_WIDTH, $1b, $d ; MT_MOON_3 - EVENT_DISP MT_MOON_2_WIDTH, $3, $17 ; MT_MOON_3 - EVENT_DISP MT_MOON_2_WIDTH, $3, $1b + warp_to $5, $5, MT_MOON_2_WIDTH ; MT_MOON_1 + warp_to $11, $b, MT_MOON_2_WIDTH ; MT_MOON_3 + warp_to $19, $9, MT_MOON_2_WIDTH ; MT_MOON_1 + warp_to $19, $f, MT_MOON_2_WIDTH ; MT_MOON_1 + warp_to $15, $11, MT_MOON_2_WIDTH ; MT_MOON_3 + warp_to $d, $1b, MT_MOON_2_WIDTH ; MT_MOON_3 + warp_to $17, $3, MT_MOON_2_WIDTH ; MT_MOON_3 + warp_to $1b, $3, MT_MOON_2_WIDTH diff --git a/data/mapObjects/mtmoon3.asm b/data/mapObjects/mtmoon3.asm index 7fe29180..f9472e74 100755 --- a/data/mapObjects/mtmoon3.asm +++ b/data/mapObjects/mtmoon3.asm @@ -2,10 +2,10 @@ MtMoon3Object: db $3 ; border block db $4 ; warps - db $9, $19, $1, MT_MOON_2 - db $11, $15, $4, MT_MOON_2 - db $1b, $f, $5, MT_MOON_2 - db $7, $5, $6, MT_MOON_2 + warp $19, $9, $1, MT_MOON_2 + warp $15, $11, $4, MT_MOON_2 + warp $f, $1b, $5, MT_MOON_2 + warp $5, $7, $6, MT_MOON_2 db $0 ; signs @@ -21,7 +21,7 @@ MtMoon3Object: object SPRITE_BALL, $1d, $5, STAY, NONE, $9, TM_01 ; warp-to - EVENT_DISP MT_MOON_3_WIDTH, $9, $19 ; MT_MOON_2 - EVENT_DISP MT_MOON_3_WIDTH, $11, $15 ; MT_MOON_2 - EVENT_DISP MT_MOON_3_WIDTH, $1b, $f ; MT_MOON_2 - EVENT_DISP MT_MOON_3_WIDTH, $7, $5 ; MT_MOON_2 + warp_to $19, $9, MT_MOON_3_WIDTH ; MT_MOON_2 + warp_to $15, $11, MT_MOON_3_WIDTH ; MT_MOON_2 + warp_to $f, $1b, MT_MOON_3_WIDTH ; MT_MOON_2 + warp_to $5, $7, MT_MOON_3_WIDTH ; MT_MOON_2 diff --git a/data/mapObjects/mtmoonpokecenter.asm b/data/mapObjects/mtmoonpokecenter.asm index 1e168895..27a4fbc3 100755 --- a/data/mapObjects/mtmoonpokecenter.asm +++ b/data/mapObjects/mtmoonpokecenter.asm @@ -2,8 +2,8 @@ MtMoonPokecenterObject: db $0 ; border block db $2 ; warps - db $7, $3, $0, $ff - db $7, $4, $0, $ff + warp $3, $7, $0, $ff + warp $4, $7, $0, $ff db $0 ; signs @@ -16,5 +16,5 @@ MtMoonPokecenterObject: object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $6 ; person ; warp-to - EVENT_DISP MT_MOON_POKECENTER_WIDTH, $7, $3 - EVENT_DISP MT_MOON_POKECENTER_WIDTH, $7, $4 + warp_to $3, $7, MT_MOON_POKECENTER_WIDTH + warp_to $4, $7, MT_MOON_POKECENTER_WIDTH diff --git a/data/mapObjects/museum1f.asm b/data/mapObjects/museum1f.asm index 56932af8..d05ff623 100755 --- a/data/mapObjects/museum1f.asm +++ b/data/mapObjects/museum1f.asm @@ -2,11 +2,11 @@ Museum1FObject: db $a ; border block db $5 ; warps - db $7, $a, $0, $ff - db $7, $b, $0, $ff - db $7, $10, $1, $ff - db $7, $11, $1, $ff - db $7, $7, $0, MUSEUM_2F + warp $a, $7, $0, $ff + warp $b, $7, $0, $ff + warp $10, $7, $1, $ff + warp $11, $7, $1, $ff + warp $7, $7, $0, MUSEUM_2F db $0 ; signs @@ -18,8 +18,8 @@ Museum1FObject: object SPRITE_OLD_AMBER, $10, $2, STAY, NONE, $5 ; person ; warp-to - EVENT_DISP MUSEUM_1F_WIDTH, $7, $a - EVENT_DISP MUSEUM_1F_WIDTH, $7, $b - EVENT_DISP MUSEUM_1F_WIDTH, $7, $10 - EVENT_DISP MUSEUM_1F_WIDTH, $7, $11 - EVENT_DISP MUSEUM_1F_WIDTH, $7, $7 ; MUSEUM_2F + warp_to $a, $7, MUSEUM_1F_WIDTH + warp_to $b, $7, MUSEUM_1F_WIDTH + warp_to $10, $7, MUSEUM_1F_WIDTH + warp_to $11, $7, MUSEUM_1F_WIDTH + warp_to $7, $7, MUSEUM_1F_WIDTH ; MUSEUM_2F diff --git a/data/mapObjects/museum2f.asm b/data/mapObjects/museum2f.asm index 689391d9..e93a6837 100755 --- a/data/mapObjects/museum2f.asm +++ b/data/mapObjects/museum2f.asm @@ -2,11 +2,11 @@ Museum2FObject: db $a ; border block db $1 ; warps - db $7, $7, $4, MUSEUM_1F + warp $7, $7, $4, MUSEUM_1F db $2 ; signs - db $2, $b, $6 ; Museum2FText6 - db $5, $2, $7 ; Museum2FText7 + sign $b, $2, $6 ; Museum2FText6 + sign $2, $5, $7 ; Museum2FText7 db $5 ; objects object SPRITE_BUG_CATCHER, $1, $7, WALK, $2, $1 ; person @@ -16,4 +16,4 @@ Museum2FObject: object SPRITE_HIKER, $c, $5, STAY, DOWN, $5 ; person ; warp-to - EVENT_DISP MUSEUM_2F_WIDTH, $7, $7 ; MUSEUM_1F + warp_to $7, $7, MUSEUM_2F_WIDTH ; MUSEUM_1F diff --git a/data/mapObjects/namerater.asm b/data/mapObjects/namerater.asm index 0118b2f7..9f0280f7 100755 --- a/data/mapObjects/namerater.asm +++ b/data/mapObjects/namerater.asm @@ -2,8 +2,8 @@ NameRaterObject: db $a ; border block db $2 ; warps - db $7, $2, $5, $ff - db $7, $3, $5, $ff + warp $2, $7, $5, $ff + warp $3, $7, $5, $ff db $0 ; signs @@ -11,5 +11,5 @@ NameRaterObject: object SPRITE_MR_MASTERBALL, $5, $3, STAY, LEFT, $1 ; person ; warp-to - EVENT_DISP NAME_RATERS_HOUSE_WIDTH, $7, $2 - EVENT_DISP NAME_RATERS_HOUSE_WIDTH, $7, $3 + warp_to $2, $7, NAME_RATERS_HOUSE_WIDTH + warp_to $3, $7, NAME_RATERS_HOUSE_WIDTH diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/oakslab.asm index 3834c49a..c23c5afe 100755 --- a/data/mapObjects/oakslab.asm +++ b/data/mapObjects/oakslab.asm @@ -2,8 +2,8 @@ OaksLabObject: db $3 ; border block db $2 ; warps - db $b, $4, $2, $ff - db $b, $5, $2, $ff + warp $4, $b, $2, $ff + warp $5, $b, $2, $ff db $0 ; signs @@ -21,5 +21,5 @@ OaksLabObject: object SPRITE_OAK_AIDE, $8, $a, STAY, NONE, $b ; person ; warp-to - EVENT_DISP OAKS_LAB_WIDTH, $b, $4 - EVENT_DISP OAKS_LAB_WIDTH, $b, $5 + warp_to $4, $b, OAKS_LAB_WIDTH + warp_to $5, $b, OAKS_LAB_WIDTH diff --git a/data/mapObjects/pallettown.asm b/data/mapObjects/pallettown.asm index d02cbae2..c6158b68 100755 --- a/data/mapObjects/pallettown.asm +++ b/data/mapObjects/pallettown.asm @@ -2,15 +2,15 @@ PalletTownObject: db $b ; border block db $3 ; warps - db $5, $5, $0, REDS_HOUSE_1F - db $5, $d, $0, BLUES_HOUSE - db $b, $c, $1, OAKS_LAB + warp $5, $5, $0, REDS_HOUSE_1F + warp $d, $5, $0, BLUES_HOUSE + warp $c, $b, $1, OAKS_LAB db $4 ; signs - db $d, $d, $4 ; PalletTownText4 - db $9, $7, $5 ; PalletTownText5 - db $5, $3, $6 ; PalletTownText6 - db $5, $b, $7 ; PalletTownText7 + sign $d, $d, $4 ; PalletTownText4 + sign $7, $9, $5 ; PalletTownText5 + sign $3, $5, $6 ; PalletTownText6 + sign $b, $5, $7 ; PalletTownText7 db $3 ; objects object SPRITE_OAK, $8, $5, STAY, NONE, $1 ; person @@ -18,6 +18,6 @@ PalletTownObject: object SPRITE_FISHER2, $b, $e, WALK, $0, $3 ; person ; warp-to - EVENT_DISP PALLET_TOWN_WIDTH, $5, $5 ; REDS_HOUSE_1F - EVENT_DISP PALLET_TOWN_WIDTH, $5, $d ; BLUES_HOUSE - EVENT_DISP PALLET_TOWN_WIDTH, $b, $c ; OAKS_LAB + warp_to $5, $5, PALLET_TOWN_WIDTH ; REDS_HOUSE_1F + warp_to $d, $5, PALLET_TOWN_WIDTH ; BLUES_HOUSE + warp_to $c, $b, PALLET_TOWN_WIDTH ; OAKS_LAB diff --git a/data/mapObjects/pewtercity.asm b/data/mapObjects/pewtercity.asm index 7b389bd2..08985e08 100755 --- a/data/mapObjects/pewtercity.asm +++ b/data/mapObjects/pewtercity.asm @@ -2,22 +2,22 @@ PewterCityObject: db $a ; border block db $7 ; warps - db $7, $e, $0, MUSEUM_1F - db $5, $13, $2, MUSEUM_1F - db $11, $10, $0, PEWTER_GYM - db $d, $1d, $0, PEWTER_HOUSE_1 - db $11, $17, $0, PEWTER_MART - db $1d, $7, $0, PEWTER_HOUSE_2 - db $19, $d, $0, PEWTER_POKECENTER + warp $e, $7, $0, MUSEUM_1F + warp $13, $5, $2, MUSEUM_1F + warp $10, $11, $0, PEWTER_GYM + warp $1d, $d, $0, PEWTER_HOUSE_1 + warp $17, $11, $0, PEWTER_MART + warp $7, $1d, $0, PEWTER_HOUSE_2 + warp $d, $19, $0, PEWTER_POKECENTER db $7 ; signs - db $1d, $13, $6 ; PewterCityText6 - db $13, $21, $7 ; PewterCityText7 - db $11, $18, $8 ; MartSignText - db $19, $e, $9 ; PokeCenterSignText - db $9, $f, $a ; PewterCityText10 - db $11, $b, $b ; PewterCityText11 - db $17, $19, $c ; PewterCityText12 + sign $13, $1d, $6 ; PewterCityText6 + sign $21, $13, $7 ; PewterCityText7 + sign $18, $11, $8 ; MartSignText + sign $e, $19, $9 ; PokeCenterSignText + sign $f, $9, $a ; PewterCityText10 + sign $b, $11, $b ; PewterCityText11 + sign $19, $17, $c ; PewterCityText12 db $5 ; objects object SPRITE_LASS, $8, $f, STAY, NONE, $1 ; person @@ -27,10 +27,10 @@ PewterCityObject: object SPRITE_BUG_CATCHER, $23, $10, STAY, DOWN, $5 ; person ; warp-to - EVENT_DISP PEWTER_CITY_WIDTH, $7, $e ; MUSEUM_1F - EVENT_DISP PEWTER_CITY_WIDTH, $5, $13 ; MUSEUM_1F - EVENT_DISP PEWTER_CITY_WIDTH, $11, $10 ; PEWTER_GYM - EVENT_DISP PEWTER_CITY_WIDTH, $d, $1d ; PEWTER_HOUSE_1 - EVENT_DISP PEWTER_CITY_WIDTH, $11, $17 ; PEWTER_MART - EVENT_DISP PEWTER_CITY_WIDTH, $1d, $7 ; PEWTER_HOUSE_2 - EVENT_DISP PEWTER_CITY_WIDTH, $19, $d ; PEWTER_POKECENTER + warp_to $e, $7, PEWTER_CITY_WIDTH ; MUSEUM_1F + warp_to $13, $5, PEWTER_CITY_WIDTH ; MUSEUM_1F + warp_to $10, $11, PEWTER_CITY_WIDTH ; PEWTER_GYM + warp_to $1d, $d, PEWTER_CITY_WIDTH ; PEWTER_HOUSE_1 + warp_to $17, $11, PEWTER_CITY_WIDTH ; PEWTER_MART + warp_to $7, $1d, PEWTER_CITY_WIDTH ; PEWTER_HOUSE_2 + warp_to $d, $19, PEWTER_CITY_WIDTH ; PEWTER_POKECENTER diff --git a/data/mapObjects/pewtergym.asm b/data/mapObjects/pewtergym.asm index 280f1a7e..b4098813 100755 --- a/data/mapObjects/pewtergym.asm +++ b/data/mapObjects/pewtergym.asm @@ -2,8 +2,8 @@ PewterGymObject: db $3 ; border block db $2 ; warps - db $d, $4, $2, $ff - db $d, $5, $2, $ff + warp $4, $d, $2, $ff + warp $5, $d, $2, $ff db $0 ; signs @@ -13,5 +13,5 @@ PewterGymObject: object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $3 ; person ; warp-to - EVENT_DISP PEWTER_GYM_WIDTH, $d, $4 - EVENT_DISP PEWTER_GYM_WIDTH, $d, $5 + warp_to $4, $d, PEWTER_GYM_WIDTH + warp_to $5, $d, PEWTER_GYM_WIDTH diff --git a/data/mapObjects/pewterhouse1.asm b/data/mapObjects/pewterhouse1.asm index d973e53b..4f1c2e8b 100755 --- a/data/mapObjects/pewterhouse1.asm +++ b/data/mapObjects/pewterhouse1.asm @@ -2,8 +2,8 @@ PewterHouse1Object: db $a ; border block db $2 ; warps - db $7, $2, $3, $ff - db $7, $3, $3, $ff + warp $2, $7, $3, $ff + warp $3, $7, $3, $ff db $0 ; signs @@ -13,5 +13,5 @@ PewterHouse1Object: object SPRITE_FAT_BALD_GUY, $1, $2, STAY, NONE, $3 ; person ; warp-to - EVENT_DISP PEWTER_HOUSE_1_WIDTH, $7, $2 - EVENT_DISP PEWTER_HOUSE_1_WIDTH, $7, $3 + warp_to $2, $7, PEWTER_HOUSE_1_WIDTH + warp_to $3, $7, PEWTER_HOUSE_1_WIDTH diff --git a/data/mapObjects/pewterhouse2.asm b/data/mapObjects/pewterhouse2.asm index 6c111acb..f74601ed 100755 --- a/data/mapObjects/pewterhouse2.asm +++ b/data/mapObjects/pewterhouse2.asm @@ -2,8 +2,8 @@ PewterHouse2Object: db $a ; border block db $2 ; warps - db $7, $2, $5, $ff - db $7, $3, $5, $ff + warp $2, $7, $5, $ff + warp $3, $7, $5, $ff db $0 ; signs @@ -12,5 +12,5 @@ PewterHouse2Object: object SPRITE_BUG_CATCHER, $4, $5, STAY, NONE, $2 ; person ; warp-to - EVENT_DISP PEWTER_HOUSE_2_WIDTH, $7, $2 - EVENT_DISP PEWTER_HOUSE_2_WIDTH, $7, $3 + warp_to $2, $7, PEWTER_HOUSE_2_WIDTH + warp_to $3, $7, PEWTER_HOUSE_2_WIDTH diff --git a/data/mapObjects/pewtermart.asm b/data/mapObjects/pewtermart.asm index 50ccd288..8272c7d2 100755 --- a/data/mapObjects/pewtermart.asm +++ b/data/mapObjects/pewtermart.asm @@ -2,8 +2,8 @@ PewterMartObject: db $0 ; border block db $2 ; warps - db $7, $3, $4, $ff - db $7, $4, $4, $ff + warp $3, $7, $4, $ff + warp $4, $7, $4, $ff db $0 ; signs @@ -13,5 +13,5 @@ PewterMartObject: object SPRITE_BLACK_HAIR_BOY_2, $5, $5, STAY, NONE, $3 ; person ; warp-to - EVENT_DISP PEWTER_MART_WIDTH, $7, $3 - EVENT_DISP PEWTER_MART_WIDTH, $7, $4 + warp_to $3, $7, PEWTER_MART_WIDTH + warp_to $4, $7, PEWTER_MART_WIDTH diff --git a/data/mapObjects/pewterpokecenter.asm b/data/mapObjects/pewterpokecenter.asm index 44e10ed6..1b6b9969 100755 --- a/data/mapObjects/pewterpokecenter.asm +++ b/data/mapObjects/pewterpokecenter.asm @@ -2,8 +2,8 @@ PewterPokecenterObject: db $0 ; border block db $2 ; warps - db $7, $3, $6, $ff - db $7, $4, $6, $ff + warp $3, $7, $6, $ff + warp $4, $7, $6, $ff db $0 ; signs @@ -14,5 +14,5 @@ PewterPokecenterObject: object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP PEWTER_POKECENTER_WIDTH, $7, $3 - EVENT_DISP PEWTER_POKECENTER_WIDTH, $7, $4 + warp_to $3, $7, PEWTER_POKECENTER_WIDTH + warp_to $4, $7, PEWTER_POKECENTER_WIDTH diff --git a/data/mapObjects/pokemontower1.asm b/data/mapObjects/pokemontower1.asm index 54af9efc..fdddcd9c 100755 --- a/data/mapObjects/pokemontower1.asm +++ b/data/mapObjects/pokemontower1.asm @@ -2,9 +2,9 @@ PokemonTower1Object: db $1 ; border block db $3 ; warps - db $11, $a, $1, $ff - db $11, $b, $1, $ff - db $9, $12, $1, POKEMONTOWER_2 + warp $a, $11, $1, $ff + warp $b, $11, $1, $ff + warp $12, $9, $1, POKEMONTOWER_2 db $0 ; signs @@ -16,6 +16,6 @@ PokemonTower1Object: object SPRITE_MEDIUM, $11, $7, STAY, LEFT, $5 ; person ; warp-to - EVENT_DISP POKEMONTOWER_1_WIDTH, $11, $a - EVENT_DISP POKEMONTOWER_1_WIDTH, $11, $b - EVENT_DISP POKEMONTOWER_1_WIDTH, $9, $12 ; POKEMONTOWER_2 + warp_to $a, $11, POKEMONTOWER_1_WIDTH + warp_to $b, $11, POKEMONTOWER_1_WIDTH + warp_to $12, $9, POKEMONTOWER_1_WIDTH ; POKEMONTOWER_2 diff --git a/data/mapObjects/pokemontower2.asm b/data/mapObjects/pokemontower2.asm index 33bc048d..2d96f12c 100755 --- a/data/mapObjects/pokemontower2.asm +++ b/data/mapObjects/pokemontower2.asm @@ -2,8 +2,8 @@ PokemonTower2Object: db $1 ; border block db $2 ; warps - db $9, $3, $0, POKEMONTOWER_3 - db $9, $12, $2, POKEMONTOWER_1 + warp $3, $9, $0, POKEMONTOWER_3 + warp $12, $9, $2, POKEMONTOWER_1 db $0 ; signs @@ -12,5 +12,5 @@ PokemonTower2Object: object SPRITE_MEDIUM, $3, $7, STAY, RIGHT, $2 ; person ; warp-to - EVENT_DISP POKEMONTOWER_2_WIDTH, $9, $3 ; POKEMONTOWER_3 - EVENT_DISP POKEMONTOWER_2_WIDTH, $9, $12 ; POKEMONTOWER_1 + warp_to $3, $9, POKEMONTOWER_2_WIDTH ; POKEMONTOWER_3 + warp_to $12, $9, POKEMONTOWER_2_WIDTH ; POKEMONTOWER_1 diff --git a/data/mapObjects/pokemontower3.asm b/data/mapObjects/pokemontower3.asm index 9899276a..804d6008 100755 --- a/data/mapObjects/pokemontower3.asm +++ b/data/mapObjects/pokemontower3.asm @@ -2,8 +2,8 @@ PokemonTower3Object: db $1 ; border block db $2 ; warps - db $9, $3, $0, POKEMONTOWER_2 - db $9, $12, $1, POKEMONTOWER_4 + warp $3, $9, $0, POKEMONTOWER_2 + warp $12, $9, $1, POKEMONTOWER_4 db $0 ; signs @@ -14,5 +14,5 @@ PokemonTower3Object: object SPRITE_BALL, $c, $1, STAY, NONE, $4, ESCAPE_ROPE ; warp-to - EVENT_DISP POKEMONTOWER_3_WIDTH, $9, $3 ; POKEMONTOWER_2 - EVENT_DISP POKEMONTOWER_3_WIDTH, $9, $12 ; POKEMONTOWER_4 + warp_to $3, $9, POKEMONTOWER_3_WIDTH ; POKEMONTOWER_2 + warp_to $12, $9, POKEMONTOWER_3_WIDTH ; POKEMONTOWER_4 diff --git a/data/mapObjects/pokemontower4.asm b/data/mapObjects/pokemontower4.asm index 19f4f4e3..5bd521e5 100755 --- a/data/mapObjects/pokemontower4.asm +++ b/data/mapObjects/pokemontower4.asm @@ -2,8 +2,8 @@ PokemonTower4Object: db $1 ; border block db $2 ; warps - db $9, $3, $0, POKEMONTOWER_5 - db $9, $12, $1, POKEMONTOWER_3 + warp $3, $9, $0, POKEMONTOWER_5 + warp $12, $9, $1, POKEMONTOWER_3 db $0 ; signs @@ -16,5 +16,5 @@ PokemonTower4Object: object SPRITE_BALL, $c, $10, STAY, NONE, $6, HP_UP ; warp-to - EVENT_DISP POKEMONTOWER_4_WIDTH, $9, $3 ; POKEMONTOWER_5 - EVENT_DISP POKEMONTOWER_4_WIDTH, $9, $12 ; POKEMONTOWER_3 + warp_to $3, $9, POKEMONTOWER_4_WIDTH ; POKEMONTOWER_5 + warp_to $12, $9, POKEMONTOWER_4_WIDTH ; POKEMONTOWER_3 diff --git a/data/mapObjects/pokemontower5.asm b/data/mapObjects/pokemontower5.asm index 5a73825c..72401577 100755 --- a/data/mapObjects/pokemontower5.asm +++ b/data/mapObjects/pokemontower5.asm @@ -2,8 +2,8 @@ PokemonTower5Object: db $1 ; border block db $2 ; warps - db $9, $3, $0, POKEMONTOWER_4 - db $9, $12, $0, POKEMONTOWER_6 + warp $3, $9, $0, POKEMONTOWER_4 + warp $12, $9, $0, POKEMONTOWER_6 db $0 ; signs @@ -16,5 +16,5 @@ PokemonTower5Object: object SPRITE_BALL, $6, $e, STAY, NONE, $6, NUGGET ; warp-to - EVENT_DISP POKEMONTOWER_5_WIDTH, $9, $3 ; POKEMONTOWER_4 - EVENT_DISP POKEMONTOWER_5_WIDTH, $9, $12 ; POKEMONTOWER_6 + warp_to $3, $9, POKEMONTOWER_5_WIDTH ; POKEMONTOWER_4 + warp_to $12, $9, POKEMONTOWER_5_WIDTH ; POKEMONTOWER_6 diff --git a/data/mapObjects/pokemontower6.asm b/data/mapObjects/pokemontower6.asm index d0035faa..62513fb4 100755 --- a/data/mapObjects/pokemontower6.asm +++ b/data/mapObjects/pokemontower6.asm @@ -2,8 +2,8 @@ PokemonTower6Object: db $1 ; border block db $2 ; warps - db $9, $12, $1, POKEMONTOWER_5 - db $10, $9, $0, POKEMONTOWER_7 + warp $12, $9, $1, POKEMONTOWER_5 + warp $9, $10, $0, POKEMONTOWER_7 db $0 ; signs @@ -15,5 +15,5 @@ PokemonTower6Object: object SPRITE_BALL, $e, $e, STAY, NONE, $5, X_ACCURACY ; warp-to - EVENT_DISP POKEMONTOWER_6_WIDTH, $9, $12 ; POKEMONTOWER_5 - EVENT_DISP POKEMONTOWER_6_WIDTH, $10, $9 ; POKEMONTOWER_7 + warp_to $12, $9, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_5 + warp_to $9, $10, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_7 diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm index 6ee1e8fd..e78d6181 100755 --- a/data/mapObjects/pokemontower7.asm +++ b/data/mapObjects/pokemontower7.asm @@ -2,7 +2,7 @@ PokemonTower7Object: db $1 ; border block db $1 ; warps - db $10, $9, $1, POKEMONTOWER_6 + warp $9, $10, $1, POKEMONTOWER_6 db $0 ; signs @@ -13,4 +13,4 @@ PokemonTower7Object: object SPRITE_MR_FUJI, $a, $3, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP POKEMONTOWER_7_WIDTH, $10, $9 ; POKEMONTOWER_6 + warp_to $9, $10, POKEMONTOWER_7_WIDTH ; POKEMONTOWER_6 diff --git a/data/mapObjects/powerplant.asm b/data/mapObjects/powerplant.asm index a04cb657..01fc94c7 100755 --- a/data/mapObjects/powerplant.asm +++ b/data/mapObjects/powerplant.asm @@ -2,9 +2,9 @@ PowerPlantObject: db $2e ; border block db $3 ; warps - db $23, $4, $3, $ff - db $23, $5, $3, $ff - db $b, $0, $3, $ff + warp $4, $23, $3, $ff + warp $5, $23, $3, $ff + warp $0, $b, $3, $ff db $0 ; signs @@ -25,6 +25,6 @@ PowerPlantObject: object SPRITE_BALL, $14, $20, STAY, NONE, $e, TM_33 ; warp-to - EVENT_DISP POWER_PLANT_WIDTH, $23, $4 - EVENT_DISP POWER_PLANT_WIDTH, $23, $5 - EVENT_DISP POWER_PLANT_WIDTH, $b, $0 + warp_to $4, $23, POWER_PLANT_WIDTH + warp_to $5, $23, POWER_PLANT_WIDTH + warp_to $0, $b, POWER_PLANT_WIDTH diff --git a/data/mapObjects/redshouse1f.asm b/data/mapObjects/redshouse1f.asm index 4d32ea3d..8c30fb84 100755 --- a/data/mapObjects/redshouse1f.asm +++ b/data/mapObjects/redshouse1f.asm @@ -2,17 +2,17 @@ RedsHouse1FObject: db $0A ; border block db $3 ; warps - db $7, $2, $0, $FF ; exit1 - db $7, $3, $0, $FF ; exit2 - db $1, $7, $0, REDS_HOUSE_2F ; staircase + warp $2, $7, $0, $FF ; exit1 + warp $3, $7, $0, $FF ; exit2 + warp $7, $1, $0, REDS_HOUSE_2F ; staircase db $1 ; signs - db $1, $3, $2 ; TV + sign $3, $1, $2 ; TV db $1 ; objects object SPRITE_MOM, $5, $4, STAY, LEFT, $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, $1, $7 + warp_to $2, $7, REDS_HOUSE_1F_WIDTH + warp_to $3, $7, REDS_HOUSE_1F_WIDTH + warp_to $7, $1, REDS_HOUSE_1F_WIDTH diff --git a/data/mapObjects/redshouse2f.asm b/data/mapObjects/redshouse2f.asm index ebd57e59..d36f0672 100755 --- a/data/mapObjects/redshouse2f.asm +++ b/data/mapObjects/redshouse2f.asm @@ -2,11 +2,11 @@ RedsHouse2FObject: db $0A ; border block db $1 ; warps - db $1, $7, $2, REDS_HOUSE_1F + warp $7, $1, $2, REDS_HOUSE_1F db $0 ; signs db $0 ; objects ; warp-to - EVENT_DISP REDS_HOUSE_2F_WIDTH, $1, $7 + warp_to $7, $1, REDS_HOUSE_2F_WIDTH diff --git a/data/mapObjects/rockethideout1.asm b/data/mapObjects/rockethideout1.asm index 0b2bf374..75b3569d 100755 --- a/data/mapObjects/rockethideout1.asm +++ b/data/mapObjects/rockethideout1.asm @@ -2,11 +2,11 @@ RocketHideout1Object: db $2e ; border block db $5 ; warps - db $2, $17, $0, ROCKET_HIDEOUT_2 - db $2, $15, $2, GAME_CORNER - db $13, $18, $0, ROCKET_HIDEOUT_ELEVATOR - db $18, $15, $3, ROCKET_HIDEOUT_2 - db $13, $19, $1, ROCKET_HIDEOUT_ELEVATOR + warp $17, $2, $0, ROCKET_HIDEOUT_2 + warp $15, $2, $2, GAME_CORNER + warp $18, $13, $0, ROCKET_HIDEOUT_ELEVATOR + warp $15, $18, $3, ROCKET_HIDEOUT_2 + warp $19, $13, $1, ROCKET_HIDEOUT_ELEVATOR db $0 ; signs @@ -20,8 +20,8 @@ RocketHideout1Object: object SPRITE_BALL, $9, $11, STAY, NONE, $7, HYPER_POTION ; warp-to - EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $2, $17 ; ROCKET_HIDEOUT_2 - EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $2, $15 ; GAME_CORNER - EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $13, $18 ; ROCKET_HIDEOUT_ELEVATOR - EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $18, $15 ; ROCKET_HIDEOUT_2 - EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $13, $19 ; ROCKET_HIDEOUT_ELEVATOR + warp_to $17, $2, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_2 + warp_to $15, $2, ROCKET_HIDEOUT_1_WIDTH ; GAME_CORNER + warp_to $18, $13, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + warp_to $15, $18, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_2 + warp_to $19, $13, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_ELEVATOR diff --git a/data/mapObjects/rockethideout2.asm b/data/mapObjects/rockethideout2.asm index 6689110c..08e7ccf1 100755 --- a/data/mapObjects/rockethideout2.asm +++ b/data/mapObjects/rockethideout2.asm @@ -2,11 +2,11 @@ RocketHideout2Object: db $2e ; border block db $5 ; warps - db $8, $1b, $0, ROCKET_HIDEOUT_1 - db $8, $15, $0, ROCKET_HIDEOUT_3 - db $13, $18, $0, ROCKET_HIDEOUT_ELEVATOR - db $16, $15, $3, ROCKET_HIDEOUT_1 - db $13, $19, $1, ROCKET_HIDEOUT_ELEVATOR + warp $1b, $8, $0, ROCKET_HIDEOUT_1 + warp $15, $8, $0, ROCKET_HIDEOUT_3 + warp $18, $13, $0, ROCKET_HIDEOUT_ELEVATOR + warp $15, $16, $3, ROCKET_HIDEOUT_1 + warp $19, $13, $1, ROCKET_HIDEOUT_ELEVATOR db $0 ; signs @@ -18,8 +18,8 @@ RocketHideout2Object: object SPRITE_BALL, $3, $15, STAY, NONE, $5, SUPER_POTION ; warp-to - EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $8, $1b ; ROCKET_HIDEOUT_1 - EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $8, $15 ; ROCKET_HIDEOUT_3 - EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $13, $18 ; ROCKET_HIDEOUT_ELEVATOR - EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $16, $15 ; ROCKET_HIDEOUT_1 - EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $13, $19 ; ROCKET_HIDEOUT_ELEVATOR + warp_to $1b, $8, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_1 + warp_to $15, $8, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_3 + warp_to $18, $13, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + warp_to $15, $16, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_1 + warp_to $19, $13, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_ELEVATOR diff --git a/data/mapObjects/rockethideout3.asm b/data/mapObjects/rockethideout3.asm index 90bfbb57..694b39ee 100755 --- a/data/mapObjects/rockethideout3.asm +++ b/data/mapObjects/rockethideout3.asm @@ -2,8 +2,8 @@ RocketHideout3Object: db $2e ; border block db $2 ; warps - db $6, $19, $1, ROCKET_HIDEOUT_2 - db $12, $13, $0, ROCKET_HIDEOUT_4 + warp $19, $6, $1, ROCKET_HIDEOUT_2 + warp $13, $12, $0, ROCKET_HIDEOUT_4 db $0 ; signs @@ -14,5 +14,5 @@ RocketHideout3Object: object SPRITE_BALL, $14, $e, STAY, NONE, $4, RARE_CANDY ; warp-to - EVENT_DISP ROCKET_HIDEOUT_3_WIDTH, $6, $19 ; ROCKET_HIDEOUT_2 - EVENT_DISP ROCKET_HIDEOUT_3_WIDTH, $12, $13 ; ROCKET_HIDEOUT_4 + warp_to $19, $6, ROCKET_HIDEOUT_3_WIDTH ; ROCKET_HIDEOUT_2 + warp_to $13, $12, ROCKET_HIDEOUT_3_WIDTH ; ROCKET_HIDEOUT_4 diff --git a/data/mapObjects/rockethideout4.asm b/data/mapObjects/rockethideout4.asm index b4e98d04..2450af12 100755 --- a/data/mapObjects/rockethideout4.asm +++ b/data/mapObjects/rockethideout4.asm @@ -2,9 +2,9 @@ RocketHideout4Object: db $2e ; border block db $3 ; warps - db $a, $13, $1, ROCKET_HIDEOUT_3 - db $f, $18, $0, ROCKET_HIDEOUT_ELEVATOR - db $f, $19, $1, ROCKET_HIDEOUT_ELEVATOR + warp $13, $a, $1, ROCKET_HIDEOUT_3 + warp $18, $f, $0, ROCKET_HIDEOUT_ELEVATOR + warp $19, $f, $1, ROCKET_HIDEOUT_ELEVATOR db $0 ; signs @@ -20,6 +20,6 @@ RocketHideout4Object: object SPRITE_BALL, $a, $2, STAY, NONE, $9, LIFT_KEY ; warp-to - EVENT_DISP ROCKET_HIDEOUT_4_WIDTH, $a, $13 ; ROCKET_HIDEOUT_3 - EVENT_DISP ROCKET_HIDEOUT_4_WIDTH, $f, $18 ; ROCKET_HIDEOUT_ELEVATOR - EVENT_DISP ROCKET_HIDEOUT_4_WIDTH, $f, $19 ; ROCKET_HIDEOUT_ELEVATOR + warp_to $13, $a, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_3 + warp_to $18, $f, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_ELEVATOR + warp_to $19, $f, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_ELEVATOR diff --git a/data/mapObjects/rockethideoutelevator.asm b/data/mapObjects/rockethideoutelevator.asm index c1dfe961..c1407769 100755 --- a/data/mapObjects/rockethideoutelevator.asm +++ b/data/mapObjects/rockethideoutelevator.asm @@ -2,14 +2,14 @@ RocketHideoutElevatorObject: db $f ; border block db $2 ; warps - db $1, $2, $2, ROCKET_HIDEOUT_1 - db $1, $3, $4, ROCKET_HIDEOUT_1 + warp $2, $1, $2, ROCKET_HIDEOUT_1 + warp $3, $1, $4, ROCKET_HIDEOUT_1 db $1 ; signs - db $1, $1, $1 ; RocketHideoutElevatorText1 + sign $1, $1, $1 ; RocketHideoutElevatorText1 db $0 ; objects ; warp-to - EVENT_DISP ROCKET_HIDEOUT_ELEVATOR_WIDTH, $1, $2 ; ROCKET_HIDEOUT_1 - EVENT_DISP ROCKET_HIDEOUT_ELEVATOR_WIDTH, $1, $3 ; ROCKET_HIDEOUT_1 + warp_to $2, $1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_1 + warp_to $3, $1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_1 diff --git a/data/mapObjects/rocktunnel1.asm b/data/mapObjects/rocktunnel1.asm index 932efb87..945f419d 100755 --- a/data/mapObjects/rocktunnel1.asm +++ b/data/mapObjects/rocktunnel1.asm @@ -2,17 +2,17 @@ RockTunnel1Object: db $3 ; border block db $8 ; warps - db $3, $f, $1, $ff - db $0, $f, $1, $ff - db $21, $f, $2, $ff - db $23, $f, $2, $ff - db $3, $25, $0, ROCK_TUNNEL_2 - db $3, $5, $1, ROCK_TUNNEL_2 - db $b, $11, $2, ROCK_TUNNEL_2 - db $11, $25, $3, ROCK_TUNNEL_2 + warp $f, $3, $1, $ff + warp $f, $0, $1, $ff + warp $f, $21, $2, $ff + warp $f, $23, $2, $ff + warp $25, $3, $0, ROCK_TUNNEL_2 + warp $5, $3, $1, ROCK_TUNNEL_2 + warp $11, $b, $2, ROCK_TUNNEL_2 + warp $25, $11, $3, ROCK_TUNNEL_2 db $1 ; signs - db $1d, $b, $8 ; RockTunnel1Text8 + sign $b, $1d, $8 ; RockTunnel1Text8 db $7 ; objects object SPRITE_HIKER, $7, $5, STAY, DOWN, $1, OPP_HIKER, $c @@ -24,11 +24,11 @@ RockTunnel1Object: object SPRITE_LASS, $20, $18, STAY, RIGHT, $7, OPP_JR_TRAINER_F, $13 ; warp-to - EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $f - EVENT_DISP ROCK_TUNNEL_1_WIDTH, $0, $f - EVENT_DISP ROCK_TUNNEL_1_WIDTH, $21, $f - EVENT_DISP ROCK_TUNNEL_1_WIDTH, $23, $f - EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $25 ; ROCK_TUNNEL_2 - EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $5 ; ROCK_TUNNEL_2 - EVENT_DISP ROCK_TUNNEL_1_WIDTH, $b, $11 ; ROCK_TUNNEL_2 - EVENT_DISP ROCK_TUNNEL_1_WIDTH, $11, $25 ; ROCK_TUNNEL_2 + warp_to $f, $3, ROCK_TUNNEL_1_WIDTH + warp_to $f, $0, ROCK_TUNNEL_1_WIDTH + warp_to $f, $21, ROCK_TUNNEL_1_WIDTH + warp_to $f, $23, ROCK_TUNNEL_1_WIDTH + warp_to $25, $3, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2 + warp_to $5, $3, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2 + warp_to $11, $b, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2 + warp_to $25, $11, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2 diff --git a/data/mapObjects/rocktunnel2.asm b/data/mapObjects/rocktunnel2.asm index 3589ec60..7acffb9a 100755 --- a/data/mapObjects/rocktunnel2.asm +++ b/data/mapObjects/rocktunnel2.asm @@ -2,10 +2,10 @@ RockTunnel2Object: db $3 ; border block db $4 ; warps - db $19, $21, $4, ROCK_TUNNEL_1 - db $3, $1b, $5, ROCK_TUNNEL_1 - db $b, $17, $6, ROCK_TUNNEL_1 - db $3, $3, $7, ROCK_TUNNEL_1 + warp $21, $19, $4, ROCK_TUNNEL_1 + warp $1b, $3, $5, ROCK_TUNNEL_1 + warp $17, $b, $6, ROCK_TUNNEL_1 + warp $3, $3, $7, ROCK_TUNNEL_1 db $0 ; signs @@ -20,7 +20,7 @@ RockTunnel2Object: object SPRITE_BLACK_HAIR_BOY_2, $1a, $1e, STAY, DOWN, $8, OPP_POKEMANIAC, $5 ; warp-to - EVENT_DISP ROCK_TUNNEL_2_WIDTH, $19, $21 ; ROCK_TUNNEL_1 - EVENT_DISP ROCK_TUNNEL_2_WIDTH, $3, $1b ; ROCK_TUNNEL_1 - EVENT_DISP ROCK_TUNNEL_2_WIDTH, $b, $17 ; ROCK_TUNNEL_1 - EVENT_DISP ROCK_TUNNEL_2_WIDTH, $3, $3 ; ROCK_TUNNEL_1 + warp_to $21, $19, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1 + warp_to $1b, $3, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1 + warp_to $17, $b, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1 + warp_to $3, $3, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1 diff --git a/data/mapObjects/rocktunnelpokecenter.asm b/data/mapObjects/rocktunnelpokecenter.asm index 90efc3ea..400b5998 100755 --- a/data/mapObjects/rocktunnelpokecenter.asm +++ b/data/mapObjects/rocktunnelpokecenter.asm @@ -2,8 +2,8 @@ RockTunnelPokecenterObject: db $0 ; border block db $2 ; warps - db $7, $3, $0, $ff - db $7, $4, $0, $ff + warp $3, $7, $0, $ff + warp $4, $7, $0, $ff db $0 ; signs @@ -14,5 +14,5 @@ RockTunnelPokecenterObject: object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP ROCK_TUNNEL_POKECENTER_WIDTH, $7, $3 - EVENT_DISP ROCK_TUNNEL_POKECENTER_WIDTH, $7, $4 + warp_to $3, $7, ROCK_TUNNEL_POKECENTER_WIDTH + warp_to $4, $7, ROCK_TUNNEL_POKECENTER_WIDTH diff --git a/data/mapObjects/route1.asm b/data/mapObjects/route1.asm index 0e6237e7..ae4fec99 100755 --- a/data/mapObjects/route1.asm +++ b/data/mapObjects/route1.asm @@ -4,11 +4,11 @@ Route1Object: db $0 ; warps db $1 ; signs - db $1b, $9, $3 ; Route1Text3 + sign $9, $1b, $3 ; Route1Text3 db $2 ; objects object SPRITE_BUG_CATCHER, $5, $18, WALK, $1, $1 ; person object SPRITE_BUG_CATCHER, $f, $d, WALK, $2, $2 ; person ; warp-to (unused) - EVENT_DISP $4, $7, $2 + warp_to $2, $7, $4 diff --git a/data/mapObjects/route10.asm b/data/mapObjects/route10.asm index a1590ded..3f052bf8 100755 --- a/data/mapObjects/route10.asm +++ b/data/mapObjects/route10.asm @@ -2,16 +2,16 @@ Route10Object: db $2c ; border block db $4 ; warps - db $13, $b, $0, ROCK_TUNNEL_POKECENTER - db $11, $8, $0, ROCK_TUNNEL_1 - db $35, $8, $2, ROCK_TUNNEL_1 - db $27, $6, $0, POWER_PLANT + warp $b, $13, $0, ROCK_TUNNEL_POKECENTER + warp $8, $11, $0, ROCK_TUNNEL_1 + warp $8, $35, $2, ROCK_TUNNEL_1 + warp $6, $27, $0, POWER_PLANT db $4 ; signs - db $13, $7, $7 ; Route10Text7 - db $13, $c, $8 ; PokeCenterSignText - db $37, $9, $9 ; Route10Text9 - db $29, $5, $a ; Route10Text10 + sign $7, $13, $7 ; Route10Text7 + sign $c, $13, $8 ; PokeCenterSignText + sign $9, $37, $9 ; Route10Text9 + sign $5, $29, $a ; Route10Text10 db $6 ; objects object SPRITE_BLACK_HAIR_BOY_2, $a, $2c, STAY, LEFT, $1, OPP_POKEMANIAC, $1 @@ -22,7 +22,7 @@ Route10Object: object SPRITE_LASS, $7, $36, STAY, DOWN, $6, OPP_JR_TRAINER_F, $8 ; warp-to - EVENT_DISP ROUTE_10_WIDTH, $13, $b ; ROCK_TUNNEL_POKECENTER - EVENT_DISP ROUTE_10_WIDTH, $11, $8 ; ROCK_TUNNEL_1 - EVENT_DISP ROUTE_10_WIDTH, $35, $8 ; ROCK_TUNNEL_1 - EVENT_DISP ROUTE_10_WIDTH, $27, $6 ; POWER_PLANT + warp_to $b, $13, ROUTE_10_WIDTH ; ROCK_TUNNEL_POKECENTER + warp_to $8, $11, ROUTE_10_WIDTH ; ROCK_TUNNEL_1 + warp_to $8, $35, ROUTE_10_WIDTH ; ROCK_TUNNEL_1 + warp_to $6, $27, ROUTE_10_WIDTH ; POWER_PLANT diff --git a/data/mapObjects/route11.asm b/data/mapObjects/route11.asm index 0c7828f2..2427e20a 100755 --- a/data/mapObjects/route11.asm +++ b/data/mapObjects/route11.asm @@ -2,14 +2,14 @@ Route11Object: db $f ; border block db $5 ; warps - db $8, $31, $0, ROUTE_11_GATE_1F - db $9, $31, $1, ROUTE_11_GATE_1F - db $8, $3a, $2, ROUTE_11_GATE_1F - db $9, $3a, $3, ROUTE_11_GATE_1F - db $5, $4, $0, DIGLETTS_CAVE_ENTRANCE + warp $31, $8, $0, ROUTE_11_GATE_1F + warp $31, $9, $1, ROUTE_11_GATE_1F + warp $3a, $8, $2, ROUTE_11_GATE_1F + warp $3a, $9, $3, ROUTE_11_GATE_1F + warp $4, $5, $0, DIGLETTS_CAVE_ENTRANCE db $1 ; signs - db $5, $1, $b ; Route11Text11 + sign $1, $5, $b ; Route11Text11 db $a ; objects object SPRITE_GAMBLER, $a, $e, STAY, DOWN, $1, OPP_GAMBLER, $1 @@ -24,8 +24,8 @@ Route11Object: object SPRITE_BUG_CATCHER, $16, $c, STAY, UP, $a, OPP_YOUNGSTER, $c ; warp-to - EVENT_DISP ROUTE_11_WIDTH, $8, $31 ; ROUTE_11_GATE_1F - EVENT_DISP ROUTE_11_WIDTH, $9, $31 ; ROUTE_11_GATE_1F - EVENT_DISP ROUTE_11_WIDTH, $8, $3a ; ROUTE_11_GATE_1F - EVENT_DISP ROUTE_11_WIDTH, $9, $3a ; ROUTE_11_GATE_1F - EVENT_DISP ROUTE_11_WIDTH, $5, $4 ; DIGLETTS_CAVE_ENTRANCE + warp_to $31, $8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F + warp_to $31, $9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F + warp_to $3a, $8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F + warp_to $3a, $9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F + warp_to $4, $5, ROUTE_11_WIDTH ; DIGLETTS_CAVE_ENTRANCE diff --git a/data/mapObjects/route11gate.asm b/data/mapObjects/route11gate.asm index d8e6bff1..98a183a0 100755 --- a/data/mapObjects/route11gate.asm +++ b/data/mapObjects/route11gate.asm @@ -2,11 +2,11 @@ Route11GateObject: db $a ; border block db $5 ; warps - db $4, $0, $0, $ff - db $5, $0, $1, $ff - db $4, $7, $2, $ff - db $5, $7, $3, $ff - db $8, $6, $0, ROUTE_11_GATE_2F + warp $0, $4, $0, $ff + warp $0, $5, $1, $ff + warp $7, $4, $2, $ff + warp $7, $5, $3, $ff + warp $6, $8, $0, ROUTE_11_GATE_2F db $0 ; signs @@ -14,8 +14,8 @@ Route11GateObject: object SPRITE_GUARD, $4, $1, STAY, NONE, $1 ; person ; warp-to - EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $4, $0 - EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $5, $0 - EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $4, $7 - EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $5, $7 - EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $8, $6 ; ROUTE_11_GATE_2F + warp_to $0, $4, ROUTE_11_GATE_1F_WIDTH + warp_to $0, $5, ROUTE_11_GATE_1F_WIDTH + warp_to $7, $4, ROUTE_11_GATE_1F_WIDTH + warp_to $7, $5, ROUTE_11_GATE_1F_WIDTH + warp_to $6, $8, ROUTE_11_GATE_1F_WIDTH ; ROUTE_11_GATE_2F diff --git a/data/mapObjects/route11gateupstairs.asm b/data/mapObjects/route11gateupstairs.asm index 6228851d..3f33e1ce 100755 --- a/data/mapObjects/route11gateupstairs.asm +++ b/data/mapObjects/route11gateupstairs.asm @@ -2,15 +2,15 @@ Route11GateUpstairsObject: db $a ; border block db $1 ; warps - db $7, $7, $4, ROUTE_11_GATE_1F + warp $7, $7, $4, ROUTE_11_GATE_1F db $2 ; signs - db $2, $1, $3 ; Route11GateUpstairsText3 - db $2, $6, $4 ; Route11GateUpstairsText4 + sign $1, $2, $3 ; Route11GateUpstairsText3 + sign $6, $2, $4 ; Route11GateUpstairsText4 db $2 ; objects object SPRITE_BUG_CATCHER, $4, $2, WALK, $2, $1 ; person object SPRITE_OAK_AIDE, $2, $6, STAY, NONE, $2 ; person ; warp-to - EVENT_DISP ROUTE_11_GATE_2F_WIDTH, $7, $7 ; ROUTE_11_GATE_1F + warp_to $7, $7, ROUTE_11_GATE_2F_WIDTH ; ROUTE_11_GATE_1F diff --git a/data/mapObjects/route12.asm b/data/mapObjects/route12.asm index dd461e6c..c950cadc 100755 --- a/data/mapObjects/route12.asm +++ b/data/mapObjects/route12.asm @@ -2,14 +2,14 @@ Route12Object: db $43 ; border block db $4 ; warps - db $f, $a, $0, ROUTE_12_GATE_1F - db $f, $b, $1, ROUTE_12_GATE_1F - db $15, $a, $2, ROUTE_12_GATE_1F - db $4d, $b, $0, ROUTE_12_HOUSE + warp $a, $f, $0, ROUTE_12_GATE_1F + warp $b, $f, $1, ROUTE_12_GATE_1F + warp $a, $15, $2, ROUTE_12_GATE_1F + warp $b, $4d, $0, ROUTE_12_HOUSE db $2 ; signs - db $d, $d, $b ; Route12Text11 - db $3f, $b, $c ; Route12Text12 + sign $d, $d, $b ; Route12Text11 + sign $b, $3f, $c ; Route12Text12 db $a ; objects object SPRITE_SNORLAX, $a, $3e, STAY, DOWN, $1 ; person @@ -24,7 +24,7 @@ Route12Object: object SPRITE_BALL, $5, $59, STAY, NONE, $a, IRON ; warp-to - EVENT_DISP ROUTE_12_WIDTH, $f, $a ; ROUTE_12_GATE_1F - EVENT_DISP ROUTE_12_WIDTH, $f, $b ; ROUTE_12_GATE_1F - EVENT_DISP ROUTE_12_WIDTH, $15, $a ; ROUTE_12_GATE_1F - EVENT_DISP ROUTE_12_WIDTH, $4d, $b ; ROUTE_12_HOUSE + warp_to $a, $f, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F + warp_to $b, $f, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F + warp_to $a, $15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F + warp_to $b, $4d, ROUTE_12_WIDTH ; ROUTE_12_HOUSE diff --git a/data/mapObjects/route12gate.asm b/data/mapObjects/route12gate.asm index 27e8532a..be4e3cb8 100755 --- a/data/mapObjects/route12gate.asm +++ b/data/mapObjects/route12gate.asm @@ -2,11 +2,11 @@ Route12GateObject: db $a ; border block db $5 ; warps - db $0, $4, $0, $ff - db $0, $5, $1, $ff - db $7, $4, $2, $ff - db $7, $5, $2, $ff - db $6, $8, $0, ROUTE_12_GATE_2F + warp $4, $0, $0, $ff + warp $5, $0, $1, $ff + warp $4, $7, $2, $ff + warp $5, $7, $2, $ff + warp $8, $6, $0, ROUTE_12_GATE_2F db $0 ; signs @@ -14,8 +14,8 @@ Route12GateObject: object SPRITE_GUARD, $1, $3, STAY, NONE, $1 ; person ; warp-to - EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $0, $4 - EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $0, $5 - EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $7, $4 - EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $7, $5 - EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $6, $8 ; ROUTE_12_GATE_2F + warp_to $4, $0, ROUTE_12_GATE_1F_WIDTH + warp_to $5, $0, ROUTE_12_GATE_1F_WIDTH + warp_to $4, $7, ROUTE_12_GATE_1F_WIDTH + warp_to $5, $7, ROUTE_12_GATE_1F_WIDTH + warp_to $8, $6, ROUTE_12_GATE_1F_WIDTH ; ROUTE_12_GATE_2F diff --git a/data/mapObjects/route12gateupstairs.asm b/data/mapObjects/route12gateupstairs.asm index f1221c44..b1c92f95 100755 --- a/data/mapObjects/route12gateupstairs.asm +++ b/data/mapObjects/route12gateupstairs.asm @@ -2,14 +2,14 @@ Route12GateUpstairsObject: db $a ; border block db $1 ; warps - db $7, $7, $4, ROUTE_12_GATE_1F + warp $7, $7, $4, ROUTE_12_GATE_1F db $2 ; signs - db $2, $1, $2 ; Route12GateUpstairsText2 - db $2, $6, $3 ; Route12GateUpstairsText3 + sign $1, $2, $2 ; Route12GateUpstairsText2 + sign $6, $2, $3 ; Route12GateUpstairsText3 db $1 ; objects object SPRITE_BRUNETTE_GIRL, $3, $4, WALK, $1, $1 ; person ; warp-to - EVENT_DISP ROUTE_12_GATE_2F_WIDTH, $7, $7 ; ROUTE_12_GATE_1F + warp_to $7, $7, ROUTE_12_GATE_2F_WIDTH ; ROUTE_12_GATE_1F diff --git a/data/mapObjects/route12house.asm b/data/mapObjects/route12house.asm index 104b01f7..7c91caa2 100755 --- a/data/mapObjects/route12house.asm +++ b/data/mapObjects/route12house.asm @@ -2,8 +2,8 @@ Route12HouseObject: db $a ; border block db $2 ; warps - db $7, $2, $3, $ff - db $7, $3, $3, $ff + warp $2, $7, $3, $ff + warp $3, $7, $3, $ff db $0 ; signs @@ -11,5 +11,5 @@ Route12HouseObject: object SPRITE_FISHER, $2, $4, STAY, RIGHT, $1 ; person ; warp-to - EVENT_DISP ROUTE_12_HOUSE_WIDTH, $7, $2 - EVENT_DISP ROUTE_12_HOUSE_WIDTH, $7, $3 + warp_to $2, $7, ROUTE_12_HOUSE_WIDTH + warp_to $3, $7, ROUTE_12_HOUSE_WIDTH diff --git a/data/mapObjects/route13.asm b/data/mapObjects/route13.asm index a01e25a3..05fe1dd9 100755 --- a/data/mapObjects/route13.asm +++ b/data/mapObjects/route13.asm @@ -4,9 +4,9 @@ Route13Object: db $0 ; warps db $3 ; signs - db $d, $f, $b ; Route13Text11 - db $5, $21, $c ; Route13Text12 - db $b, $1f, $d ; Route13Text13 + sign $f, $d, $b ; Route13Text11 + sign $21, $5, $c ; Route13Text12 + sign $1f, $b, $d ; Route13Text13 db $a ; objects object SPRITE_BLACK_HAIR_BOY_1, $31, $a, STAY, RIGHT, $1, OPP_BIRD_KEEPER, $1 diff --git a/data/mapObjects/route14.asm b/data/mapObjects/route14.asm index 48edd284..81819f0d 100755 --- a/data/mapObjects/route14.asm +++ b/data/mapObjects/route14.asm @@ -4,7 +4,7 @@ Route14Object: db $0 ; warps db $1 ; signs - db $d, $11, $b ; Route14Text11 + sign $11, $d, $b ; Route14Text11 db $a ; objects object SPRITE_BLACK_HAIR_BOY_1, $4, $4, STAY, DOWN, $1, OPP_BIRD_KEEPER, $e diff --git a/data/mapObjects/route15.asm b/data/mapObjects/route15.asm index 1d83b20d..38fbae4d 100755 --- a/data/mapObjects/route15.asm +++ b/data/mapObjects/route15.asm @@ -2,13 +2,13 @@ Route15Object: db $43 ; border block db $4 ; warps - db $8, $7, $0, ROUTE_15_GATE_1F - db $9, $7, $1, ROUTE_15_GATE_1F - db $8, $e, $2, ROUTE_15_GATE_1F - db $9, $e, $3, ROUTE_15_GATE_1F + warp $7, $8, $0, ROUTE_15_GATE_1F + warp $7, $9, $1, ROUTE_15_GATE_1F + warp $e, $8, $2, ROUTE_15_GATE_1F + warp $e, $9, $3, ROUTE_15_GATE_1F db $1 ; signs - db $9, $27, $c ; Route15Text12 + sign $27, $9, $c ; Route15Text12 db $b ; objects object SPRITE_LASS, $29, $b, STAY, DOWN, $1, OPP_JR_TRAINER_F, $14 @@ -24,7 +24,7 @@ Route15Object: object SPRITE_BALL, $12, $5, STAY, NONE, $b, TM_20 ; warp-to - EVENT_DISP ROUTE_15_WIDTH, $8, $7 ; ROUTE_15_GATE_1F - EVENT_DISP ROUTE_15_WIDTH, $9, $7 ; ROUTE_15_GATE_1F - EVENT_DISP ROUTE_15_WIDTH, $8, $e ; ROUTE_15_GATE_1F - EVENT_DISP ROUTE_15_WIDTH, $9, $e ; ROUTE_15_GATE_1F + warp_to $7, $8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F + warp_to $7, $9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F + warp_to $e, $8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F + warp_to $e, $9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F diff --git a/data/mapObjects/route15gate.asm b/data/mapObjects/route15gate.asm index 06a6790a..a5902851 100755 --- a/data/mapObjects/route15gate.asm +++ b/data/mapObjects/route15gate.asm @@ -2,11 +2,11 @@ Route15GateObject: db $a ; border block db $5 ; warps - db $4, $0, $0, $ff - db $5, $0, $1, $ff - db $4, $7, $2, $ff - db $5, $7, $3, $ff - db $8, $6, $0, ROUTE_15_GATE_2F + warp $0, $4, $0, $ff + warp $0, $5, $1, $ff + warp $7, $4, $2, $ff + warp $7, $5, $3, $ff + warp $6, $8, $0, ROUTE_15_GATE_2F db $0 ; signs @@ -14,8 +14,8 @@ Route15GateObject: object SPRITE_GUARD, $4, $1, STAY, NONE, $1 ; person ; warp-to - EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $4, $0 - EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $5, $0 - EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $4, $7 - EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $5, $7 - EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $8, $6 ; ROUTE_15_GATE_2F + warp_to $0, $4, ROUTE_15_GATE_1F_WIDTH + warp_to $0, $5, ROUTE_15_GATE_1F_WIDTH + warp_to $7, $4, ROUTE_15_GATE_1F_WIDTH + warp_to $7, $5, ROUTE_15_GATE_1F_WIDTH + warp_to $6, $8, ROUTE_15_GATE_1F_WIDTH ; ROUTE_15_GATE_2F diff --git a/data/mapObjects/route15gateupstairs.asm b/data/mapObjects/route15gateupstairs.asm index c4cdcea8..09c3b322 100755 --- a/data/mapObjects/route15gateupstairs.asm +++ b/data/mapObjects/route15gateupstairs.asm @@ -2,13 +2,13 @@ Route15GateUpstairsObject: db $a ; border block db $1 ; warps - db $7, $7, $4, ROUTE_15_GATE_1F + warp $7, $7, $4, ROUTE_15_GATE_1F db $1 ; signs - db $2, $6, $2 ; Route15GateUpstairsText2 + sign $6, $2, $2 ; Route15GateUpstairsText2 db $1 ; objects object SPRITE_OAK_AIDE, $4, $2, STAY, DOWN, $1 ; warp-to - EVENT_DISP ROUTE_15_GATE_2F_WIDTH, $7, $7 ; ROUTE_15_GATE_1F + warp_to $7, $7, ROUTE_15_GATE_2F_WIDTH ; ROUTE_15_GATE_1F diff --git a/data/mapObjects/route16.asm b/data/mapObjects/route16.asm index a342d106..d65ea9c8 100755 --- a/data/mapObjects/route16.asm +++ b/data/mapObjects/route16.asm @@ -2,19 +2,19 @@ Route16Object: db $f ; border block db $9 ; warps - db $a, $11, $0, ROUTE_16_GATE_1F - db $b, $11, $1, ROUTE_16_GATE_1F - db $a, $18, $2, ROUTE_16_GATE_1F - db $b, $18, $3, ROUTE_16_GATE_1F - db $4, $11, $4, ROUTE_16_GATE_1F - db $5, $11, $5, ROUTE_16_GATE_1F - db $4, $18, $6, ROUTE_16_GATE_1F - db $5, $18, $7, ROUTE_16_GATE_1F - db $5, $7, $0, ROUTE_16_HOUSE + warp $11, $a, $0, ROUTE_16_GATE_1F + warp $11, $b, $1, ROUTE_16_GATE_1F + warp $18, $a, $2, ROUTE_16_GATE_1F + warp $18, $b, $3, ROUTE_16_GATE_1F + warp $11, $4, $4, ROUTE_16_GATE_1F + warp $11, $5, $5, ROUTE_16_GATE_1F + warp $18, $4, $6, ROUTE_16_GATE_1F + warp $18, $5, $7, ROUTE_16_GATE_1F + warp $7, $5, $0, ROUTE_16_HOUSE db $2 ; signs - db $b, $1b, $8 ; Route16Text8 - db $11, $5, $9 ; Route16Text9 + sign $1b, $b, $8 ; Route16Text8 + sign $5, $11, $9 ; Route16Text9 db $7 ; objects object SPRITE_BIKER, $11, $c, STAY, LEFT, $1, OPP_BIKER, $5 @@ -26,12 +26,12 @@ Route16Object: object SPRITE_SNORLAX, $1a, $a, STAY, DOWN, $7 ; person ; warp-to - EVENT_DISP ROUTE_16_WIDTH, $a, $11 ; ROUTE_16_GATE_1F - EVENT_DISP ROUTE_16_WIDTH, $b, $11 ; ROUTE_16_GATE_1F - EVENT_DISP ROUTE_16_WIDTH, $a, $18 ; ROUTE_16_GATE_1F - EVENT_DISP ROUTE_16_WIDTH, $b, $18 ; ROUTE_16_GATE_1F - EVENT_DISP ROUTE_16_WIDTH, $4, $11 ; ROUTE_16_GATE_1F - EVENT_DISP ROUTE_16_WIDTH, $5, $11 ; ROUTE_16_GATE_1F - EVENT_DISP ROUTE_16_WIDTH, $4, $18 ; ROUTE_16_GATE_1F - EVENT_DISP ROUTE_16_WIDTH, $5, $18 ; ROUTE_16_GATE_1F - EVENT_DISP ROUTE_16_WIDTH, $5, $7 ; ROUTE_16_HOUSE + warp_to $11, $a, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to $11, $b, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to $18, $a, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to $18, $b, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to $11, $4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to $11, $5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to $18, $4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to $18, $5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F + warp_to $7, $5, ROUTE_16_WIDTH ; ROUTE_16_HOUSE diff --git a/data/mapObjects/route16gate.asm b/data/mapObjects/route16gate.asm index fce6c292..a94c4e9b 100755 --- a/data/mapObjects/route16gate.asm +++ b/data/mapObjects/route16gate.asm @@ -2,15 +2,15 @@ Route16GateObject: db $a ; border block db $9 ; warps - db $8, $0, $0, $ff - db $9, $0, $1, $ff - db $8, $7, $2, $ff - db $9, $7, $2, $ff - db $2, $0, $4, $ff - db $3, $0, $5, $ff - db $2, $7, $6, $ff - db $3, $7, $7, $ff - db $c, $6, $0, ROUTE_16_GATE_2F + warp $0, $8, $0, $ff + warp $0, $9, $1, $ff + warp $7, $8, $2, $ff + warp $7, $9, $2, $ff + warp $0, $2, $4, $ff + warp $0, $3, $5, $ff + warp $7, $2, $6, $ff + warp $7, $3, $7, $ff + warp $6, $c, $0, ROUTE_16_GATE_2F db $0 ; signs @@ -19,12 +19,12 @@ Route16GateObject: object SPRITE_GAMBLER, $4, $3, STAY, NONE, $2 ; person ; warp-to - EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $8, $0 - EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $9, $0 - EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $8, $7 - EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $9, $7 - EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $2, $0 - EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $3, $0 - EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $2, $7 - EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $3, $7 - EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $c, $6 ; ROUTE_16_GATE_2F + warp_to $0, $8, ROUTE_16_GATE_1F_WIDTH + warp_to $0, $9, ROUTE_16_GATE_1F_WIDTH + warp_to $7, $8, ROUTE_16_GATE_1F_WIDTH + warp_to $7, $9, ROUTE_16_GATE_1F_WIDTH + warp_to $0, $2, ROUTE_16_GATE_1F_WIDTH + warp_to $0, $3, ROUTE_16_GATE_1F_WIDTH + warp_to $7, $2, ROUTE_16_GATE_1F_WIDTH + warp_to $7, $3, ROUTE_16_GATE_1F_WIDTH + warp_to $6, $c, ROUTE_16_GATE_1F_WIDTH ; ROUTE_16_GATE_2F diff --git a/data/mapObjects/route16gateupstairs.asm b/data/mapObjects/route16gateupstairs.asm index 9119bf5e..3d18bcb0 100755 --- a/data/mapObjects/route16gateupstairs.asm +++ b/data/mapObjects/route16gateupstairs.asm @@ -2,15 +2,15 @@ Route16GateUpstairsObject: db $a ; border block db $1 ; warps - db $7, $7, $8, ROUTE_16_GATE_1F + warp $7, $7, $8, ROUTE_16_GATE_1F db $2 ; signs - db $2, $1, $3 ; Route16GateUpstairsText3 - db $2, $6, $4 ; Route16GateUpstairsText4 + sign $1, $2, $3 ; Route16GateUpstairsText3 + sign $6, $2, $4 ; Route16GateUpstairsText4 db $2 ; objects object SPRITE_YOUNG_BOY, $4, $2, STAY, NONE, $1 ; person object SPRITE_LITTLE_GIRL, $2, $5, WALK, $2, $2 ; person ; warp-to - EVENT_DISP ROUTE_16_GATE_2F_WIDTH, $7, $7 ; ROUTE_16_GATE_1F + warp_to $7, $7, ROUTE_16_GATE_2F_WIDTH ; ROUTE_16_GATE_1F diff --git a/data/mapObjects/route16house.asm b/data/mapObjects/route16house.asm index e1e4244d..56de89d2 100755 --- a/data/mapObjects/route16house.asm +++ b/data/mapObjects/route16house.asm @@ -2,8 +2,8 @@ Route16HouseObject: db $a ; border block db $2 ; warps - db $7, $2, $8, $ff - db $7, $3, $8, $ff + warp $2, $7, $8, $ff + warp $3, $7, $8, $ff db $0 ; signs @@ -12,5 +12,5 @@ Route16HouseObject: object SPRITE_BIRD, $6, $4, WALK, $0, $2 ; person ; warp-to - EVENT_DISP ROUTE_16_HOUSE_WIDTH, $7, $2 - EVENT_DISP ROUTE_16_HOUSE_WIDTH, $7, $3 + warp_to $2, $7, ROUTE_16_HOUSE_WIDTH + warp_to $3, $7, ROUTE_16_HOUSE_WIDTH diff --git a/data/mapObjects/route17.asm b/data/mapObjects/route17.asm index 3c8e3bce..b13a2878 100755 --- a/data/mapObjects/route17.asm +++ b/data/mapObjects/route17.asm @@ -4,12 +4,12 @@ Route17Object: db $0 ; warps db $6 ; signs - db $33, $9, $b ; Route17Text11 - db $3f, $9, $c ; Route17Text12 - db $4b, $9, $d ; Route17Text13 - db $57, $9, $e ; Route17Text14 - db $6f, $9, $f ; Route17Text15 - db $8d, $9, $10 ; Route17Text16 + sign $9, $33, $b ; Route17Text11 + sign $9, $3f, $c ; Route17Text12 + sign $9, $4b, $d ; Route17Text13 + sign $9, $57, $e ; Route17Text14 + sign $9, $6f, $f ; Route17Text15 + sign $9, $8d, $10 ; Route17Text16 db $a ; objects object SPRITE_BIKER, $c, $13, STAY, LEFT, $1, OPP_CUE_BALL, $4 diff --git a/data/mapObjects/route18.asm b/data/mapObjects/route18.asm index 8b36ab7c..5cfb7ddb 100755 --- a/data/mapObjects/route18.asm +++ b/data/mapObjects/route18.asm @@ -2,14 +2,14 @@ Route18Object: db $43 ; border block db $4 ; warps - db $8, $21, $0, ROUTE_18_GATE_1F - db $9, $21, $1, ROUTE_18_GATE_1F - db $8, $28, $2, ROUTE_18_GATE_1F - db $9, $28, $3, ROUTE_18_GATE_1F + warp $21, $8, $0, ROUTE_18_GATE_1F + warp $21, $9, $1, ROUTE_18_GATE_1F + warp $28, $8, $2, ROUTE_18_GATE_1F + warp $28, $9, $3, ROUTE_18_GATE_1F db $2 ; signs - db $7, $2b, $4 ; Route18Text4 - db $5, $21, $5 ; Route18Text5 + sign $2b, $7, $4 ; Route18Text4 + sign $21, $5, $5 ; Route18Text5 db $3 ; objects object SPRITE_BLACK_HAIR_BOY_1, $24, $b, STAY, RIGHT, $1, OPP_BIRD_KEEPER, $8 @@ -17,7 +17,7 @@ Route18Object: object SPRITE_BLACK_HAIR_BOY_1, $2a, $d, STAY, LEFT, $3, OPP_BIRD_KEEPER, $a ; warp-to - EVENT_DISP ROUTE_18_WIDTH, $8, $21 ; ROUTE_18_GATE_1F - EVENT_DISP ROUTE_18_WIDTH, $9, $21 ; ROUTE_18_GATE_1F - EVENT_DISP ROUTE_18_WIDTH, $8, $28 ; ROUTE_18_GATE_1F - EVENT_DISP ROUTE_18_WIDTH, $9, $28 ; ROUTE_18_GATE_1F + warp_to $21, $8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F + warp_to $21, $9, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F + warp_to $28, $8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F + warp_to $28, $9, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F diff --git a/data/mapObjects/route18gate.asm b/data/mapObjects/route18gate.asm index 08b10050..06aa03ba 100755 --- a/data/mapObjects/route18gate.asm +++ b/data/mapObjects/route18gate.asm @@ -2,11 +2,11 @@ Route18GateObject: db $a ; border block db $5 ; warps - db $4, $0, $0, $ff - db $5, $0, $1, $ff - db $4, $7, $2, $ff - db $5, $7, $3, $ff - db $8, $6, $0, ROUTE_18_GATE_2F + warp $0, $4, $0, $ff + warp $0, $5, $1, $ff + warp $7, $4, $2, $ff + warp $7, $5, $3, $ff + warp $6, $8, $0, ROUTE_18_GATE_2F db $0 ; signs @@ -14,8 +14,8 @@ Route18GateObject: object SPRITE_GUARD, $4, $1, STAY, DOWN, $1 ; person ; warp-to - EVENT_DISP ROUTE_18_GATE_1F_WIDTH, $4, $0 - EVENT_DISP ROUTE_18_GATE_1F_WIDTH, $5, $0 - EVENT_DISP ROUTE_18_GATE_1F_WIDTH, $4, $7 - EVENT_DISP ROUTE_18_GATE_1F_WIDTH, $5, $7 - EVENT_DISP ROUTE_18_GATE_1F_WIDTH, $8, $6 ; ROUTE_18_GATE_2F + warp_to $0, $4, ROUTE_18_GATE_1F_WIDTH + warp_to $0, $5, ROUTE_18_GATE_1F_WIDTH + warp_to $7, $4, ROUTE_18_GATE_1F_WIDTH + warp_to $7, $5, ROUTE_18_GATE_1F_WIDTH + warp_to $6, $8, ROUTE_18_GATE_1F_WIDTH ; ROUTE_18_GATE_2F diff --git a/data/mapObjects/route18gateupstairs.asm b/data/mapObjects/route18gateupstairs.asm index 671b3215..db0671b7 100755 --- a/data/mapObjects/route18gateupstairs.asm +++ b/data/mapObjects/route18gateupstairs.asm @@ -2,14 +2,14 @@ Route18GateUpstairsObject: db $a ; border block db $1 ; warps - db $7, $7, $4, ROUTE_18_GATE_1F + warp $7, $7, $4, ROUTE_18_GATE_1F db $2 ; signs - db $2, $1, $2 ; Route18GateUpstairsText2 - db $2, $6, $3 ; Route18GateUpstairsText3 + sign $1, $2, $2 ; Route18GateUpstairsText2 + sign $6, $2, $3 ; Route18GateUpstairsText3 db $1 ; objects object SPRITE_BUG_CATCHER, $4, $2, WALK, $2, $1 ; person ; warp-to - EVENT_DISP ROUTE_18_GATE_2F_WIDTH, $7, $7 ; ROUTE_18_GATE_1F + warp_to $7, $7, ROUTE_18_GATE_2F_WIDTH ; ROUTE_18_GATE_1F diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index 956caa6e..48cee7a6 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -4,7 +4,7 @@ Route19Object: db $0 ; warps db $1 ; signs - db $9, $b, $b ; Route19Text11 + sign $b, $9, $b ; Route19Text11 db $a ; objects object SPRITE_BLACK_HAIR_BOY_1, $8, $7, STAY, LEFT, 1, OPP_SWIMMER, 2 diff --git a/data/mapObjects/route2.asm b/data/mapObjects/route2.asm index 7db8fe09..0c14d76f 100755 --- a/data/mapObjects/route2.asm +++ b/data/mapObjects/route2.asm @@ -2,32 +2,32 @@ Route2Object: db $f ; border block db $6 ; 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 + warp $c, $9, $0, DIGLETTS_CAVE_EXIT + warp $3, $b, $1, VIRIDIAN_FOREST_EXIT + warp $f, $13, $0, ROUTE_2_HOUSE + warp $10, $23, $1, ROUTE_2_GATE + warp $f, $27, $2, ROUTE_2_GATE + warp $3, $2b, $2, VIRIDIAN_FOREST_ENTRANCE db $2 ; signs - db $41, $5, $3 ; Route2Text3 - db $b, $b, $4 ; Route2Text4 + sign $5, $41, $3 ; Route2Text3 + sign $b, $b, $4 ; Route2Text4 db $2 ; objects object SPRITE_BALL, $d, $36, STAY, NONE, $1, MOON_STONE object SPRITE_BALL, $d, $2d, STAY, NONE, $2, HP_UP ; warp-to - EVENT_DISP ROUTE_2_WIDTH, $9, $c ; DIGLETTS_CAVE_EXIT - EVENT_DISP ROUTE_2_WIDTH, $b, $3 ; VIRIDIAN_FOREST_EXIT - EVENT_DISP ROUTE_2_WIDTH, $13, $f ; ROUTE_2_HOUSE - 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 + warp_to $c, $9, ROUTE_2_WIDTH ; DIGLETTS_CAVE_EXIT + warp_to $3, $b, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_EXIT + warp_to $f, $13, ROUTE_2_WIDTH ; ROUTE_2_HOUSE + warp_to $10, $23, ROUTE_2_WIDTH ; ROUTE_2_GATE + warp_to $f, $27, ROUTE_2_WIDTH ; ROUTE_2_GATE + warp_to $3, $2b, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_ENTRANCE ; unused - EVENT_DISP $4, $7, $2 - db $12, $c7, $9, $7 - EVENT_DISP $4, $7, $2 - EVENT_DISP $4, $7, $2 - EVENT_DISP $4, $7, $2 + warp_to $2, $7, $4 + db $12, $c7, $9, $7 + warp_to $2, $7, $4 + warp_to $2, $7, $4 + warp_to $2, $7, $4 diff --git a/data/mapObjects/route20.asm b/data/mapObjects/route20.asm index a3527525..0be02ca7 100755 --- a/data/mapObjects/route20.asm +++ b/data/mapObjects/route20.asm @@ -2,12 +2,12 @@ Route20Object: db $43 ; border block db $2 ; warps - db $5, $30, $0, SEAFOAM_ISLANDS_1 - db $9, $3a, $2, SEAFOAM_ISLANDS_1 + warp $30, $5, $0, SEAFOAM_ISLANDS_1 + warp $3a, $9, $2, SEAFOAM_ISLANDS_1 db $2 ; signs - db $7, $33, $b ; Route20Text11 - db $b, $39, $c ; Route20Text12 + sign $33, $7, $b ; Route20Text11 + sign $39, $b, $c ; Route20Text12 db $a ; objects object SPRITE_SWIMMER, $57, $8, STAY, UP, $1, OPP_SWIMMER, $9 @@ -22,5 +22,5 @@ Route20Object: object SPRITE_SWIMMER, $f, $8, STAY, UP, $a, OPP_BEAUTY, $8 ; warp-to - EVENT_DISP ROUTE_20_WIDTH, $5, $30 ; SEAFOAM_ISLANDS_1 - EVENT_DISP ROUTE_20_WIDTH, $9, $3a ; SEAFOAM_ISLANDS_1 + warp_to $30, $5, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1 + warp_to $3a, $9, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1 diff --git a/data/mapObjects/route22.asm b/data/mapObjects/route22.asm index ef568ae8..258c29a1 100755 --- a/data/mapObjects/route22.asm +++ b/data/mapObjects/route22.asm @@ -2,14 +2,14 @@ Route22Object: db $2c ; border block db $1 ; warps - db $5, $8, $0, ROUTE_22_GATE + warp $8, $5, $0, ROUTE_22_GATE db $1 ; signs - db $b, $7, $3 ; Route22FrontGateText + sign $7, $b, $3 ; Route22FrontGateText db $2 ; objects object SPRITE_BLUE, $19, $5, STAY, NONE, $1 ; person object SPRITE_BLUE, $19, $5, STAY, NONE, $2 ; person ; warp-to - EVENT_DISP ROUTE_22_WIDTH, $5, $8 ; ROUTE_22_GATE + warp_to $8, $5, ROUTE_22_WIDTH ; ROUTE_22_GATE diff --git a/data/mapObjects/route22gate.asm b/data/mapObjects/route22gate.asm index 2798311b..e321d95d 100755 --- a/data/mapObjects/route22gate.asm +++ b/data/mapObjects/route22gate.asm @@ -2,10 +2,10 @@ Route22GateObject: db $a ; border block db $4 ; warps - db $7, $4, $0, $ff - db $7, $5, $0, $ff - db $0, $4, $0, $ff - db $0, $5, $1, $ff + warp $4, $7, $0, $ff + warp $5, $7, $0, $ff + warp $4, $0, $0, $ff + warp $5, $0, $1, $ff db $0 ; signs @@ -13,7 +13,7 @@ Route22GateObject: object SPRITE_GUARD, $6, $2, STAY, LEFT, $1 ; person ; warp-to - EVENT_DISP ROUTE_22_GATE_WIDTH, $7, $4 - EVENT_DISP ROUTE_22_GATE_WIDTH, $7, $5 - EVENT_DISP ROUTE_22_GATE_WIDTH, $0, $4 - EVENT_DISP ROUTE_22_GATE_WIDTH, $0, $5 + warp_to $4, $7, ROUTE_22_GATE_WIDTH + warp_to $5, $7, ROUTE_22_GATE_WIDTH + warp_to $4, $0, ROUTE_22_GATE_WIDTH + warp_to $5, $0, ROUTE_22_GATE_WIDTH diff --git a/data/mapObjects/route23.asm b/data/mapObjects/route23.asm index 3995e510..08358bd9 100755 --- a/data/mapObjects/route23.asm +++ b/data/mapObjects/route23.asm @@ -2,13 +2,13 @@ Route23Object: db $f ; border block db $4 ; warps - db $8b, $7, $2, ROUTE_22_GATE - db $8b, $8, $3, ROUTE_22_GATE - db $1f, $4, $0, VICTORY_ROAD_1 - db $1f, $e, $1, VICTORY_ROAD_2 + warp $7, $8b, $2, ROUTE_22_GATE + warp $8, $8b, $3, ROUTE_22_GATE + warp $4, $1f, $0, VICTORY_ROAD_1 + warp $e, $1f, $1, VICTORY_ROAD_2 db $1 ; signs - db $21, $3, $8 ; Route23Text8 + sign $3, $21, $8 ; Route23Text8 db $7 ; objects object SPRITE_GUARD, $4, $23, STAY, DOWN, $1 ; person @@ -20,7 +20,7 @@ Route23Object: object SPRITE_GUARD, $8, $88, STAY, DOWN, $7 ; person ; warp-to - EVENT_DISP ROUTE_23_WIDTH, $8b, $7 ; ROUTE_22_GATE - EVENT_DISP ROUTE_23_WIDTH, $8b, $8 ; ROUTE_22_GATE - EVENT_DISP ROUTE_23_WIDTH, $1f, $4 ; VICTORY_ROAD_1 - EVENT_DISP ROUTE_23_WIDTH, $1f, $e ; VICTORY_ROAD_2 + warp_to $7, $8b, ROUTE_23_WIDTH ; ROUTE_22_GATE + warp_to $8, $8b, ROUTE_23_WIDTH ; ROUTE_22_GATE + warp_to $4, $1f, ROUTE_23_WIDTH ; VICTORY_ROAD_1 + warp_to $e, $1f, ROUTE_23_WIDTH ; VICTORY_ROAD_2 diff --git a/data/mapObjects/route25.asm b/data/mapObjects/route25.asm index b26f62ef..d0870b13 100755 --- a/data/mapObjects/route25.asm +++ b/data/mapObjects/route25.asm @@ -2,10 +2,10 @@ Route25Object: db $2c ; border block db $1 ; warps - db $3, $2d, $0, BILLS_HOUSE + warp $2d, $3, $0, BILLS_HOUSE db $1 ; signs - db $3, $2b, $b ; Route25Text11 + sign $2b, $3, $b ; Route25Text11 db $a ; objects object SPRITE_BUG_CATCHER, $e, $2, STAY, DOWN, $1, OPP_YOUNGSTER, $5 @@ -20,4 +20,4 @@ Route25Object: object SPRITE_BALL, $16, $2, STAY, NONE, $a, TM_19 ; warp-to - EVENT_DISP ROUTE_25_WIDTH, $3, $2d ; BILLS_HOUSE + warp_to $2d, $3, ROUTE_25_WIDTH ; BILLS_HOUSE diff --git a/data/mapObjects/route2gate.asm b/data/mapObjects/route2gate.asm index 53590f69..4caba6e1 100755 --- a/data/mapObjects/route2gate.asm +++ b/data/mapObjects/route2gate.asm @@ -2,10 +2,10 @@ Route2GateObject: db $a ; border block db $4 ; warps - db $0, $4, $3, $ff - db $0, $5, $3, $ff - db $7, $4, $4, $ff - db $7, $5, $4, $ff + warp $4, $0, $3, $ff + warp $5, $0, $3, $ff + warp $4, $7, $4, $ff + warp $5, $7, $4, $ff db $0 ; signs @@ -14,7 +14,7 @@ Route2GateObject: object SPRITE_BUG_CATCHER, $5, $4, WALK, $2, $2 ; person ; warp-to - EVENT_DISP ROUTE_2_GATE_WIDTH, $0, $4 - EVENT_DISP ROUTE_2_GATE_WIDTH, $0, $5 - EVENT_DISP ROUTE_2_GATE_WIDTH, $7, $4 - EVENT_DISP ROUTE_2_GATE_WIDTH, $7, $5 + warp_to $4, $0, ROUTE_2_GATE_WIDTH + warp_to $5, $0, ROUTE_2_GATE_WIDTH + warp_to $4, $7, ROUTE_2_GATE_WIDTH + warp_to $5, $7, ROUTE_2_GATE_WIDTH diff --git a/data/mapObjects/route2house.asm b/data/mapObjects/route2house.asm index d6665020..70991e43 100755 --- a/data/mapObjects/route2house.asm +++ b/data/mapObjects/route2house.asm @@ -2,8 +2,8 @@ Route2HouseObject: db $a ; border block db $2 ; warps - db $7, $2, $2, $ff - db $7, $3, $2, $ff + warp $2, $7, $2, $ff + warp $3, $7, $2, $ff db $0 ; signs @@ -12,5 +12,5 @@ Route2HouseObject: object SPRITE_GAMEBOY_KID_COPY, $4, $1, STAY, DOWN, $2 ; person ; warp-to - EVENT_DISP ROUTE_2_HOUSE_WIDTH, $7, $2 - EVENT_DISP ROUTE_2_HOUSE_WIDTH, $7, $3 + warp_to $2, $7, ROUTE_2_HOUSE_WIDTH + warp_to $3, $7, ROUTE_2_HOUSE_WIDTH diff --git a/data/mapObjects/route3.asm b/data/mapObjects/route3.asm index ba446dca..44c80382 100755 --- a/data/mapObjects/route3.asm +++ b/data/mapObjects/route3.asm @@ -4,7 +4,7 @@ Route3Object: db $0 ; warps db $1 ; signs - db $9, $3b, $a ; Route3Text10 + sign $3b, $9, $a ; Route3Text10 db $9 ; objects object SPRITE_BLACK_HAIR_BOY_2, $39, $b, STAY, NONE, $1 ; person diff --git a/data/mapObjects/route4.asm b/data/mapObjects/route4.asm index e52f4909..c997212e 100755 --- a/data/mapObjects/route4.asm +++ b/data/mapObjects/route4.asm @@ -2,14 +2,14 @@ Route4Object: db $2c ; border block db $3 ; warps - db $5, $b, $0, MT_MOON_POKECENTER - db $5, $12, $0, MT_MOON_1 - db $5, $18, $7, MT_MOON_2 + warp $b, $5, $0, MT_MOON_POKECENTER + warp $12, $5, $0, MT_MOON_1 + warp $18, $5, $7, MT_MOON_2 db $3 ; signs - db $5, $c, $4 ; PokeCenterSignText - db $7, $11, $5 ; Route4Text5 - db $7, $1b, $6 ; Route4Text6 + sign $c, $5, $4 ; PokeCenterSignText + sign $11, $7, $5 ; Route4Text5 + sign $1b, $7, $6 ; Route4Text6 db $3 ; objects object SPRITE_LASS, $9, $8, WALK, $0, $1 ; person @@ -17,6 +17,6 @@ Route4Object: object SPRITE_BALL, $39, $3, STAY, NONE, $3, TM_04 ; warp-to - EVENT_DISP ROUTE_4_WIDTH, $5, $b ; MT_MOON_POKECENTER - EVENT_DISP ROUTE_4_WIDTH, $5, $12 ; MT_MOON_1 - EVENT_DISP ROUTE_4_WIDTH, $5, $18 ; MT_MOON_2 + warp_to $b, $5, ROUTE_4_WIDTH ; MT_MOON_POKECENTER + warp_to $12, $5, ROUTE_4_WIDTH ; MT_MOON_1 + warp_to $18, $5, ROUTE_4_WIDTH ; MT_MOON_2 diff --git a/data/mapObjects/route5.asm b/data/mapObjects/route5.asm index 6065f599..e9048db8 100755 --- a/data/mapObjects/route5.asm +++ b/data/mapObjects/route5.asm @@ -2,20 +2,20 @@ Route5Object: db $a ; border block db $5 ; warps - db $1d, $a, $3, 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 - db $15, $a, $0, DAYCAREM + warp $a, $1d, $3, ROUTE_5_GATE + warp $9, $1d, $2, ROUTE_5_GATE + warp $a, $21, $0, ROUTE_5_GATE + warp $11, $1b, $0, PATH_ENTRANCE_ROUTE_5 + warp $a, $15, $0, DAYCAREM db $1 ; signs - db $1d, $11, $1 ; Route5Text1 + sign $11, $1d, $1 ; Route5Text1 db $0 ; objects ; warp-to - EVENT_DISP ROUTE_5_WIDTH, $1d, $a ; ROUTE_5_GATE - EVENT_DISP ROUTE_5_WIDTH, $1d, $9 ; ROUTE_5_GATE - EVENT_DISP ROUTE_5_WIDTH, $21, $a ; ROUTE_5_GATE - EVENT_DISP ROUTE_5_WIDTH, $1b, $11 ; PATH_ENTRANCE_ROUTE_5 - EVENT_DISP ROUTE_5_WIDTH, $15, $a ; DAYCAREM + warp_to $a, $1d, ROUTE_5_WIDTH ; ROUTE_5_GATE + warp_to $9, $1d, ROUTE_5_WIDTH ; ROUTE_5_GATE + warp_to $a, $21, ROUTE_5_WIDTH ; ROUTE_5_GATE + warp_to $11, $1b, ROUTE_5_WIDTH ; PATH_ENTRANCE_ROUTE_5 + warp_to $a, $15, ROUTE_5_WIDTH ; DAYCAREM diff --git a/data/mapObjects/route5gate.asm b/data/mapObjects/route5gate.asm index 9588f511..453412f7 100755 --- a/data/mapObjects/route5gate.asm +++ b/data/mapObjects/route5gate.asm @@ -2,10 +2,10 @@ Route5GateObject: db $a ; border block db $4 ; warps - db $5, $3, $2, $ff - db $5, $4, $2, $ff - db $0, $3, $1, $ff - db $0, $4, $0, $ff + warp $3, $5, $2, $ff + warp $4, $5, $2, $ff + warp $3, $0, $1, $ff + warp $4, $0, $0, $ff db $0 ; signs @@ -13,7 +13,7 @@ Route5GateObject: object SPRITE_GUARD, $1, $3, STAY, RIGHT, $1 ; person ; warp-to - EVENT_DISP ROUTE_5_GATE_WIDTH, $5, $3 - EVENT_DISP ROUTE_5_GATE_WIDTH, $5, $4 - EVENT_DISP ROUTE_5_GATE_WIDTH, $0, $3 - EVENT_DISP ROUTE_5_GATE_WIDTH, $0, $4 + warp_to $3, $5, ROUTE_5_GATE_WIDTH + warp_to $4, $5, ROUTE_5_GATE_WIDTH + warp_to $3, $0, ROUTE_5_GATE_WIDTH + warp_to $4, $0, ROUTE_5_GATE_WIDTH diff --git a/data/mapObjects/route6.asm b/data/mapObjects/route6.asm index bfd88fac..c7b505d4 100755 --- a/data/mapObjects/route6.asm +++ b/data/mapObjects/route6.asm @@ -2,13 +2,13 @@ Route6Object: db $f ; border block db $4 ; warps - db $1, $9, $2, ROUTE_6_GATE - db $1, $a, $2, ROUTE_6_GATE - db $7, $a, $0, ROUTE_6_GATE - db $d, $11, $0, PATH_ENTRANCE_ROUTE_6 + warp $9, $1, $2, ROUTE_6_GATE + warp $a, $1, $2, ROUTE_6_GATE + warp $a, $7, $0, ROUTE_6_GATE + warp $11, $d, $0, PATH_ENTRANCE_ROUTE_6 db $1 ; signs - db $f, $13, $7 ; Route6Text7 + sign $13, $f, $7 ; Route6Text7 db $6 ; objects object SPRITE_BLACK_HAIR_BOY_1, $a, $15, STAY, RIGHT, $1, OPP_JR_TRAINER_M, $4 @@ -19,7 +19,7 @@ Route6Object: object SPRITE_BUG_CATCHER, $13, $1a, STAY, LEFT, $6, OPP_BUG_CATCHER, $b ; warp-to - EVENT_DISP ROUTE_6_WIDTH, $1, $9 ; ROUTE_6_GATE - EVENT_DISP ROUTE_6_WIDTH, $1, $a ; ROUTE_6_GATE - EVENT_DISP ROUTE_6_WIDTH, $7, $a ; ROUTE_6_GATE - EVENT_DISP ROUTE_6_WIDTH, $d, $11 ; PATH_ENTRANCE_ROUTE_6 + warp_to $9, $1, ROUTE_6_WIDTH ; ROUTE_6_GATE + warp_to $a, $1, ROUTE_6_WIDTH ; ROUTE_6_GATE + warp_to $a, $7, ROUTE_6_WIDTH ; ROUTE_6_GATE + warp_to $11, $d, ROUTE_6_WIDTH ; PATH_ENTRANCE_ROUTE_6 diff --git a/data/mapObjects/route6gate.asm b/data/mapObjects/route6gate.asm index 79f17007..2c52f0d6 100755 --- a/data/mapObjects/route6gate.asm +++ b/data/mapObjects/route6gate.asm @@ -2,10 +2,10 @@ Route6GateObject: db $a ; border block db $4 ; warps - db $5, $3, $2, $ff - db $5, $4, $2, $ff - db $0, $3, $1, $ff - db $0, $4, $1, $ff + warp $3, $5, $2, $ff + warp $4, $5, $2, $ff + warp $3, $0, $1, $ff + warp $4, $0, $1, $ff db $0 ; signs @@ -13,7 +13,7 @@ Route6GateObject: object SPRITE_GUARD, $6, $2, STAY, LEFT, $1 ; person ; warp-to - EVENT_DISP ROUTE_6_GATE_WIDTH, $5, $3 - EVENT_DISP ROUTE_6_GATE_WIDTH, $5, $4 - EVENT_DISP ROUTE_6_GATE_WIDTH, $0, $3 - EVENT_DISP ROUTE_6_GATE_WIDTH, $0, $4 + warp_to $3, $5, ROUTE_6_GATE_WIDTH + warp_to $4, $5, ROUTE_6_GATE_WIDTH + warp_to $3, $0, ROUTE_6_GATE_WIDTH + warp_to $4, $0, ROUTE_6_GATE_WIDTH diff --git a/data/mapObjects/route7.asm b/data/mapObjects/route7.asm index d039cb3c..44982068 100755 --- a/data/mapObjects/route7.asm +++ b/data/mapObjects/route7.asm @@ -2,20 +2,20 @@ Route7Object: db $f ; border block db $5 ; warps - db $9, $12, $2, ROUTE_7_GATE - db $a, $12, $3, ROUTE_7_GATE - db $9, $b, $0, ROUTE_7_GATE - db $a, $b, $1, ROUTE_7_GATE - db $d, $5, $0, PATH_ENTRANCE_ROUTE_7 + warp $12, $9, $2, ROUTE_7_GATE + warp $12, $a, $3, ROUTE_7_GATE + warp $b, $9, $0, ROUTE_7_GATE + warp $b, $a, $1, ROUTE_7_GATE + warp $5, $d, $0, PATH_ENTRANCE_ROUTE_7 db $1 ; signs - db $d, $3, $1 ; Route7Text1 + sign $3, $d, $1 ; Route7Text1 db $0 ; objects ; warp-to - EVENT_DISP ROUTE_7_WIDTH, $9, $12 ; ROUTE_7_GATE - EVENT_DISP ROUTE_7_WIDTH, $a, $12 ; ROUTE_7_GATE - EVENT_DISP ROUTE_7_WIDTH, $9, $b ; ROUTE_7_GATE - EVENT_DISP ROUTE_7_WIDTH, $a, $b ; ROUTE_7_GATE - EVENT_DISP ROUTE_7_WIDTH, $d, $5 ; PATH_ENTRANCE_ROUTE_7 + warp_to $12, $9, ROUTE_7_WIDTH ; ROUTE_7_GATE + warp_to $12, $a, ROUTE_7_WIDTH ; ROUTE_7_GATE + warp_to $b, $9, ROUTE_7_WIDTH ; ROUTE_7_GATE + warp_to $b, $a, ROUTE_7_WIDTH ; ROUTE_7_GATE + warp_to $5, $d, ROUTE_7_WIDTH ; PATH_ENTRANCE_ROUTE_7 diff --git a/data/mapObjects/route7gate.asm b/data/mapObjects/route7gate.asm index 3aea6a88..293be913 100755 --- a/data/mapObjects/route7gate.asm +++ b/data/mapObjects/route7gate.asm @@ -2,10 +2,10 @@ Route7GateObject: db $a ; border block db $4 ; warps - db $3, $0, $3, $ff - db $4, $0, $3, $ff - db $3, $5, $0, $ff - db $4, $5, $1, $ff + warp $0, $3, $3, $ff + warp $0, $4, $3, $ff + warp $5, $3, $0, $ff + warp $5, $4, $1, $ff db $0 ; signs @@ -13,7 +13,7 @@ Route7GateObject: object SPRITE_GUARD, $3, $1, STAY, DOWN, $1 ; person ; warp-to - EVENT_DISP ROUTE_7_GATE_WIDTH, $3, $0 - EVENT_DISP ROUTE_7_GATE_WIDTH, $4, $0 - EVENT_DISP ROUTE_7_GATE_WIDTH, $3, $5 - EVENT_DISP ROUTE_7_GATE_WIDTH, $4, $5 + warp_to $0, $3, ROUTE_7_GATE_WIDTH + warp_to $0, $4, ROUTE_7_GATE_WIDTH + warp_to $5, $3, ROUTE_7_GATE_WIDTH + warp_to $5, $4, ROUTE_7_GATE_WIDTH diff --git a/data/mapObjects/route8.asm b/data/mapObjects/route8.asm index 8aa16b82..c3e35f92 100755 --- a/data/mapObjects/route8.asm +++ b/data/mapObjects/route8.asm @@ -2,14 +2,14 @@ Route8Object: db $2c ; border block db $5 ; warps - db $9, $1, $0, ROUTE_8_GATE - db $a, $1, $1, ROUTE_8_GATE - db $9, $8, $2, ROUTE_8_GATE - db $a, $8, $3, ROUTE_8_GATE - db $3, $d, $0, PATH_ENTRANCE_ROUTE_8 + warp $1, $9, $0, ROUTE_8_GATE + warp $1, $a, $1, ROUTE_8_GATE + warp $8, $9, $2, ROUTE_8_GATE + warp $8, $a, $3, ROUTE_8_GATE + warp $d, $3, $0, PATH_ENTRANCE_ROUTE_8 db $1 ; signs - db $3, $11, $a ; Route8Text10 + sign $11, $3, $a ; Route8Text10 db $9 ; objects object SPRITE_BLACK_HAIR_BOY_2, $8, $5, STAY, RIGHT, $1, OPP_SUPER_NERD, $3 @@ -23,8 +23,8 @@ Route8Object: object SPRITE_LASS, $33, $c, STAY, LEFT, $9, OPP_LASS, $10 ; warp-to - EVENT_DISP ROUTE_8_WIDTH, $9, $1 ; ROUTE_8_GATE - EVENT_DISP ROUTE_8_WIDTH, $a, $1 ; ROUTE_8_GATE - EVENT_DISP ROUTE_8_WIDTH, $9, $8 ; ROUTE_8_GATE - EVENT_DISP ROUTE_8_WIDTH, $a, $8 ; ROUTE_8_GATE - EVENT_DISP ROUTE_8_WIDTH, $3, $d ; PATH_ENTRANCE_ROUTE_8 + warp_to $1, $9, ROUTE_8_WIDTH ; ROUTE_8_GATE + warp_to $1, $a, ROUTE_8_WIDTH ; ROUTE_8_GATE + warp_to $8, $9, ROUTE_8_WIDTH ; ROUTE_8_GATE + warp_to $8, $a, ROUTE_8_WIDTH ; ROUTE_8_GATE + warp_to $d, $3, ROUTE_8_WIDTH ; PATH_ENTRANCE_ROUTE_8 diff --git a/data/mapObjects/route8gate.asm b/data/mapObjects/route8gate.asm index b059fb36..46ed94dd 100755 --- a/data/mapObjects/route8gate.asm +++ b/data/mapObjects/route8gate.asm @@ -2,10 +2,10 @@ Route8GateObject: db $a ; border block db $4 ; warps - db $3, $0, $0, $ff - db $4, $0, $1, $ff - db $3, $5, $2, $ff - db $4, $5, $3, $ff + warp $0, $3, $0, $ff + warp $0, $4, $1, $ff + warp $5, $3, $2, $ff + warp $5, $4, $3, $ff db $0 ; signs @@ -13,7 +13,7 @@ Route8GateObject: object SPRITE_GUARD, $2, $1, STAY, DOWN, $1 ; person ; warp-to - EVENT_DISP ROUTE_8_GATE_WIDTH, $3, $0 - EVENT_DISP ROUTE_8_GATE_WIDTH, $4, $0 - EVENT_DISP ROUTE_8_GATE_WIDTH, $3, $5 - EVENT_DISP ROUTE_8_GATE_WIDTH, $4, $5 + warp_to $0, $3, ROUTE_8_GATE_WIDTH + warp_to $0, $4, ROUTE_8_GATE_WIDTH + warp_to $5, $3, ROUTE_8_GATE_WIDTH + warp_to $5, $4, ROUTE_8_GATE_WIDTH diff --git a/data/mapObjects/route9.asm b/data/mapObjects/route9.asm index 9e079eab..848c6924 100755 --- a/data/mapObjects/route9.asm +++ b/data/mapObjects/route9.asm @@ -4,7 +4,7 @@ Route9Object: db $0 ; warps db $1 ; signs - db $7, $19, $b ; Route9Text11 + sign $19, $7, $b ; Route9Text11 db $a ; objects object SPRITE_LASS, $d, $a, STAY, LEFT, $1, OPP_JR_TRAINER_F, $5 diff --git a/data/mapObjects/safarizonecenter.asm b/data/mapObjects/safarizonecenter.asm index b5fa0107..681e81e1 100755 --- a/data/mapObjects/safarizonecenter.asm +++ b/data/mapObjects/safarizonecenter.asm @@ -2,30 +2,30 @@ SafariZoneCenterObject: db $0 ; border block db $9 ; warps - db $19, $e, $2, SAFARI_ZONE_ENTRANCE - db $19, $f, $3, SAFARI_ZONE_ENTRANCE - db $a, $0, $4, SAFARI_ZONE_WEST - db $b, $0, $5, SAFARI_ZONE_WEST - db $0, $e, $4, SAFARI_ZONE_NORTH - db $0, $f, $5, SAFARI_ZONE_NORTH - db $a, $1d, $2, SAFARI_ZONE_EAST - db $b, $1d, $3, SAFARI_ZONE_EAST - db $13, $11, $0, SAFARI_ZONE_REST_HOUSE_1 + warp $e, $19, $2, SAFARI_ZONE_ENTRANCE + warp $f, $19, $3, SAFARI_ZONE_ENTRANCE + warp $0, $a, $4, SAFARI_ZONE_WEST + warp $0, $b, $5, SAFARI_ZONE_WEST + warp $e, $0, $4, SAFARI_ZONE_NORTH + warp $f, $0, $5, SAFARI_ZONE_NORTH + warp $1d, $a, $2, SAFARI_ZONE_EAST + warp $1d, $b, $3, SAFARI_ZONE_EAST + warp $11, $13, $0, SAFARI_ZONE_REST_HOUSE_1 db $2 ; signs - db $14, $12, $2 ; SafariZoneCenterText2 - db $16, $e, $3 ; SafariZoneCenterText3 + sign $12, $14, $2 ; SafariZoneCenterText2 + sign $e, $16, $3 ; SafariZoneCenterText3 db $1 ; objects object SPRITE_BALL, $e, $a, STAY, NONE, $1, NUGGET ; warp-to - EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $19, $e ; SAFARI_ZONE_ENTRANCE - EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $19, $f ; SAFARI_ZONE_ENTRANCE - EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $a, $0 ; SAFARI_ZONE_WEST - EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $b, $0 ; SAFARI_ZONE_WEST - EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $0, $e ; SAFARI_ZONE_NORTH - EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $0, $f ; SAFARI_ZONE_NORTH - EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $a, $1d ; SAFARI_ZONE_EAST - EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $b, $1d ; SAFARI_ZONE_EAST - EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $13, $11 ; SAFARI_ZONE_REST_HOUSE_1 + warp_to $e, $19, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_ENTRANCE + warp_to $f, $19, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_ENTRANCE + warp_to $0, $a, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST + warp_to $0, $b, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST + warp_to $e, $0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH + warp_to $f, $0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH + warp_to $1d, $a, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST + warp_to $1d, $b, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST + warp_to $11, $13, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_REST_HOUSE_1 diff --git a/data/mapObjects/safarizoneeast.asm b/data/mapObjects/safarizoneeast.asm index 6c2f8138..4ce97b87 100755 --- a/data/mapObjects/safarizoneeast.asm +++ b/data/mapObjects/safarizoneeast.asm @@ -2,16 +2,16 @@ SafariZoneEastObject: db $0 ; border block db $5 ; warps - db $4, $0, $6, SAFARI_ZONE_NORTH - db $5, $0, $7, SAFARI_ZONE_NORTH - db $16, $0, $6, SAFARI_ZONE_CENTER - db $17, $0, $6, SAFARI_ZONE_CENTER - db $9, $19, $0, SAFARI_ZONE_REST_HOUSE_3 + warp $0, $4, $6, SAFARI_ZONE_NORTH + warp $0, $5, $7, SAFARI_ZONE_NORTH + warp $0, $16, $6, SAFARI_ZONE_CENTER + warp $0, $17, $6, SAFARI_ZONE_CENTER + warp $19, $9, $0, SAFARI_ZONE_REST_HOUSE_3 db $3 ; signs - db $a, $1a, $5 ; SafariZoneEastText5 - db $4, $6, $6 ; SafariZoneEastText6 - db $17, $5, $7 ; SafariZoneEastText7 + sign $1a, $a, $5 ; SafariZoneEastText5 + sign $6, $4, $6 ; SafariZoneEastText6 + sign $5, $17, $7 ; SafariZoneEastText7 db $4 ; objects object SPRITE_BALL, $15, $a, STAY, NONE, $1, FULL_RESTORE @@ -20,8 +20,8 @@ SafariZoneEastObject: object SPRITE_BALL, $f, $c, STAY, NONE, $4, TM_37 ; warp-to - EVENT_DISP SAFARI_ZONE_EAST_WIDTH, $4, $0 ; SAFARI_ZONE_NORTH - EVENT_DISP SAFARI_ZONE_EAST_WIDTH, $5, $0 ; SAFARI_ZONE_NORTH - EVENT_DISP SAFARI_ZONE_EAST_WIDTH, $16, $0 ; SAFARI_ZONE_CENTER - EVENT_DISP SAFARI_ZONE_EAST_WIDTH, $17, $0 ; SAFARI_ZONE_CENTER - EVENT_DISP SAFARI_ZONE_EAST_WIDTH, $9, $19 ; SAFARI_ZONE_REST_HOUSE_3 + warp_to $0, $4, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_NORTH + warp_to $0, $5, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_NORTH + warp_to $0, $16, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_CENTER + warp_to $0, $17, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_CENTER + warp_to $19, $9, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_REST_HOUSE_3 diff --git a/data/mapObjects/safarizoneentrance.asm b/data/mapObjects/safarizoneentrance.asm index 9d26aa17..5154e8e0 100755 --- a/data/mapObjects/safarizoneentrance.asm +++ b/data/mapObjects/safarizoneentrance.asm @@ -2,10 +2,10 @@ SafariZoneEntranceObject: db $a ; border block db $4 ; warps - db $5, $3, $4, $ff - db $5, $4, $4, $ff - db $0, $3, $0, SAFARI_ZONE_CENTER - db $0, $4, $1, SAFARI_ZONE_CENTER + warp $3, $5, $4, $ff + warp $4, $5, $4, $ff + warp $3, $0, $0, SAFARI_ZONE_CENTER + warp $4, $0, $1, SAFARI_ZONE_CENTER db $0 ; signs @@ -14,7 +14,7 @@ SafariZoneEntranceObject: object SPRITE_WHITE_PLAYER, $1, $4, STAY, RIGHT, $2 ; person ; warp-to - EVENT_DISP SAFARI_ZONE_ENTRANCE_WIDTH, $5, $3 - EVENT_DISP SAFARI_ZONE_ENTRANCE_WIDTH, $5, $4 - EVENT_DISP SAFARI_ZONE_ENTRANCE_WIDTH, $0, $3 ; SAFARI_ZONE_CENTER - EVENT_DISP SAFARI_ZONE_ENTRANCE_WIDTH, $0, $4 ; SAFARI_ZONE_CENTER + warp_to $3, $5, SAFARI_ZONE_ENTRANCE_WIDTH + warp_to $4, $5, SAFARI_ZONE_ENTRANCE_WIDTH + warp_to $3, $0, SAFARI_ZONE_ENTRANCE_WIDTH ; SAFARI_ZONE_CENTER + warp_to $4, $0, SAFARI_ZONE_ENTRANCE_WIDTH ; SAFARI_ZONE_CENTER diff --git a/data/mapObjects/safarizonenorth.asm b/data/mapObjects/safarizonenorth.asm index d0305507..421cd4e2 100755 --- a/data/mapObjects/safarizonenorth.asm +++ b/data/mapObjects/safarizonenorth.asm @@ -2,34 +2,34 @@ SafariZoneNorthObject: db $0 ; border block db $9 ; warps - db $23, $2, $0, SAFARI_ZONE_WEST - db $23, $3, $1, SAFARI_ZONE_WEST - db $23, $8, $2, SAFARI_ZONE_WEST - db $23, $9, $3, SAFARI_ZONE_WEST - db $23, $14, $4, SAFARI_ZONE_CENTER - db $23, $15, $5, SAFARI_ZONE_CENTER - db $1e, $27, $0, SAFARI_ZONE_EAST - db $1f, $27, $1, SAFARI_ZONE_EAST - db $3, $23, $0, SAFARI_ZONE_REST_HOUSE_4 + warp $2, $23, $0, SAFARI_ZONE_WEST + warp $3, $23, $1, SAFARI_ZONE_WEST + warp $8, $23, $2, SAFARI_ZONE_WEST + warp $9, $23, $3, SAFARI_ZONE_WEST + warp $14, $23, $4, SAFARI_ZONE_CENTER + warp $15, $23, $5, SAFARI_ZONE_CENTER + warp $27, $1e, $0, SAFARI_ZONE_EAST + warp $27, $1f, $1, SAFARI_ZONE_EAST + warp $23, $3, $0, SAFARI_ZONE_REST_HOUSE_4 db $5 ; signs - db $4, $24, $3 ; SafariZoneNorthText3 - db $19, $4, $4 ; SafariZoneNorthText4 - db $1f, $d, $5 ; SafariZoneNorthText5 - db $21, $13, $6 ; SafariZoneNorthText6 - db $1c, $1a, $7 ; SafariZoneNorthText7 + sign $24, $4, $3 ; SafariZoneNorthText3 + sign $4, $19, $4 ; SafariZoneNorthText4 + sign $d, $1f, $5 ; SafariZoneNorthText5 + sign $13, $21, $6 ; SafariZoneNorthText6 + sign $1a, $1c, $7 ; SafariZoneNorthText7 db $2 ; objects object SPRITE_BALL, $19, $1, STAY, NONE, $1, PROTEIN object SPRITE_BALL, $13, $7, STAY, NONE, $2, TM_40 ; warp-to - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $2 ; SAFARI_ZONE_WEST - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $3 ; SAFARI_ZONE_WEST - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $8 ; SAFARI_ZONE_WEST - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $9 ; SAFARI_ZONE_WEST - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $14 ; SAFARI_ZONE_CENTER - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $15 ; SAFARI_ZONE_CENTER - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $1e, $27 ; SAFARI_ZONE_EAST - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $1f, $27 ; SAFARI_ZONE_EAST - EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $3, $23 ; SAFARI_ZONE_REST_HOUSE_4 + warp_to $2, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST + warp_to $3, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST + warp_to $8, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST + warp_to $9, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST + warp_to $14, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER + warp_to $15, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER + warp_to $27, $1e, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST + warp_to $27, $1f, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST + warp_to $23, $3, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_REST_HOUSE_4 diff --git a/data/mapObjects/safarizoneresthouse1.asm b/data/mapObjects/safarizoneresthouse1.asm index 79156825..ded590c8 100755 --- a/data/mapObjects/safarizoneresthouse1.asm +++ b/data/mapObjects/safarizoneresthouse1.asm @@ -2,8 +2,8 @@ SafariZoneRestHouse1Object: db $a ; border block db $2 ; warps - db $7, $2, $8, SAFARI_ZONE_CENTER - db $7, $3, $8, SAFARI_ZONE_CENTER + warp $2, $7, $8, SAFARI_ZONE_CENTER + warp $3, $7, $8, SAFARI_ZONE_CENTER db $0 ; signs @@ -12,5 +12,5 @@ SafariZoneRestHouse1Object: object SPRITE_OAK_AIDE, $1, $4, WALK, $1, $2 ; person ; warp-to - EVENT_DISP SAFARI_ZONE_REST_HOUSE_1_WIDTH, $7, $2 ; SAFARI_ZONE_CENTER - EVENT_DISP SAFARI_ZONE_REST_HOUSE_1_WIDTH, $7, $3 ; SAFARI_ZONE_CENTER + warp_to $2, $7, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; SAFARI_ZONE_CENTER + warp_to $3, $7, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; SAFARI_ZONE_CENTER diff --git a/data/mapObjects/safarizoneresthouse2.asm b/data/mapObjects/safarizoneresthouse2.asm index 82f04f9d..0532c505 100755 --- a/data/mapObjects/safarizoneresthouse2.asm +++ b/data/mapObjects/safarizoneresthouse2.asm @@ -2,8 +2,8 @@ SafariZoneRestHouse2Object: db $a ; border block db $2 ; warps - db $7, $2, $7, SAFARI_ZONE_WEST - db $7, $3, $7, SAFARI_ZONE_WEST + warp $2, $7, $7, SAFARI_ZONE_WEST + warp $3, $7, $7, SAFARI_ZONE_WEST db $0 ; signs @@ -13,5 +13,5 @@ SafariZoneRestHouse2Object: object SPRITE_ERIKA, $6, $2, STAY, DOWN, $3 ; person ; warp-to - EVENT_DISP SAFARI_ZONE_REST_HOUSE_2_WIDTH, $7, $2 ; SAFARI_ZONE_WEST - EVENT_DISP SAFARI_ZONE_REST_HOUSE_2_WIDTH, $7, $3 ; SAFARI_ZONE_WEST + warp_to $2, $7, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; SAFARI_ZONE_WEST + warp_to $3, $7, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; SAFARI_ZONE_WEST diff --git a/data/mapObjects/safarizoneresthouse3.asm b/data/mapObjects/safarizoneresthouse3.asm index ae973fa8..a83e451a 100755 --- a/data/mapObjects/safarizoneresthouse3.asm +++ b/data/mapObjects/safarizoneresthouse3.asm @@ -2,8 +2,8 @@ SafariZoneRestHouse3Object: db $a ; border block db $2 ; warps - db $7, $2, $4, SAFARI_ZONE_EAST - db $7, $3, $4, SAFARI_ZONE_EAST + warp $2, $7, $4, SAFARI_ZONE_EAST + warp $3, $7, $4, SAFARI_ZONE_EAST db $0 ; signs @@ -13,5 +13,5 @@ SafariZoneRestHouse3Object: object SPRITE_LAPRAS_GIVER, $5, $2, STAY, NONE, $3 ; person ; warp-to - EVENT_DISP SAFARI_ZONE_REST_HOUSE_3_WIDTH, $7, $2 ; SAFARI_ZONE_EAST - EVENT_DISP SAFARI_ZONE_REST_HOUSE_3_WIDTH, $7, $3 ; SAFARI_ZONE_EAST + warp_to $2, $7, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; SAFARI_ZONE_EAST + warp_to $3, $7, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; SAFARI_ZONE_EAST diff --git a/data/mapObjects/safarizoneresthouse4.asm b/data/mapObjects/safarizoneresthouse4.asm index 7502732c..6db675ee 100755 --- a/data/mapObjects/safarizoneresthouse4.asm +++ b/data/mapObjects/safarizoneresthouse4.asm @@ -2,8 +2,8 @@ SafariZoneRestHouse4Object: db $a ; border block db $2 ; warps - db $7, $2, $8, SAFARI_ZONE_NORTH - db $7, $3, $8, SAFARI_ZONE_NORTH + warp $2, $7, $8, SAFARI_ZONE_NORTH + warp $3, $7, $8, SAFARI_ZONE_NORTH db $0 ; signs @@ -13,5 +13,5 @@ SafariZoneRestHouse4Object: object SPRITE_GENTLEMAN, $1, $5, WALK, $1, $3 ; person ; warp-to - EVENT_DISP SAFARI_ZONE_REST_HOUSE_4_WIDTH, $7, $2 ; SAFARI_ZONE_NORTH - EVENT_DISP SAFARI_ZONE_REST_HOUSE_4_WIDTH, $7, $3 ; SAFARI_ZONE_NORTH + warp_to $2, $7, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; SAFARI_ZONE_NORTH + warp_to $3, $7, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; SAFARI_ZONE_NORTH diff --git a/data/mapObjects/safarizonesecrethouse.asm b/data/mapObjects/safarizonesecrethouse.asm index a96115b8..dfefa02f 100755 --- a/data/mapObjects/safarizonesecrethouse.asm +++ b/data/mapObjects/safarizonesecrethouse.asm @@ -2,8 +2,8 @@ SafariZoneSecretHouseObject: db $17 ; border block db $2 ; warps - db $7, $2, $6, SAFARI_ZONE_WEST - db $7, $3, $6, SAFARI_ZONE_WEST + warp $2, $7, $6, SAFARI_ZONE_WEST + warp $3, $7, $6, SAFARI_ZONE_WEST db $0 ; signs @@ -11,5 +11,5 @@ SafariZoneSecretHouseObject: object SPRITE_FISHER, $3, $3, STAY, DOWN, $1 ; person ; warp-to - EVENT_DISP SAFARI_ZONE_SECRET_HOUSE_WIDTH, $7, $2 ; SAFARI_ZONE_WEST - EVENT_DISP SAFARI_ZONE_SECRET_HOUSE_WIDTH, $7, $3 ; SAFARI_ZONE_WEST + warp_to $2, $7, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; SAFARI_ZONE_WEST + warp_to $3, $7, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; SAFARI_ZONE_WEST diff --git a/data/mapObjects/safarizonewest.asm b/data/mapObjects/safarizonewest.asm index 64ed0876..6a667fcc 100755 --- a/data/mapObjects/safarizonewest.asm +++ b/data/mapObjects/safarizonewest.asm @@ -2,20 +2,20 @@ SafariZoneWestObject: db $0 ; border block db $8 ; warps - db $0, $14, $0, SAFARI_ZONE_NORTH - db $0, $15, $1, SAFARI_ZONE_NORTH - db $0, $1a, $2, SAFARI_ZONE_NORTH - db $0, $1b, $3, SAFARI_ZONE_NORTH - db $16, $1d, $2, SAFARI_ZONE_CENTER - db $17, $1d, $3, SAFARI_ZONE_CENTER - db $3, $3, $0, SAFARI_ZONE_SECRET_HOUSE - db $b, $b, $0, SAFARI_ZONE_REST_HOUSE_2 + warp $14, $0, $0, SAFARI_ZONE_NORTH + warp $15, $0, $1, SAFARI_ZONE_NORTH + warp $1a, $0, $2, SAFARI_ZONE_NORTH + warp $1b, $0, $3, SAFARI_ZONE_NORTH + warp $1d, $16, $2, SAFARI_ZONE_CENTER + warp $1d, $17, $3, SAFARI_ZONE_CENTER + warp $3, $3, $0, SAFARI_ZONE_SECRET_HOUSE + warp $b, $b, $0, SAFARI_ZONE_REST_HOUSE_2 db $4 ; signs - db $c, $c, $5 ; SafariZoneWestText5 - db $3, $11, $6 ; SafariZoneWestText6 - db $4, $1a, $7 ; SafariZoneWestText7 - db $16, $18, $8 ; SafariZoneWestText8 + sign $c, $c, $5 ; SafariZoneWestText5 + sign $11, $3, $6 ; SafariZoneWestText6 + sign $1a, $4, $7 ; SafariZoneWestText7 + sign $18, $16, $8 ; SafariZoneWestText8 db $4 ; objects object SPRITE_BALL, $8, $14, STAY, NONE, $1, MAX_POTION @@ -24,11 +24,11 @@ SafariZoneWestObject: object SPRITE_BALL, $13, $7, STAY, NONE, $4, GOLD_TEETH ; warp-to - EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $0, $14 ; SAFARI_ZONE_NORTH - EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $0, $15 ; SAFARI_ZONE_NORTH - EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $0, $1a ; SAFARI_ZONE_NORTH - EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $0, $1b ; SAFARI_ZONE_NORTH - EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $16, $1d ; SAFARI_ZONE_CENTER - EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $17, $1d ; SAFARI_ZONE_CENTER - EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $3, $3 ; SAFARI_ZONE_SECRET_HOUSE - EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $b, $b ; SAFARI_ZONE_REST_HOUSE_2 + warp_to $14, $0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH + warp_to $15, $0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH + warp_to $1a, $0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH + warp_to $1b, $0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH + warp_to $1d, $16, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER + warp_to $1d, $17, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER + warp_to $3, $3, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_SECRET_HOUSE + warp_to $b, $b, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_REST_HOUSE_2 diff --git a/data/mapObjects/saffroncity.asm b/data/mapObjects/saffroncity.asm index 7275800a..6c1c9b14 100755 --- a/data/mapObjects/saffroncity.asm +++ b/data/mapObjects/saffroncity.asm @@ -2,26 +2,26 @@ SaffronCityObject: db $f ; border block db $8 ; warps - db $5, $7, $0, COPYCATS_HOUSE_1F - db $3, $1a, $0, FIGHTING_DOJO - db $3, $22, $0, SAFFRON_GYM - db $b, $d, $0, SAFFRON_HOUSE_1 - db $b, $19, $0, SAFFRON_MART - db $15, $12, $0, SILPH_CO_1F - db $1d, $9, $0, SAFFRON_POKECENTER - db $1d, $1d, $0, SAFFRON_HOUSE_2 + warp $7, $5, $0, COPYCATS_HOUSE_1F + warp $1a, $3, $0, FIGHTING_DOJO + warp $22, $3, $0, SAFFRON_GYM + warp $d, $b, $0, SAFFRON_HOUSE_1 + warp $19, $b, $0, SAFFRON_MART + warp $12, $15, $0, SILPH_CO_1F + warp $9, $1d, $0, SAFFRON_POKECENTER + warp $1d, $1d, $0, SAFFRON_HOUSE_2 db $a ; signs - db $5, $11, $10 ; SaffronCityText16 - db $5, $1b, $11 ; SaffronCityText17 - db $5, $23, $12 ; SaffronCityText18 - db $b, $1a, $13 ; MartSignText - db $13, $27, $14 ; SaffronCityText20 - db $15, $5, $15 ; SaffronCityText21 - db $15, $f, $16 ; SaffronCityText22 - db $1d, $a, $17 ; PokeCenterSignText - db $1d, $1b, $18 ; SaffronCityText24 - db $13, $1, $19 ; SaffronCityText25 + sign $11, $5, $10 ; SaffronCityText16 + sign $1b, $5, $11 ; SaffronCityText17 + sign $23, $5, $12 ; SaffronCityText18 + sign $1a, $b, $13 ; MartSignText + sign $27, $13, $14 ; SaffronCityText20 + sign $5, $15, $15 ; SaffronCityText21 + sign $f, $15, $16 ; SaffronCityText22 + sign $a, $1d, $17 ; PokeCenterSignText + sign $1b, $1d, $18 ; SaffronCityText24 + sign $1, $13, $19 ; SaffronCityText25 db $f ; objects object SPRITE_ROCKET, $7, $6, STAY, NONE, $1 ; person @@ -41,11 +41,11 @@ SaffronCityObject: object SPRITE_ROCKET, $13, $16, STAY, DOWN, $f ; person ; warp-to - EVENT_DISP SAFFRON_CITY_WIDTH, $5, $7 ; COPYCATS_HOUSE_1F - EVENT_DISP SAFFRON_CITY_WIDTH, $3, $1a ; FIGHTING_DOJO - EVENT_DISP SAFFRON_CITY_WIDTH, $3, $22 ; SAFFRON_GYM - EVENT_DISP SAFFRON_CITY_WIDTH, $b, $d ; SAFFRON_HOUSE_1 - EVENT_DISP SAFFRON_CITY_WIDTH, $b, $19 ; SAFFRON_MART - EVENT_DISP SAFFRON_CITY_WIDTH, $15, $12 ; SILPH_CO_1F - EVENT_DISP SAFFRON_CITY_WIDTH, $1d, $9 ; SAFFRON_POKECENTER - EVENT_DISP SAFFRON_CITY_WIDTH, $1d, $1d ; SAFFRON_HOUSE_2 + warp_to $7, $5, SAFFRON_CITY_WIDTH ; COPYCATS_HOUSE_1F + warp_to $1a, $3, SAFFRON_CITY_WIDTH ; FIGHTING_DOJO + warp_to $22, $3, SAFFRON_CITY_WIDTH ; SAFFRON_GYM + warp_to $d, $b, SAFFRON_CITY_WIDTH ; SAFFRON_HOUSE_1 + warp_to $19, $b, SAFFRON_CITY_WIDTH ; SAFFRON_MART + warp_to $12, $15, SAFFRON_CITY_WIDTH ; SILPH_CO_1F + warp_to $9, $1d, SAFFRON_CITY_WIDTH ; SAFFRON_POKECENTER + warp_to $1d, $1d, SAFFRON_CITY_WIDTH ; SAFFRON_HOUSE_2 diff --git a/data/mapObjects/saffrongym.asm b/data/mapObjects/saffrongym.asm index 6a770fdc..95e44aa9 100755 --- a/data/mapObjects/saffrongym.asm +++ b/data/mapObjects/saffrongym.asm @@ -2,38 +2,38 @@ SaffronGymObject: db $2e ; border block db $20 ; warps - db $11, $8, $2, $ff - db $11, $9, $2, $ff - db $3, $1, $16, SAFFRON_GYM - db $3, $5, $f, SAFFRON_GYM - db $5, $1, $12, SAFFRON_GYM - db $5, $5, $8, SAFFRON_GYM - db $9, $1, $1b, SAFFRON_GYM - db $9, $5, $10, SAFFRON_GYM - db $b, $1, $5, SAFFRON_GYM - db $b, $5, $d, SAFFRON_GYM - db $f, $1, $17, SAFFRON_GYM - db $f, $5, $1e, SAFFRON_GYM - db $11, $1, $11, SAFFRON_GYM - db $11, $5, $9, SAFFRON_GYM - db $3, $9, $1a, SAFFRON_GYM - db $3, $b, $3, SAFFRON_GYM - db $5, $9, $7, SAFFRON_GYM - db $5, $b, $c, SAFFRON_GYM - db $b, $b, $4, SAFFRON_GYM - db $f, $b, $1f, SAFFRON_GYM - db $3, $f, $18, SAFFRON_GYM - db $3, $13, $1c, SAFFRON_GYM - db $5, $f, $2, SAFFRON_GYM - db $5, $13, $a, SAFFRON_GYM - db $9, $f, $14, SAFFRON_GYM - db $9, $13, $1d, SAFFRON_GYM - db $b, $f, $e, SAFFRON_GYM - db $b, $13, $6, SAFFRON_GYM - db $f, $f, $15, SAFFRON_GYM - db $f, $13, $19, SAFFRON_GYM - db $11, $f, $b, SAFFRON_GYM - db $11, $13, $13, SAFFRON_GYM + warp $8, $11, $2, $ff + warp $9, $11, $2, $ff + warp $1, $3, $16, SAFFRON_GYM + warp $5, $3, $f, SAFFRON_GYM + warp $1, $5, $12, SAFFRON_GYM + warp $5, $5, $8, SAFFRON_GYM + warp $1, $9, $1b, SAFFRON_GYM + warp $5, $9, $10, SAFFRON_GYM + warp $1, $b, $5, SAFFRON_GYM + warp $5, $b, $d, SAFFRON_GYM + warp $1, $f, $17, SAFFRON_GYM + warp $5, $f, $1e, SAFFRON_GYM + warp $1, $11, $11, SAFFRON_GYM + warp $5, $11, $9, SAFFRON_GYM + warp $9, $3, $1a, SAFFRON_GYM + warp $b, $3, $3, SAFFRON_GYM + warp $9, $5, $7, SAFFRON_GYM + warp $b, $5, $c, SAFFRON_GYM + warp $b, $b, $4, SAFFRON_GYM + warp $b, $f, $1f, SAFFRON_GYM + warp $f, $3, $18, SAFFRON_GYM + warp $13, $3, $1c, SAFFRON_GYM + warp $f, $5, $2, SAFFRON_GYM + warp $13, $5, $a, SAFFRON_GYM + warp $f, $9, $14, SAFFRON_GYM + warp $13, $9, $1d, SAFFRON_GYM + warp $f, $b, $e, SAFFRON_GYM + warp $13, $b, $6, SAFFRON_GYM + warp $f, $f, $15, SAFFRON_GYM + warp $13, $f, $19, SAFFRON_GYM + warp $f, $11, $b, SAFFRON_GYM + warp $13, $11, $13, SAFFRON_GYM db $0 ; signs @@ -49,35 +49,35 @@ SaffronGymObject: object SPRITE_GYM_HELPER, $a, $f, STAY, DOWN, $9 ; person ; warp-to - EVENT_DISP SAFFRON_GYM_WIDTH, $11, $8 - EVENT_DISP SAFFRON_GYM_WIDTH, $11, $9 - EVENT_DISP SAFFRON_GYM_WIDTH, $3, $1 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $3, $5 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $5, $1 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $5, $5 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $9, $1 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $9, $5 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $b, $1 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $b, $5 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $f, $1 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $f, $5 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $11, $1 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $11, $5 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $3, $9 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $3, $b ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $5, $9 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $5, $b ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $b, $b ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $f, $b ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $3, $f ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $3, $13 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $5, $f ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $5, $13 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $9, $f ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $9, $13 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $b, $f ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $b, $13 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $f, $f ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $f, $13 ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $11, $f ; SAFFRON_GYM - EVENT_DISP SAFFRON_GYM_WIDTH, $11, $13 ; SAFFRON_GYM + warp_to $8, $11, SAFFRON_GYM_WIDTH + warp_to $9, $11, SAFFRON_GYM_WIDTH + warp_to $1, $3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $5, $3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $1, $5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $5, $5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $1, $9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $5, $9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $1, $b, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $5, $b, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $1, $f, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $5, $f, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $1, $11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $5, $11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $9, $3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $b, $3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $9, $5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $b, $5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $b, $b, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $b, $f, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $f, $3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $13, $3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $f, $5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $13, $5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $f, $9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $13, $9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $f, $b, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $13, $b, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $f, $f, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $13, $f, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $f, $11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM + warp_to $13, $11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM diff --git a/data/mapObjects/saffronhouse1.asm b/data/mapObjects/saffronhouse1.asm index 9f6d7750..f7691f78 100755 --- a/data/mapObjects/saffronhouse1.asm +++ b/data/mapObjects/saffronhouse1.asm @@ -2,8 +2,8 @@ SaffronHouse1Object: db $a ; border block db $2 ; warps - db $7, $2, $3, $ff - db $7, $3, $3, $ff + warp $2, $7, $3, $ff + warp $3, $7, $3, $ff db $0 ; signs @@ -14,5 +14,5 @@ SaffronHouse1Object: object SPRITE_PAPER_SHEET, $3, $3, STAY, NONE, $4 ; person ; warp-to - EVENT_DISP SAFFRON_HOUSE_1_WIDTH, $7, $2 - EVENT_DISP SAFFRON_HOUSE_1_WIDTH, $7, $3 + warp_to $2, $7, SAFFRON_HOUSE_1_WIDTH + warp_to $3, $7, SAFFRON_HOUSE_1_WIDTH diff --git a/data/mapObjects/saffronhouse2.asm b/data/mapObjects/saffronhouse2.asm index e57bdbb7..d8f7cd4d 100755 --- a/data/mapObjects/saffronhouse2.asm +++ b/data/mapObjects/saffronhouse2.asm @@ -2,8 +2,8 @@ SaffronHouse2Object: db $a ; border block db $2 ; warps - db $7, $2, $7, $ff - db $7, $3, $7, $ff + warp $2, $7, $7, $ff + warp $3, $7, $7, $ff db $0 ; signs @@ -11,5 +11,5 @@ SaffronHouse2Object: object SPRITE_FISHER, $5, $3, STAY, LEFT, $1 ; person ; warp-to - EVENT_DISP SAFFRON_HOUSE_2_WIDTH, $7, $2 - EVENT_DISP SAFFRON_HOUSE_2_WIDTH, $7, $3 + warp_to $2, $7, SAFFRON_HOUSE_2_WIDTH + warp_to $3, $7, SAFFRON_HOUSE_2_WIDTH diff --git a/data/mapObjects/saffronmart.asm b/data/mapObjects/saffronmart.asm index 113a1ea9..93c5aa2d 100755 --- a/data/mapObjects/saffronmart.asm +++ b/data/mapObjects/saffronmart.asm @@ -2,8 +2,8 @@ SaffronMartObject: db $0 ; border block db $2 ; warps - db $7, $3, $4, $ff - db $7, $4, $4, $ff + warp $3, $7, $4, $ff + warp $4, $7, $4, $ff db $0 ; signs @@ -13,5 +13,5 @@ SaffronMartObject: object SPRITE_LASS, $6, $5, WALK, $0, $3 ; person ; warp-to - EVENT_DISP SAFFRON_MART_WIDTH, $7, $3 - EVENT_DISP SAFFRON_MART_WIDTH, $7, $4 + warp_to $3, $7, SAFFRON_MART_WIDTH + warp_to $4, $7, SAFFRON_MART_WIDTH diff --git a/data/mapObjects/saffronpokecenter.asm b/data/mapObjects/saffronpokecenter.asm index 896b550a..07230c0c 100755 --- a/data/mapObjects/saffronpokecenter.asm +++ b/data/mapObjects/saffronpokecenter.asm @@ -2,8 +2,8 @@ SaffronPokecenterObject: db $0 ; border block db $2 ; warps - db $7, $3, $6, $ff - db $7, $4, $6, $ff + warp $3, $7, $6, $ff + warp $4, $7, $6, $ff db $0 ; signs @@ -14,5 +14,5 @@ SaffronPokecenterObject: object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP SAFFRON_POKECENTER_WIDTH, $7, $3 - EVENT_DISP SAFFRON_POKECENTER_WIDTH, $7, $4 + warp_to $3, $7, SAFFRON_POKECENTER_WIDTH + warp_to $4, $7, SAFFRON_POKECENTER_WIDTH diff --git a/data/mapObjects/school.asm b/data/mapObjects/school.asm index 53f7fc00..4482776c 100755 --- a/data/mapObjects/school.asm +++ b/data/mapObjects/school.asm @@ -2,8 +2,8 @@ SchoolObject: db $a ; border block db $2 ; warps - db $7, $2, $2, $ff - db $7, $3, $2, $ff + warp $2, $7, $2, $ff + warp $3, $7, $2, $ff db $0 ; signs @@ -12,5 +12,5 @@ SchoolObject: object SPRITE_LASS, $4, $1, STAY, DOWN, $2 ; person ; warp-to - EVENT_DISP VIRIDIAN_SCHOOL_WIDTH, $7, $2 - EVENT_DISP VIRIDIAN_SCHOOL_WIDTH, $7, $3 + warp_to $2, $7, VIRIDIAN_SCHOOL_WIDTH + warp_to $3, $7, VIRIDIAN_SCHOOL_WIDTH diff --git a/data/mapObjects/seafoamislands1.asm b/data/mapObjects/seafoamislands1.asm index 4f7f7a8e..027c4abe 100755 --- a/data/mapObjects/seafoamislands1.asm +++ b/data/mapObjects/seafoamislands1.asm @@ -2,13 +2,13 @@ SeafoamIslands1Object: db $7d ; border block db $7 ; warps - db $11, $4, $0, $ff - db $11, $5, $0, $ff - db $11, $1a, $1, $ff - db $11, $1b, $1, $ff - db $5, $7, $1, SEAFOAM_ISLANDS_2 - db $3, $19, $6, SEAFOAM_ISLANDS_2 - db $f, $17, $4, SEAFOAM_ISLANDS_2 + warp $4, $11, $0, $ff + warp $5, $11, $0, $ff + warp $1a, $11, $1, $ff + warp $1b, $11, $1, $ff + warp $7, $5, $1, SEAFOAM_ISLANDS_2 + warp $19, $3, $6, SEAFOAM_ISLANDS_2 + warp $17, $f, $4, SEAFOAM_ISLANDS_2 db $0 ; signs @@ -17,14 +17,14 @@ SeafoamIslands1Object: object SPRITE_BOULDER, $1a, $7, STAY, BOULDER_MOVEMENT_BYTE_2, $2 ; person ; warp-to - EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $11, $4 - EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $11, $5 - EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $11, $1a - EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $11, $1b - EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $5, $7 ; SEAFOAM_ISLANDS_2 - EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $3, $19 ; SEAFOAM_ISLANDS_2 - EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $f, $17 ; SEAFOAM_ISLANDS_2 + warp_to $4, $11, SEAFOAM_ISLANDS_1_WIDTH + warp_to $5, $11, SEAFOAM_ISLANDS_1_WIDTH + warp_to $1a, $11, SEAFOAM_ISLANDS_1_WIDTH + warp_to $1b, $11, SEAFOAM_ISLANDS_1_WIDTH + warp_to $7, $5, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2 + warp_to $19, $3, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2 + warp_to $17, $f, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2 ; holes - EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $6, $11 - EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $6, $18 + warp_to $11, $6, SEAFOAM_ISLANDS_1_WIDTH + warp_to $18, $6, SEAFOAM_ISLANDS_1_WIDTH diff --git a/data/mapObjects/seafoamislands2.asm b/data/mapObjects/seafoamislands2.asm index d25e5375..e2cdc09a 100755 --- a/data/mapObjects/seafoamislands2.asm +++ b/data/mapObjects/seafoamislands2.asm @@ -2,13 +2,13 @@ SeafoamIslands2Object: db $7d ; border block db $7 ; warps - db $2, $4, $0, SEAFOAM_ISLANDS_3 - db $5, $7, $4, SEAFOAM_ISLANDS_1 - db $7, $d, $2, SEAFOAM_ISLANDS_3 - db $f, $13, $3, SEAFOAM_ISLANDS_3 - db $f, $17, $6, SEAFOAM_ISLANDS_1 - db $b, $19, $5, SEAFOAM_ISLANDS_3 - db $3, $19, $5, SEAFOAM_ISLANDS_1 + warp $4, $2, $0, SEAFOAM_ISLANDS_3 + warp $7, $5, $4, SEAFOAM_ISLANDS_1 + warp $d, $7, $2, SEAFOAM_ISLANDS_3 + warp $13, $f, $3, SEAFOAM_ISLANDS_3 + warp $17, $f, $6, SEAFOAM_ISLANDS_1 + warp $19, $b, $5, SEAFOAM_ISLANDS_3 + warp $19, $3, $5, SEAFOAM_ISLANDS_1 db $0 ; signs @@ -17,10 +17,10 @@ SeafoamIslands2Object: object SPRITE_BOULDER, $16, $6, STAY, BOULDER_MOVEMENT_BYTE_2, $2 ; person ; warp-to - EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $2, $4 ; SEAFOAM_ISLANDS_3 - EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $5, $7 ; SEAFOAM_ISLANDS_1 - EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $7, $d ; SEAFOAM_ISLANDS_3 - EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $f, $13 ; SEAFOAM_ISLANDS_3 - EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $f, $17 ; SEAFOAM_ISLANDS_1 - EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $b, $19 ; SEAFOAM_ISLANDS_3 - EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $3, $19 ; SEAFOAM_ISLANDS_1 + warp_to $4, $2, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3 + warp_to $7, $5, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1 + warp_to $d, $7, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3 + warp_to $13, $f, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3 + warp_to $17, $f, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1 + warp_to $19, $b, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3 + warp_to $19, $3, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1 diff --git a/data/mapObjects/seafoamislands3.asm b/data/mapObjects/seafoamislands3.asm index a660f2ed..087cba58 100755 --- a/data/mapObjects/seafoamislands3.asm +++ b/data/mapObjects/seafoamislands3.asm @@ -2,13 +2,13 @@ SeafoamIslands3Object: db $7d ; border block db $7 ; warps - db $3, $5, $0, SEAFOAM_ISLANDS_2 - db $d, $5, $0, SEAFOAM_ISLANDS_4 - db $7, $d, $2, SEAFOAM_ISLANDS_2 - db $f, $13, $3, SEAFOAM_ISLANDS_2 - db $3, $19, $3, SEAFOAM_ISLANDS_4 - db $b, $19, $5, SEAFOAM_ISLANDS_2 - db $e, $19, $4, SEAFOAM_ISLANDS_4 + warp $5, $3, $0, SEAFOAM_ISLANDS_2 + warp $5, $d, $0, SEAFOAM_ISLANDS_4 + warp $d, $7, $2, SEAFOAM_ISLANDS_2 + warp $13, $f, $3, SEAFOAM_ISLANDS_2 + warp $19, $3, $3, SEAFOAM_ISLANDS_4 + warp $19, $b, $5, SEAFOAM_ISLANDS_2 + warp $19, $e, $4, SEAFOAM_ISLANDS_4 db $0 ; signs @@ -17,10 +17,10 @@ SeafoamIslands3Object: object SPRITE_BOULDER, $17, $6, STAY, BOULDER_MOVEMENT_BYTE_2, $2 ; person ; warp-to - EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $3, $5 ; SEAFOAM_ISLANDS_2 - EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $d, $5 ; SEAFOAM_ISLANDS_4 - EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $7, $d ; SEAFOAM_ISLANDS_2 - EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $f, $13 ; SEAFOAM_ISLANDS_2 - EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $3, $19 ; SEAFOAM_ISLANDS_4 - EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $b, $19 ; SEAFOAM_ISLANDS_2 - EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $e, $19 ; SEAFOAM_ISLANDS_4 + warp_to $5, $3, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2 + warp_to $5, $d, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_4 + warp_to $d, $7, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2 + warp_to $13, $f, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2 + warp_to $19, $3, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_4 + warp_to $19, $b, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2 + warp_to $19, $e, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_4 diff --git a/data/mapObjects/seafoamislands4.asm b/data/mapObjects/seafoamislands4.asm index c7043a93..06b2fb78 100755 --- a/data/mapObjects/seafoamislands4.asm +++ b/data/mapObjects/seafoamislands4.asm @@ -2,13 +2,13 @@ SeafoamIslands4Object: db $7d ; border block db $7 ; warps - db $c, $5, $1, SEAFOAM_ISLANDS_3 - db $6, $8, $2, SEAFOAM_ISLANDS_5 - db $4, $19, $3, SEAFOAM_ISLANDS_5 - db $3, $19, $4, SEAFOAM_ISLANDS_3 - db $e, $19, $6, SEAFOAM_ISLANDS_3 - db $11, $14, $0, SEAFOAM_ISLANDS_5 - db $11, $15, $1, SEAFOAM_ISLANDS_5 + warp $5, $c, $1, SEAFOAM_ISLANDS_3 + warp $8, $6, $2, SEAFOAM_ISLANDS_5 + warp $19, $4, $3, SEAFOAM_ISLANDS_5 + warp $19, $3, $4, SEAFOAM_ISLANDS_3 + warp $19, $e, $6, SEAFOAM_ISLANDS_3 + warp $14, $11, $0, SEAFOAM_ISLANDS_5 + warp $15, $11, $1, SEAFOAM_ISLANDS_5 db $0 ; signs @@ -21,10 +21,10 @@ SeafoamIslands4Object: object SPRITE_BOULDER, $13, $6, STAY, NONE, $6 ; person ; warp-to - EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $c, $5 ; SEAFOAM_ISLANDS_3 - EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $6, $8 ; SEAFOAM_ISLANDS_5 - EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $4, $19 ; SEAFOAM_ISLANDS_5 - EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $3, $19 ; SEAFOAM_ISLANDS_3 - EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $e, $19 ; SEAFOAM_ISLANDS_3 - EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $11, $14 ; SEAFOAM_ISLANDS_5 - EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $11, $15 ; SEAFOAM_ISLANDS_5 + warp_to $5, $c, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_3 + warp_to $8, $6, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5 + warp_to $19, $4, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5 + warp_to $19, $3, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_3 + warp_to $19, $e, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_3 + warp_to $14, $11, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5 + warp_to $15, $11, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5 diff --git a/data/mapObjects/seafoamislands5.asm b/data/mapObjects/seafoamislands5.asm index a05c00cc..dd2d77f0 100755 --- a/data/mapObjects/seafoamislands5.asm +++ b/data/mapObjects/seafoamislands5.asm @@ -2,14 +2,14 @@ SeafoamIslands5Object: db $7d ; border block db $4 ; warps - db $11, $14, $5, SEAFOAM_ISLANDS_4 - db $11, $15, $6, SEAFOAM_ISLANDS_4 - db $7, $b, $1, SEAFOAM_ISLANDS_4 - db $4, $19, $2, SEAFOAM_ISLANDS_4 + warp $14, $11, $5, SEAFOAM_ISLANDS_4 + warp $15, $11, $6, SEAFOAM_ISLANDS_4 + warp $b, $7, $1, SEAFOAM_ISLANDS_4 + warp $19, $4, $2, SEAFOAM_ISLANDS_4 db $2 ; signs - db $f, $9, $4 ; SeafoamIslands5Text4 - db $1, $17, $5 ; SeafoamIslands5Text5 + sign $9, $f, $4 ; SeafoamIslands5Text4 + sign $17, $1, $5 ; SeafoamIslands5Text5 db $3 ; objects object SPRITE_BOULDER, $4, $f, STAY, NONE, $1 ; person @@ -17,7 +17,7 @@ SeafoamIslands5Object: object SPRITE_BIRD, $6, $1, STAY, DOWN, $3, ARTICUNO, 50 ; warp-to - EVENT_DISP SEAFOAM_ISLANDS_5_WIDTH, $11, $14 ; SEAFOAM_ISLANDS_4 - EVENT_DISP SEAFOAM_ISLANDS_5_WIDTH, $11, $15 ; SEAFOAM_ISLANDS_4 - EVENT_DISP SEAFOAM_ISLANDS_5_WIDTH, $7, $b ; SEAFOAM_ISLANDS_4 - EVENT_DISP SEAFOAM_ISLANDS_5_WIDTH, $4, $19 ; SEAFOAM_ISLANDS_4 + warp_to $14, $11, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4 + warp_to $15, $11, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4 + warp_to $b, $7, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4 + warp_to $19, $4, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4 diff --git a/data/mapObjects/silphco1.asm b/data/mapObjects/silphco1.asm index fe779393..0ef17156 100755 --- a/data/mapObjects/silphco1.asm +++ b/data/mapObjects/silphco1.asm @@ -2,11 +2,11 @@ SilphCo1Object: db $2e ; border block db $5 ; warps - db $11, $a, $5, $ff - db $11, $b, $5, $ff - db $0, $1a, $0, SILPH_CO_2F - db $0, $14, $0, SILPH_CO_ELEVATOR - db $a, $10, $6, SILPH_CO_3F + warp $a, $11, $5, $ff + warp $b, $11, $5, $ff + warp $1a, $0, $0, SILPH_CO_2F + warp $14, $0, $0, SILPH_CO_ELEVATOR + warp $10, $a, $6, SILPH_CO_3F db $0 ; signs @@ -14,8 +14,8 @@ SilphCo1Object: object SPRITE_CABLE_CLUB_WOMAN, $4, $2, STAY, DOWN, $1 ; person ; warp-to - EVENT_DISP SILPH_CO_1F_WIDTH, $11, $a - EVENT_DISP SILPH_CO_1F_WIDTH, $11, $b - EVENT_DISP SILPH_CO_1F_WIDTH, $0, $1a ; SILPH_CO_2F - EVENT_DISP SILPH_CO_1F_WIDTH, $0, $14 ; SILPH_CO_ELEVATOR - EVENT_DISP SILPH_CO_1F_WIDTH, $a, $10 ; SILPH_CO_3F + warp_to $a, $11, SILPH_CO_1F_WIDTH + warp_to $b, $11, SILPH_CO_1F_WIDTH + warp_to $1a, $0, SILPH_CO_1F_WIDTH ; SILPH_CO_2F + warp_to $14, $0, SILPH_CO_1F_WIDTH ; SILPH_CO_ELEVATOR + warp_to $10, $a, SILPH_CO_1F_WIDTH ; SILPH_CO_3F diff --git a/data/mapObjects/silphco10.asm b/data/mapObjects/silphco10.asm index 185a23c9..d2ddd338 100755 --- a/data/mapObjects/silphco10.asm +++ b/data/mapObjects/silphco10.asm @@ -2,12 +2,12 @@ SilphCo10Object: db $2e ; border block db $6 ; warps - db $0, $8, $0, SILPH_CO_9F - db $0, $a, $0, SILPH_CO_11F - db $0, $c, $0, SILPH_CO_ELEVATOR - db $b, $9, $3, SILPH_CO_4F - db $f, $d, $5, SILPH_CO_4F - db $7, $d, $6, SILPH_CO_4F + warp $8, $0, $0, SILPH_CO_9F + warp $a, $0, $0, SILPH_CO_11F + warp $c, $0, $0, SILPH_CO_ELEVATOR + warp $9, $b, $3, SILPH_CO_4F + warp $d, $f, $5, SILPH_CO_4F + warp $d, $7, $6, SILPH_CO_4F db $0 ; signs @@ -20,9 +20,9 @@ SilphCo10Object: object SPRITE_BALL, $5, $b, STAY, NONE, $6, CARBOS ; warp-to - EVENT_DISP SILPH_CO_10F_WIDTH, $0, $8 ; SILPH_CO_9F - EVENT_DISP SILPH_CO_10F_WIDTH, $0, $a ; SILPH_CO_11F - EVENT_DISP SILPH_CO_10F_WIDTH, $0, $c ; SILPH_CO_ELEVATOR - EVENT_DISP SILPH_CO_10F_WIDTH, $b, $9 ; SILPH_CO_4F - EVENT_DISP SILPH_CO_10F_WIDTH, $f, $d ; SILPH_CO_4F - EVENT_DISP SILPH_CO_10F_WIDTH, $7, $d ; SILPH_CO_4F + warp_to $8, $0, SILPH_CO_10F_WIDTH ; SILPH_CO_9F + warp_to $a, $0, SILPH_CO_10F_WIDTH ; SILPH_CO_11F + warp_to $c, $0, SILPH_CO_10F_WIDTH ; SILPH_CO_ELEVATOR + warp_to $9, $b, SILPH_CO_10F_WIDTH ; SILPH_CO_4F + warp_to $d, $f, SILPH_CO_10F_WIDTH ; SILPH_CO_4F + warp_to $d, $7, SILPH_CO_10F_WIDTH ; SILPH_CO_4F diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/silphco11.asm index 95712629..da97ef89 100755 --- a/data/mapObjects/silphco11.asm +++ b/data/mapObjects/silphco11.asm @@ -2,10 +2,10 @@ SilphCo11Object: db $d ; border block db $4 ; warps - db $0, $9, $1, SILPH_CO_10F - db $0, $d, $0, SILPH_CO_ELEVATOR - db $5, $5, $9, $ff - db $2, $3, $3, SILPH_CO_7F + warp $9, $0, $1, SILPH_CO_10F + warp $d, $0, $0, SILPH_CO_ELEVATOR + warp $5, $5, $9, $ff + warp $3, $2, $3, SILPH_CO_7F db $0 ; signs @@ -17,7 +17,7 @@ SilphCo11Object: object SPRITE_ROCKET, $f, $9, STAY, UP, $5, OPP_ROCKET, $28 ; warp-to - EVENT_DISP SILPH_CO_11F_WIDTH, $0, $9 ; SILPH_CO_10F - EVENT_DISP SILPH_CO_11F_WIDTH, $0, $d ; SILPH_CO_ELEVATOR - EVENT_DISP SILPH_CO_11F_WIDTH, $5, $5 - EVENT_DISP SILPH_CO_11F_WIDTH, $2, $3 ; SILPH_CO_7F + warp_to $9, $0, SILPH_CO_11F_WIDTH ; SILPH_CO_10F + warp_to $d, $0, SILPH_CO_11F_WIDTH ; SILPH_CO_ELEVATOR + warp_to $5, $5, SILPH_CO_11F_WIDTH + warp_to $3, $2, SILPH_CO_11F_WIDTH ; SILPH_CO_7F diff --git a/data/mapObjects/silphco2.asm b/data/mapObjects/silphco2.asm index ae3aca74..98a50355 100755 --- a/data/mapObjects/silphco2.asm +++ b/data/mapObjects/silphco2.asm @@ -2,13 +2,13 @@ SilphCo2Object: db $2e ; border block db $7 ; warps - db $0, $18, $2, SILPH_CO_1F - db $0, $1a, $0, SILPH_CO_3F - db $0, $14, $0, SILPH_CO_ELEVATOR - db $3, $3, $6, SILPH_CO_3F - db $3, $d, $4, SILPH_CO_8F - db $f, $1b, $5, SILPH_CO_8F - db $f, $9, $4, SILPH_CO_6F + warp $18, $0, $2, SILPH_CO_1F + warp $1a, $0, $0, SILPH_CO_3F + warp $14, $0, $0, SILPH_CO_ELEVATOR + warp $3, $3, $6, SILPH_CO_3F + warp $d, $3, $4, SILPH_CO_8F + warp $1b, $f, $5, SILPH_CO_8F + warp $9, $f, $4, SILPH_CO_6F db $0 ; signs @@ -20,10 +20,10 @@ SilphCo2Object: object SPRITE_ROCKET, $18, $7, STAY, UP, $5, OPP_ROCKET, $18 ; warp-to - EVENT_DISP SILPH_CO_2F_WIDTH, $0, $18 ; SILPH_CO_1F - EVENT_DISP SILPH_CO_2F_WIDTH, $0, $1a ; SILPH_CO_3F - EVENT_DISP SILPH_CO_2F_WIDTH, $0, $14 ; SILPH_CO_ELEVATOR - EVENT_DISP SILPH_CO_2F_WIDTH, $3, $3 ; SILPH_CO_3F - EVENT_DISP SILPH_CO_2F_WIDTH, $3, $d ; SILPH_CO_8F - EVENT_DISP SILPH_CO_2F_WIDTH, $f, $1b ; SILPH_CO_8F - EVENT_DISP SILPH_CO_2F_WIDTH, $f, $9 ; SILPH_CO_6F + warp_to $18, $0, SILPH_CO_2F_WIDTH ; SILPH_CO_1F + warp_to $1a, $0, SILPH_CO_2F_WIDTH ; SILPH_CO_3F + warp_to $14, $0, SILPH_CO_2F_WIDTH ; SILPH_CO_ELEVATOR + warp_to $3, $3, SILPH_CO_2F_WIDTH ; SILPH_CO_3F + warp_to $d, $3, SILPH_CO_2F_WIDTH ; SILPH_CO_8F + warp_to $1b, $f, SILPH_CO_2F_WIDTH ; SILPH_CO_8F + warp_to $9, $f, SILPH_CO_2F_WIDTH ; SILPH_CO_6F diff --git a/data/mapObjects/silphco3.asm b/data/mapObjects/silphco3.asm index ddea9062..d04e74c7 100755 --- a/data/mapObjects/silphco3.asm +++ b/data/mapObjects/silphco3.asm @@ -2,16 +2,16 @@ SilphCo3Object: db $2e ; border block db $a ; warps - db $0, $1a, $1, SILPH_CO_2F - db $0, $18, $0, SILPH_CO_4F - db $0, $14, $0, SILPH_CO_ELEVATOR - db $b, $17, $9, SILPH_CO_3F - db $3, $3, $5, SILPH_CO_5F - db $f, $3, $6, SILPH_CO_5F - db $3, $1b, $3, SILPH_CO_2F - db $b, $3, $3, SILPH_CO_9F - db $b, $b, $4, SILPH_CO_7F - db $f, $1b, $3, SILPH_CO_3F + warp $1a, $0, $1, SILPH_CO_2F + warp $18, $0, $0, SILPH_CO_4F + warp $14, $0, $0, SILPH_CO_ELEVATOR + warp $17, $b, $9, SILPH_CO_3F + warp $3, $3, $5, SILPH_CO_5F + warp $3, $f, $6, SILPH_CO_5F + warp $1b, $3, $3, SILPH_CO_2F + warp $3, $b, $3, SILPH_CO_9F + warp $b, $b, $4, SILPH_CO_7F + warp $1b, $f, $3, SILPH_CO_3F db $0 ; signs @@ -22,13 +22,13 @@ SilphCo3Object: object SPRITE_BALL, $8, $5, STAY, NONE, $4, HYPER_POTION ; warp-to - EVENT_DISP SILPH_CO_3F_WIDTH, $0, $1a ; SILPH_CO_2F - EVENT_DISP SILPH_CO_3F_WIDTH, $0, $18 ; SILPH_CO_4F - EVENT_DISP SILPH_CO_3F_WIDTH, $0, $14 ; SILPH_CO_ELEVATOR - EVENT_DISP SILPH_CO_3F_WIDTH, $b, $17 ; SILPH_CO_3F - EVENT_DISP SILPH_CO_3F_WIDTH, $3, $3 ; SILPH_CO_5F - EVENT_DISP SILPH_CO_3F_WIDTH, $f, $3 ; SILPH_CO_5F - EVENT_DISP SILPH_CO_3F_WIDTH, $3, $1b ; SILPH_CO_2F - EVENT_DISP SILPH_CO_3F_WIDTH, $b, $3 ; SILPH_CO_9F - EVENT_DISP SILPH_CO_3F_WIDTH, $b, $b ; SILPH_CO_7F - EVENT_DISP SILPH_CO_3F_WIDTH, $f, $1b ; SILPH_CO_3F + warp_to $1a, $0, SILPH_CO_3F_WIDTH ; SILPH_CO_2F + warp_to $18, $0, SILPH_CO_3F_WIDTH ; SILPH_CO_4F + warp_to $14, $0, SILPH_CO_3F_WIDTH ; SILPH_CO_ELEVATOR + warp_to $17, $b, SILPH_CO_3F_WIDTH ; SILPH_CO_3F + warp_to $3, $3, SILPH_CO_3F_WIDTH ; SILPH_CO_5F + warp_to $3, $f, SILPH_CO_3F_WIDTH ; SILPH_CO_5F + warp_to $1b, $3, SILPH_CO_3F_WIDTH ; SILPH_CO_2F + warp_to $3, $b, SILPH_CO_3F_WIDTH ; SILPH_CO_9F + warp_to $b, $b, SILPH_CO_3F_WIDTH ; SILPH_CO_7F + warp_to $1b, $f, SILPH_CO_3F_WIDTH ; SILPH_CO_3F diff --git a/data/mapObjects/silphco4.asm b/data/mapObjects/silphco4.asm index a2320112..66443046 100755 --- a/data/mapObjects/silphco4.asm +++ b/data/mapObjects/silphco4.asm @@ -2,13 +2,13 @@ SilphCo4Object: db $2e ; border block db $7 ; warps - db $0, $18, $1, SILPH_CO_3F - db $0, $1a, $1, SILPH_CO_5F - db $0, $14, $0, SILPH_CO_ELEVATOR - db $7, $b, $3, SILPH_CO_10F - db $3, $11, $3, SILPH_CO_6F - db $f, $3, $4, SILPH_CO_10F - db $b, $11, $5, SILPH_CO_10F + warp $18, $0, $1, SILPH_CO_3F + warp $1a, $0, $1, SILPH_CO_5F + warp $14, $0, $0, SILPH_CO_ELEVATOR + warp $b, $7, $3, SILPH_CO_10F + warp $11, $3, $3, SILPH_CO_6F + warp $3, $f, $4, SILPH_CO_10F + warp $11, $b, $5, SILPH_CO_10F db $0 ; signs @@ -22,10 +22,10 @@ SilphCo4Object: object SPRITE_BALL, $5, $8, STAY, NONE, $7, ESCAPE_ROPE ; warp-to - EVENT_DISP SILPH_CO_4F_WIDTH, $0, $18 ; SILPH_CO_3F - EVENT_DISP SILPH_CO_4F_WIDTH, $0, $1a ; SILPH_CO_5F - EVENT_DISP SILPH_CO_4F_WIDTH, $0, $14 ; SILPH_CO_ELEVATOR - EVENT_DISP SILPH_CO_4F_WIDTH, $7, $b ; SILPH_CO_10F - EVENT_DISP SILPH_CO_4F_WIDTH, $3, $11 ; SILPH_CO_6F - EVENT_DISP SILPH_CO_4F_WIDTH, $f, $3 ; SILPH_CO_10F - EVENT_DISP SILPH_CO_4F_WIDTH, $b, $11 ; SILPH_CO_10F + warp_to $18, $0, SILPH_CO_4F_WIDTH ; SILPH_CO_3F + warp_to $1a, $0, SILPH_CO_4F_WIDTH ; SILPH_CO_5F + warp_to $14, $0, SILPH_CO_4F_WIDTH ; SILPH_CO_ELEVATOR + warp_to $b, $7, SILPH_CO_4F_WIDTH ; SILPH_CO_10F + warp_to $11, $3, SILPH_CO_4F_WIDTH ; SILPH_CO_6F + warp_to $3, $f, SILPH_CO_4F_WIDTH ; SILPH_CO_10F + warp_to $11, $b, SILPH_CO_4F_WIDTH ; SILPH_CO_10F diff --git a/data/mapObjects/silphco5.asm b/data/mapObjects/silphco5.asm index 62e30fac..0063b94c 100755 --- a/data/mapObjects/silphco5.asm +++ b/data/mapObjects/silphco5.asm @@ -2,13 +2,13 @@ SilphCo5Object: db $2e ; border block db $7 ; warps - db $0, $18, $1, SILPH_CO_6F - db $0, $1a, $1, SILPH_CO_4F - db $0, $14, $0, SILPH_CO_ELEVATOR - db $3, $1b, $5, SILPH_CO_7F - db $f, $9, $4, SILPH_CO_9F - db $5, $b, $4, SILPH_CO_3F - db $f, $3, $5, SILPH_CO_3F + warp $18, $0, $1, SILPH_CO_6F + warp $1a, $0, $1, SILPH_CO_4F + warp $14, $0, $0, SILPH_CO_ELEVATOR + warp $1b, $3, $5, SILPH_CO_7F + warp $9, $f, $4, SILPH_CO_9F + warp $b, $5, $4, SILPH_CO_3F + warp $3, $f, $5, SILPH_CO_3F db $0 ; signs @@ -26,10 +26,10 @@ SilphCo5Object: object SPRITE_CLIPBOARD, $18, $6, STAY, NONE, $b ; person ; warp-to - EVENT_DISP SILPH_CO_5F_WIDTH, $0, $18 ; SILPH_CO_6F - EVENT_DISP SILPH_CO_5F_WIDTH, $0, $1a ; SILPH_CO_4F - EVENT_DISP SILPH_CO_5F_WIDTH, $0, $14 ; SILPH_CO_ELEVATOR - EVENT_DISP SILPH_CO_5F_WIDTH, $3, $1b ; SILPH_CO_7F - EVENT_DISP SILPH_CO_5F_WIDTH, $f, $9 ; SILPH_CO_9F - EVENT_DISP SILPH_CO_5F_WIDTH, $5, $b ; SILPH_CO_3F - EVENT_DISP SILPH_CO_5F_WIDTH, $f, $3 ; SILPH_CO_3F + warp_to $18, $0, SILPH_CO_5F_WIDTH ; SILPH_CO_6F + warp_to $1a, $0, SILPH_CO_5F_WIDTH ; SILPH_CO_4F + warp_to $14, $0, SILPH_CO_5F_WIDTH ; SILPH_CO_ELEVATOR + warp_to $1b, $3, SILPH_CO_5F_WIDTH ; SILPH_CO_7F + warp_to $9, $f, SILPH_CO_5F_WIDTH ; SILPH_CO_9F + warp_to $b, $5, SILPH_CO_5F_WIDTH ; SILPH_CO_3F + warp_to $3, $f, SILPH_CO_5F_WIDTH ; SILPH_CO_3F diff --git a/data/mapObjects/silphco6.asm b/data/mapObjects/silphco6.asm index 19d66e50..9409a4b5 100755 --- a/data/mapObjects/silphco6.asm +++ b/data/mapObjects/silphco6.asm @@ -2,11 +2,11 @@ SilphCo6Object: db $2e ; border block db $5 ; warps - db $0, $10, $1, SILPH_CO_7F - db $0, $e, $0, SILPH_CO_5F - db $0, $12, $0, SILPH_CO_ELEVATOR - db $3, $3, $4, SILPH_CO_4F - db $3, $17, $6, SILPH_CO_2F + warp $10, $0, $1, SILPH_CO_7F + warp $e, $0, $0, SILPH_CO_5F + warp $12, $0, $0, SILPH_CO_ELEVATOR + warp $3, $3, $4, SILPH_CO_4F + warp $17, $3, $6, SILPH_CO_2F db $0 ; signs @@ -23,8 +23,8 @@ SilphCo6Object: object SPRITE_BALL, $2, $f, STAY, NONE, $a, X_ACCURACY ; warp-to - EVENT_DISP SILPH_CO_6F_WIDTH, $0, $10 ; SILPH_CO_7F - EVENT_DISP SILPH_CO_6F_WIDTH, $0, $e ; SILPH_CO_5F - EVENT_DISP SILPH_CO_6F_WIDTH, $0, $12 ; SILPH_CO_ELEVATOR - EVENT_DISP SILPH_CO_6F_WIDTH, $3, $3 ; SILPH_CO_4F - EVENT_DISP SILPH_CO_6F_WIDTH, $3, $17 ; SILPH_CO_2F + warp_to $10, $0, SILPH_CO_6F_WIDTH ; SILPH_CO_7F + warp_to $e, $0, SILPH_CO_6F_WIDTH ; SILPH_CO_5F + warp_to $12, $0, SILPH_CO_6F_WIDTH ; SILPH_CO_ELEVATOR + warp_to $3, $3, SILPH_CO_6F_WIDTH ; SILPH_CO_4F + warp_to $17, $3, SILPH_CO_6F_WIDTH ; SILPH_CO_2F diff --git a/data/mapObjects/silphco7.asm b/data/mapObjects/silphco7.asm index 47e881fe..1eb12713 100755 --- a/data/mapObjects/silphco7.asm +++ b/data/mapObjects/silphco7.asm @@ -2,12 +2,12 @@ SilphCo7Object: db $2e ; border block db $6 ; warps - db $0, $10, $1, SILPH_CO_8F - db $0, $16, $0, SILPH_CO_6F - db $0, $12, $0, SILPH_CO_ELEVATOR - db $7, $5, $3, SILPH_CO_11F - db $3, $5, $8, SILPH_CO_3F - db $f, $15, $3, SILPH_CO_5F + warp $10, $0, $1, SILPH_CO_8F + warp $16, $0, $0, SILPH_CO_6F + warp $12, $0, $0, SILPH_CO_ELEVATOR + warp $5, $7, $3, SILPH_CO_11F + warp $5, $3, $8, SILPH_CO_3F + warp $15, $f, $3, SILPH_CO_5F db $0 ; signs @@ -25,9 +25,9 @@ SilphCo7Object: object SPRITE_BALL, $18, $b, STAY, NONE, $b, TM_03 ; warp-to - EVENT_DISP SILPH_CO_7F_WIDTH, $0, $10 ; SILPH_CO_8F - EVENT_DISP SILPH_CO_7F_WIDTH, $0, $16 ; SILPH_CO_6F - EVENT_DISP SILPH_CO_7F_WIDTH, $0, $12 ; SILPH_CO_ELEVATOR - EVENT_DISP SILPH_CO_7F_WIDTH, $7, $5 ; SILPH_CO_11F - EVENT_DISP SILPH_CO_7F_WIDTH, $3, $5 ; SILPH_CO_3F - EVENT_DISP SILPH_CO_7F_WIDTH, $f, $15 ; SILPH_CO_5F + warp_to $10, $0, SILPH_CO_7F_WIDTH ; SILPH_CO_8F + warp_to $16, $0, SILPH_CO_7F_WIDTH ; SILPH_CO_6F + warp_to $12, $0, SILPH_CO_7F_WIDTH ; SILPH_CO_ELEVATOR + warp_to $5, $7, SILPH_CO_7F_WIDTH ; SILPH_CO_11F + warp_to $5, $3, SILPH_CO_7F_WIDTH ; SILPH_CO_3F + warp_to $15, $f, SILPH_CO_7F_WIDTH ; SILPH_CO_5F diff --git a/data/mapObjects/silphco8.asm b/data/mapObjects/silphco8.asm index 188b27b6..5574e18e 100755 --- a/data/mapObjects/silphco8.asm +++ b/data/mapObjects/silphco8.asm @@ -2,13 +2,13 @@ SilphCo8Object: db $2e ; border block db $7 ; warps - db $0, $10, $1, SILPH_CO_9F - db $0, $e, $0, SILPH_CO_7F - db $0, $12, $0, SILPH_CO_ELEVATOR - db $b, $3, $6, SILPH_CO_8F - db $f, $3, $4, SILPH_CO_2F - db $5, $b, $5, SILPH_CO_2F - db $9, $b, $3, SILPH_CO_8F + warp $10, $0, $1, SILPH_CO_9F + warp $e, $0, $0, SILPH_CO_7F + warp $12, $0, $0, SILPH_CO_ELEVATOR + warp $3, $b, $6, SILPH_CO_8F + warp $3, $f, $4, SILPH_CO_2F + warp $b, $5, $5, SILPH_CO_2F + warp $b, $9, $3, SILPH_CO_8F db $0 ; signs @@ -19,10 +19,10 @@ SilphCo8Object: object SPRITE_ROCKET, $c, $f, STAY, RIGHT, $4, OPP_ROCKET, $24 ; warp-to - EVENT_DISP SILPH_CO_8F_WIDTH, $0, $10 ; SILPH_CO_9F - EVENT_DISP SILPH_CO_8F_WIDTH, $0, $e ; SILPH_CO_7F - EVENT_DISP SILPH_CO_8F_WIDTH, $0, $12 ; SILPH_CO_ELEVATOR - EVENT_DISP SILPH_CO_8F_WIDTH, $b, $3 ; SILPH_CO_8F - EVENT_DISP SILPH_CO_8F_WIDTH, $f, $3 ; SILPH_CO_2F - EVENT_DISP SILPH_CO_8F_WIDTH, $5, $b ; SILPH_CO_2F - EVENT_DISP SILPH_CO_8F_WIDTH, $9, $b ; SILPH_CO_8F_WIDTH + warp_to $10, $0, SILPH_CO_8F_WIDTH ; SILPH_CO_9F + warp_to $e, $0, SILPH_CO_8F_WIDTH ; SILPH_CO_7F + warp_to $12, $0, SILPH_CO_8F_WIDTH ; SILPH_CO_ELEVATOR + warp_to $3, $b, SILPH_CO_8F_WIDTH ; SILPH_CO_8F + warp_to $3, $f, SILPH_CO_8F_WIDTH ; SILPH_CO_2F + warp_to $b, $5, SILPH_CO_8F_WIDTH ; SILPH_CO_2F + warp_to $b, $9, SILPH_CO_8F_WIDTH ; SILPH_CO_8F_WIDTH diff --git a/data/mapObjects/silphco9.asm b/data/mapObjects/silphco9.asm index 76d82895..1a89997f 100755 --- a/data/mapObjects/silphco9.asm +++ b/data/mapObjects/silphco9.asm @@ -2,11 +2,11 @@ SilphCo9Object: db $2e ; border block db $5 ; warps - db $0, $e, $0, SILPH_CO_10F - db $0, $10, $0, SILPH_CO_8F - db $0, $12, $0, SILPH_CO_ELEVATOR - db $3, $9, $7, SILPH_CO_3F - db $f, $11, $4, SILPH_CO_5F + warp $e, $0, $0, SILPH_CO_10F + warp $10, $0, $0, SILPH_CO_8F + warp $12, $0, $0, SILPH_CO_ELEVATOR + warp $9, $3, $7, SILPH_CO_3F + warp $11, $f, $4, SILPH_CO_5F db $0 ; signs @@ -17,8 +17,8 @@ SilphCo9Object: object SPRITE_ROCKET, $d, $10, STAY, UP, $4, OPP_ROCKET, $26 ; warp-to - EVENT_DISP SILPH_CO_9F_WIDTH, $0, $e ; SILPH_CO_10F - EVENT_DISP SILPH_CO_9F_WIDTH, $0, $10 ; SILPH_CO_8F - EVENT_DISP SILPH_CO_9F_WIDTH, $0, $12 ; SILPH_CO_ELEVATOR - EVENT_DISP SILPH_CO_9F_WIDTH, $3, $9 ; SILPH_CO_3F - EVENT_DISP SILPH_CO_9F_WIDTH, $f, $11 ; SILPH_CO_5F + warp_to $e, $0, SILPH_CO_9F_WIDTH ; SILPH_CO_10F + warp_to $10, $0, SILPH_CO_9F_WIDTH ; SILPH_CO_8F + warp_to $12, $0, SILPH_CO_9F_WIDTH ; SILPH_CO_ELEVATOR + warp_to $9, $3, SILPH_CO_9F_WIDTH ; SILPH_CO_3F + warp_to $11, $f, SILPH_CO_9F_WIDTH ; SILPH_CO_5F diff --git a/data/mapObjects/silphcoelevator.asm b/data/mapObjects/silphcoelevator.asm index 2de795ae..13a13739 100755 --- a/data/mapObjects/silphcoelevator.asm +++ b/data/mapObjects/silphcoelevator.asm @@ -2,14 +2,14 @@ SilphCoElevatorObject: db $f ; border block db $2 ; warps - db $3, $1, $0, $ed - db $3, $2, $0, $ed + warp $1, $3, $0, $ed + warp $2, $3, $0, $ed db $1 ; signs - db $0, $3, $1 ; SilphCoElevatorText1 + sign $3, $0, $1 ; SilphCoElevatorText1 db $0 ; objects ; warp-to - EVENT_DISP SILPH_CO_ELEVATOR_WIDTH, $3, $1 - EVENT_DISP SILPH_CO_ELEVATOR_WIDTH, $3, $2 + warp_to $1, $3, SILPH_CO_ELEVATOR_WIDTH + warp_to $2, $3, SILPH_CO_ELEVATOR_WIDTH diff --git a/data/mapObjects/ssanne1.asm b/data/mapObjects/ssanne1.asm index 7f6a826c..c3f96ef4 100755 --- a/data/mapObjects/ssanne1.asm +++ b/data/mapObjects/ssanne1.asm @@ -2,17 +2,17 @@ SSAnne1Object: db $c ; border block db $b ; warps - db $0, $1a, $1, VERMILION_DOCK - db $0, $1b, $1, VERMILION_DOCK - db $8, $1f, $0, SS_ANNE_8 - db $8, $17, $1, SS_ANNE_8 - db $8, $13, $2, SS_ANNE_8 - db $8, $f, $3, SS_ANNE_8 - db $8, $b, $4, SS_ANNE_8 - db $8, $7, $5, SS_ANNE_8 - db $6, $2, $6, SS_ANNE_2 - db $f, $25, $5, SS_ANNE_4 - db $10, $3, $0, SS_ANNE_6 + warp $1a, $0, $1, VERMILION_DOCK + warp $1b, $0, $1, VERMILION_DOCK + warp $1f, $8, $0, SS_ANNE_8 + warp $17, $8, $1, SS_ANNE_8 + warp $13, $8, $2, SS_ANNE_8 + warp $f, $8, $3, SS_ANNE_8 + warp $b, $8, $4, SS_ANNE_8 + warp $7, $8, $5, SS_ANNE_8 + warp $2, $6, $6, SS_ANNE_2 + warp $25, $f, $5, SS_ANNE_4 + warp $3, $10, $0, SS_ANNE_6 db $0 ; signs @@ -21,14 +21,14 @@ SSAnne1Object: object SPRITE_SAILOR, $1b, $5, STAY, NONE, $2 ; person ; warp-to - EVENT_DISP SS_ANNE_1_WIDTH, $0, $1a ; VERMILION_DOCK - EVENT_DISP SS_ANNE_1_WIDTH, $0, $1b ; VERMILION_DOCK - EVENT_DISP SS_ANNE_1_WIDTH, $8, $1f ; SS_ANNE_8 - EVENT_DISP SS_ANNE_1_WIDTH, $8, $17 ; SS_ANNE_8 - EVENT_DISP SS_ANNE_1_WIDTH, $8, $13 ; SS_ANNE_8 - EVENT_DISP SS_ANNE_1_WIDTH, $8, $f ; SS_ANNE_8 - EVENT_DISP SS_ANNE_1_WIDTH, $8, $b ; SS_ANNE_8 - EVENT_DISP SS_ANNE_1_WIDTH, $8, $7 ; SS_ANNE_8 - EVENT_DISP SS_ANNE_1_WIDTH, $6, $2 ; SS_ANNE_2 - EVENT_DISP SS_ANNE_1_WIDTH, $f, $25 ; SS_ANNE_4 - EVENT_DISP SS_ANNE_1_WIDTH, $10, $3 ; SS_ANNE_6 + warp_to $1a, $0, SS_ANNE_1_WIDTH ; VERMILION_DOCK + warp_to $1b, $0, SS_ANNE_1_WIDTH ; VERMILION_DOCK + warp_to $1f, $8, SS_ANNE_1_WIDTH ; SS_ANNE_8 + warp_to $17, $8, SS_ANNE_1_WIDTH ; SS_ANNE_8 + warp_to $13, $8, SS_ANNE_1_WIDTH ; SS_ANNE_8 + warp_to $f, $8, SS_ANNE_1_WIDTH ; SS_ANNE_8 + warp_to $b, $8, SS_ANNE_1_WIDTH ; SS_ANNE_8 + warp_to $7, $8, SS_ANNE_1_WIDTH ; SS_ANNE_8 + warp_to $2, $6, SS_ANNE_1_WIDTH ; SS_ANNE_2 + warp_to $25, $f, SS_ANNE_1_WIDTH ; SS_ANNE_4 + warp_to $3, $10, SS_ANNE_1_WIDTH ; SS_ANNE_6 diff --git a/data/mapObjects/ssanne10.asm b/data/mapObjects/ssanne10.asm index a8f49cf7..a281316c 100755 --- a/data/mapObjects/ssanne10.asm +++ b/data/mapObjects/ssanne10.asm @@ -2,16 +2,16 @@ SSAnne10Object: db $c ; border block db $a ; warps - db $5, $2, $4, SS_ANNE_4 - db $5, $3, $4, SS_ANNE_4 - db $5, $c, $3, SS_ANNE_4 - db $5, $d, $3, SS_ANNE_4 - db $5, $16, $2, SS_ANNE_4 - db $5, $17, $2, SS_ANNE_4 - db $f, $2, $1, SS_ANNE_4 - db $f, $3, $1, SS_ANNE_4 - db $f, $c, $0, SS_ANNE_4 - db $f, $d, $0, SS_ANNE_4 + warp $2, $5, $4, SS_ANNE_4 + warp $3, $5, $4, SS_ANNE_4 + warp $c, $5, $3, SS_ANNE_4 + warp $d, $5, $3, SS_ANNE_4 + warp $16, $5, $2, SS_ANNE_4 + warp $17, $5, $2, SS_ANNE_4 + warp $2, $f, $1, SS_ANNE_4 + warp $3, $f, $1, SS_ANNE_4 + warp $c, $f, $0, SS_ANNE_4 + warp $d, $f, $0, SS_ANNE_4 db $0 ; signs @@ -29,13 +29,13 @@ SSAnne10Object: object SPRITE_BALL, $c, $b, STAY, NONE, $b, MAX_POTION ; warp-to - EVENT_DISP SS_ANNE_10_WIDTH, $5, $2 ; SS_ANNE_4 - EVENT_DISP SS_ANNE_10_WIDTH, $5, $3 ; SS_ANNE_4 - EVENT_DISP SS_ANNE_10_WIDTH, $5, $c ; SS_ANNE_4 - EVENT_DISP SS_ANNE_10_WIDTH, $5, $d ; SS_ANNE_4 - EVENT_DISP SS_ANNE_10_WIDTH, $5, $16 ; SS_ANNE_4 - EVENT_DISP SS_ANNE_10_WIDTH, $5, $17 ; SS_ANNE_4 - EVENT_DISP SS_ANNE_10_WIDTH, $f, $2 ; SS_ANNE_4 - EVENT_DISP SS_ANNE_10_WIDTH, $f, $3 ; SS_ANNE_4 - EVENT_DISP SS_ANNE_10_WIDTH, $f, $c ; SS_ANNE_4 - EVENT_DISP SS_ANNE_10_WIDTH, $f, $d ; SS_ANNE_4 + warp_to $2, $5, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to $3, $5, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to $c, $5, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to $d, $5, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to $16, $5, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to $17, $5, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to $2, $f, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to $3, $f, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to $c, $f, SS_ANNE_10_WIDTH ; SS_ANNE_4 + warp_to $d, $f, SS_ANNE_10_WIDTH ; SS_ANNE_4 diff --git a/data/mapObjects/ssanne2.asm b/data/mapObjects/ssanne2.asm index eb761685..208cf88c 100755 --- a/data/mapObjects/ssanne2.asm +++ b/data/mapObjects/ssanne2.asm @@ -2,15 +2,15 @@ SSAnne2Object: db $c ; border block db $9 ; warps - db $b, $9, $0, SS_ANNE_9 - db $b, $d, $2, SS_ANNE_9 - db $b, $11, $4, SS_ANNE_9 - db $b, $15, $6, SS_ANNE_9 - db $b, $19, $8, SS_ANNE_9 - db $b, $1d, $a, SS_ANNE_9 - db $4, $2, $8, SS_ANNE_1 - db $c, $2, $1, SS_ANNE_3 - db $4, $24, $0, SS_ANNE_7 + warp $9, $b, $0, SS_ANNE_9 + warp $d, $b, $2, SS_ANNE_9 + warp $11, $b, $4, SS_ANNE_9 + warp $15, $b, $6, SS_ANNE_9 + warp $19, $b, $8, SS_ANNE_9 + warp $1d, $b, $a, SS_ANNE_9 + warp $2, $4, $8, SS_ANNE_1 + warp $2, $c, $1, SS_ANNE_3 + warp $24, $4, $0, SS_ANNE_7 db $0 ; signs @@ -19,12 +19,12 @@ SSAnne2Object: object SPRITE_BLUE, $24, $4, STAY, DOWN, $2, OPP_SONY1, $1 ; warp-to - EVENT_DISP SS_ANNE_2_WIDTH, $b, $9 ; SS_ANNE_9 - EVENT_DISP SS_ANNE_2_WIDTH, $b, $d ; SS_ANNE_9 - EVENT_DISP SS_ANNE_2_WIDTH, $b, $11 ; SS_ANNE_9 - EVENT_DISP SS_ANNE_2_WIDTH, $b, $15 ; SS_ANNE_9 - EVENT_DISP SS_ANNE_2_WIDTH, $b, $19 ; SS_ANNE_9 - EVENT_DISP SS_ANNE_2_WIDTH, $b, $1d ; SS_ANNE_9 - EVENT_DISP SS_ANNE_2_WIDTH, $4, $2 ; SS_ANNE_1 - EVENT_DISP SS_ANNE_2_WIDTH, $c, $2 ; SS_ANNE_3 - EVENT_DISP SS_ANNE_2_WIDTH, $4, $24 ; SS_ANNE_7 + warp_to $9, $b, SS_ANNE_2_WIDTH ; SS_ANNE_9 + warp_to $d, $b, SS_ANNE_2_WIDTH ; SS_ANNE_9 + warp_to $11, $b, SS_ANNE_2_WIDTH ; SS_ANNE_9 + warp_to $15, $b, SS_ANNE_2_WIDTH ; SS_ANNE_9 + warp_to $19, $b, SS_ANNE_2_WIDTH ; SS_ANNE_9 + warp_to $1d, $b, SS_ANNE_2_WIDTH ; SS_ANNE_9 + warp_to $2, $4, SS_ANNE_2_WIDTH ; SS_ANNE_1 + warp_to $2, $c, SS_ANNE_2_WIDTH ; SS_ANNE_3 + warp_to $24, $4, SS_ANNE_2_WIDTH ; SS_ANNE_7 diff --git a/data/mapObjects/ssanne3.asm b/data/mapObjects/ssanne3.asm index 567f0363..f431fe46 100755 --- a/data/mapObjects/ssanne3.asm +++ b/data/mapObjects/ssanne3.asm @@ -2,8 +2,8 @@ SSAnne3Object: db $c ; border block db $2 ; warps - db $3, $0, $0, SS_ANNE_5 - db $3, $13, $7, SS_ANNE_2 + warp $0, $3, $0, SS_ANNE_5 + warp $13, $3, $7, SS_ANNE_2 db $0 ; signs @@ -11,5 +11,5 @@ SSAnne3Object: object SPRITE_SAILOR, $9, $3, WALK, $2, $1 ; person ; warp-to - EVENT_DISP SS_ANNE_3_WIDTH, $3, $0 ; SS_ANNE_5 - EVENT_DISP SS_ANNE_3_WIDTH, $3, $13 ; SS_ANNE_2 + warp_to $0, $3, SS_ANNE_3_WIDTH ; SS_ANNE_5 + warp_to $13, $3, SS_ANNE_3_WIDTH ; SS_ANNE_2 diff --git a/data/mapObjects/ssanne4.asm b/data/mapObjects/ssanne4.asm index fbd1df5b..d1e72162 100755 --- a/data/mapObjects/ssanne4.asm +++ b/data/mapObjects/ssanne4.asm @@ -2,21 +2,21 @@ SSAnne4Object: db $c ; border block db $6 ; warps - db $3, $17, $8, SS_ANNE_10 - db $3, $13, $6, SS_ANNE_10 - db $3, $f, $4, SS_ANNE_10 - db $3, $b, $2, SS_ANNE_10 - db $3, $7, $0, SS_ANNE_10 - db $5, $1b, $9, SS_ANNE_1 + warp $17, $3, $8, SS_ANNE_10 + warp $13, $3, $6, SS_ANNE_10 + warp $f, $3, $4, SS_ANNE_10 + warp $b, $3, $2, SS_ANNE_10 + warp $7, $3, $0, SS_ANNE_10 + warp $1b, $5, $9, SS_ANNE_1 db $0 ; signs db $0 ; objects ; warp-to - EVENT_DISP SS_ANNE_4_WIDTH, $3, $17 ; SS_ANNE_10 - EVENT_DISP SS_ANNE_4_WIDTH, $3, $13 ; SS_ANNE_10 - EVENT_DISP SS_ANNE_4_WIDTH, $3, $f ; SS_ANNE_10 - EVENT_DISP SS_ANNE_4_WIDTH, $3, $b ; SS_ANNE_10 - EVENT_DISP SS_ANNE_4_WIDTH, $3, $7 ; SS_ANNE_10 - EVENT_DISP SS_ANNE_4_WIDTH, $5, $1b ; SS_ANNE_1 + warp_to $17, $3, SS_ANNE_4_WIDTH ; SS_ANNE_10 + warp_to $13, $3, SS_ANNE_4_WIDTH ; SS_ANNE_10 + warp_to $f, $3, SS_ANNE_4_WIDTH ; SS_ANNE_10 + warp_to $b, $3, SS_ANNE_4_WIDTH ; SS_ANNE_10 + warp_to $7, $3, SS_ANNE_4_WIDTH ; SS_ANNE_10 + warp_to $1b, $5, SS_ANNE_4_WIDTH ; SS_ANNE_1 diff --git a/data/mapObjects/ssanne5.asm b/data/mapObjects/ssanne5.asm index 6031327e..44816883 100755 --- a/data/mapObjects/ssanne5.asm +++ b/data/mapObjects/ssanne5.asm @@ -2,8 +2,8 @@ SSAnne5Object: db $23 ; border block db $2 ; warps - db $6, $d, $0, SS_ANNE_3 - db $7, $d, $0, SS_ANNE_3 + warp $d, $6, $0, SS_ANNE_3 + warp $d, $7, $0, SS_ANNE_3 db $0 ; signs @@ -15,5 +15,5 @@ SSAnne5Object: object SPRITE_SAILOR, $a, $8, STAY, UP, $5, OPP_SAILOR, $2 ; warp-to - EVENT_DISP SS_ANNE_5_WIDTH, $6, $d ; SS_ANNE_3 - EVENT_DISP SS_ANNE_5_WIDTH, $7, $d ; SS_ANNE_3 + warp_to $d, $6, SS_ANNE_5_WIDTH ; SS_ANNE_3 + warp_to $d, $7, SS_ANNE_5_WIDTH ; SS_ANNE_3 diff --git a/data/mapObjects/ssanne6.asm b/data/mapObjects/ssanne6.asm index 8c2444f8..25568e99 100755 --- a/data/mapObjects/ssanne6.asm +++ b/data/mapObjects/ssanne6.asm @@ -2,7 +2,7 @@ SSAnne6Object: db $c ; border block db $1 ; warps - db $0, $6, $a, SS_ANNE_1 + warp $6, $0, $a, SS_ANNE_1 db $0 ; signs @@ -16,4 +16,4 @@ SSAnne6Object: object SPRITE_COOK, $b, $d, STAY, UP, $7 ; person ; warp-to - EVENT_DISP SS_ANNE_6_WIDTH, $0, $6 ; SS_ANNE_1 + warp_to $6, $0, SS_ANNE_6_WIDTH ; SS_ANNE_1 diff --git a/data/mapObjects/ssanne7.asm b/data/mapObjects/ssanne7.asm index 6002e85b..8e9c9194 100755 --- a/data/mapObjects/ssanne7.asm +++ b/data/mapObjects/ssanne7.asm @@ -2,14 +2,14 @@ SSAnne7Object: db $c ; border block db $1 ; warps - db $7, $0, $8, SS_ANNE_2 + warp $0, $7, $8, SS_ANNE_2 db $2 ; signs - db $1, $4, $2 ; SSAnne7Text2 - db $2, $1, $3 ; SSAnne7Text3 + sign $4, $1, $2 ; SSAnne7Text2 + sign $1, $2, $3 ; SSAnne7Text3 db $1 ; objects object SPRITE_SS_CAPTAIN, $4, $2, STAY, UP, $1 ; person ; warp-to - EVENT_DISP SS_ANNE_7_WIDTH, $7, $0 ; SS_ANNE_2 + warp_to $0, $7, SS_ANNE_7_WIDTH ; SS_ANNE_2 diff --git a/data/mapObjects/ssanne8.asm b/data/mapObjects/ssanne8.asm index 37c8cf61..b298f179 100755 --- a/data/mapObjects/ssanne8.asm +++ b/data/mapObjects/ssanne8.asm @@ -2,12 +2,12 @@ SSAnne8Object: db $c ; border block db $6 ; warps - db $0, $0, $2, SS_ANNE_1 - db $0, $a, $3, SS_ANNE_1 - db $0, $14, $4, SS_ANNE_1 - db $a, $0, $5, SS_ANNE_1 - db $a, $a, $6, SS_ANNE_1 - db $a, $14, $7, SS_ANNE_1 + warp $0, $0, $2, SS_ANNE_1 + warp $a, $0, $3, SS_ANNE_1 + warp $14, $0, $4, SS_ANNE_1 + warp $0, $a, $5, SS_ANNE_1 + warp $a, $a, $6, SS_ANNE_1 + warp $14, $a, $7, SS_ANNE_1 db $0 ; signs @@ -25,9 +25,9 @@ SSAnne8Object: object SPRITE_GENTLEMAN, $15, $d, WALK, $2, $b ; person ; warp-to - EVENT_DISP SS_ANNE_8_WIDTH, $0, $0 ; SS_ANNE_1 - EVENT_DISP SS_ANNE_8_WIDTH, $0, $a ; SS_ANNE_1 - EVENT_DISP SS_ANNE_8_WIDTH, $0, $14 ; SS_ANNE_1 - EVENT_DISP SS_ANNE_8_WIDTH, $a, $0 ; SS_ANNE_1 - EVENT_DISP SS_ANNE_8_WIDTH, $a, $a ; SS_ANNE_1 - EVENT_DISP SS_ANNE_8_WIDTH, $a, $14 ; SS_ANNE_1 + warp_to $0, $0, SS_ANNE_8_WIDTH ; SS_ANNE_1 + warp_to $a, $0, SS_ANNE_8_WIDTH ; SS_ANNE_1 + warp_to $14, $0, SS_ANNE_8_WIDTH ; SS_ANNE_1 + warp_to $0, $a, SS_ANNE_8_WIDTH ; SS_ANNE_1 + warp_to $a, $a, SS_ANNE_8_WIDTH ; SS_ANNE_1 + warp_to $14, $a, SS_ANNE_8_WIDTH ; SS_ANNE_1 diff --git a/data/mapObjects/ssanne9.asm b/data/mapObjects/ssanne9.asm index 6b5e4b7d..c3cc9e6a 100755 --- a/data/mapObjects/ssanne9.asm +++ b/data/mapObjects/ssanne9.asm @@ -2,18 +2,18 @@ SSAnne9Object: db $c ; border block db $c ; warps - db $5, $2, $0, SS_ANNE_2 - db $5, $3, $0, SS_ANNE_2 - db $5, $c, $1, SS_ANNE_2 - db $5, $d, $1, SS_ANNE_2 - db $5, $16, $2, SS_ANNE_2 - db $5, $17, $2, SS_ANNE_2 - db $f, $2, $3, SS_ANNE_2 - db $f, $3, $3, SS_ANNE_2 - db $f, $c, $4, SS_ANNE_2 - db $f, $d, $4, SS_ANNE_2 - db $f, $16, $5, SS_ANNE_2 - db $f, $17, $5, SS_ANNE_2 + warp $2, $5, $0, SS_ANNE_2 + warp $3, $5, $0, SS_ANNE_2 + warp $c, $5, $1, SS_ANNE_2 + warp $d, $5, $1, SS_ANNE_2 + warp $16, $5, $2, SS_ANNE_2 + warp $17, $5, $2, SS_ANNE_2 + warp $2, $f, $3, SS_ANNE_2 + warp $3, $f, $3, SS_ANNE_2 + warp $c, $f, $4, SS_ANNE_2 + warp $d, $f, $4, SS_ANNE_2 + warp $16, $f, $5, SS_ANNE_2 + warp $17, $f, $5, SS_ANNE_2 db $0 ; signs @@ -33,15 +33,15 @@ SSAnne9Object: object SPRITE_FOULARD_WOMAN, $14, $c, STAY, RIGHT, $d ; person ; warp-to - EVENT_DISP SS_ANNE_9_WIDTH, $5, $2 ; SS_ANNE_2 - EVENT_DISP SS_ANNE_9_WIDTH, $5, $3 ; SS_ANNE_2 - EVENT_DISP SS_ANNE_9_WIDTH, $5, $c ; SS_ANNE_2 - EVENT_DISP SS_ANNE_9_WIDTH, $5, $d ; SS_ANNE_2 - EVENT_DISP SS_ANNE_9_WIDTH, $5, $16 ; SS_ANNE_2 - EVENT_DISP SS_ANNE_9_WIDTH, $5, $17 ; SS_ANNE_2 - EVENT_DISP SS_ANNE_9_WIDTH, $f, $2 ; SS_ANNE_2 - EVENT_DISP SS_ANNE_9_WIDTH, $f, $3 ; SS_ANNE_2 - EVENT_DISP SS_ANNE_9_WIDTH, $f, $c ; SS_ANNE_2 - EVENT_DISP SS_ANNE_9_WIDTH, $f, $d ; SS_ANNE_2 - EVENT_DISP SS_ANNE_9_WIDTH, $f, $16 ; SS_ANNE_2 - EVENT_DISP SS_ANNE_9_WIDTH, $f, $17 ; SS_ANNE_2 + warp_to $2, $5, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to $3, $5, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to $c, $5, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to $d, $5, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to $16, $5, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to $17, $5, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to $2, $f, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to $3, $f, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to $c, $f, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to $d, $f, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to $16, $f, SS_ANNE_9_WIDTH ; SS_ANNE_2 + warp_to $17, $f, SS_ANNE_9_WIDTH ; SS_ANNE_2 diff --git a/data/mapObjects/undergroundpathentranceroute5.asm b/data/mapObjects/undergroundpathentranceroute5.asm index 14d7232e..1c63b2e7 100755 --- a/data/mapObjects/undergroundpathentranceroute5.asm +++ b/data/mapObjects/undergroundpathentranceroute5.asm @@ -2,9 +2,9 @@ UndergroundPathEntranceRoute5Object: db $a ; border block db $3 ; warps - db $7, $3, $3, $ff - db $7, $4, $3, $ff - db $4, $4, $0, UNDERGROUND_PATH_NS + warp $3, $7, $3, $ff + warp $4, $7, $3, $ff + warp $4, $4, $0, UNDERGROUND_PATH_NS db $0 ; signs @@ -12,6 +12,6 @@ UndergroundPathEntranceRoute5Object: object SPRITE_LITTLE_GIRL, $2, $3, STAY, NONE, $1 ; person ; warp-to - EVENT_DISP PATH_ENTRANCE_ROUTE_5_WIDTH, $7, $3 - EVENT_DISP PATH_ENTRANCE_ROUTE_5_WIDTH, $7, $4 - EVENT_DISP PATH_ENTRANCE_ROUTE_5_WIDTH, $4, $4 ; UNDERGROUND_PATH_NS + warp_to $3, $7, PATH_ENTRANCE_ROUTE_5_WIDTH + warp_to $4, $7, PATH_ENTRANCE_ROUTE_5_WIDTH + warp_to $4, $4, PATH_ENTRANCE_ROUTE_5_WIDTH ; UNDERGROUND_PATH_NS diff --git a/data/mapObjects/undergroundpathentranceroute6.asm b/data/mapObjects/undergroundpathentranceroute6.asm index 7bce8774..41e375b0 100755 --- a/data/mapObjects/undergroundpathentranceroute6.asm +++ b/data/mapObjects/undergroundpathentranceroute6.asm @@ -2,9 +2,9 @@ UndergroundPathEntranceRoute6Object: db $a ; border block db $3 ; warps - db $7, $3, $3, $ff - db $7, $4, $3, $ff - db $4, $4, $1, UNDERGROUND_PATH_NS + warp $3, $7, $3, $ff + warp $4, $7, $3, $ff + warp $4, $4, $1, UNDERGROUND_PATH_NS db $0 ; signs @@ -12,6 +12,6 @@ UndergroundPathEntranceRoute6Object: object SPRITE_GIRL, $2, $3, STAY, NONE, $1 ; person ; warp-to - EVENT_DISP PATH_ENTRANCE_ROUTE_6_WIDTH, $7, $3 - EVENT_DISP PATH_ENTRANCE_ROUTE_6_WIDTH, $7, $4 - EVENT_DISP PATH_ENTRANCE_ROUTE_6_WIDTH, $4, $4 ; UNDERGROUND_PATH_NS + warp_to $3, $7, PATH_ENTRANCE_ROUTE_6_WIDTH + warp_to $4, $7, PATH_ENTRANCE_ROUTE_6_WIDTH + warp_to $4, $4, PATH_ENTRANCE_ROUTE_6_WIDTH ; UNDERGROUND_PATH_NS diff --git a/data/mapObjects/undergroundpathentranceroute7.asm b/data/mapObjects/undergroundpathentranceroute7.asm index 51b4bcda..29f971d0 100755 --- a/data/mapObjects/undergroundpathentranceroute7.asm +++ b/data/mapObjects/undergroundpathentranceroute7.asm @@ -2,9 +2,9 @@ UndergroundPathEntranceRoute7Object: db $a ; border block db $3 ; warps - db $7, $3, $4, $ff - db $7, $4, $4, $ff - db $4, $4, $0, UNDERGROUND_PATH_WE + warp $3, $7, $4, $ff + warp $4, $7, $4, $ff + warp $4, $4, $0, UNDERGROUND_PATH_WE db $0 ; signs @@ -12,6 +12,6 @@ UndergroundPathEntranceRoute7Object: object SPRITE_FAT_BALD_GUY, $2, $4, STAY, NONE, $1 ; person ; warp-to - EVENT_DISP PATH_ENTRANCE_ROUTE_7_WIDTH, $7, $3 - EVENT_DISP PATH_ENTRANCE_ROUTE_7_WIDTH, $7, $4 - EVENT_DISP PATH_ENTRANCE_ROUTE_7_WIDTH, $4, $4 ; UNDERGROUND_PATH_WE + warp_to $3, $7, PATH_ENTRANCE_ROUTE_7_WIDTH + warp_to $4, $7, PATH_ENTRANCE_ROUTE_7_WIDTH + warp_to $4, $4, PATH_ENTRANCE_ROUTE_7_WIDTH ; UNDERGROUND_PATH_WE diff --git a/data/mapObjects/undergroundpathentranceroute7copy.asm b/data/mapObjects/undergroundpathentranceroute7copy.asm index 04a5bf2f..7d595d5f 100755 --- a/data/mapObjects/undergroundpathentranceroute7copy.asm +++ b/data/mapObjects/undergroundpathentranceroute7copy.asm @@ -2,9 +2,9 @@ UndergroundPathEntranceRoute7CopyObject: db $a ; border block db $3 ; warps - db $7, $3, $5, $ff - db $7, $4, $5, $ff - db $4, $4, $0, UNDERGROUND_PATH_WE + warp $3, $7, $5, $ff + warp $4, $7, $5, $ff + warp $4, $4, $0, UNDERGROUND_PATH_WE db $0 ; signs @@ -13,6 +13,6 @@ UndergroundPathEntranceRoute7CopyObject: object SPRITE_FAT_BALD_GUY, $2, $4, STAY, NONE, $2 ; person ; warp-to - EVENT_DISP PATH_ENTRANCE_ROUTE_7_COPY_WIDTH, $7, $3 - EVENT_DISP PATH_ENTRANCE_ROUTE_7_COPY_WIDTH, $7, $4 - EVENT_DISP PATH_ENTRANCE_ROUTE_7_COPY_WIDTH, $4, $4 ; UNDERGROUND_PATH_WE + warp_to $3, $7, PATH_ENTRANCE_ROUTE_7_COPY_WIDTH + warp_to $4, $7, PATH_ENTRANCE_ROUTE_7_COPY_WIDTH + warp_to $4, $4, PATH_ENTRANCE_ROUTE_7_COPY_WIDTH ; UNDERGROUND_PATH_WE diff --git a/data/mapObjects/undergroundpathentranceroute8.asm b/data/mapObjects/undergroundpathentranceroute8.asm index 9e98c987..84548b8c 100755 --- a/data/mapObjects/undergroundpathentranceroute8.asm +++ b/data/mapObjects/undergroundpathentranceroute8.asm @@ -2,9 +2,9 @@ UndergroundPathEntranceRoute8Object: db $a ; border block db $3 ; warps - db $7, $3, $4, $ff - db $7, $4, $4, $ff - db $4, $4, $1, UNDERGROUND_PATH_WE + warp $3, $7, $4, $ff + warp $4, $7, $4, $ff + warp $4, $4, $1, UNDERGROUND_PATH_WE db $0 ; signs @@ -12,6 +12,6 @@ UndergroundPathEntranceRoute8Object: object SPRITE_GIRL, $3, $4, STAY, NONE, $1 ; person ; warp-to - EVENT_DISP PATH_ENTRANCE_ROUTE_8_WIDTH, $7, $3 - EVENT_DISP PATH_ENTRANCE_ROUTE_8_WIDTH, $7, $4 - EVENT_DISP PATH_ENTRANCE_ROUTE_8_WIDTH, $4, $4 ; UNDERGROUND_PATH_WE + warp_to $3, $7, PATH_ENTRANCE_ROUTE_8_WIDTH + warp_to $4, $7, PATH_ENTRANCE_ROUTE_8_WIDTH + warp_to $4, $4, PATH_ENTRANCE_ROUTE_8_WIDTH ; UNDERGROUND_PATH_WE diff --git a/data/mapObjects/undergroundpathns.asm b/data/mapObjects/undergroundpathns.asm index d0188a76..4fcb2feb 100755 --- a/data/mapObjects/undergroundpathns.asm +++ b/data/mapObjects/undergroundpathns.asm @@ -2,13 +2,13 @@ UndergroundPathNSObject: db $1 ; border block db $2 ; warps - db $4, $5, $2, PATH_ENTRANCE_ROUTE_5 - db $29, $2, $2, PATH_ENTRANCE_ROUTE_6 + warp $5, $4, $2, PATH_ENTRANCE_ROUTE_5 + warp $2, $29, $2, PATH_ENTRANCE_ROUTE_6 db $0 ; signs db $0 ; objects ; warp-to - EVENT_DISP UNDERGROUND_PATH_NS_WIDTH, $4, $5 ; PATH_ENTRANCE_ROUTE_5 - EVENT_DISP UNDERGROUND_PATH_NS_WIDTH, $29, $2 ; PATH_ENTRANCE_ROUTE_6 + warp_to $5, $4, UNDERGROUND_PATH_NS_WIDTH ; PATH_ENTRANCE_ROUTE_5 + warp_to $2, $29, UNDERGROUND_PATH_NS_WIDTH ; PATH_ENTRANCE_ROUTE_6 diff --git a/data/mapObjects/undergroundpathwe.asm b/data/mapObjects/undergroundpathwe.asm index 42bbb9bf..292db488 100755 --- a/data/mapObjects/undergroundpathwe.asm +++ b/data/mapObjects/undergroundpathwe.asm @@ -2,13 +2,13 @@ UndergroundPathWEObject: db $1 ; border block db $2 ; warps - db $5, $2, $2, PATH_ENTRANCE_ROUTE_7 - db $2, $2f, $2, PATH_ENTRANCE_ROUTE_8 + warp $2, $5, $2, PATH_ENTRANCE_ROUTE_7 + warp $2f, $2, $2, PATH_ENTRANCE_ROUTE_8 db $0 ; signs db $0 ; objects ; warp-to - EVENT_DISP UNDERGROUND_PATH_WE_WIDTH, $5, $2 ; PATH_ENTRANCE_ROUTE_7 - EVENT_DISP UNDERGROUND_PATH_WE_WIDTH, $2, $2f ; PATH_ENTRANCE_ROUTE_8 + warp_to $2, $5, UNDERGROUND_PATH_WE_WIDTH ; PATH_ENTRANCE_ROUTE_7 + warp_to $2f, $2, UNDERGROUND_PATH_WE_WIDTH ; PATH_ENTRANCE_ROUTE_8 diff --git a/data/mapObjects/unknowndungeon1.asm b/data/mapObjects/unknowndungeon1.asm index e0393f2e..1f5663b9 100755 --- a/data/mapObjects/unknowndungeon1.asm +++ b/data/mapObjects/unknowndungeon1.asm @@ -2,15 +2,15 @@ UnknownDungeon1Object: db $7d ; border block db $9 ; warps - db $11, $18, $6, $ff - db $11, $19, $6, $ff - db $1, $1b, $0, UNKNOWN_DUNGEON_2 - db $7, $17, $1, UNKNOWN_DUNGEON_2 - db $9, $12, $2, UNKNOWN_DUNGEON_2 - db $1, $7, $3, UNKNOWN_DUNGEON_2 - db $3, $1, $4, UNKNOWN_DUNGEON_2 - db $b, $3, $5, UNKNOWN_DUNGEON_2 - db $6, $0, $0, UNKNOWN_DUNGEON_3 + warp $18, $11, $6, $ff + warp $19, $11, $6, $ff + warp $1b, $1, $0, UNKNOWN_DUNGEON_2 + warp $17, $7, $1, UNKNOWN_DUNGEON_2 + warp $12, $9, $2, UNKNOWN_DUNGEON_2 + warp $7, $1, $3, UNKNOWN_DUNGEON_2 + warp $1, $3, $4, UNKNOWN_DUNGEON_2 + warp $3, $b, $5, UNKNOWN_DUNGEON_2 + warp $0, $6, $0, UNKNOWN_DUNGEON_3 db $0 ; signs @@ -20,12 +20,12 @@ UnknownDungeon1Object: object SPRITE_BALL, $5, $0, STAY, NONE, $3, NUGGET ; warp-to - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $11, $18 - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $11, $19 - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $1, $1b ; UNKNOWN_DUNGEON_2 - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $7, $17 ; UNKNOWN_DUNGEON_2 - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $9, $12 ; UNKNOWN_DUNGEON_2 - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $1, $7 ; UNKNOWN_DUNGEON_2 - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $3, $1 ; UNKNOWN_DUNGEON_2 - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $b, $3 ; UNKNOWN_DUNGEON_2 - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $6, $0 ; UNKNOWN_DUNGEON_3 + warp_to $18, $11, UNKNOWN_DUNGEON_1_WIDTH + warp_to $19, $11, UNKNOWN_DUNGEON_1_WIDTH + warp_to $1b, $1, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 + warp_to $17, $7, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 + warp_to $12, $9, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 + warp_to $7, $1, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 + warp_to $1, $3, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 + warp_to $3, $b, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 + warp_to $0, $6, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_3 diff --git a/data/mapObjects/unknowndungeon2.asm b/data/mapObjects/unknowndungeon2.asm index e1a443bb..a8fb25f9 100755 --- a/data/mapObjects/unknowndungeon2.asm +++ b/data/mapObjects/unknowndungeon2.asm @@ -2,12 +2,12 @@ UnknownDungeon2Object: db $7d ; border block db $6 ; warps - db $1, $1d, $2, UNKNOWN_DUNGEON_1 - db $6, $16, $3, UNKNOWN_DUNGEON_1 - db $7, $13, $4, UNKNOWN_DUNGEON_1 - db $1, $9, $5, UNKNOWN_DUNGEON_1 - db $3, $1, $6, UNKNOWN_DUNGEON_1 - db $b, $3, $7, UNKNOWN_DUNGEON_1 + warp $1d, $1, $2, UNKNOWN_DUNGEON_1 + warp $16, $6, $3, UNKNOWN_DUNGEON_1 + warp $13, $7, $4, UNKNOWN_DUNGEON_1 + warp $9, $1, $5, UNKNOWN_DUNGEON_1 + warp $1, $3, $6, UNKNOWN_DUNGEON_1 + warp $3, $b, $7, UNKNOWN_DUNGEON_1 db $0 ; signs @@ -17,9 +17,9 @@ UnknownDungeon2Object: object SPRITE_BALL, $d, $6, STAY, NONE, $3, FULL_RESTORE ; warp-to - EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $1, $1d ; UNKNOWN_DUNGEON_1 - EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $6, $16 ; UNKNOWN_DUNGEON_1 - EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $7, $13 ; UNKNOWN_DUNGEON_1 - EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $1, $9 ; UNKNOWN_DUNGEON_1 - EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $3, $1 ; UNKNOWN_DUNGEON_1 - EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $b, $3 ; UNKNOWN_DUNGEON_1 + warp_to $1d, $1, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 + warp_to $16, $6, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 + warp_to $13, $7, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 + warp_to $9, $1, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 + warp_to $1, $3, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 + warp_to $3, $b, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1 diff --git a/data/mapObjects/unknowndungeon3.asm b/data/mapObjects/unknowndungeon3.asm index 84fe5e5d..98abcf7c 100755 --- a/data/mapObjects/unknowndungeon3.asm +++ b/data/mapObjects/unknowndungeon3.asm @@ -2,7 +2,7 @@ UnknownDungeon3Object: db $7d ; border block db $1 ; warps - db $6, $3, $8, UNKNOWN_DUNGEON_1 + warp $3, $6, $8, UNKNOWN_DUNGEON_1 db $0 ; signs @@ -12,4 +12,4 @@ UnknownDungeon3Object: object SPRITE_BALL, $12, $1, STAY, NONE, $3, MAX_REVIVE ; warp-to - EVENT_DISP UNKNOWN_DUNGEON_3_WIDTH, $6, $3 ; UNKNOWN_DUNGEON_1 + warp_to $3, $6, UNKNOWN_DUNGEON_3_WIDTH ; UNKNOWN_DUNGEON_1 diff --git a/data/mapObjects/vermilioncity.asm b/data/mapObjects/vermilioncity.asm index 8f64e894..6b3d6011 100755 --- a/data/mapObjects/vermilioncity.asm +++ b/data/mapObjects/vermilioncity.asm @@ -2,24 +2,24 @@ VermilionCityObject: db $43 ; border block db $9 ; warps - db $3, $b, $0, VERMILION_POKECENTER - db $d, $9, $0, POKEMON_FAN_CLUB - db $d, $17, $0, VERMILION_MART - db $13, $c, $0, VERMILION_GYM - db $13, $17, $0, VERMILION_HOUSE_1 - db $1f, $12, $0, VERMILION_DOCK - db $1f, $13, $0, VERMILION_DOCK - db $d, $f, $0, VERMILION_HOUSE_3 - db $3, $7, $0, VERMILION_HOUSE_2 + warp $b, $3, $0, VERMILION_POKECENTER + warp $9, $d, $0, POKEMON_FAN_CLUB + warp $17, $d, $0, VERMILION_MART + warp $c, $13, $0, VERMILION_GYM + warp $17, $13, $0, VERMILION_HOUSE_1 + warp $12, $1f, $0, VERMILION_DOCK + warp $13, $1f, $0, VERMILION_DOCK + warp $f, $d, $0, VERMILION_HOUSE_3 + warp $7, $3, $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 + sign $1b, $3, $7 ; VermilionCityText7 + sign $25, $d, $8 ; VermilionCityText8 + sign $18, $d, $9 ; MartSignText + sign $c, $3, $a ; PokeCenterSignText + sign $7, $d, $b ; VermilionCityText11 + sign $7, $13, $c ; VermilionCityText12 + sign $1d, $f, $d ; VermilionCityText13 db $6 ; objects object SPRITE_FOULARD_WOMAN, $13, $7, WALK, $2, $1 ; person @@ -30,12 +30,12 @@ VermilionCityObject: object SPRITE_SAILOR, $19, $1b, WALK, $2, $6 ; person ; warp-to - EVENT_DISP VERMILION_CITY_WIDTH, $3, $b ; VERMILION_POKECENTER - EVENT_DISP VERMILION_CITY_WIDTH, $d, $9 ; POKEMON_FAN_CLUB - EVENT_DISP VERMILION_CITY_WIDTH, $d, $17 ; VERMILION_MART - EVENT_DISP VERMILION_CITY_WIDTH, $13, $c ; VERMILION_GYM - EVENT_DISP VERMILION_CITY_WIDTH, $13, $17 ; VERMILION_HOUSE_1 - EVENT_DISP VERMILION_CITY_WIDTH, $1f, $12 ; VERMILION_DOCK - EVENT_DISP VERMILION_CITY_WIDTH, $1f, $13 ; VERMILION_DOCK - EVENT_DISP VERMILION_CITY_WIDTH, $d, $f ; VERMILION_HOUSE_3 - EVENT_DISP VERMILION_CITY_WIDTH, $3, $7 ; VERMILION_HOUSE_2 + warp_to $b, $3, VERMILION_CITY_WIDTH ; VERMILION_POKECENTER + warp_to $9, $d, VERMILION_CITY_WIDTH ; POKEMON_FAN_CLUB + warp_to $17, $d, VERMILION_CITY_WIDTH ; VERMILION_MART + warp_to $c, $13, VERMILION_CITY_WIDTH ; VERMILION_GYM + warp_to $17, $13, VERMILION_CITY_WIDTH ; VERMILION_HOUSE_1 + warp_to $12, $1f, VERMILION_CITY_WIDTH ; VERMILION_DOCK + warp_to $13, $1f, VERMILION_CITY_WIDTH ; VERMILION_DOCK + warp_to $f, $d, VERMILION_CITY_WIDTH ; VERMILION_HOUSE_3 + warp_to $7, $3, VERMILION_CITY_WIDTH ; VERMILION_HOUSE_2 diff --git a/data/mapObjects/vermiliondock.asm b/data/mapObjects/vermiliondock.asm index 54d6790a..1c0f2f44 100755 --- a/data/mapObjects/vermiliondock.asm +++ b/data/mapObjects/vermiliondock.asm @@ -2,13 +2,13 @@ VermilionDockObject: db $f ; border block db $2 ; warps - db $0, $e, $5, $ff - db $2, $e, $1, SS_ANNE_1 + warp $e, $0, $5, $ff + warp $e, $2, $1, SS_ANNE_1 db $0 ; signs db $0 ; objects ; warp-to - EVENT_DISP VERMILION_DOCK_WIDTH, $0, $e - EVENT_DISP VERMILION_DOCK_WIDTH, $2, $e ; SS_ANNE_1 + warp_to $e, $0, VERMILION_DOCK_WIDTH + warp_to $e, $2, VERMILION_DOCK_WIDTH ; SS_ANNE_1 diff --git a/data/mapObjects/vermiliongym.asm b/data/mapObjects/vermiliongym.asm index 9058ec4c..16af5f5b 100755 --- a/data/mapObjects/vermiliongym.asm +++ b/data/mapObjects/vermiliongym.asm @@ -2,8 +2,8 @@ VermilionGymObject: db $3 ; border block db $2 ; warps - db $11, $4, $3, $ff - db $11, $5, $3, $ff + warp $4, $11, $3, $ff + warp $5, $11, $3, $ff db $0 ; signs @@ -15,5 +15,5 @@ VermilionGymObject: object SPRITE_GYM_HELPER, $4, $e, STAY, DOWN, $5 ; person ; warp-to - EVENT_DISP VERMILION_GYM_WIDTH, $11, $4 - EVENT_DISP VERMILION_GYM_WIDTH, $11, $5 + warp_to $4, $11, VERMILION_GYM_WIDTH + warp_to $5, $11, VERMILION_GYM_WIDTH diff --git a/data/mapObjects/vermilionhouse1.asm b/data/mapObjects/vermilionhouse1.asm index 199489ba..6a36b043 100755 --- a/data/mapObjects/vermilionhouse1.asm +++ b/data/mapObjects/vermilionhouse1.asm @@ -2,8 +2,8 @@ VermilionHouse1Object: db $a ; border block db $2 ; warps - db $7, $2, $4, $ff - db $7, $3, $4, $ff + warp $2, $7, $4, $ff + warp $3, $7, $4, $ff db $0 ; signs @@ -13,5 +13,5 @@ VermilionHouse1Object: object SPRITE_PAPER_SHEET, $4, $3, STAY, NONE, $3 ; person ; warp-to - EVENT_DISP VERMILION_HOUSE_1_WIDTH, $7, $2 - EVENT_DISP VERMILION_HOUSE_1_WIDTH, $7, $3 + warp_to $2, $7, VERMILION_HOUSE_1_WIDTH + warp_to $3, $7, VERMILION_HOUSE_1_WIDTH diff --git a/data/mapObjects/vermilionhouse2.asm b/data/mapObjects/vermilionhouse2.asm index 0108233b..e66744b6 100755 --- a/data/mapObjects/vermilionhouse2.asm +++ b/data/mapObjects/vermilionhouse2.asm @@ -2,8 +2,8 @@ VermilionHouse2Object: db $a ; border block db $2 ; warps - db $7, $2, $8, $ff - db $7, $3, $8, $ff + warp $2, $7, $8, $ff + warp $3, $7, $8, $ff db $0 ; signs @@ -11,5 +11,5 @@ VermilionHouse2Object: object SPRITE_FISHER, $2, $4, STAY, RIGHT, $1 ; person ; warp-to - EVENT_DISP VERMILION_HOUSE_2_WIDTH, $7, $2 - EVENT_DISP VERMILION_HOUSE_2_WIDTH, $7, $3 + warp_to $2, $7, VERMILION_HOUSE_2_WIDTH + warp_to $3, $7, VERMILION_HOUSE_2_WIDTH diff --git a/data/mapObjects/vermilionhouse3.asm b/data/mapObjects/vermilionhouse3.asm index 2b8e007b..7bafcd88 100755 --- a/data/mapObjects/vermilionhouse3.asm +++ b/data/mapObjects/vermilionhouse3.asm @@ -2,8 +2,8 @@ VermilionHouse3Object: db $a ; border block db $2 ; warps - db $7, $2, $7, $ff - db $7, $3, $7, $ff + warp $2, $7, $7, $ff + warp $3, $7, $7, $ff db $0 ; signs @@ -11,5 +11,5 @@ VermilionHouse3Object: object SPRITE_LITTLE_GIRL, $3, $5, STAY, UP, $1 ; person ; warp-to - EVENT_DISP VERMILION_HOUSE_3_WIDTH, $7, $2 - EVENT_DISP VERMILION_HOUSE_3_WIDTH, $7, $3 + warp_to $2, $7, VERMILION_HOUSE_3_WIDTH + warp_to $3, $7, VERMILION_HOUSE_3_WIDTH diff --git a/data/mapObjects/vermilionmart.asm b/data/mapObjects/vermilionmart.asm index 01df824e..2b1c578d 100755 --- a/data/mapObjects/vermilionmart.asm +++ b/data/mapObjects/vermilionmart.asm @@ -2,8 +2,8 @@ VermilionMartObject: db $0 ; border block db $2 ; warps - db $7, $3, $2, $ff - db $7, $4, $2, $ff + warp $3, $7, $2, $ff + warp $4, $7, $2, $ff db $0 ; signs @@ -13,5 +13,5 @@ VermilionMartObject: object SPRITE_LASS, $3, $3, WALK, $2, $3 ; person ; warp-to - EVENT_DISP VERMILION_MART_WIDTH, $7, $3 - EVENT_DISP VERMILION_MART_WIDTH, $7, $4 + warp_to $3, $7, VERMILION_MART_WIDTH + warp_to $4, $7, VERMILION_MART_WIDTH diff --git a/data/mapObjects/vermilionpokecenter.asm b/data/mapObjects/vermilionpokecenter.asm index 727af039..0934cd4f 100755 --- a/data/mapObjects/vermilionpokecenter.asm +++ b/data/mapObjects/vermilionpokecenter.asm @@ -2,8 +2,8 @@ VermilionPokecenterObject: db $0 ; border block db $2 ; warps - db $7, $3, $0, $ff - db $7, $4, $0, $ff + warp $3, $7, $0, $ff + warp $4, $7, $0, $ff db $0 ; signs @@ -14,5 +14,5 @@ VermilionPokecenterObject: object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP VERMILION_POKECENTER_WIDTH, $7, $3 - EVENT_DISP VERMILION_POKECENTER_WIDTH, $7, $4 + warp_to $3, $7, VERMILION_POKECENTER_WIDTH + warp_to $4, $7, VERMILION_POKECENTER_WIDTH diff --git a/data/mapObjects/victoryroad1.asm b/data/mapObjects/victoryroad1.asm index 05680b9f..a354328d 100755 --- a/data/mapObjects/victoryroad1.asm +++ b/data/mapObjects/victoryroad1.asm @@ -2,9 +2,9 @@ VictoryRoad1Object: db $7d ; border block db $3 ; warps - db $11, $8, $2, $ff - db $11, $9, $2, $ff - db $1, $1, $0, VICTORY_ROAD_2 + warp $8, $11, $2, $ff + warp $9, $11, $2, $ff + warp $1, $1, $0, VICTORY_ROAD_2 db $0 ; signs @@ -18,6 +18,6 @@ VictoryRoad1Object: object SPRITE_BOULDER, $2, $a, STAY, BOULDER_MOVEMENT_BYTE_2, $7 ; person ; warp-to - EVENT_DISP VICTORY_ROAD_1_WIDTH, $11, $8 - EVENT_DISP VICTORY_ROAD_1_WIDTH, $11, $9 - EVENT_DISP VICTORY_ROAD_1_WIDTH, $1, $1 ; VICTORY_ROAD_2 + warp_to $8, $11, VICTORY_ROAD_1_WIDTH + warp_to $9, $11, VICTORY_ROAD_1_WIDTH + warp_to $1, $1, VICTORY_ROAD_1_WIDTH ; VICTORY_ROAD_2 diff --git a/data/mapObjects/victoryroad2.asm b/data/mapObjects/victoryroad2.asm index 1bada62a..7d8c6e3c 100755 --- a/data/mapObjects/victoryroad2.asm +++ b/data/mapObjects/victoryroad2.asm @@ -2,13 +2,13 @@ VictoryRoad2Object: db $7d ; border block db $7 ; warps - db $8, $0, $2, VICTORY_ROAD_1 - db $7, $1d, $3, $ff - db $8, $1d, $3, $ff - db $7, $17, $0, VICTORY_ROAD_3 - db $e, $19, $2, VICTORY_ROAD_3 - db $7, $1b, $1, VICTORY_ROAD_3 - db $1, $1, $3, VICTORY_ROAD_3 + warp $0, $8, $2, VICTORY_ROAD_1 + warp $1d, $7, $3, $ff + warp $1d, $8, $3, $ff + warp $17, $7, $0, VICTORY_ROAD_3 + warp $19, $e, $2, VICTORY_ROAD_3 + warp $1b, $7, $1, VICTORY_ROAD_3 + warp $1, $1, $3, VICTORY_ROAD_3 db $0 ; signs @@ -28,10 +28,10 @@ VictoryRoad2Object: object SPRITE_BOULDER, $17, $10, STAY, BOULDER_MOVEMENT_BYTE_2, $d ; person ; warp-to - EVENT_DISP VICTORY_ROAD_2_WIDTH, $8, $0 ; VICTORY_ROAD_1 - EVENT_DISP VICTORY_ROAD_2_WIDTH, $7, $1d - EVENT_DISP VICTORY_ROAD_2_WIDTH, $8, $1d - EVENT_DISP VICTORY_ROAD_2_WIDTH, $7, $17 ; VICTORY_ROAD_3 - EVENT_DISP VICTORY_ROAD_2_WIDTH, $e, $19 ; VICTORY_ROAD_3 - EVENT_DISP VICTORY_ROAD_2_WIDTH, $7, $1b ; VICTORY_ROAD_3 - EVENT_DISP VICTORY_ROAD_2_WIDTH, $1, $1 ; VICTORY_ROAD_3 + warp_to $0, $8, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_1 + warp_to $1d, $7, VICTORY_ROAD_2_WIDTH + warp_to $1d, $8, VICTORY_ROAD_2_WIDTH + warp_to $17, $7, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3 + warp_to $19, $e, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3 + warp_to $1b, $7, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3 + warp_to $1, $1, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3 diff --git a/data/mapObjects/victoryroad3.asm b/data/mapObjects/victoryroad3.asm index 20e43583..c83026ef 100755 --- a/data/mapObjects/victoryroad3.asm +++ b/data/mapObjects/victoryroad3.asm @@ -2,10 +2,10 @@ VictoryRoad3Object: db $7d ; border block db $4 ; warps - db $7, $17, $3, VICTORY_ROAD_2 - db $8, $1a, $5, VICTORY_ROAD_2 - db $f, $1b, $4, VICTORY_ROAD_2 - db $0, $2, $6, VICTORY_ROAD_2 + warp $17, $7, $3, VICTORY_ROAD_2 + warp $1a, $8, $5, VICTORY_ROAD_2 + warp $1b, $f, $4, VICTORY_ROAD_2 + warp $2, $0, $6, VICTORY_ROAD_2 db $0 ; signs @@ -22,7 +22,7 @@ VictoryRoad3Object: object SPRITE_BOULDER, $16, $f, STAY, BOULDER_MOVEMENT_BYTE_2, $a ; person ; warp-to - EVENT_DISP VICTORY_ROAD_3_WIDTH, $7, $17 ; VICTORY_ROAD_2 - EVENT_DISP VICTORY_ROAD_3_WIDTH, $8, $1a ; VICTORY_ROAD_2 - EVENT_DISP VICTORY_ROAD_3_WIDTH, $f, $1b ; VICTORY_ROAD_2 - EVENT_DISP VICTORY_ROAD_3_WIDTH, $0, $2 ; VICTORY_ROAD_2 + warp_to $17, $7, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2 + warp_to $1a, $8, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2 + warp_to $1b, $f, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2 + warp_to $2, $0, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2 diff --git a/data/mapObjects/viridiancity.asm b/data/mapObjects/viridiancity.asm index ca40cc4f..754a26fe 100755 --- a/data/mapObjects/viridiancity.asm +++ b/data/mapObjects/viridiancity.asm @@ -2,19 +2,19 @@ ViridianCityObject: db $f ; border block db $5 ; warps - db $19, $17, $0, VIRIDIAN_POKECENTER - db $13, $1d, $0, VIRIDIAN_MART - db $f, $15, $0, VIRIDIAN_SCHOOL - db $9, $15, $0, VIRIDIAN_HOUSE - db $7, $20, $0, VIRIDIAN_GYM + warp $17, $19, $0, VIRIDIAN_POKECENTER + warp $1d, $13, $0, VIRIDIAN_MART + warp $15, $f, $0, VIRIDIAN_SCHOOL + warp $15, $9, $0, VIRIDIAN_HOUSE + warp $20, $7, $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 + sign $11, $11, $8 ; ViridianCityText8 + sign $13, $1, $9 ; ViridianCityText9 + sign $15, $1d, $a ; ViridianCityText10 + sign $1e, $13, $b ; MartSignText + sign $18, $19, $c ; PokeCenterSignText + sign $1b, $7, $d ; ViridianCityText13 db $7 ; objects object SPRITE_BUG_CATCHER, $d, $14, WALK, $0, $1 ; person @@ -26,8 +26,8 @@ ViridianCityObject: object SPRITE_GAMBLER, $11, $5, WALK, $2, $7 ; person ; warp-to - EVENT_DISP VIRIDIAN_CITY_WIDTH, $19, $17 ; VIRIDIAN_POKECENTER - EVENT_DISP VIRIDIAN_CITY_WIDTH, $13, $1d ; VIRIDIAN_MART - EVENT_DISP VIRIDIAN_CITY_WIDTH, $f, $15 ; VIRIDIAN_SCHOOL - EVENT_DISP VIRIDIAN_CITY_WIDTH, $9, $15 ; VIRIDIAN_HOUSE - EVENT_DISP VIRIDIAN_CITY_WIDTH, $7, $20 ; VIRIDIAN_GYM + warp_to $17, $19, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_POKECENTER + warp_to $1d, $13, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_MART + warp_to $15, $f, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_SCHOOL + warp_to $15, $9, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_HOUSE + warp_to $20, $7, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_GYM diff --git a/data/mapObjects/viridianforest.asm b/data/mapObjects/viridianforest.asm index 0e466a70..31189bb4 100755 --- a/data/mapObjects/viridianforest.asm +++ b/data/mapObjects/viridianforest.asm @@ -2,20 +2,20 @@ ViridianForestObject: db $3 ; border block db $6 ; warps - db $0, $1, $2, VIRIDIAN_FOREST_EXIT - db $0, $2, $3, 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 + warp $1, $0, $2, VIRIDIAN_FOREST_EXIT + warp $2, $0, $3, VIRIDIAN_FOREST_EXIT + warp $f, $2f, $1, VIRIDIAN_FOREST_ENTRANCE + warp $10, $2f, $1, VIRIDIAN_FOREST_ENTRANCE + warp $11, $2f, $1, VIRIDIAN_FOREST_ENTRANCE + warp $12, $2f, $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 + sign $18, $28, $9 ; ViridianForestText9 + sign $10, $20, $a ; ViridianForestText10 + sign $1a, $11, $b ; ViridianForestText11 + sign $4, $18, $c ; ViridianForestText12 + sign $12, $2d, $d ; ViridianForestText13 + sign $2, $1, $e ; ViridianForestText14 db $8 ; objects object SPRITE_BUG_CATCHER, $10, $2b, STAY, NONE, $1 ; person @@ -28,9 +28,9 @@ ViridianForestObject: object SPRITE_BUG_CATCHER, $1b, $28, STAY, NONE, $8 ; person ; warp-to - EVENT_DISP VIRIDIAN_FOREST_WIDTH, $0, $1 ; VIRIDIAN_FOREST_EXIT - EVENT_DISP VIRIDIAN_FOREST_WIDTH, $0, $2 ; VIRIDIAN_FOREST_EXIT - EVENT_DISP VIRIDIAN_FOREST_WIDTH, $2f, $f ; VIRIDIAN_FOREST_ENTRANCE - EVENT_DISP VIRIDIAN_FOREST_WIDTH, $2f, $10 ; VIRIDIAN_FOREST_ENTRANCE - EVENT_DISP VIRIDIAN_FOREST_WIDTH, $2f, $11 ; VIRIDIAN_FOREST_ENTRANCE - EVENT_DISP VIRIDIAN_FOREST_WIDTH, $2f, $12 ; VIRIDIAN_FOREST_ENTRANCE + warp_to $1, $0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_EXIT + warp_to $2, $0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_EXIT + warp_to $f, $2f, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE + warp_to $10, $2f, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE + warp_to $11, $2f, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE + warp_to $12, $2f, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE diff --git a/data/mapObjects/viridianforestentrance.asm b/data/mapObjects/viridianforestentrance.asm index 06faad72..40b1b42e 100755 --- a/data/mapObjects/viridianforestentrance.asm +++ b/data/mapObjects/viridianforestentrance.asm @@ -2,10 +2,10 @@ ViridianForestEntranceObject: db $a ; border block db $4 ; warps - db $0, $4, $3, VIRIDIAN_FOREST - db $0, $5, $4, VIRIDIAN_FOREST - db $7, $4, $5, $ff - db $7, $5, $5, $ff + warp $4, $0, $3, VIRIDIAN_FOREST + warp $5, $0, $4, VIRIDIAN_FOREST + warp $4, $7, $5, $ff + warp $5, $7, $5, $ff db $0 ; signs @@ -14,7 +14,7 @@ ViridianForestEntranceObject: object SPRITE_LITTLE_GIRL, $2, $4, WALK, $1, $2 ; person ; warp-to - EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $0, $4 ; VIRIDIAN_FOREST - EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $0, $5 ; VIRIDIAN_FOREST - EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $7, $4 - EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $7, $5 + warp_to $4, $0, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; VIRIDIAN_FOREST + warp_to $5, $0, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; VIRIDIAN_FOREST + warp_to $4, $7, VIRIDIAN_FOREST_ENTRANCE_WIDTH + warp_to $5, $7, VIRIDIAN_FOREST_ENTRANCE_WIDTH diff --git a/data/mapObjects/viridianforestexit.asm b/data/mapObjects/viridianforestexit.asm index 0f48fd1c..278f5770 100755 --- a/data/mapObjects/viridianforestexit.asm +++ b/data/mapObjects/viridianforestexit.asm @@ -2,10 +2,10 @@ ViridianForestExitObject: db $a ; border block db $4 ; warps - db $0, $4, $1, $ff - db $0, $5, $1, $ff - db $7, $4, $0, VIRIDIAN_FOREST - db $7, $5, $0, VIRIDIAN_FOREST + warp $4, $0, $1, $ff + warp $5, $0, $1, $ff + warp $4, $7, $0, VIRIDIAN_FOREST + warp $5, $7, $0, VIRIDIAN_FOREST db $0 ; signs @@ -14,7 +14,7 @@ ViridianForestExitObject: object SPRITE_OLD_PERSON, $2, $5, STAY, NONE, $2 ; person ; warp-to - EVENT_DISP VIRIDIAN_FOREST_EXIT_WIDTH, $0, $4 - EVENT_DISP VIRIDIAN_FOREST_EXIT_WIDTH, $0, $5 - EVENT_DISP VIRIDIAN_FOREST_EXIT_WIDTH, $7, $4 ; VIRIDIAN_FOREST - EVENT_DISP VIRIDIAN_FOREST_EXIT_WIDTH, $7, $5 ; VIRIDIAN_FOREST + warp_to $4, $0, VIRIDIAN_FOREST_EXIT_WIDTH + warp_to $5, $0, VIRIDIAN_FOREST_EXIT_WIDTH + warp_to $4, $7, VIRIDIAN_FOREST_EXIT_WIDTH ; VIRIDIAN_FOREST + warp_to $5, $7, VIRIDIAN_FOREST_EXIT_WIDTH ; VIRIDIAN_FOREST diff --git a/data/mapObjects/viridiangym.asm b/data/mapObjects/viridiangym.asm index 8efa5e22..5b2ce100 100755 --- a/data/mapObjects/viridiangym.asm +++ b/data/mapObjects/viridiangym.asm @@ -2,8 +2,8 @@ ViridianGymObject: db $3 ; border block db $2 ; warps - db $11, $10, $4, $ff - db $11, $11, $4, $ff + warp $10, $11, $4, $ff + warp $11, $11, $4, $ff db $0 ; signs @@ -21,5 +21,5 @@ ViridianGymObject: object SPRITE_BALL, $10, $9, STAY, NONE, $b, REVIVE ; warp-to - EVENT_DISP VIRIDIAN_GYM_WIDTH, $11, $10 - EVENT_DISP VIRIDIAN_GYM_WIDTH, $11, $11 + warp_to $10, $11, VIRIDIAN_GYM_WIDTH + warp_to $11, $11, VIRIDIAN_GYM_WIDTH diff --git a/data/mapObjects/viridianhouse.asm b/data/mapObjects/viridianhouse.asm index c06bb9c8..e6bdd88e 100755 --- a/data/mapObjects/viridianhouse.asm +++ b/data/mapObjects/viridianhouse.asm @@ -2,8 +2,8 @@ ViridianHouseObject: db $a ; border block db $2 ; warps - db $7, $2, $3, $ff - db $7, $3, $3, $ff + warp $2, $7, $3, $ff + warp $3, $7, $3, $ff db $0 ; signs @@ -14,5 +14,5 @@ ViridianHouseObject: object SPRITE_CLIPBOARD, $4, $0, STAY, NONE, $4 ; person ; warp-to - EVENT_DISP VIRIDIAN_HOUSE_WIDTH, $7, $2 - EVENT_DISP VIRIDIAN_HOUSE_WIDTH, $7, $3 + warp_to $2, $7, VIRIDIAN_HOUSE_WIDTH + warp_to $3, $7, VIRIDIAN_HOUSE_WIDTH diff --git a/data/mapObjects/viridianmart.asm b/data/mapObjects/viridianmart.asm index 4b90bee3..fc47718f 100755 --- a/data/mapObjects/viridianmart.asm +++ b/data/mapObjects/viridianmart.asm @@ -2,8 +2,8 @@ ViridianMartObject: db $0 ; border block db $2 ; warps - db $7, $3, $1, $ff - db $7, $4, $1, $ff + warp $3, $7, $1, $ff + warp $4, $7, $1, $ff db $0 ; signs @@ -13,5 +13,5 @@ ViridianMartObject: object SPRITE_BLACK_HAIR_BOY_1, $3, $3, STAY, NONE, $3 ; person ; warp-to - EVENT_DISP VIRIDIAN_MART_WIDTH, $7, $3 - EVENT_DISP VIRIDIAN_MART_WIDTH, $7, $4 + warp_to $3, $7, VIRIDIAN_MART_WIDTH + warp_to $4, $7, VIRIDIAN_MART_WIDTH diff --git a/data/mapObjects/viridianpokecenter.asm b/data/mapObjects/viridianpokecenter.asm index 2e96ca58..4f337e16 100755 --- a/data/mapObjects/viridianpokecenter.asm +++ b/data/mapObjects/viridianpokecenter.asm @@ -2,8 +2,8 @@ ViridianPokecenterObject: db $0 ; border block db $2 ; warps - db $7, $3, $0, $ff - db $7, $4, $0, $ff + warp $3, $7, $0, $ff + warp $4, $7, $0, $ff db $0 ; signs @@ -14,5 +14,5 @@ ViridianPokecenterObject: object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to - EVENT_DISP VIRIDIAN_POKECENTER_WIDTH, $7, $3 - EVENT_DISP VIRIDIAN_POKECENTER_WIDTH, $7, $4 + warp_to $3, $7, VIRIDIAN_POKECENTER_WIDTH + warp_to $4, $7, VIRIDIAN_POKECENTER_WIDTH diff --git a/macros/data_macros.asm b/macros/data_macros.asm index 4c6457be..9085cf76 100755 --- a/macros/data_macros.asm +++ b/macros/data_macros.asm @@ -118,6 +118,28 @@ object: MACRO ENDC ENDM +;\1 x position +;\2 y position +;\3 destination warp id +;\4 destination map ($ff = wLastMap) +warp: MACRO + db \2, \1, \3, \4 +ENDM + +;\1 x position +;\2 y position +;\3 sign id +sign: MACRO + db \2, \1, \3 +ENDM + +;\1 x position +;\2 y position +;\3 map width +warp_to: MACRO + EVENT_DISP \3, \2, \1 +ENDM + ;\1 (byte) = current map id ;\2 (byte) = connected map id ;\3 (byte) = x movement of connection strip |