diff options
Diffstat (limited to 'maps/Route33.asm')
| -rw-r--r-- | maps/Route33.asm | 47 |
1 files changed, 20 insertions, 27 deletions
diff --git a/maps/Route33.asm b/maps/Route33.asm index be2abbf4c..9fbecb775 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -1,24 +1,22 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE33_POKEFAN_M const ROUTE33_LASS const ROUTE33_FRUIT_TREE Route33_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Route33LassScript: jumptextfaceplayer Route33LassText TrainerHikerAnthony: - trainer EVENT_BEAT_HIKER_ANTHONY, HIKER, ANTHONY2, HikerAnthony2SeenText, HikerAnthony2BeatenText, 0, .Script + trainer HIKER, ANTHONY2, EVENT_BEAT_HIKER_ANTHONY, HikerAnthony2SeenText, HikerAnthony2BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_HIKER_ANTHONY - end_if_just_battled + endifjustbattled opentext checkflag ENGINE_ANTHONY iftrue .Rematch @@ -38,8 +36,8 @@ TrainerHikerAnthony: scall .AskNumber2 .AskForPhoneNumber: askforphonenumber PHONE_HIKER_ANTHONY - if_equal PHONE_CONTACTS_FULL, .PhoneFull - if_equal PHONE_CONTACT_REFUSED, .NumberDeclined + ifequal PHONE_CONTACTS_FULL, .PhoneFull + ifequal PHONE_CONTACT_REFUSED, .NumberDeclined trainertotext HIKER, ANTHONY2, MEM_BUFFER_0 scall .RegisteredNumber jump .NumberAccepted @@ -48,11 +46,11 @@ TrainerHikerAnthony: scall .RematchStd winlosstext HikerAnthony2BeatenText, 0 copybytetovar wAnthonyFightCount - if_equal 4, .Fight4 - if_equal 3, .Fight3 - if_equal 2, .Fight2 - if_equal 1, .Fight1 - if_equal 0, .LoadFight0 + ifequal 4, .Fight4 + ifequal 3, .Fight3 + ifequal 2, .Fight2 + ifequal 1, .Fight1 + ifequal 0, .LoadFight0 .Fight4: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight4 @@ -195,22 +193,17 @@ Route33SignText: done Route33_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 1 - warp_def 11, 9, 3, UNION_CAVE_1F + db 1 ; warp events + warp_event 11, 9, UNION_CAVE_1F, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 11, 11, BGEVENT_READ, Route33Sign -.ObjectEvents: - db 3 - object_event 6, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerAnthony, -1 + db 3 ; object events + object_event 6, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerAnthony, -1 object_event 13, 16, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route33LassScript, -1 - object_event 14, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route33FruitTreeScript, -1 + object_event 14, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route33FruitTreeScript, -1 |