summaryrefslogtreecommitdiff
path: root/maps/BlackthornGym2F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/BlackthornGym2F.asm')
-rw-r--r--maps/BlackthornGym2F.asm36
1 files changed, 2 insertions, 34 deletions
diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm
index 74605ec54..c1eeffdbd 100644
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -59,23 +59,7 @@ BlackthornGymBoulder:
jumpstd strengthboulder
TrainerCooltrainermCody:
- ; bit/flag number
- dw EVENT_BEAT_COOLTRAINERM_CODY
-
- ; trainer group && trainer id
- db COOLTRAINERM, CODY
-
- ; text when seen
- dw CooltrainermCodySeenText
-
- ; text when trainer beaten
- dw CooltrainermCodyBeatenText
-
- ; script when lost
- dw $0000
-
- ; script when talk again
- dw CooltrainermCodyScript
+ trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, $0000, CooltrainermCodyScript
CooltrainermCodyScript:
talkaftercancel
@@ -86,23 +70,7 @@ CooltrainermCodyScript:
end
TrainerCooltrainerfFran:
- ; bit/flag number
- dw EVENT_BEAT_COOLTRAINERF_FRAN
-
- ; trainer group && trainer id
- db COOLTRAINERF, FRAN
-
- ; text when seen
- dw CooltrainerfFranSeenText
-
- ; text when trainer beaten
- dw CooltrainerfFranBeatenText
-
- ; script when lost
- dw $0000
-
- ; script when talk again
- dw CooltrainerfFranScript
+ trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, $0000, CooltrainerfFranScript
CooltrainerfFranScript:
talkaftercancel