diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2021-04-13 18:24:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-13 18:24:37 -0400 |
| commit | 506a14084e32d7532b8400a6457f46492bbc47ab (patch) | |
| tree | 60ce89cfa9dc1158c5e8a8353ef96fba810c929c /scripts/SaffronGym.asm | |
| parent | 2954013da1f10e11db4ec96f9586b7c01706ae1a (diff) | |
The 'def_trainers' macro checks that trainers' event flag bits are correct (#318)
Diffstat (limited to 'scripts/SaffronGym.asm')
| -rw-r--r-- | scripts/SaffronGym.asm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/SaffronGym.asm b/scripts/SaffronGym.asm index f90bba65..a55c58ff 100644 --- a/scripts/SaffronGym.asm +++ b/scripts/SaffronGym.asm @@ -4,7 +4,7 @@ SaffronGym_Script: res 6, [hl] call nz, .LoadNames call EnableAutoTextBoxDrawing - ld hl, SaffronGymTrainerHeader0 + ld hl, SaffronGymTrainerHeaders ld de, SaffronGym_ScriptPointers ld a, [wSaffronGymCurScript] call ExecuteCurMapScriptInTable @@ -84,6 +84,8 @@ SaffronGym_TextPointers: dw SaffronGymText11 dw SaffronGymText12 +SaffronGymTrainerHeaders: + def_trainers 2 SaffronGymTrainerHeader0: trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_0, 3, SaffronGymBattleText1, SaffronGymEndBattleText1, SaffronGymAfterBattleText1 SaffronGymTrainerHeader1: @@ -97,7 +99,7 @@ SaffronGymTrainerHeader4: SaffronGymTrainerHeader5: trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_5, 3, SaffronGymBattleText6, SaffronGymEndBattleText6, SaffronGymAfterBattleText6 SaffronGymTrainerHeader6: - trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_6, 1, 3, SaffronGymBattleText7, SaffronGymEndBattleText7, SaffronGymAfterBattleText7 + trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_6, 3, SaffronGymBattleText7, SaffronGymEndBattleText7, SaffronGymAfterBattleText7 db -1 ; end SaffronGymText1: |