aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/mtmoon3.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2020-05-20 19:40:33 -0500
committerdannye <33dannye@gmail.com>2020-05-20 20:02:53 -0500
commit10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch)
tree7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /data/mapObjects/mtmoon3.asm
parentMerge pull request #39 from TiKevin83/master (diff)
downloadpokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz
pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz
pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip
Sync with pokered
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 f76a3e26..a4c9869a 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
@@ -22,7 +22,7 @@ MtMoon3Object:
object SPRITE_BALL, 29, 5, STAY, NONE, 10, 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