diff options
Diffstat (limited to 'maps/MountMoonGiftShop.asm')
| -rw-r--r-- | maps/MountMoonGiftShop.asm | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index b24a98e20..54616ea17 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const MOUNTMOONGIFTSHOP_GRAMPS1 ; morning only const MOUNTMOONGIFTSHOP_GRAMPS2 ; day only const MOUNTMOONGIFTSHOP_LASS1 ; morning only const MOUNTMOONGIFTSHOP_LASS2 ; day only MountMoonGiftShop_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks MountMoonGiftShopClerkScript: faceplayer @@ -28,23 +26,18 @@ MountMoonGiftShopLassText: done MountMoonGiftShop_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 3, 7, 3, MOUNT_MOON_SQUARE - warp_def 4, 7, 3, MOUNT_MOON_SQUARE - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 4, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1 - object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1 - object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1 - object_event 5, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 3, 7, MOUNT_MOON_SQUARE, 3 + warp_event 4, 7, MOUNT_MOON_SQUARE, 3 + + db 0 ; coord events + + db 0 ; bg events + + db 4 ; object events + object_event 4, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1 + object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1 + object_event 1, 6, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1 + object_event 5, 4, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1 |