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/celadonmart5.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/CeladonMart5F.asm (renamed from data/mapObjects/celadonmart5.asm) | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/celadonmart5.asm b/data/mapObjects/CeladonMart5F.asm index ff4f3955..fb1201c9 100755 --- a/data/mapObjects/celadonmart5.asm +++ b/data/mapObjects/CeladonMart5F.asm @@ -1,9 +1,9 @@ -CeladonMart5Object: +CeladonMart5F_Object: db $f ; border block db 3 ; warps warp 12, 1, 0, CELADON_MART_ROOF - warp 16, 1, 1, CELADON_MART_4 + warp 16, 1, 1, CELADON_MART_4F warp 1, 1, 0, CELADON_MART_ELEVATOR db 1 ; signs @@ -16,6 +16,6 @@ CeladonMart5Object: object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 4 ; person ; warp-to - warp_to 12, 1, CELADON_MART_5_WIDTH ; CELADON_MART_ROOF - warp_to 16, 1, CELADON_MART_5_WIDTH ; CELADON_MART_4F - warp_to 1, 1, CELADON_MART_5_WIDTH ; CELADON_MART_ELEVATOR + warp_to 12, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_ROOF + warp_to 16, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_4F + warp_to 1, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_ELEVATOR |