aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/DiglettsCaveRoute11.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/DiglettsCaveRoute11.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/DiglettsCaveRoute11.asm (renamed from data/mapObjects/diglettscaveroute11.asm)8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/diglettscaveroute11.asm b/data/mapObjects/DiglettsCaveRoute11.asm
index af28bfbf..a4c70f06 100755
--- a/data/mapObjects/diglettscaveroute11.asm
+++ b/data/mapObjects/DiglettsCaveRoute11.asm
@@ -1,4 +1,4 @@
-DiglettsCaveEntranceRoute11Object:
+DiglettsCaveRoute11_Object:
db $7d ; border block
db 3 ; warps
@@ -12,6 +12,6 @@ DiglettsCaveEntranceRoute11Object:
object SPRITE_GAMBLER, 2, 3, STAY, NONE, 1 ; person
; warp-to
- warp_to 2, 7, DIGLETTS_CAVE_ENTRANCE_WIDTH
- warp_to 3, 7, DIGLETTS_CAVE_ENTRANCE_WIDTH
- warp_to 4, 4, DIGLETTS_CAVE_ENTRANCE_WIDTH ; DIGLETTS_CAVE
+ warp_to 2, 7, DIGLETTS_CAVE_ROUTE_11_WIDTH
+ warp_to 3, 7, DIGLETTS_CAVE_ROUTE_11_WIDTH
+ warp_to 4, 4, DIGLETTS_CAVE_ROUTE_11_WIDTH ; DIGLETTS_CAVE