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/VictoryRoad1F.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/VictoryRoad1F.asm')
| -rw-r--r-- | scripts/VictoryRoad1F.asm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/VictoryRoad1F.asm b/scripts/VictoryRoad1F.asm index 9d566e6f..f7b3b65f 100644 --- a/scripts/VictoryRoad1F.asm +++ b/scripts/VictoryRoad1F.asm @@ -4,7 +4,7 @@ VictoryRoad1F_Script: res 5, [hl] call nz, .next call EnableAutoTextBoxDrawing - ld hl, VictoryRoad1TrainerHeader0 + ld hl, VictoryRoad1TrainerHeaders ld de, VictoryRoad1F_ScriptPointers ld a, [wVictoryRoad1FCurScript] call ExecuteCurMapScriptInTable @@ -50,6 +50,8 @@ VictoryRoad1F_TextPointers: dw BoulderText dw BoulderText +VictoryRoad1TrainerHeaders: + def_trainers VictoryRoad1TrainerHeader0: trainer EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0, 2, VictoryRoad1BattleText1, VictoryRoad1EndBattleText1, VictoryRoad1AfterBattleText1 VictoryRoad1TrainerHeader1: |