summaryrefslogtreecommitdiff
path: root/maps/Pokecenter2F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Pokecenter2F.asm')
-rw-r--r--maps/Pokecenter2F.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index 27a5224f9..2f15c0c10 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -1024,20 +1024,20 @@ Pokecenter2F_MapEvents:
db 0, 0 ; filler
db 6 ; warp events
- warp_event 0, 7, POKECENTER_2F, -1
- warp_event 5, 0, TRADE_CENTER, 1
- warp_event 9, 0, COLOSSEUM, 1
- warp_event 13, 2, TIME_CAPSULE, 1
- warp_event 6, 0, MOBILE_TRADE_ROOM, 1
- warp_event 10, 0, MOBILE_BATTLE_ROOM, 1
+ warp_event 0, 7, POKECENTER_2F, -1
+ warp_event 5, 0, TRADE_CENTER, 1
+ warp_event 9, 0, COLOSSEUM, 1
+ warp_event 13, 2, TIME_CAPSULE, 1
+ warp_event 6, 0, MOBILE_TRADE_ROOM, 1
+ warp_event 10, 0, MOBILE_BATTLE_ROOM, 1
db 0 ; coord events
db 1 ; bg events
- bg_event 7, 3, BGEVENT_READ, MapPokecenter2FSignpost0Script
+ bg_event 7, 3, BGEVENT_READ, MapPokecenter2FSignpost0Script
db 4 ; object events
- object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Trade, -1
- object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Battle, -1
- object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_TimeCapsule, -1
- object_event 1, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x192c9a, EVENT_MYSTERY_GIFT_DELIVERY_GUY
+ object_event 5, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Trade, -1
+ object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_Battle, -1
+ object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LinkReceptionistScript_TimeCapsule, -1
+ object_event 1, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x192c9a, EVENT_MYSTERY_GIFT_DELIVERY_GUY