summaryrefslogtreecommitdiff
path: root/scripts/LancesRoom.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-15 12:26:16 -0400
committerGitHub <noreply@github.com>2020-07-15 12:26:16 -0400
commite18e5d50b5e154c1a7c94a2a1f39a3a99daa689a (patch)
treed8a157ae5aa323a00873efe79eb4693327b8bb70 /scripts/LancesRoom.asm
parentaa97e196dd5b37e89db5ddf154dc7aea9b02a045 (diff)
parent93d0697f37aca8ed7a21298a980876af6d43268b (diff)
Merge pull request #273 from Rangi42/master
Clean up some data, using macros for multiline list entries
Diffstat (limited to 'scripts/LancesRoom.asm')
-rwxr-xr-xscripts/LancesRoom.asm11
1 files changed, 2 insertions, 9 deletions
diff --git a/scripts/LancesRoom.asm b/scripts/LancesRoom.asm
index 5087dda8..e1b9a1f2 100755
--- a/scripts/LancesRoom.asm
+++ b/scripts/LancesRoom.asm
@@ -131,15 +131,8 @@ LancesRoom_TextPointers:
dw LanceText1
LanceTrainerHeader0:
- dbEventFlagBit EVENT_BEAT_LANCES_ROOM_TRAINER_0
- db ($0 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_LANCES_ROOM_TRAINER_0
- dw LanceBeforeBattleText ; TextBeforeBattle
- dw LanceAfterBattleText ; TextAfterBattle
- dw LanceEndBattleText ; TextEndBattle
- dw LanceEndBattleText ; TextEndBattle
-
- db $ff
+ trainer EVENT_BEAT_LANCES_ROOM_TRAINER_0, 0, LanceBeforeBattleText, LanceEndBattleText, LanceAfterBattleText
+ db -1 ; end
LanceText1:
text_asm