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/BrunosRoom.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/BrunosRoom.asm')
| -rw-r--r-- | scripts/BrunosRoom.asm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/BrunosRoom.asm b/scripts/BrunosRoom.asm index 578cbb98..ca8f5418 100644 --- a/scripts/BrunosRoom.asm +++ b/scripts/BrunosRoom.asm @@ -1,7 +1,7 @@ BrunosRoom_Script: call BrunoShowOrHideExitBlock call EnableAutoTextBoxDrawing - ld hl, BrunoTrainerHeader0 + ld hl, BrunosRoomTrainerHeaders ld de, BrunosRoom_ScriptPointers ld a, [wBrunosRoomCurScript] call ExecuteCurMapScriptInTable @@ -117,13 +117,15 @@ BrunosRoom_TextPointers: dw BrunoText1 dw BrunoDontRunAwayText -BrunoTrainerHeader0: +BrunosRoomTrainerHeaders: + def_trainers +BrunosRoomTrainerHeader0: trainer EVENT_BEAT_BRUNOS_ROOM_TRAINER_0, 0, BrunoBeforeBattleText, BrunoEndBattleText, BrunoAfterBattleText db -1 ; end BrunoText1: text_asm - ld hl, BrunoTrainerHeader0 + ld hl, BrunosRoomTrainerHeader0 call TalkToTrainer jp TextScriptEnd |