diff options
Diffstat (limited to 'maps/Route26.asm')
| -rw-r--r-- | maps/Route26.asm | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/maps/Route26.asm b/maps/Route26.asm index 25b04283b..9c118d700 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -9,14 +9,12 @@ const_value set 2 const ROUTE26_POKE_BALL Route26_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks TrainerCooltrainermJake: - trainer EVENT_BEAT_COOLTRAINERM_JAKE, COOLTRAINERM, JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, .Script + trainer COOLTRAINERM, JAKE, EVENT_BEAT_COOLTRAINERM_JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, .Script .Script: end_if_just_battled @@ -27,7 +25,7 @@ TrainerCooltrainermJake: end TrainerCooltrainermGaven3: - trainer EVENT_BEAT_COOLTRAINERM_GAVEN, COOLTRAINERM, GAVEN3, CooltrainermGaven3SeenText, CooltrainermGaven3BeatenText, 0, .Script + trainer COOLTRAINERM, GAVEN3, EVENT_BEAT_COOLTRAINERM_GAVEN, CooltrainermGaven3SeenText, CooltrainermGaven3BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_COOLTRAINERM_GAVEN @@ -120,7 +118,7 @@ TrainerCooltrainermGaven3: end TrainerCooltrainerfJoyce: - trainer EVENT_BEAT_COOLTRAINERF_JOYCE, COOLTRAINERF, JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, 0, .Script + trainer COOLTRAINERF, JOYCE, EVENT_BEAT_COOLTRAINERF_JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, 0, .Script .Script: end_if_just_battled @@ -131,7 +129,7 @@ TrainerCooltrainerfJoyce: end TrainerCooltrainerfBeth1: - trainer EVENT_BEAT_COOLTRAINERF_BETH, COOLTRAINERF, BETH1, CooltrainerfBeth1SeenText, CooltrainerfBeth1BeatenText, 0, .Script + trainer COOLTRAINERF, BETH1, EVENT_BEAT_COOLTRAINERF_BETH, CooltrainerfBeth1SeenText, CooltrainerfBeth1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_COOLTRAINERF_BETH @@ -224,7 +222,7 @@ TrainerCooltrainerfBeth1: end TrainerPsychicRichard: - trainer EVENT_BEAT_PSYCHIC_RICHARD, PSYCHIC_T, RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, 0, .Script + trainer PSYCHIC_T, RICHARD, EVENT_BEAT_PSYCHIC_RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, 0, .Script .Script: end_if_just_battled @@ -235,7 +233,7 @@ TrainerPsychicRichard: end TrainerFisherScott: - trainer EVENT_BEAT_FISHER_SCOTT, FISHER, SCOTT, FisherScottSeenText, FisherScottBeatenText, 0, .Script + trainer FISHER, SCOTT, EVENT_BEAT_FISHER_SCOTT, FisherScottSeenText, FisherScottBeatenText, 0, .Script .Script: end_if_just_battled @@ -413,24 +411,19 @@ Route26SignText: done Route26_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 3 - warp_def 7, 5, 3, VICTORY_ROAD_GATE - warp_def 15, 57, 1, ROUTE_26_HEAL_SPEECH_HOUSE - warp_def 5, 71, 1, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE + db 3 ; warp events + warp_event 7, 5, 3, VICTORY_ROAD_GATE + warp_event 15, 57, 1, ROUTE_26_HEAL_HOUSE + warp_event 5, 71, 1, DAY_OF_WEEK_SIBLINGS_HOUSE -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 1 + db 1 ; bg events bg_event 8, 6, BGEVENT_READ, Route26Sign -.ObjectEvents: - db 8 + db 8 ; object events object_event 14, 24, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermJake, -1 object_event 9, 38, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermGaven3, -1 object_event 10, 56, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJoyce, -1 |