From 5647ca687b92954dcf37a6ea6bfbc9a341c32de4 Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Wed, 4 Nov 2020 00:06:44 -0600
Subject: Sync with pokered

---
 data/maps/objects/PokemonMansion1F.asm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100755 data/maps/objects/PokemonMansion1F.asm

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

diff --git a/data/maps/objects/PokemonMansion1F.asm b/data/maps/objects/PokemonMansion1F.asm
new file mode 100755
index 00000000..70eef1a1
--- /dev/null
+++ b/data/maps/objects/PokemonMansion1F.asm
@@ -0,0 +1,21 @@
+PokemonMansion1F_Object:
+	db $2e ; border block
+
+	def_warps
+	warp  4, 27, 0, LAST_MAP
+	warp  5, 27, 0, LAST_MAP
+	warp  6, 27, 0, LAST_MAP
+	warp  7, 27, 0, LAST_MAP
+	warp  5, 10, 0, POKEMON_MANSION_2F
+	warp 21, 23, 0, POKEMON_MANSION_B1F
+	warp 26, 27, 0, LAST_MAP
+	warp 27, 27, 0, LAST_MAP
+
+	def_signs
+
+	def_objects
+	object SPRITE_SCIENTIST, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4
+	object SPRITE_POKE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE
+	object SPRITE_POKE_BALL, 18, 21, STAY, NONE, 3, CARBOS
+
+	def_warps_to POKEMON_MANSION_1F
-- 
cgit v1.3.1-sl0p