diff options
Diffstat (limited to 'maps/ElmsLab.asm')
| -rw-r--r-- | maps/ElmsLab.asm | 137 |
1 files changed, 66 insertions, 71 deletions
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index c49c522fc..631969785 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -7,63 +7,58 @@ const_value set 2 const ELMSLAB_OFFICER ElmsLab_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 6 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 - maptrigger .Trigger3 - maptrigger .Trigger4 - maptrigger .Trigger5 + scene_script .MeetElm + scene_script .DummyScene1 + scene_script .DummyScene2 + scene_script .DummyScene3 + scene_script .DummyScene4 + scene_script .DummyScene5 .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .MoveElmCallback - ; callbacks - - dbw MAPCALLBACK_OBJECTS, .Callback_MoveElm - -.Trigger0: - priorityjump ElmsLab_AutowalkUpToElm +.MeetElm: + priorityjump .WalkUpToElm end -.Trigger1: +.DummyScene1: end -.Trigger2: +.DummyScene2: end -.Trigger3: +.DummyScene3: end -.Trigger4: +.DummyScene4: end -.Trigger5: +.DummyScene5: end -.Callback_MoveElm: - checktriggers +.MoveElmCallback: + checkscene iftrue .Skip - moveperson ELMSLAB_ELM, $3, $4 + moveobject ELMSLAB_ELM, $3, $4 .Skip: return -ElmsLab_AutowalkUpToElm: +.WalkUpToElm: applymovement PLAYER, ElmsLab_WalkUpToElmMovement showemote EMOTE_SHOCK, ELMSLAB_ELM, 15 spriteface ELMSLAB_ELM, RIGHT opentext writetext ElmText_Intro -ElmsLab_RefuseLoop: +.MustSayYes: yesorno - iftrue ElmsLab_ElmGetsEmail + iftrue .ElmGetsEmail writetext ElmText_Refused - jump ElmsLab_RefuseLoop + jump .MustSayYes -ElmsLab_ElmGetsEmail: +.ElmGetsEmail: writetext ElmText_Accepted buttonsound writetext ElmText_ResearchAmbitions @@ -89,7 +84,7 @@ ElmsLab_ElmGetsEmail: opentext writetext ElmText_ChooseAPokemon waitbutton - dotrigger $1 + setscene $1 closetext end @@ -279,8 +274,8 @@ ElmDirectionsScript: closetext setevent EVENT_GOT_A_POKEMON_FROM_ELM setevent EVENT_RIVAL_CHERRYGROVE_CITY - dotrigger $5 - domaptrigger NEW_BARK_TOWN, $1 + setscene $5 + setmapscene NEW_BARK_TOWN, $1 end ElmDescribesMrPokemonScript: @@ -346,13 +341,13 @@ ElmAfterTheftScript: buttonsound setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM setflag ENGINE_BUG_CONTEST_ON - domaptrigger ROUTE_29, $1 + setmapscene ROUTE_29, $1 clearevent EVENT_ROUTE_30_YOUNGSTER_JOEY setevent EVENT_ROUTE_30_BATTLE writetext ElmAfterTheftText6 waitbutton closetext - dotrigger $6 + setscene $6 end ElmStudyingEggScript: @@ -484,7 +479,7 @@ AideScript_GivePotions: writetext AideText_AlwaysBusy waitbutton closetext - dotrigger $2 + setscene $2 end AideScript_WalkBalls1: @@ -512,7 +507,7 @@ AideScript_GiveYouBalls: buttonsound itemnotify closetext - dotrigger $2 + setscene $2 end AideScript_ReceiveTheBalls: @@ -567,7 +562,7 @@ CopScript: closetext applymovement ELMSLAB_OFFICER, OfficerLeavesMovement disappear ELMSLAB_OFFICER - dotrigger $2 + setscene $2 end ElmsLabWindow: @@ -1384,41 +1379,41 @@ ElmsLab_MapEventHeader: warp_def $b, $4, 1, NEW_BARK_TOWN warp_def $b, $5, 1, NEW_BARK_TOWN -.XYTriggers: +.CoordEvents: db 8 - xy_trigger 1, $6, $4, $0, LabTryToLeaveScript, $0, $0 - xy_trigger 1, $6, $5, $0, LabTryToLeaveScript, $0, $0 - xy_trigger 3, $5, $4, $0, MeetCopScript, $0, $0 - xy_trigger 3, $5, $5, $0, MeetCopScript2, $0, $0 - xy_trigger 5, $8, $4, $0, AideScript_WalkPotions1, $0, $0 - xy_trigger 5, $8, $5, $0, AideScript_WalkPotions2, $0, $0 - xy_trigger 6, $8, $4, $0, AideScript_WalkBalls1, $0, $0 - xy_trigger 6, $8, $5, $0, AideScript_WalkBalls2, $0, $0 - -.Signposts: + coord_event 1, $6, $4, LabTryToLeaveScript + coord_event 1, $6, $5, LabTryToLeaveScript + coord_event 3, $5, $4, MeetCopScript + coord_event 3, $5, $5, MeetCopScript2 + coord_event 5, $8, $4, AideScript_WalkPotions1 + coord_event 5, $8, $5, AideScript_WalkPotions2 + coord_event 6, $8, $4, AideScript_WalkBalls1 + coord_event 6, $8, $5, AideScript_WalkBalls2 + +.BGEvents: db 16 - signpost 1, 2, SIGNPOST_READ, ElmsLabHealingMachine - signpost 1, 6, SIGNPOST_READ, ElmsLabBookshelf - signpost 1, 7, SIGNPOST_READ, ElmsLabBookshelf - signpost 1, 8, SIGNPOST_READ, ElmsLabBookshelf - signpost 1, 9, SIGNPOST_READ, ElmsLabBookshelf - signpost 7, 0, SIGNPOST_READ, ElmsLabTravelTip1 - signpost 7, 1, SIGNPOST_READ, ElmsLabTravelTip2 - signpost 7, 2, SIGNPOST_READ, ElmsLabTravelTip3 - signpost 7, 3, SIGNPOST_READ, ElmsLabTravelTip4 - signpost 7, 6, SIGNPOST_READ, ElmsLabBookshelf - signpost 7, 7, SIGNPOST_READ, ElmsLabBookshelf - signpost 7, 8, SIGNPOST_READ, ElmsLabBookshelf - signpost 7, 9, SIGNPOST_READ, ElmsLabBookshelf - signpost 3, 9, SIGNPOST_READ, ElmsLabTrashcan - signpost 0, 5, SIGNPOST_READ, ElmsLabWindow - signpost 5, 3, SIGNPOST_DOWN, ElmsLabPC - -.PersonEvents: + bg_event 1, 2, BGEVENT_READ, ElmsLabHealingMachine + bg_event 1, 6, BGEVENT_READ, ElmsLabBookshelf + bg_event 1, 7, BGEVENT_READ, ElmsLabBookshelf + bg_event 1, 8, BGEVENT_READ, ElmsLabBookshelf + bg_event 1, 9, BGEVENT_READ, ElmsLabBookshelf + bg_event 7, 0, BGEVENT_READ, ElmsLabTravelTip1 + bg_event 7, 1, BGEVENT_READ, ElmsLabTravelTip2 + bg_event 7, 2, BGEVENT_READ, ElmsLabTravelTip3 + bg_event 7, 3, BGEVENT_READ, ElmsLabTravelTip4 + bg_event 7, 6, BGEVENT_READ, ElmsLabBookshelf + bg_event 7, 7, BGEVENT_READ, ElmsLabBookshelf + bg_event 7, 8, BGEVENT_READ, ElmsLabBookshelf + bg_event 7, 9, BGEVENT_READ, ElmsLabBookshelf + bg_event 3, 9, BGEVENT_READ, ElmsLabTrashcan + bg_event 0, 5, BGEVENT_READ, ElmsLabWindow + bg_event 5, 3, BGEVENT_DOWN, ElmsLabPC + +.ObjectEvents: db 6 - person_event SPRITE_ELM, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ProfElmScript, -1 - person_event SPRITE_SCIENTIST, 9, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB - person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB - person_event SPRITE_POKE_BALL, 3, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB - person_event SPRITE_POKE_BALL, 3, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB - person_event SPRITE_OFFICER, 3, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CopScript, EVENT_COP_IN_ELMS_LAB + object_event SPRITE_ELM, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ProfElmScript, -1 + object_event SPRITE_SCIENTIST, 9, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB + object_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB + object_event SPRITE_POKE_BALL, 3, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB + object_event SPRITE_POKE_BALL, 3, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB + object_event SPRITE_OFFICER, 3, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopScript, EVENT_COP_IN_ELMS_LAB |