Add warp, sign, and warp_to macros for data/mapObjects definitions

data/mapObjects/agatha.asm

@@ -2,10 +2,10 @@ AgathaObject:
 	db $0 ; border block
 
 	db $4 ; warps
-	db $b, $4, $2, BRUNOS_ROOM
+	warp $4, $b, $2, BRUNOS_ROOM
-	db $b, $5, $3, BRUNOS_ROOM
+	warp $5, $b, $3, BRUNOS_ROOM
-	db $0, $4, $0, LANCES_ROOM
+	warp $4, $0, $0, LANCES_ROOM
-	db $0, $5, $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
+	warp_to $4, $b, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM
-	EVENT_DISP AGATHAS_ROOM_WIDTH, $b, $5 ; BRUNOS_ROOM
+	warp_to $5, $b, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM
-	EVENT_DISP AGATHAS_ROOM_WIDTH, $0, $4 ; LANCES_ROOM
+	warp_to $4, $0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM
-	EVENT_DISP AGATHAS_ROOM_WIDTH, $0, $5 ; LANCES_ROOM
+	warp_to $5, $0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM

data/mapObjects/bikeshop.asm

@@ -2,8 +2,8 @@ BikeShopObject:
 	db $e ; border block
 
 	db $2 ; warps
-	db $7, $2, $4, $ff
+	warp $2, $7, $4, $ff
-	db $7, $3, $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
+	warp_to $2, $7, BIKE_SHOP_WIDTH
-	EVENT_DISP BIKE_SHOP_WIDTH, $7, $3
+	warp_to $3, $7, BIKE_SHOP_WIDTH

data/mapObjects/billshouse.asm

@@ -2,8 +2,8 @@ BillsHouseObject:
 	db $d ; border block
 
 	db $2 ; warps
-	db $7, $2, $0, $ff
+	warp $2, $7, $0, $ff
-	db $7, $3, $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
+	warp_to $2, $7, BILLS_HOUSE_WIDTH
-	EVENT_DISP BILLS_HOUSE_WIDTH, $7, $3
+	warp_to $3, $7, BILLS_HOUSE_WIDTH

data/mapObjects/blueshouse.asm

@@ -2,8 +2,8 @@ BluesHouseObject:
 	db $0A ; border block
 
 	db $2 ; warps
-	db $7, $2, $1, $FF
+	warp $2, $7, $1, $FF
-	db $7, $3, $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
+	warp_to $2, $7, BLUES_HOUSE_WIDTH
-	EVENT_DISP BLUES_HOUSE_WIDTH, $7, $3
+	warp_to $3, $7, BLUES_HOUSE_WIDTH

data/mapObjects/bruno.asm

@@ -2,10 +2,10 @@ BrunoObject:
 	db $3 ; border block
 
 	db $4 ; warps
-	db $b, $4, $2, LORELEIS_ROOM
+	warp $4, $b, $2, LORELEIS_ROOM
-	db $b, $5, $3, LORELEIS_ROOM
+	warp $5, $b, $3, LORELEIS_ROOM
-	db $0, $4, $0, AGATHAS_ROOM
+	warp $4, $0, $0, AGATHAS_ROOM
-	db $0, $5, $1, 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
+	warp_to $4, $b, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM
-	EVENT_DISP BRUNOS_ROOM_WIDTH, $b, $5 ; LORELEIS_ROOM
+	warp_to $5, $b, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM
-	EVENT_DISP BRUNOS_ROOM_WIDTH, $0, $4 ; AGATHAS_ROOM
+	warp_to $4, $0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM
-	EVENT_DISP BRUNOS_ROOM_WIDTH, $0, $5 ; AGATHAS_ROOM
+	warp_to $5, $0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM

data/mapObjects/celadoncity.asm

@@ -2,30 +2,30 @@ CeladonCityObject:
 	db $f ; border block
 
 	db $d ; warps
-	db $d, $8, $0, CELADON_MART_1
+	warp $8, $d, $0, CELADON_MART_1
-	db $d, $a, $2, CELADON_MART_1
+	warp $a, $d, $2, CELADON_MART_1
-	db $9, $18, $0, CELADON_MANSION_1
+	warp $18, $9, $0, CELADON_MANSION_1
-	db $3, $18, $2, CELADON_MANSION_1
+	warp $18, $3, $2, CELADON_MANSION_1
-	db $3, $19, $2, CELADON_MANSION_1
+	warp $19, $3, $2, CELADON_MANSION_1
-	db $9, $29, $0, CELADON_POKECENTER
+	warp $29, $9, $0, CELADON_POKECENTER
-	db $1b, $c, $0, CELADON_GYM
+	warp $c, $1b, $0, CELADON_GYM
-	db $13, $1c, $0, GAME_CORNER
+	warp $1c, $13, $0, GAME_CORNER
-	db $13, $27, $0, CELADON_MART_5 ; beta warp! no longer used
+	warp $27, $13, $0, CELADON_MART_5 ; beta warp! no longer used
-	db $13, $21, $0, CELADON_PRIZE_ROOM
+	warp $21, $13, $0, CELADON_PRIZE_ROOM
-	db $1b, $1f, $0, CELADON_DINER
+	warp $1f, $1b, $0, CELADON_DINER
-	db $1b, $23, $0, CELADON_HOUSE
+	warp $23, $1b, $0, CELADON_HOUSE
-	db $1b, $2b, $0, CELADON_HOTEL
+	warp $2b, $1b, $0, CELADON_HOTEL
 
 	db $9 ; signs
-	db $f, $1b, $a ; CeladonCityText10
+	sign $1b, $f, $a ; CeladonCityText10
-	db $f, $13, $b ; CeladonCityText11
+	sign $13, $f, $b ; CeladonCityText11
-	db $9, $2a, $c ; PokeCenterSignText
+	sign $2a, $9, $c ; PokeCenterSignText
-	db $1d, $d, $d ; CeladonCityText13
+	sign $d, $1d, $d ; CeladonCityText13
-	db $9, $15, $e ; CeladonCityText14
+	sign $15, $9, $e ; CeladonCityText14
-	db $d, $c, $f ; CeladonCityText15
+	sign $c, $d, $f ; CeladonCityText15
-	db $15, $27, $10 ; CeladonCityText16
+	sign $27, $15, $10 ; CeladonCityText16
-	db $15, $21, $11 ; CeladonCityText17
+	sign $21, $15, $11 ; CeladonCityText17
-	db $15, $1b, $12 ; CeladonCityText18
+	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
+	warp_to $8, $d, CELADON_CITY_WIDTH ; CELADON_MART_1
-	EVENT_DISP CELADON_CITY_WIDTH, $d, $a ; CELADON_MART_1
+	warp_to $a, $d, CELADON_CITY_WIDTH ; CELADON_MART_1
-	EVENT_DISP CELADON_CITY_WIDTH, $9, $18 ; CELADON_MANSION_1
+	warp_to $18, $9, CELADON_CITY_WIDTH ; CELADON_MANSION_1
-	EVENT_DISP CELADON_CITY_WIDTH, $3, $18 ; CELADON_MANSION_1
+	warp_to $18, $3, CELADON_CITY_WIDTH ; CELADON_MANSION_1
-	EVENT_DISP CELADON_CITY_WIDTH, $3, $19 ; CELADON_MANSION_1
+	warp_to $19, $3, CELADON_CITY_WIDTH ; CELADON_MANSION_1
-	EVENT_DISP CELADON_CITY_WIDTH, $9, $29 ; CELADON_POKECENTER
+	warp_to $29, $9, CELADON_CITY_WIDTH ; CELADON_POKECENTER
-	EVENT_DISP CELADON_CITY_WIDTH, $1b, $c ; CELADON_GYM
+	warp_to $c, $1b, CELADON_CITY_WIDTH ; CELADON_GYM
-	EVENT_DISP CELADON_CITY_WIDTH, $13, $1c ; GAME_CORNER
+	warp_to $1c, $13, CELADON_CITY_WIDTH ; GAME_CORNER
-	EVENT_DISP CELADON_CITY_WIDTH, $13, $27 ; CELADON_MART_5
+	warp_to $27, $13, CELADON_CITY_WIDTH ; CELADON_MART_5
-	EVENT_DISP CELADON_CITY_WIDTH, $13, $21 ; CELADON_PRIZE_ROOM
+	warp_to $21, $13, CELADON_CITY_WIDTH ; CELADON_PRIZE_ROOM
-	EVENT_DISP CELADON_CITY_WIDTH, $1b, $1f ; CELADON_DINER
+	warp_to $1f, $1b, CELADON_CITY_WIDTH ; CELADON_DINER
-	EVENT_DISP CELADON_CITY_WIDTH, $1b, $23 ; CELADON_HOUSE
+	warp_to $23, $1b, CELADON_CITY_WIDTH ; CELADON_HOUSE
-	EVENT_DISP CELADON_CITY_WIDTH, $1b, $2b ; CELADON_HOTEL
+	warp_to $2b, $1b, CELADON_CITY_WIDTH ; CELADON_HOTEL

data/mapObjects/celadondiner.asm

@@ -2,8 +2,8 @@ CeladonDinerObject:
 	db $f ; border block
 
 	db $2 ; warps
-	db $7, $3, $a, $ff
+	warp $3, $7, $a, $ff
-	db $7, $4, $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
+	warp_to $3, $7, CELADON_DINER_WIDTH
-	EVENT_DISP CELADON_DINER_WIDTH, $7, $4
+	warp_to $4, $7, CELADON_DINER_WIDTH

data/mapObjects/celadongamecorner.asm

@@ -2,12 +2,12 @@ CeladonGameCornerObject:
 	db $f ; border block
 
 	db $3 ; warps
-	db $11, $f, $7, $ff
+	warp $f, $11, $7, $ff
-	db $11, $10, $7, $ff
+	warp $10, $11, $7, $ff
-	db $4, $11, $1, ROCKET_HIDEOUT_1
+	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
+	warp_to $f, $11, GAME_CORNER_WIDTH
-	EVENT_DISP GAME_CORNER_WIDTH, $11, $10
+	warp_to $10, $11, GAME_CORNER_WIDTH
-	EVENT_DISP GAME_CORNER_WIDTH, $4, $11 ; ROCKET_HIDEOUT_1
+	warp_to $11, $4, GAME_CORNER_WIDTH ; ROCKET_HIDEOUT_1

data/mapObjects/celadongym.asm

@@ -2,8 +2,8 @@ CeladonGymObject:
 	db $3 ; border block
 
 	db $2 ; warps
-	db $11, $4, $6, $ff
+	warp $4, $11, $6, $ff
-	db $11, $5, $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
+	warp_to $4, $11, CELADON_GYM_WIDTH
-	EVENT_DISP CELADON_GYM_WIDTH, $11, $5
+	warp_to $5, $11, CELADON_GYM_WIDTH

data/mapObjects/celadonhotel.asm

@@ -2,8 +2,8 @@ CeladonHotelObject:
 	db $0 ; border block
 
 	db $2 ; warps
-	db $7, $3, $c, $ff
+	warp $3, $7, $c, $ff
-	db $7, $4, $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
+	warp_to $3, $7, CELADON_HOTEL_WIDTH
-	EVENT_DISP CELADON_HOTEL_WIDTH, $7, $4
+	warp_to $4, $7, CELADON_HOTEL_WIDTH

data/mapObjects/celadonhouse.asm

@@ -2,8 +2,8 @@ CeladonHouseObject:
 	db $f ; border block
 
 	db $2 ; warps
-	db $7, $2, $b, $ff
+	warp $2, $7, $b, $ff
-	db $7, $3, $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
+	warp_to $2, $7, CELADON_HOUSE_WIDTH
-	EVENT_DISP CELADON_HOUSE_WIDTH, $7, $3
+	warp_to $3, $7, CELADON_HOUSE_WIDTH

data/mapObjects/celadonmansion1.asm

@@ -2,14 +2,14 @@ CeladonMansion1Object:
 	db $f ; border block
 
 	db $5 ; warps
