diff options
Diffstat (limited to 'maps/OlivineLighthouse5F.asm')
| -rw-r--r-- | maps/OlivineLighthouse5F.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 5b29a089e..e7c4a7884 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -97,25 +97,25 @@ OlivineLighthouse5F_MapEventHeader: .Warps: db 7 - warp_def $f, $9, 1, OLIVINE_LIGHTHOUSE_6F - warp_def $5, $3, 2, OLIVINE_LIGHTHOUSE_4F - warp_def $7, $9, 3, OLIVINE_LIGHTHOUSE_4F - warp_def $7, $10, 9, OLIVINE_LIGHTHOUSE_4F - warp_def $7, $11, 10, OLIVINE_LIGHTHOUSE_4F - warp_def $5, $10, 2, OLIVINE_LIGHTHOUSE_6F - warp_def $5, $11, 3, OLIVINE_LIGHTHOUSE_6F + warp_def 9, 15, 1, OLIVINE_LIGHTHOUSE_6F + warp_def 3, 5, 2, OLIVINE_LIGHTHOUSE_4F + warp_def 9, 7, 3, OLIVINE_LIGHTHOUSE_4F + warp_def 16, 7, 9, OLIVINE_LIGHTHOUSE_4F + warp_def 17, 7, 10, OLIVINE_LIGHTHOUSE_4F + warp_def 16, 5, 2, OLIVINE_LIGHTHOUSE_6F + warp_def 17, 5, 3, OLIVINE_LIGHTHOUSE_6F .CoordEvents: db 0 .BGEvents: db 1 - bg_event 13, 3, BGEVENT_ITEM, OlivineLighthouse5FHiddenHyperPotion + bg_event 3, 13, BGEVENT_ITEM, OlivineLighthouse5FHiddenHyperPotion .ObjectEvents: db 5 - object_event SPRITE_SAILOR, 11, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorErnest, -1 - object_event SPRITE_YOUNGSTER, 3, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerBirdKeeperDenis, -1 - object_event SPRITE_POKE_BALL, 12, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY - object_event SPRITE_POKE_BALL, 15, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FSuperRepel, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL - object_event SPRITE_POKE_BALL, 13, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FTMSwagger, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER + object_event 8, 11, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorErnest, -1 + object_event 8, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerBirdKeeperDenis, -1 + object_event 15, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY + object_event 6, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FSuperRepel, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL + object_event 2, 13, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FTMSwagger, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER |