diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2021-04-13 18:24:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-13 18:24:37 -0400 |
| commit | 506a14084e32d7532b8400a6457f46492bbc47ab (patch) | |
| tree | 60ce89cfa9dc1158c5e8a8353ef96fba810c929c /scripts/LoreleisRoom.asm | |
| parent | 2954013da1f10e11db4ec96f9586b7c01706ae1a (diff) | |
The 'def_trainers' macro checks that trainers' event flag bits are correct (#318)
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 |