diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-24 13:46:34 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-24 14:33:17 -0500 |
| commit | c05b7f41dd5783315e9e4032b63ca84c6ed05893 (patch) | |
| tree | 0c1995c8a928a297f842a75c2e009003534b3ec8 /maps/VictoryRoadGate.asm | |
| parent | 20d6c1d876cde19061c458761c7283163e316d8a (diff) | |
Renaming: (fix #412)
- MapTriggers / maptrigger → SceneScripts / scene_script
- XYTriggers / xy_trigger → CoordEvents / coord_event
- Signposts / signpost → BGEvents / bg_event
- PersonEvents / person_event → ObjectEvents / object_event
Diffstat (limited to 'maps/VictoryRoadGate.asm')
| -rw-r--r-- | maps/VictoryRoadGate.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index dbfbafb09..10bc70b99 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -4,21 +4,21 @@ const_value set 2 const VICTORYROADGATE_BLACK_BELT2 VictoryRoadGate_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 0 -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end -VictoryRoadGateBadgeCheckTrigger: +VictoryRoadGateBadgeCheckScene: spriteface PLAYER, LEFT jump VictoryRoadGateBadgeCheckScript @@ -40,7 +40,7 @@ VictoryRoadGateBadgeCheckScript: writetext VictoryRoadGateEightBadgesText waitbutton closetext - dotrigger $1 + setscene $1 end VictoryRoadGateLeftBlackBeltScript: @@ -112,15 +112,15 @@ VictoryRoadGate_MapEventHeader: warp_def $7, $1, 2, ROUTE_28 warp_def $7, $2, 2, ROUTE_28 -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 0, $b, $a, VictoryRoadGateBadgeCheckTrigger + coord_event 0, $b, $a, VictoryRoadGateBadgeCheckScene -.Signposts: +.BGEvents: db 0 -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_OFFICER, 11, 8, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VictoryRoadGateOfficerScript, -1 - person_event SPRITE_BLACK_BELT, 5, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VictoryRoadGateLeftBlackBeltScript, EVENT_OPENED_MT_SILVER - person_event SPRITE_BLACK_BELT, 5, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VictoryRoadGateRightBlackBeltScript, EVENT_FOUGHT_SNORLAX + object_event SPRITE_OFFICER, 11, 8, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateOfficerScript, -1 + object_event SPRITE_BLACK_BELT, 5, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateLeftBlackBeltScript, EVENT_OPENED_MT_SILVER + object_event SPRITE_BLACK_BELT, 5, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VictoryRoadGateRightBlackBeltScript, EVENT_FOUGHT_SNORLAX |