aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/MtMoonB2F.asm
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2019-01-13 22:38:16 -0600
committerGitHub <noreply@github.com>2019-01-13 22:38:16 -0600
commit725b86ebbec23bd1f53fd60bf0201c904fee951d (patch)
treea37f4d33c5b77635c7ff72b91a73fcd90c4af915 /data/mapObjects/MtMoonB2F.asm
parentMerge pull request #195 from Rangi42/master (diff)
parentRename map files, labels, and constants to be consistent and work with Polish... (diff)
downloadpokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.gz
pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.xz
pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.zip
Merge pull request #196 from Rangi42/polishedmaps
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to '')
-rwxr-xr-xdata/mapObjects/MtMoonB2F.asm (renamed from data/mapObjects/mtmoon3.asm)18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/mtmoon3.asm b/data/mapObjects/MtMoonB2F.asm
index 13aa5a79..27b2383f 100755
--- a/data/mapObjects/mtmoon3.asm
+++ b/data/mapObjects/MtMoonB2F.asm
@@ -1,11 +1,11 @@
-MtMoon3Object:
+MtMoonB2F_Object:
db $3 ; border block
db 4 ; warps
- warp 25, 9, 1, MT_MOON_2
- warp 21, 17, 4, MT_MOON_2
- warp 15, 27, 5, MT_MOON_2
- warp 5, 7, 6, MT_MOON_2
+ warp 25, 9, 1, MT_MOON_B1F
+ warp 21, 17, 4, MT_MOON_B1F
+ warp 15, 27, 5, MT_MOON_B1F
+ warp 5, 7, 6, MT_MOON_B1F
db 0 ; signs
@@ -21,7 +21,7 @@ MtMoon3Object:
object SPRITE_BALL, 29, 5, STAY, NONE, 9, TM_01
; warp-to
- warp_to 25, 9, MT_MOON_3_WIDTH ; MT_MOON_2
- warp_to 21, 17, MT_MOON_3_WIDTH ; MT_MOON_2
- warp_to 15, 27, MT_MOON_3_WIDTH ; MT_MOON_2
- warp_to 5, 7, MT_MOON_3_WIDTH ; MT_MOON_2
+ warp_to 25, 9, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
+ warp_to 21, 17, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
+ warp_to 15, 27, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
+ warp_to 5, 7, MT_MOON_B2F_WIDTH ; MT_MOON_B1F