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/SilphCo7F.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/SilphCo7F.asm')
| -rw-r--r-- | scripts/SilphCo7F.asm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/SilphCo7F.asm b/scripts/SilphCo7F.asm index b32f967b..b2a63292 100644 --- a/scripts/SilphCo7F.asm +++ b/scripts/SilphCo7F.asm @@ -1,7 +1,7 @@ SilphCo7F_Script: call SilphCo7Script_51b77 call EnableAutoTextBoxDrawing - ld hl, SilphCo7TrainerHeader0 + ld hl, SilphCo7TrainerHeaders ld de, SilphCo7F_ScriptPointers ld a, [wSilphCo7FCurScript] call ExecuteCurMapScriptInTable @@ -265,6 +265,8 @@ SilphCo7F_TextPointers: dw SilphCo7Text14 dw SilphCo7Text15 +SilphCo7TrainerHeaders: + def_trainers 5 SilphCo7TrainerHeader0: trainer EVENT_BEAT_SILPH_CO_7F_TRAINER_0, 2, SilphCo7BattleText1, SilphCo7EndBattleText1, SilphCo7AfterBattleText1 SilphCo7TrainerHeader1: @@ -272,7 +274,7 @@ SilphCo7TrainerHeader1: SilphCo7TrainerHeader2: trainer EVENT_BEAT_SILPH_CO_7F_TRAINER_2, 3, SilphCo7BattleText3, SilphCo7EndBattleText3, SilphCo7AfterBattleText3 SilphCo7TrainerHeader3: - trainer EVENT_BEAT_SILPH_CO_7F_TRAINER_3, 1, 4, SilphCo7BattleText4, SilphCo7EndBattleText4, SilphCo7AfterBattleText4 + trainer EVENT_BEAT_SILPH_CO_7F_TRAINER_3, 4, SilphCo7BattleText4, SilphCo7EndBattleText4, SilphCo7AfterBattleText4 db -1 ; end SilphCo7Text1: |