summaryrefslogtreecommitdiff
path: root/scripts/SSAnneB1FRooms.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/SSAnneB1FRooms.asm')
-rwxr-xr-xscripts/SSAnneB1FRooms.asm56
1 files changed, 7 insertions, 49 deletions
diff --git a/scripts/SSAnneB1FRooms.asm b/scripts/SSAnneB1FRooms.asm
index e655b1b8..2a077c33 100755
--- a/scripts/SSAnneB1FRooms.asm
+++ b/scripts/SSAnneB1FRooms.asm
@@ -26,60 +26,18 @@ SSAnneB1FRooms_TextPointers:
dw PickUpItemText
SSAnne10TrainerHeader0:
- dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_0
- db ($2 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_0
- dw SSAnne10BattleText1 ; TextBeforeBattle
- dw SSAnne10AfterBattleText1 ; TextAfterBattle
- dw SSAnne10EndBattleText1 ; TextEndBattle
- dw SSAnne10EndBattleText1 ; TextEndBattle
-
+ trainer EVENT_BEAT_SS_ANNE_10_TRAINER_0, 2, SSAnne10BattleText1, SSAnne10EndBattleText1, SSAnne10AfterBattleText1
SSAnne10TrainerHeader1:
- dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_1
- db ($3 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_1
- dw SSAnne10BattleText2 ; TextBeforeBattle
- dw SSAnne10AfterBattleText2 ; TextAfterBattle
- dw SSAnne10EndBattleText2 ; TextEndBattle
- dw SSAnne10EndBattleText2 ; TextEndBattle
-
+ trainer EVENT_BEAT_SS_ANNE_10_TRAINER_1, 3, SSAnne10BattleText2, SSAnne10EndBattleText2, SSAnne10AfterBattleText2
SSAnne10TrainerHeader2:
- dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_2
- db ($2 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_2
- dw SSAnne10BattleText3 ; TextBeforeBattle
- dw SSAnne10AfterBattleText3 ; TextAfterBattle
- dw SSAnne10EndBattleText3 ; TextEndBattle
- dw SSAnne10EndBattleText3 ; TextEndBattle
-
+ trainer EVENT_BEAT_SS_ANNE_10_TRAINER_2, 2, SSAnne10BattleText3, SSAnne10EndBattleText3, SSAnne10AfterBattleText3
SSAnne10TrainerHeader3:
- dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_3
- db ($2 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_3
- dw SSAnne10BattleText4 ; TextBeforeBattle
- dw SSAnne10AfterBattleText4 ; TextAfterBattle
- dw SSAnne10EndBattleText4 ; TextEndBattle
- dw SSAnne10EndBattleText4 ; TextEndBattle
-
+ trainer EVENT_BEAT_SS_ANNE_10_TRAINER_3, 2, SSAnne10BattleText4, SSAnne10EndBattleText4, SSAnne10AfterBattleText4
SSAnne10TrainerHeader4:
- dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_4
- db ($2 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_4
- dw SSAnne10BattleText5 ; TextBeforeBattle
- dw SSAnne10AfterBattleText5 ; TextAfterBattle
- dw SSAnne10EndBattleText5 ; TextEndBattle
- dw SSAnne10EndBattleText5 ; TextEndBattle
-
+ trainer EVENT_BEAT_SS_ANNE_10_TRAINER_4, 2, SSAnne10BattleText5, SSAnne10EndBattleText5, SSAnne10AfterBattleText5
SSAnne10TrainerHeader5:
- dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_5
- db ($3 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_5
- dw SSAnne10BattleText6 ; TextBeforeBattle
- dw SSAnne10AfterBattleText6 ; TextAfterBattle
- dw SSAnne10EndBattleText6 ; TextEndBattle
- dw SSAnne10EndBattleText6 ; TextEndBattle
-
- db $ff
+ trainer EVENT_BEAT_SS_ANNE_10_TRAINER_5, 3, SSAnne10BattleText6, SSAnne10EndBattleText6, SSAnne10AfterBattleText6
+ db -1 ; end
SSAnne10Text1:
text_asm