diff options
Diffstat (limited to 'maps/OlivineLighthouse3F.asm')
| -rw-r--r-- | maps/OlivineLighthouse3F.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 1d07ae2c8..e81f24fb7 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -114,22 +114,22 @@ OlivineLighthouse3F_MapEvents: db 0, 0 ; filler db 9 ; warp events - warp_event 13, 3, OLIVINE_LIGHTHOUSE_4F, 1 - warp_event 5, 3, OLIVINE_LIGHTHOUSE_2F, 2 - warp_event 9, 5, OLIVINE_LIGHTHOUSE_4F, 4 + warp_event 13, 3, OLIVINE_LIGHTHOUSE_4F, 1 + warp_event 5, 3, OLIVINE_LIGHTHOUSE_2F, 2 + warp_event 9, 5, OLIVINE_LIGHTHOUSE_4F, 4 warp_event 16, 11, OLIVINE_LIGHTHOUSE_2F, 5 warp_event 17, 11, OLIVINE_LIGHTHOUSE_2F, 6 - warp_event 16, 9, OLIVINE_LIGHTHOUSE_4F, 5 - warp_event 17, 9, OLIVINE_LIGHTHOUSE_4F, 6 - warp_event 8, 3, OLIVINE_LIGHTHOUSE_4F, 7 - warp_event 9, 3, OLIVINE_LIGHTHOUSE_4F, 8 + warp_event 16, 9, OLIVINE_LIGHTHOUSE_4F, 5 + warp_event 17, 9, OLIVINE_LIGHTHOUSE_4F, 6 + warp_event 8, 3, OLIVINE_LIGHTHOUSE_4F, 7 + warp_event 9, 3, OLIVINE_LIGHTHOUSE_4F, 8 db 0 ; coord events db 0 ; bg events db 4 ; object events - object_event 9, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSailorTerrell, -1 - object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanPreston, -1 - object_event 3, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperTheo, -1 - object_event 8, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse3FEther, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER + object_event 9, 2, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSailorTerrell, -1 + object_event 13, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanPreston, -1 + object_event 3, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperTheo, -1 + object_event 8, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse3FEther, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER |