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/celadonmart2.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/CeladonMart2F.asm (renamed from data/mapObjects/celadonmart2.asm) | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/mapObjects/celadonmart2.asm b/data/mapObjects/CeladonMart2F.asm index 215861e6..2f5f428e 100755 --- a/data/mapObjects/celadonmart2.asm +++ b/data/mapObjects/CeladonMart2F.asm @@ -1,9 +1,9 @@ -CeladonMart2Object: +CeladonMart2F_Object: db $f ; border block db 3 ; warps - warp 12, 1, 4, CELADON_MART_1 - warp 16, 1, 1, CELADON_MART_3 + warp 12, 1, 4, CELADON_MART_1F + warp 16, 1, 1, CELADON_MART_3F warp 1, 1, 0, CELADON_MART_ELEVATOR db 1 ; signs @@ -16,6 +16,6 @@ CeladonMart2Object: object SPRITE_GIRL, 14, 4, WALK, 1, 4 ; person ; warp-to - warp_to 12, 1, CELADON_MART_2_WIDTH ; CELADON_MART_1 - warp_to 16, 1, CELADON_MART_2_WIDTH ; CELADON_MART_3 - warp_to 1, 1, CELADON_MART_2_WIDTH ; CELADON_MART_ELEVATOR + warp_to 12, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_1F + warp_to 16, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_3F + warp_to 1, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_ELEVATOR |