summaryrefslogtreecommitdiff
path: root/scripts/VictoryRoad1F.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/VictoryRoad1F.asm
parentbe326c65652d5e87e353172a4471458822ffd3da (diff)
Use a 'trainer' macro for trainers in scripts/
Diffstat (limited to 'scripts/VictoryRoad1F.asm')
-rwxr-xr-xscripts/VictoryRoad1F.asm20
1 files changed, 3 insertions, 17 deletions
diff --git a/scripts/VictoryRoad1F.asm b/scripts/VictoryRoad1F.asm
index afff8ca5..784329f0 100755
--- a/scripts/VictoryRoad1F.asm
+++ b/scripts/VictoryRoad1F.asm
@@ -47,24 +47,10 @@ VictoryRoad1F_TextPointers:
dw BoulderText
VictoryRoad1TrainerHeader0:
- dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0
- db ($2 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0
- dw VictoryRoad1BattleText1 ; TextBeforeBattle
- dw VictoryRoad1AfterBattleText1 ; TextAfterBattle
- dw VictoryRoad1EndBattleText1 ; TextEndBattle
- dw VictoryRoad1EndBattleText1 ; TextEndBattle
-
+ trainer EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0, 2, VictoryRoad1BattleText1, VictoryRoad1EndBattleText1, VictoryRoad1AfterBattleText1
VictoryRoad1TrainerHeader1:
- dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1
- db ($2 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1
- dw VictoryRoad1BattleText2 ; TextBeforeBattle
- dw VictoryRoad1AfterBattleText2 ; TextAfterBattle
- dw VictoryRoad1EndBattleText2 ; TextEndBattle
- dw VictoryRoad1EndBattleText2 ; TextEndBattle
-
- db $ff
+ trainer EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1, 2, VictoryRoad1BattleText2, VictoryRoad1EndBattleText2, VictoryRoad1AfterBattleText2
+ db -1 ; end
VictoryRoad1Text1:
text_asm