diff options
Diffstat (limited to 'maps/Route10South.asm')
| -rw-r--r-- | maps/Route10South.asm | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/maps/Route10South.asm b/maps/Route10South.asm index a03a5d485..6161995df 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -1,19 +1,17 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE10SOUTH_POKEFAN_M1 const ROUTE10SOUTH_POKEFAN_M2 Route10South_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerHikerJim: - trainer EVENT_BEAT_HIKER_JIM, HIKER, JIM, HikerJimSeenText, HikerJimBeatenText, 0, .Script + trainer HIKER, JIM, EVENT_BEAT_HIKER_JIM, HikerJimSeenText, HikerJimBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext HikerJimAfterBattleText waitbutton @@ -21,10 +19,10 @@ TrainerHikerJim: end TrainerPokefanmRobert: - trainer EVENT_BEAT_POKEFANM_ROBERT, POKEFANM, ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, 0, .Script + trainer POKEFANM, ROBERT, EVENT_BEAT_POKEFANM_ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, 0, .Script .Script: - end_if_just_battled + endifjustbattled opentext writetext PokefanmRobertAfterBattleText waitbutton @@ -76,21 +74,16 @@ Route10SignText: done Route10South_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 6, 1, 2, ROCK_TUNNEL_1F + db 1 ; warp events + warp_event 6, 1, ROCK_TUNNEL_1F, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 - bg_event 5, 3, BGEVENT_READ, Route10Sign + db 1 ; bg events + bg_event 5, 3, BGEVENT_READ, Route10Sign -.ObjectEvents: - db 2 - object_event 17, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerJim, -1 - object_event 8, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmRobert, -1 + db 2 ; object events + object_event 17, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerHikerJim, -1 + object_event 8, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmRobert, -1 |