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/ViridianGym.asm | |
| parent | 2954013da1f10e11db4ec96f9586b7c01706ae1a (diff) | |
The 'def_trainers' macro checks that trainers' event flag bits are correct (#318)
Diffstat (limited to 'scripts/ViridianGym.asm')
| -rw-r--r-- | scripts/ViridianGym.asm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/ViridianGym.asm b/scripts/ViridianGym.asm index 68da9301..b7b4a34d 100644 --- a/scripts/ViridianGym.asm +++ b/scripts/ViridianGym.asm @@ -3,7 +3,7 @@ ViridianGym_Script: ld de, .LeaderName call LoadGymLeaderAndCityName call EnableAutoTextBoxDrawing - ld hl, ViridianGymTrainerHeader0 + ld hl, ViridianGymTrainerHeaders ld de, ViridianGym_ScriptPointers ld a, [wViridianGymCurScript] call ExecuteCurMapScriptInTable @@ -181,6 +181,8 @@ ViridianGym_TextPointers: dw ViridianGymText13 dw ViridianGymText14 +ViridianGymTrainerHeaders: + def_trainers 2 ViridianGymTrainerHeader0: trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0, 4, ViridianGymBattleText1, ViridianGymEndBattleText1, ViridianGymAfterBattleText1 ViridianGymTrainerHeader1: @@ -194,9 +196,9 @@ ViridianGymTrainerHeader4: ViridianGymTrainerHeader5: trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_5, 4, ViridianGymBattleText6, ViridianGymEndBattleText6, ViridianGymAfterBattleText6 ViridianGymTrainerHeader6: - trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_6, 1, 3, ViridianGymBattleText7, ViridianGymEndBattleText7, ViridianGymAfterBattleText7 + trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_6, 3, ViridianGymBattleText7, ViridianGymEndBattleText7, ViridianGymAfterBattleText7 ViridianGymTrainerHeader7: - trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7, 1, 4, ViridianGymBattleText8, ViridianGymEndBattleText8, ViridianGymAfterBattleText8 + trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7, 4, ViridianGymBattleText8, ViridianGymEndBattleText8, ViridianGymAfterBattleText8 db -1 ; end ViridianGymText1: |