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/mansion2.asm | 22 ----------------------
 1 file changed, 22 deletions(-)
 delete mode 100755 data/mapObjects/mansion2.asm

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

diff --git a/data/mapObjects/mansion2.asm b/data/mapObjects/mansion2.asm
deleted file mode 100755
index 6fd86b97..00000000
--- a/data/mapObjects/mansion2.asm
+++ /dev/null
@@ -1,22 +0,0 @@
-Mansion2Object:
-	db $1 ; border block
-
-	db 4 ; warps
-	warp 5, 10, 4, MANSION_1
-	warp 7, 10, 0, MANSION_3
-	warp 25, 14, 2, MANSION_3
-	warp 6, 1, 1, MANSION_3
-
-	db 0 ; signs
-
-	db 4 ; objects
-	object SPRITE_BLACK_HAIR_BOY_2, 3, 17, WALK, 2, 1, OPP_BURGLAR, 7
-	object SPRITE_BALL, 28, 7, STAY, NONE, 2, CALCIUM
-	object SPRITE_BOOK_MAP_DEX, 18, 2, STAY, NONE, 3 ; person
-	object SPRITE_BOOK_MAP_DEX, 3, 22, STAY, NONE, 4 ; person
-
-	; warp-to
-	warp_to 5, 10, MANSION_2_WIDTH ; POKEMON_MANSION_1F
-	warp_to 7, 10, MANSION_2_WIDTH ; POKEMON_MANSION_3F
-	warp_to 25, 14, MANSION_2_WIDTH ; POKEMON_MANSION_3F
-	warp_to 6, 1, MANSION_2_WIDTH ; POKEMON_MANSION_3F
-- 
cgit v1.3.1-sl0p