diff options
Diffstat (limited to 'maps/OlivineLighthouse3F.asm')
| -rw-r--r-- | maps/OlivineLighthouse3F.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 500dab0c9..2c6662029 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -118,15 +118,15 @@ OlivineLighthouse3F_MapEventHeader: .Warps: db 9 - warp_def $3, $d, 1, OLIVINE_LIGHTHOUSE_4F - warp_def $3, $5, 2, OLIVINE_LIGHTHOUSE_2F - warp_def $5, $9, 4, OLIVINE_LIGHTHOUSE_4F - warp_def $b, $10, 5, OLIVINE_LIGHTHOUSE_2F - warp_def $b, $11, 6, OLIVINE_LIGHTHOUSE_2F - warp_def $9, $10, 5, OLIVINE_LIGHTHOUSE_4F - warp_def $9, $11, 6, OLIVINE_LIGHTHOUSE_4F - warp_def $3, $8, 7, OLIVINE_LIGHTHOUSE_4F - warp_def $3, $9, 8, OLIVINE_LIGHTHOUSE_4F + warp_def 13, 3, 1, OLIVINE_LIGHTHOUSE_4F + warp_def 5, 3, 2, OLIVINE_LIGHTHOUSE_2F + warp_def 9, 5, 4, OLIVINE_LIGHTHOUSE_4F + warp_def 16, 11, 5, OLIVINE_LIGHTHOUSE_2F + warp_def 17, 11, 6, OLIVINE_LIGHTHOUSE_2F + warp_def 16, 9, 5, OLIVINE_LIGHTHOUSE_4F + warp_def 17, 9, 6, OLIVINE_LIGHTHOUSE_4F + warp_def 8, 3, 7, OLIVINE_LIGHTHOUSE_4F + warp_def 9, 3, 8, OLIVINE_LIGHTHOUSE_4F .CoordEvents: db 0 @@ -136,7 +136,7 @@ OlivineLighthouse3F_MapEventHeader: .ObjectEvents: db 4 - object_event SPRITE_SAILOR, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSailorTerrell, -1 - object_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanPreston, -1 - object_event SPRITE_YOUNGSTER, 9, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperTheo, -1 - object_event SPRITE_POKE_BALL, 2, 8, SPRITEMOVEDATA_ITEM_TREE, 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_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse3FEther, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER |