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/mtmoon1.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/MtMoon1F.asm (renamed from data/mapObjects/mtmoon1.asm) | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/mtmoon1.asm b/data/mapObjects/MtMoon1F.asm index 0215d821..56820161 100755 --- a/data/mapObjects/mtmoon1.asm +++ b/data/mapObjects/MtMoon1F.asm @@ -1,12 +1,12 @@ -MtMoon1Object: +MtMoon1F_Object: db $3 ; border block db 5 ; warps warp 14, 35, 1, -1 warp 15, 35, 1, -1 - warp 5, 5, 0, MT_MOON_2 - warp 17, 11, 2, MT_MOON_2 - warp 25, 15, 3, MT_MOON_2 + warp 5, 5, 0, MT_MOON_B1F + warp 17, 11, 2, MT_MOON_B1F + warp 25, 15, 3, MT_MOON_B1F db 1 ; signs sign 15, 23, 14 ; MtMoon1Text14 @@ -27,8 +27,8 @@ MtMoon1Object: object SPRITE_BALL, 5, 32, STAY, NONE, 13, TM_12 ; warp-to - warp_to 14, 35, MT_MOON_1_WIDTH - warp_to 15, 35, MT_MOON_1_WIDTH - warp_to 5, 5, MT_MOON_1_WIDTH ; MT_MOON_B1F - warp_to 17, 11, MT_MOON_1_WIDTH ; MT_MOON_B1F - warp_to 25, 15, MT_MOON_1_WIDTH ; MT_MOON_B1F + warp_to 14, 35, MT_MOON_1F_WIDTH + warp_to 15, 35, MT_MOON_1F_WIDTH + warp_to 5, 5, MT_MOON_1F_WIDTH ; MT_MOON_B1F + warp_to 17, 11, MT_MOON_1F_WIDTH ; MT_MOON_B1F + warp_to 25, 15, MT_MOON_1F_WIDTH ; MT_MOON_B1F |