diff options
Diffstat (limited to 'maps/Route35NationalParkGate.asm')
| -rw-r--r-- | maps/Route35NationalParkGate.asm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index 935a8e518..c3c38a34f 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -4,21 +4,21 @@ const_value set 2 const ROUTE35NATIONALPARKGATE_OFFICER2 Route35NationalParkGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 3 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 - maptrigger .LeaveContestEarly + scene_script .DummyScene0 + scene_script .DummyScene1 + scene_script .LeaveContestEarly .MapCallbacks: db 2 dbw MAPCALLBACK_NEWMAP, .CheckIfContestRunning dbw MAPCALLBACK_OBJECTS, .CheckIfContestAvailable -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end .LeaveContestEarly: @@ -28,11 +28,11 @@ Route35NationalParkGate_MapScriptHeader: .CheckIfContestRunning: checkflag ENGINE_BUG_CONTEST_TIMER iftrue .BugContestIsRunning - dotrigger $0 + setscene $0 return .BugContestIsRunning: - dotrigger $2 + setscene $2 return .CheckIfContestAvailable: @@ -448,15 +448,15 @@ Route35NationalParkGate_MapEventHeader: warp_def $7, $3, 3, ROUTE_35 warp_def $7, $4, 3, ROUTE_35 -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 0, 5, SIGNPOST_READ, MapRoute36NationalParkGateSignpost0Script + bg_event 0, 5, BGEVENT_READ, MapRoute36NationalParkGateSignpost0Script -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_OFFICER, 1, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY - person_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, Route35NationalParkGateYoungsterScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER - person_event SPRITE_OFFICER, 3, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY + object_event SPRITE_OFFICER, 1, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY + object_event SPRITE_YOUNGSTER, 5, 6, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route35NationalParkGateYoungsterScript, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER + object_event SPRITE_OFFICER, 3, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY |