diff options
Diffstat (limited to 'maps/SproutTower3F.asm')
| -rw-r--r-- | maps/SproutTower3F.asm | 85 |
1 files changed, 39 insertions, 46 deletions
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 2b459c55d..8121d2d4a 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const SPROUTTOWER3F_SAGE1 const SPROUTTOWER3F_SAGE2 const SPROUTTOWER3F_SAGE3 @@ -8,13 +8,11 @@ const_value set 2 const SPROUTTOWER3F_SILVER SproutTower3F_MapScripts: -.SceneScripts: - db 2 - scene_script .DummyScene0 - scene_script .DummyScene1 + db 2 ; scene scripts + scene_script .DummyScene0 ; SCENE_DEFAULT + scene_script .DummyScene1 ; SCENE_FINISHED -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene0: end @@ -23,9 +21,9 @@ SproutTower3F_MapScripts: end UnknownScript_0x184947: - spriteface PLAYER, UP + turnobject PLAYER, UP showemote EMOTE_SHOCK, PLAYER, 15 - special Special_FadeOutMusic + special FadeOutMusic playsound SFX_TACKLE playsound SFX_ELEVATOR earthquake 79 @@ -40,7 +38,7 @@ UnknownScript_0x184947: waitbutton closetext showemote EMOTE_SHOCK, SPROUTTOWER3F_SILVER, 15 - spriteface SPROUTTOWER3F_SILVER, DOWN + turnobject SPROUTTOWER3F_SILVER, DOWN pause 15 applymovement SPROUTTOWER3F_SILVER, MovementData_0x184a24 playmusic MUSIC_RIVAL_ENCOUNTER @@ -48,18 +46,18 @@ UnknownScript_0x184947: writetext UnknownText_0x184aec waitbutton closetext - spriteface SPROUTTOWER3F_SILVER, UP + turnobject SPROUTTOWER3F_SILVER, UP opentext writetext UnknownText_0x184bc8 pause 15 closetext playsound SFX_WARP_TO - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes disappear SPROUTTOWER3F_SILVER waitsfx - special Special_FadeInQuickly - setscene 1 + special FadeInQuickly + setscene SCENE_FINISHED special RestartMapMusic end @@ -93,10 +91,10 @@ UnknownScript_0x1849d1: end TrainerSageJin: - trainer EVENT_BEAT_SAGE_JIN, SAGE, JIN, SageJinSeenText, SageJinBeatenText, 0, .Script + trainer SAGE, JIN, EVENT_BEAT_SAGE_JIN, SageJinSeenText, SageJinBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SageJinAfterBattleText waitbutton @@ -104,10 +102,10 @@ TrainerSageJin: end TrainerSageTroy: - trainer EVENT_BEAT_SAGE_TROY, SAGE, TROY, SageTroySeenText, SageTroyBeatenText, 0, .Script + trainer SAGE, TROY, EVENT_BEAT_SAGE_TROY, SageTroySeenText, SageTroyBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SageTroyAfterBattleText waitbutton @@ -115,10 +113,10 @@ TrainerSageTroy: end TrainerSageNeal: - trainer EVENT_BEAT_SAGE_NEAL, SAGE, NEAL, SageNealSeenText, SageNealBeatenText, 0, .Script + trainer SAGE, NEAL, EVENT_BEAT_SAGE_NEAL, SageNealSeenText, SageNealBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SageNealAfterBattleText waitbutton @@ -330,32 +328,27 @@ UnknownText_0x184f61: done SproutTower3F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 1 - warp_def 10, 14, 4, SPROUT_TOWER_2F - -.CoordEvents: - db 1 - coord_event 11, 9, 0, UnknownScript_0x184947 - -.BGEvents: - db 6 - bg_event 8, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script - bg_event 11, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script - bg_event 9, 0, BGEVENT_READ, MapSproutTower3FSignpost3Script - bg_event 10, 0, BGEVENT_READ, MapSproutTower3FSignpost3Script - bg_event 5, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script + db 0, 0 ; filler + + db 1 ; warp events + warp_event 10, 14, SPROUT_TOWER_2F, 4 + + db 1 ; coord events + coord_event 11, 9, SCENE_DEFAULT, UnknownScript_0x184947 + + db 6 ; bg events + bg_event 8, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script + bg_event 11, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script + bg_event 9, 0, BGEVENT_READ, MapSproutTower3FSignpost3Script + bg_event 10, 0, BGEVENT_READ, MapSproutTower3FSignpost3Script + bg_event 5, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script bg_event 14, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script -.ObjectEvents: - db 7 - object_event 8, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageJin, -1 - object_event 8, 8, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSageTroy, -1 - object_event 10, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SageLiScript, -1 + db 7 ; object events + object_event 8, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageJin, -1 + object_event 8, 8, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSageTroy, -1 + object_event 10, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SageLiScript, -1 object_event 11, 11, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageNeal, -1 - object_event 6, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FPotion, EVENT_SPROUT_TOWER_3F_POTION - object_event 14, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FEscapeRope, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE - object_event 10, 4, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER + object_event 6, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FPotion, EVENT_SPROUT_TOWER_3F_POTION + object_event 14, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FEscapeRope, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE + object_event 10, 4, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER |