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/celadonmart2.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/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 db095add..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_1F - warp_to 16, 1, CELADON_MART_2_WIDTH ; CELADON_MART_3F - 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 |