diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-01-01 15:06:23 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-01-01 23:33:10 -0500 |
| commit | c7796024590fec48ac79756793c1a6e3b54daf8f (patch) | |
| tree | 0d61caa7ebe429995a61e800d1d78c3a82aec886 /data/mapObjects/lab2.asm | |
| parent | Merge pull request #193 from luckytyphlosion/master (diff) | |
| download | pokeyellow-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 '')
| -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 |