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/celadonmansion3.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/CeladonMansion3F.asm (renamed from data/mapObjects/celadonmansion3.asm) | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/celadonmansion3.asm b/data/mapObjects/CeladonMansion3F.asm index 129a7148..32701f14 100755 --- a/data/mapObjects/celadonmansion3.asm +++ b/data/mapObjects/CeladonMansion3F.asm @@ -1,11 +1,11 @@ -CeladonMansion3Object: +CeladonMansion3F_Object: db $f ; border block db 4 ; warps - warp 6, 1, 0, CELADON_MANSION_2 - warp 7, 1, 0, CELADON_MANSION_4 - warp 2, 1, 1, CELADON_MANSION_4 - warp 4, 1, 3, CELADON_MANSION_2 + warp 6, 1, 0, CELADON_MANSION_2F + warp 7, 1, 0, CELADON_MANSION_ROOF + warp 2, 1, 1, CELADON_MANSION_ROOF + warp 4, 1, 3, CELADON_MANSION_2F db 4 ; signs sign 1, 3, 5 ; CeladonMansion3Text5 @@ -20,7 +20,7 @@ CeladonMansion3Object: object SPRITE_LAPRAS_GIVER, 2, 3, STAY, NONE, 4 ; person ; warp-to - warp_to 6, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_2F - warp_to 7, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_ROOF - warp_to 2, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_ROOF - warp_to 4, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_2F + warp_to 6, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_2F + warp_to 7, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_ROOF + warp_to 2, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_ROOF + warp_to 4, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_2F |