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/Route12.asm | |
parent | 2954013da1f10e11db4ec96f9586b7c01706ae1a (diff) |
The 'def_trainers' macro checks that trainers' event flag bits are correct (#318)
Diffstat (limited to 'scripts/Route12.asm')
-rw-r--r-- | scripts/Route12.asm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/Route12.asm b/scripts/Route12.asm index 3c0d77e1..d46a95bb 100644 --- a/scripts/Route12.asm +++ b/scripts/Route12.asm @@ -1,6 +1,6 @@ Route12_Script: call EnableAutoTextBoxDrawing - ld hl, Route12TrainerHeader0 + ld hl, Route12TrainerHeaders ld de, Route12_ScriptPointers ld a, [wRoute12CurScript] call ExecuteCurMapScriptInTable @@ -76,6 +76,8 @@ Route12_TextPointers: dw Route12Text13 dw Route12Text14 +Route12TrainerHeaders: + def_trainers 2 Route12TrainerHeader0: trainer EVENT_BEAT_ROUTE_12_TRAINER_0, 4, Route12BattleText1, Route12EndBattleText1, Route12AfterBattleText1 Route12TrainerHeader1: @@ -89,7 +91,7 @@ Route12TrainerHeader4: Route12TrainerHeader5: trainer EVENT_BEAT_ROUTE_12_TRAINER_5, 4, Route12BattleText6, Route12EndBattleText6, Route12AfterBattleText6 Route12TrainerHeader6: - trainer EVENT_BEAT_ROUTE_12_TRAINER_6, 1, 1, Route12BattleText7, Route12EndBattleText7, Route12AfterBattleText7 + trainer EVENT_BEAT_ROUTE_12_TRAINER_6, 1, Route12BattleText7, Route12EndBattleText7, Route12AfterBattleText7 db -1 ; end Route12Text1: |