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/SilphCo9F.asm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

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

diff --git a/data/maps/objects/SilphCo9F.asm b/data/maps/objects/SilphCo9F.asm
index e6de70fd..cf55b5aa 100644
--- a/data/maps/objects/SilphCo9F.asm
+++ b/data/maps/objects/SilphCo9F.asm
@@ -1,19 +1,19 @@
 SilphCo9F_Object:
 	db $2e ; border block
 
-	def_warps
-	warp 14,  0, 0, SILPH_CO_10F
-	warp 16,  0, 0, SILPH_CO_8F
-	warp 18,  0, 0, SILPH_CO_ELEVATOR
-	warp  9,  3, 7, SILPH_CO_3F
-	warp 17, 15, 4, SILPH_CO_5F
+	def_warp_events
+	warp_event 14,  0, SILPH_CO_10F, 0
+	warp_event 16,  0, SILPH_CO_8F, 0
+	warp_event 18,  0, SILPH_CO_ELEVATOR, 0
+	warp_event  9,  3, SILPH_CO_3F, 7
+	warp_event 17, 15, SILPH_CO_5F, 4
 
-	def_signs
+	def_bg_events
 
-	def_objects
-	object SPRITE_NURSE, 3, 14, STAY, DOWN, 1 ; person
-	object SPRITE_ROCKET, 2, 4, STAY, UP, 2, OPP_ROCKET, 37
-	object SPRITE_SCIENTIST, 21, 13, STAY, DOWN, 3, OPP_SCIENTIST, 10
-	object SPRITE_ROCKET, 13, 16, STAY, UP, 4, OPP_ROCKET, 38
+	def_object_events
+	object_event 3, 14, SPRITE_NURSE, STAY, DOWN, 1 ; person
+	object_event 2, 4, SPRITE_ROCKET, STAY, UP, 2, OPP_ROCKET, 37
+	object_event 21, 13, SPRITE_SCIENTIST, STAY, DOWN, 3, OPP_SCIENTIST, 10
+	object_event 13, 16, SPRITE_ROCKET, STAY, UP, 4, OPP_ROCKET, 38
 
 	def_warps_to SILPH_CO_9F
-- 
cgit v1.3.1-sl0p