Unify map event gen1 gen2 (#335)

* Update sign to bg_event #289

* Rename warp to warp_event

* Replace object to object_event

* Move warp macro parameter from warp x, y, id, map to warp_event x, y, map, id

data/maps/objects/AgathasRoom.asm

@@ -1,15 +1,15 @@
 AgathasRoom_Object:
 	db $0 ; border block
 
-	def_warps
-	warp  4, 11, 2, BRUNOS_ROOM
-	warp  5, 11, 3, BRUNOS_ROOM
-	warp  4,  0, 0, LANCES_ROOM
-	warp  5,  0, 0, LANCES_ROOM
+	def_warp_events
+	warp_event  4, 11, BRUNOS_ROOM, 2
+	warp_event  5, 11, BRUNOS_ROOM, 3
+	warp_event  4,  0, LANCES_ROOM, 0
+	warp_event  5,  0, LANCES_ROOM, 0
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_AGATHA, 5, 2, STAY, DOWN, 1, OPP_AGATHA, 1
+	def_object_events
+	object_event 5, 2, SPRITE_AGATHA, STAY, DOWN, 1, OPP_AGATHA, 1
 
 	def_warps_to AGATHAS_ROOM

data/maps/objects/BikeShop.asm

@@ -1,15 +1,15 @@
 BikeShop_Object:
 	db $e ; border block
 
-	def_warps
-	warp  2,  7, 4, LAST_MAP
-	warp  3,  7, 4, LAST_MAP
+	def_warp_events
+	warp_event  2,  7, LAST_MAP, 4
+	warp_event  3,  7, LAST_MAP, 4
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_BIKE_SHOP_CLERK, 6, 2, STAY, NONE, 1 ; person
-	object SPRITE_MIDDLE_AGED_WOMAN, 5, 6, WALK, UP_DOWN, 2 ; person
-	object SPRITE_YOUNGSTER, 1, 3, STAY, UP, 3 ; person
+	def_object_events
+	object_event 6, 2, SPRITE_BIKE_SHOP_CLERK, STAY, NONE, 1 ; person
+	object_event 5, 6, SPRITE_MIDDLE_AGED_WOMAN, WALK, UP_DOWN, 2 ; person
+	object_event 1, 3, SPRITE_YOUNGSTER, STAY, UP, 3 ; person
 
 	def_warps_to BIKE_SHOP

data/maps/objects/BillsHouse.asm

@@ -1,15 +1,15 @@
 BillsHouse_Object:
 	db $d ; border block
 
-	def_warps
-	warp  2,  7, 0, LAST_MAP
-	warp  3,  7, 0, LAST_MAP
+	def_warp_events
+	warp_event  2,  7, LAST_MAP, 0
+	warp_event  3,  7, LAST_MAP, 0
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_MONSTER, 6, 5, STAY, NONE, 1 ; person
-	object SPRITE_SUPER_NERD, 4, 4, STAY, NONE, 2 ; person
-	object SPRITE_SUPER_NERD, 6, 5, STAY, NONE, 3 ; person
+	def_object_events
+	object_event 6, 5, SPRITE_MONSTER, STAY, NONE, 1 ; person
+	object_event 4, 4, SPRITE_SUPER_NERD, STAY, NONE, 2 ; person
+	object_event 6, 5, SPRITE_SUPER_NERD, STAY, NONE, 3 ; person
 
 	def_warps_to BILLS_HOUSE

data/maps/objects/BluesHouse.asm

@@ -1,15 +1,15 @@
 BluesHouse_Object:
 	db $a ; border block
 
-	def_warps
-	warp  2,  7, 1, LAST_MAP
-	warp  3,  7, 1, LAST_MAP
+	def_warp_events
+	warp_event  2,  7, LAST_MAP, 1
+	warp_event  3,  7, LAST_MAP, 1
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_DAISY, 2, 3, STAY, RIGHT, 1 ; Daisy, sitting by map
-	object SPRITE_DAISY, 6, 4, WALK, UP_DOWN, 2, 0 ; Daisy, walking around
-	object SPRITE_POKEDEX, 3, 3, STAY, NONE, 3, 0 ; map on table
+	def_object_events
+	object_event 2, 3, SPRITE_DAISY, STAY, RIGHT, 1 ; Daisy, sitting by map
+	object_event 6, 4, SPRITE_DAISY, WALK, UP_DOWN, 2, 0 ; Daisy, walking around
+	object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 3, 0 ; map on table
 
 	def_warps_to BLUES_HOUSE

data/maps/objects/BrunosRoom.asm

@@ -1,15 +1,15 @@
 BrunosRoom_Object:
 	db $3 ; border block
 
-	def_warps
-	warp  4, 11, 2, LORELEIS_ROOM
-	warp  5, 11, 3, LORELEIS_ROOM
-	warp  4,  0, 0, AGATHAS_ROOM
-	warp  5,  0, 1, AGATHAS_ROOM
+	def_warp_events
+	warp_event  4, 11, LORELEIS_ROOM, 2
+	warp_event  5, 11, LORELEIS_ROOM, 3
+	warp_event  4,  0, AGATHAS_ROOM, 0
+	warp_event  5,  0, AGATHAS_ROOM, 1
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_BRUNO, 5, 2, STAY, DOWN, 1, OPP_BRUNO, 1
+	def_object_events
+	object_event 5, 2, SPRITE_BRUNO, STAY, DOWN, 1, OPP_BRUNO, 1
 
 	def_warps_to BRUNOS_ROOM

data/maps/objects/CeladonChiefHouse.asm

@@ -1,15 +1,15 @@
 CeladonChiefHouse_Object:
 	db $f ; border block
 
-	def_warps
-	warp  2,  7, 11, LAST_MAP
-	warp  3,  7, 11, LAST_MAP
+	def_warp_events
+	warp_event  2,  7, LAST_MAP, 11
+	warp_event  3,  7, LAST_MAP, 11
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_GRAMPS, 4, 2, STAY, DOWN, 1 ; person
-	object SPRITE_ROCKET, 1, 4, WALK, ANY_DIR, 2 ; person
-	object SPRITE_SAILOR, 5, 6, STAY, LEFT, 3 ; person
+	def_object_events
+	object_event 4, 2, SPRITE_GRAMPS, STAY, DOWN, 1 ; person
+	object_event 1, 4, SPRITE_ROCKET, WALK, ANY_DIR, 2 ; person
+	object_event 5, 6, SPRITE_SAILOR, STAY, LEFT, 3 ; person
 
 	def_warps_to CELADON_CHIEF_HOUSE

data/maps/objects/CeladonCity.asm

@@ -1,41 +1,41 @@
 CeladonCity_Object:
 	db $f ; border block
 
-	def_warps
-	warp  8, 13, 0, CELADON_MART_1F
-	warp 10, 13, 2, CELADON_MART_1F
-	warp 24,  9, 0, CELADON_MANSION_1F
-	warp 24,  3, 2, CELADON_MANSION_1F
-	warp 25,  3, 2, CELADON_MANSION_1F
-	warp 41,  9, 0, CELADON_POKECENTER
-	warp 12, 27, 0, CELADON_GYM
-	warp 28, 19, 0, GAME_CORNER
-	warp 39, 19, 0, CELADON_MART_5F ; beta warp! no longer used
-	warp 33, 19, 0, GAME_CORNER_PRIZE_ROOM
-	warp 31, 27, 0, CELADON_DINER
-	warp 35, 27, 0, CELADON_CHIEF_HOUSE
-	warp 43, 27, 0, CELADON_HOTEL
+	def_warp_events
+	warp_event  8, 13, CELADON_MART_1F, 0
+	warp_event 10, 13, CELADON_MART_1F, 2
+	warp_event 24,  9, CELADON_MANSION_1F, 0
+	warp_event 24,  3, CELADON_MANSION_1F, 2
+	warp_event 25,  3, CELADON_MANSION_1F, 2
+	warp_event 41,  9, CELADON_POKECENTER, 0
+	warp_event 12, 27, CELADON_GYM, 0
+	warp_event 28, 19, GAME_CORNER, 0
+	warp_event 39, 19, CELADON_MART_5F, 0 ; beta warp_event! no longer used
+	warp_event 33, 19, GAME_CORNER_PRIZE_ROOM, 0
+	warp_event 31, 27, CELADON_DINER, 0
+	warp_event 35, 27, CELADON_CHIEF_HOUSE, 0
+	warp_event 43, 27, CELADON_HOTEL, 0
 
-	def_signs
-	sign 27, 15, 10 ; CeladonCityText10
-	sign 19, 15, 11 ; CeladonCityText11
-	sign 42,  9, 12 ; PokeCenterSignText
-	sign 13, 29, 13 ; CeladonCityText13
-	sign 21,  9, 14 ; CeladonCityText14
-	sign 12, 13, 15 ; CeladonCityText15
-	sign 39, 21, 16 ; CeladonCityText16
-	sign 33, 21, 17 ; CeladonCityText17
-	sign 27, 21, 18 ; CeladonCityText18
+	def_bg_events
+	bg_event 27, 15, 10 ; CeladonCityText10
+	bg_event 19, 15, 11 ; CeladonCityText11
+	bg_event 42,  9, 12 ; PokeCenterSignText
+	bg_event 13, 29, 13 ; CeladonCityText13
+	bg_event 21,  9, 14 ; CeladonCityText14
+	bg_event 12, 13, 15 ; CeladonCityText15
+	bg_event 39, 21, 16 ; CeladonCityText16
+	bg_event 33, 21, 17 ; CeladonCityText17
+	bg_event 27, 21, 18 ; CeladonCityText18
 
-	def_objects
-	object SPRITE_LITTLE_GIRL, 8, 17, WALK, ANY_DIR, 1 ; person
-	object SPRITE_GRAMPS, 11, 28, STAY, UP, 2 ; person
-	object SPRITE_GIRL, 14, 19, WALK, UP_DOWN, 3 ; person
-	object SPRITE_GRAMPS, 25, 22, STAY, DOWN, 4 ; person
-	object SPRITE_GRAMPS, 22, 16, STAY, DOWN, 5 ; person
-	object SPRITE_FISHER, 32, 12, STAY, LEFT, 6 ; person
-	object SPRITE_MONSTER, 30, 12, STAY, RIGHT, 7 ; person
-	object SPRITE_ROCKET, 32, 29, WALK, LEFT_RIGHT, 8 ; person
-	object SPRITE_ROCKET, 42, 14, WALK, LEFT_RIGHT, 9 ; person
+	def_object_events
+	object_event 8, 17, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 1 ; person
+	object_event 11, 28, SPRITE_GRAMPS, STAY, UP, 2 ; person
+	object_event 14, 19, SPRITE_GIRL, WALK, UP_DOWN, 3 ; person
+	object_event 25, 22, SPRITE_GRAMPS, STAY, DOWN, 4 ; person
+	object_event 22, 16, SPRITE_GRAMPS, STAY, DOWN, 5 ; person
+	object_event 32, 12, SPRITE_FISHER, STAY, LEFT, 6 ; person
+	object_event 30, 12, SPRITE_MONSTER, STAY, RIGHT, 7 ; person
+	object_event 32, 29, SPRITE_ROCKET, WALK, LEFT_RIGHT, 8 ; person
+	object_event 42, 14, SPRITE_ROCKET, WALK, LEFT_RIGHT, 9 ; person
 
 	def_warps_to CELADON_CITY

data/maps/objects/CeladonDiner.asm

@@ -1,17 +1,17 @@
 CeladonDiner_Object:
 	db $f ; border block
 
-	def_warps
-	warp  3,  7, 10, LAST_MAP
-	warp  4,  7, 10, LAST_MAP
+	def_warp_events
+	warp_event  3,  7, LAST_MAP, 10
+	warp_event  4,  7, LAST_MAP, 10
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_COOK, 8, 5, WALK, LEFT_RIGHT, 1 ; person
-	object SPRITE_MIDDLE_AGED_WOMAN, 7, 2, STAY, NONE, 2 ; person
-	object SPRITE_MIDDLE_AGED_MAN, 1, 4, STAY, DOWN, 3 ; person
-	object SPRITE_FISHER, 5, 3, STAY, RIGHT, 4 ; person
-	object SPRITE_GYM_GUIDE, 0, 1, STAY, DOWN, 5 ; person
+	def_object_events
+	object_event 8, 5, SPRITE_COOK, WALK, LEFT_RIGHT, 1 ; person
+	object_event 7, 2, SPRITE_MIDDLE_AGED_WOMAN, STAY, NONE, 2 ; person
+	object_event 1, 4, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, 3 ; person
+	object_event 5, 3, SPRITE_FISHER, STAY, RIGHT, 4 ; person
+	object_event 0, 1, SPRITE_GYM_GUIDE, STAY, DOWN, 5 ; person
 
 	def_warps_to CELADON_DINER

data/maps/objects/CeladonGym.asm

@@ -1,20 +1,20 @@
 CeladonGym_Object:
 	db $3 ; border block
 
-	def_warps
-	warp  4, 17, 6, LAST_MAP
-	warp  5, 17, 6, LAST_MAP
+	def_warp_events
+	warp_event  4, 17, LAST_MAP, 6
+	warp_event  5, 17, LAST_MAP, 6
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_ERIKA, 4, 3, STAY, DOWN, 1, OPP_ERIKA, 1
-	object SPRITE_COOLTRAINER_F, 2, 11, STAY, RIGHT, 2, OPP_LASS, 17
-	object SPRITE_BEAUTY, 7, 10, STAY, LEFT, 3, OPP_BEAUTY, 1
-	object SPRITE_COOLTRAINER_F, 9, 5, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11
-	object SPRITE_BEAUTY, 1, 5, STAY, DOWN, 5, OPP_BEAUTY, 2
-	object SPRITE_COOLTRAINER_F, 6, 3, STAY, DOWN, 6, OPP_LASS, 18
-	object SPRITE_BEAUTY, 3, 3, STAY, DOWN, 7, OPP_BEAUTY, 3
-	object SPRITE_COOLTRAINER_F, 5, 3, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1
+	def_object_events
+	object_event 4, 3, SPRITE_ERIKA, STAY, DOWN, 1, OPP_ERIKA, 1
+	object_event 2, 11, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_LASS, 17
+	object_event 7, 10, SPRITE_BEAUTY, STAY, LEFT, 3, OPP_BEAUTY, 1
+	object_event 9, 5, SPRITE_COOLTRAINER_F, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11
+	object_event 1, 5, SPRITE_BEAUTY, STAY, DOWN, 5, OPP_BEAUTY, 2
+	object_event 6, 3, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_LASS, 18
+	object_event 3, 3, SPRITE_BEAUTY, STAY, DOWN, 7, OPP_BEAUTY, 3
+	object_event 5, 3, SPRITE_COOLTRAINER_F, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1
 
 	def_warps_to CELADON_GYM

data/maps/objects/CeladonHotel.asm

@@ -1,15 +1,15 @@
 CeladonHotel_Object:
 	db $0 ; border block
 
-	def_warps
-	warp  3,  7, 12, LAST_MAP
-	warp  4,  7, 12, LAST_MAP
+	def_warp_events
+	warp_event  3,  7, LAST_MAP, 12
+	warp_event  4,  7, LAST_MAP, 12
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_GRANNY, 3, 1, STAY, DOWN, 1 ; person
-	object SPRITE_BEAUTY, 2, 4, STAY, NONE, 2 ; person
-	object SPRITE_SUPER_NERD, 8, 4, WALK, LEFT_RIGHT, 3 ; person
+	def_object_events
+	object_event 3, 1, SPRITE_GRANNY, STAY, DOWN, 1 ; person
+	object_event 2, 4, SPRITE_BEAUTY, STAY, NONE, 2 ; person
+	object_event 8, 4, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 3 ; person
 
 	def_warps_to CELADON_HOTEL

data/maps/objects/CeladonMansion1F.asm

@@ -1,20 +1,20 @@
 CeladonMansion1F_Object:
 	db $f ; border block
 
-	def_warps
-	warp  4, 11, 2, LAST_MAP
-	warp  5, 11, 2, LAST_MAP
-	warp  4,  0, 4, LAST_MAP
-	warp  7,  1, 1, CELADON_MANSION_2F
-	warp  2,  1, 2, CELADON_MANSION_2F
+	def_warp_events
+	warp_event  4, 11, LAST_MAP, 2
+	warp_event  5, 11, LAST_MAP, 2
+	warp_event  4,  0, LAST_MAP, 4
+	warp_event  7,  1, CELADON_MANSION_2F, 1
+	warp_event  2,  1, CELADON_MANSION_2F, 2
 
-	def_signs
-	sign  4,  9, 5 ; CeladonMansion1Text5
+	def_bg_events
+	bg_event  4,  9, 5 ; CeladonMansion1Text5
 
-	def_objects
-	object SPRITE_MONSTER, 0, 5, STAY, RIGHT, 1 ; person
-	object SPRITE_GRANNY, 1, 5, STAY, DOWN, 2 ; person
-	object SPRITE_FAIRY, 1, 8, WALK, LEFT_RIGHT, 3 ; person
-	object SPRITE_MONSTER, 4, 4, WALK, UP_DOWN, 4 ; person
+	def_object_events
+	object_event 0, 5, SPRITE_MONSTER, STAY, RIGHT, 1 ; person
+	object_event 1, 5, SPRITE_GRANNY, STAY, DOWN, 2 ; person
+	object_event 1, 8, SPRITE_FAIRY, WALK, LEFT_RIGHT, 3 ; person
+	object_event 4, 4, SPRITE_MONSTER, WALK, UP_DOWN, 4 ; person
 
 	def_warps_to CELADON_MANSION_1F

data/maps/objects/CeladonMansion2F.asm

@@ -1,15 +1,15 @@
 CeladonMansion2F_Object:
 	db $f ; border block
 
-	def_warps
-	warp  6,  1, 0, CELADON_MANSION_3F
-	warp  7,  1, 3, CELADON_MANSION_1F
-	warp  2,  1, 4, CELADON_MANSION_1F
-	warp  4,  1, 3, CELADON_MANSION_3F
+	def_warp_events
+	warp_event  6,  1, CELADON_MANSION_3F, 0
+	warp_event  7,  1, CELADON_MANSION_1F, 3
+	warp_event  2,  1, CELADON_MANSION_1F, 4
+	warp_event  4,  1, CELADON_MANSION_3F, 3
 
-	def_signs
-	sign  4,  9, 1 ; CeladonMansion2Text1
+	def_bg_events
+	bg_event  4,  9, 1 ; CeladonMansion2Text1
 
-	def_objects
+	def_object_events
 
 	def_warps_to CELADON_MANSION_2F

data/maps/objects/CeladonMansion3F.asm

@@ -1,22 +1,22 @@
 CeladonMansion3F_Object:
 	db $f ; border block
 
-	def_warps
-	warp  6,  1, 0, CELADON_MANSION_2F
-	warp  7,  1, 0, CELADON_MANSION_ROOF
-	warp  2,  1, 1, CELADON_MANSION_ROOF
-	warp  4,  1, 3, CELADON_MANSION_2F
+	def_warp_events
+	warp_event  6,  1, CELADON_MANSION_2F, 0
+	warp_event  7,  1, CELADON_MANSION_ROOF, 0
+	warp_event  2,  1, CELADON_MANSION_ROOF, 1
+	warp_event  4,  1, CELADON_MANSION_2F, 3
 
-	def_signs
-	sign  1,  3, 5 ; CeladonMansion3Text5
-	sign  4,  3, 6 ; CeladonMansion3Text6
-	sign  1,  6, 7 ; CeladonMansion3Text7
-	sign  4,  9, 8 ; CeladonMansion3Text8
+	def_bg_events
+	bg_event  1,  3, 5 ; CeladonMansion3Text5
+	bg_event  4,  3, 6 ; CeladonMansion3Text6
+	bg_event  1,  6, 7 ; CeladonMansion3Text7
+	bg_event  4,  9, 8 ; CeladonMansion3Text8
 
-	def_objects
-	object SPRITE_BIKE_SHOP_CLERK, 0, 4, STAY, UP, 1 ; person
-	object SPRITE_CLERK, 3, 4, STAY, UP, 2 ; person
-	object SPRITE_SUPER_NERD, 0, 7, STAY, UP, 3 ; person
-	object SPRITE_SILPH_WORKER, 2, 3, STAY, NONE, 4 ; person
+	def_object_events
+	object_event 0, 4, SPRITE_BIKE_SHOP_CLERK, STAY, UP, 1 ; person
+	object_event 3, 4, SPRITE_CLERK, STAY, UP, 2 ; person
+	object_event 0, 7, SPRITE_SUPER_NERD, STAY, UP, 3 ; person
+	object_event 2, 3, SPRITE_SILPH_WORKER, STAY, NONE, 4 ; person
 
 	def_warps_to CELADON_MANSION_3F

data/maps/objects/CeladonMansionRoof.asm

@@ -1,14 +1,14 @@
 CeladonMansionRoof_Object:
 	db $9 ; border block
 
-	def_warps
-	warp  6,  1, 1, CELADON_MANSION_3F
-	warp  2,  1, 2, CELADON_MANSION_3F
-	warp  2,  7, 0, CELADON_MANSION_ROOF_HOUSE
+	def_warp_events
+	warp_event  6,  1, CELADON_MANSION_3F, 1
+	warp_event  2,  1, CELADON_MANSION_3F, 2
+	warp_event  2,  7, CELADON_MANSION_ROOF_HOUSE, 0
 
-	def_signs
-	sign  3,  7, 1 ; CeladonMansion4Text1
+	def_bg_events
+	bg_event  3,  7, 1 ; CeladonMansion4Text1
 
-	def_objects
+	def_object_events
 
 	def_warps_to CELADON_MANSION_ROOF

data/maps/objects/CeladonMansionRoofHouse.asm

@@ -1,14 +1,14 @@
 CeladonMansionRoofHouse_Object:
 	db $a ; border block
 
-	def_warps
-	warp  2,  7, 2, CELADON_MANSION_ROOF
-	warp  3,  7, 2, CELADON_MANSION_ROOF
+	def_warp_events
+	warp_event  2,  7, CELADON_MANSION_ROOF, 2
+	warp_event  3,  7, CELADON_MANSION_ROOF, 2
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_HIKER, 2, 2, STAY, DOWN, 1 ; person
-	object SPRITE_POKE_BALL, 4, 3, STAY, NONE, 2 ; person
+	def_object_events
+	object_event 2, 2, SPRITE_HIKER, STAY, DOWN, 1 ; person
+	object_event 4, 3, SPRITE_POKE_BALL, STAY, NONE, 2 ; person
 
 	def_warps_to CELADON_MANSION_ROOF_HOUSE

data/maps/objects/CeladonMart1F.asm

@@ -1,19 +1,19 @@
 CeladonMart1F_Object:
 	db $f ; border block
 
-	def_warps
-	warp  2,  7, 0, LAST_MAP
-	warp  3,  7, 0, LAST_MAP
-	warp 16,  7, 1, LAST_MAP
-	warp 17,  7, 1, LAST_MAP
-	warp 12,  1, 0, CELADON_MART_2F
-	warp  1,  1, 0, CELADON_MART_ELEVATOR
+	def_warp_events
+	warp_event  2,  7, LAST_MAP, 0
+	warp_event  3,  7, LAST_MAP, 0
+	warp_event 16,  7, LAST_MAP, 1
+	warp_event 17,  7, LAST_MAP, 1
+	warp_event 12,  1, CELADON_MART_2F, 0
+	warp_event  1,  1, CELADON_MART_ELEVATOR, 0
 
-	def_signs
-	sign 11,  4, 2 ; CeladonMart1Text2
-	sign 14,  1, 3 ; CeladonMart1Text3
+	def_bg_events
+	bg_event 11,  4, 2 ; CeladonMart1Text2
+	bg_event 14,  1, 3 ; CeladonMart1Text3
 
-	def_objects
-	object SPRITE_LINK_RECEPTIONIST, 8, 3, STAY, DOWN, 1 ; person
+	def_object_events
+	object_event 8, 3, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 1 ; person
 
 	def_warps_to CELADON_MART_1F

data/maps/objects/CeladonMart2F.asm

@@ -1,18 +1,18 @@
 CeladonMart2F_Object:
 	db $f ; border block
 
-	def_warps
-	warp 12,  1, 4, CELADON_MART_1F
-	warp 16,  1, 1, CELADON_MART_3F
-	warp  1,  1, 0, CELADON_MART_ELEVATOR
+	def_warp_events
+	warp_event 12,  1, CELADON_MART_1F, 4
+	warp_event 16,  1, CELADON_MART_3F, 1
+	warp_event  1,  1, CELADON_MART_ELEVATOR, 0
 
-	def_signs
-	sign 14,  1, 5 ; CeladonMart2Text5
+	def_bg_events
+	bg_event 14,  1, 5 ; CeladonMart2Text5
 
-	def_objects
-	object SPRITE_CLERK, 5, 3, STAY, DOWN, 1 ; person
-	object SPRITE_CLERK, 6, 3, STAY, DOWN, 2 ; person
-	object SPRITE_MIDDLE_AGED_MAN, 19, 5, STAY, NONE, 3 ; person
-	object SPRITE_GIRL, 14, 4, WALK, UP_DOWN, 4 ; person
+	def_object_events
+	object_event 5, 3, SPRITE_CLERK, STAY, DOWN, 1 ; person
+	object_event 6, 3, SPRITE_CLERK, STAY, DOWN, 2 ; person
+	object_event 19, 5, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 3 ; person
+	object_event 14, 4, SPRITE_GIRL, WALK, UP_DOWN, 4 ; person
 
 	def_warps_to CELADON_MART_2F

data/maps/objects/CeladonMart3F.asm

@@ -1,30 +1,30 @@
 CeladonMart3F_Object:
 	db $f ; border block
 
-	def_warps
-	warp 12,  1, 0, CELADON_MART_4F
-	warp 16,  1, 1, CELADON_MART_2F
-	warp  1,  1, 0, CELADON_MART_ELEVATOR
+	def_warp_events
+	warp_event 12,  1, CELADON_MART_4F, 0
+	warp_event 16,  1, CELADON_MART_2F, 1
+	warp_event  1,  1, CELADON_MART_ELEVATOR, 0
 
-	def_signs
-	sign  2,  4, 6 ; CeladonMart3Text6
-	sign  3,  4, 7 ; CeladonMart3Text7
-	sign  5,  4, 8 ; CeladonMart3Text8
-	sign  6,  4, 9 ; CeladonMart3Text9
-	sign  2,  6, 10 ; CeladonMart3Text10
-	sign  3,  6, 11 ; CeladonMart3Text11
-	sign  5,  6, 12 ; CeladonMart3Text12
-	sign  6,  6, 13 ; CeladonMart3Text13
-	sign 14,  1, 14 ; CeladonMart3Text14
-	sign  4,  1, 15 ; CeladonMart3Text15
-	sign  6,  1, 16 ; CeladonMart3Text16
-	sign 10,  1, 17 ; CeladonMart3Text17
+	def_bg_events
+	bg_event  2,  4, 6 ; CeladonMart3Text6
+	bg_event  3,  4, 7 ; CeladonMart3Text7
+	bg_event  5,  4, 8 ; CeladonMart3Text8
+	bg_event  6,  4, 9 ; CeladonMart3Text9
+	bg_event  2,  6, 10 ; CeladonMart3Text10
+	bg_event  3,  6, 11 ; CeladonMart3Text11
+	bg_event  5,  6, 12 ; CeladonMart3Text12
+	bg_event  6,  6, 13 ; CeladonMart3Text13
+	bg_event 14,  1, 14 ; CeladonMart3Text14
+	bg_event  4,  1, 15 ; CeladonMart3Text15
+	bg_event  6,  1, 16 ; CeladonMart3Text16
+	bg_event 10,  1, 17 ; CeladonMart3Text17
 
-	def_objects
-	object SPRITE_CLERK, 16, 5, STAY, NONE, 1 ; person
-	object SPRITE_GAMEBOY_KID, 11, 6, STAY, RIGHT, 2 ; person
-	object SPRITE_GAMEBOY_KID, 7, 2, STAY, DOWN, 3 ; person
-	object SPRITE_GAMEBOY_KID, 8, 2, STAY, DOWN, 4 ; person
-	object SPRITE_LITTLE_BOY, 2, 5, STAY, UP, 5 ; person
+	def_object_events
+	object_event 16, 5, SPRITE_CLERK, STAY, NONE, 1 ; person
+	object_event 11, 6, SPRITE_GAMEBOY_KID, STAY, RIGHT, 2 ; person
+	object_event 7, 2, SPRITE_GAMEBOY_KID, STAY, DOWN, 3 ; person
+	object_event 8, 2, SPRITE_GAMEBOY_KID, STAY, DOWN, 4 ; person
+	object_event 2, 5, SPRITE_LITTLE_BOY, STAY, UP, 5 ; person
 
 	def_warps_to CELADON_MART_3F

data/maps/objects/CeladonMart4F.asm

@@ -1,17 +1,17 @@
 CeladonMart4F_Object:
 	db $f ; border block
 
-	def_warps
-	warp 12,  1, 0, CELADON_MART_3F
-	warp 16,  1, 1, CELADON_MART_5F
-	warp  1,  1, 0, CELADON_MART_ELEVATOR
+	def_warp_events
+	warp_event 12,  1, CELADON_MART_3F, 0
+	warp_event 16,  1, CELADON_MART_5F, 1
+	warp_event  1,  1, CELADON_MART_ELEVATOR, 0
 
-	def_signs
-	sign 14,  1, 4 ; CeladonMart4Text4
+	def_bg_events
+	bg_event 14,  1, 4 ; CeladonMart4Text4
 
-	def_objects
-	object SPRITE_CLERK, 5, 7, STAY, NONE, 1 ; person
-	object SPRITE_SUPER_NERD, 15, 5, WALK, LEFT_RIGHT, 2 ; person
-	object SPRITE_YOUNGSTER, 5, 2, WALK, LEFT_RIGHT, 3 ; person
+	def_object_events
+	object_event 5, 7, SPRITE_CLERK, STAY, NONE, 1 ; person
+	object_event 15, 5, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 2 ; person
+	object_event 5, 2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 3 ; person
 
 	def_warps_to CELADON_MART_4F

data/maps/objects/CeladonMart5F.asm

@@ -1,18 +1,18 @@
 CeladonMart5F_Object:
 	db $f ; border block
 
-	def_warps
-	warp 12,  1, 0, CELADON_MART_ROOF
-	warp 16,  1, 1, CELADON_MART_4F
-	warp  1,  1, 0, CELADON_MART_ELEVATOR
+	def_warp_events
+	warp_event 12,  1, CELADON_MART_ROOF, 0
+	warp_event 16,  1, CELADON_MART_4F, 1
+	warp_event  1,  1, CELADON_MART_ELEVATOR, 0
 
-	def_signs
-	sign 14,  1, 5 ; CeladonMart5Text5
+	def_bg_events
+	bg_event 14,  1, 5 ; CeladonMart5Text5
 
-	def_objects
-	object SPRITE_GENTLEMAN, 14, 5, WALK, UP_DOWN, 1 ; person
-	object SPRITE_SAILOR, 2, 6, STAY, NONE, 2 ; person
-	object SPRITE_CLERK, 5, 3, STAY, DOWN, 3 ; person
-	object SPRITE_CLERK, 6, 3, STAY, DOWN, 4 ; person
+	def_object_events
+	object_event 14, 5, SPRITE_GENTLEMAN, WALK, UP_DOWN, 1 ; person
+	object_event 2, 6, SPRITE_SAILOR, STAY, NONE, 2 ; person
+	object_event 5, 3, SPRITE_CLERK, STAY, DOWN, 3 ; person
+	object_event 6, 3, SPRITE_CLERK, STAY, DOWN, 4 ; person
 
 	def_warps_to CELADON_MART_5F

data/maps/objects/CeladonMartElevator.asm

@@ -1,13 +1,13 @@
 CeladonMartElevator_Object:
 	db $f ; border block
 
-	def_warps
-	warp  1,  3, 5, CELADON_MART_1F
-	warp  2,  3, 5, CELADON_MART_1F
+	def_warp_events
+	warp_event  1,  3, CELADON_MART_1F, 5
+	warp_event  2,  3, CELADON_MART_1F, 5
 
-	def_signs
-	sign  3,  0, 1 ; CeladonMartElevatorText1
+	def_bg_events
+	bg_event  3,  0, 1 ; CeladonMartElevatorText1
 
-	def_objects
+	def_object_events
 
 	def_warps_to CELADON_MART_ELEVATOR

data/maps/objects/CeladonMartRoof.asm

@@ -1,17 +1,17 @@
 CeladonMartRoof_Object:
 	db $42 ; border block
 
-	def_warps
-	warp 15,  2, 0, CELADON_MART_5F
+	def_warp_events
+	warp_event 15,  2, CELADON_MART_5F, 0
 
-	def_signs
-	sign 10,  1, 3 ; CeladonMartRoofText3
-	sign 11,  1, 4 ; CeladonMartRoofText4
-	sign 12,  2, 5 ; CeladonMartRoofText5
-	sign 13,  2, 6 ; CeladonMartRoofText6
+	def_bg_events
+	bg_event 10,  1, 3 ; CeladonMartRoofText3
+	bg_event 11,  1, 4 ; CeladonMartRoofText4
+	bg_event 12,  2, 5 ; CeladonMartRoofText5
+	bg_event 13,  2, 6 ; CeladonMartRoofText6
 
-	def_objects
-	object SPRITE_SUPER_NERD, 10, 4, STAY, LEFT, 1 ; person
-	object SPRITE_LITTLE_GIRL, 5, 5, WALK, ANY_DIR, 2 ; person
+	def_object_events
+	object_event 10, 4, SPRITE_SUPER_NERD, STAY, LEFT, 1 ; person
+	object_event 5, 5, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 2 ; person
 
 	def_warps_to CELADON_MART_ROOF

data/maps/objects/CeladonPokecenter.asm

@@ -1,16 +1,16 @@
 CeladonPokecenter_Object:
 	db $0 ; border block
 
-	def_warps
-	warp  3,  7, 5, LAST_MAP
-	warp  4,  7, 5, LAST_MAP
+	def_warp_events
+	warp_event  3,  7, LAST_MAP, 5
+	warp_event  4,  7, LAST_MAP, 5
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
-	object SPRITE_GENTLEMAN, 7, 3, WALK, LEFT_RIGHT, 2 ; person
-	object SPRITE_BEAUTY, 10, 5, WALK, ANY_DIR, 3 ; person
-	object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
+	def_object_events
+	object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
+	object_event 7, 3, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 2 ; person
+	object_event 10, 5, SPRITE_BEAUTY, WALK, ANY_DIR, 3 ; person
+	object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
 
 	def_warps_to CELADON_POKECENTER

data/maps/objects/CeruleanBadgeHouse.asm

@@ -1,14 +1,14 @@
 CeruleanBadgeHouse_Object:
 	db $c ; border block
 
-	def_warps
-	warp  2,  0, 9, LAST_MAP
-	warp  2,  7, 8, LAST_MAP
-	warp  3,  7, 8, LAST_MAP
+	def_warp_events
+	warp_event  2,  0, LAST_MAP, 9
+	warp_event  2,  7, LAST_MAP, 8
+	warp_event  3,  7, LAST_MAP, 8
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_MIDDLE_AGED_MAN, 5, 3, STAY, RIGHT, 1 ; person
+	def_object_events
+	object_event 5, 3, SPRITE_MIDDLE_AGED_MAN, STAY, RIGHT, 1 ; person
 
 	def_warps_to CERULEAN_BADGE_HOUSE

data/maps/objects/CeruleanCave1F.asm

@@ -1,22 +1,22 @@
 CeruleanCave1F_Object:
 	db $7d ; border block
 
-	def_warps
-	warp 24, 17, 6, LAST_MAP
-	warp 25, 17, 6, LAST_MAP
-	warp 27,  1, 0, CERULEAN_CAVE_2F
-	warp 23,  7, 1, CERULEAN_CAVE_2F
-	warp 18,  9, 2, CERULEAN_CAVE_2F
-	warp  7,  1, 3, CERULEAN_CAVE_2F
-	warp  1,  3, 4, CERULEAN_CAVE_2F
-	warp  3, 11, 5, CERULEAN_CAVE_2F
-	warp  0,  6, 0, CERULEAN_CAVE_B1F
+	def_warp_events
+	warp_event 24, 17, LAST_MAP, 6
+	warp_event 25, 17, LAST_MAP, 6
+	warp_event 27,  1, CERULEAN_CAVE_2F, 0
+	warp_event 23,  7, CERULEAN_CAVE_2F, 1
+	warp_event 18,  9, CERULEAN_CAVE_2F, 2
+	warp_event  7,  1, CERULEAN_CAVE_2F, 3
+	warp_event  1,  3, CERULEAN_CAVE_2F, 4
+	warp_event  3, 11, CERULEAN_CAVE_2F, 5
+	warp_event  0,  6, CERULEAN_CAVE_B1F, 0
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_POKE_BALL, 7, 13, STAY, NONE, 1, FULL_RESTORE
-	object SPRITE_POKE_BALL, 19, 3, STAY, NONE, 2, MAX_ELIXER
-	object SPRITE_POKE_BALL, 5, 0, STAY, NONE, 3, NUGGET
+	def_object_events
+	object_event 7, 13, SPRITE_POKE_BALL, STAY, NONE, 1, FULL_RESTORE
+	object_event 19, 3, SPRITE_POKE_BALL, STAY, NONE, 2, MAX_ELIXER
+	object_event 5, 0, SPRITE_POKE_BALL, STAY, NONE, 3, NUGGET
 
 	def_warps_to CERULEAN_CAVE_1F

data/maps/objects/CeruleanCave2F.asm

@@ -1,19 +1,19 @@
 CeruleanCave2F_Object:
 	db $7d ; border block
 
-	def_warps
-	warp 29,  1, 2, CERULEAN_CAVE_1F
-	warp 22,  6, 3, CERULEAN_CAVE_1F
-	warp 19,  7, 4, CERULEAN_CAVE_1F
-	warp  9,  1, 5, CERULEAN_CAVE_1F
-	warp  1,  3, 6, CERULEAN_CAVE_1F
-	warp  3, 11, 7, CERULEAN_CAVE_1F
+	def_warp_events
+	warp_event 29,  1, CERULEAN_CAVE_1F, 2
+	warp_event 22,  6, CERULEAN_CAVE_1F, 3
+	warp_event 19,  7, CERULEAN_CAVE_1F, 4
+	warp_event  9,  1, CERULEAN_CAVE_1F, 5
+	warp_event  1,  3, CERULEAN_CAVE_1F, 6
+	warp_event  3, 11, CERULEAN_CAVE_1F, 7
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_POKE_BALL, 29, 9, STAY, NONE, 1, PP_UP
-	object SPRITE_POKE_BALL, 4, 15, STAY, NONE, 2, ULTRA_BALL
-	object SPRITE_POKE_BALL, 13, 6, STAY, NONE, 3, FULL_RESTORE
+	def_object_events
+	object_event 29, 9, SPRITE_POKE_BALL, STAY, NONE, 1, PP_UP
+	object_event 4, 15, SPRITE_POKE_BALL, STAY, NONE, 2, ULTRA_BALL
+	object_event 13, 6, SPRITE_POKE_BALL, STAY, NONE, 3, FULL_RESTORE
 
 	def_warps_to CERULEAN_CAVE_2F

data/maps/objects/CeruleanCaveB1F.asm

@@ -1,14 +1,14 @@
 CeruleanCaveB1F_Object:
 	db $7d ; border block
 
-	def_warps
-	warp  3,  6, 8, CERULEAN_CAVE_1F
+	def_warp_events
+	warp_event  3,  6, CERULEAN_CAVE_1F, 8
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_MONSTER, 27, 13, STAY, DOWN, 1, MEWTWO, 70
-	object SPRITE_POKE_BALL, 16, 9, STAY, NONE, 2, ULTRA_BALL
-	object SPRITE_POKE_BALL, 18, 1, STAY, NONE, 3, MAX_REVIVE
+	def_object_events
+	object_event 27, 13, SPRITE_MONSTER, STAY, DOWN, 1, MEWTWO, 70
+	object_event 16, 9, SPRITE_POKE_BALL, STAY, NONE, 2, ULTRA_BALL
+	object_event 18, 1, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_REVIVE
 
 	def_warps_to CERULEAN_CAVE_B1F

data/maps/objects/CeruleanCity.asm

@@ -1,37 +1,37 @@
 CeruleanCity_Object:
 	db $f ; border block
 
-	def_warps
-	warp 27, 11, 0, CERULEAN_TRASHED_HOUSE
-	warp 13, 15, 0, CERULEAN_TRADE_HOUSE
-	warp 19, 17, 0, CERULEAN_POKECENTER
-	warp 30, 19, 0, CERULEAN_GYM
-	warp 13, 25, 0, BIKE_SHOP
-	warp 25, 25, 0, CERULEAN_MART
-	warp  4, 11, 0, CERULEAN_CAVE_1F
-	warp 27,  9, 2, CERULEAN_TRASHED_HOUSE
-	warp  9, 11, 1, CERULEAN_BADGE_HOUSE
-	warp  9,  9, 0, CERULEAN_BADGE_HOUSE
+	def_warp_events
+	warp_event 27, 11, CERULEAN_TRASHED_HOUSE, 0
+	warp_event 13, 15, CERULEAN_TRADE_HOUSE, 0
+	warp_event 19, 17, CERULEAN_POKECENTER, 0
+	warp_event 30, 19, CERULEAN_GYM, 0
+	warp_event 13, 25, BIKE_SHOP, 0
+	warp_event 25, 25, CERULEAN_MART, 0
+	warp_event  4, 11, CERULEAN_CAVE_1F, 0
+	warp_event 27,  9, CERULEAN_TRASHED_HOUSE, 2
+	warp_event  9, 11, CERULEAN_BADGE_HOUSE, 1
+	warp_event  9,  9, CERULEAN_BADGE_HOUSE, 0
 
-	def_signs
-	sign 23, 19, 12 ; CeruleanCityText12
-	sign 17, 29, 13 ; CeruleanCityText13
-	sign 26, 25, 14 ; MartSignText
-	sign 20, 17, 15 ; PokeCenterSignText
-	sign 11, 25, 16 ; CeruleanCityText16
-	sign 27, 21, 17 ; CeruleanCityText17
+	def_bg_events
+	bg_event 23, 19, 12 ; CeruleanCityText12
+	bg_event 17, 29, 13 ; CeruleanCityText13
+	bg_event 26, 25, 14 ; MartSignText
+	bg_event 20, 17, 15 ; PokeCenterSignText
+	bg_event 11, 25, 16 ; CeruleanCityText16
+	bg_event 27, 21, 17 ; CeruleanCityText17
 
-	def_objects
-	object SPRITE_BLUE, 20, 2, STAY, DOWN, 1 ; person
-	object SPRITE_ROCKET, 30, 8, STAY, NONE, 2, OPP_ROCKET, 5
-	object SPRITE_COOLTRAINER_M, 31, 20, STAY, DOWN, 3 ; person
-	object SPRITE_SUPER_NERD, 15, 18, WALK, UP_DOWN, 4 ; person
-	object SPRITE_SUPER_NERD, 9, 21, WALK, LEFT_RIGHT, 5 ; person
-	object SPRITE_GUARD, 28, 12, STAY, DOWN, 6 ; person
-	object SPRITE_COOLTRAINER_F, 29, 26, STAY, LEFT, 7 ; person
-	object SPRITE_MONSTER, 28, 26, STAY, DOWN, 8 ; person
-	object SPRITE_COOLTRAINER_F, 9, 27, WALK, LEFT_RIGHT, 9 ; person
-	object SPRITE_SUPER_NERD, 4, 12, STAY, DOWN, 10 ; person
-	object SPRITE_GUARD, 27, 12, STAY, DOWN, 11 ; person
+	def_object_events
+	object_event 20, 2, SPRITE_BLUE, STAY, DOWN, 1 ; person
+	object_event 30, 8, SPRITE_ROCKET, STAY, NONE, 2, OPP_ROCKET, 5
+	object_event 31, 20, SPRITE_COOLTRAINER_M, STAY, DOWN, 3 ; person
+	object_event 15, 18, SPRITE_SUPER_NERD, WALK, UP_DOWN, 4 ; person
+	object_event 9, 21, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 5 ; person
+	object_event 28, 12, SPRITE_GUARD, STAY, DOWN, 6 ; person
+	object_event 29, 26, SPRITE_COOLTRAINER_F, STAY, LEFT, 7 ; person
+	object_event 28, 26, SPRITE_MONSTER, STAY, DOWN, 8 ; person
+	object_event 9, 27, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 9 ; person
+	object_event 4, 12, SPRITE_SUPER_NERD, STAY, DOWN, 10 ; person
+	object_event 27, 12, SPRITE_GUARD, STAY, DOWN, 11 ; person
 
 	def_warps_to CERULEAN_CITY

data/maps/objects/CeruleanGym.asm

@@ -1,16 +1,16 @@
 CeruleanGym_Object:
 	db $3 ; border block
 
-	def_warps
-	warp  4, 13, 3, LAST_MAP
-	warp  5, 13, 3, LAST_MAP
+	def_warp_events
+	warp_event  4, 13, LAST_MAP, 3
+	warp_event  5, 13, LAST_MAP, 3
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_BRUNETTE_GIRL, 4, 2, STAY, DOWN, 1, OPP_MISTY, 1
-	object SPRITE_COOLTRAINER_F, 2, 3, STAY, RIGHT, 2, OPP_JR_TRAINER_F, 1
-	object SPRITE_SWIMMER, 8, 7, STAY, LEFT, 3, OPP_SWIMMER, 1
-	object SPRITE_GYM_GUIDE, 7, 10, STAY, DOWN, 4 ; person
+	def_object_events
+	object_event 4, 2, SPRITE_BRUNETTE_GIRL, STAY, DOWN, 1, OPP_MISTY, 1
+	object_event 2, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_JR_TRAINER_F, 1
+	object_event 8, 7, SPRITE_SWIMMER, STAY, LEFT, 3, OPP_SWIMMER, 1
+	object_event 7, 10, SPRITE_GYM_GUIDE, STAY, DOWN, 4 ; person
 
 	def_warps_to CERULEAN_GYM

data/maps/objects/CeruleanMart.asm

@@ -1,15 +1,15 @@
 CeruleanMart_Object:
 	db $0 ; border block
 
-	def_warps
-	warp  3,  7, 5, LAST_MAP
-	warp  4,  7, 5, LAST_MAP
+	def_warp_events
+	warp_event  3,  7, LAST_MAP, 5
+	warp_event  4,  7, LAST_MAP, 5
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
-	object SPRITE_COOLTRAINER_M, 3, 4, WALK, UP_DOWN, 2 ; person
-	object SPRITE_COOLTRAINER_F, 6, 2, WALK, LEFT_RIGHT, 3 ; person
+	def_object_events
+	object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
+	object_event 3, 4, SPRITE_COOLTRAINER_M, WALK, UP_DOWN, 2 ; person
+	object_event 6, 2, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 3 ; person
 
 	def_warps_to CERULEAN_MART

data/maps/objects/CeruleanPokecenter.asm

@@ -1,16 +1,16 @@
 CeruleanPokecenter_Object:
 	db $0 ; border block
 
-	def_warps
-	warp  3,  7, 2, LAST_MAP
-	warp  4,  7, 2, LAST_MAP
+	def_warp_events
+	warp_event  3,  7, LAST_MAP, 2
+	warp_event  4,  7, LAST_MAP, 2
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
-	object SPRITE_SUPER_NERD, 10, 5, WALK, ANY_DIR, 2 ; person
-	object SPRITE_GENTLEMAN, 4, 3, STAY, DOWN, 3 ; person
-	object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
+	def_object_events
+	object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
+	object_event 10, 5, SPRITE_SUPER_NERD, WALK, ANY_DIR, 2 ; person
+	object_event 4, 3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person
+	object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
 
 	def_warps_to CERULEAN_POKECENTER

data/maps/objects/CeruleanTradeHouse.asm

@@ -1,14 +1,14 @@
 CeruleanTradeHouse_Object:
 	db $a ; border block
 
-	def_warps
-	warp  2,  7, 1, LAST_MAP
-	warp  3,  7, 1, LAST_MAP
+	def_warp_events
+	warp_event  2,  7, LAST_MAP, 1
+	warp_event  3,  7, LAST_MAP, 1
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_GRANNY, 5, 4, STAY, LEFT, 1 ; person
-	object SPRITE_GAMBLER, 1, 2, STAY, NONE, 2 ; person
+	def_object_events
+	object_event 5, 4, SPRITE_GRANNY, STAY, LEFT, 1 ; person
+	object_event 1, 2, SPRITE_GAMBLER, STAY, NONE, 2 ; person
 
 	def_warps_to CERULEAN_TRADE_HOUSE

data/maps/objects/CeruleanTrashedHouse.asm

@@ -1,16 +1,16 @@
 CeruleanTrashedHouse_Object:
 	db $a ; border block
 
-	def_warps
-	warp  2,  7, 0, LAST_MAP
-	warp  3,  7, 0, LAST_MAP
-	warp  3,  0, 7, LAST_MAP
+	def_warp_events
+	warp_event  2,  7, LAST_MAP, 0
+	warp_event  3,  7, LAST_MAP, 0
+	warp_event  3,  0, LAST_MAP, 7
 
-	def_signs
-	sign  3,  0, 3 ; CeruleanHouseTrashedText3
+	def_bg_events
+	bg_event  3,  0, 3 ; CeruleanHouseTrashedText3
 
-	def_objects
-	object SPRITE_FISHING_GURU, 2, 1, STAY, DOWN, 1 ; person
-	object SPRITE_GIRL, 5, 6, WALK, LEFT_RIGHT, 2 ; person
+	def_object_events
+	object_event 2, 1, SPRITE_FISHING_GURU, STAY, DOWN, 1 ; person
+	object_event 5, 6, SPRITE_GIRL, WALK, LEFT_RIGHT, 2 ; person
 
 	def_warps_to CERULEAN_TRASHED_HOUSE

data/maps/objects/ChampionsRoom.asm

@@ -1,16 +1,16 @@
 ChampionsRoom_Object:
 	db $3 ; border block
 
-	def_warps
-	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
+	def_warp_events
+	warp_event  3,  7, LANCES_ROOM, 1
+	warp_event  4,  7, LANCES_ROOM, 2
+	warp_event  3,  0, HALL_OF_FAME, 0
+	warp_event  4,  0, HALL_OF_FAME, 0
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_BLUE, 4, 2, STAY, DOWN, 1 ; person
-	object SPRITE_OAK, 3, 7, STAY, UP, 2 ; person
+	def_object_events
+	object_event 4, 2, SPRITE_BLUE, STAY, DOWN, 1 ; person
+	object_event 3, 7, SPRITE_OAK, STAY, UP, 2 ; person
 
 	def_warps_to CHAMPIONS_ROOM

data/maps/objects/CinnabarGym.asm

@@ -1,21 +1,21 @@
 CinnabarGym_Object:
 	db $2e ; border block
 
-	def_warps
-	warp 16, 17, 1, LAST_MAP
-	warp 17, 17, 1, LAST_MAP
+	def_warp_events
+	warp_event 16, 17, LAST_MAP, 1
+	warp_event 17, 17, LAST_MAP, 1
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_MIDDLE_AGED_MAN, 3, 3, STAY, DOWN, 1, OPP_BLAINE, 1
-	object SPRITE_SUPER_NERD, 17, 2, STAY, DOWN, 2, OPP_SUPER_NERD, 9
-	object SPRITE_SUPER_NERD, 17, 8, STAY, DOWN, 3, OPP_BURGLAR, 4
-	object SPRITE_SUPER_NERD, 11, 4, STAY, DOWN, 4, OPP_SUPER_NERD, 10
-	object SPRITE_SUPER_NERD, 11, 8, STAY, DOWN, 5, OPP_BURGLAR, 5
-	object SPRITE_SUPER_NERD, 11, 14, STAY, DOWN, 6, OPP_SUPER_NERD, 11
-	object SPRITE_SUPER_NERD, 3, 14, STAY, DOWN, 7, OPP_BURGLAR, 6
-	object SPRITE_SUPER_NERD, 3, 8, STAY, DOWN, 8, OPP_SUPER_NERD, 12
-	object SPRITE_GYM_GUIDE, 16, 13, STAY, DOWN, 9 ; person
+	def_object_events
+	object_event 3, 3, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, 1, OPP_BLAINE, 1
+	object_event 17, 2, SPRITE_SUPER_NERD, STAY, DOWN, 2, OPP_SUPER_NERD, 9
+	object_event 17, 8, SPRITE_SUPER_NERD, STAY, DOWN, 3, OPP_BURGLAR, 4
+	object_event 11, 4, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_SUPER_NERD, 10
+	object_event 11, 8, SPRITE_SUPER_NERD, STAY, DOWN, 5, OPP_BURGLAR, 5
+	object_event 11, 14, SPRITE_SUPER_NERD, STAY, DOWN, 6, OPP_SUPER_NERD, 11
+	object_event 3, 14, SPRITE_SUPER_NERD, STAY, DOWN, 7, OPP_BURGLAR, 6
+	object_event 3, 8, SPRITE_SUPER_NERD, STAY, DOWN, 8, OPP_SUPER_NERD, 12
+	object_event 16, 13, SPRITE_GYM_GUIDE, STAY, DOWN, 9 ; person
 
 	def_warps_to CINNABAR_GYM

data/maps/objects/CinnabarIsland.asm

@@ -1,22 +1,22 @@
 CinnabarIsland_Object:
 	db $43 ; border block
 
-	def_warps
-	warp  6,  3, 1, POKEMON_MANSION_1F
-	warp 18,  3, 0, CINNABAR_GYM
-	warp  6,  9, 0, CINNABAR_LAB
-	warp 11, 11, 0, CINNABAR_POKECENTER
-	warp 15, 11, 0, CINNABAR_MART
+	def_warp_events
+	warp_event  6,  3, POKEMON_MANSION_1F, 1
+	warp_event 18,  3, CINNABAR_GYM, 0
+	warp_event  6,  9, CINNABAR_LAB, 0
+	warp_event 11, 11, CINNABAR_POKECENTER, 0
+	warp_event 15, 11, CINNABAR_MART, 0
 
-	def_signs
-	sign  9,  5, 3 ; CinnabarIslandText3
-	sign 16, 11, 4 ; MartSignText
-	sign 12, 11, 5 ; PokeCenterSignText
-	sign  9, 11, 6 ; CinnabarIslandText6
-	sign 13,  3, 7 ; CinnabarIslandText7
+	def_bg_events
+	bg_event  9,  5, 3 ; CinnabarIslandText3
+	bg_event 16, 11, 4 ; MartSignText
+	bg_event 12, 11, 5 ; PokeCenterSignText
+	bg_event  9, 11, 6 ; CinnabarIslandText6
+	bg_event 13,  3, 7 ; CinnabarIslandText7
 
-	def_objects
-	object SPRITE_GIRL, 12, 5, WALK, LEFT_RIGHT, 1 ; person
-	object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person
+	def_object_events
+	object_event 12, 5, SPRITE_GIRL, WALK, LEFT_RIGHT, 1 ; person
+	object_event 14, 6, SPRITE_GAMBLER, STAY, NONE, 2 ; person
 
 	def_warps_to CINNABAR_ISLAND

data/maps/objects/CinnabarLab.asm

@@ -1,20 +1,20 @@
 CinnabarLab_Object:
 	db $17 ; border block
 
-	def_warps
-	warp  2,  7, 2, LAST_MAP
-	warp  3,  7, 2, LAST_MAP
-	warp  8,  4, 0, CINNABAR_LAB_TRADE_ROOM
-	warp 12,  4, 0, CINNABAR_LAB_METRONOME_ROOM
-	warp 16,  4, 0, CINNABAR_LAB_FOSSIL_ROOM
+	def_warp_events
+	warp_event  2,  7, LAST_MAP, 2
+	warp_event  3,  7, LAST_MAP, 2
+	warp_event  8,  4, CINNABAR_LAB_TRADE_ROOM, 0
+	warp_event 12,  4, CINNABAR_LAB_METRONOME_ROOM, 0
+	warp_event 16,  4, CINNABAR_LAB_FOSSIL_ROOM, 0
 
-	def_signs
-	sign  3,  2, 2 ; Lab1Text2
-	sign  9,  4, 3 ; Lab1Text3
-	sign 13,  4, 4 ; Lab1Text4
-	sign 17,  4, 5 ; Lab1Text5
+	def_bg_events
+	bg_event  3,  2, 2 ; Lab1Text2
+	bg_event  9,  4, 3 ; Lab1Text3
+	bg_event 13,  4, 4 ; Lab1Text4
+	bg_event 17,  4, 5 ; Lab1Text5
 
-	def_objects
-	object SPRITE_FISHING_GURU, 1, 3, STAY, NONE, 1 ; person
+	def_object_events
+	object_event 1, 3, SPRITE_FISHING_GURU, STAY, NONE, 1 ; person
 
 	def_warps_to CINNABAR_LAB

data/maps/objects/CinnabarLabFossilRoom.asm

@@ -1,14 +1,14 @@
 CinnabarLabFossilRoom_Object:
 	db $17 ; border block
 
-	def_warps
-	warp  2,  7, 4, CINNABAR_LAB
-	warp  3,  7, 4, CINNABAR_LAB
+	def_warp_events
+	warp_event  2,  7, CINNABAR_LAB, 4
+	warp_event  3,  7, CINNABAR_LAB, 4
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_SCIENTIST, 5, 2, WALK, LEFT_RIGHT, 1 ; person
-	object SPRITE_SCIENTIST, 7, 6, STAY, UP, 2 ; person
+	def_object_events
+	object_event 5, 2, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 1 ; person
+	object_event 7, 6, SPRITE_SCIENTIST, STAY, UP, 2 ; person
 
 	def_warps_to CINNABAR_LAB_FOSSIL_ROOM

data/maps/objects/CinnabarLabMetronomeRoom.asm

@@ -1,17 +1,17 @@
 CinnabarLabMetronomeRoom_Object:
 	db $17 ; border block
 
-	def_warps
-	warp  2,  7, 3, CINNABAR_LAB
-	warp  3,  7, 3, CINNABAR_LAB
+	def_warp_events
+	warp_event  2,  7, CINNABAR_LAB, 3
+	warp_event  3,  7, CINNABAR_LAB, 3
 
-	def_signs
-	sign  0,  4, 3 ; Lab3Text3
-	sign  1,  4, 4 ; Lab3Text4
-	sign  2,  1, 5 ; Lab3Text5
+	def_bg_events
+	bg_event  0,  4, 3 ; Lab3Text3
+	bg_event  1,  4, 4 ; Lab3Text4
+	bg_event  2,  1, 5 ; Lab3Text5
 
-	def_objects
-	object SPRITE_SCIENTIST, 7, 2, STAY, DOWN, 1 ; person
-	object SPRITE_SCIENTIST, 2, 3, WALK, LEFT_RIGHT, 2 ; person
+	def_object_events
+	object_event 7, 2, SPRITE_SCIENTIST, STAY, DOWN, 1 ; person
+	object_event 2, 3, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 2 ; person
 
 	def_warps_to CINNABAR_LAB_METRONOME_ROOM

data/maps/objects/CinnabarLabTradeRoom.asm

@@ -1,15 +1,15 @@
 CinnabarLabTradeRoom_Object:
 	db $17 ; border block
 
-	def_warps
-	warp  2,  7, 2, CINNABAR_LAB
-	warp  3,  7, 2, CINNABAR_LAB
+	def_warp_events
+	warp_event  2,  7, CINNABAR_LAB, 2
+	warp_event  3,  7, CINNABAR_LAB, 2
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_SUPER_NERD, 3, 2, STAY, DOWN, 1 ; person
-	object SPRITE_GRAMPS, 1, 4, STAY, NONE, 2 ; person
-	object SPRITE_BEAUTY, 5, 5, STAY, UP, 3 ; person
+	def_object_events
+	object_event 3, 2, SPRITE_SUPER_NERD, STAY, DOWN, 1 ; person
+	object_event 1, 4, SPRITE_GRAMPS, STAY, NONE, 2 ; person
+	object_event 5, 5, SPRITE_BEAUTY, STAY, UP, 3 ; person
 
 	def_warps_to CINNABAR_LAB_TRADE_ROOM

data/maps/objects/CinnabarMart.asm

@@ -1,15 +1,15 @@
 CinnabarMart_Object:
 	db $0 ; border block
 
-	def_warps
-	warp  3,  7, 4, LAST_MAP
-	warp  4,  7, 4, LAST_MAP
+	def_warp_events
+	warp_event  3,  7, LAST_MAP, 4
+	warp_event  4,  7, LAST_MAP, 4
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
-	object SPRITE_ERIKA, 6, 2, STAY, NONE, 2 ; person
-	object SPRITE_SCIENTIST, 3, 4, STAY, NONE, 3 ; person
+	def_object_events
+	object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
+	object_event 6, 2, SPRITE_ERIKA, STAY, NONE, 2 ; person
+	object_event 3, 4, SPRITE_SCIENTIST, STAY, NONE, 3 ; person
 
 	def_warps_to CINNABAR_MART

data/maps/objects/CinnabarPokecenter.asm

@@ -1,16 +1,16 @@
 CinnabarPokecenter_Object:
 	db $0 ; border block
 
-	def_warps
-	warp  3,  7, 3, LAST_MAP
-	warp  4,  7, 3, LAST_MAP
+	def_warp_events
+	warp_event  3,  7, LAST_MAP, 3
+	warp_event  4,  7, LAST_MAP, 3
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
-	object SPRITE_COOLTRAINER_F, 9, 4, WALK, ANY_DIR, 2 ; person
-	object SPRITE_GENTLEMAN, 2, 6, STAY, NONE, 3 ; person
-	object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
+	def_object_events
+	object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
+	object_event 9, 4, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, 2 ; person
+	object_event 2, 6, SPRITE_GENTLEMAN, STAY, NONE, 3 ; person
+	object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
 
 	def_warps_to CINNABAR_POKECENTER

data/maps/objects/Colosseum.asm

@@ -1,11 +1,11 @@
 Colosseum_Object:
 	db $e ; border block
 
-	def_warps
+	def_warp_events
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_RED, 2, 2, STAY, 0, 1 ; person
+	def_object_events
+	object_event 2, 2, SPRITE_RED, STAY, 0, 1 ; person
 
 	def_warps_to COLOSSEUM

data/maps/objects/CopycatsHouse1F.asm

@@ -1,16 +1,16 @@
 CopycatsHouse1F_Object:
 	db $a ; border block
 
-	def_warps
-	warp  2,  7, 0, LAST_MAP
-	warp  3,  7, 0, LAST_MAP
-	warp  7,  1, 0, COPYCATS_HOUSE_2F
+	def_warp_events
+	warp_event  2,  7, LAST_MAP, 0
+	warp_event  3,  7, LAST_MAP, 0
+	warp_event  7,  1, COPYCATS_HOUSE_2F, 0
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_MIDDLE_AGED_WOMAN, 2, 2, STAY, DOWN, 1 ; person
-	object SPRITE_MIDDLE_AGED_MAN, 5, 4, STAY, LEFT, 2 ; person
-	object SPRITE_FAIRY, 1, 4, WALK, UP_DOWN, 3 ; person
+	def_object_events
+	object_event 2, 2, SPRITE_MIDDLE_AGED_WOMAN, STAY, DOWN, 1 ; person
+	object_event 5, 4, SPRITE_MIDDLE_AGED_MAN, STAY, LEFT, 2 ; person
+	object_event 1, 4, SPRITE_FAIRY, WALK, UP_DOWN, 3 ; person
 
 	def_warps_to COPYCATS_HOUSE_1F

data/maps/objects/CopycatsHouse2F.asm

@@ -1,18 +1,18 @@
 CopycatsHouse2F_Object:
 	db $a ; border block
 
-	def_warps
-	warp  7,  1, 2, COPYCATS_HOUSE_1F
+	def_warp_events
+	warp_event  7,  1, COPYCATS_HOUSE_1F, 2
 
-	def_signs
-	sign  3,  5, 6 ; CopycatsHouse2FText6
-	sign  0,  1, 7 ; CopycatsHouse2FText7
+	def_bg_events
+	bg_event  3,  5, 6 ; CopycatsHouse2FText6
+	bg_event  0,  1, 7 ; CopycatsHouse2FText7
 
-	def_objects
-	object SPRITE_BRUNETTE_GIRL, 4, 3, WALK, ANY_DIR, 1 ; person
-	object SPRITE_BIRD, 4, 6, WALK, LEFT_RIGHT, 2 ; person
-	object SPRITE_MONSTER, 5, 1, STAY, DOWN, 3 ; person
-	object SPRITE_BIRD, 2, 0, STAY, DOWN, 4 ; person
-	object SPRITE_FAIRY, 1, 6, STAY, RIGHT, 5 ; person
+	def_object_events
+	object_event 4, 3, SPRITE_BRUNETTE_GIRL, WALK, ANY_DIR, 1 ; person
+	object_event 4, 6, SPRITE_BIRD, WALK, LEFT_RIGHT, 2 ; person
+	object_event 5, 1, SPRITE_MONSTER, STAY, DOWN, 3 ; person
+	object_event 2, 0, SPRITE_BIRD, STAY, DOWN, 4 ; person
+	object_event 1, 6, SPRITE_FAIRY, STAY, RIGHT, 5 ; person
 
 	def_warps_to COPYCATS_HOUSE_2F

data/maps/objects/Daycare.asm

@@ -1,13 +1,13 @@
 Daycare_Object:
 	db $a ; border block
 
-	def_warps
-	warp  2,  7, 4, LAST_MAP
-	warp  3,  7, 4, LAST_MAP
+	def_warp_events
+	warp_event  2,  7, LAST_MAP, 4
+	warp_event  3,  7, LAST_MAP, 4
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_GENTLEMAN, 2, 3, STAY, RIGHT, 1 ; person
+	def_object_events
+	object_event 2, 3, SPRITE_GENTLEMAN, STAY, RIGHT, 1 ; person
 
 	def_warps_to DAYCARE

data/maps/objects/DiglettsCave.asm

@@ -1,12 +1,12 @@
 DiglettsCave_Object:
 	db $19 ; border block
 
-	def_warps
-	warp  5,  5, 2, DIGLETTS_CAVE_ROUTE_2
-	warp 37, 31, 2, DIGLETTS_CAVE_ROUTE_11
+	def_warp_events
+	warp_event  5,  5, DIGLETTS_CAVE_ROUTE_2, 2
+	warp_event 37, 31, DIGLETTS_CAVE_ROUTE_11, 2
 
-	def_signs
+	def_bg_events
 
-	def_objects
+	def_object_events
 
 	def_warps_to DIGLETTS_CAVE

data/maps/objects/DiglettsCaveRoute11.asm

@@ -1,14 +1,14 @@
 DiglettsCaveRoute11_Object:
 	db $7d ; border block
 
-	def_warps
-	warp  2,  7, 4, LAST_MAP
-	warp  3,  7, 4, LAST_MAP
-	warp  4,  4, 1, DIGLETTS_CAVE
+	def_warp_events
+	warp_event  2,  7, LAST_MAP, 4
+	warp_event  3,  7, LAST_MAP, 4
+	warp_event  4,  4, DIGLETTS_CAVE, 1
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_GAMBLER, 2, 3, STAY, NONE, 1 ; person
+	def_object_events
+	object_event 2, 3, SPRITE_GAMBLER, STAY, NONE, 1 ; person
 
 	def_warps_to DIGLETTS_CAVE_ROUTE_11

data/maps/objects/DiglettsCaveRoute2.asm

@@ -1,14 +1,14 @@
 DiglettsCaveRoute2_Object:
 	db $7d ; border block
 
-	def_warps
-	warp  2,  7, 0, LAST_MAP
-	warp  3,  7, 0, LAST_MAP
-	warp  4,  4, 0, DIGLETTS_CAVE
+	def_warp_events
+	warp_event  2,  7, LAST_MAP, 0
+	warp_event  3,  7, LAST_MAP, 0
+	warp_event  4,  4, DIGLETTS_CAVE, 0
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_FISHING_GURU, 3, 3, STAY, NONE, 1 ; person
+	def_object_events
+	object_event 3, 3, SPRITE_FISHING_GURU, STAY, NONE, 1 ; person
 
 	def_warps_to DIGLETTS_CAVE_ROUTE_2

data/maps/objects/FightingDojo.asm

@@ -1,19 +1,19 @@
 FightingDojo_Object:
 	db $3 ; border block
 
-	def_warps
-	warp  4, 11, 1, LAST_MAP
-	warp  5, 11, 1, LAST_MAP
+	def_warp_events
+	warp_event  4, 11, LAST_MAP, 1
+	warp_event  5, 11, LAST_MAP, 1
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_HIKER, 5, 3, STAY, DOWN, 1, OPP_BLACKBELT, 1
-	object SPRITE_HIKER, 3, 4, STAY, RIGHT, 2, OPP_BLACKBELT, 2
-	object SPRITE_HIKER, 3, 6, STAY, RIGHT, 3, OPP_BLACKBELT, 3
-	object SPRITE_HIKER, 5, 5, STAY, LEFT, 4, OPP_BLACKBELT, 4
-	object SPRITE_HIKER, 5, 7, STAY, LEFT, 5, OPP_BLACKBELT, 5
-	object SPRITE_POKE_BALL, 4, 1, STAY, NONE, 6 ; person
-	object SPRITE_POKE_BALL, 5, 1, STAY, NONE, 7 ; person
+	def_object_events
+	object_event 5, 3, SPRITE_HIKER, STAY, DOWN, 1, OPP_BLACKBELT, 1
+	object_event 3, 4, SPRITE_HIKER, STAY, RIGHT, 2, OPP_BLACKBELT, 2
+	object_event 3, 6, SPRITE_HIKER, STAY, RIGHT, 3, OPP_BLACKBELT, 3
+	object_event 5, 5, SPRITE_HIKER, STAY, LEFT, 4, OPP_BLACKBELT, 4
+	object_event 5, 7, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 5
+	object_event 4, 1, SPRITE_POKE_BALL, STAY, NONE, 6 ; person
+	object_event 5, 1, SPRITE_POKE_BALL, STAY, NONE, 7 ; person
 
 	def_warps_to FIGHTING_DOJO

data/maps/objects/FuchsiaBillsGrandpasHouse.asm

@@ -1,15 +1,15 @@
 FuchsiaBillsGrandpasHouse_Object:
 	db $a ; border block
 
-	def_warps
-	warp  2,  7, 1, LAST_MAP
-	warp  3,  7, 1, LAST_MAP
+	def_warp_events
+	warp_event  2,  7, LAST_MAP, 1
+	warp_event  3,  7, LAST_MAP, 1
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_MIDDLE_AGED_WOMAN, 2, 3, STAY, RIGHT, 1 ; person
-	object SPRITE_GAMBLER, 7, 2, STAY, UP, 2 ; person
-	object SPRITE_YOUNGSTER, 5, 5, STAY, NONE, 3 ; person
+	def_object_events
+	object_event 2, 3, SPRITE_MIDDLE_AGED_WOMAN, STAY, RIGHT, 1 ; person
+	object_event 7, 2, SPRITE_GAMBLER, STAY, UP, 2 ; person
+	object_event 5, 5, SPRITE_YOUNGSTER, STAY, NONE, 3 ; person
 
 	def_warps_to FUCHSIA_BILLS_GRANDPAS_HOUSE

data/maps/objects/FuchsiaCity.asm

@@ -1,43 +1,43 @@
 FuchsiaCity_Object:
 	db $f ; border block
 
-	def_warps
-	warp  5, 13, 0, FUCHSIA_MART
-	warp 11, 27, 0, FUCHSIA_BILLS_GRANDPAS_HOUSE
-	warp 19, 27, 0, FUCHSIA_POKECENTER
-	warp 27, 27, 0, WARDENS_HOUSE
-	warp 18,  3, 0, SAFARI_ZONE_GATE
-	warp  5, 27, 0, FUCHSIA_GYM
-	warp 22, 13, 0, FUCHSIA_MEETING_ROOM
-	warp 31, 27, 1, FUCHSIA_GOOD_ROD_HOUSE
-	warp 31, 24, 0, FUCHSIA_GOOD_ROD_HOUSE
+	def_warp_events
+	warp_event  5, 13, FUCHSIA_MART, 0
+	warp_event 11, 27, FUCHSIA_BILLS_GRANDPAS_HOUSE, 0
+	warp_event 19, 27, FUCHSIA_POKECENTER, 0
+	warp_event 27, 27, WARDENS_HOUSE, 0
+	warp_event 18,  3, SAFARI_ZONE_GATE, 0
+	warp_event  5, 27, FUCHSIA_GYM, 0
+	warp_event 22, 13, FUCHSIA_MEETING_ROOM, 0
+	warp_event 31, 27, FUCHSIA_GOOD_ROD_HOUSE, 1
+	warp_event 31, 24, FUCHSIA_GOOD_ROD_HOUSE, 0
 
-	def_signs
-	sign 15, 23, 11 ; FuchsiaCityText11
-	sign 25, 15, 12 ; FuchsiaCityText12
-	sign 17,  5, 13 ; FuchsiaCityText13
-	sign  6, 13, 14 ; MartSignText
-	sign 20, 27, 15 ; PokeCenterSignText
-	sign 27, 29, 16 ; FuchsiaCityText16
-	sign 21, 15, 17 ; FuchsiaCityText17
-	sign  5, 29, 18 ; FuchsiaCityText18
-	sign 33,  7, 19 ; FuchsiaCityText19
-	sign 27,  7, 20 ; FuchsiaCityText20
-	sign 13,  7, 21 ; FuchsiaCityText21
-	sign 31, 13, 22 ; FuchsiaCityText22
-	sign 13, 15, 23 ; FuchsiaCityText23
-	sign  7,  7, 24 ; FuchsiaCityText24
+	def_bg_events
+	bg_event 15, 23, 11 ; FuchsiaCityText11
+	bg_event 25, 15, 12 ; FuchsiaCityText12
+	bg_event 17,  5, 13 ; FuchsiaCityText13
+	bg_event  6, 13, 14 ; MartSignText
+	bg_event 20, 27, 15 ; PokeCenterSignText
+	bg_event 27, 29, 16 ; FuchsiaCityText16
+	bg_event 21, 15, 17 ; FuchsiaCityText17
+	bg_event  5, 29, 18 ; FuchsiaCityText18
+	bg_event 33,  7, 19 ; FuchsiaCityText19
+	bg_event 27,  7, 20 ; FuchsiaCityText20
+	bg_event 13,  7, 21 ; FuchsiaCityText21
+	bg_event 31, 13, 22 ; FuchsiaCityText22
+	bg_event 13, 15, 23 ; FuchsiaCityText23
+	bg_event  7,  7, 24 ; FuchsiaCityText24
 
-	def_objects
-	object SPRITE_YOUNGSTER, 10, 12, WALK, LEFT_RIGHT, 1 ; person
-	object SPRITE_GAMBLER, 28, 17, WALK, LEFT_RIGHT, 2 ; person
-	object SPRITE_FISHER, 30, 14, STAY, DOWN, 3 ; person
-	object SPRITE_YOUNGSTER, 24, 8, STAY, UP, 4 ; person
-	object SPRITE_FAIRY, 31, 5, WALK, ANY_DIR, 5 ; person
-	object SPRITE_POKE_BALL, 25, 6, STAY, NONE, 6 ; person
-	object SPRITE_MONSTER, 12, 6, WALK, LEFT_RIGHT, 7 ; person
-	object SPRITE_MONSTER, 30, 12, WALK, LEFT_RIGHT, 8 ; person
-	object SPRITE_SEEL, 8, 17, WALK, ANY_DIR, 9 ; person
-	object SPRITE_FOSSIL, 6, 5, STAY, NONE, 10 ; person
+	def_object_events
+	object_event 10, 12, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person
+	object_event 28, 17, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 2 ; person
+	object_event 30, 14, SPRITE_FISHER, STAY, DOWN, 3 ; person
+	object_event 24, 8, SPRITE_YOUNGSTER, STAY, UP, 4 ; person
+	object_event 31, 5, SPRITE_FAIRY, WALK, ANY_DIR, 5 ; person
+	object_event 25, 6, SPRITE_POKE_BALL, STAY, NONE, 6 ; person
+	object_event 12, 6, SPRITE_MONSTER, WALK, LEFT_RIGHT, 7 ; person
+	object_event 30, 12, SPRITE_MONSTER, WALK, LEFT_RIGHT, 8 ; person
+	object_event 8, 17, SPRITE_SEEL, WALK, ANY_DIR, 9 ; person
+	object_event 6, 5, SPRITE_FOSSIL, STAY, NONE, 10 ; person
 
 	def_warps_to FUCHSIA_CITY

data/maps/objects/FuchsiaGoodRodHouse.asm

@@ -1,14 +1,14 @@
 FuchsiaGoodRodHouse_Object:
 	db $c ; border block
 
-	def_warps
-	warp  2,  0, 8, LAST_MAP
-	warp  2,  7, 7, LAST_MAP
-	warp  3,  7, 7, LAST_MAP
+	def_warp_events
+	warp_event  2,  0, LAST_MAP, 8
+	warp_event  2,  7, LAST_MAP, 7
+	warp_event  3,  7, LAST_MAP, 7
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_FISHING_GURU, 5, 3, STAY, RIGHT, 1 ; person
+	def_object_events
+	object_event 5, 3, SPRITE_FISHING_GURU, STAY, RIGHT, 1 ; person
 
 	def_warps_to FUCHSIA_GOOD_ROD_HOUSE

data/maps/objects/FuchsiaGym.asm

@@ -1,20 +1,20 @@
 FuchsiaGym_Object:
 	db $3 ; border block
 
-	def_warps
-	warp  4, 17, 5, LAST_MAP
-	warp  5, 17, 5, LAST_MAP
+	def_warp_events
+	warp_event  4, 17, LAST_MAP, 5
+	warp_event  5, 17, LAST_MAP, 5
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_KOGA, 4, 10, STAY, DOWN, 1, OPP_KOGA, 1
-	object SPRITE_ROCKER, 8, 13, STAY, DOWN, 2, OPP_JUGGLER, 7
-	object SPRITE_ROCKER, 7, 8, STAY, RIGHT, 3, OPP_JUGGLER, 3
-	object SPRITE_ROCKER, 1, 12, STAY, DOWN, 4, OPP_JUGGLER, 8
-	object SPRITE_ROCKER, 3, 5, STAY, UP, 5, OPP_TAMER, 1
-	object SPRITE_ROCKER, 8, 2, STAY, DOWN, 6, OPP_TAMER, 2
-	object SPRITE_ROCKER, 2, 7, STAY, LEFT, 7, OPP_JUGGLER, 4
-	object SPRITE_GYM_GUIDE, 7, 15, STAY, DOWN, 8 ; person
+	def_object_events
+	object_event 4, 10, SPRITE_KOGA, STAY, DOWN, 1, OPP_KOGA, 1
+	object_event 8, 13, SPRITE_ROCKER, STAY, DOWN, 2, OPP_JUGGLER, 7
+	object_event 7, 8, SPRITE_ROCKER, STAY, RIGHT, 3, OPP_JUGGLER, 3
+	object_event 1, 12, SPRITE_ROCKER, STAY, DOWN, 4, OPP_JUGGLER, 8
+	object_event 3, 5, SPRITE_ROCKER, STAY, UP, 5, OPP_TAMER, 1
+	object_event 8, 2, SPRITE_ROCKER, STAY, DOWN, 6, OPP_TAMER, 2
+	object_event 2, 7, SPRITE_ROCKER, STAY, LEFT, 7, OPP_JUGGLER, 4
+	object_event 7, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 8 ; person
 
 	def_warps_to FUCHSIA_GYM

data/maps/objects/FuchsiaMart.asm

@@ -1,15 +1,15 @@
 FuchsiaMart_Object:
 	db $0 ; border block
 
-	def_warps
-	warp  3,  7, 0, LAST_MAP
-	warp  4,  7, 0, LAST_MAP
+	def_warp_events
+	warp_event  3,  7, LAST_MAP, 0
+	warp_event  4,  7, LAST_MAP, 0
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
-	object SPRITE_MIDDLE_AGED_MAN, 4, 2, STAY, NONE, 2 ; person
-	object SPRITE_COOLTRAINER_F, 6, 5, WALK, UP_DOWN, 3 ; person
+	def_object_events
+	object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
+	object_event 4, 2, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 2 ; person
+	object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, UP_DOWN, 3 ; person
 
 	def_warps_to FUCHSIA_MART

data/maps/objects/FuchsiaMeetingRoom.asm

@@ -1,15 +1,15 @@
 FuchsiaMeetingRoom_Object:
 	db $17 ; border block
 
-	def_warps
-	warp  4,  7, 6, LAST_MAP
-	warp  5,  7, 6, LAST_MAP
+	def_warp_events
+	warp_event  4,  7, LAST_MAP, 6
+	warp_event  5,  7, LAST_MAP, 6
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_SAFARI_ZONE_WORKER, 4, 1, STAY, DOWN, 1 ; person
-	object SPRITE_SAFARI_ZONE_WORKER, 0, 2, STAY, UP, 2 ; person
-	object SPRITE_SAFARI_ZONE_WORKER, 10, 1, STAY, DOWN, 3 ; person
+	def_object_events
+	object_event 4, 1, SPRITE_SAFARI_ZONE_WORKER, STAY, DOWN, 1 ; person
+	object_event 0, 2, SPRITE_SAFARI_ZONE_WORKER, STAY, UP, 2 ; person
+	object_event 10, 1, SPRITE_SAFARI_ZONE_WORKER, STAY, DOWN, 3 ; person
 
 	def_warps_to FUCHSIA_MEETING_ROOM

data/maps/objects/FuchsiaPokecenter.asm

@@ -1,16 +1,16 @@
 FuchsiaPokecenter_Object:
 	db $0 ; border block
 
-	def_warps
-	warp  3,  7, 2, LAST_MAP
-	warp  4,  7, 2, LAST_MAP
+	def_warp_events
+	warp_event  3,  7, LAST_MAP, 2
+	warp_event  4,  7, LAST_MAP, 2
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
-	object SPRITE_ROCKER, 2, 3, STAY, NONE, 2 ; person
-	object SPRITE_COOLTRAINER_F, 6, 5, WALK, LEFT_RIGHT, 3 ; person
-	object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
+	def_object_events
+	object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
+	object_event 2, 3, SPRITE_ROCKER, STAY, NONE, 2 ; person
+	object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 3 ; person
+	object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
 
 	def_warps_to FUCHSIA_POKECENTER

data/maps/objects/GameCorner.asm

@@ -1,25 +1,25 @@
 GameCorner_Object:
 	db $f ; border block
 
-	def_warps
-	warp 15, 17, 7, LAST_MAP
-	warp 16, 17, 7, LAST_MAP
-	warp 17,  4, 1, ROCKET_HIDEOUT_B1F
+	def_warp_events
+	warp_event 15, 17, LAST_MAP, 7
+	warp_event 16, 17, LAST_MAP, 7
+	warp_event 17,  4, ROCKET_HIDEOUT_B1F, 1
 
-	def_signs
-	sign  9,  4, 12 ; CeladonGameCornerText12
+	def_bg_events
+	bg_event  9,  4, 12 ; CeladonGameCornerText12
 
-	def_objects
-	object SPRITE_BEAUTY, 2, 6, STAY, DOWN, 1 ; person
-	object SPRITE_CLERK, 5, 6, STAY, DOWN, 2 ; person
-	object SPRITE_MIDDLE_AGED_MAN, 2, 10, STAY, LEFT, 3 ; person
-	object SPRITE_BEAUTY, 2, 13, STAY, LEFT, 4 ; person
-	object SPRITE_FISHING_GURU, 5, 11, STAY, RIGHT, 5 ; person
-	object SPRITE_MIDDLE_AGED_WOMAN, 8, 11, STAY, LEFT, 6 ; person
-	object SPRITE_GYM_GUIDE, 8, 14, STAY, LEFT, 7 ; person
-	object SPRITE_GAMBLER, 11, 15, STAY, RIGHT, 8 ; person
-	object SPRITE_CLERK, 14, 11, STAY, LEFT, 9 ; person
-	object SPRITE_GENTLEMAN, 17, 13, STAY, RIGHT, 10 ; person
-	object SPRITE_ROCKET, 9, 5, STAY, UP, 11, OPP_ROCKET, 7
+	def_object_events
+	object_event 2, 6, SPRITE_BEAUTY, STAY, DOWN, 1 ; person
+	object_event 5, 6, SPRITE_CLERK, STAY, DOWN, 2 ; person
+	object_event 2, 10, SPRITE_MIDDLE_AGED_MAN, STAY, LEFT, 3 ; person
+	object_event 2, 13, SPRITE_BEAUTY, STAY, LEFT, 4 ; person
+	object_event 5, 11, SPRITE_FISHING_GURU, STAY, RIGHT, 5 ; person
+	object_event 8, 11, SPRITE_MIDDLE_AGED_WOMAN, STAY, LEFT, 6 ; person
+	object_event 8, 14, SPRITE_GYM_GUIDE, STAY, LEFT, 7 ; person
+	object_event 11, 15, SPRITE_GAMBLER, STAY, RIGHT, 8 ; person
+	object_event 14, 11, SPRITE_CLERK, STAY, LEFT, 9 ; person
+	object_event 17, 13, SPRITE_GENTLEMAN, STAY, RIGHT, 10 ; person
+	object_event 9, 5, SPRITE_ROCKET, STAY, UP, 11, OPP_ROCKET, 7
 
 	def_warps_to GAME_CORNER

data/maps/objects/GameCornerPrizeRoom.asm

@@ -1,17 +1,17 @@
 GameCornerPrizeRoom_Object:
 	db $f ; border block
 
-	def_warps
-	warp  4,  7, 9, LAST_MAP
-	warp  5,  7, 9, LAST_MAP
+	def_warp_events
+	warp_event  4,  7, LAST_MAP, 9
+	warp_event  5,  7, LAST_MAP, 9
 
-	def_signs
-	sign  2,  2, 3 ; CeladonPrizeRoomText3
-	sign  4,  2, 4 ; CeladonPrizeRoomText4
-	sign  6,  2, 5 ; CeladonPrizeRoomText5
+	def_bg_events
+	bg_event  2,  2, 3 ; CeladonPrizeRoomText3
+	bg_event  4,  2, 4 ; CeladonPrizeRoomText4
+	bg_event  6,  2, 5 ; CeladonPrizeRoomText5
 
-	def_objects
-	object SPRITE_BALDING_GUY, 1, 4, STAY, NONE, 1 ; person
-	object SPRITE_GAMBLER, 7, 3, WALK, LEFT_RIGHT, 2 ; person
+	def_object_events
+	object_event 1, 4, SPRITE_BALDING_GUY, STAY, NONE, 1 ; person
+	object_event 7, 3, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 2 ; person
 
 	def_warps_to GAME_CORNER_PRIZE_ROOM

data/maps/objects/HallOfFame.asm

@@ -1,13 +1,13 @@
 HallOfFame_Object:
 	db $3 ; border block
 
-	def_warps
-	warp  4,  7, 2, CHAMPIONS_ROOM
-	warp  5,  7, 3, CHAMPIONS_ROOM
+	def_warp_events
+	warp_event  4,  7, CHAMPIONS_ROOM, 2
+	warp_event  5,  7, CHAMPIONS_ROOM, 3
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_OAK, 5, 2, STAY, DOWN, 1 ; person
+	def_object_events
+	object_event 5, 2, SPRITE_OAK, STAY, DOWN, 1 ; person
 
 	def_warps_to HALL_OF_FAME

data/maps/objects/IndigoPlateau.asm

@@ -1,12 +1,12 @@
 IndigoPlateau_Object:
 	db $e ; border block
 
-	def_warps
-	warp  9,  5, 0, INDIGO_PLATEAU_LOBBY
-	warp 10,  5, 0, INDIGO_PLATEAU_LOBBY
+	def_warp_events
+	warp_event  9,  5, INDIGO_PLATEAU_LOBBY, 0
+	warp_event 10,  5, INDIGO_PLATEAU_LOBBY, 0
 
-	def_signs
+	def_bg_events
 
-	def_objects
+	def_object_events
 
 	def_warps_to INDIGO_PLATEAU

data/maps/objects/IndigoPlateauLobby.asm

@@ -1,18 +1,18 @@
 IndigoPlateauLobby_Object:
 	db $0 ; border block
 
-	def_warps
-	warp  7, 11, 0, LAST_MAP
-	warp  8, 11, 1, LAST_MAP
-	warp  8,  0, 0, LORELEIS_ROOM
+	def_warp_events
+	warp_event  7, 11, LAST_MAP, 0
+	warp_event  8, 11, LAST_MAP, 1
+	warp_event  8,  0, LORELEIS_ROOM, 0
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_NURSE, 7, 5, STAY, DOWN, 1 ; person
-	object SPRITE_GYM_GUIDE, 4, 9, STAY, RIGHT, 2 ; person
-	object SPRITE_COOLTRAINER_F, 5, 1, STAY, DOWN, 3 ; person
-	object SPRITE_CLERK, 0, 5, STAY, RIGHT, 4 ; person
-	object SPRITE_LINK_RECEPTIONIST, 13, 6, STAY, DOWN, 5 ; person
+	def_object_events
+	object_event 7, 5, SPRITE_NURSE, STAY, DOWN, 1 ; person
+	object_event 4, 9, SPRITE_GYM_GUIDE, STAY, RIGHT, 2 ; person
+	object_event 5, 1, SPRITE_COOLTRAINER_F, STAY, DOWN, 3 ; person
+	object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 4 ; person
+	object_event 13, 6, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 5 ; person
 
 	def_warps_to INDIGO_PLATEAU_LOBBY

data/maps/objects/LancesRoom.asm

@@ -1,14 +1,14 @@
 LancesRoom_Object:
 	db $3 ; border block
 
-	def_warps
-	warp 24, 16, 2, AGATHAS_ROOM
-	warp  5,  0, 0, CHAMPIONS_ROOM
-	warp  6,  0, 0, CHAMPIONS_ROOM
+	def_warp_events
+	warp_event 24, 16, AGATHAS_ROOM, 2
+	warp_event  5,  0, CHAMPIONS_ROOM, 0
+	warp_event  6,  0, CHAMPIONS_ROOM, 0
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_LANCE, 6, 1, STAY, DOWN, 1, OPP_LANCE, 1
+	def_object_events
+	object_event 6, 1, SPRITE_LANCE, STAY, DOWN, 1, OPP_LANCE, 1
 
 	def_warps_to LANCES_ROOM

data/maps/objects/LavenderCuboneHouse.asm

@@ -1,14 +1,14 @@
 LavenderCuboneHouse_Object:
 	db $a ; border block
 
-	def_warps
-	warp  2,  7, 4, LAST_MAP
-	warp  3,  7, 4, LAST_MAP
+	def_warp_events
+	warp_event  2,  7, LAST_MAP, 4
+	warp_event  3,  7, LAST_MAP, 4
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_MONSTER, 3, 5, STAY, UP, 1 ; person
-	object SPRITE_BRUNETTE_GIRL, 2, 4, STAY, RIGHT, 2 ; person
+	def_object_events
+	object_event 3, 5, SPRITE_MONSTER, STAY, UP, 1 ; person
+	object_event 2, 4, SPRITE_BRUNETTE_GIRL, STAY, RIGHT, 2 ; person
 
 	def_warps_to LAVENDER_CUBONE_HOUSE

data/maps/objects/LavenderMart.asm

@@ -1,15 +1,15 @@
 LavenderMart_Object:
 	db $0 ; border block
 
-	def_warps
-	warp  3,  7, 3, LAST_MAP
-	warp  4,  7, 3, LAST_MAP
+	def_warp_events
+	warp_event  3,  7, LAST_MAP, 3
+	warp_event  4,  7, LAST_MAP, 3
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
-	object SPRITE_BALDING_GUY, 3, 4, STAY, NONE, 2 ; person
-	object SPRITE_COOLTRAINER_M, 7, 2, STAY, NONE, 3 ; person
+	def_object_events
+	object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
+	object_event 3, 4, SPRITE_BALDING_GUY, STAY, NONE, 2 ; person
+	object_event 7, 2, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person
 
 	def_warps_to LAVENDER_MART

data/maps/objects/LavenderPokecenter.asm

@@ -1,16 +1,16 @@
 LavenderPokecenter_Object:
 	db $0 ; border block
 
-	def_warps
-	warp  3,  7, 0, LAST_MAP
-	warp  4,  7, 0, LAST_MAP
+	def_warp_events
+	warp_event  3,  7, LAST_MAP, 0
+	warp_event  4,  7, LAST_MAP, 0
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
-	object SPRITE_GENTLEMAN, 5, 3, STAY, NONE, 2 ; person
-	object SPRITE_LITTLE_GIRL, 2, 6, WALK, UP_DOWN, 3 ; person
-	object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
+	def_object_events
+	object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
+	object_event 5, 3, SPRITE_GENTLEMAN, STAY, NONE, 2 ; person
+	object_event 2, 6, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 3 ; person
+	object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
 
 	def_warps_to LAVENDER_POKECENTER

data/maps/objects/LavenderTown.asm

@@ -1,25 +1,25 @@
 LavenderTown_Object:
 	db $2c ; border block
 
-	def_warps
-	warp  3,  5, 0, LAVENDER_POKECENTER
-	warp 14,  5, 0, POKEMON_TOWER_1F
-	warp  7,  9, 0, MR_FUJIS_HOUSE
-	warp 15, 13, 0, LAVENDER_MART
-	warp  3, 13, 0, LAVENDER_CUBONE_HOUSE
-	warp  7, 13, 0, NAME_RATERS_HOUSE
+	def_warp_events
+	warp_event  3,  5, LAVENDER_POKECENTER, 0
+	warp_event 14,  5, POKEMON_TOWER_1F, 0
+	warp_event  7,  9, MR_FUJIS_HOUSE, 0
+	warp_event 15, 13, LAVENDER_MART, 0
+	warp_event  3, 13, LAVENDER_CUBONE_HOUSE, 0
+	warp_event  7, 13, NAME_RATERS_HOUSE, 0
 
-	def_signs
-	sign 11,  9, 4 ; LavenderTownText4
-	sign  9,  3, 5 ; LavenderTownText5
-	sign 16, 13, 6 ; MartSignText
-	sign  4,  5, 7 ; PokeCenterSignText
-	sign  5,  9, 8 ; LavenderTownText8
-	sign 17,  7, 9 ; LavenderTownText9
+	def_bg_events
+	bg_event 11,  9, 4 ; LavenderTownText4
+	bg_event  9,  3, 5 ; LavenderTownText5
+	bg_event 16, 13, 6 ; MartSignText
+	bg_event  4,  5, 7 ; PokeCenterSignText
+	bg_event  5,  9, 8 ; LavenderTownText8
+	bg_event 17,  7, 9 ; LavenderTownText9
 
-	def_objects
-	object SPRITE_LITTLE_GIRL, 15, 9, WALK, ANY_DIR, 1 ; person
-	object SPRITE_COOLTRAINER_M, 9, 10, STAY, NONE, 2 ; person
-	object SPRITE_SUPER_NERD, 8, 7, WALK, LEFT_RIGHT, 3 ; person
+	def_object_events
+	object_event 15, 9, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 1 ; person
+	object_event 9, 10, SPRITE_COOLTRAINER_M, STAY, NONE, 2 ; person
+	object_event 8, 7, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 3 ; person
 
 	def_warps_to LAVENDER_TOWN

data/maps/objects/LoreleisRoom.asm

@@ -1,15 +1,15 @@
 LoreleisRoom_Object:
 	db $3 ; border block
 
-	def_warps
-	warp  4, 11, 2, INDIGO_PLATEAU_LOBBY
-	warp  5, 11, 2, INDIGO_PLATEAU_LOBBY
-	warp  4,  0, 0, BRUNOS_ROOM
-	warp  5,  0, 1, BRUNOS_ROOM
+	def_warp_events
+	warp_event  4, 11, INDIGO_PLATEAU_LOBBY, 2
+	warp_event  5, 11, INDIGO_PLATEAU_LOBBY, 2
+	warp_event  4,  0, BRUNOS_ROOM, 0
+	warp_event  5,  0, BRUNOS_ROOM, 1
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_LORELEI, 5, 2, STAY, DOWN, 1, OPP_LORELEI, 1
+	def_object_events
+	object_event 5, 2, SPRITE_LORELEI, STAY, DOWN, 1, OPP_LORELEI, 1
 
 	def_warps_to LORELEIS_ROOM

data/maps/objects/MrFujisHouse.asm

@@ -1,18 +1,18 @@
 MrFujisHouse_Object:
 	db $a ; border block
 
-	def_warps
-	warp  2,  7, 2, LAST_MAP
-	warp  3,  7, 2, LAST_MAP
+	def_warp_events
+	warp_event  2,  7, LAST_MAP, 2
+	warp_event  3,  7, LAST_MAP, 2
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_SUPER_NERD, 3, 5, STAY, NONE, 1 ; person
-	object SPRITE_LITTLE_GIRL, 6, 3, STAY, DOWN, 2 ; person
-	object SPRITE_MONSTER, 6, 4, STAY, UP, 3 ; person
-	object SPRITE_MONSTER, 1, 3, STAY, NONE, 4 ; person
-	object SPRITE_MR_FUJI, 3, 1, STAY, NONE, 5 ; person
-	object SPRITE_POKEDEX, 3, 3, STAY, NONE, 6 ; person
+	def_object_events
+	object_event 3, 5, SPRITE_SUPER_NERD, STAY, NONE, 1 ; person
+	object_event 6, 3, SPRITE_LITTLE_GIRL, STAY, DOWN, 2 ; person
+	object_event 6, 4, SPRITE_MONSTER, STAY, UP, 3 ; person
+	object_event 1, 3, SPRITE_MONSTER, STAY, NONE, 4 ; person
+	object_event 3, 1, SPRITE_MR_FUJI, STAY, NONE, 5 ; person
+	object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 6 ; person
 
 	def_warps_to MR_FUJIS_HOUSE

data/maps/objects/MrPsychicsHouse.asm

@@ -1,13 +1,13 @@
 MrPsychicsHouse_Object:
 	db $a ; border block
 
-	def_warps
-	warp  2,  7, 7, LAST_MAP
-	warp  3,  7, 7, LAST_MAP
+	def_warp_events
+	warp_event  2,  7, LAST_MAP, 7
+	warp_event  3,  7, LAST_MAP, 7
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_FISHING_GURU, 5, 3, STAY, LEFT, 1 ; person
+	def_object_events
+	object_event 5, 3, SPRITE_FISHING_GURU, STAY, LEFT, 1 ; person
 
 	def_warps_to MR_PSYCHICS_HOUSE

data/maps/objects/MtMoon1F.asm

@@ -1,29 +1,29 @@
 MtMoon1F_Object:
 	db $3 ; border block
 
-	def_warps
-	warp 14, 35, 1, LAST_MAP
-	warp 15, 35, 1, LAST_MAP
-	warp  5,  5, 0, MT_MOON_B1F
-	warp 17, 11, 2, MT_MOON_B1F
-	warp 25, 15, 3, MT_MOON_B1F
+	def_warp_events
+	warp_event 14, 35, LAST_MAP, 1
+	warp_event 15, 35, LAST_MAP, 1
+	warp_event  5,  5, MT_MOON_B1F, 0
+	warp_event 17, 11, MT_MOON_B1F, 2
+	warp_event 25, 15, MT_MOON_B1F, 3
 
-	def_signs
-	sign 15, 23, 14 ; MtMoon1Text14
+	def_bg_events
+	bg_event 15, 23, 14 ; MtMoon1Text14
 
-	def_objects
-	object SPRITE_HIKER, 5, 6, STAY, DOWN, 1, OPP_HIKER, 1
-	object SPRITE_YOUNGSTER, 12, 16, STAY, RIGHT, 2, OPP_YOUNGSTER, 3
-	object SPRITE_COOLTRAINER_F, 30, 4, STAY, DOWN, 3, OPP_LASS, 5
-	object SPRITE_SUPER_NERD, 24, 31, STAY, UP, 4, OPP_SUPER_NERD, 1
-	object SPRITE_COOLTRAINER_F, 16, 23, STAY, DOWN, 5, OPP_LASS, 6
-	object SPRITE_YOUNGSTER, 7, 22, STAY, DOWN, 6, OPP_BUG_CATCHER, 7
-	object SPRITE_YOUNGSTER, 30, 27, STAY, RIGHT, 7, OPP_BUG_CATCHER, 8
-	object SPRITE_POKE_BALL, 2, 20, STAY, NONE, 8, POTION
-	object SPRITE_POKE_BALL, 2, 2, STAY, NONE, 9, MOON_STONE
-	object SPRITE_POKE_BALL, 35, 31, STAY, NONE, 10, RARE_CANDY
-	object SPRITE_POKE_BALL, 36, 23, STAY, NONE, 11, ESCAPE_ROPE
-	object SPRITE_POKE_BALL, 20, 33, STAY, NONE, 12, POTION
-	object SPRITE_POKE_BALL, 5, 32, STAY, NONE, 13, TM_WATER_GUN
+	def_object_events
+	object_event 5, 6, SPRITE_HIKER, STAY, DOWN, 1, OPP_HIKER, 1
+	object_event 12, 16, SPRITE_YOUNGSTER, STAY, RIGHT, 2, OPP_YOUNGSTER, 3
+	object_event 30, 4, SPRITE_COOLTRAINER_F, STAY, DOWN, 3, OPP_LASS, 5
+	object_event 24, 31, SPRITE_SUPER_NERD, STAY, UP, 4, OPP_SUPER_NERD, 1
+	object_event 16, 23, SPRITE_COOLTRAINER_F, STAY, DOWN, 5, OPP_LASS, 6
+	object_event 7, 22, SPRITE_YOUNGSTER, STAY, DOWN, 6, OPP_BUG_CATCHER, 7
+	object_event 30, 27, SPRITE_YOUNGSTER, STAY, RIGHT, 7, OPP_BUG_CATCHER, 8
+	object_event 2, 20, SPRITE_POKE_BALL, STAY, NONE, 8, POTION
+	object_event 2, 2, SPRITE_POKE_BALL, STAY, NONE, 9, MOON_STONE
+	object_event 35, 31, SPRITE_POKE_BALL, STAY, NONE, 10, RARE_CANDY
+	object_event 36, 23, SPRITE_POKE_BALL, STAY, NONE, 11, ESCAPE_ROPE
+	object_event 20, 33, SPRITE_POKE_BALL, STAY, NONE, 12, POTION
+	object_event 5, 32, SPRITE_POKE_BALL, STAY, NONE, 13, TM_WATER_GUN
 
 	def_warps_to MT_MOON_1F

data/maps/objects/MtMoonB1F.asm

@@ -1,18 +1,18 @@
 MtMoonB1F_Object:
 	db $3 ; border block
 
-	def_warps
-	warp  5,  5, 2, MT_MOON_1F
-	warp 17, 11, 0, MT_MOON_B2F
-	warp 25,  9, 3, MT_MOON_1F
-	warp 25, 15, 4, MT_MOON_1F
-	warp 21, 17, 1, MT_MOON_B2F
-	warp 13, 27, 2, MT_MOON_B2F
-	warp 23,  3, 3, MT_MOON_B2F
-	warp 27,  3, 2, LAST_MAP
+	def_warp_events
+	warp_event  5,  5, MT_MOON_1F, 2
+	warp_event 17, 11, MT_MOON_B2F, 0
+	warp_event 25,  9, MT_MOON_1F, 3
+	warp_event 25, 15, MT_MOON_1F, 4
+	warp_event 21, 17, MT_MOON_B2F, 1
+	warp_event 13, 27, MT_MOON_B2F, 2
+	warp_event 23,  3, MT_MOON_B2F, 3
+	warp_event 27,  3, LAST_MAP, 2
 
-	def_signs
+	def_bg_events
 
-	def_objects
+	def_object_events
 
 	def_warps_to MT_MOON_B1F

data/maps/objects/MtMoonB2F.asm

@@ -1,23 +1,23 @@
 MtMoonB2F_Object:
 	db $3 ; border block
 
-	def_warps
-	warp 25,  9, 1, MT_MOON_B1F
-	warp 21, 17, 4, MT_MOON_B1F
-	warp 15, 27, 5, MT_MOON_B1F
-	warp  5,  7, 6, MT_MOON_B1F
+	def_warp_events
+	warp_event 25,  9, MT_MOON_B1F, 1
+	warp_event 21, 17, MT_MOON_B1F, 4
+	warp_event 15, 27, MT_MOON_B1F, 5
+	warp_event  5,  7, MT_MOON_B1F, 6
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_SUPER_NERD, 12, 8, STAY, RIGHT, 1, OPP_SUPER_NERD, 2
-	object SPRITE_ROCKET, 11, 16, STAY, DOWN, 2, OPP_ROCKET, 1
-	object SPRITE_ROCKET, 15, 22, STAY, DOWN, 3, OPP_ROCKET, 2
-	object SPRITE_ROCKET, 29, 11, STAY, UP, 4, OPP_ROCKET, 3
-	object SPRITE_ROCKET, 29, 17, STAY, LEFT, 5, OPP_ROCKET, 4
-	object SPRITE_FOSSIL, 12, 6, STAY, NONE, 6 ; person
-	object SPRITE_FOSSIL, 13, 6, STAY, NONE, 7 ; person
-	object SPRITE_POKE_BALL, 25, 21, STAY, NONE, 8, HP_UP
-	object SPRITE_POKE_BALL, 29, 5, STAY, NONE, 9, TM_MEGA_PUNCH
+	def_object_events
+	object_event 12, 8, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 2
+	object_event 11, 16, SPRITE_ROCKET, STAY, DOWN, 2, OPP_ROCKET, 1
+	object_event 15, 22, SPRITE_ROCKET, STAY, DOWN, 3, OPP_ROCKET, 2
+	object_event 29, 11, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 3
+	object_event 29, 17, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 4
+	object_event 12, 6, SPRITE_FOSSIL, STAY, NONE, 6 ; person
+	object_event 13, 6, SPRITE_FOSSIL, STAY, NONE, 7 ; person
+	object_event 25, 21, SPRITE_POKE_BALL, STAY, NONE, 8, HP_UP
+	object_event 29, 5, SPRITE_POKE_BALL, STAY, NONE, 9, TM_MEGA_PUNCH
 
 	def_warps_to MT_MOON_B2F

data/maps/objects/MtMoonPokecenter.asm

@@ -1,18 +1,18 @@
 MtMoonPokecenter_Object:
 	db $0 ; border block
 
-	def_warps
-	warp  3,  7, 0, LAST_MAP
-	warp  4,  7, 0, LAST_MAP
+	def_warp_events
+	warp_event  3,  7, LAST_MAP, 0
+	warp_event  4,  7, LAST_MAP, 0
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
-	object SPRITE_YOUNGSTER, 4, 3, STAY, UP, 2 ; person
-	object SPRITE_GENTLEMAN, 7, 3, STAY, UP, 3 ; person
-	object SPRITE_MIDDLE_AGED_MAN, 10, 6, WALK, LEFT_RIGHT, 4 ; person
-	object SPRITE_CLIPBOARD, 7, 2, STAY, NONE, 5 ; person
-	object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 6 ; person
+	def_object_events
+	object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
+	object_event 4, 3, SPRITE_YOUNGSTER, STAY, UP, 2 ; person
+	object_event 7, 3, SPRITE_GENTLEMAN, STAY, UP, 3 ; person
+	object_event 10, 6, SPRITE_MIDDLE_AGED_MAN, WALK, LEFT_RIGHT, 4 ; person
+	object_event 7, 2, SPRITE_CLIPBOARD, STAY, NONE, 5 ; person
+	object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 6 ; person
 
 	def_warps_to MT_MOON_POKECENTER

data/maps/objects/Museum1F.asm

@@ -1,20 +1,20 @@
 Museum1F_Object:
 	db $a ; border block
 
-	def_warps
-	warp 10,  7, 0, LAST_MAP
-	warp 11,  7, 0, LAST_MAP
-	warp 16,  7, 1, LAST_MAP
-	warp 17,  7, 1, LAST_MAP
-	warp  7,  7, 0, MUSEUM_2F
+	def_warp_events
+	warp_event 10,  7, LAST_MAP, 0
+	warp_event 11,  7, LAST_MAP, 0
+	warp_event 16,  7, LAST_MAP, 1
+	warp_event 17,  7, LAST_MAP, 1
+	warp_event  7,  7, MUSEUM_2F, 0
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_SCIENTIST, 12, 4, STAY, LEFT, 1 ; person
-	object SPRITE_GAMBLER, 1, 4, STAY, NONE, 2 ; person
-	object SPRITE_SCIENTIST, 15, 2, STAY, DOWN, 3 ; person
-	object SPRITE_SCIENTIST, 17, 4, STAY, NONE, 4 ; person
-	object SPRITE_OLD_AMBER, 16, 2, STAY, NONE, 5 ; person
+	def_object_events
+	object_event 12, 4, SPRITE_SCIENTIST, STAY, LEFT, 1 ; person
+	object_event 1, 4, SPRITE_GAMBLER, STAY, NONE, 2 ; person
+	object_event 15, 2, SPRITE_SCIENTIST, STAY, DOWN, 3 ; person
+	object_event 17, 4, SPRITE_SCIENTIST, STAY, NONE, 4 ; person
+	object_event 16, 2, SPRITE_OLD_AMBER, STAY, NONE, 5 ; person
 
 	def_warps_to MUSEUM_1F

data/maps/objects/Museum2F.asm

@@ -1,18 +1,18 @@
 Museum2F_Object:
 	db $a ; border block
 
-	def_warps
-	warp  7,  7, 4, MUSEUM_1F
+	def_warp_events
+	warp_event  7,  7, MUSEUM_1F, 4
 
-	def_signs
-	sign 11,  2, 6 ; Museum2FText6
-	sign  2,  5, 7 ; Museum2FText7
+	def_bg_events
+	bg_event 11,  2, 6 ; Museum2FText6
+	bg_event  2,  5, 7 ; Museum2FText7
 
-	def_objects
-	object SPRITE_YOUNGSTER, 1, 7, WALK, LEFT_RIGHT, 1 ; person
-	object SPRITE_GRAMPS, 0, 5, STAY, DOWN, 2 ; person
-	object SPRITE_SCIENTIST, 7, 5, STAY, DOWN, 3 ; person
-	object SPRITE_BRUNETTE_GIRL, 11, 5, STAY, NONE, 4 ; person
-	object SPRITE_HIKER, 12, 5, STAY, DOWN, 5 ; person
+	def_object_events
+	object_event 1, 7, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person
+	object_event 0, 5, SPRITE_GRAMPS, STAY, DOWN, 2 ; person
+	object_event 7, 5, SPRITE_SCIENTIST, STAY, DOWN, 3 ; person
+	object_event 11, 5, SPRITE_BRUNETTE_GIRL, STAY, NONE, 4 ; person
+	object_event 12, 5, SPRITE_HIKER, STAY, DOWN, 5 ; person
 
 	def_warps_to MUSEUM_2F

data/maps/objects/NameRatersHouse.asm

@@ -1,13 +1,13 @@
 NameRatersHouse_Object:
 	db $a ; border block
 
-	def_warps
-	warp  2,  7, 5, LAST_MAP
-	warp  3,  7, 5, LAST_MAP
+	def_warp_events
+	warp_event  2,  7, LAST_MAP, 5
+	warp_event  3,  7, LAST_MAP, 5
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_SILPH_PRESIDENT, 5, 3, STAY, LEFT, 1 ; person
+	def_object_events
+	object_event 5, 3, SPRITE_SILPH_PRESIDENT, STAY, LEFT, 1 ; person
 
 	def_warps_to NAME_RATERS_HOUSE

data/maps/objects/OaksLab.asm

@@ -1,23 +1,23 @@
 OaksLab_Object:
 	db $3 ; border block
 
-	def_warps
-	warp  4, 11, 2, LAST_MAP
-	warp  5, 11, 2, LAST_MAP
+	def_warp_events
+	warp_event  4, 11, LAST_MAP, 2
+	warp_event  5, 11, LAST_MAP, 2
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_RIVAL1, 1
-	object SPRITE_POKE_BALL, 6, 3, STAY, NONE, 2 ; person
-	object SPRITE_POKE_BALL, 7, 3, STAY, NONE, 3 ; person
-	object SPRITE_POKE_BALL, 8, 3, STAY, NONE, 4 ; person
-	object SPRITE_OAK, 5, 2, STAY, DOWN, 5 ; person
-	object SPRITE_POKEDEX, 2, 1, STAY, NONE, 6 ; person
-	object SPRITE_POKEDEX, 3, 1, STAY, NONE, 7 ; person
-	object SPRITE_OAK, 5, 10, STAY, UP, 8 ; person
-	object SPRITE_GIRL, 1, 9, WALK, UP_DOWN, 9 ; person
-	object SPRITE_SCIENTIST, 2, 10, STAY, NONE, 10 ; person
-	object SPRITE_SCIENTIST, 8, 10, STAY, NONE, 11 ; person
+	def_object_events
+	object_event 4, 3, SPRITE_BLUE, STAY, NONE, 1, OPP_RIVAL1, 1
+	object_event 6, 3, SPRITE_POKE_BALL, STAY, NONE, 2 ; person
+	object_event 7, 3, SPRITE_POKE_BALL, STAY, NONE, 3 ; person
+	object_event 8, 3, SPRITE_POKE_BALL, STAY, NONE, 4 ; person
+	object_event 5, 2, SPRITE_OAK, STAY, DOWN, 5 ; person
+	object_event 2, 1, SPRITE_POKEDEX, STAY, NONE, 6 ; person
+	object_event 3, 1, SPRITE_POKEDEX, STAY, NONE, 7 ; person
+	object_event 5, 10, SPRITE_OAK, STAY, UP, 8 ; person
+	object_event 1, 9, SPRITE_GIRL, WALK, UP_DOWN, 9 ; person
+	object_event 2, 10, SPRITE_SCIENTIST, STAY, NONE, 10 ; person
+	object_event 8, 10, SPRITE_SCIENTIST, STAY, NONE, 11 ; person
 
 	def_warps_to OAKS_LAB

data/maps/objects/PalletTown.asm

@@ -1,20 +1,20 @@
 PalletTown_Object:
 	db $b ; border block
 
-	def_warps
-	warp  5,  5, 0, REDS_HOUSE_1F
-	warp 13,  5, 0, BLUES_HOUSE
-	warp 12, 11, 1, OAKS_LAB
+	def_warp_events
+	warp_event  5,  5, REDS_HOUSE_1F, 0
+	warp_event 13,  5, BLUES_HOUSE, 0
+	warp_event 12, 11, OAKS_LAB, 1
 
-	def_signs
-	sign 13, 13, 4 ; PalletTownText4
-	sign  7,  9, 5 ; PalletTownText5
-	sign  3,  5, 6 ; PalletTownText6
-	sign 11,  5, 7 ; PalletTownText7
+	def_bg_events
+	bg_event 13, 13, 4 ; PalletTownText4
+	bg_event  7,  9, 5 ; PalletTownText5
+	bg_event  3,  5, 6 ; PalletTownText6
+	bg_event 11,  5, 7 ; PalletTownText7
 
-	def_objects
-	object SPRITE_OAK, 8, 5, STAY, NONE, 1 ; person
-	object SPRITE_GIRL, 3, 8, WALK, ANY_DIR, 2 ; person
-	object SPRITE_FISHER, 11, 14, WALK, ANY_DIR, 3 ; person
+	def_object_events
+	object_event 8, 5, SPRITE_OAK, STAY, NONE, 1 ; person
+	object_event 3, 8, SPRITE_GIRL, WALK, ANY_DIR, 2 ; person
+	object_event 11, 14, SPRITE_FISHER, WALK, ANY_DIR, 3 ; person
 
 	def_warps_to PALLET_TOWN

data/maps/objects/PewterCity.asm

@@ -1,29 +1,29 @@
 PewterCity_Object:
 	db $a ; border block
 
-	def_warps
-	warp 14,  7, 0, MUSEUM_1F
-	warp 19,  5, 2, MUSEUM_1F
-	warp 16, 17, 0, PEWTER_GYM
-	warp 29, 13, 0, PEWTER_NIDORAN_HOUSE
-	warp 23, 17, 0, PEWTER_MART
-	warp  7, 29, 0, PEWTER_SPEECH_HOUSE
-	warp 13, 25, 0, PEWTER_POKECENTER
+	def_warp_events
+	warp_event 14,  7, MUSEUM_1F, 0
+	warp_event 19,  5, MUSEUM_1F, 2
+	warp_event 16, 17, PEWTER_GYM, 0
+	warp_event 29, 13, PEWTER_NIDORAN_HOUSE, 0
+	warp_event 23, 17, PEWTER_MART, 0
+	warp_event  7, 29, PEWTER_SPEECH_HOUSE, 0
+	warp_event 13, 25, PEWTER_POKECENTER, 0
 
-	def_signs
-	sign 19, 29,  6 ; PewterCityText6
-	sign 33, 19,  7 ; PewterCityText7
-	sign 24, 17,  8 ; MartSignText
-	sign 14, 25,  9 ; PokeCenterSignText
-	sign 15,  9, 10 ; PewterCityText10
-	sign 11, 17, 11 ; PewterCityText11
-	sign 25, 23, 12 ; PewterCityText12
+	def_bg_events
+	bg_event 19, 29,  6 ; PewterCityText6
+	bg_event 33, 19,  7 ; PewterCityText7
+	bg_event 24, 17,  8 ; MartSignText
+	bg_event 14, 25,  9 ; PokeCenterSignText
+	bg_event 15,  9, 10 ; PewterCityText10
+	bg_event 11, 17, 11 ; PewterCityText11
+	bg_event 25, 23, 12 ; PewterCityText12
 
-	def_objects
-	object SPRITE_COOLTRAINER_F, 8, 15, STAY, NONE, 1 ; person
-	object SPRITE_COOLTRAINER_M, 17, 25, STAY, NONE, 2 ; person
-	object SPRITE_SUPER_NERD, 27, 17, STAY, NONE, 3 ; person
-	object SPRITE_SUPER_NERD, 26, 25, WALK, LEFT_RIGHT, 4 ; person
-	object SPRITE_YOUNGSTER, 35, 16, STAY, DOWN, 5 ; person
+	def_object_events
+	object_event 8, 15, SPRITE_COOLTRAINER_F, STAY, NONE, 1 ; person
+	object_event 17, 25, SPRITE_COOLTRAINER_M, STAY, NONE, 2 ; person
+	object_event 27, 17, SPRITE_SUPER_NERD, STAY, NONE, 3 ; person
+	object_event 26, 25, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 4 ; person
+	object_event 35, 16, SPRITE_YOUNGSTER, STAY, DOWN, 5 ; person
 
 	def_warps_to PEWTER_CITY

data/maps/objects/PewterGym.asm

@@ -1,15 +1,15 @@
 PewterGym_Object:
 	db $3 ; border block
 
-	def_warps
-	warp  4, 13, 2, LAST_MAP
-	warp  5, 13, 2, LAST_MAP
+	def_warp_events
+	warp_event  4, 13, LAST_MAP, 2
+	warp_event  5, 13, LAST_MAP, 2
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_SUPER_NERD, 4, 1, STAY, DOWN, 1, OPP_BROCK, 1
-	object SPRITE_COOLTRAINER_M, 3, 6, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1
-	object SPRITE_GYM_GUIDE, 7, 10, STAY, DOWN, 3 ; person
+	def_object_events
+	object_event 4, 1, SPRITE_SUPER_NERD, STAY, DOWN, 1, OPP_BROCK, 1
+	object_event 3, 6, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1
+	object_event 7, 10, SPRITE_GYM_GUIDE, STAY, DOWN, 3 ; person
 
 	def_warps_to PEWTER_GYM

data/maps/objects/PewterMart.asm

@@ -1,15 +1,15 @@
 PewterMart_Object:
 	db $0 ; border block
 
-	def_warps
-	warp  3,  7, 4, LAST_MAP
-	warp  4,  7, 4, LAST_MAP
+	def_warp_events
+	warp_event  3,  7, LAST_MAP, 4
+	warp_event  4,  7, LAST_MAP, 4
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
-	object SPRITE_YOUNGSTER, 3, 3, WALK, UP_DOWN, 2 ; person
-	object SPRITE_SUPER_NERD, 5, 5, STAY, NONE, 3 ; person
+	def_object_events
+	object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
+	object_event 3, 3, SPRITE_YOUNGSTER, WALK, UP_DOWN, 2 ; person
+	object_event 5, 5, SPRITE_SUPER_NERD, STAY, NONE, 3 ; person
 
 	def_warps_to PEWTER_MART

data/maps/objects/PewterNidoranHouse.asm

@@ -1,15 +1,15 @@
 PewterNidoranHouse_Object:
 	db $a ; border block
 
-	def_warps
-	warp  2,  7, 3, LAST_MAP
-	warp  3,  7, 3, LAST_MAP
+	def_warp_events
+	warp_event  2,  7, LAST_MAP, 3
+	warp_event  3,  7, LAST_MAP, 3
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_MONSTER, 4, 5, STAY, LEFT, 1 ; person
-	object SPRITE_LITTLE_BOY, 3, 5, STAY, RIGHT, 2 ; person
-	object SPRITE_MIDDLE_AGED_MAN, 1, 2, STAY, NONE, 3 ; person
+	def_object_events
+	object_event 4, 5, SPRITE_MONSTER, STAY, LEFT, 1 ; person
+	object_event 3, 5, SPRITE_LITTLE_BOY, STAY, RIGHT, 2 ; person
+	object_event 1, 2, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 3 ; person
 
 	def_warps_to PEWTER_NIDORAN_HOUSE

data/maps/objects/PewterPokecenter.asm

@@ -1,16 +1,16 @@
 PewterPokecenter_Object:
 	db $0 ; border block
 
-	def_warps
-	warp  3,  7, 6, LAST_MAP
-	warp  4,  7, 6, LAST_MAP
+	def_warp_events
+	warp_event  3,  7, LAST_MAP, 6
+	warp_event  4,  7, LAST_MAP, 6
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
-	object SPRITE_GENTLEMAN, 11, 7, STAY, LEFT, 2 ; person
-	object SPRITE_FAIRY, 1, 3, STAY, DOWN, 3 ; person
-	object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
+	def_object_events
+	object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
+	object_event 11, 7, SPRITE_GENTLEMAN, STAY, LEFT, 2 ; person
+	object_event 1, 3, SPRITE_FAIRY, STAY, DOWN, 3 ; person
+	object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
 
 	def_warps_to PEWTER_POKECENTER

data/maps/objects/PewterSpeechHouse.asm

@@ -1,14 +1,14 @@
 PewterSpeechHouse_Object:
 	db $a ; border block
 
-	def_warps
-	warp  2,  7, 5, LAST_MAP
-	warp  3,  7, 5, LAST_MAP
+	def_warp_events
+	warp_event  2,  7, LAST_MAP, 5
+	warp_event  3,  7, LAST_MAP, 5
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_GAMBLER, 2, 3, STAY, RIGHT, 1 ; person
-	object SPRITE_YOUNGSTER, 4, 5, STAY, NONE, 2 ; person
+	def_object_events
+	object_event 2, 3, SPRITE_GAMBLER, STAY, RIGHT, 1 ; person
+	object_event 4, 5, SPRITE_YOUNGSTER, STAY, NONE, 2 ; person
 
 	def_warps_to PEWTER_SPEECH_HOUSE

data/maps/objects/PokemonFanClub.asm

@@ -1,20 +1,20 @@
 PokemonFanClub_Object:
 	db $d ; border block
 
-	def_warps
-	warp  2,  7, 1, LAST_MAP
-	warp  3,  7, 1, LAST_MAP
+	def_warp_events
+	warp_event  2,  7, LAST_MAP, 1
+	warp_event  3,  7, LAST_MAP, 1
 
-	def_signs
-	sign  1,  0, 7 ; FanClubText7
-	sign  6,  0, 8 ; FanClubText8
+	def_bg_events
+	bg_event  1,  0, 7 ; FanClubText7
+	bg_event  6,  0, 8 ; FanClubText8
 
-	def_objects
-	object SPRITE_FISHER, 6, 3, STAY, LEFT, 1 ; person
-	object SPRITE_GIRL, 1, 3, STAY, RIGHT, 2 ; person
-	object SPRITE_FAIRY, 6, 4, STAY, LEFT, 3 ; person
-	object SPRITE_SEEL, 1, 4, STAY, RIGHT, 4 ; person
-	object SPRITE_GENTLEMAN, 3, 1, STAY, DOWN, 5 ; person
-	object SPRITE_LINK_RECEPTIONIST, 5, 1, STAY, DOWN, 6 ; person
+	def_object_events
+	object_event 6, 3, SPRITE_FISHER, STAY, LEFT, 1 ; person
+	object_event 1, 3, SPRITE_GIRL, STAY, RIGHT, 2 ; person
+	object_event 6, 4, SPRITE_FAIRY, STAY, LEFT, 3 ; person
+	object_event 1, 4, SPRITE_SEEL, STAY, RIGHT, 4 ; person
+	object_event 3, 1, SPRITE_GENTLEMAN, STAY, DOWN, 5 ; person
+	object_event 5, 1, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 6 ; person
 
 	def_warps_to POKEMON_FAN_CLUB

data/maps/objects/PokemonMansion1F.asm

@@ -1,21 +1,21 @@
 PokemonMansion1F_Object:
 	db $2e ; border block
 
-	def_warps
-	warp  4, 27, 0, LAST_MAP
-	warp  5, 27, 0, LAST_MAP
-	warp  6, 27, 0, LAST_MAP
-	warp  7, 27, 0, LAST_MAP
-	warp  5, 10, 0, POKEMON_MANSION_2F
-	warp 21, 23, 0, POKEMON_MANSION_B1F
-	warp 26, 27, 0, LAST_MAP
-	warp 27, 27, 0, LAST_MAP
+	def_warp_events
+	warp_event  4, 27, LAST_MAP, 0
+	warp_event  5, 27, LAST_MAP, 0
+	warp_event  6, 27, LAST_MAP, 0
+	warp_event  7, 27, LAST_MAP, 0
+	warp_event  5, 10, POKEMON_MANSION_2F, 0
+	warp_event 21, 23, POKEMON_MANSION_B1F, 0
+	warp_event 26, 27, LAST_MAP, 0
+	warp_event 27, 27, LAST_MAP, 0
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_SCIENTIST, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4
-	object SPRITE_POKE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE
-	object SPRITE_POKE_BALL, 18, 21, STAY, NONE, 3, CARBOS
+	def_object_events
+	object_event 17, 17, SPRITE_SCIENTIST, STAY, LEFT, 1, OPP_SCIENTIST, 4
+	object_event 14, 3, SPRITE_POKE_BALL, STAY, NONE, 2, ESCAPE_ROPE
+	object_event 18, 21, SPRITE_POKE_BALL, STAY, NONE, 3, CARBOS
 
 	def_warps_to POKEMON_MANSION_1F

data/maps/objects/PokemonMansion2F.asm

@@ -1,18 +1,18 @@
 PokemonMansion2F_Object:
 	db $1 ; border block
 
-	def_warps
-	warp  5, 10, 4, POKEMON_MANSION_1F
-	warp  7, 10, 0, POKEMON_MANSION_3F
-	warp 25, 14, 2, POKEMON_MANSION_3F
-	warp  6,  1, 1, POKEMON_MANSION_3F
+	def_warp_events
+	warp_event  5, 10, POKEMON_MANSION_1F, 4
+	warp_event  7, 10, POKEMON_MANSION_3F, 0
+	warp_event 25, 14, POKEMON_MANSION_3F, 2
+	warp_event  6,  1, POKEMON_MANSION_3F, 1
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_SUPER_NERD, 3, 17, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 7
-	object SPRITE_POKE_BALL, 28, 7, STAY, NONE, 2, CALCIUM
-	object SPRITE_POKEDEX, 18, 2, STAY, NONE, 3 ; person
-	object SPRITE_POKEDEX, 3, 22, STAY, NONE, 4 ; person
+	def_object_events
+	object_event 3, 17, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 7
+	object_event 28, 7, SPRITE_POKE_BALL, STAY, NONE, 2, CALCIUM
+	object_event 18, 2, SPRITE_POKEDEX, STAY, NONE, 3 ; person
+	object_event 3, 22, SPRITE_POKEDEX, STAY, NONE, 4 ; person
 
 	def_warps_to POKEMON_MANSION_2F

data/maps/objects/PokemonMansion3F.asm

@@ -1,18 +1,18 @@
 PokemonMansion3F_Object:
 	db $1 ; border block
 
-	def_warps
-	warp  7, 10, 1, POKEMON_MANSION_2F
-	warp  6,  1, 3, POKEMON_MANSION_2F
-	warp 25, 14, 2, POKEMON_MANSION_2F
+	def_warp_events
+	warp_event  7, 10, POKEMON_MANSION_2F, 1
+	warp_event  6,  1, POKEMON_MANSION_2F, 3
+	warp_event 25, 14, POKEMON_MANSION_2F, 2
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_SUPER_NERD, 5, 11, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 8
-	object SPRITE_SCIENTIST, 20, 11, STAY, LEFT, 2, OPP_SCIENTIST, 12
-	object SPRITE_POKE_BALL, 1, 16, STAY, NONE, 3, MAX_POTION
-	object SPRITE_POKE_BALL, 25, 5, STAY, NONE, 4, IRON
-	object SPRITE_POKEDEX, 6, 12, STAY, NONE, 5 ; person
+	def_object_events
+	object_event 5, 11, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 8
+	object_event 20, 11, SPRITE_SCIENTIST, STAY, LEFT, 2, OPP_SCIENTIST, 12
+	object_event 1, 16, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_POTION
+	object_event 25, 5, SPRITE_POKE_BALL, STAY, NONE, 4, IRON
+	object_event 6, 12, SPRITE_POKEDEX, STAY, NONE, 5 ; person
 
 	def_warps_to POKEMON_MANSION_3F

data/maps/objects/PokemonMansionB1F.asm

@@ -1,19 +1,19 @@
 PokemonMansionB1F_Object:
 	db $1 ; border block
 
-	def_warps
-	warp 23, 22, 5, POKEMON_MANSION_1F
+	def_warp_events
+	warp_event 23, 22, POKEMON_MANSION_1F, 5
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_SUPER_NERD, 16, 23, STAY, NONE, 1, OPP_BURGLAR, 9
-	object SPRITE_SCIENTIST, 27, 11, STAY, DOWN, 2, OPP_SCIENTIST, 13
-	object SPRITE_POKE_BALL, 10, 2, STAY, NONE, 3, RARE_CANDY
-	object SPRITE_POKE_BALL, 1, 22, STAY, NONE, 4, FULL_RESTORE
-	object SPRITE_POKE_BALL, 19, 25, STAY, NONE, 5, TM_BLIZZARD
-	object SPRITE_POKE_BALL, 5, 4, STAY, NONE, 6, TM_SOLARBEAM
-	object SPRITE_POKEDEX, 16, 20, STAY, NONE, 7 ; person
-	object SPRITE_POKE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY
+	def_object_events
+	object_event 16, 23, SPRITE_SUPER_NERD, STAY, NONE, 1, OPP_BURGLAR, 9
+	object_event 27, 11, SPRITE_SCIENTIST, STAY, DOWN, 2, OPP_SCIENTIST, 13
+	object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 3, RARE_CANDY
+	object_event 1, 22, SPRITE_POKE_BALL, STAY, NONE, 4, FULL_RESTORE
+	object_event 19, 25, SPRITE_POKE_BALL, STAY, NONE, 5, TM_BLIZZARD
+	object_event 5, 4, SPRITE_POKE_BALL, STAY, NONE, 6, TM_SOLARBEAM
+	object_event 16, 20, SPRITE_POKEDEX, STAY, NONE, 7 ; person
+	object_event 5, 13, SPRITE_POKE_BALL, STAY, NONE, 8, SECRET_KEY
 
 	def_warps_to POKEMON_MANSION_B1F

data/maps/objects/PokemonTower1F.asm

@@ -1,18 +1,18 @@
 PokemonTower1F_Object:
 	db $1 ; border block
 
-	def_warps
-	warp 10, 17, 1, LAST_MAP
-	warp 11, 17, 1, LAST_MAP
-	warp 18,  9, 1, POKEMON_TOWER_2F
+	def_warp_events
+	warp_event 10, 17, LAST_MAP, 1
+	warp_event 11, 17, LAST_MAP, 1
+	warp_event 18,  9, POKEMON_TOWER_2F, 1
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_LINK_RECEPTIONIST, 15, 13, STAY, UP, 1 ; person
-	object SPRITE_MIDDLE_AGED_WOMAN, 6, 8, STAY, NONE, 2 ; person
-	object SPRITE_BALDING_GUY, 8, 12, STAY, NONE, 3 ; person
-	object SPRITE_GIRL, 13, 7, STAY, NONE, 4 ; person
-	object SPRITE_CHANNELER, 17, 7, STAY, LEFT, 5 ; person
+	def_object_events
+	object_event 15, 13, SPRITE_LINK_RECEPTIONIST, STAY, UP, 1 ; person
+	object_event 6, 8, SPRITE_MIDDLE_AGED_WOMAN, STAY, NONE, 2 ; person
+	object_event 8, 12, SPRITE_BALDING_GUY, STAY, NONE, 3 ; person
+	object_event 13, 7, SPRITE_GIRL, STAY, NONE, 4 ; person
+	object_event 17, 7, SPRITE_CHANNELER, STAY, LEFT, 5 ; person
 
 	def_warps_to POKEMON_TOWER_1F

data/maps/objects/PokemonTower2F.asm

@@ -1,14 +1,14 @@
 PokemonTower2F_Object:
 	db $1 ; border block
 
-	def_warps
-	warp  3,  9, 0, POKEMON_TOWER_3F
-	warp 18,  9, 2, POKEMON_TOWER_1F
+	def_warp_events
+	warp_event  3,  9, POKEMON_TOWER_3F, 0
+	warp_event 18,  9, POKEMON_TOWER_1F, 2
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person
-	object SPRITE_CHANNELER, 3, 7, STAY, RIGHT, 2 ; person
+	def_object_events
+	object_event 14, 5, SPRITE_BLUE, STAY, NONE, 1 ; person
+	object_event 3, 7, SPRITE_CHANNELER, STAY, RIGHT, 2 ; person
 
 	def_warps_to POKEMON_TOWER_2F

data/maps/objects/PokemonTower3F.asm

@@ -1,16 +1,16 @@
 PokemonTower3F_Object:
 	db $1 ; border block
 
-	def_warps
-	warp  3,  9, 0, POKEMON_TOWER_2F
-	warp 18,  9, 1, POKEMON_TOWER_4F
+	def_warp_events
+	warp_event  3,  9, POKEMON_TOWER_2F, 0
+	warp_event 18,  9, POKEMON_TOWER_4F, 1
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_CHANNELER, 12, 3, STAY, LEFT, 1, OPP_CHANNELER, 5
-	object SPRITE_CHANNELER, 9, 8, STAY, DOWN, 2, OPP_CHANNELER, 6
-	object SPRITE_CHANNELER, 10, 13, STAY, DOWN, 3, OPP_CHANNELER, 8
-	object SPRITE_POKE_BALL, 12, 1, STAY, NONE, 4, ESCAPE_ROPE
+	def_object_events
+	object_event 12, 3, SPRITE_CHANNELER, STAY, LEFT, 1, OPP_CHANNELER, 5
+	object_event 9, 8, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 6
+	object_event 10, 13, SPRITE_CHANNELER, STAY, DOWN, 3, OPP_CHANNELER, 8
+	object_event 12, 1, SPRITE_POKE_BALL, STAY, NONE, 4, ESCAPE_ROPE
 
 	def_warps_to POKEMON_TOWER_3F

data/maps/objects/PokemonTower4F.asm

@@ -1,18 +1,18 @@
 PokemonTower4F_Object:
 	db $1 ; border block
 
-	def_warps
-	warp  3,  9, 0, POKEMON_TOWER_5F
-	warp 18,  9, 1, POKEMON_TOWER_3F
+	def_warp_events
+	warp_event  3,  9, POKEMON_TOWER_5F, 0
+	warp_event 18,  9, POKEMON_TOWER_3F, 1
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_CHANNELER, 5, 10, STAY, RIGHT, 1, OPP_CHANNELER, 9
-	object SPRITE_CHANNELER, 15, 7, STAY, DOWN, 2, OPP_CHANNELER, 10
-	object SPRITE_CHANNELER, 14, 12, STAY, LEFT, 3, OPP_CHANNELER, 12
-	object SPRITE_POKE_BALL, 12, 10, STAY, NONE, 4, ELIXER
-	object SPRITE_POKE_BALL, 9, 10, STAY, NONE, 5, AWAKENING
-	object SPRITE_POKE_BALL, 12, 16, STAY, NONE, 6, HP_UP
+	def_object_events
+	object_event 5, 10, SPRITE_CHANNELER, STAY, RIGHT, 1, OPP_CHANNELER, 9
+	object_event 15, 7, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 10
+	object_event 14, 12, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 12
+	object_event 12, 10, SPRITE_POKE_BALL, STAY, NONE, 4, ELIXER
+	object_event 9, 10, SPRITE_POKE_BALL, STAY, NONE, 5, AWAKENING
+	object_event 12, 16, SPRITE_POKE_BALL, STAY, NONE, 6, HP_UP
 
 	def_warps_to POKEMON_TOWER_4F

data/maps/objects/PokemonTower5F.asm

@@ -1,18 +1,18 @@
 PokemonTower5F_Object:
 	db $1 ; border block
 
-	def_warps
-	warp  3,  9, 0, POKEMON_TOWER_4F
-	warp 18,  9, 0, POKEMON_TOWER_6F
+	def_warp_events
+	warp_event  3,  9, POKEMON_TOWER_4F, 0
+	warp_event 18,  9, POKEMON_TOWER_6F, 0
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_CHANNELER, 12, 8, STAY, NONE, 1 ; person
-	object SPRITE_CHANNELER, 17, 7, STAY, LEFT, 2, OPP_CHANNELER, 14
-	object SPRITE_CHANNELER, 14, 3, STAY, LEFT, 3, OPP_CHANNELER, 16
-	object SPRITE_CHANNELER, 6, 10, STAY, RIGHT, 4, OPP_CHANNELER, 17
-	object SPRITE_CHANNELER, 9, 16, STAY, RIGHT, 5, OPP_CHANNELER, 18
-	object SPRITE_POKE_BALL, 6, 14, STAY, NONE, 6, NUGGET
+	def_object_events
+	object_event 12, 8, SPRITE_CHANNELER, STAY, NONE, 1 ; person
+	object_event 17, 7, SPRITE_CHANNELER, STAY, LEFT, 2, OPP_CHANNELER, 14
+	object_event 14, 3, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 16
+	object_event 6, 10, SPRITE_CHANNELER, STAY, RIGHT, 4, OPP_CHANNELER, 17
+	object_event 9, 16, SPRITE_CHANNELER, STAY, RIGHT, 5, OPP_CHANNELER, 18
+	object_event 6, 14, SPRITE_POKE_BALL, STAY, NONE, 6, NUGGET
 
 	def_warps_to POKEMON_TOWER_5F

data/maps/objects/PokemonTower6F.asm

@@ -1,17 +1,17 @@
 PokemonTower6F_Object:
 	db $1 ; border block
 
-	def_warps
-	warp 18,  9, 1, POKEMON_TOWER_5F
-	warp  9, 16, 0, POKEMON_TOWER_7F
+	def_warp_events
+	warp_event 18,  9, POKEMON_TOWER_5F, 1
+	warp_event  9, 16, POKEMON_TOWER_7F, 0
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_CHANNELER, 12, 10, STAY, RIGHT, 1, OPP_CHANNELER, 19
-	object SPRITE_CHANNELER, 9, 5, STAY, DOWN, 2, OPP_CHANNELER, 20
-	object SPRITE_CHANNELER, 16, 5, STAY, LEFT, 3, OPP_CHANNELER, 21
-	object SPRITE_POKE_BALL, 6, 8, STAY, NONE, 4, RARE_CANDY
-	object SPRITE_POKE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY
+	def_object_events
+	object_event 12, 10, SPRITE_CHANNELER, STAY, RIGHT, 1, OPP_CHANNELER, 19
+	object_event 9, 5, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 20
+	object_event 16, 5, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 21
+	object_event 6, 8, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY
+	object_event 14, 14, SPRITE_POKE_BALL, STAY, NONE, 5, X_ACCURACY
 
 	def_warps_to POKEMON_TOWER_6F

data/maps/objects/PokemonTower7F.asm

@@ -1,15 +1,15 @@
 PokemonTower7F_Object:
 	db $1 ; border block
 
-	def_warps
-	warp  9, 16, 1, POKEMON_TOWER_6F
+	def_warp_events
+	warp_event  9, 16, POKEMON_TOWER_6F, 1
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_ROCKET, 9, 11, STAY, RIGHT, 1, OPP_ROCKET, 19
-	object SPRITE_ROCKET, 12, 9, STAY, LEFT, 2, OPP_ROCKET, 20
-	object SPRITE_ROCKET, 9, 7, STAY, RIGHT, 3, OPP_ROCKET, 21
-	object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 4 ; person
+	def_object_events
+	object_event 9, 11, SPRITE_ROCKET, STAY, RIGHT, 1, OPP_ROCKET, 19
+	object_event 12, 9, SPRITE_ROCKET, STAY, LEFT, 2, OPP_ROCKET, 20
+	object_event 9, 7, SPRITE_ROCKET, STAY, RIGHT, 3, OPP_ROCKET, 21
+	object_event 10, 3, SPRITE_MR_FUJI, STAY, DOWN, 4 ; person
 
 	def_warps_to POKEMON_TOWER_7F

data/maps/objects/PowerPlant.asm

@@ -1,27 +1,27 @@
 PowerPlant_Object:
 	db $2e ; border block
 
-	def_warps
-	warp  4, 35, 3, LAST_MAP
-	warp  5, 35, 3, LAST_MAP
-	warp  0, 11, 3, LAST_MAP
+	def_warp_events
+	warp_event  4, 35, LAST_MAP, 3
+	warp_event  5, 35, LAST_MAP, 3
+	warp_event  0, 11, LAST_MAP, 3
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_POKE_BALL, 9, 20, STAY, NONE, 1, VOLTORB, 40
-	object SPRITE_POKE_BALL, 32, 18, STAY, NONE, 2, VOLTORB, 40
-	object SPRITE_POKE_BALL, 21, 25, STAY, NONE, 3, VOLTORB, 40
-	object SPRITE_POKE_BALL, 25, 18, STAY, NONE, 4, ELECTRODE, 43
-	object SPRITE_POKE_BALL, 23, 34, STAY, NONE, 5, VOLTORB, 40
-	object SPRITE_POKE_BALL, 26, 28, STAY, NONE, 6, VOLTORB, 40
-	object SPRITE_POKE_BALL, 21, 14, STAY, NONE, 7, ELECTRODE, 43
-	object SPRITE_POKE_BALL, 37, 32, STAY, NONE, 8, VOLTORB, 40
-	object SPRITE_BIRD, 4, 9, STAY, UP, 9, ZAPDOS, 50
-	object SPRITE_POKE_BALL, 7, 25, STAY, NONE, 10, CARBOS
-	object SPRITE_POKE_BALL, 28, 3, STAY, NONE, 11, HP_UP
-	object SPRITE_POKE_BALL, 34, 3, STAY, NONE, 12, RARE_CANDY
-	object SPRITE_POKE_BALL, 26, 32, STAY, NONE, 13, TM_THUNDER
-	object SPRITE_POKE_BALL, 20, 32, STAY, NONE, 14, TM_REFLECT
+	def_object_events
+	object_event 9, 20, SPRITE_POKE_BALL, STAY, NONE, 1, VOLTORB, 40
+	object_event 32, 18, SPRITE_POKE_BALL, STAY, NONE, 2, VOLTORB, 40
+	object_event 21, 25, SPRITE_POKE_BALL, STAY, NONE, 3, VOLTORB, 40
+	object_event 25, 18, SPRITE_POKE_BALL, STAY, NONE, 4, ELECTRODE, 43
+	object_event 23, 34, SPRITE_POKE_BALL, STAY, NONE, 5, VOLTORB, 40
+	object_event 26, 28, SPRITE_POKE_BALL, STAY, NONE, 6, VOLTORB, 40
+	object_event 21, 14, SPRITE_POKE_BALL, STAY, NONE, 7, ELECTRODE, 43
+	object_event 37, 32, SPRITE_POKE_BALL, STAY, NONE, 8, VOLTORB, 40
+	object_event 4, 9, SPRITE_BIRD, STAY, UP, 9, ZAPDOS, 50
+	object_event 7, 25, SPRITE_POKE_BALL, STAY, NONE, 10, CARBOS
+	object_event 28, 3, SPRITE_POKE_BALL, STAY, NONE, 11, HP_UP
+	object_event 34, 3, SPRITE_POKE_BALL, STAY, NONE, 12, RARE_CANDY
+	object_event 26, 32, SPRITE_POKE_BALL, STAY, NONE, 13, TM_THUNDER
+	object_event 20, 32, SPRITE_POKE_BALL, STAY, NONE, 14, TM_REFLECT
 
 	def_warps_to POWER_PLANT

data/maps/objects/RedsHouse1F.asm

@@ -1,15 +1,15 @@
 RedsHouse1F_Object:
 	db $a ; border block
 
-	def_warps
-	warp  2,  7, 0, LAST_MAP ; exit1
-	warp  3,  7, 0, LAST_MAP ; exit2
-	warp  7,  1, 0, REDS_HOUSE_2F ; staircase
+	def_warp_events
+	warp_event  2,  7, LAST_MAP, 0 ; exit1
+	warp_event  3,  7, LAST_MAP, 0 ; exit2
+	warp_event  7,  1, REDS_HOUSE_2F, 0 ; staircase
 
-	def_signs
-	sign  3,  1, 2 ; TV
+	def_bg_events
+	bg_event  3,  1, 2 ; TV
 
-	def_objects
-	object SPRITE_MOM, 5, 4, STAY, LEFT, 1 ; Mom
+	def_object_events
+	object_event 5, 4, SPRITE_MOM, STAY, LEFT, 1 ; Mom
 
 	def_warps_to REDS_HOUSE_1F

data/maps/objects/RedsHouse2F.asm

@@ -1,11 +1,11 @@
 RedsHouse2F_Object:
 	db $a ; border block
 
-	def_warps
-	warp  7,  1, 2, REDS_HOUSE_1F
+	def_warp_events
+	warp_event  7,  1, REDS_HOUSE_1F, 2
 
-	def_signs
+	def_bg_events
 
-	def_objects
+	def_object_events
 
 	def_warps_to REDS_HOUSE_2F