-	db $b, $4, $2, $ff
+	warp $4, $b, $2, $ff
-	db $b, $5, $2, $ff
+	warp $5, $b, $2, $ff
-	db $0, $4, $4, $ff
+	warp $4, $0, $4, $ff
-	db $1, $7, $1, CELADON_MANSION_2
+	warp $7, $1, $1, CELADON_MANSION_2
-	db $1, $2, $2, 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
+	warp_to $4, $b, CELADON_MANSION_1_WIDTH
-	EVENT_DISP CELADON_MANSION_1_WIDTH, $b, $5
+	warp_to $5, $b, CELADON_MANSION_1_WIDTH
-	EVENT_DISP CELADON_MANSION_1_WIDTH, $0, $4
+	warp_to $4, $0, CELADON_MANSION_1_WIDTH
-	EVENT_DISP CELADON_MANSION_1_WIDTH, $1, $7 ; CELADON_MANSION_2
+	warp_to $7, $1, CELADON_MANSION_1_WIDTH ; CELADON_MANSION_2
-	EVENT_DISP CELADON_MANSION_1_WIDTH, $1, $2 ; CELADON_MANSION_2
+	warp_to $2, $1, CELADON_MANSION_1_WIDTH ; CELADON_MANSION_2

data/mapObjects/celadonmansion2.asm

@@ -2,18 +2,18 @@ CeladonMansion2Object:
 	db $f ; border block
 
 	db $4 ; warps
-	db $1, $6, $0, CELADON_MANSION_3
+	warp $6, $1, $0, CELADON_MANSION_3
-	db $1, $7, $3, CELADON_MANSION_1
+	warp $7, $1, $3, CELADON_MANSION_1
-	db $1, $2, $4, CELADON_MANSION_1
+	warp $2, $1, $4, CELADON_MANSION_1
-	db $1, $4, $3, CELADON_MANSION_3
+	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
+	warp_to $6, $1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3
-	EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $7 ; CELADON_MANSION_1
+	warp_to $7, $1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1
-	EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $2 ; CELADON_MANSION_1
+	warp_to $2, $1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1
-	EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $4 ; CELADON_MANSION_3
+	warp_to $4, $1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3

data/mapObjects/celadonmansion3.asm

@@ -2,16 +2,16 @@ CeladonMansion3Object:
 	db $f ; border block
 
 	db $4 ; warps
-	db $1, $6, $0, CELADON_MANSION_2
+	warp $6, $1, $0, CELADON_MANSION_2
-	db $1, $7, $0, CELADON_MANSION_4
+	warp $7, $1, $0, CELADON_MANSION_4
-	db $1, $2, $1, CELADON_MANSION_4
+	warp $2, $1, $1, CELADON_MANSION_4
-	db $1, $4, $3, CELADON_MANSION_2
+	warp $4, $1, $3, CELADON_MANSION_2
 
 	db $4 ; signs
-	db $3, $1, $5 ; CeladonMansion3Text5
+	sign $1, $3, $5 ; CeladonMansion3Text5
-	db $3, $4, $6 ; CeladonMansion3Text6
+	sign $4, $3, $6 ; CeladonMansion3Text6
-	db $6, $1, $7 ; CeladonMansion3Text7
+	sign $1, $6, $7 ; CeladonMansion3Text7
-	db $9, $4, $8 ; CeladonMansion3Text8
+	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
+	warp_to $6, $1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_2
-	EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $7 ; CELADON_MANSION_4
+	warp_to $7, $1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_4
-	EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $2 ; CELADON_MANSION_4
+	warp_to $2, $1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_4
-	EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $4 ; CELADON_MANSION_2
+	warp_to $4, $1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_2

data/mapObjects/celadonmansion4.asm

@@ -2,16 +2,16 @@ CeladonMansion4Object:
 	db $9 ; border block
 
 	db $3 ; warps
-	db $1, $6, $1, CELADON_MANSION_3
+	warp $6, $1, $1, CELADON_MANSION_3
-	db $1, $2, $2, CELADON_MANSION_3
+	warp $2, $1, $2, CELADON_MANSION_3
-	db $7, $2, $0, CELADON_MANSION_5
+	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
+	warp_to $6, $1, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_3
-	EVENT_DISP CELADON_MANSION_4_WIDTH, $1, $2 ; CELADON_MANSION_3
+	warp_to $2, $1, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_3
-	EVENT_DISP CELADON_MANSION_4_WIDTH, $7, $2 ; CELADON_MANSION_5
+	warp_to $2, $7, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_5

data/mapObjects/celadonmansion5.asm

@@ -2,8 +2,8 @@ CeladonMansion5Object:
 	db $a ; border block
 
 	db $2 ; warps
-	db $7, $2, $2, CELADON_MANSION_4
+	warp $2, $7, $2, CELADON_MANSION_4
-	db $7, $3, $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
+	warp_to $2, $7, CELADON_MANSION_5_WIDTH ; CELADON_MANSION_4
-	EVENT_DISP CELADON_MANSION_5_WIDTH, $7, $3 ; CELADON_MANSION_4
+	warp_to $3, $7, CELADON_MANSION_5_WIDTH ; CELADON_MANSION_4

data/mapObjects/celadonmart1.asm

@@ -2,24 +2,24 @@ CeladonMart1Object:
 	db $f ; border block
 
 	db $6 ; warps
-	db $7, $2, $0, $ff
+	warp $2, $7, $0, $ff
-	db $7, $3, $0, $ff
+	warp $3, $7, $0, $ff
-	db $7, $10, $1, $ff
+	warp $10, $7, $1, $ff
-	db $7, $11, $1, $ff
+	warp $11, $7, $1, $ff
-	db $1, $c, $0, CELADON_MART_2
+	warp $c, $1, $0, CELADON_MART_2
-	db $1, $1, $0, CELADON_MART_ELEVATOR
+	warp $1, $1, $0, CELADON_MART_ELEVATOR
 
 	db $2 ; signs
-	db $4, $b, $2 ; CeladonMart1Text2
+	sign $b, $4, $2 ; CeladonMart1Text2
-	db $1, $e, $3 ; CeladonMart1Text3
+	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
+	warp_to $2, $7, CELADON_MART_1_WIDTH
-	EVENT_DISP CELADON_MART_1_WIDTH, $7, $3
+	warp_to $3, $7, CELADON_MART_1_WIDTH
-	EVENT_DISP CELADON_MART_1_WIDTH, $7, $10
+	warp_to $10, $7, CELADON_MART_1_WIDTH
-	EVENT_DISP CELADON_MART_1_WIDTH, $7, $11
+	warp_to $11, $7, CELADON_MART_1_WIDTH
-	EVENT_DISP CELADON_MART_1_WIDTH, $1, $c ; CELADON_MART_2
+	warp_to $c, $1, CELADON_MART_1_WIDTH ; CELADON_MART_2
-	EVENT_DISP CELADON_MART_1_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR
+	warp_to $1, $1, CELADON_MART_1_WIDTH ; CELADON_MART_ELEVATOR

data/mapObjects/celadonmart2.asm

@@ -2,12 +2,12 @@ CeladonMart2Object:
 	db $f ; border block
 
 	db $3 ; warps
-	db $1, $c, $4, CELADON_MART_1
+	warp $c, $1, $4, CELADON_MART_1
-	db $1, $10, $1, CELADON_MART_3
+	warp $10, $1, $1, CELADON_MART_3
-	db $1, $1, $0, CELADON_MART_ELEVATOR
+	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
+	warp_to $c, $1, CELADON_MART_2_WIDTH ; CELADON_MART_1
-	EVENT_DISP CELADON_MART_2_WIDTH, $1, $10 ; CELADON_MART_3
+	warp_to $10, $1, CELADON_MART_2_WIDTH ; CELADON_MART_3
-	EVENT_DISP CELADON_MART_2_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR
+	warp_to $1, $1, CELADON_MART_2_WIDTH ; CELADON_MART_ELEVATOR

data/mapObjects/celadonmart3.asm

@@ -2,23 +2,23 @@ CeladonMart3Object:
 	db $f ; border block
 
 	db $3 ; warps
-	db $1, $c, $0, CELADON_MART_4
+	warp $c, $1, $0, CELADON_MART_4
-	db $1, $10, $1, CELADON_MART_2
+	warp $10, $1, $1, CELADON_MART_2
-	db $1, $1, $0, CELADON_MART_ELEVATOR
+	warp $1, $1, $0, CELADON_MART_ELEVATOR
 
 	db $c ; signs
-	db $4, $2, $6 ; CeladonMart3Text6
+	sign $2, $4, $6 ; CeladonMart3Text6
-	db $4, $3, $7 ; CeladonMart3Text7
+	sign $3, $4, $7 ; CeladonMart3Text7
-	db $4, $5, $8 ; CeladonMart3Text8
+	sign $5, $4, $8 ; CeladonMart3Text8
-	db $4, $6, $9 ; CeladonMart3Text9
+	sign $6, $4, $9 ; CeladonMart3Text9
-	db $6, $2, $a ; CeladonMart3Text10
+	sign $2, $6, $a ; CeladonMart3Text10
-	db $6, $3, $b ; CeladonMart3Text11
+	sign $3, $6, $b ; CeladonMart3Text11
-	db $6, $5, $c ; CeladonMart3Text12
+	sign $5, $6, $c ; CeladonMart3Text12
-	db $6, $6, $d ; CeladonMart3Text13
+	sign $6, $6, $d ; CeladonMart3Text13
-	db $1, $e, $e ; CeladonMart3Text14
+	sign $e, $1, $e ; CeladonMart3Text14
-	db $1, $4, $f ; CeladonMart3Text15
+	sign $4, $1, $f ; CeladonMart3Text15
-	db $1, $6, $10 ; CeladonMart3Text16
+	sign $6, $1, $10 ; CeladonMart3Text16
-	db $1, $a, $11 ; CeladonMart3Text17
+	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
+	warp_to $c, $1, CELADON_MART_3_WIDTH ; CELADON_MART_4
-	EVENT_DISP CELADON_MART_3_WIDTH, $1, $10 ; CELADON_MART_2
+	warp_to $10, $1, CELADON_MART_3_WIDTH ; CELADON_MART_2
-	EVENT_DISP CELADON_MART_3_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR
+	warp_to $1, $1, CELADON_MART_3_WIDTH ; CELADON_MART_ELEVATOR

data/mapObjects/celadonmart4.asm

@@ -2,12 +2,12 @@ CeladonMart4Object:
 	db $f ; border block
 
 	db $3 ; warps
-	db $1, $c, $0, CELADON_MART_3
+	warp $c, $1, $0, CELADON_MART_3
-	db $1, $10, $1, CELADON_MART_5
+	warp $10, $1, $1, CELADON_MART_5
-	db $1, $1, $0, CELADON_MART_ELEVATOR
+	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
+	warp_to $c, $1, CELADON_MART_4_WIDTH ; CELADON_MART_3
-	EVENT_DISP CELADON_MART_4_WIDTH, $1, $10 ; CELADON_MART_5
+	warp_to $10, $1, CELADON_MART_4_WIDTH ; CELADON_MART_5
-	EVENT_DISP CELADON_MART_4_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR
+	warp_to $1, $1, CELADON_MART_4_WIDTH ; CELADON_MART_ELEVATOR

data/mapObjects/celadonmart5.asm

@@ -2,12 +2,12 @@ CeladonMart5Object:
 	db $f ; border block
 
 	db $3 ; warps
-	db $1, $c, $0, CELADON_MART_ROOF
+	warp $c, $1, $0, CELADON_MART_ROOF
-	db $1, $10, $1, CELADON_MART_4
+	warp $10, $1, $1, CELADON_MART_4
-	db $1, $1, $0, CELADON_MART_ELEVATOR
+	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
+	warp_to $c, $1, CELADON_MART_5_WIDTH ; CELADON_MART_ROOF
-	EVENT_DISP CELADON_MART_5_WIDTH, $1, $10 ; CELADON_MART_4
+	warp_to $10, $1, CELADON_MART_5_WIDTH ; CELADON_MART_4
-	EVENT_DISP CELADON_MART_5_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR
+	warp_to $1, $1, CELADON_MART_5_WIDTH ; CELADON_MART_ELEVATOR

