diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-14 15:45:36 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-14 15:53:25 -0400 |
| commit | 5c0f33cb5350d3e11bd75cc04d943549667ecd4c (patch) | |
| tree | 2d5927ab83072b0673793269eacd14e6b5fd5ad2 /scripts/CeruleanGym.asm | |
| parent | be326c65652d5e87e353172a4471458822ffd3da (diff) | |
Use a 'trainer' macro for trainers in scripts/
Diffstat (limited to 'scripts/CeruleanGym.asm')
| -rwxr-xr-x | scripts/CeruleanGym.asm | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/scripts/CeruleanGym.asm b/scripts/CeruleanGym.asm index fef3f551..57edfe78 100755 --- a/scripts/CeruleanGym.asm +++ b/scripts/CeruleanGym.asm @@ -80,24 +80,10 @@ CeruleanGym_TextPointers: dw CeruleanGymText7 CeruleanGymTrainerHeader0: - dbEventFlagBit EVENT_BEAT_CERULEAN_GYM_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CERULEAN_GYM_TRAINER_0 - dw CeruleanGymBattleText1 ; TextBeforeBattle - dw CeruleanGymAfterBattleText1 ; TextAfterBattle - dw CeruleanGymEndBattleText1 ; TextEndBattle - dw CeruleanGymEndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_CERULEAN_GYM_TRAINER_0, 3, CeruleanGymBattleText1, CeruleanGymEndBattleText1, CeruleanGymAfterBattleText1 CeruleanGymTrainerHeader1: - dbEventFlagBit EVENT_BEAT_CERULEAN_GYM_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CERULEAN_GYM_TRAINER_1 - dw CeruleanGymBattleText2 ; TextBeforeBattle - dw CeruleanGymAfterBattleText2 ; TextAfterBattle - dw CeruleanGymEndBattleText2 ; TextEndBattle - dw CeruleanGymEndBattleText2 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_CERULEAN_GYM_TRAINER_1, 3, CeruleanGymBattleText2, CeruleanGymEndBattleText2, CeruleanGymAfterBattleText2 + db -1 ; end CeruleanGymText1: text_asm |