From 10f9559eab8c93b94abb8ae8d1083704ad4e169a Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Wed, 20 May 2020 19:40:33 -0500
Subject: Sync with pokered

---
 data/mapObjects/cinnabarmart.asm | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100755 data/mapObjects/cinnabarmart.asm

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

diff --git a/data/mapObjects/cinnabarmart.asm b/data/mapObjects/cinnabarmart.asm
deleted file mode 100755
index cf135039..00000000
--- a/data/mapObjects/cinnabarmart.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-CinnabarMartObject:
-	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