aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/CeruleanCaveB1F.asm
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2020-05-20 20:17:30 -0500
committerGitHub <noreply@github.com>2020-05-20 20:17:30 -0500
commit500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch)
tree7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /data/mapObjects/CeruleanCaveB1F.asm
parentMerge pull request #39 from TiKevin83/master (diff)
parentMerge remote-tracking branch 'pokered/master' (diff)
downloadpokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.gz
pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.xz
pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.zip
Merge pull request #50 from dannye/master
merge pokered
Diffstat (limited to '')
-rwxr-xr-xdata/mapObjects/CeruleanCaveB1F.asm (renamed from data/mapObjects/unknowndungeon3.asm)6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/unknowndungeon3.asm b/data/mapObjects/CeruleanCaveB1F.asm
index b658d9f3..193d674b 100755
--- a/data/mapObjects/unknowndungeon3.asm
+++ b/data/mapObjects/CeruleanCaveB1F.asm
@@ -1,8 +1,8 @@
-UnknownDungeon3Object:
+CeruleanCaveB1F_Object:
db $7d ; border block
db 1 ; warps
- warp 3, 6, 8, UNKNOWN_DUNGEON_1
+ warp 3, 6, 8, CERULEAN_CAVE_1F
db 0 ; signs
@@ -14,4 +14,4 @@ UnknownDungeon3Object:
object SPRITE_BALL, 15, 3, STAY, NONE, 5, MAX_ELIXER
; warp-to
- warp_to 3, 6, UNKNOWN_DUNGEON_3_WIDTH ; UNKNOWN_DUNGEON_1
+ warp_to 3, 6, CERULEAN_CAVE_B1F_WIDTH ; CERULEAN_CAVE_1F