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/SilphCo2F.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/SilphCo2F.asm')
| -rw-r--r-- | scripts/SilphCo2F.asm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/SilphCo2F.asm b/scripts/SilphCo2F.asm index 4b96c314..f8e157e8 100644 --- a/scripts/SilphCo2F.asm +++ b/scripts/SilphCo2F.asm @@ -1,7 +1,7 @@ SilphCo2F_Script: call SilphCo2Script_59d07 call EnableAutoTextBoxDrawing - ld hl, SilphCo2TrainerHeader0 + ld hl, SilphCo2TrainerHeaders ld de, SilphCo2F_ScriptPointers ld a, [wSilphCo2FCurScript] call ExecuteCurMapScriptInTable @@ -98,6 +98,8 @@ SilphCo2F_TextPointers: dw SilphCo2Text4 dw SilphCo2Text5 +SilphCo2TrainerHeaders: + def_trainers 2 SilphCo2TrainerHeader0: trainer EVENT_BEAT_SILPH_CO_2F_TRAINER_0, 3, SilphCo2BattleText1, SilphCo2EndBattleText1, SilphCo2AfterBattleText1 SilphCo2TrainerHeader1: |