data/mapObjects/celadonmartelevator.asm

@@ -2,14 +2,14 @@ CeladonMartElevatorObject:
 	db $f ; border block
 
 	db $2 ; warps
-	db $3, $1, $5, CELADON_MART_1
+	warp $1, $3, $5, CELADON_MART_1
-	db $3, $2, $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
+	warp_to $1, $3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1
-	EVENT_DISP CELADON_MART_ELEVATOR_WIDTH, $3, $2 ; CELADON_MART_1
+	warp_to $2, $3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1

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
+	sign $a, $1, $3 ; CeladonMartRoofText3
-	db $1, $b, $4 ; CeladonMartRoofText4
+	sign $b, $1, $4 ; CeladonMartRoofText4
-	db $2, $c, $5 ; CeladonMartRoofText5
+	sign $c, $2, $5 ; CeladonMartRoofText5
-	db $2, $d, $6 ; CeladonMartRoofText6
+	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

data/mapObjects/celadonpokecenter.asm

@@ -2,8 +2,8 @@ CeladonPokecenterObject:
 	db $0 ; border block
 
 	db $2 ; warps
-	db $7, $3, $5, $ff
+	warp $3, $7, $5, $ff
-	db $7, $4, $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
+	warp_to $3, $7, CELADON_POKECENTER_WIDTH
-	EVENT_DISP CELADON_POKECENTER_WIDTH, $7, $4
+	warp_to $4, $7, CELADON_POKECENTER_WIDTH

data/mapObjects/celadonprizeroom.asm

@@ -2,18 +2,18 @@ CeladonPrizeRoomObject:
 	db $f ; border block
 
 	db $2 ; warps
-	db $7, $4, $9, $ff
+	warp $4, $7, $9, $ff
-	db $7, $5, $9, $ff
+	warp $5, $7, $9, $ff
 
 	db $3 ; signs
-	db $2, $2, $3 ; CeladonPrizeRoomText3
+	sign $2, $2, $3 ; CeladonPrizeRoomText3
-	db $2, $4, $4 ; CeladonPrizeRoomText4
+	sign $4, $2, $4 ; CeladonPrizeRoomText4
-	db $2, $6, $5 ; CeladonPrizeRoomText5
+	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
+	warp_to $4, $7, CELADON_PRIZE_ROOM_WIDTH
-	EVENT_DISP CELADON_PRIZE_ROOM_WIDTH, $7, $5
+	warp_to $5, $7, CELADON_PRIZE_ROOM_WIDTH

data/mapObjects/ceruleancity.asm

@@ -2,24 +2,24 @@ CeruleanCityObject:
 	db $f ; border block
 
 	db $a ; warps
-	db $b, $1b, $0, TRASHED_HOUSE
+	warp $1b, $b, $0, TRASHED_HOUSE
-	db $f, $d, $0, CERULEAN_HOUSE_1
+	warp $d, $f, $0, CERULEAN_HOUSE_1
-	db $11, $13, $0, CERULEAN_POKECENTER
+	warp $13, $11, $0, CERULEAN_POKECENTER
-	db $13, $1e, $0, CERULEAN_GYM
+	warp $1e, $13, $0, CERULEAN_GYM
-	db $19, $d, $0, BIKE_SHOP
+	warp $d, $19, $0, BIKE_SHOP
-	db $19, $19, $0, CERULEAN_MART
+	warp $19, $19, $0, CERULEAN_MART
-	db $b, $4, $0, UNKNOWN_DUNGEON_1
+	warp $4, $b, $0, UNKNOWN_DUNGEON_1
-	db $9, $1b, $2, TRASHED_HOUSE
+	warp $1b, $9, $2, TRASHED_HOUSE
-	db $b, $9, $1, CERULEAN_HOUSE_2
+	warp $9, $b, $1, CERULEAN_HOUSE_2
-	db $9, $9, $0, CERULEAN_HOUSE_2
+	warp $9, $9, $0, CERULEAN_HOUSE_2
 
 	db $6 ; signs
-	db $13, $17, $c ; CeruleanCityText12
+	sign $17, $13, $c ; CeruleanCityText12
-	db $1d, $11, $d ; CeruleanCityText13
+	sign $11, $1d, $d ; CeruleanCityText13
-	db $19, $1a, $e ; MartSignText
+	sign $1a, $19, $e ; MartSignText
-	db $11, $14, $f ; PokeCenterSignText
+	sign $14, $11, $f ; PokeCenterSignText
-	db $19, $b, $10 ; CeruleanCityText16
+	sign $b, $19, $10 ; CeruleanCityText16
-	db $15, $1b, $11 ; CeruleanCityText17
+	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
+	warp_to $1b, $b, CERULEAN_CITY_WIDTH ; TRASHED_HOUSE
-	EVENT_DISP CERULEAN_CITY_WIDTH, $f, $d ; CERULEAN_HOUSE_1
+	warp_to $d, $f, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_1
-	EVENT_DISP CERULEAN_CITY_WIDTH, $11, $13 ; CERULEAN_POKECENTER
+	warp_to $13, $11, CERULEAN_CITY_WIDTH ; CERULEAN_POKECENTER
-	EVENT_DISP CERULEAN_CITY_WIDTH, $13, $1e ; CERULEAN_GYM
+	warp_to $1e, $13, CERULEAN_CITY_WIDTH ; CERULEAN_GYM
-	EVENT_DISP CERULEAN_CITY_WIDTH, $19, $d ; BIKE_SHOP
+	warp_to $d, $19, CERULEAN_CITY_WIDTH ; BIKE_SHOP
-	EVENT_DISP CERULEAN_CITY_WIDTH, $19, $19 ; CERULEAN_MART
+	warp_to $19, $19, CERULEAN_CITY_WIDTH ; CERULEAN_MART
-	EVENT_DISP CERULEAN_CITY_WIDTH, $b, $4 ; UNKNOWN_DUNGEON_1
+	warp_to $4, $b, CERULEAN_CITY_WIDTH ; UNKNOWN_DUNGEON_1
-	EVENT_DISP CERULEAN_CITY_WIDTH, $9, $1b ; TRASHED_HOUSE
+	warp_to $1b, $9, CERULEAN_CITY_WIDTH ; TRASHED_HOUSE
-	EVENT_DISP CERULEAN_CITY_WIDTH, $b, $9 ; CERULEAN_HOUSE_2
+	warp_to $9, $b, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_2
-	EVENT_DISP CERULEAN_CITY_WIDTH, $9, $9 ; CERULEAN_HOUSE_2
+	warp_to $9, $9, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_2

data/mapObjects/ceruleangym.asm

@@ -2,8 +2,8 @@ CeruleanGymObject:
 	db $3 ; border block
 
 	db $2 ; warps
-	db $d, $4, $3, $ff
+	warp $4, $d, $3, $ff
-	db $d, $5, $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
+	warp_to $4, $d, CERULEAN_GYM_WIDTH
-	EVENT_DISP CERULEAN_GYM_WIDTH, $d, $5
+	warp_to $5, $d, CERULEAN_GYM_WIDTH

data/mapObjects/ceruleanhouse1.asm

@@ -2,8 +2,8 @@ CeruleanHouse1Object:
 	db $a ; border block
 
 	db $2 ; warps
-	db $7, $2, $1, $ff
+	warp $2, $7, $1, $ff
-	db $7, $3, $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
+	warp_to $2, $7, CERULEAN_HOUSE_1_WIDTH
-	EVENT_DISP CERULEAN_HOUSE_1_WIDTH, $7, $3
+	warp_to $3, $7, CERULEAN_HOUSE_1_WIDTH

data/mapObjects/ceruleanhouse2.asm

@@ -2,9 +2,9 @@ CeruleanHouse2Object:
 	db $c ; border block
 
 	db $3 ; warps
-	db $0, $2, $9, $ff
+	warp $2, $0, $9, $ff
-	db $7, $2, $8, $ff
+	warp $2, $7, $8, $ff
-	db $7, $3, $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
+	warp_to $2, $0, CERULEAN_HOUSE_2_WIDTH
-	EVENT_DISP CERULEAN_HOUSE_2_WIDTH, $7, $2
+	warp_to $2, $7, CERULEAN_HOUSE_2_WIDTH
-	EVENT_DISP CERULEAN_HOUSE_2_WIDTH, $7, $3
+	warp_to $3, $7, CERULEAN_HOUSE_2_WIDTH

data/mapObjects/ceruleanhousetrashed.asm

@@ -2,18 +2,18 @@ CeruleanHouseTrashedObject:
 	db $a ; border block
 
 	db $3 ; warps
-	db $7, $2, $0, $ff
+	warp $2, $7, $0, $ff
-	db $7, $3, $0, $ff
+	warp $3, $7, $0, $ff
-	db $0, $3, $7, $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
+	warp_to $2, $7, TRASHED_HOUSE_WIDTH
-	EVENT_DISP TRASHED_HOUSE_WIDTH, $7, $3
+	warp_to $3, $7, TRASHED_HOUSE_WIDTH
-	EVENT_DISP TRASHED_HOUSE_WIDTH, $0, $3
+	warp_to $3, $0, TRASHED_HOUSE_WIDTH

data/mapObjects/ceruleanmart.asm

@@ -2,8 +2,8 @@ CeruleanMartObject:
 	db $0 ; border block
 
 	db $2 ; warps
-	db $7, $3, $5, $ff
+	warp $3, $7, $5, $ff
-	db $7, $4, $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
+	warp_to $3, $7, CERULEAN_MART_WIDTH
-	EVENT_DISP CERULEAN_MART_WIDTH, $7, $4
+	warp_to $4, $7, CERULEAN_MART_WIDTH

data/mapObjects/ceruleanpokecenter.asm

@@ -2,8 +2,8 @@ CeruleanPokecenterObject:
 	db $0 ; border block
 
 	db $2 ; warps
-	db $7, $3, $2, $ff
+	warp $3, $7, $2, $ff
-	db $7, $4, $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
+	warp_to $3, $7, CERULEAN_POKECENTER_WIDTH
-	EVENT_DISP CERULEAN_POKECENTER_WIDTH, $7, $4
+	warp_to $4, $7, CERULEAN_POKECENTER_WIDTH

data/mapObjects/cinnabargym.asm

@@ -2,8 +2,8 @@ CinnabarGymObject:
 	db $2e ; border block
 
 	db $2 ; warps
-	db $11, $10, $1, $ff
+	warp $10, $11, $1, $ff
-	db $11, $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
+	warp_to $10, $11, CINNABAR_GYM_WIDTH
-	EVENT_DISP CINNABAR_GYM_WIDTH, $11, $11
+	warp_to $11, $11, CINNABAR_GYM_WIDTH

data/mapObjects/cinnabarisland.asm

@@ -2,26 +2,26 @@ CinnabarIslandObject:
 	db $43 ; border block
 
 	db $5 ; warps
-	db $3, $6, $1, MANSION_1
+	warp $6, $3, $1, MANSION_1
-	db $3, $12, $0, CINNABAR_GYM
+	warp $12, $3, $0, CINNABAR_GYM
-	db $9, $6, $0, CINNABAR_LAB_1
+	warp $6, $9, $0, CINNABAR_LAB_1
-	db $b, $b, $0, CINNABAR_POKECENTER
+	warp $b, $b, $0, CINNABAR_POKECENTER
-	db $b, $f, $0, CINNABAR_MART
+	warp $f, $b, $0, CINNABAR_MART
 
 	db $5 ; signs
-	db $5, $9, $3 ; CinnabarIslandText3
+	sign $9, $5, $3 ; CinnabarIslandText3
-	db $b, $10, $4 ; MartSignText
+	sign $10, $b, $4 ; MartSignText
-	db $b, $c, $5 ; PokeCenterSignText
+	sign $c, $b, $5 ; PokeCenterSignText
-	db $b, $9, $6 ; CinnabarIslandText6
+	sign $9, $b, $6 ; CinnabarIslandText6
-	db $3, $d, $7 ; CinnabarIslandText7
+	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
+	warp_to $6, $3, CINNABAR_ISLAND_WIDTH ; MANSION_1
-	EVENT_DISP CINNABAR_ISLAND_WIDTH, $3, $12 ; CINNABAR_GYM
+	warp_to $12, $3, CINNABAR_ISLAND_WIDTH ; CINNABAR_GYM
-	EVENT_DISP CINNABAR_ISLAND_WIDTH, $9, $6 ; CINNABAR_LAB_1
+	warp_to $6, $9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB_1
-	EVENT_DISP CINNABAR_ISLAND_WIDTH, $b, $b ; CINNABAR_POKECENTER
+	warp_to $b, $b, CINNABAR_ISLAND_WIDTH ; CINNABAR_POKECENTER
-	EVENT_DISP CINNABAR_ISLAND_WIDTH, $b, $f ; CINNABAR_MART
+	warp_to $f, $b, CINNABAR_ISLAND_WIDTH ; CINNABAR_MART

data/mapObjects/cinnabarmart.asm

@@ -2,8 +2,8 @@ CinnabarMartObject:
 	db $0 ; border block
 
 	db $2 ; warps
-	db $7, $3, $4, $ff
+	warp $3, $7, $4, $ff
-	db $7, $4, $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
+	warp_to $3, $7, CINNABAR_MART_WIDTH
-	EVENT_DISP CINNABAR_MART_WIDTH, $7, $4
+	warp_to $4, $7, CINNABAR_MART_WIDTH

data/mapObjects/cinnabarpokecenter.asm

@@ -2,8 +2,8 @@ CinnabarPokecenterObject:
 	db $0 ; border block
 
 	db $2 ; warps
-	db $7, $3, $3, $ff
+	warp $3, $7, $3, $ff
-	db $7, $4, $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
+	warp_to $3, $7, CINNABAR_POKECENTER_WIDTH
-	EVENT_DISP CINNABAR_POKECENTER_WIDTH, $7, $4
+	warp_to $4, $7, CINNABAR_POKECENTER_WIDTH

data/mapObjects/copycatshouse1f.asm

@@ -2,9 +2,9 @@ CopycatsHouse1FObject:
 	db $a ; border block
 
 	db $3 ; warps
-	db $7, $2, $0, $ff
+	warp $2, $7, $0, $ff
-	db $7, $3, $0, $ff
+	warp $3, $7, $0, $ff
-	db $1, $7, $0, COPYCATS_HOUSE_2F
+	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
+	warp_to $2, $7, COPYCATS_HOUSE_1F_WIDTH
-	EVENT_DISP COPYCATS_HOUSE_1F_WIDTH, $7, $3
+	warp_to $3, $7, COPYCATS_HOUSE_1F_WIDTH
-	EVENT_DISP COPYCATS_HOUSE_1F_WIDTH, $1, $7 ; COPYCATS_HOUSE_2F
+	warp_to $7, $1, COPYCATS_HOUSE_1F_WIDTH ; COPYCATS_HOUSE_2F

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
+	sign $3, $5, $6 ; CopycatsHouse2FText6
-	db $1, $0, $7 ; CopycatsHouse2FText7
+	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

data/mapObjects/daycarem.asm

@@ -2,8 +2,8 @@ DayCareMObject:
 	db $a ; border block
 
 	db $2 ; warps
-	db $7, $2, $4, $ff
+	warp $2, $7, $4, $ff
-	db $7, $3, $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
+	warp_to $2, $7, DAYCAREM_WIDTH
-	EVENT_DISP DAYCAREM_WIDTH, $7, $3
+	warp_to $3, $7, DAYCAREM_WIDTH

data/mapObjects/diglettscave.asm

@@ -2,13 +2,13 @@ DiglettsCaveObject:
 	db $19 ; border block
 
 	db $2 ; warps
-	db $5, $5, $2, DIGLETTS_CAVE_EXIT
+	warp $5, $5, $2, DIGLETTS_CAVE_EXIT
-	db $1f, $25, $2, DIGLETTS_CAVE_ENTRANCE
+	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
+	warp_to $5, $5, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_EXIT
-	EVENT_DISP DIGLETTS_CAVE_WIDTH, $1f, $25 ; DIGLETTS_CAVE_ENTRANCE
+	warp_to $25, $1f, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ENTRANCE

data/mapObjects/diglettscaveroute11.asm

@@ -2,9 +2,9 @@ DiglettsCaveEntranceRoute11Object:
 	db $7d ; border block
 
 	db $3 ; warps
-	db $7, $2, $4, $ff
+	warp $2, $7, $4, $ff
-	db $7, $3, $4, $ff
+	warp $3, $7, $4, $ff
-	db $4, $4, $1, DIGLETTS_CAVE
+	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
+	warp_to $2, $7, DIGLETTS_CAVE_ENTRANCE_WIDTH
-	EVENT_DISP DIGLETTS_CAVE_ENTRANCE_WIDTH, $7, $3
+	warp_to $3, $7, DIGLETTS_CAVE_ENTRANCE_WIDTH
-	EVENT_DISP DIGLETTS_CAVE_ENTRANCE_WIDTH, $4, $4 ; DIGLETTS_CAVE
+	warp_to $4, $4, DIGLETTS_CAVE_ENTRANCE_WIDTH ; DIGLETTS_CAVE

data/mapObjects/diglettscaveroute2.asm

@@ -2,9 +2,9 @@ DiglettsCaveRoute2Object:
 	db $7d ; border block
 
 	db $3 ; warps
-	db $7, $2, $0, $ff
+	warp $2, $7, $0, $ff
-	db $7, $3, $0, $ff
+	warp $3, $7, $0, $ff
-	db $4, $4, $0, DIGLETTS_CAVE
+	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
+	warp_to $2, $7, DIGLETTS_CAVE_EXIT_WIDTH
-	EVENT_DISP DIGLETTS_CAVE_EXIT_WIDTH, $7, $3
+	warp_to $3, $7, DIGLETTS_CAVE_EXIT_WIDTH
-	EVENT_DISP DIGLETTS_CAVE_EXIT_WIDTH, $4, $4 ; DIGLETTS_CAVE
+	warp_to $4, $4, DIGLETTS_CAVE_EXIT_WIDTH ; DIGLETTS_CAVE

data/mapObjects/fanclub.asm

@@ -2,12 +2,12 @@ FanClubObject:
 	db $d ; border block
 
 	db $2 ; warps
-	db $7, $2, $1, $ff
+	warp $2, $7, $1, $ff
-	db $7, $3, $1, $ff
+	warp $3, $7, $1, $ff
 
 	db $2 ; signs
-	db $0, $1, $7 ; FanClubText7
+	sign $1, $0, $7 ; FanClubText7
-	db $0, $6, $8 ; FanClubText8
+	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
+	warp_to $2, $7, POKEMON_FAN_CLUB_WIDTH
-	EVENT_DISP POKEMON_FAN_CLUB_WIDTH, $7, $3
+	warp_to $3, $7, POKEMON_FAN_CLUB_WIDTH

data/mapObjects/fightingdojo.asm

@@ -2,8 +2,8 @@ FightingDojoObject:
 	db $3 ; border block
 
 	db $2 ; warps
-	db $b, $4, $1, $ff
+	warp $4, $b, $1, $ff
-	db $b, $5, $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
+	warp_to $4, $b, FIGHTING_DOJO_WIDTH
-	EVENT_DISP FIGHTING_DOJO_WIDTH, $b, $5
+	warp_to $5, $b, FIGHTING_DOJO_WIDTH

data/mapObjects/fuchsiacity.asm

@@ -2,31 +2,31 @@ FuchsiaCityObject:
 	db $f ; border block
 
 	db $9 ; warps
-	db $d, $5, $0, FUCHSIA_MART
+	warp $5, $d, $0, FUCHSIA_MART
-	db $1b, $b, $0, FUCHSIA_HOUSE_1
+	warp $b, $1b, $0, FUCHSIA_HOUSE_1
-	db $1b, $13, $0, FUCHSIA_POKECENTER
+	warp $13, $1b, $0, FUCHSIA_POKECENTER
-	db $1b, $1b, $0, FUCHSIA_HOUSE_2
+	warp $1b, $1b, $0, FUCHSIA_HOUSE_2
-	db $3, $12, $0, SAFARI_ZONE_ENTRANCE
+	warp $12, $3, $0, SAFARI_ZONE_ENTRANCE
-	db $1b, $5, $0, FUCHSIA_GYM
+	warp $5, $1b, $0, FUCHSIA_GYM
-	db $d, $16, $0, FUCHSIA_MEETING_ROOM
+	warp $16, $d, $0, FUCHSIA_MEETING_ROOM
-	db $1b, $1f, $1, FUCHSIA_HOUSE_3
+	warp $1f, $1b, $1, FUCHSIA_HOUSE_3
-	db $18, $1f, $0, FUCHSIA_HOUSE_3
+	warp $1f, $18, $0, FUCHSIA_HOUSE_3
 
 	db $e ; signs
-	db $17, $f, $b ; FuchsiaCityText11
+	sign $f, $17, $b ; FuchsiaCityText11
-	db $f, $19, $c ; FuchsiaCityText12
+	sign $19, $f, $c ; FuchsiaCityText12
-	db $5, $11, $d ; FuchsiaCityText13
+	sign $11, $5, $d ; FuchsiaCityText13
-	db $d, $6, $e ; MartSignText
+	sign $6, $d, $e ; MartSignText
-	db $1b, $14, $f ; PokeCenterSignText
+	sign $14, $1b, $f ; PokeCenterSignText
-	db $1d, $1b, $10 ; FuchsiaCityText16
+	sign $1b, $1d, $10 ; FuchsiaCityText16
-	db $f, $15, $11 ; FuchsiaCityText17
+	sign $15, $f, $11 ; FuchsiaCityText17
-	db $1d, $5, $12 ; FuchsiaCityText18
+	sign $5, $1d, $12 ; FuchsiaCityText18
-	db $7, $21, $13 ; FuchsiaCityText19
+	sign $21, $7, $13 ; FuchsiaCityText19
-	db $7, $1b, $14 ; FuchsiaCityText20
+	sign $1b, $7, $14 ; FuchsiaCityText20
-	db $7, $d, $15 ; FuchsiaCityText21
+	sign $d, $7, $15 ; FuchsiaCityText21
-	db $d, $1f, $16 ; FuchsiaCityText22
+	sign $1f, $d, $16 ; FuchsiaCityText22
-	db $f, $d, $17 ; FuchsiaCityText23
+	sign $d, $f, $17 ; FuchsiaCityText23
-	db $7, $7, $18 ; FuchsiaCityText24
+	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
+	warp_to $5, $d, FUCHSIA_CITY_WIDTH ; FUCHSIA_MART
-	EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $b ; FUCHSIA_HOUSE_1
+	warp_to $b, $1b, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_1
-	EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $13 ; FUCHSIA_POKECENTER
+	warp_to $13, $1b, FUCHSIA_CITY_WIDTH ; FUCHSIA_POKECENTER
-	EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $1b ; FUCHSIA_HOUSE_2
+	warp_to $1b, $1b, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_2
-	EVENT_DISP FUCHSIA_CITY_WIDTH, $3, $12 ; SAFARI_ZONE_ENTRANCE
+	warp_to $12, $3, FUCHSIA_CITY_WIDTH ; SAFARI_ZONE_ENTRANCE
-	EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $5 ; FUCHSIA_GYM
+	warp_to $5, $1b, FUCHSIA_CITY_WIDTH ; FUCHSIA_GYM
-	EVENT_DISP FUCHSIA_CITY_WIDTH, $d, $16 ; FUCHSIA_MEETING_ROOM
+	warp_to $16, $d, FUCHSIA_CITY_WIDTH ; FUCHSIA_MEETING_ROOM
-	EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $1f ; FUCHSIA_HOUSE_3
+	warp_to $1f, $1b, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_3
-	EVENT_DISP FUCHSIA_CITY_WIDTH, $18, $1f ; FUCHSIA_HOUSE_3
+	warp_to $1f, $18, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_3

data/mapObjects/fuchsiagym.asm

@@ -2,8 +2,8 @@ FuchsiaGymObject:
 	db $3 ; border block
 
 	db $2 ; warps
-	db $11, $4, $5, $ff
+	warp $4, $11, $5, $ff
-	db $11, $5, $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
+	warp_to $4, $11, FUCHSIA_GYM_WIDTH
-	EVENT_DISP FUCHSIA_GYM_WIDTH, $11, $5
+	warp_to $5, $11, FUCHSIA_GYM_WIDTH

data/mapObjects/fuchsiahouse1.asm

@@ -2,8 +2,8 @@ FuchsiaHouse1Object:
 	db $a ; border block
 
 	db $2 ; warps
-	db $7, $2, $1, $ff
+	warp $2, $7, $1, $ff
-	db $7, $3, $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
+	warp_to $2, $7, FUCHSIA_HOUSE_1_WIDTH
-	EVENT_DISP FUCHSIA_HOUSE_1_WIDTH, $7, $3
+	warp_to $3, $7, FUCHSIA_HOUSE_1_WIDTH

data/mapObjects/fuchsiahouse2.asm

@@ -2,12 +2,12 @@ FuchsiaHouse2Object:
 	db $17 ; border block
 
 	db $2 ; warps
-	db $7, $4, $3, $ff
+	warp $4, $7, $3, $ff
-	db $7, $5, $3, $ff
+	warp $5, $7, $3, $ff
 
 	db $2 ; signs
-	db $3, $4, $4 ; FuchsiaHouse2Text4
+	sign $4, $3, $4 ; FuchsiaHouse2Text4
-	db $3, $5, $5 ; FuchsiaHouse2Text5
+	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
+	warp_to $4, $7, FUCHSIA_HOUSE_2_WIDTH
-	EVENT_DISP FUCHSIA_HOUSE_2_WIDTH, $7, $5
+	warp_to $5, $7, FUCHSIA_HOUSE_2_WIDTH

data/mapObjects/fuchsiahouse3.asm

@@ -2,9 +2,9 @@ FuchsiaHouse3Object:
 	db $c ; border block
 
 	db $3 ; warps
-	db $0, $2, $8, $ff
+	warp $2, $0, $8, $ff
-	db $7, $2, $7, $ff
+	warp $2, $7, $7, $ff
-	db $7, $3, $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
+	warp_to $2, $0, FUCHSIA_HOUSE_3_WIDTH
-	EVENT_DISP FUCHSIA_HOUSE_3_WIDTH, $7, $2
+	warp_to $2, $7, FUCHSIA_HOUSE_3_WIDTH
-	EVENT_DISP FUCHSIA_HOUSE_3_WIDTH, $7, $3
+	warp_to $3, $7, FUCHSIA_HOUSE_3_WIDTH

data/mapObjects/fuchsiamart.asm

@@ -2,8 +2,8 @@ FuchsiaMartObject:
 	db $0 ; border block
 
 	db $2 ; warps
-	db $7, $3, $0, $ff
+	warp $3, $7, $0, $ff
-	db $7, $4, $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
+	warp_to $3, $7, FUCHSIA_MART_WIDTH
-	EVENT_DISP FUCHSIA_MART_WIDTH, $7, $4
+	warp_to $4, $7, FUCHSIA_MART_WIDTH

data/mapObjects/fuchsiameetingroom.asm

@@ -2,8 +2,8 @@ FuchsiaMeetingRoomObject:
 	db $17 ; border block
 
 	db $2 ; warps
-	db $7, $4, $6, $ff
+	warp $4, $7, $6, $ff
-	db $7, $5, $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
+	warp_to $4, $7, FUCHSIA_MEETING_ROOM_WIDTH
-	EVENT_DISP FUCHSIA_MEETING_ROOM_WIDTH, $7, $5
+	warp_to $5, $7, FUCHSIA_MEETING_ROOM_WIDTH

data/mapObjects/fuchsiapokecenter.asm

@@ -2,8 +2,8 @@ FuchsiaPokecenterObject:
 	db $0 ; border block
 
 	db $2 ; warps
-	db $7, $3, $2, $ff
+	warp $3, $7, $2, $ff
-	db $7, $4, $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
+	warp_to $3, $7, FUCHSIA_POKECENTER_WIDTH
-	EVENT_DISP FUCHSIA_POKECENTER_WIDTH, $7, $4
+	warp_to $4, $7, FUCHSIA_POKECENTER_WIDTH

data/mapObjects/gary.asm

@@ -2,10 +2,10 @@ GaryObject:
 	db $3 ; border block
 
 	db $4 ; warps
-	db $7, $3, $1, LANCES_ROOM
+	warp $3, $7, $1, LANCES_ROOM
-	db $7, $4, $2, LANCES_ROOM
+	warp $4, $7, $2, LANCES_ROOM
-	db $0, $3, $0, HALL_OF_FAME
+	warp $3, $0, $0, HALL_OF_FAME
-	db $0, $4, $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
+	warp_to $3, $7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM
-	EVENT_DISP CHAMPIONS_ROOM_WIDTH, $7, $4 ; LANCES_ROOM
+	warp_to $4, $7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM
-	EVENT_DISP CHAMPIONS_ROOM_WIDTH, $0, $3 ; HALL_OF_FAME
+	warp_to $3, $0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME
-	EVENT_DISP CHAMPIONS_ROOM_WIDTH, $0, $4 ; HALL_OF_FAME
+	warp_to $4, $0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME

data/mapObjects/halloffameroom.asm

@@ -2,8 +2,8 @@ HallofFameRoomObject:
 	db $3 ; border block
 
 	db $2 ; warps
-	db $7, $4, $2, CHAMPIONS_ROOM
+	warp $4, $7, $2, CHAMPIONS_ROOM
-	db $7, $5, $3, 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
+	warp_to $4, $7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM
-	EVENT_DISP HALL_OF_FAME_WIDTH, $7, $5 ; CHAMPIONS_ROOM
+	warp_to $5, $7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM

data/mapObjects/indigoplateau.asm

@@ -2,13 +2,13 @@ IndigoPlateauObject:
 	db $e ; border block
 
 	db $2 ; warps
-	db $5, $9, $0, INDIGO_PLATEAU_LOBBY
+	warp $9, $5, $0, INDIGO_PLATEAU_LOBBY
-	db $5, $a, $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
+	warp_to $9, $5, INDIGO_PLATEAU_WIDTH ; INDIGO_PLATEAU_LOBBY
-	EVENT_DISP INDIGO_PLATEAU_WIDTH, $5, $a ; INDIGO_PLATEAU_LOBBY
+	warp_to $a, $5, INDIGO_PLATEAU_WIDTH ; INDIGO_PLATEAU_LOBBY

data/mapObjects/indigoplateaulobby.asm

@@ -2,9 +2,9 @@ IndigoPlateauLobbyObject:
 	db $0 ; border block
 
 	db $3 ; warps
-	db $b, $7, $0, $ff
+	warp $7, $b, $0, $ff
-	db $b, $8, $1, $ff
+	warp $8, $b, $1, $ff
-	db $0, $8, $0, LORELEIS_ROOM
+	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
+	warp_to $7, $b, INDIGO_PLATEAU_LOBBY_WIDTH
-	EVENT_DISP INDIGO_PLATEAU_LOBBY_WIDTH, $b, $8
+	warp_to $8, $b, INDIGO_PLATEAU_LOBBY_WIDTH
-	EVENT_DISP INDIGO_PLATEAU_LOBBY_WIDTH, $0, $8 ; LORELEIS_ROOM
+	warp_to $8, $0, INDIGO_PLATEAU_LOBBY_WIDTH ; LORELEIS_ROOM

data/mapObjects/lab1.asm

@@ -2,24 +2,24 @@ Lab1Object:
 	db $17 ; border block
 
 	db $5 ; warps
-	db $7, $2, $2, $ff
+	warp $2, $7, $2, $ff
-	db $7, $3, $2, $ff
+	warp $3, $7, $2, $ff
-	db $4, $8, $0, CINNABAR_LAB_2
+	warp $8, $4, $0, CINNABAR_LAB_2
-	db $4, $c, $0, CINNABAR_LAB_3
+	warp $c, $4, $0, CINNABAR_LAB_3
-	db $4, $10, $0, CINNABAR_LAB_4
+	warp $10, $4, $0, CINNABAR_LAB_4
 
 	db $4 ; signs
-	db $2, $3, $2 ; Lab1Text2
+	sign $3, $2, $2 ; Lab1Text2
-	db $4, $9, $3 ; Lab1Text3
+	sign $9, $4, $3 ; Lab1Text3
-	db $4, $d, $4 ; Lab1Text4
+	sign $d, $4, $4 ; Lab1Text4
-	db $4, $11, $5 ; Lab1Text5
+	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
+	warp_to $2, $7, CINNABAR_LAB_1_WIDTH
-	EVENT_DISP CINNABAR_LAB_1_WIDTH, $7, $3
+	warp_to $3, $7, CINNABAR_LAB_1_WIDTH
-	EVENT_DISP CINNABAR_LAB_1_WIDTH, $4, $8 ; CINNABAR_LAB_2
+	warp_to $8, $4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_2
-	EVENT_DISP CINNABAR_LAB_1_WIDTH, $4, $c ; CINNABAR_LAB_3
+	warp_to $c, $4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_3
-	EVENT_DISP CINNABAR_LAB_1_WIDTH, $4, $10 ; CINNABAR_LAB_4
+	warp_to $10, $4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_4

data/mapObjects/lab2.asm

@@ -2,8 +2,8 @@ Lab2Object:
 	db $17 ; border block
 
 	db $2 ; warps
-	db $7, $2, $2, CINNABAR_LAB_1
+	warp $2, $7, $2, CINNABAR_LAB_1
-	db $7, $3, $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
+	warp_to $2, $7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1
-	EVENT_DISP CINNABAR_LAB_2_WIDTH, $7, $3 ; CINNABAR_LAB_1
+	warp_to $3, $7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1

data/mapObjects/lab3.asm

@@ -2,18 +2,18 @@ Lab3Object:
 	db $17 ; border block
 
 	db $2 ; warps
-	db $7, $2, $3, CINNABAR_LAB_1
+	warp $2, $7, $3, CINNABAR_LAB_1
-	db $7, $3, $3, CINNABAR_LAB_1
+	warp $3, $7, $3, CINNABAR_LAB_1
 
 	db $3 ; signs
-	db $4, $0, $3 ; Lab3Text3
+	sign $0, $4, $3 ; Lab3Text3
-	db $4, $1, $4 ; Lab3Text4
+	sign $1, $4, $4 ; Lab3Text4
-	db $1, $2, $5 ; Lab3Text5
+	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
+	warp_to $2, $7, CINNABAR_LAB_3_WIDTH ; CINNABAR_LAB_1
-	EVENT_DISP CINNABAR_LAB_3_WIDTH, $7, $3 ; CINNABAR_LAB_1
+	warp_to $3, $7, CINNABAR_LAB_3_WIDTH ; CINNABAR_LAB_1

data/mapObjects/lab4.asm

@@ -2,8 +2,8 @@ Lab4Object:
 	db $17 ; border block
 
 	db $2 ; warps
-	db $7, $2, $4, CINNABAR_LAB_1
+	warp $2, $7, $4, CINNABAR_LAB_1
-	db $7, $3, $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
+	warp_to $2, $7, CINNABAR_LAB_4_WIDTH ; CINNABAR_LAB_1
-	EVENT_DISP CINNABAR_LAB_4_WIDTH, $7, $3 ; CINNABAR_LAB_1
+	warp_to $3, $7, CINNABAR_LAB_4_WIDTH ; CINNABAR_LAB_1

data/mapObjects/lance.asm

@@ -2,9 +2,9 @@ LanceObject:
 	db $3 ; border block
 
 	db $3 ; warps
