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/AgathasRoom.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/AgathasRoom.asm')
| -rw-r--r-- | scripts/AgathasRoom.asm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/AgathasRoom.asm b/scripts/AgathasRoom.asm index 3c5740e9..abe22a4f 100644 --- a/scripts/AgathasRoom.asm +++ b/scripts/AgathasRoom.asm @@ -1,7 +1,7 @@ AgathasRoom_Script: call AgathaShowOrHideExitBlock call EnableAutoTextBoxDrawing - ld hl, AgathaTrainerHeader0 + ld hl, AgathasRoomTrainerHeaders ld de, AgathasRoom_ScriptPointers ld a, [wAgathasRoomCurScript] call ExecuteCurMapScriptInTable @@ -120,13 +120,15 @@ AgathasRoom_TextPointers: dw AgathaText1 dw AgathaDontRunAwayText -AgathaTrainerHeader0: +AgathasRoomTrainerHeaders: + def_trainers +AgathasRoomTrainerHeader0: trainer EVENT_BEAT_AGATHAS_ROOM_TRAINER_0, 0, AgathaBeforeBattleText, AgathaEndBattleText, AgathaAfterBattleText db -1 ; end AgathaText1: text_asm - ld hl, AgathaTrainerHeader0 + ld hl, AgathasRoomTrainerHeader0 call TalkToTrainer jp TextScriptEnd |