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

@ -31,42 +31,14 @@ SSAnne2FRooms_TextPointers:
dw SSAnne9Text13
SSAnne9TrainerHeader0:
dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_0
db ($2 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_0
dw SSAnne9BattleText1 ; TextBeforeBattle
dw SSAnne9AfterBattleText1 ; TextAfterBattle
dw SSAnne9EndBattleText1 ; TextEndBattle
dw SSAnne9EndBattleText1 ; TextEndBattle
trainer EVENT_BEAT_SS_ANNE_9_TRAINER_0, 2, SSAnne9BattleText1, SSAnne9EndBattleText1, SSAnne9AfterBattleText1
SSAnne9TrainerHeader1:
dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_1
db ($3 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_1
dw SSAnne9BattleText2 ; TextBeforeBattle
dw SSAnne9AfterBattleText2 ; TextAfterBattle
dw SSAnne9EndBattleText2 ; TextEndBattle
dw SSAnne9EndBattleText2 ; TextEndBattle
trainer EVENT_BEAT_SS_ANNE_9_TRAINER_1, 3, SSAnne9BattleText2, SSAnne9EndBattleText2, SSAnne9AfterBattleText2
SSAnne9TrainerHeader2:
dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_2
db ($3 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_2
dw SSAnne9BattleText3 ; TextBeforeBattle
dw SSAnne9AfterBattleText3 ; TextAfterBattle
dw SSAnne9EndBattleText3 ; TextEndBattle
dw SSAnne9EndBattleText3 ; TextEndBattle
trainer EVENT_BEAT_SS_ANNE_9_TRAINER_2, 3, SSAnne9BattleText3, SSAnne9EndBattleText3, SSAnne9AfterBattleText3
SSAnne9TrainerHeader3:
dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_3
db ($2 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_3
dw SSAnne9BattleText4 ; TextBeforeBattle
dw SSAnne9AfterBattleText4 ; TextAfterBattle
dw SSAnne9EndBattleText4 ; TextEndBattle
dw SSAnne9EndBattleText4 ; TextEndBattle
db $ff
trainer EVENT_BEAT_SS_ANNE_9_TRAINER_3, 2, SSAnne9BattleText4, SSAnne9EndBattleText4, SSAnne9AfterBattleText4
db -1 ; end
SSAnne9Text1:
text_asm