diff options
Diffstat (limited to 'maps/VermilionPort.asm')
| -rw-r--r-- | maps/VermilionPort.asm | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index bce464809..07e6ae00c 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -1,12 +1,12 @@ VermilionPort_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw .Trigger1, $0000 dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -27,19 +27,19 @@ UnknownScript_0x74da6: applymovement $0, MovementData_0x74ef3 appear $2 dotrigger $0 - setevent $0731 - setevent $0730 - setevent $0739 - clearevent $0733 - setevent $0030 - setevent $0000 + 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 blackoutmod GROUP_VERMILION_CITY, MAP_VERMILION_CITY end SailorScript_0x74dc4: faceplayer loadfont - checkevent $0000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74e1a writetext UnknownText_0x74f06 closetext @@ -51,10 +51,10 @@ SailorScript_0x74dc4: waitbutton applymovement $0, MovementData_0x74ef1 playsound SFX_EXIT_BUILDING - special Function8c084 + special FadeBlackBGMap waitbutton - setevent $073a - clearevent $073b + setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND clearevent EVENT_BEAT_POKEMANIAC_ETHAN clearevent EVENT_BEAT_BURGLAR_COREY clearevent EVENT_BEAT_BUG_CATCHER_KEN @@ -65,7 +65,7 @@ SailorScript_0x74dc4: clearevent EVENT_BEAT_TEACHER_SHIRLEY clearevent EVENT_BEAT_SCHOOLBOY_NATE clearevent EVENT_BEAT_SCHOOLBOY_RICKY - setevent $002f + setevent EVENT_FAST_SHIP_DESTINATION_OLIVINE appear $2 domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $1 warp GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $19, $1 @@ -79,13 +79,13 @@ UnknownScript_0x74e1a: UnknownScript_0x74e20: spriteface $3, RIGHT - checkevent $0000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74e86 - checkevent $0001 + checkevent EVENT_RECEIVED_BALLS_FROM_KURT iftrue UnknownScript_0x74e86 spriteface $0, LEFT loadfont - checkcode $b + checkcode VAR_WEEKDAY if_equal MONDAY, UnknownScript_0x74e72 if_equal TUESDAY, UnknownScript_0x74e72 if_equal THURSDAY, UnknownScript_0x74e7c @@ -101,7 +101,7 @@ UnknownScript_0x74e20: writetext UnknownText_0x74fc2 closetext loadmovesprites - setevent $0001 + setevent EVENT_RECEIVED_BALLS_FROM_KURT applymovement $0, MovementData_0x74ef8 jump SailorScript_0x74dc4 @@ -145,9 +145,9 @@ UnknownScript_0x74e8d: SailorScript_0x74e97: faceplayer loadfont - checkevent $0000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74e1a - checkcode $b + checkcode VAR_WEEKDAY if_equal MONDAY, UnknownScript_0x74eda if_equal TUESDAY, UnknownScript_0x74eda if_equal THURSDAY, UnknownScript_0x74ee0 @@ -163,7 +163,7 @@ SailorScript_0x74e97: writetext UnknownText_0x74fc2 closetext loadmovesprites - setevent $0001 + setevent EVENT_RECEIVED_BALLS_FROM_KURT applymovement $0, MovementData_0x74efe jump SailorScript_0x74dc4 @@ -194,8 +194,7 @@ SuperNerdScript_0x74ee6: end MapVermilionPortSignpostItem0: - dw $00eb - db IRON + dwb EVENT_VERMILION_PORT_HIDDEN_IRON, IRON MovementData_0x74ef1: @@ -303,21 +302,21 @@ VermilionPort_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $5, $9, 5, GROUP_VERMILION_PORT_PASSAGE, MAP_VERMILION_PORT_PASSAGE warp_def $11, $7, 1, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - ; xy triggers +.XYTriggers: db 1 xy_trigger 0, $b, $7, $0, UnknownScript_0x74e20, $0, $0 - ; signposts +.Signposts: db 1 - signpost 13, 16, $7, MapVermilionPortSignpostItem0 + signpost 13, 16, SIGNPOST_ITEM, MapVermilionPortSignpostItem0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_SAILOR, 21, 11, $7, $0, 255, 255, $0, 0, SailorScript_0x74dc4, $072b - person_event SPRITE_SAILOR, 15, 10, $9, $0, 255, 255, $0, 0, SailorScript_0x74e97, $ffff - person_event SPRITE_SUPER_NERD, 15, 15, $5, $2, 255, 255, $0, 0, SuperNerdScript_0x74ee6, $ffff + person_event SPRITE_SAILOR, 21, 11, OW_UP | $3, $0, -1, -1, $0, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY + person_event SPRITE_SAILOR, 15, 10, OW_LEFT | $1, $0, -1, -1, $0, 0, SailorScript_0x74e97, -1 + person_event SPRITE_SUPER_NERD, 15, 15, OW_UP | $1, $2, -1, -1, $0, 0, SuperNerdScript_0x74ee6, -1 |