summaryrefslogtreecommitdiff
path: root/maps/Route34.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-01-23 13:08:48 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2018-01-23 13:08:48 -0500
commit8f2878c37e6755a4ac41ea65568bbfabd77bbe83 (patch)
treea082947316f88193c6020b04bb51243a74c96f00 /maps/Route34.asm
parentdea26c663961a19073927e11c140d5ae576f275f (diff)
trainers put the class and id first: `trainer YOUNGSTER, JOEY1, ...`
Diffstat (limited to 'maps/Route34.asm')
-rw-r--r--maps/Route34.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/Route34.asm b/maps/Route34.asm
index 8d78baad4..aeb532ae9 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -88,7 +88,7 @@ DayCareMon2Script:
end
TrainerCamperTodd1:
- trainer EVENT_BEAT_CAMPER_TODD, CAMPER, TODD1, CamperTodd1SeenText, CamperTodd1BeatenText, 0, .Script
+ trainer CAMPER, TODD1, EVENT_BEAT_CAMPER_TODD, CamperTodd1SeenText, CamperTodd1BeatenText, 0, .Script
.Script:
writecode VAR_CALLERID, PHONE_CAMPER_TODD
@@ -213,7 +213,7 @@ TrainerCamperTodd1:
end
TrainerPicnickerGina1:
- trainer EVENT_BEAT_PICNICKER_GINA, PICNICKER, GINA1, PicnickerGina1SeenText, PicnickerGina1BeatenText, 0, .Script
+ trainer PICNICKER, GINA1, EVENT_BEAT_PICNICKER_GINA, PicnickerGina1SeenText, PicnickerGina1BeatenText, 0, .Script
.Script:
writecode VAR_CALLERID, PHONE_PICNICKER_GINA
@@ -382,7 +382,7 @@ OfficerKeithScript:
end
TrainerYoungsterSamuel:
- trainer EVENT_BEAT_YOUNGSTER_SAMUEL, YOUNGSTER, SAMUEL, YoungsterSamuelSeenText, YoungsterSamuelBeatenText, 0, .Script
+ trainer YOUNGSTER, SAMUEL, EVENT_BEAT_YOUNGSTER_SAMUEL, YoungsterSamuelSeenText, YoungsterSamuelBeatenText, 0, .Script
.Script:
end_if_just_battled
@@ -393,7 +393,7 @@ TrainerYoungsterSamuel:
end
TrainerYoungsterIan:
- trainer EVENT_BEAT_YOUNGSTER_IAN, YOUNGSTER, IAN, YoungsterIanSeenText, YoungsterIanBeatenText, 0, .Script
+ trainer YOUNGSTER, IAN, EVENT_BEAT_YOUNGSTER_IAN, YoungsterIanSeenText, YoungsterIanBeatenText, 0, .Script
.Script:
end_if_just_battled
@@ -404,7 +404,7 @@ TrainerYoungsterIan:
end
TrainerPokefanmBrandon:
- trainer EVENT_BEAT_POKEFANM_BRANDON, POKEFANM, BRANDON, PokefanmBrandonSeenText, PokefanmBrandonBeatenText, 0, .Script
+ trainer POKEFANM, BRANDON, EVENT_BEAT_POKEFANM_BRANDON, PokefanmBrandonSeenText, PokefanmBrandonBeatenText, 0, .Script
.Script:
end_if_just_battled
@@ -415,7 +415,7 @@ TrainerPokefanmBrandon:
end
TrainerCooltrainerfIrene:
- trainer EVENT_BEAT_COOLTRAINERF_IRENE, COOLTRAINERF, IRENE, CooltrainerfIreneSeenText, CooltrainerfIreneBeatenText, 0, .Script
+ trainer COOLTRAINERF, IRENE, EVENT_BEAT_COOLTRAINERF_IRENE, CooltrainerfIreneSeenText, CooltrainerfIreneBeatenText, 0, .Script
.Script:
end_if_just_battled
@@ -434,7 +434,7 @@ TrainerCooltrainerfIrene:
end
TrainerCooltrainerfJenn:
- trainer EVENT_BEAT_COOLTRAINERF_JENN, COOLTRAINERF, JENN, CooltrainerfJennSeenText, CooltrainerfJennBeatenText, 0, .Script
+ trainer COOLTRAINERF, JENN, EVENT_BEAT_COOLTRAINERF_JENN, CooltrainerfJennSeenText, CooltrainerfJennBeatenText, 0, .Script
.Script:
end_if_just_battled
@@ -453,7 +453,7 @@ TrainerCooltrainerfJenn:
end
TrainerCooltrainerfKate:
- trainer EVENT_BEAT_COOLTRAINERF_KATE, COOLTRAINERF, KATE, CooltrainerfKateSeenText, CooltrainerfKateBeatenText, 0, .Script
+ trainer COOLTRAINERF, KATE, EVENT_BEAT_COOLTRAINERF_KATE, CooltrainerfKateSeenText, CooltrainerfKateBeatenText, 0, .Script
.Script:
end_if_just_battled