From 2c4f35848b786864822a3f211df91de30a2857c9 Mon Sep 17 00:00:00 2001
From: Yoann Fievez <yoann.fievez@gmail.com>
Date: Mon, 27 Sep 2021 04:56:09 +0200
Subject: 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/PokemonMansion3F.asm | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'data/maps/objects/PokemonMansion3F.asm')

diff --git a/data/maps/objects/PokemonMansion3F.asm b/data/maps/objects/PokemonMansion3F.asm
index fdf16a8d..7cb94a3e 100644
--- a/data/maps/objects/PokemonMansion3F.asm
+++ b/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
-- 
cgit v1.3.1-sl0p