Use a 'trainer' macro for trainers in scripts/

This commit is contained in:
Rangi 2020-07-14 15:45:36 -04:00
parent be326c6565
commit 5c0f33cb53
71 changed files with 413 additions and 2645 deletions

View file

@ -76,96 +76,26 @@ Route20_TextPointers:
dw Route20Text12
Route20TrainerHeader0:
dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_0
db ($4 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_0
dw Route20BattleText1 ; TextBeforeBattle
dw Route20AfterBattleText1 ; TextAfterBattle
dw Route20EndBattleText1 ; TextEndBattle
dw Route20EndBattleText1 ; TextEndBattle
trainer EVENT_BEAT_ROUTE_20_TRAINER_0, 4, Route20BattleText1, Route20EndBattleText1, Route20AfterBattleText1
Route20TrainerHeader1:
dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_1
db ($4 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_1
dw Route20BattleText2 ; TextBeforeBattle
dw Route20AfterBattleText2 ; TextAfterBattle
dw Route20EndBattleText2 ; TextEndBattle
dw Route20EndBattleText2 ; TextEndBattle
trainer EVENT_BEAT_ROUTE_20_TRAINER_1, 4, Route20BattleText2, Route20EndBattleText2, Route20AfterBattleText2
Route20TrainerHeader2:
dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_2
db ($2 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_2
dw Route20BattleText3 ; TextBeforeBattle
dw Route20AfterBattleText3 ; TextAfterBattle
dw Route20EndBattleText3 ; TextEndBattle
dw Route20EndBattleText3 ; TextEndBattle
trainer EVENT_BEAT_ROUTE_20_TRAINER_2, 2, Route20BattleText3, Route20EndBattleText3, Route20AfterBattleText3
Route20TrainerHeader3:
dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_3
db ($4 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_3
dw Route20BattleText4 ; TextBeforeBattle
dw Route20AfterBattleText4 ; TextAfterBattle
dw Route20EndBattleText4 ; TextEndBattle
dw Route20EndBattleText4 ; TextEndBattle
trainer EVENT_BEAT_ROUTE_20_TRAINER_3, 4, Route20BattleText4, Route20EndBattleText4, Route20AfterBattleText4
Route20TrainerHeader4:
dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_4
db ($3 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_4
dw Route20BattleText5 ; TextBeforeBattle
dw Route20AfterBattleText5 ; TextAfterBattle
dw Route20EndBattleText5 ; TextEndBattle
dw Route20EndBattleText5 ; TextEndBattle
trainer EVENT_BEAT_ROUTE_20_TRAINER_4, 3, Route20BattleText5, Route20EndBattleText5, Route20AfterBattleText5
Route20TrainerHeader5:
dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_5
db ($4 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_5
dw Route20BattleText6 ; TextBeforeBattle
dw Route20AfterBattleText6 ; TextAfterBattle
dw Route20EndBattleText6 ; TextEndBattle
dw Route20EndBattleText6 ; TextEndBattle
trainer EVENT_BEAT_ROUTE_20_TRAINER_5, 4, Route20BattleText6, Route20EndBattleText6, Route20AfterBattleText6
Route20TrainerHeader6:
dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_6
db ($2 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_6
dw Route20BattleText7 ; TextBeforeBattle
dw Route20AfterBattleText7 ; TextAfterBattle
dw Route20EndBattleText7 ; TextEndBattle
dw Route20EndBattleText7 ; TextEndBattle
trainer EVENT_BEAT_ROUTE_20_TRAINER_6, 2, Route20BattleText7, Route20EndBattleText7, Route20AfterBattleText7
Route20TrainerHeader7:
dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_7, 1
db ($4 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_7, 1
dw Route20BattleText8 ; TextBeforeBattle
dw Route20AfterBattleText8 ; TextAfterBattle
dw Route20EndBattleText8 ; TextEndBattle
dw Route20EndBattleText8 ; TextEndBattle
trainer EVENT_BEAT_ROUTE_20_TRAINER_7, 1, 4, Route20BattleText8, Route20EndBattleText8, Route20AfterBattleText8
Route20TrainerHeader8:
dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_8, 1
db ($3 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_8, 1
dw Route20BattleText9 ; TextBeforeBattle
dw Route20AfterBattleText9 ; TextAfterBattle
dw Route20EndBattleText9 ; TextEndBattle
dw Route20EndBattleText9 ; TextEndBattle
trainer EVENT_BEAT_ROUTE_20_TRAINER_8, 1, 3, Route20BattleText9, Route20EndBattleText9, Route20AfterBattleText9
Route20TrainerHeader9:
dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_9, 1
db ($4 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_9, 1
dw Route20BattleText10 ; TextBeforeBattle
dw Route20AfterBattleText10 ; TextAfterBattle
dw Route20EndBattleText10 ; TextEndBattle
dw Route20EndBattleText10 ; TextEndBattle
db $ff
trainer EVENT_BEAT_ROUTE_20_TRAINER_9, 1, 4, Route20BattleText10, Route20EndBattleText10, Route20AfterBattleText10
db -1 ; end
Route20Text1:
text_asm