summaryrefslogtreecommitdiff
path: root/scripts/RocketHideoutB1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/RocketHideoutB1F.asm')
-rwxr-xr-xscripts/RocketHideoutB1F.asm121
1 files changed, 43 insertions, 78 deletions
diff --git a/scripts/RocketHideoutB1F.asm b/scripts/RocketHideoutB1F.asm
index 0cbddb49..f20c0892 100755
--- a/scripts/RocketHideoutB1F.asm
+++ b/scripts/RocketHideoutB1F.asm
@@ -45,145 +45,110 @@ RocketHideoutB1F_TextPointers:
dw PickUpItemText
RocketHideout1TrainerHeader0:
- dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0
- db ($3 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0
- dw RocketHideout1BattleText2 ; TextBeforeBattle
- dw RocketHideout1AfterBattleTxt2 ; TextAfterBattle
- dw RocketHideout1EndBattleText2 ; TextEndBattle
- dw RocketHideout1EndBattleText2 ; TextEndBattle
-
+ trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0, 3, RocketHideout1BattleText2, RocketHideout1EndBattleText2, RocketHideout1AfterBattleTxt2
RocketHideout1TrainerHeader1:
- dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1
- db ($2 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1
- dw RocketHideout1BattleText3 ; TextBeforeBattle
- dw RocketHideout1AfterBattleTxt3 ; TextAfterBattle
- dw RocketHideout1EndBattleText3 ; TextEndBattle
- dw RocketHideout1EndBattleText3 ; TextEndBattle
-
+ trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1, 2, RocketHideout1BattleText3, RocketHideout1EndBattleText3, RocketHideout1AfterBattleTxt3
RocketHideout1TrainerHeader2:
- dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2
- db ($2 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2
- dw RocketHideout1BattleText4 ; TextBeforeBattle
- dw RocketHideout1AfterBattleTxt4 ; TextAfterBattle
- dw RocketHideout1EndBattleText4 ; TextEndBattle
- dw RocketHideout1EndBattleText4 ; TextEndBattle
-
+ trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2, 2, RocketHideout1BattleText4, RocketHideout1EndBattleText4, RocketHideout1AfterBattleTxt4
RocketHideout1TrainerHeader3:
- dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3
- db ($3 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3
- dw RocketHideout1BattleText5 ; TextBeforeBattle
- dw RocketHideout1AfterBattleTxt5 ; TextAfterBattle
- dw RocketHideout1EndBattleText5 ; TextEndBattle
- dw RocketHideout1EndBattleText5 ; TextEndBattle
-
+ trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3, 3, RocketHideout1BattleText5, RocketHideout1EndBattleText5, RocketHideout1AfterBattleTxt5
RocketHideout1TrainerHeader4:
- dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4
- db ($3 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4
- dw RocketHideout1BattleText6 ; TextBeforeBattle
- dw RocketHideout1AfterBattleTxt6 ; TextAfterBattle
- dw RocketHideout1EndBattleText6 ; TextEndBattle
- dw RocketHideout1EndBattleText6 ; TextEndBattle
-
- db $ff
+ trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4, 3, RocketHideout1BattleText6, RocketHideout1EndBattleText6, RocketHideout1AfterBattleTxt6
+ db -1 ; end
RocketHideout1Text1:
- TX_ASM
+ text_asm
ld hl, RocketHideout1TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
RocketHideout1Text2:
- TX_ASM
+ text_asm
ld hl, RocketHideout1TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
RocketHideout1Text3:
- TX_ASM
+ text_asm
ld hl, RocketHideout1TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
RocketHideout1Text4:
- TX_ASM
+ text_asm
ld hl, RocketHideout1TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
RocketHideout1Text5:
- TX_ASM
+ text_asm
ld hl, RocketHideout1TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
RocketHideout1EndBattleText6:
- TX_FAR _RocketHideout1EndBattleText6
- TX_ASM
+ text_far _RocketHideout1EndBattleText6
+ text_asm
SetEvent EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4
ld hl, RocketHideout1Text_44c9f
ret
RocketHideout1Text_44c9f:
- TX_BLINK
- db "@"
+ text_promptbutton
+ text_end
RocketHideout1BattleText2:
- TX_FAR _RocketHideout1BattleText2
- db "@"
+ text_far _RocketHideout1BattleText2
+ text_end
RocketHideout1EndBattleText2:
- TX_FAR _RocketHideout1EndBattleText2
- db "@"
+ text_far _RocketHideout1EndBattleText2
+ text_end
RocketHideout1AfterBattleTxt2:
- TX_FAR _RocketHideout1AfterBattleTxt2
- db "@"
+ text_far _RocketHideout1AfterBattleTxt2
+ text_end
RocketHideout1BattleText3:
- TX_FAR _RocketHideout1BattleText3
- db "@"
+ text_far _RocketHideout1BattleText3
+ text_end
RocketHideout1EndBattleText3:
- TX_FAR _RocketHideout1EndBattleText3
- db "@"
+ text_far _RocketHideout1EndBattleText3
+ text_end
RocketHideout1AfterBattleTxt3:
- TX_FAR _RocketHideout1AfterBattleTxt3
- db "@"
+ text_far _RocketHideout1AfterBattleTxt3
+ text_end
RocketHideout1BattleText4:
- TX_FAR _RocketHideout1BattleText4
- db "@"
+ text_far _RocketHideout1BattleText4
+ text_end
RocketHideout1EndBattleText4:
- TX_FAR _RocketHideout1EndBattleText4
- db "@"
+ text_far _RocketHideout1EndBattleText4
+ text_end
RocketHideout1AfterBattleTxt4:
- TX_FAR _RocketHideout1AfterBattleTxt4
- db "@"
+ text_far _RocketHideout1AfterBattleTxt4
+ text_end
RocketHideout1BattleText5:
- TX_FAR _RocketHideout1BattleText5
- db "@"
+ text_far _RocketHideout1BattleText5
+ text_end
RocketHideout1EndBattleText5:
- TX_FAR _RocketHideout1EndBattleText5
- db "@"
+ text_far _RocketHideout1EndBattleText5
+ text_end
RocketHideout1AfterBattleTxt5:
- TX_FAR _RocketHideout1AfterBattleTxt5
- db "@"
+ text_far _RocketHideout1AfterBattleTxt5
+ text_end
RocketHideout1BattleText6:
- TX_FAR _RocketHideout1BattleText6
- db "@"
+ text_far _RocketHideout1BattleText6
+ text_end
RocketHideout1AfterBattleTxt6:
- TX_FAR _RocketHideout1AfterBattleTxt6
- db "@"
+ text_far _RocketHideout1AfterBattleTxt6
+ text_end