summaryrefslogtreecommitdiff
path: root/scripts/SilphCo5F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/SilphCo5F.asm')
-rwxr-xr-xscripts/SilphCo5F.asm38
1 files changed, 5 insertions, 33 deletions
diff --git a/scripts/SilphCo5F.asm b/scripts/SilphCo5F.asm
index 4d4f6ab6..94a7ec30 100755
--- a/scripts/SilphCo5F.asm
+++ b/scripts/SilphCo5F.asm
@@ -84,42 +84,14 @@ SilphCo5F_TextPointers:
dw SilphCo5Text11
SilphCo5TrainerHeader0:
- dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_0
- db ($1 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_0
- dw SilphCo5BattleText2 ; TextBeforeBattle
- dw SilphCo5AfterBattleText2 ; TextAfterBattle
- dw SilphCo5EndBattleText2 ; TextEndBattle
- dw SilphCo5EndBattleText2 ; TextEndBattle
-
+ trainer EVENT_BEAT_SILPH_CO_5F_TRAINER_0, 1, SilphCo5BattleText2, SilphCo5EndBattleText2, SilphCo5AfterBattleText2
SilphCo5TrainerHeader1:
- dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_1
- db ($2 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_1
- dw SilphCo5BattleText3 ; TextBeforeBattle
- dw SilphCo5AfterBattleText3 ; TextAfterBattle
- dw SilphCo5EndBattleText3 ; TextEndBattle
- dw SilphCo5EndBattleText3 ; TextEndBattle
-
+ trainer EVENT_BEAT_SILPH_CO_5F_TRAINER_1, 2, SilphCo5BattleText3, SilphCo5EndBattleText3, SilphCo5AfterBattleText3
SilphCo5TrainerHeader2:
- dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_2
- db ($4 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_2
- dw SilphCo5BattleText4 ; TextBeforeBattle
- dw SilphCo5AfterBattleText4 ; TextAfterBattle
- dw SilphCo5EndBattleText4 ; TextEndBattle
- dw SilphCo5EndBattleText4 ; TextEndBattle
-
+ trainer EVENT_BEAT_SILPH_CO_5F_TRAINER_2, 4, SilphCo5BattleText4, SilphCo5EndBattleText4, SilphCo5AfterBattleText4
SilphCo5TrainerHeader3:
- dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_3
- db ($3 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_3
- dw SilphCo5BattleText5 ; TextBeforeBattle
- dw SilphCo5AfterBattleText5 ; TextAfterBattle
- dw SilphCo5EndBattleText5 ; TextEndBattle
- dw SilphCo5EndBattleText5 ; TextEndBattle
-
- db $ff
+ trainer EVENT_BEAT_SILPH_CO_5F_TRAINER_3, 3, SilphCo5BattleText5, SilphCo5EndBattleText5, SilphCo5AfterBattleText5
+ db -1 ; end
SilphCo5Text1:
text_asm