Merge branch 'master' of https://github.com/pret/pokered

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, 0 ; 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, 0 ; 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