diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-05-20 20:17:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 20:17:30 -0500 |
| commit | 500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /data/mapObjects/DiglettsCaveRoute2.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| parent | Merge remote-tracking branch 'pokered/master' (diff) | |
| download | pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.gz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.xz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.zip | |
Merge pull request #50 from dannye/master
merge pokered
Diffstat (limited to '')
| -rwxr-xr-x | data/mapObjects/DiglettsCaveRoute2.asm (renamed from data/mapObjects/diglettscaveroute2.asm) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/diglettscaveroute2.asm b/data/mapObjects/DiglettsCaveRoute2.asm index 645cc385..0567fee6 100755 --- a/data/mapObjects/diglettscaveroute2.asm +++ b/data/mapObjects/DiglettsCaveRoute2.asm @@ -1,4 +1,4 @@ -DiglettsCaveRoute2Object: +DiglettsCaveRoute2_Object: db $7d ; border block db 3 ; warps @@ -12,6 +12,6 @@ DiglettsCaveRoute2Object: object SPRITE_FISHER, 3, 3, STAY, NONE, 1 ; person ; warp-to - warp_to 2, 7, DIGLETTS_CAVE_EXIT_WIDTH - warp_to 3, 7, DIGLETTS_CAVE_EXIT_WIDTH - warp_to 4, 4, DIGLETTS_CAVE_EXIT_WIDTH ; DIGLETTS_CAVE + warp_to 2, 7, DIGLETTS_CAVE_ROUTE_2_WIDTH + warp_to 3, 7, DIGLETTS_CAVE_ROUTE_2_WIDTH + warp_to 4, 4, DIGLETTS_CAVE_ROUTE_2_WIDTH ; DIGLETTS_CAVE |