diff options
Diffstat (limited to 'maps/SproutTower3F.asm')
| -rw-r--r-- | maps/SproutTower3F.asm | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index c882ac18e..c92926585 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -8,18 +8,18 @@ const_value set 2 const SPROUTTOWER3F_SILVER SproutTower3F_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - maptrigger .DummyTrigger0 - maptrigger .DummyTrigger1 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 0 -.DummyTrigger0: +.DummyScene0: end -.DummyTrigger1: +.DummyScene1: end UnknownScript_0x184947: @@ -59,7 +59,7 @@ UnknownScript_0x184947: disappear SPROUTTOWER3F_SILVER waitsfx special Special_FadeInQuickly - dotrigger $1 + setscene $1 special RestartMapMusic end @@ -337,25 +337,25 @@ SproutTower3F_MapEventHeader: db 1 warp_def $e, $a, 4, SPROUT_TOWER_2F -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 0, $9, $b, UnknownScript_0x184947 + coord_event 0, $9, $b, UnknownScript_0x184947 -.Signposts: +.BGEvents: db 6 - signpost 1, 8, SIGNPOST_READ, MapSproutTower3FSignpost5Script - signpost 1, 11, SIGNPOST_READ, MapSproutTower3FSignpost5Script - signpost 0, 9, SIGNPOST_READ, MapSproutTower3FSignpost3Script - signpost 0, 10, SIGNPOST_READ, MapSproutTower3FSignpost3Script - signpost 15, 5, SIGNPOST_READ, MapSproutTower3FSignpost5Script - signpost 15, 14, SIGNPOST_READ, MapSproutTower3FSignpost5Script - -.PersonEvents: + bg_event 1, 8, BGEVENT_READ, MapSproutTower3FSignpost5Script + bg_event 1, 11, BGEVENT_READ, MapSproutTower3FSignpost5Script + bg_event 0, 9, BGEVENT_READ, MapSproutTower3FSignpost3Script + bg_event 0, 10, BGEVENT_READ, MapSproutTower3FSignpost3Script + bg_event 15, 5, BGEVENT_READ, MapSproutTower3FSignpost5Script + bg_event 15, 14, BGEVENT_READ, MapSproutTower3FSignpost5Script + +.ObjectEvents: db 7 - person_event SPRITE_SAGE, 13, 8, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSageJin, -1 - person_event SPRITE_SAGE, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 2, TrainerSageTroy, -1 - person_event SPRITE_SAGE, 2, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, SageLiScript, -1 - person_event SPRITE_SAGE, 11, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_TRAINER, 3, TrainerSageNeal, -1 - person_event SPRITE_POKE_BALL, 14, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SproutTower3FPotion, EVENT_SPROUT_TOWER_3F_POTION - person_event SPRITE_POKE_BALL, 1, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SproutTower3FEscapeRope, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE - person_event SPRITE_SILVER, 4, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER + object_event SPRITE_SAGE, 13, 8, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageJin, -1 + object_event SPRITE_SAGE, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSageTroy, -1 + object_event SPRITE_SAGE, 2, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SageLiScript, -1 + object_event SPRITE_SAGE, 11, 11, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageNeal, -1 + object_event SPRITE_POKE_BALL, 14, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FPotion, EVENT_SPROUT_TOWER_3F_POTION + object_event SPRITE_POKE_BALL, 1, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FEscapeRope, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE + object_event SPRITE_SILVER, 4, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER |