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/SilphCo5F.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/SilphCo5F.asm')
| -rw-r--r-- | scripts/SilphCo5F.asm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/SilphCo5F.asm b/scripts/SilphCo5F.asm index 975dacac..58b64ba2 100644 --- a/scripts/SilphCo5F.asm +++ b/scripts/SilphCo5F.asm @@ -1,7 +1,7 @@ SilphCo5F_Script: call SilphCo5Script_19f4d call EnableAutoTextBoxDrawing - ld hl, SilphCo5TrainerHeader0 + ld hl, SilphCo5TrainerHeaders ld de, SilphCo5F_ScriptPointers ld a, [wSilphCo5FCurScript] call ExecuteCurMapScriptInTable @@ -83,6 +83,8 @@ SilphCo5F_TextPointers: dw SilphCo5Text10 dw SilphCo5Text11 +SilphCo5TrainerHeaders: + def_trainers 2 SilphCo5TrainerHeader0: trainer EVENT_BEAT_SILPH_CO_5F_TRAINER_0, 1, SilphCo5BattleText2, SilphCo5EndBattleText2, SilphCo5AfterBattleText2 SilphCo5TrainerHeader1: |