diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /data/mapObjects/celadonmart1.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| download | pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip | |
Sync with pokered
Diffstat (limited to '')
| -rwxr-xr-x | data/mapObjects/CeladonMart1F.asm (renamed from data/mapObjects/celadonmart1.asm) | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/celadonmart1.asm b/data/mapObjects/CeladonMart1F.asm index b2a8fdcd..2037369a 100755 --- a/data/mapObjects/celadonmart1.asm +++ b/data/mapObjects/CeladonMart1F.asm @@ -1,4 +1,4 @@ -CeladonMart1Object: +CeladonMart1F_Object: db $f ; border block db 6 ; warps @@ -6,7 +6,7 @@ CeladonMart1Object: warp 3, 7, 0, -1 warp 16, 7, 1, -1 warp 17, 7, 1, -1 - warp 12, 1, 0, CELADON_MART_2 + warp 12, 1, 0, CELADON_MART_2F warp 1, 1, 0, CELADON_MART_ELEVATOR db 2 ; signs @@ -17,9 +17,9 @@ CeladonMart1Object: object SPRITE_CABLE_CLUB_WOMAN, 8, 3, STAY, DOWN, 1 ; person ; warp-to - warp_to 2, 7, CELADON_MART_1_WIDTH - warp_to 3, 7, CELADON_MART_1_WIDTH - warp_to 16, 7, CELADON_MART_1_WIDTH - warp_to 17, 7, CELADON_MART_1_WIDTH - warp_to 12, 1, CELADON_MART_1_WIDTH ; CELADON_MART_2F - warp_to 1, 1, CELADON_MART_1_WIDTH ; CELADON_MART_ELEVATOR + warp_to 2, 7, CELADON_MART_1F_WIDTH + warp_to 3, 7, CELADON_MART_1F_WIDTH + warp_to 16, 7, CELADON_MART_1F_WIDTH + warp_to 17, 7, CELADON_MART_1F_WIDTH + warp_to 12, 1, CELADON_MART_1F_WIDTH ; CELADON_MART_2F + warp_to 1, 1, CELADON_MART_1F_WIDTH ; CELADON_MART_ELEVATOR |