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/CinnabarLabTradeRoom.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/CinnabarLabTradeRoom.asm (renamed from data/mapObjects/lab2.asm) | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/lab2.asm b/data/mapObjects/CinnabarLabTradeRoom.asm index 3062fcae..449cc914 100755 --- a/data/mapObjects/lab2.asm +++ b/data/mapObjects/CinnabarLabTradeRoom.asm @@ -1,9 +1,9 @@ -Lab2Object: +CinnabarLabTradeRoom_Object: db $17 ; border block db 2 ; warps - warp 2, 7, 2, CINNABAR_LAB_1 - warp 3, 7, 2, CINNABAR_LAB_1 + warp 2, 7, 2, CINNABAR_LAB + warp 3, 7, 2, CINNABAR_LAB db 0 ; signs @@ -13,5 +13,5 @@ Lab2Object: object SPRITE_FOULARD_WOMAN, 5, 5, STAY, UP, 3 ; person ; warp-to - warp_to 2, 7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1 - warp_to 3, 7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1 + warp_to 2, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB + warp_to 3, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB |