aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/bruno.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2019-01-01 15:06:23 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2019-01-01 23:33:10 -0500
commitc7796024590fec48ac79756793c1a6e3b54daf8f (patch)
tree0d61caa7ebe429995a61e800d1d78c3a82aec886 /data/mapObjects/bruno.asm
parentMerge pull request #193 from luckytyphlosion/master (diff)
downloadpokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.tar.gz
pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.tar.xz
pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.zip
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to 'data/mapObjects/bruno.asm')
-rwxr-xr-xdata/mapObjects/bruno.asm19
1 files changed, 0 insertions, 19 deletions
diff --git a/data/mapObjects/bruno.asm b/data/mapObjects/bruno.asm
deleted file mode 100755
index 45d21186..00000000
--- a/data/mapObjects/bruno.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-BrunoObject:
- db $3 ; border block
-
- db 4 ; warps
- warp 4, 11, 2, LORELEIS_ROOM
- warp 5, 11, 3, LORELEIS_ROOM
- warp 4, 0, 0, AGATHAS_ROOM
- warp 5, 0, 1, AGATHAS_ROOM
-
- db 0 ; signs
-
- db 1 ; objects
- object SPRITE_BRUNO, 5, 2, STAY, DOWN, 1, OPP_BRUNO, 1
-
- ; warp-to
- warp_to 4, 11, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM
- warp_to 5, 11, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM
- warp_to 4, 0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM
- warp_to 5, 0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM