diff options
| author | dannye <33dannye@gmail.com> | 2021-04-13 17:48:44 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-04-13 17:48:44 -0500 |
| commit | 3af309e80584a0e2567586613f406883118d88e3 (patch) | |
| tree | 9204f1351993e4679ad9ef91aa82ad1ebb4b8c4c /scripts/Route16.asm | |
| parent | Trim extra newlines from some files (diff) | |
| parent | The 'def_trainers' macro checks that trainers' event flag bits are correct (#... (diff) | |
| download | pokeyellow-3af309e80584a0e2567586613f406883118d88e3.tar.gz pokeyellow-3af309e80584a0e2567586613f406883118d88e3.tar.xz pokeyellow-3af309e80584a0e2567586613f406883118d88e3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/Route16.asm')
| -rw-r--r-- | scripts/Route16.asm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/Route16.asm b/scripts/Route16.asm index e7b1eb9a..b77bbf61 100644 --- a/scripts/Route16.asm +++ b/scripts/Route16.asm @@ -1,6 +1,6 @@ Route16_Script: call EnableAutoTextBoxDrawing - ld hl, Route16TrainerHeader0 + ld hl, Route16TrainerHeaders ld de, Route16_ScriptPointers ld a, [wRoute16CurScript] call ExecuteCurMapScriptInTable @@ -74,6 +74,8 @@ Route16_TextPointers: dw Route16Text10 dw Route16Text11 +Route16TrainerHeaders: + def_trainers Route16TrainerHeader0: trainer EVENT_BEAT_ROUTE_16_TRAINER_0, 3, Route16BattleText1, Route16EndBattleText1, Route16AfterBattleText1 Route16TrainerHeader1: |