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/SSAnne2FRooms.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/SSAnne2FRooms.asm')
| -rw-r--r-- | scripts/SSAnne2FRooms.asm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/SSAnne2FRooms.asm b/scripts/SSAnne2FRooms.asm index 3fe2d34f..4fa679e3 100644 --- a/scripts/SSAnne2FRooms.asm +++ b/scripts/SSAnne2FRooms.asm @@ -3,7 +3,7 @@ SSAnne2FRooms_Script: ld [wAutoTextBoxDrawingControl], a xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, SSAnne9TrainerHeader0 + ld hl, SSAnne9TrainerHeaders ld de, SSAnne2FRooms_ScriptPointers ld a, [wSSAnne2FRoomsCurScript] call ExecuteCurMapScriptInTable @@ -30,6 +30,8 @@ SSAnne2FRooms_TextPointers: dw SSAnne9Text12 dw SSAnne9Text13 +SSAnne9TrainerHeaders: + def_trainers SSAnne9TrainerHeader0: trainer EVENT_BEAT_SS_ANNE_9_TRAINER_0, 2, SSAnne9BattleText1, SSAnne9EndBattleText1, SSAnne9AfterBattleText1 SSAnne9TrainerHeader1: |