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/SSAnne2FRooms.asm | |
| parent | Trim extra newlines from some files (diff) | |
| parent | The 'def_trainers' macro checks that trainers' event flag bits are correct (#... (diff) | |
| download | pokeyellow-3af309e80584a0e2567586613f406883118d88e3.tar.gz pokeyellow-3af309e80584a0e2567586613f406883118d88e3.tar.xz pokeyellow-3af309e80584a0e2567586613f406883118d88e3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
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 ff1dcfaf..f3346fe3 100644 --- a/scripts/SSAnne2FRooms.asm +++ b/scripts/SSAnne2FRooms.asm @@ -1,6 +1,6 @@ SSAnne2FRooms_Script: call DisableAutoTextBoxDrawing - ld hl, SSAnne9TrainerHeader0 + ld hl, SSAnne9TrainerHeaders ld de, SSAnne2FRooms_ScriptPointers ld a, [wSSAnne2FRoomsCurScript] call ExecuteCurMapScriptInTable @@ -27,6 +27,8 @@ SSAnne2FRooms_TextPointers: dw SSAnne9Text12 dw SSAnne9Text13 +SSAnne9TrainerHeaders: + def_trainers SSAnne9TrainerHeader0: trainer EVENT_BEAT_SS_ANNE_9_TRAINER_0, 2, SSAnne9BattleText1, SSAnne9EndBattleText1, SSAnne9AfterBattleText1 SSAnne9TrainerHeader1: |