diff options
Diffstat (limited to 'maps/AzaleaTown.asm')
| -rw-r--r-- | maps/AzaleaTown.asm | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 90e387f46..cf576d81d 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -13,31 +13,31 @@ const_value set 2 const AZALEATOWN_KURT_OUTSIDE AzaleaTown_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 3 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 - maptrigger .DummyTrigger2 + scene_script .DummyScene0 + scene_script .DummyScene1 + scene_script .DummyScene2 .MapCallbacks: db 1 dbw MAPCALLBACK_NEWMAP, .Flypoint -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end -.DummyTrigger2: +.DummyScene2: end .Flypoint: setflag ENGINE_FLYPOINT_AZALEA return -AzaleaTownRivalBattleTrigger1: - moveperson AZALEATOWN_SILVER, $b, $b +AzaleaTownRivalBattleScene1: + moveobject AZALEATOWN_SILVER, $b, $b spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic @@ -47,7 +47,7 @@ AzaleaTownRivalBattleTrigger1: spriteface PLAYER, DOWN jump AzaleaTownRivalBattleScript -AzaleaTownRivalBattleTrigger2: +AzaleaTownRivalBattleScene2: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 special Special_FadeOutMusic @@ -102,7 +102,7 @@ AzaleaTownRivalBattleScript: applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement playsound SFX_EXIT_BUILDING disappear AZALEATOWN_SILVER - dotrigger $0 + setscene $0 waitsfx playmapmusic end @@ -155,7 +155,7 @@ WoosterScript: closetext end -AzaleaTownCelebiTrigger: +AzaleaTownCelebiScene: applymovement PLAYER, AzaleaTownPlayerLeavesKurtsHouseMovement opentext writetext AzaleaTownKurtText1 @@ -170,7 +170,7 @@ AzaleaTownCelebiTrigger: setflag ENGINE_HAVE_EXAMINED_GS_BALL clearevent EVENT_ILEX_FOREST_LASS setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS - dotrigger $0 + setscene $0 closetext end @@ -470,35 +470,35 @@ AzaleaTown_MapEventHeader: warp_def $a, $2, 3, ILEX_FOREST_AZALEA_GATE warp_def $b, $2, 4, ILEX_FOREST_AZALEA_GATE -.XYTriggers: +.CoordEvents: db 3 - xy_trigger 1, $a, $5, AzaleaTownRivalBattleTrigger1 - xy_trigger 1, $b, $5, AzaleaTownRivalBattleTrigger2 - xy_trigger 2, $6, $9, AzaleaTownCelebiTrigger + coord_event 1, $a, $5, AzaleaTownRivalBattleScene1 + coord_event 1, $b, $5, AzaleaTownRivalBattleScene2 + coord_event 2, $6, $9, AzaleaTownCelebiScene -.Signposts: +.BGEvents: db 9 - signpost 9, 19, SIGNPOST_READ, AzaleaTownSign - signpost 9, 10, SIGNPOST_READ, KurtsHouseSign - signpost 15, 14, SIGNPOST_READ, AzaleaGymSign - signpost 7, 29, SIGNPOST_READ, SlowpokeWellSign - signpost 13, 19, SIGNPOST_READ, CharcoalKilnSign - signpost 9, 16, SIGNPOST_READ, AzaleaTownPokecenterSign - signpost 5, 22, SIGNPOST_READ, AzaleaTownMartSign - signpost 9, 3, SIGNPOST_READ, AzaleaTownIlextForestSign - signpost 6, 31, SIGNPOST_ITEM, AzaleaTownHiddenFullHeal - -.PersonEvents: + bg_event 9, 19, BGEVENT_READ, AzaleaTownSign + bg_event 9, 10, BGEVENT_READ, KurtsHouseSign + bg_event 15, 14, BGEVENT_READ, AzaleaGymSign + bg_event 7, 29, BGEVENT_READ, SlowpokeWellSign + bg_event 13, 19, BGEVENT_READ, CharcoalKilnSign + bg_event 9, 16, BGEVENT_READ, AzaleaTownPokecenterSign + bg_event 5, 22, BGEVENT_READ, AzaleaTownMartSign + bg_event 9, 3, BGEVENT_READ, AzaleaTownIlextForestSign + bg_event 6, 31, BGEVENT_ITEM, AzaleaTownHiddenFullHeal + +.ObjectEvents: db 12 - person_event SPRITE_AZALEA_ROCKET, 9, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET - person_event SPRITE_GRAMPS, 9, 21, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1 - person_event SPRITE_TEACHER, 13, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1 - person_event SPRITE_YOUNGSTER, 9, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1 - person_event SPRITE_SLOWPOKE, 17, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES - person_event SPRITE_SLOWPOKE, 9, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES - person_event SPRITE_SLOWPOKE, 9, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES - person_event SPRITE_SLOWPOKE, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES - person_event SPRITE_FRUIT_TREE, 2, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, WhiteApricornTree, -1 - person_event SPRITE_AZALEA_ROCKET, 10, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN - person_event SPRITE_AZALEA_ROCKET, 16, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownRocket2Script, EVENT_SLOWPOKE_WELL_ROCKETS - person_event SPRITE_KURT_OUTSIDE, 5, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AzaleaTownKurtScript, EVENT_AZALEA_TOWN_KURT + object_event SPRITE_AZALEA_ROCKET, 9, 31, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET + object_event SPRITE_GRAMPS, 9, 21, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1 + object_event SPRITE_TEACHER, 13, 15, SPRITEMOVEDATA_WALK_UP_DOWN, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1 + object_event SPRITE_YOUNGSTER, 9, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1 + object_event SPRITE_SLOWPOKE, 17, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES + object_event SPRITE_SLOWPOKE, 9, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES + object_event SPRITE_SLOWPOKE, 9, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES + object_event SPRITE_SLOWPOKE, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES + object_event SPRITE_FRUIT_TREE, 2, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhiteApricornTree, -1 + object_event SPRITE_AZALEA_ROCKET, 10, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN + object_event SPRITE_AZALEA_ROCKET, 16, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket2Script, EVENT_SLOWPOKE_WELL_ROCKETS + object_event SPRITE_KURT_OUTSIDE, 5, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownKurtScript, EVENT_AZALEA_TOWN_KURT |