-	db $10, $18, $2, AGATHAS_ROOM
+	warp $18, $10, $2, AGATHAS_ROOM
-	db $0, $5, $0, CHAMPIONS_ROOM
+	warp $5, $0, $0, CHAMPIONS_ROOM
-	db $0, $6, $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
+	warp_to $18, $10, LANCES_ROOM_WIDTH ; AGATHAS_ROOM
-	EVENT_DISP LANCES_ROOM_WIDTH, $0, $5 ; CHAMPIONS_ROOM
+	warp_to $5, $0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM
-	EVENT_DISP LANCES_ROOM_WIDTH, $0, $6 ; CHAMPIONS_ROOM
+	warp_to $6, $0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM

data/mapObjects/lavenderhouse1.asm

@@ -2,8 +2,8 @@ LavenderHouse1Object:
 	db $a ; border block
 
 	db $2 ; warps
-	db $7, $2, $2, $ff
+	warp $2, $7, $2, $ff
-	db $7, $3, $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
+	warp_to $2, $7, LAVENDER_HOUSE_1_WIDTH
-	EVENT_DISP LAVENDER_HOUSE_1_WIDTH, $7, $3
+	warp_to $3, $7, LAVENDER_HOUSE_1_WIDTH

data/mapObjects/lavenderhouse2.asm

@@ -2,8 +2,8 @@ LavenderHouse2Object:
 	db $a ; border block
 
 	db $2 ; warps
-	db $7, $2, $4, $ff
+	warp $2, $7, $4, $ff
-	db $7, $3, $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
+	warp_to $2, $7, LAVENDER_HOUSE_2_WIDTH
-	EVENT_DISP LAVENDER_HOUSE_2_WIDTH, $7, $3
+	warp_to $3, $7, LAVENDER_HOUSE_2_WIDTH

data/mapObjects/lavendermart.asm

@@ -2,8 +2,8 @@ LavenderMartObject:
 	db $0 ; border block
 
 	db $2 ; warps
-	db $7, $3, $3, $ff
+	warp $3, $7, $3, $ff
-	db $7, $4, $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
+	warp_to $3, $7, LAVENDER_MART_WIDTH
-	EVENT_DISP LAVENDER_MART_WIDTH, $7, $4
+	warp_to $4, $7, LAVENDER_MART_WIDTH

data/mapObjects/lavenderpokecenter.asm

@@ -2,8 +2,8 @@ LavenderPokecenterObject:
 	db $0 ; border block
 
 	db $2 ; warps
-	db $7, $3, $0, $ff
+	warp $3, $7, $0, $ff
-	db $7, $4, $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
+	warp_to $3, $7, LAVENDER_POKECENTER_WIDTH
-	EVENT_DISP LAVENDER_POKECENTER_WIDTH, $7, $4
+	warp_to $4, $7, LAVENDER_POKECENTER_WIDTH

data/mapObjects/lavendertown.asm

@@ -2,20 +2,20 @@ LavenderTownObject:
 	db $2c ; border block
 
 	db $6 ; warps
-	db $5, $3, $0, LAVENDER_POKECENTER
+	warp $3, $5, $0, LAVENDER_POKECENTER
-	db $5, $e, $0, POKEMONTOWER_1
+	warp $e, $5, $0, POKEMONTOWER_1
-	db $9, $7, $0, LAVENDER_HOUSE_1
+	warp $7, $9, $0, LAVENDER_HOUSE_1
-	db $d, $f, $0, LAVENDER_MART
+	warp $f, $d, $0, LAVENDER_MART
-	db $d, $3, $0, LAVENDER_HOUSE_2
+	warp $3, $d, $0, LAVENDER_HOUSE_2
-	db $d, $7, $0, NAME_RATERS_HOUSE
+	warp $7, $d, $0, NAME_RATERS_HOUSE
 
 	db $6 ; signs
-	db $9, $b, $4 ; LavenderTownText4
+	sign $b, $9, $4 ; LavenderTownText4
-	db $3, $9, $5 ; LavenderTownText5
+	sign $9, $3, $5 ; LavenderTownText5
-	db $d, $10, $6 ; MartSignText
+	sign $10, $d, $6 ; MartSignText
-	db $5, $4, $7 ; PokeCenterSignText
+	sign $4, $5, $7 ; PokeCenterSignText
-	db $9, $5, $8 ; LavenderTownText8
+	sign $5, $9, $8 ; LavenderTownText8
-	db $7, $11, $9 ; LavenderTownText9
+	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
+	warp_to $3, $5, LAVENDER_TOWN_WIDTH ; LAVENDER_POKECENTER
-	EVENT_DISP LAVENDER_TOWN_WIDTH, $5, $e ; POKEMONTOWER_1
+	warp_to $e, $5, LAVENDER_TOWN_WIDTH ; POKEMONTOWER_1
-	EVENT_DISP LAVENDER_TOWN_WIDTH, $9, $7 ; LAVENDER_HOUSE_1
+	warp_to $7, $9, LAVENDER_TOWN_WIDTH ; LAVENDER_HOUSE_1
-	EVENT_DISP LAVENDER_TOWN_WIDTH, $d, $f ; LAVENDER_MART
+	warp_to $f, $d, LAVENDER_TOWN_WIDTH ; LAVENDER_MART
-	EVENT_DISP LAVENDER_TOWN_WIDTH, $d, $3 ; LAVENDER_HOUSE_2
+	warp_to $3, $d, LAVENDER_TOWN_WIDTH ; LAVENDER_HOUSE_2
-	EVENT_DISP LAVENDER_TOWN_WIDTH, $d, $7 ; NAME_RATERS_HOUSE
+	warp_to $7, $d, LAVENDER_TOWN_WIDTH ; NAME_RATERS_HOUSE

data/mapObjects/lorelei.asm

@@ -2,10 +2,10 @@ LoreleiObject:
 	db $3 ; border block
 
 	db $4 ; warps
-	db $b, $4, $2, INDIGO_PLATEAU_LOBBY
+	warp $4, $b, $2, INDIGO_PLATEAU_LOBBY
-	db $b, $5, $2, INDIGO_PLATEAU_LOBBY
+	warp $5, $b, $2, INDIGO_PLATEAU_LOBBY
-	db $0, $4, $0, BRUNOS_ROOM
+	warp $4, $0, $0, BRUNOS_ROOM
-	db $0, $5, $1, 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
+	warp_to $4, $b, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY
-	EVENT_DISP LORELEIS_ROOM_WIDTH, $b, $5 ; INDIGO_PLATEAU_LOBBY
+	warp_to $5, $b, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY
-	EVENT_DISP LORELEIS_ROOM_WIDTH, $0, $4 ; BRUNOS_ROOM
+	warp_to $4, $0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM
-	EVENT_DISP LORELEIS_ROOM_WIDTH, $0, $5 ; BRUNOS_ROOM
+	warp_to $5, $0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM

data/mapObjects/mansion1.asm

@@ -2,14 +2,14 @@ Mansion1Object:
 	db $2e ; border block
 
 	db $8 ; warps
-	db $1b, $4, $0, $ff
+	warp $4, $1b, $0, $ff
-	db $1b, $5, $0, $ff
+	warp $5, $1b, $0, $ff
-	db $1b, $6, $0, $ff
+	warp $6, $1b, $0, $ff
-	db $1b, $7, $0, $ff
+	warp $7, $1b, $0, $ff
-	db $a, $5, $0, MANSION_2
+	warp $5, $a, $0, MANSION_2
-	db $17, $15, $0, MANSION_4
+	warp $15, $17, $0, MANSION_4
-	db $1b, $1a, $0, $ff
+	warp $1a, $1b, $0, $ff
-	db $1b, $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
+	warp_to $4, $1b, MANSION_1_WIDTH
-	EVENT_DISP MANSION_1_WIDTH, $1b, $5
+	warp_to $5, $1b, MANSION_1_WIDTH
-	EVENT_DISP MANSION_1_WIDTH, $1b, $6
+	warp_to $6, $1b, MANSION_1_WIDTH
-	EVENT_DISP MANSION_1_WIDTH, $1b, $7
+	warp_to $7, $1b, MANSION_1_WIDTH
-	EVENT_DISP MANSION_1_WIDTH, $a, $5 ; MANSION_2
+	warp_to $5, $a, MANSION_1_WIDTH ; MANSION_2
-	EVENT_DISP MANSION_1_WIDTH, $17, $15 ; MANSION_4
+	warp_to $15, $17, MANSION_1_WIDTH ; MANSION_4
-	EVENT_DISP MANSION_1_WIDTH, $1b, $1a
+	warp_to $1a, $1b, MANSION_1_WIDTH
-	EVENT_DISP MANSION_1_WIDTH, $1b, $1b
+	warp_to $1b, $1b, MANSION_1_WIDTH

data/mapObjects/mansion2.asm

@@ -2,10 +2,10 @@ Mansion2Object:
 	db $1 ; border block
 
 	db $4 ; warps
-	db $a, $5, $4, MANSION_1
+	warp $5, $a, $4, MANSION_1
-	db $a, $7, $0, MANSION_3
+	warp $7, $a, $0, MANSION_3
-	db $e, $19, $2, MANSION_3
+	warp $19, $e, $2, MANSION_3
-	db $1, $6, $1, 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
+	warp_to $5, $a, MANSION_2_WIDTH ; MANSION_1
-	EVENT_DISP MANSION_2_WIDTH, $a, $7 ; MANSION_3
+	warp_to $7, $a, MANSION_2_WIDTH ; MANSION_3
-	EVENT_DISP MANSION_2_WIDTH, $e, $19 ; MANSION_3
+	warp_to $19, $e, MANSION_2_WIDTH ; MANSION_3
-	EVENT_DISP MANSION_2_WIDTH, $1, $6 ; MANSION_3
+	warp_to $6, $1, MANSION_2_WIDTH ; MANSION_3

data/mapObjects/mansion3.asm

@@ -2,9 +2,9 @@ Mansion3Object:
 	db $1 ; border block
 
 	db $3 ; warps
-	db $a, $7, $1, MANSION_2
+	warp $7, $a, $1, MANSION_2
-	db $1, $6, $3, MANSION_2
+	warp $6, $1, $3, MANSION_2
-	db $e, $19, $2, 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
+	warp_to $7, $a, MANSION_3_WIDTH ; MANSION_2
-	EVENT_DISP MANSION_3_WIDTH, $1, $6 ; MANSION_2
+	warp_to $6, $1, MANSION_3_WIDTH ; MANSION_2
-	EVENT_DISP MANSION_3_WIDTH, $e, $19 ; MANSION_2
+	warp_to $19, $e, MANSION_3_WIDTH ; MANSION_2

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

data/mapObjects/mtmoon1.asm

@@ -2,14 +2,14 @@ MtMoon1Object:
 	db $3 ; border block
 
 	db $5 ; warps
-	db $23, $e, $1, $ff
+	warp $e, $23, $1, $ff
-	db $23, $f, $1, $ff
+	warp $f, $23, $1, $ff
-	db $5, $5, $0, MT_MOON_2
+	warp $5, $5, $0, MT_MOON_2
-	db $b, $11, $2, MT_MOON_2
+	warp $11, $b, $2, MT_MOON_2
-	db $f, $19, $3, 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
+	warp_to $e, $23, MT_MOON_1_WIDTH
-	EVENT_DISP MT_MOON_1_WIDTH, $23, $f
+	warp_to $f, $23, MT_MOON_1_WIDTH
-	EVENT_DISP MT_MOON_1_WIDTH, $5, $5 ; MT_MOON_2
+	warp_to $5, $5, MT_MOON_1_WIDTH ; MT_MOON_2
-	EVENT_DISP MT_MOON_1_WIDTH, $b, $11 ; MT_MOON_2
+	warp_to $11, $b, MT_MOON_1_WIDTH ; MT_MOON_2
-	EVENT_DISP MT_MOON_1_WIDTH, $f, $19 ; MT_MOON_2
+	warp_to $19, $f, MT_MOON_1_WIDTH ; MT_MOON_2

data/mapObjects/mtmoon2.asm

