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/SilphCo6F.asm | |
| parent | 3ce276892c1b97ae893d319125b13fed936d14f2 (diff) | |
| parent | 506a14084e32d7532b8400a6457f46492bbc47ab (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/SilphCo6F.asm')
| -rw-r--r-- | scripts/SilphCo6F.asm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/SilphCo6F.asm b/scripts/SilphCo6F.asm index ea8c20c2..74cad978 100644 --- a/scripts/SilphCo6F.asm +++ b/scripts/SilphCo6F.asm @@ -1,7 +1,7 @@ SilphCo6F_Script: call SilphCo6Script_1a1bf call EnableAutoTextBoxDrawing - ld hl, SilphCo6TrainerHeader0 + ld hl, SilphCo6TrainerHeaders ld de, SilphCo6F_ScriptPointers ld a, [wSilphCo6FCurScript] call ExecuteCurMapScriptInTable @@ -51,12 +51,14 @@ SilphCo6F_TextPointers: dw PickUpItemText dw PickUpItemText +SilphCo6TrainerHeaders: + def_trainers 6 SilphCo6TrainerHeader0: trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_0, 2, SilphCo6BattleText2, SilphCo6EndBattleText2, SilphCo6AfterBattleText2 SilphCo6TrainerHeader1: trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_1, 3, SilphCo6BattleText3, SilphCo6EndBattleText3, SilphCo6AfterBattleText3 SilphCo6TrainerHeader2: - trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 1, 2, SilphCo6BattleText4, SilphCo6EndBattleText4, SilphCo6AfterBattleText4 + trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 2, SilphCo6BattleText4, SilphCo6EndBattleText4, SilphCo6AfterBattleText4 db -1 ; end SilphCo6Script_1a22f: |