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/LancesRoom.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/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 174a1505..8a3dc31d 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 |