@@ -2,25 +2,25 @@ MtMoon2Object:
 	db $3 ; border block
 
 	db $8 ; warps
-	db $5, $5, $2, MT_MOON_1
+	warp $5, $5, $2, MT_MOON_1
-	db $b, $11, $0, MT_MOON_3
+	warp $11, $b, $0, MT_MOON_3
-	db $9, $19, $3, MT_MOON_1
+	warp $19, $9, $3, MT_MOON_1
-	db $f, $19, $4, MT_MOON_1
+	warp $19, $f, $4, MT_MOON_1
-	db $11, $15, $1, MT_MOON_3
+	warp $15, $11, $1, MT_MOON_3
-	db $1b, $d, $2, MT_MOON_3
+	warp $d, $1b, $2, MT_MOON_3
-	db $3, $17, $3, MT_MOON_3
+	warp $17, $3, $3, MT_MOON_3
-	db $3, $1b, $2, $ff
+	warp $1b, $3, $2, $ff
 
 	db $0 ; signs
 
 	db $0 ; objects
 
 	; warp-to
-	EVENT_DISP MT_MOON_2_WIDTH, $5, $5 ; MT_MOON_1
+	warp_to $5, $5, MT_MOON_2_WIDTH ; MT_MOON_1
-	EVENT_DISP MT_MOON_2_WIDTH, $b, $11 ; MT_MOON_3
+	warp_to $11, $b, MT_MOON_2_WIDTH ; MT_MOON_3
-	EVENT_DISP MT_MOON_2_WIDTH, $9, $19 ; MT_MOON_1
+	warp_to $19, $9, MT_MOON_2_WIDTH ; MT_MOON_1
-	EVENT_DISP MT_MOON_2_WIDTH, $f, $19 ; MT_MOON_1
+	warp_to $19, $f, MT_MOON_2_WIDTH ; MT_MOON_1
-	EVENT_DISP MT_MOON_2_WIDTH, $11, $15 ; MT_MOON_3
+	warp_to $15, $11, MT_MOON_2_WIDTH ; MT_MOON_3
-	EVENT_DISP MT_MOON_2_WIDTH, $1b, $d ; MT_MOON_3
+	warp_to $d, $1b, MT_MOON_2_WIDTH ; MT_MOON_3
-	EVENT_DISP MT_MOON_2_WIDTH, $3, $17 ; MT_MOON_3
+	warp_to $17, $3, MT_MOON_2_WIDTH ; MT_MOON_3
-	EVENT_DISP MT_MOON_2_WIDTH, $3, $1b
+	warp_to $1b, $3, MT_MOON_2_WIDTH

data/mapObjects/mtmoon3.asm

@@ -2,10 +2,10 @@ MtMoon3Object:
 	db $3 ; border block
 
 	db $4 ; warps
-	db $9, $19, $1, MT_MOON_2
+	warp $19, $9, $1, MT_MOON_2
-	db $11, $15, $4, MT_MOON_2
+	warp $15, $11, $4, MT_MOON_2
-	db $1b, $f, $5, MT_MOON_2
+	warp $f, $1b, $5, MT_MOON_2
-	db $7, $5, $6, 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
+	warp_to $19, $9, MT_MOON_3_WIDTH ; MT_MOON_2
-	EVENT_DISP MT_MOON_3_WIDTH, $11, $15 ; MT_MOON_2
+	warp_to $15, $11, MT_MOON_3_WIDTH ; MT_MOON_2
-	EVENT_DISP MT_MOON_3_WIDTH, $1b, $f ; MT_MOON_2
+	warp_to $f, $1b, MT_MOON_3_WIDTH ; MT_MOON_2
-	EVENT_DISP MT_MOON_3_WIDTH, $7, $5 ; MT_MOON_2
+	warp_to $5, $7, MT_MOON_3_WIDTH ; MT_MOON_2

data/mapObjects/mtmoonpokecenter.asm

@@ -2,8 +2,8 @@ MtMoonPokecenterObject:
 	db $0 ; border block
 
 	db $2 ; warps
-	db $7, $3, $0, $ff
+	warp $3, $7, $0, $ff
-	db $7, $4, $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
+	warp_to $3, $7, MT_MOON_POKECENTER_WIDTH
-	EVENT_DISP MT_MOON_POKECENTER_WIDTH, $7, $4
+	warp_to $4, $7, MT_MOON_POKECENTER_WIDTH

data/mapObjects/museum1f.asm

@@ -2,11 +2,11 @@ Museum1FObject:
 	db $a ; border block
 
 	db $5 ; warps
-	db $7, $a, $0, $ff
+	warp $a, $7, $0, $ff
-	db $7, $b, $0, $ff
+	warp $b, $7, $0, $ff
-	db $7, $10, $1, $ff
+	warp $10, $7, $1, $ff
-	db $7, $11, $1, $ff
+	warp $11, $7, $1, $ff
-	db $7, $7, $0, MUSEUM_2F
+	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
+	warp_to $a, $7, MUSEUM_1F_WIDTH
-	EVENT_DISP MUSEUM_1F_WIDTH, $7, $b
+	warp_to $b, $7, MUSEUM_1F_WIDTH
-	EVENT_DISP MUSEUM_1F_WIDTH, $7, $10
+	warp_to $10, $7, MUSEUM_1F_WIDTH
-	EVENT_DISP MUSEUM_1F_WIDTH, $7, $11
+	warp_to $11, $7, MUSEUM_1F_WIDTH
-	EVENT_DISP MUSEUM_1F_WIDTH, $7, $7 ; MUSEUM_2F
+	warp_to $7, $7, MUSEUM_1F_WIDTH ; MUSEUM_2F

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
+	sign $b, $2, $6 ; Museum2FText6
-	db $5, $2, $7 ; Museum2FText7
+	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

data/mapObjects/namerater.asm

@@ -2,8 +2,8 @@ NameRaterObject:
 	db $a ; border block
 
 	db $2 ; warps
-	db $7, $2, $5, $ff
+	warp $2, $7, $5, $ff
-	db $7, $3, $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
+	warp_to $2, $7, NAME_RATERS_HOUSE_WIDTH
-	EVENT_DISP NAME_RATERS_HOUSE_WIDTH, $7, $3
+	warp_to $3, $7, NAME_RATERS_HOUSE_WIDTH

data/mapObjects/oakslab.asm

@@ -2,8 +2,8 @@ OaksLabObject:
 	db $3 ; border block
 
 	db $2 ; warps
-	db $b, $4, $2, $ff
+	warp $4, $b, $2, $ff
-	db $b, $5, $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
+	warp_to $4, $b, OAKS_LAB_WIDTH
-	EVENT_DISP OAKS_LAB_WIDTH, $b, $5
+	warp_to $5, $b, OAKS_LAB_WIDTH

data/mapObjects/pallettown.asm

@@ -2,15 +2,15 @@ PalletTownObject:
 	db $b ; border block
 
 	db $3 ; warps
-	db $5, $5, $0, REDS_HOUSE_1F
+	warp $5, $5, $0, REDS_HOUSE_1F
-	db $5, $d, $0, BLUES_HOUSE
+	warp $d, $5, $0, BLUES_HOUSE
-	db $b, $c, $1, OAKS_LAB
+	warp $c, $b, $1, OAKS_LAB
 
 	db $4 ; signs
-	db $d, $d, $4 ; PalletTownText4
+	sign $d, $d, $4 ; PalletTownText4
-	db $9, $7, $5 ; PalletTownText5
+	sign $7, $9, $5 ; PalletTownText5
-	db $5, $3, $6 ; PalletTownText6
+	sign $3, $5, $6 ; PalletTownText6
-	db $5, $b, $7 ; PalletTownText7
+	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
+	warp_to $5, $5, PALLET_TOWN_WIDTH ; REDS_HOUSE_1F
-	EVENT_DISP PALLET_TOWN_WIDTH, $5, $d ; BLUES_HOUSE
+	warp_to $d, $5, PALLET_TOWN_WIDTH ; BLUES_HOUSE
-	EVENT_DISP PALLET_TOWN_WIDTH, $b, $c ; OAKS_LAB
+	warp_to $c, $b, PALLET_TOWN_WIDTH ; OAKS_LAB

data/mapObjects/pewtercity.asm

@@ -2,22 +2,22 @@ PewterCityObject:
 	db $a ; border block
 
 	db $7 ; warps
-	db $7, $e, $0, MUSEUM_1F
+	warp $e, $7, $0, MUSEUM_1F
-	db $5, $13, $2, MUSEUM_1F
+	warp $13, $5, $2, MUSEUM_1F
-	db $11, $10, $0, PEWTER_GYM
+	warp $10, $11, $0, PEWTER_GYM
-	db $d, $1d, $0, PEWTER_HOUSE_1
+	warp $1d, $d, $0, PEWTER_HOUSE_1
-	db $11, $17, $0, PEWTER_MART
+	warp $17, $11, $0, PEWTER_MART
-	db $1d, $7, $0, PEWTER_HOUSE_2
+	warp $7, $1d, $0, PEWTER_HOUSE_2
-	db $19, $d, $0, PEWTER_POKECENTER
+	warp $d, $19, $0, PEWTER_POKECENTER
 
 	db $7 ; signs
-	db $1d, $13, $6 ; PewterCityText6
+	sign $13, $1d, $6 ; PewterCityText6
-	db $13, $21, $7 ; PewterCityText7
+	sign $21, $13, $7 ; PewterCityText7
-	db $11, $18, $8 ; MartSignText
+	sign $18, $11, $8 ; MartSignText
-	db $19, $e, $9 ; PokeCenterSignText
+	sign $e, $19, $9 ; PokeCenterSignText
-	db $9, $f, $a ; PewterCityText10
+	sign $f, $9, $a ; PewterCityText10
-	db $11, $b, $b ; PewterCityText11
+	sign $b, $11, $b ; PewterCityText11
-	db $17, $19, $c ; PewterCityText12
+	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
+	warp_to $e, $7, PEWTER_CITY_WIDTH ; MUSEUM_1F
-	EVENT_DISP PEWTER_CITY_WIDTH, $5, $13 ; MUSEUM_1F
+	warp_to $13, $5, PEWTER_CITY_WIDTH ; MUSEUM_1F
-	EVENT_DISP PEWTER_CITY_WIDTH, $11, $10 ; PEWTER_GYM
+	warp_to $10, $11, PEWTER_CITY_WIDTH ; PEWTER_GYM
-	EVENT_DISP PEWTER_CITY_WIDTH, $d, $1d ; PEWTER_HOUSE_1
+	warp_to $1d, $d, PEWTER_CITY_WIDTH ; PEWTER_HOUSE_1
-	EVENT_DISP PEWTER_CITY_WIDTH, $11, $17 ; PEWTER_MART
+	warp_to $17, $11, PEWTER_CITY_WIDTH ; PEWTER_MART
-	EVENT_DISP PEWTER_CITY_WIDTH, $1d, $7 ; PEWTER_HOUSE_2
+	warp_to $7, $1d, PEWTER_CITY_WIDTH ; PEWTER_HOUSE_2
-	EVENT_DISP PEWTER_CITY_WIDTH, $19, $d ; PEWTER_POKECENTER
+	warp_to $d, $19, PEWTER_CITY_WIDTH ; PEWTER_POKECENTER

data/mapObjects/pewtergym.asm

@@ -2,8 +2,8 @@ PewterGymObject:
 	db $3 ; border block
 
 	db $2 ; warps
-	db $d, $4, $2, $ff
+	warp $4, $d, $2, $ff
-	db $d, $5, $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
+	warp_to $4, $d, PEWTER_GYM_WIDTH
-	EVENT_DISP PEWTER_GYM_WIDTH, $d, $5
+	warp_to $5, $d, PEWTER_GYM_WIDTH

data/mapObjects/pewterhouse1.asm

@@ -2,8 +2,8 @@ PewterHouse1Object:
 	db $a ; border block
 
 	db $2 ; warps
