summaryrefslogtreecommitdiff
path: root/maps/Route15.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route15.asm')
-rw-r--r--maps/Route15.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/Route15.asm b/maps/Route15.asm
index 58fe79c9b..8127f60a0 100644
--- a/maps/Route15.asm
+++ b/maps/Route15.asm
@@ -15,7 +15,7 @@ Route15_MapScripts:
db 0
TrainerTeacherColette:
- trainer EVENT_BEAT_TEACHER_COLETTE, TEACHER, COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, .Script
+ trainer TEACHER, COLETTE, EVENT_BEAT_TEACHER_COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, .Script
.Script:
end_if_just_battled
@@ -26,7 +26,7 @@ TrainerTeacherColette:
end
TrainerTeacherHillary:
- trainer EVENT_BEAT_TEACHER_HILLARY, TEACHER, HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, 0, .Script
+ trainer TEACHER, HILLARY, EVENT_BEAT_TEACHER_HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, 0, .Script
.Script:
end_if_just_battled
@@ -37,7 +37,7 @@ TrainerTeacherHillary:
end
TrainerSchoolboyKipp:
- trainer EVENT_BEAT_SCHOOLBOY_KIP, SCHOOLBOY, KIPP, SchoolboyKippSeenText, SchoolboyKippBeatenText, 0, .Script
+ trainer SCHOOLBOY, KIPP, EVENT_BEAT_SCHOOLBOY_KIP, SchoolboyKippSeenText, SchoolboyKippBeatenText, 0, .Script
.Script:
end_if_just_battled
@@ -48,7 +48,7 @@ TrainerSchoolboyKipp:
end
TrainerSchoolboyTommy:
- trainer EVENT_BEAT_SCHOOLBOY_TOMMY, SCHOOLBOY, TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, 0, .Script
+ trainer SCHOOLBOY, TOMMY, EVENT_BEAT_SCHOOLBOY_TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, 0, .Script
.Script:
end_if_just_battled
@@ -59,7 +59,7 @@ TrainerSchoolboyTommy:
end
TrainerSchoolboyJohnny:
- trainer EVENT_BEAT_SCHOOLBOY_JOHNNY, SCHOOLBOY, JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, 0, .Script
+ trainer SCHOOLBOY, JOHNNY, EVENT_BEAT_SCHOOLBOY_JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, 0, .Script
.Script:
end_if_just_battled
@@ -70,7 +70,7 @@ TrainerSchoolboyJohnny:
end
TrainerSchoolboyBilly:
- trainer EVENT_BEAT_SCHOOLBOY_BILLY, SCHOOLBOY, BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, 0, .Script
+ trainer SCHOOLBOY, BILLY, EVENT_BEAT_SCHOOLBOY_BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, 0, .Script
.Script:
end_if_just_battled