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/CeladonGym.asm | |
| parent | 3ce276892c1b97ae893d319125b13fed936d14f2 (diff) | |
| parent | 506a14084e32d7532b8400a6457f46492bbc47ab (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/CeladonGym.asm')
| -rw-r--r-- | scripts/CeladonGym.asm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/CeladonGym.asm b/scripts/CeladonGym.asm index 2b695819..30e4fa35 100644 --- a/scripts/CeladonGym.asm +++ b/scripts/CeladonGym.asm @@ -4,7 +4,7 @@ CeladonGym_Script: res 6, [hl] call nz, .LoadNames call EnableAutoTextBoxDrawing - ld hl, CeladonGymTrainerHeader0 + ld hl, CeladonGymTrainerHeaders ld de, CeladonGym_ScriptPointers ld a, [wCeladonGymCurScript] call ExecuteCurMapScriptInTable @@ -83,6 +83,8 @@ CeladonGym_TextPointers: dw TM21Text dw TM21NoRoomText +CeladonGymTrainerHeaders: + def_trainers 2 CeladonGymTrainerHeader0: trainer EVENT_BEAT_CELADON_GYM_TRAINER_0, 2, CeladonGymBattleText2, CeladonGymEndBattleText2, CeladonGymAfterBattleText2 CeladonGymTrainerHeader1: @@ -96,7 +98,7 @@ CeladonGymTrainerHeader4: CeladonGymTrainerHeader5: trainer EVENT_BEAT_CELADON_GYM_TRAINER_5, 2, CeladonGymBattleText7, CeladonGymEndBattleText7, CeladonGymAfterBattleText7 CeladonGymTrainerHeader6: - trainer EVENT_BEAT_CELADON_GYM_TRAINER_6, 1, 3, CeladonGymBattleText8, CeladonGymEndBattleText8, CeladonGymAfterBattleText8 + trainer EVENT_BEAT_CELADON_GYM_TRAINER_6, 3, CeladonGymBattleText8, CeladonGymEndBattleText8, CeladonGymAfterBattleText8 db -1 ; end CeladonGymText1: |