summaryrefslogtreecommitdiff
path: root/scripts/SilphCo2F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/SilphCo2F.asm')
-rwxr-xr-xscripts/SilphCo2F.asm38
1 files changed, 5 insertions, 33 deletions
diff --git a/scripts/SilphCo2F.asm b/scripts/SilphCo2F.asm
index 42e5a7e6..5433bca4 100755
--- a/scripts/SilphCo2F.asm
+++ b/scripts/SilphCo2F.asm
@@ -99,42 +99,14 @@ SilphCo2F_TextPointers:
dw SilphCo2Text5
SilphCo2TrainerHeader0:
- dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_0
- db ($3 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_SILPH_CO_2F_TRAINER_0
- dw SilphCo2BattleText1 ; TextBeforeBattle
- dw SilphCo2AfterBattleText1 ; TextAfterBattle
- dw SilphCo2EndBattleText1 ; TextEndBattle
- dw SilphCo2EndBattleText1 ; TextEndBattle
-
+ trainer EVENT_BEAT_SILPH_CO_2F_TRAINER_0, 3, SilphCo2BattleText1, SilphCo2EndBattleText1, SilphCo2AfterBattleText1
SilphCo2TrainerHeader1:
- dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_1
- db ($4 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_SILPH_CO_2F_TRAINER_1
- dw SilphCo2BattleText2 ; TextBeforeBattle
- dw SilphCo2AfterBattleText2 ; TextAfterBattle
- dw SilphCo2EndBattleText2 ; TextEndBattle
- dw SilphCo2EndBattleText2 ; TextEndBattle
-
+ trainer EVENT_BEAT_SILPH_CO_2F_TRAINER_1, 4, SilphCo2BattleText2, SilphCo2EndBattleText2, SilphCo2AfterBattleText2
SilphCo2TrainerHeader2:
- dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_2
- db ($3 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_SILPH_CO_2F_TRAINER_2
- dw SilphCo2BattleText3 ; TextBeforeBattle
- dw SilphCo2AfterBattleText3 ; TextAfterBattle
- dw SilphCo2EndBattleText3 ; TextEndBattle
- dw SilphCo2EndBattleText3 ; TextEndBattle
-
+ trainer EVENT_BEAT_SILPH_CO_2F_TRAINER_2, 3, SilphCo2BattleText3, SilphCo2EndBattleText3, SilphCo2AfterBattleText3
SilphCo2TrainerHeader3:
- dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_3
- db ($3 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_SILPH_CO_2F_TRAINER_3
- dw SilphCo2BattleText4 ; TextBeforeBattle
- dw SilphCo2AfterBattleText4 ; TextAfterBattle
- dw SilphCo2EndBattleText4 ; TextEndBattle
- dw SilphCo2EndBattleText4 ; TextEndBattle
-
- db $ff
+ trainer EVENT_BEAT_SILPH_CO_2F_TRAINER_3, 3, SilphCo2BattleText4, SilphCo2EndBattleText4, SilphCo2AfterBattleText4
+ db -1 ; end
SilphCo2Text1:
text_asm