diff options
Diffstat (limited to 'maps/NewBarkTown.asm')
| -rw-r--r-- | maps/NewBarkTown.asm | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index ff74da9f1..3ad5cd2bf 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -4,19 +4,19 @@ const_value set 2 const NEWBARKTOWN_SILVER NewBarkTown_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 1 dbw MAPCALLBACK_NEWMAP, .FlyPoint -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end .FlyPoint: @@ -24,7 +24,7 @@ NewBarkTown_MapScriptHeader: clearevent EVENT_FIRST_TIME_BANKING_WITH_MOM return -NewBarkTown_TeacherStopsYouTrigger1: +NewBarkTown_TeacherStopsYouScene1: playmusic MUSIC_MOM spriteface NEWBARKTOWN_TEACHER, LEFT opentext @@ -47,7 +47,7 @@ NewBarkTown_TeacherStopsYouTrigger1: special RestartMapMusic end -NewBarkTown_TeacherStopsYouTrigger2: +NewBarkTown_TeacherStopsYouScene2: playmusic MUSIC_MOM spriteface NEWBARKTOWN_TEACHER, LEFT opentext @@ -292,20 +292,20 @@ NewBarkTown_MapEventHeader: warp_def $b, $3, 1, KRISS_NEIGHBORS_HOUSE warp_def $d, $b, 1, ELMS_HOUSE -.XYTriggers: +.CoordEvents: db 2 - xy_trigger 0, $8, $1, NewBarkTown_TeacherStopsYouTrigger1 - xy_trigger 0, $9, $1, NewBarkTown_TeacherStopsYouTrigger2 + coord_event 0, $8, $1, NewBarkTown_TeacherStopsYouScene1 + coord_event 0, $9, $1, NewBarkTown_TeacherStopsYouScene2 -.Signposts: +.BGEvents: db 4 - signpost 8, 8, SIGNPOST_READ, NewBarkTownSign - signpost 5, 11, SIGNPOST_READ, MapNewBarkTownSignpost1Script - signpost 3, 3, SIGNPOST_READ, MapNewBarkTownSignpost2Script - signpost 13, 9, SIGNPOST_READ, MapNewBarkTownSignpost3Script + bg_event 8, 8, BGEVENT_READ, NewBarkTownSign + bg_event 5, 11, BGEVENT_READ, MapNewBarkTownSignpost1Script + bg_event 3, 3, BGEVENT_READ, MapNewBarkTownSignpost2Script + bg_event 13, 9, BGEVENT_READ, MapNewBarkTownSignpost3Script -.PersonEvents: +.ObjectEvents: db 3 - person_event SPRITE_TEACHER, 8, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1 - person_event SPRITE_FISHER, 9, 12, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1 - person_event SPRITE_SILVER, 2, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NewBarkTownSilverScript, EVENT_RIVAL_NEW_BARK_TOWN + object_event SPRITE_TEACHER, 8, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1 + object_event SPRITE_FISHER, 9, 12, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1 + object_event SPRITE_SILVER, 2, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownSilverScript, EVENT_RIVAL_NEW_BARK_TOWN |