summaryrefslogtreecommitdiff
path: root/maps/Route38.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/Route38.asm
parentdea26c663961a19073927e11c140d5ae576f275f (diff)
trainers put the class and id first: `trainer YOUNGSTER, JOEY1, ...`
Diffstat (limited to 'maps/Route38.asm')
-rw-r--r--maps/Route38.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/Route38.asm b/maps/Route38.asm
index c228429ba..6272d3a51 100644
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -15,7 +15,7 @@ Route38_MapScripts:
db 0
TrainerBirdKeeperToby:
- trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, BirdKeeperTobySeenText, BirdKeeperTobyBeatenText, 0, .Script
+ trainer BIRD_KEEPER, TOBY, EVENT_BEAT_BIRD_KEEPER_TOBY, BirdKeeperTobySeenText, BirdKeeperTobyBeatenText, 0, .Script
.Script
end_if_just_battled
@@ -26,7 +26,7 @@ TrainerBirdKeeperToby:
end
TrainerSailorHarry:
- trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .Script
+ trainer SAILOR, HARRY, EVENT_BEAT_SAILOR_HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .Script
.Script
end_if_just_battled
@@ -37,7 +37,7 @@ TrainerSailorHarry:
end
TrainerLassDana1:
- trainer EVENT_BEAT_LASS_DANA, LASS, DANA1, LassDana1SeenText, LassDana1BeatenText, 0, .Script
+ trainer LASS, DANA1, EVENT_BEAT_LASS_DANA, LassDana1SeenText, LassDana1BeatenText, 0, .Script
.Script
writecode VAR_CALLERID, PHONE_LASS_DANA
@@ -175,7 +175,7 @@ TrainerLassDana1:
end
TrainerSchoolboyChad1:
- trainer EVENT_BEAT_SCHOOLBOY_CHAD, SCHOOLBOY, CHAD1, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, 0, .Script
+ trainer SCHOOLBOY, CHAD1, EVENT_BEAT_SCHOOLBOY_CHAD, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, 0, .Script
.Script
writecode VAR_CALLERID, PHONE_SCHOOLBOY_CHAD
@@ -292,7 +292,7 @@ TrainerSchoolboyChad1:
end
TrainerBeautyValerie:
- trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .Script
+ trainer BEAUTY, VALERIE, EVENT_BEAT_BEAUTY_VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .Script
.Script
end_if_just_battled
@@ -303,7 +303,7 @@ TrainerBeautyValerie:
end
TrainerBeautyOlivia:
- trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .Script
+ trainer BEAUTY, OLIVIA, EVENT_BEAT_BEAUTY_OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .Script
.Script
end_if_just_battled