diff options
Diffstat (limited to 'maps/FastShipCabins_NNW_NNE_NE.asm')
| -rw-r--r-- | maps/FastShipCabins_NNW_NNE_NE.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 8bc91d408..c2af9728b 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -78,7 +78,7 @@ TrainerBurglarCorey: closetext end -SailorScript_0x755f1: +FastShipLazySailorScript: playmusic MUSIC_HIKER_ENCOUNTER faceplayer opentext @@ -98,15 +98,15 @@ SailorScript_0x755f1: setevent EVENT_FAST_SHIP_LAZY_SAILOR setmapscene FAST_SHIP_B1F, SCENE_FINISHED checkcode VAR_FACING - ifequal RIGHT, UnknownScript_0x75629 - applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x75637 + ifequal RIGHT, .Movement2 + applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, FastShipLazySailorLeavesMovement1 playsound SFX_EXIT_BUILDING disappear FASTSHIPCABINS_NNW_NNE_NE_SAILOR waitsfx end -UnknownScript_0x75629: - applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x7563c +.Movement2: + applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, FastShipLazySailorLeavesMovement2 playsound SFX_EXIT_BUILDING disappear FASTSHIPCABINS_NNW_NNE_NE_SAILOR waitsfx @@ -115,14 +115,14 @@ UnknownScript_0x75629: FastShipCabins_NNW_NNE_NETrashcan: jumpstd trashcan -MovementData_0x75637: +FastShipLazySailorLeavesMovement1: step LEFT step LEFT step UP step UP step_end -MovementData_0x7563c: +FastShipLazySailorLeavesMovement2: step DOWN step LEFT step LEFT @@ -284,6 +284,6 @@ FastShipCabins_NNW_NNE_NE_MapEvents: object_event 1, 5, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND object_event 1, 5, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND object_event 4, 17, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - object_event 4, 26, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SailorScript_0x755f1, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR + object_event 4, 26, SPRITE_SAILOR, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FastShipLazySailorScript, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR object_event 7, 30, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND object_event 2, 30, SPRITE_PHARMACIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND |