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/Route25.asm | |
| parent | 2954013da1f10e11db4ec96f9586b7c01706ae1a (diff) | |
The 'def_trainers' macro checks that trainers' event flag bits are correct (#318)
Diffstat (limited to 'scripts/Route25.asm')
| -rw-r--r-- | scripts/Route25.asm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/Route25.asm b/scripts/Route25.asm index fba28bc4..265a8310 100644 --- a/scripts/Route25.asm +++ b/scripts/Route25.asm @@ -1,7 +1,7 @@ Route25_Script: call Route25Script_515e1 call EnableAutoTextBoxDrawing - ld hl, Route25TrainerHeader0 + ld hl, Route25TrainerHeaders ld de, Route25_ScriptPointers ld a, [wRoute25CurScript] call ExecuteCurMapScriptInTable @@ -53,6 +53,8 @@ Route25_TextPointers: dw PickUpItemText dw Route25Text11 +Route25TrainerHeaders: + def_trainers Route25TrainerHeader0: trainer EVENT_BEAT_ROUTE_25_TRAINER_0, 2, Route25BattleText1, Route25EndBattleText1, Route25AfterBattleText1 Route25TrainerHeader1: @@ -68,9 +70,9 @@ Route25TrainerHeader5: Route25TrainerHeader6: trainer EVENT_BEAT_ROUTE_25_TRAINER_6, 3, Route25BattleText7, Route25EndBattleText7, Route25AfterBattleText7 Route25TrainerHeader7: - trainer EVENT_BEAT_ROUTE_25_TRAINER_7, 1, 2, Route25BattleText8, Route25EndBattleText8, Route25AfterBattleText8 + trainer EVENT_BEAT_ROUTE_25_TRAINER_7, 2, Route25BattleText8, Route25EndBattleText8, Route25AfterBattleText8 Route25TrainerHeader8: - trainer EVENT_BEAT_ROUTE_25_TRAINER_8, 1, 2, Route25BattleText9, Route25EndBattleText9, Route25AfterBattleText9 + trainer EVENT_BEAT_ROUTE_25_TRAINER_8, 2, Route25BattleText9, Route25EndBattleText9, Route25AfterBattleText9 db -1 ; end Route25Text1: |