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/CeruleanGym.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/CeruleanGym.asm')
| -rw-r--r-- | scripts/CeruleanGym.asm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/CeruleanGym.asm b/scripts/CeruleanGym.asm index 13a00da2..7e4bd319 100644 --- a/scripts/CeruleanGym.asm +++ b/scripts/CeruleanGym.asm @@ -4,7 +4,7 @@ CeruleanGym_Script: res 6, [hl] call nz, .LoadNames call EnableAutoTextBoxDrawing - ld hl, CeruleanGymTrainerHeader0 + ld hl, CeruleanGymTrainerHeaders ld de, CeruleanGym_ScriptPointers ld a, [wCeruleanGymCurScript] call ExecuteCurMapScriptInTable @@ -79,6 +79,8 @@ CeruleanGym_TextPointers: dw CeruleanGymText6 dw CeruleanGymText7 +CeruleanGymTrainerHeaders: + def_trainers 2 CeruleanGymTrainerHeader0: trainer EVENT_BEAT_CERULEAN_GYM_TRAINER_0, 3, CeruleanGymBattleText1, CeruleanGymEndBattleText1, CeruleanGymAfterBattleText1 CeruleanGymTrainerHeader1: |