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/celadonmansion1.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/CeladonMansion1F.asm (renamed from data/mapObjects/celadonmansion1.asm) | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/celadonmansion1.asm b/data/mapObjects/CeladonMansion1F.asm index 423a9a2e..1abd434c 100755 --- a/data/mapObjects/celadonmansion1.asm +++ b/data/mapObjects/CeladonMansion1F.asm @@ -1,12 +1,12 @@ -CeladonMansion1Object: +CeladonMansion1F_Object: db $f ; border block db 5 ; warps warp 4, 11, 2, -1 warp 5, 11, 2, -1 warp 4, 0, 4, -1 - warp 7, 1, 1, CELADON_MANSION_2 - warp 2, 1, 2, CELADON_MANSION_2 + warp 7, 1, 1, CELADON_MANSION_2F + warp 2, 1, 2, CELADON_MANSION_2F db 1 ; signs sign 4, 9, 5 ; CeladonMansion1Text5 @@ -18,8 +18,8 @@ CeladonMansion1Object: object SPRITE_SLOWBRO, 4, 4, WALK, 1, 4 ; person ; warp-to - warp_to 4, 11, CELADON_MANSION_1_WIDTH - warp_to 5, 11, CELADON_MANSION_1_WIDTH - warp_to 4, 0, CELADON_MANSION_1_WIDTH - warp_to 7, 1, CELADON_MANSION_1_WIDTH ; CELADON_MANSION_2 - warp_to 2, 1, CELADON_MANSION_1_WIDTH ; CELADON_MANSION_2 + warp_to 4, 11, CELADON_MANSION_1F_WIDTH + warp_to 5, 11, CELADON_MANSION_1F_WIDTH + warp_to 4, 0, CELADON_MANSION_1F_WIDTH + warp_to 7, 1, CELADON_MANSION_1F_WIDTH ; CELADON_MANSION_2F + warp_to 2, 1, CELADON_MANSION_1F_WIDTH ; CELADON_MANSION_2F |