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/SilphCo11F.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/SilphCo11F.asm')
| -rw-r--r-- | scripts/SilphCo11F.asm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm index ff8bb85f..63c236ee 100644 --- a/scripts/SilphCo11F.asm +++ b/scripts/SilphCo11F.asm @@ -1,7 +1,7 @@ SilphCo11F_Script: call SilphCo11Script_62127 call EnableAutoTextBoxDrawing - ld hl, SilphCo11TrainerHeader0 + ld hl, SilphCo11TrainerHeaders ld de, SilphCo11F_ScriptPointers ld a, [wSilphCo11FCurScript] call ExecuteCurMapScriptInTable @@ -479,6 +479,8 @@ SilphCo11F_TextPointers: dw SilphCo11Text9 dw SilphCo11Text10 +SilphCo11TrainerHeaders: + def_trainers 5 SilphCo11TrainerHeader0: trainer EVENT_BEAT_SILPH_CO_11F_TRAINER_1, 3, SilphCo11Trainer1BattleText, SilphCo11Trainer1EndBattleText, SilphCo11Trainer1AfterBattleText db -1 ; end |