diff options
Diffstat (limited to 'maps/VermilionPort.asm')
| -rw-r--r-- | maps/VermilionPort.asm | 85 |
1 files changed, 39 insertions, 46 deletions
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 566350ef9..b231bfa8b 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -1,16 +1,14 @@ -const_value set 2 + const_def 2 ; object constants const VERMILIONPORT_SAILOR1 const VERMILIONPORT_SAILOR2 const VERMILIONPORT_SUPER_NERD VermilionPort_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .LeaveFastShip + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_DEFAULT + scene_script .LeaveFastShip ; SCENE_VERMILIONPORT_LEAVE_SHIP -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: @@ -27,32 +25,32 @@ VermilionPort_MapScripts: .LeaveFastShipScript: applymovement PLAYER, MovementData_0x74ef3 appear VERMILIONPORT_SAILOR1 - setscene 0 + setscene SCENE_DEFAULT setevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 setevent EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN setevent EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP clearevent EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M setevent EVENT_FAST_SHIP_FIRST_TIME - setevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 blackoutmod VERMILION_CITY end VermilionPortSailorAtGangway: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue VermilionPortAlreadyRodeScript writetext UnknownText_0x74f06 waitbutton closetext - spriteface VERMILIONPORT_SAILOR1, DOWN + turnobject VERMILIONPORT_SAILOR1, DOWN pause 10 playsound SFX_EXIT_BUILDING disappear VERMILIONPORT_SAILOR1 waitsfx applymovement PLAYER, MovementData_0x74ef1 playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND @@ -68,7 +66,7 @@ VermilionPortSailorAtGangway: clearevent EVENT_BEAT_SCHOOLBOY_RICKY setevent EVENT_FAST_SHIP_DESTINATION_OLIVINE appear VERMILIONPORT_SAILOR1 - setmapscene FAST_SHIP_1F, 1 + setmapscene FAST_SHIP_1F, SCENE_FASTSHIP1F_ENTER_SHIP warp FAST_SHIP_1F, 25, 1 end @@ -79,19 +77,19 @@ VermilionPortAlreadyRodeScript: end VermilionPortWalkUpToShipScript: - spriteface VERMILIONPORT_SAILOR2, RIGHT - checkevent EVENT_GAVE_KURT_APRICORNS + turnobject VERMILIONPORT_SAILOR2, RIGHT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue .skip - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue .skip - spriteface PLAYER, LEFT + turnobject PLAYER, LEFT opentext checkcode VAR_WEEKDAY - if_equal MONDAY, .NextShipWednesday - if_equal TUESDAY, .NextShipWednesday - if_equal THURSDAY, .NextShipSunday - if_equal FRIDAY, .NextShipSunday - if_equal SATURDAY, .NextShipSunday + ifequal MONDAY, .NextShipWednesday + ifequal TUESDAY, .NextShipWednesday + ifequal THURSDAY, .NextShipSunday + ifequal FRIDAY, .NextShipSunday + ifequal SATURDAY, .NextShipSunday writetext UnknownText_0x74f4d yesorno iffalse VermilionPortNotRidingMoveAwayScript @@ -102,7 +100,7 @@ VermilionPortWalkUpToShipScript: writetext VermilionPortSSTicketText waitbutton closetext - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 applymovement PLAYER, MovementData_0x74ef8 jump VermilionPortSailorAtGangway @@ -146,14 +144,14 @@ VermilionPortNotRidingMoveAwayScript: SailorScript_0x74e97: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue VermilionPortAlreadyRodeScript checkcode VAR_WEEKDAY - if_equal MONDAY, .NextShipWednesday - if_equal TUESDAY, .NextShipWednesday - if_equal THURSDAY, .NextShipSunday - if_equal FRIDAY, .NextShipSunday - if_equal SATURDAY, .NextShipSunday + ifequal MONDAY, .NextShipWednesday + ifequal TUESDAY, .NextShipWednesday + ifequal THURSDAY, .NextShipSunday + ifequal FRIDAY, .NextShipSunday + ifequal SATURDAY, .NextShipSunday writetext UnknownText_0x74f4d yesorno iffalse VermilionPortNotRidingScript @@ -164,7 +162,7 @@ SailorScript_0x74e97: writetext VermilionPortSSTicketText waitbutton closetext - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 applymovement PLAYER, MovementData_0x74efe jump VermilionPortSailorAtGangway @@ -195,7 +193,7 @@ SuperNerdScript_0x74ee6: end VermilionPortHiddenIron: - hiddenitem EVENT_VERMILION_PORT_HIDDEN_IRON, IRON + hiddenitem IRON, EVENT_VERMILION_PORT_HIDDEN_IRON MovementData_0x74ef1: step DOWN @@ -299,24 +297,19 @@ UnknownText_0x750a6: done VermilionPort_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 9, 5, 5, VERMILION_PORT_PASSAGE - warp_def 7, 17, 1, FAST_SHIP_1F + db 2 ; warp events + warp_event 9, 5, VERMILION_PORT_PASSAGE, 5 + warp_event 7, 17, FAST_SHIP_1F, 1 -.CoordEvents: - db 1 - coord_event 7, 11, 0, VermilionPortWalkUpToShipScript + db 1 ; coord events + coord_event 7, 11, SCENE_DEFAULT, VermilionPortWalkUpToShipScript -.BGEvents: - db 1 + db 1 ; bg events bg_event 16, 13, BGEVENT_ITEM, VermilionPortHiddenIron -.ObjectEvents: - db 3 - object_event 7, 17, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortSailorAtGangway, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY - object_event 6, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74e97, -1 + db 3 ; object events + object_event 7, 17, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortSailorAtGangway, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY + object_event 6, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74e97, -1 object_event 11, 11, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x74ee6, -1 |