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/VermilionGym.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/VermilionGym.asm')
| -rw-r--r-- | scripts/VermilionGym.asm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/VermilionGym.asm b/scripts/VermilionGym.asm index 7343f37f..3673f9b9 100644 --- a/scripts/VermilionGym.asm +++ b/scripts/VermilionGym.asm @@ -9,7 +9,7 @@ VermilionGym_Script: res 6, [hl] call nz, VermilionGymSetDoorTile call EnableAutoTextBoxDrawing - ld hl, VermilionGymTrainerHeader0 + ld hl, VermilionGymTrainerHeaders ld de, VermilionGym_ScriptPointers ld a, [wVermilionGymCurScript] call ExecuteCurMapScriptInTable @@ -99,6 +99,8 @@ VermilionGym_TextPointers: dw ReceivedTM24Text dw TM24NoRoomText +VermilionGymTrainerHeaders: + def_trainers 2 VermilionGymTrainerHeader0: trainer EVENT_BEAT_VERMILION_GYM_TRAINER_0, 3, VermilionGymBattleText1, VermilionGymEndBattleText1, VermilionGymAfterBattleText1 VermilionGymTrainerHeader1: |