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/LancesRoom.asm | |
| parent | Trim extra newlines from some files (diff) | |
| download | pokeyellow-506a14084e32d7532b8400a6457f46492bbc47ab.tar.gz pokeyellow-506a14084e32d7532b8400a6457f46492bbc47ab.tar.xz pokeyellow-506a14084e32d7532b8400a6457f46492bbc47ab.zip | |
The 'def_trainers' macro checks that trainers' event flag bits are correct (#318)
Diffstat (limited to 'scripts/LancesRoom.asm')
| -rw-r--r-- | scripts/LancesRoom.asm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/LancesRoom.asm b/scripts/LancesRoom.asm index 6de0283e..9c316416 100644 --- a/scripts/LancesRoom.asm +++ b/scripts/LancesRoom.asm @@ -1,7 +1,7 @@ LancesRoom_Script: call LanceShowOrHideEntranceBlocks call EnableAutoTextBoxDrawing - ld hl, LanceTrainerHeader0 + ld hl, LancesRoomTrainerHeaders ld de, LancesRoom_ScriptPointers ld a, [wLancesRoomCurScript] call ExecuteCurMapScriptInTable @@ -128,13 +128,15 @@ LanceScript3: LancesRoom_TextPointers: dw LanceText1 -LanceTrainerHeader0: +LancesRoomTrainerHeaders: + def_trainers +LancesRoomTrainerHeader0: trainer EVENT_BEAT_LANCES_ROOM_TRAINER_0, 0, LanceBeforeBattleText, LanceEndBattleText, LanceAfterBattleText db -1 ; end LanceText1: text_asm - ld hl, LanceTrainerHeader0 + ld hl, LancesRoomTrainerHeader0 call TalkToTrainer jp TextScriptEnd |