diff options
Diffstat (limited to 'maps/OlivinePort.asm')
| -rw-r--r-- | maps/OlivinePort.asm | 111 |
1 files changed, 52 insertions, 59 deletions
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 0b9b8882a..558812ebe 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const OLIVINEPORT_SAILOR1 const OLIVINEPORT_SAILOR2 const OLIVINEPORT_SAILOR3 @@ -8,13 +8,11 @@ const_value set 2 const OLIVINEPORT_COOLTRAINER_F OlivinePort_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .LeaveFastShip + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_DEFAULT + scene_script .LeaveFastShip ; SCENE_OLIVINEPORT_LEAVE_SHIP -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -26,27 +24,27 @@ OlivinePort_MapScripts: .LeaveFastShipScript: applymovement PLAYER, MovementData_0x74a32 appear OLIVINEPORT_SAILOR1 - setscene 0 - setevent EVENT_GAVE_KURT_APRICORNS + setscene SCENE_DEFAULT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 blackoutmod OLIVINE_CITY end SailorScript_0x748c0: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x74919 writetext UnknownText_0x74a55 waitbutton closetext - spriteface OLIVINEPORT_SAILOR1, DOWN + turnobject OLIVINEPORT_SAILOR1, DOWN pause 10 playsound SFX_EXIT_BUILDING disappear OLIVINEPORT_SAILOR1 waitsfx applymovement PLAYER, MovementData_0x74a30 playsound SFX_EXIT_BUILDING - special Special_FadeOutPalettes + special FadeOutPalettes waitsfx checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x7490a @@ -64,7 +62,7 @@ SailorScript_0x748c0: UnknownScript_0x7490a: clearevent EVENT_FAST_SHIP_DESTINATION_OLIVINE appear OLIVINEPORT_SAILOR1 - setmapscene FAST_SHIP_1F, 1 + setmapscene FAST_SHIP_1F, SCENE_FASTSHIP1F_ENTER_SHIP warp FAST_SHIP_1F, 25, 1 end @@ -75,21 +73,21 @@ UnknownScript_0x74919: end UnknownScript_0x7491f: - spriteface OLIVINEPORT_SAILOR3, RIGHT - checkevent EVENT_GAVE_KURT_APRICORNS + turnobject OLIVINEPORT_SAILOR3, RIGHT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x7498b - checkevent EVENT_RECEIVED_BALLS_FROM_KURT + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 iftrue UnknownScript_0x7498b - spriteface PLAYER, LEFT + turnobject PLAYER, LEFT opentext checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x7494e checkcode VAR_WEEKDAY - if_equal SUNDAY, UnknownScript_0x74977 - if_equal SATURDAY, UnknownScript_0x74977 - if_equal TUESDAY, UnknownScript_0x74981 - if_equal WEDNESDAY, UnknownScript_0x74981 - if_equal THURSDAY, UnknownScript_0x74981 + ifequal SUNDAY, UnknownScript_0x74977 + ifequal SATURDAY, UnknownScript_0x74977 + ifequal TUESDAY, UnknownScript_0x74981 + ifequal WEDNESDAY, UnknownScript_0x74981 + ifequal THURSDAY, UnknownScript_0x74981 UnknownScript_0x7494e: writetext UnknownText_0x74a9c yesorno @@ -101,7 +99,7 @@ UnknownScript_0x7494e: writetext UnknownText_0x74b11 waitbutton closetext - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 applymovement PLAYER, MovementData_0x74a37 jump SailorScript_0x748c0 @@ -145,16 +143,16 @@ UnknownScript_0x74992: SailorScript_0x7499c: faceplayer opentext - checkevent EVENT_GAVE_KURT_APRICORNS + checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 iftrue UnknownScript_0x74919 checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x749c0 checkcode VAR_WEEKDAY - if_equal SUNDAY, UnknownScript_0x749f2 - if_equal SATURDAY, UnknownScript_0x749f2 - if_equal TUESDAY, UnknownScript_0x749f8 - if_equal WEDNESDAY, UnknownScript_0x749f8 - if_equal THURSDAY, UnknownScript_0x749f8 + ifequal SUNDAY, UnknownScript_0x749f2 + ifequal SATURDAY, UnknownScript_0x749f2 + ifequal TUESDAY, UnknownScript_0x749f8 + ifequal WEDNESDAY, UnknownScript_0x749f8 + ifequal THURSDAY, UnknownScript_0x749f8 UnknownScript_0x749c0: writetext UnknownText_0x74a9c yesorno @@ -166,9 +164,9 @@ UnknownScript_0x749c0: writetext UnknownText_0x74b11 waitbutton closetext - setevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 checkcode VAR_FACING - if_equal RIGHT, UnknownScript_0x749e5 + ifequal RIGHT, UnknownScript_0x749e5 applymovement PLAYER, MovementData_0x74a3f jump SailorScript_0x748c0 @@ -203,7 +201,7 @@ FishingGuruScript_0x74a01: writetext UnknownText_0x74bf4 waitbutton closetext - spriteface OLIVINEPORT_FISHING_GURU1, UP + turnobject OLIVINEPORT_FISHING_GURU1, UP end FishingGuruScript_0x74a0c: @@ -212,7 +210,7 @@ FishingGuruScript_0x74a0c: writetext UnknownText_0x74c35 waitbutton closetext - spriteface OLIVINEPORT_FISHING_GURU2, UP + turnobject OLIVINEPORT_FISHING_GURU2, UP end YoungsterScript_0x74a17: @@ -221,7 +219,7 @@ YoungsterScript_0x74a17: writetext UnknownText_0x74c76 waitbutton closetext - spriteface OLIVINEPORT_YOUNGSTER, DOWN + turnobject OLIVINEPORT_YOUNGSTER, DOWN end CooltrainerFScript_0x74a22: @@ -230,11 +228,11 @@ CooltrainerFScript_0x74a22: writetext UnknownText_0x74ca2 waitbutton closetext - spriteface OLIVINEPORT_COOLTRAINER_F, DOWN + turnobject OLIVINEPORT_COOLTRAINER_F, DOWN end OlivinePortHiddenProtein: - hiddenitem EVENT_OLIVINE_PORT_HIDDEN_PROTEIN, PROTEIN + hiddenitem PROTEIN, EVENT_OLIVINE_PORT_HIDDEN_PROTEIN MovementData_0x74a30: step DOWN @@ -385,28 +383,23 @@ OlivinePortSailorText: done OlivinePort_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 11, 7, 5, OLIVINE_PORT_PASSAGE - warp_def 7, 23, 1, FAST_SHIP_1F - -.CoordEvents: - db 1 - coord_event 7, 15, 0, UnknownScript_0x7491f - -.BGEvents: - db 1 - bg_event 1, 22, BGEVENT_ITEM, OlivinePortHiddenProtein - -.ObjectEvents: - db 7 - object_event 7, 23, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY - object_event 7, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorScript, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME - object_event 6, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME - object_event 4, 14, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + db 0, 0 ; filler + + db 2 ; warp events + warp_event 11, 7, OLIVINE_PORT_PASSAGE, 5 + warp_event 7, 23, FAST_SHIP_1F, 1 + + db 1 ; coord events + coord_event 7, 15, SCENE_DEFAULT, UnknownScript_0x7491f + + db 1 ; bg events + bg_event 1, 22, BGEVENT_ITEM, OlivinePortHiddenProtein + + db 7 ; object events + object_event 7, 23, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY + object_event 7, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OlivinePortSailorScript, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + object_event 6, 15, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME + object_event 4, 14, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME object_event 13, 14, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FishingGuruScript_0x74a0c, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME - object_event 4, 15, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x74a17, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME + object_event 4, 15, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, YoungsterScript_0x74a17, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME object_event 11, 15, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x74a22, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME |