From c7796024590fec48ac79756793c1a6e3b54daf8f Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Tue, 1 Jan 2019 15:06:23 -0500
Subject: Rename map files, labels, and constants to be consistent and work
 with Polished Map

---
 data/mapObjects/CinnabarMart.asm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100755 data/mapObjects/CinnabarMart.asm

(limited to 'data/mapObjects/CinnabarMart.asm')

diff --git a/data/mapObjects/CinnabarMart.asm b/data/mapObjects/CinnabarMart.asm
new file mode 100755
index 00000000..af88ddf0
--- /dev/null
+++ b/data/mapObjects/CinnabarMart.asm
@@ -0,0 +1,17 @@
+CinnabarMart_Object:
+	db $0 ; border block
+
+	db 2 ; warps
+	warp 3, 7, 4, -1
+	warp 4, 7, 4, -1
+
+	db 0 ; signs
+
+	db 3 ; objects
+	object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
+	object SPRITE_ERIKA, 6, 2, STAY, NONE, 2 ; person
+	object SPRITE_OAK_AIDE, 3, 4, STAY, NONE, 3 ; person
+
+	; warp-to
+	warp_to 3, 7, CINNABAR_MART_WIDTH
+	warp_to 4, 7, CINNABAR_MART_WIDTH
-- 
cgit v1.3.1-sl0p