diff options
Diffstat (limited to 'maps/FastShipCabins_SW_SSW_NW.asm')
| -rw-r--r-- | maps/FastShipCabins_SW_SSW_NW.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 15200b33c..275fb5db7 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -224,21 +224,21 @@ FastShipCabins_SW_SSW_NW_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 2, 0, FAST_SHIP_1F, 5 - warp_event 2, 19, FAST_SHIP_1F, 6 - warp_event 3, 19, FAST_SHIP_1F, 6 - warp_event 2, 31, FAST_SHIP_1F, 7 - warp_event 3, 31, FAST_SHIP_1F, 7 + warp_event 2, 0, FAST_SHIP_1F, 5 + warp_event 2, 19, FAST_SHIP_1F, 6 + warp_event 3, 19, FAST_SHIP_1F, 6 + warp_event 2, 31, FAST_SHIP_1F, 7 + warp_event 3, 31, FAST_SHIP_1F, 7 db 0 ; coord events db 3 ; bg events - bg_event 7, 1, BGEVENT_READ, FastShipBed - bg_event 7, 2, BGEVENT_READ, FastShipBed - bg_event 7, 7, BGEVENT_READ, FastShipCabinsNorthwestCabinTrashcan + bg_event 7, 1, BGEVENT_READ, FastShipBed + bg_event 7, 2, BGEVENT_READ, FastShipBed + bg_event 7, 7, BGEVENT_READ, FastShipCabinsNorthwestCabinTrashcan db 4 ; object events - object_event 1, 15, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - object_event 6, 15, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND - object_event 1, 26, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND - object_event 3, 28, SPRITE_ROCKER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event 1, 15, SPRITE_FISHER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + object_event 6, 15, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event 1, 26, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + object_event 3, 28, SPRITE_ROCKER, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND |