diff options
Diffstat (limited to 'maps/SproutTower1F.asm')
| -rw-r--r-- | maps/SproutTower1F.asm | 55 |
1 files changed, 24 insertions, 31 deletions
diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 3f9887fe2..42a2c74ea 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const SPROUTTOWER1F_SAGE1 const SPROUTTOWER1F_SAGE2 const SPROUTTOWER1F_GRANNY @@ -7,11 +7,9 @@ const_value set 2 const SPROUTTOWER1F_POKE_BALL SproutTower1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks SproutTower1FSage1Script: jumptextfaceplayer SproutTower1FSage1Text @@ -26,10 +24,10 @@ SproutTower1FTeacherScript: jumptextfaceplayer SproutTower1FTeacherText TrainerSageChow: - trainer EVENT_BEAT_SAGE_CHOW, SAGE, CHOW, SageChowSeenText, SageChowBeatenText, 0, .Script + trainer SAGE, CHOW, EVENT_BEAT_SAGE_CHOW, SageChowSeenText, SageChowBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext SageChowAfterBattleText waitbutton @@ -103,30 +101,25 @@ UnknownText_0x1846d6: done SproutTower1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 9, 15, 7, VIOLET_CITY - warp_def 10, 15, 7, VIOLET_CITY - warp_def 6, 4, 1, SPROUT_TOWER_2F - warp_def 2, 6, 2, SPROUT_TOWER_2F - warp_def 17, 3, 3, SPROUT_TOWER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 7, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script + db 0, 0 ; filler + + db 5 ; warp events + warp_event 9, 15, VIOLET_CITY, 7 + warp_event 10, 15, VIOLET_CITY, 7 + warp_event 6, 4, SPROUT_TOWER_2F, 1 + warp_event 2, 6, SPROUT_TOWER_2F, 2 + warp_event 17, 3, SPROUT_TOWER_2F, 3 + + db 0 ; coord events + + db 2 ; bg events + bg_event 7, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script bg_event 12, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script -.ObjectEvents: - db 6 - object_event 7, 4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage1Script, -1 - object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage2Script, -1 + db 6 ; object events + object_event 7, 4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage1Script, -1 + object_event 6, 7, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage2Script, -1 object_event 11, 12, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FGrannyScript, -1 - object_event 9, 9, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FTeacherScript, -1 - object_event 3, 5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageChow, -1 - object_event 16, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower1FParlyzHeal, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL + object_event 9, 9, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SproutTower1FTeacherScript, -1 + object_event 3, 5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageChow, -1 + object_event 16, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower1FParlyzHeal, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL |