summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsurskitty <surskitty@gmail.com>2017-12-25 14:31:24 -0500
committersurskitty <surskitty@gmail.com>2017-12-25 14:31:24 -0500
commit41d4d3d37fb3f9f97ad78f83458a2bad58c0eaf0 (patch)
tree54725be9c088d45b9c9f9e37194b5036cbf24a84
parentf22e127bb9be22b90c421c0528ef01ce49a31267 (diff)
Mt Moon gift shop NPCs are only there in the morning and day.
-rw-r--r--maps/MountMoonGiftShop.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm
index 954ab2d26..cc4e5bbfb 100644
--- a/maps/MountMoonGiftShop.asm
+++ b/maps/MountMoonGiftShop.asm
@@ -1,8 +1,8 @@
const_value set 2
- const MOUNTMOONGIFTSHOP_GRAMPS1
- const MOUNTMOONGIFTSHOP_GRAMPS2
- const MOUNTMOONGIFTSHOP_LASS1
- const MOUNTMOONGIFTSHOP_LASS2
+ const MOUNTMOONGIFTSHOP_GRAMPS1 ; morning only
+ const MOUNTMOONGIFTSHOP_GRAMPS2 ; day only
+ const MOUNTMOONGIFTSHOP_LASS1 ; morning only
+ const MOUNTMOONGIFTSHOP_LASS2 ; day only
MountMoonGiftShop_MapScriptHeader:
.SceneScripts:
@@ -11,7 +11,7 @@ MountMoonGiftShop_MapScriptHeader:
.MapCallbacks:
db 0
-GrampsScript_0x771a8:
+MountMoonGiftShopClerkScript:
faceplayer
opentext
pokemart MARTTYPE_STANDARD, MART_MT_MOON
@@ -44,7 +44,7 @@ MountMoonGiftShop_MapEventHeader:
.ObjectEvents:
db 4
- object_event SPRITE_GRAMPS, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1
- object_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x771a8, -1
+ object_event SPRITE_GRAMPS, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1
+ object_event SPRITE_GRAMPS, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopClerkScript, -1
object_event SPRITE_LASS, 6, 1, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1
object_event SPRITE_LASS, 4, 5, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MountMoonGiftShopLassScript, -1