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/Route3.asm | |
| parent | Trim extra newlines from some files (diff) | |
| download | pokeyellow-506a14084e32d7532b8400a6457f46492bbc47ab.tar.gz pokeyellow-506a14084e32d7532b8400a6457f46492bbc47ab.tar.xz pokeyellow-506a14084e32d7532b8400a6457f46492bbc47ab.zip | |
The 'def_trainers' macro checks that trainers' event flag bits are correct (#318)
Diffstat (limited to '')
| -rw-r--r-- | scripts/Route3.asm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/Route3.asm b/scripts/Route3.asm index 74140b40..ecc16a0c 100644 --- a/scripts/Route3.asm +++ b/scripts/Route3.asm @@ -1,6 +1,6 @@ Route3_Script: call EnableAutoTextBoxDrawing - ld hl, Route3TrainerHeader0 + ld hl, Route3TrainerHeaders ld de, Route3_ScriptPointers ld a, [wRoute3CurScript] call ExecuteCurMapScriptInTable @@ -24,6 +24,8 @@ Route3_TextPointers: dw Route3Text9 dw Route3Text10 +Route3TrainerHeaders: + def_trainers 2 Route3TrainerHeader0: trainer EVENT_BEAT_ROUTE_3_TRAINER_0, 2, Route3BattleText1, Route3EndBattleText1, Route3AfterBattleText1 Route3TrainerHeader1: @@ -37,9 +39,9 @@ Route3TrainerHeader4: Route3TrainerHeader5: trainer EVENT_BEAT_ROUTE_3_TRAINER_5, 3, Route3BattleText6, Route3EndBattleText6, Route3AfterBattleText6 Route3TrainerHeader6: - trainer EVENT_BEAT_ROUTE_3_TRAINER_6, 1, 3, Route3BattleText7, Route3EndBattleText7, Route3AfterBattleText7 + trainer EVENT_BEAT_ROUTE_3_TRAINER_6, 3, Route3BattleText7, Route3EndBattleText7, Route3AfterBattleText7 Route3TrainerHeader7: - trainer EVENT_BEAT_ROUTE_3_TRAINER_7, 1, 2, Route3BattleText8, Route3EndBattleText8, Route3AfterBattleText8 + trainer EVENT_BEAT_ROUTE_3_TRAINER_7, 2, Route3BattleText8, Route3EndBattleText8, Route3AfterBattleText8 db -1 ; end Route3Text1: |