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/LoreleisRoom.asm | |
| parent | 3ce276892c1b97ae893d319125b13fed936d14f2 (diff) | |
| parent | 506a14084e32d7532b8400a6457f46492bbc47ab (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/LoreleisRoom.asm')
| -rw-r--r-- | scripts/LoreleisRoom.asm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/LoreleisRoom.asm b/scripts/LoreleisRoom.asm index 8e9730ff..1f42fa2e 100644 --- a/scripts/LoreleisRoom.asm +++ b/scripts/LoreleisRoom.asm @@ -1,7 +1,7 @@ LoreleisRoom_Script: call LoreleiShowOrHideExitBlock call EnableAutoTextBoxDrawing - ld hl, LoreleiTrainerHeader0 + ld hl, LoreleisRoomTrainerHeaders ld de, LoreleisRoom_ScriptPointers ld a, [wLoreleisRoomCurScript] call ExecuteCurMapScriptInTable @@ -119,13 +119,15 @@ LoreleisRoom_TextPointers: dw LoreleiText1 dw LoreleiDontRunAwayText -LoreleiTrainerHeader0: +LoreleisRoomTrainerHeaders: + def_trainers +LoreleisRoomTrainerHeader0: trainer EVENT_BEAT_LORELEIS_ROOM_TRAINER_0, 0, LoreleiBeforeBattleText, LoreleiEndBattleText, LoreleiAfterBattleText db -1 ; end LoreleiText1: text_asm - ld hl, LoreleiTrainerHeader0 + ld hl, LoreleisRoomTrainerHeader0 call TalkToTrainer jp TextScriptEnd |