-	db $7, $2, $3, $ff
+	warp $2, $7, $3, $ff
-	db $7, $3, $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
+	warp_to $2, $7, PEWTER_HOUSE_1_WIDTH
-	EVENT_DISP PEWTER_HOUSE_1_WIDTH, $7, $3
+	warp_to $3, $7, PEWTER_HOUSE_1_WIDTH

data/mapObjects/pewterhouse2.asm

@@ -2,8 +2,8 @@ PewterHouse2Object:
 	db $a ; border block
 
 	db $2 ; warps
-	db $7, $2, $5, $ff
+	warp $2, $7, $5, $ff
-	db $7, $3, $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
+	warp_to $2, $7, PEWTER_HOUSE_2_WIDTH
-	EVENT_DISP PEWTER_HOUSE_2_WIDTH, $7, $3
+	warp_to $3, $7, PEWTER_HOUSE_2_WIDTH

data/mapObjects/pewtermart.asm

@@ -2,8 +2,8 @@ PewterMartObject:
 	db $0 ; border block
 
 	db $2 ; warps
-	db $7, $3, $4, $ff
+	warp $3, $7, $4, $ff
-	db $7, $4, $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
+	warp_to $3, $7, PEWTER_MART_WIDTH
-	EVENT_DISP PEWTER_MART_WIDTH, $7, $4
+	warp_to $4, $7, PEWTER_MART_WIDTH

data/mapObjects/pewterpokecenter.asm

@@ -2,8 +2,8 @@ PewterPokecenterObject:
 	db $0 ; border block
 
 	db $2 ; warps
-	db $7, $3, $6, $ff
+	warp $3, $7, $6, $ff
-	db $7, $4, $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
+	warp_to $3, $7, PEWTER_POKECENTER_WIDTH
-	EVENT_DISP PEWTER_POKECENTER_WIDTH, $7, $4
+	warp_to $4, $7, PEWTER_POKECENTER_WIDTH

data/mapObjects/pokemontower1.asm

@@ -2,9 +2,9 @@ PokemonTower1Object:
 	db $1 ; border block
 
 	db $3 ; warps
-	db $11, $a, $1, $ff
+	warp $a, $11, $1, $ff
-	db $11, $b, $1, $ff
+	warp $b, $11, $1, $ff
-	db $9, $12, $1, POKEMONTOWER_2
+	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
+	warp_to $a, $11, POKEMONTOWER_1_WIDTH
-	EVENT_DISP POKEMONTOWER_1_WIDTH, $11, $b
+	warp_to $b, $11, POKEMONTOWER_1_WIDTH
-	EVENT_DISP POKEMONTOWER_1_WIDTH, $9, $12 ; POKEMONTOWER_2
+	warp_to $12, $9, POKEMONTOWER_1_WIDTH ; POKEMONTOWER_2

data/mapObjects/pokemontower2.asm

@@ -2,8 +2,8 @@ PokemonTower2Object:
 	db $1 ; border block
 
 	db $2 ; warps
-	db $9, $3, $0, POKEMONTOWER_3
+	warp $3, $9, $0, POKEMONTOWER_3
-	db $9, $12, $2, POKEMONTOWER_1
+	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
+	warp_to $3, $9, POKEMONTOWER_2_WIDTH ; POKEMONTOWER_3
-	EVENT_DISP POKEMONTOWER_2_WIDTH, $9, $12 ; POKEMONTOWER_1
+	warp_to $12, $9, POKEMONTOWER_2_WIDTH ; POKEMONTOWER_1

data/mapObjects/pokemontower3.asm

@@ -2,8 +2,8 @@ PokemonTower3Object:
 	db $1 ; border block
 
 	db $2 ; warps
-	db $9, $3, $0, POKEMONTOWER_2
+	warp $3, $9, $0, POKEMONTOWER_2
-	db $9, $12, $1, POKEMONTOWER_4
+	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
+	warp_to $3, $9, POKEMONTOWER_3_WIDTH ; POKEMONTOWER_2
-	EVENT_DISP POKEMONTOWER_3_WIDTH, $9, $12 ; POKEMONTOWER_4
+	warp_to $12, $9, POKEMONTOWER_3_WIDTH ; POKEMONTOWER_4

data/mapObjects/pokemontower4.asm

@@ -2,8 +2,8 @@ PokemonTower4Object:
 	db $1 ; border block
 
 	db $2 ; warps
-	db $9, $3, $0, POKEMONTOWER_5
+	warp $3, $9, $0, POKEMONTOWER_5
-	db $9, $12, $1, POKEMONTOWER_3
+	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
+	warp_to $3, $9, POKEMONTOWER_4_WIDTH ; POKEMONTOWER_5
-	EVENT_DISP POKEMONTOWER_4_WIDTH, $9, $12 ; POKEMONTOWER_3
+	warp_to $12, $9, POKEMONTOWER_4_WIDTH ; POKEMONTOWER_3

data/mapObjects/pokemontower5.asm

@@ -2,8 +2,8 @@ PokemonTower5Object:
 	db $1 ; border block
 
 	db $2 ; warps
-	db $9, $3, $0, POKEMONTOWER_4
+	warp $3, $9, $0, POKEMONTOWER_4
-	db $9, $12, $0, POKEMONTOWER_6
+	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
+	warp_to $3, $9, POKEMONTOWER_5_WIDTH ; POKEMONTOWER_4
-	EVENT_DISP POKEMONTOWER_5_WIDTH, $9, $12 ; POKEMONTOWER_6
+	warp_to $12, $9, POKEMONTOWER_5_WIDTH ; POKEMONTOWER_6

data/mapObjects/pokemontower6.asm

@@ -2,8 +2,8 @@ PokemonTower6Object:
 	db $1 ; border block
 
 	db $2 ; warps
-	db $9, $12, $1, POKEMONTOWER_5
+	warp $12, $9, $1, POKEMONTOWER_5
-	db $10, $9, $0, POKEMONTOWER_7
+	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
+	warp_to $12, $9, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_5
-	EVENT_DISP POKEMONTOWER_6_WIDTH, $10, $9 ; POKEMONTOWER_7
+	warp_to $9, $10, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_7

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

data/mapObjects/powerplant.asm

@@ -2,9 +2,9 @@ PowerPlantObject:
 	db $2e ; border block
 
 	db $3 ; warps
-	db $23, $4, $3, $ff
+	warp $4, $23, $3, $ff
-	db $23, $5, $3, $ff
+	warp $5, $23, $3, $ff
-	db $b, $0, $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
+	warp_to $4, $23, POWER_PLANT_WIDTH
-	EVENT_DISP POWER_PLANT_WIDTH, $23, $5
+	warp_to $5, $23, POWER_PLANT_WIDTH
-	EVENT_DISP POWER_PLANT_WIDTH, $b, $0
+	warp_to $0, $b, POWER_PLANT_WIDTH

data/mapObjects/redshouse1f.asm

@@ -2,17 +2,17 @@ RedsHouse1FObject:
 	db $0A ; border block
 
 	db $3 ; warps
-	db $7, $2, $0, $FF ; exit1
+	warp $2, $7, $0, $FF ; exit1
-	db $7, $3, $0, $FF ; exit2
+	warp $3, $7, $0, $FF ; exit2
-	db $1, $7, $0, REDS_HOUSE_2F ; staircase
+	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
+	warp_to $2, $7, REDS_HOUSE_1F_WIDTH
-	EVENT_DISP REDS_HOUSE_1F_WIDTH, $7, $3
+	warp_to $3, $7, REDS_HOUSE_1F_WIDTH
-	EVENT_DISP REDS_HOUSE_1F_WIDTH, $1, $7
+	warp_to $7, $1, REDS_HOUSE_1F_WIDTH

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

data/mapObjects/rockethideout1.asm

@@ -2,11 +2,11 @@ RocketHideout1Object:
 	db $2e ; border block
 
 	db $5 ; warps
-	db $2, $17, $0, ROCKET_HIDEOUT_2
+	warp $17, $2, $0, ROCKET_HIDEOUT_2
-	db $2, $15, $2, GAME_CORNER
+	warp $15, $2, $2, GAME_CORNER
-	db $13, $18, $0, ROCKET_HIDEOUT_ELEVATOR
+	warp $18, $13, $0, ROCKET_HIDEOUT_ELEVATOR
-	db $18, $15, $3, ROCKET_HIDEOUT_2
+	warp $15, $18, $3, ROCKET_HIDEOUT_2
-	db $13, $19, $1, ROCKET_HIDEOUT_ELEVATOR
+	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
+	warp_to $17, $2, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_2
-	EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $2, $15 ; GAME_CORNER
+	warp_to $15, $2, ROCKET_HIDEOUT_1_WIDTH ; GAME_CORNER
-	EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $13, $18 ; ROCKET_HIDEOUT_ELEVATOR
+	warp_to $18, $13, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
-	EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $18, $15 ; ROCKET_HIDEOUT_2
+	warp_to $15, $18, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_2
-	EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $13, $19 ; ROCKET_HIDEOUT_ELEVATOR
+	warp_to $19, $13, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_ELEVATOR

data/mapObjects/rockethideout2.asm

@@ -2,11 +2,11 @@ RocketHideout2Object:
 	db $2e ; border block
 
 	db $5 ; warps
-	db $8, $1b, $0, ROCKET_HIDEOUT_1
+	warp $1b, $8, $0, ROCKET_HIDEOUT_1
-	db $8, $15, $0, ROCKET_HIDEOUT_3
+	warp $15, $8, $0, ROCKET_HIDEOUT_3
-	db $13, $18, $0, ROCKET_HIDEOUT_ELEVATOR
+	warp $18, $13, $0, ROCKET_HIDEOUT_ELEVATOR
-	db $16, $15, $3, ROCKET_HIDEOUT_1
+	warp $15, $16, $3, ROCKET_HIDEOUT_1
-	db $13, $19, $1, ROCKET_HIDEOUT_ELEVATOR
+	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
+	warp_to $1b, $8, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_1
-	EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $8, $15 ; ROCKET_HIDEOUT_3
+	warp_to $15, $8, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_3
-	EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $13, $18 ; ROCKET_HIDEOUT_ELEVATOR
+	warp_to $18, $13, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
-	EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $16, $15 ; ROCKET_HIDEOUT_1
+	warp_to $15, $16, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_1
-	EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $13, $19 ; ROCKET_HIDEOUT_ELEVATOR
+	warp_to $19, $13, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_ELEVATOR

data/mapObjects/rockethideout3.asm

@@ -2,8 +2,8 @@ RocketHideout3Object:
 	db $2e ; border block
 
 	db $2 ; warps
-	db $6, $19, $1, ROCKET_HIDEOUT_2
+	warp $19, $6, $1, ROCKET_HIDEOUT_2
-	db $12, $13, $0, ROCKET_HIDEOUT_4
+	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
+	warp_to $19, $6, ROCKET_HIDEOUT_3_WIDTH ; ROCKET_HIDEOUT_2
-	EVENT_DISP ROCKET_HIDEOUT_3_WIDTH, $12, $13 ; ROCKET_HIDEOUT_4
+	warp_to $13, $12, ROCKET_HIDEOUT_3_WIDTH ; ROCKET_HIDEOUT_4

data/mapObjects/rockethideout4.asm

@@ -2,9 +2,9 @@ RocketHideout4Object:
 	db $2e ; border block
 
 	db $3 ; warps
-	db $a, $13, $1, ROCKET_HIDEOUT_3
+	warp $13, $a, $1, ROCKET_HIDEOUT_3
-	db $f, $18, $0, ROCKET_HIDEOUT_ELEVATOR
+	warp $18, $f, $0, ROCKET_HIDEOUT_ELEVATOR
-	db $f, $19, $1, 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
+	warp_to $13, $a, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_3
-	EVENT_DISP ROCKET_HIDEOUT_4_WIDTH, $f, $18 ; ROCKET_HIDEOUT_ELEVATOR
+	warp_to $18, $f, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
-	EVENT_DISP ROCKET_HIDEOUT_4_WIDTH, $f, $19 ; ROCKET_HIDEOUT_ELEVATOR
+	warp_to $19, $f, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_ELEVATOR