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

@ -26,60 +26,18 @@ SSAnneB1FRooms_TextPointers:
dw PickUpItemText
SSAnne10TrainerHeader0:
dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_0
db ($2 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_0
dw SSAnne10BattleText1 ; TextBeforeBattle
dw SSAnne10AfterBattleText1 ; TextAfterBattle
dw SSAnne10EndBattleText1 ; TextEndBattle
dw SSAnne10EndBattleText1 ; TextEndBattle
trainer EVENT_BEAT_SS_ANNE_10_TRAINER_0, 2, SSAnne10BattleText1, SSAnne10EndBattleText1, SSAnne10AfterBattleText1
SSAnne10TrainerHeader1:
dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_1
db ($3 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_1
dw SSAnne10BattleText2 ; TextBeforeBattle
dw SSAnne10AfterBattleText2 ; TextAfterBattle
dw SSAnne10EndBattleText2 ; TextEndBattle
dw SSAnne10EndBattleText2 ; TextEndBattle
trainer EVENT_BEAT_SS_ANNE_10_TRAINER_1, 3, SSAnne10BattleText2, SSAnne10EndBattleText2, SSAnne10AfterBattleText2
SSAnne10TrainerHeader2:
dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_2
db ($2 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_2
dw SSAnne10BattleText3 ; TextBeforeBattle
dw SSAnne10AfterBattleText3 ; TextAfterBattle
dw SSAnne10EndBattleText3 ; TextEndBattle
dw SSAnne10EndBattleText3 ; TextEndBattle
trainer EVENT_BEAT_SS_ANNE_10_TRAINER_2, 2, SSAnne10BattleText3, SSAnne10EndBattleText3, SSAnne10AfterBattleText3
SSAnne10TrainerHeader3:
dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_3
db ($2 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_3
dw SSAnne10BattleText4 ; TextBeforeBattle
dw SSAnne10AfterBattleText4 ; TextAfterBattle
dw SSAnne10EndBattleText4 ; TextEndBattle
dw SSAnne10EndBattleText4 ; TextEndBattle
trainer EVENT_BEAT_SS_ANNE_10_TRAINER_3, 2, SSAnne10BattleText4, SSAnne10EndBattleText4, SSAnne10AfterBattleText4
SSAnne10TrainerHeader4:
dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_4
db ($2 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_4
dw SSAnne10BattleText5 ; TextBeforeBattle
dw SSAnne10AfterBattleText5 ; TextAfterBattle
dw SSAnne10EndBattleText5 ; TextEndBattle
dw SSAnne10EndBattleText5 ; TextEndBattle
trainer EVENT_BEAT_SS_ANNE_10_TRAINER_4, 2, SSAnne10BattleText5, SSAnne10EndBattleText5, SSAnne10AfterBattleText5
SSAnne10TrainerHeader5:
dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_5
db ($3 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_5
dw SSAnne10BattleText6 ; TextBeforeBattle
dw SSAnne10AfterBattleText6 ; TextAfterBattle
dw SSAnne10EndBattleText6 ; TextEndBattle
dw SSAnne10EndBattleText6 ; TextEndBattle
db $ff
trainer EVENT_BEAT_SS_ANNE_10_TRAINER_5, 3, SSAnne10BattleText6, SSAnne10EndBattleText6, SSAnne10AfterBattleText6
db -1 ; end
SSAnne10Text1:
text_asm