summaryrefslogtreecommitdiff
path: root/scripts/CeruleanGym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/CeruleanGym.asm')
-rwxr-xr-xscripts/CeruleanGym.asm20
1 files changed, 3 insertions, 17 deletions
diff --git a/scripts/CeruleanGym.asm b/scripts/CeruleanGym.asm
index fef3f551..57edfe78 100755
--- a/scripts/CeruleanGym.asm
+++ b/scripts/CeruleanGym.asm
@@ -80,24 +80,10 @@ CeruleanGym_TextPointers:
dw CeruleanGymText7
CeruleanGymTrainerHeader0:
- dbEventFlagBit EVENT_BEAT_CERULEAN_GYM_TRAINER_0
- db ($3 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_CERULEAN_GYM_TRAINER_0
- dw CeruleanGymBattleText1 ; TextBeforeBattle
- dw CeruleanGymAfterBattleText1 ; TextAfterBattle
- dw CeruleanGymEndBattleText1 ; TextEndBattle
- dw CeruleanGymEndBattleText1 ; TextEndBattle
-
+ trainer EVENT_BEAT_CERULEAN_GYM_TRAINER_0, 3, CeruleanGymBattleText1, CeruleanGymEndBattleText1, CeruleanGymAfterBattleText1
CeruleanGymTrainerHeader1:
- dbEventFlagBit EVENT_BEAT_CERULEAN_GYM_TRAINER_1
- db ($3 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_CERULEAN_GYM_TRAINER_1
- dw CeruleanGymBattleText2 ; TextBeforeBattle
- dw CeruleanGymAfterBattleText2 ; TextAfterBattle
- dw CeruleanGymEndBattleText2 ; TextEndBattle
- dw CeruleanGymEndBattleText2 ; TextEndBattle
-
- db $ff
+ trainer EVENT_BEAT_CERULEAN_GYM_TRAINER_1, 3, CeruleanGymBattleText2, CeruleanGymEndBattleText2, CeruleanGymAfterBattleText2
+ db -1 ; end
CeruleanGymText1:
text_asm