summaryrefslogtreecommitdiff
path: root/maps/Route44.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/Route44.asm
parentdea26c663961a19073927e11c140d5ae576f275f (diff)
trainers put the class and id first: `trainer YOUNGSTER, JOEY1, ...`
Diffstat (limited to 'maps/Route44.asm')
-rw-r--r--maps/Route44.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route44.asm b/maps/Route44.asm
index 1995c4cb2..58bc46bbf 100644
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -19,7 +19,7 @@ Route44_MapScripts:
db 0
TrainerBirdKeeperVance1:
- trainer EVENT_BEAT_BIRD_KEEPER_VANCE, BIRD_KEEPER, VANCE1, BirdKeeperVance1SeenText, BirdKeeperVance1BeatenText, 0, .Script
+ trainer BIRD_KEEPER, VANCE1, EVENT_BEAT_BIRD_KEEPER_VANCE, BirdKeeperVance1SeenText, BirdKeeperVance1BeatenText, 0, .Script
.Script:
writecode VAR_CALLERID, PHONE_BIRDKEEPER_VANCE
@@ -150,7 +150,7 @@ UnknownScript_0x19d90a:
end
TrainerPsychicPhil:
- trainer EVENT_BEAT_PSYCHIC_PHIL, PSYCHIC_T, PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, 0, .Script
+ trainer PSYCHIC_T, PHIL, EVENT_BEAT_PSYCHIC_PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, 0, .Script
.Script:
end_if_just_battled
@@ -161,7 +161,7 @@ TrainerPsychicPhil:
end
TrainerFisherWilton1:
- trainer EVENT_BEAT_FISHER_WILTON, FISHER, WILTON1, FisherWilton1SeenText, FisherWilton1BeatenText, 0, .Script
+ trainer FISHER, WILTON1, EVENT_BEAT_FISHER_WILTON, FisherWilton1SeenText, FisherWilton1BeatenText, 0, .Script
.Script:
writecode VAR_CALLERID, PHONE_FISHER_WILTON
@@ -256,7 +256,7 @@ UnknownScript_0x19d9e7:
jump UnknownScript_0x19d8ff
TrainerFisherEdgar:
- trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, .Script
+ trainer FISHER, EDGAR, EVENT_BEAT_FISHER_EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, .Script
.Script:
end_if_just_battled
@@ -267,7 +267,7 @@ TrainerFisherEdgar:
end
TrainerCooltrainerfCybil:
- trainer EVENT_BEAT_COOLTRAINERF_CYBIL, COOLTRAINERF, CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, 0, .Script
+ trainer COOLTRAINERF, CYBIL, EVENT_BEAT_COOLTRAINERF_CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, 0, .Script
.Script:
end_if_just_battled
@@ -278,7 +278,7 @@ TrainerCooltrainerfCybil:
end
TrainerPokemaniacZach:
- trainer EVENT_BEAT_POKEMANIAC_ZACH, POKEMANIAC, ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, 0, .Script
+ trainer POKEMANIAC, ZACH, EVENT_BEAT_POKEMANIAC_ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, 0, .Script
.Script:
end_if_just_battled
@@ -289,7 +289,7 @@ TrainerPokemaniacZach:
end
TrainerCooltrainermAllen:
- trainer EVENT_BEAT_COOLTRAINERM_ALLEN, COOLTRAINERM, ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, 0, .Script
+ trainer COOLTRAINERM, ALLEN, EVENT_BEAT_COOLTRAINERM_ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, 0, .Script
.Script:
end_if_just_battled