summaryrefslogtreecommitdiff
path: root/scripts/SilphCo8F.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-14 15:45:36 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-14 15:53:25 -0400
commit5c0f33cb5350d3e11bd75cc04d943549667ecd4c (patch)
tree2d5927ab83072b0673793269eacd14e6b5fd5ad2 /scripts/SilphCo8F.asm
parentbe326c65652d5e87e353172a4471458822ffd3da (diff)
Use a 'trainer' macro for trainers in scripts/
Diffstat (limited to 'scripts/SilphCo8F.asm')
-rwxr-xr-xscripts/SilphCo8F.asm29
1 files changed, 4 insertions, 25 deletions
diff --git a/scripts/SilphCo8F.asm b/scripts/SilphCo8F.asm
index 0a10781e..6b77ce46 100755
--- a/scripts/SilphCo8F.asm
+++ b/scripts/SilphCo8F.asm
@@ -82,33 +82,12 @@ SilphCo8F_TextPointers:
dw SilphCo8Text4
SilphCo8TrainerHeader0:
- dbEventFlagBit EVENT_BEAT_SILPH_CO_8F_TRAINER_0
- db ($4 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_SILPH_CO_8F_TRAINER_0
- dw SilphCo8BattleText1 ; TextBeforeBattle
- dw SilphCo8AfterBattleText1 ; TextAfterBattle
- dw SilphCo8EndBattleText1 ; TextEndBattle
- dw SilphCo8EndBattleText1 ; TextEndBattle
-
+ trainer EVENT_BEAT_SILPH_CO_8F_TRAINER_0, 4, SilphCo8BattleText1, SilphCo8EndBattleText1, SilphCo8AfterBattleText1
SilphCo8TrainerHeader1:
- dbEventFlagBit EVENT_BEAT_SILPH_CO_8F_TRAINER_1
- db ($4 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_SILPH_CO_8F_TRAINER_1
- dw SilphCo8BattleText2 ; TextBeforeBattle
- dw SilphCo8AfterBattleText2 ; TextAfterBattle
- dw SilphCo8EndBattleText2 ; TextEndBattle
- dw SilphCo8EndBattleText2 ; TextEndBattle
-
+ trainer EVENT_BEAT_SILPH_CO_8F_TRAINER_1, 4, SilphCo8BattleText2, SilphCo8EndBattleText2, SilphCo8AfterBattleText2
SilphCo8TrainerHeader2:
- dbEventFlagBit EVENT_BEAT_SILPH_CO_8F_TRAINER_2
- db ($4 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_SILPH_CO_8F_TRAINER_2
- dw SilphCo8BattleText3 ; TextBeforeBattle
- dw SilphCo8AfterBattleText3 ; TextAfterBattle
- dw SilphCo8EndBattleText3 ; TextEndBattle
- dw SilphCo8EndBattleText3 ; TextEndBattle
-
- db $ff
+ trainer EVENT_BEAT_SILPH_CO_8F_TRAINER_2, 4, SilphCo8BattleText3, SilphCo8EndBattleText3, SilphCo8AfterBattleText3
+ db -1 ; end
SilphCo8Text1:
text_asm