summaryrefslogtreecommitdiff
path: root/scripts/PowerPlant.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/PowerPlant.asm')
-rwxr-xr-xscripts/PowerPlant.asm109
1 files changed, 23 insertions, 86 deletions
diff --git a/scripts/PowerPlant.asm b/scripts/PowerPlant.asm
index f720b6f8..76859218 100755
--- a/scripts/PowerPlant.asm
+++ b/scripts/PowerPlant.asm
@@ -29,87 +29,24 @@ PowerPlant_TextPointers:
dw PickUpItemText
Voltorb0TrainerHeader:
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_0
- db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_0
- dw VoltorbBattleText ; TextBeforeBattle
- dw VoltorbBattleText ; TextAfterBattle
- dw VoltorbBattleText ; TextEndBattle
- dw VoltorbBattleText ; TextEndBattle
-
+ trainer EVENT_BEAT_POWER_PLANT_VOLTORB_0, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText
Voltorb1TrainerHeader:
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_1
- db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_1
- dw VoltorbBattleText ; TextBeforeBattle
- dw VoltorbBattleText ; TextAfterBattle
- dw VoltorbBattleText ; TextEndBattle
- dw VoltorbBattleText ; TextEndBattle
-
+ trainer EVENT_BEAT_POWER_PLANT_VOLTORB_1, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText
Voltorb2TrainerHeader:
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_2
- db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_2
- dw VoltorbBattleText ; TextBeforeBattle
- dw VoltorbBattleText ; TextAfterBattle
- dw VoltorbBattleText ; TextEndBattle
- dw VoltorbBattleText ; TextEndBattle
-
+ trainer EVENT_BEAT_POWER_PLANT_VOLTORB_2, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText
Voltorb3TrainerHeader:
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_3
- db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_3
- dw VoltorbBattleText ; TextBeforeBattle
- dw VoltorbBattleText ; TextAfterBattle
- dw VoltorbBattleText ; TextEndBattle
- dw VoltorbBattleText ; TextEndBattle
-
+ trainer EVENT_BEAT_POWER_PLANT_VOLTORB_3, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText
Voltorb4TrainerHeader:
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_4
- db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_4
- dw VoltorbBattleText ; TextBeforeBattle
- dw VoltorbBattleText ; TextAfterBattle
- dw VoltorbBattleText ; TextEndBattle
- dw VoltorbBattleText ; TextEndBattle
-
+ trainer EVENT_BEAT_POWER_PLANT_VOLTORB_4, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText
Voltorb5TrainerHeader:
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_5
- db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_5
- dw VoltorbBattleText ; TextBeforeBattle
- dw VoltorbBattleText ; TextAfterBattle
- dw VoltorbBattleText ; TextEndBattle
- dw VoltorbBattleText ; TextEndBattle
-
+ trainer EVENT_BEAT_POWER_PLANT_VOLTORB_5, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText
Voltorb6TrainerHeader:
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_6
- db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_6
- dw VoltorbBattleText ; TextBeforeBattle
- dw VoltorbBattleText ; TextAfterBattle
- dw VoltorbBattleText ; TextEndBattle
- dw VoltorbBattleText ; TextEndBattle
-
+ trainer EVENT_BEAT_POWER_PLANT_VOLTORB_6, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText
Voltorb7TrainerHeader:
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_7, 1
- db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_7, 1
- dw VoltorbBattleText ; TextBeforeBattle
- dw VoltorbBattleText ; TextAfterBattle
- dw VoltorbBattleText ; TextEndBattle
- dw VoltorbBattleText ; TextEndBattle
-
+ trainer EVENT_BEAT_POWER_PLANT_VOLTORB_7, 1, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText
ZapdosTrainerHeader:
- dbEventFlagBit EVENT_BEAT_ZAPDOS, 1
- db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_ZAPDOS, 1
- dw ZapdosBattleText ; TextBeforeBattle
- dw ZapdosBattleText ; TextAfterBattle
- dw ZapdosBattleText ; TextEndBattle
- dw ZapdosBattleText ; TextEndBattle
-
- db $ff
+ trainer EVENT_BEAT_ZAPDOS, 1, 0, ZapdosBattleText, ZapdosBattleText, ZapdosBattleText
+ db -1 ; end
InitVoltorbBattle:
call TalkToTrainer
@@ -118,57 +55,57 @@ InitVoltorbBattle:
jp TextScriptEnd
Voltorb0Text:
- TX_ASM
+ text_asm
ld hl, Voltorb0TrainerHeader
jr InitVoltorbBattle
Voltorb1Text:
- TX_ASM
+ text_asm
ld hl, Voltorb1TrainerHeader
jr InitVoltorbBattle
Voltorb2Text:
- TX_ASM
+ text_asm
ld hl, Voltorb2TrainerHeader
jr InitVoltorbBattle
Voltorb3Text:
- TX_ASM
+ text_asm
ld hl, Voltorb3TrainerHeader
jr InitVoltorbBattle
Voltorb4Text:
- TX_ASM
+ text_asm
ld hl, Voltorb4TrainerHeader
jr InitVoltorbBattle
Voltorb5Text:
- TX_ASM
+ text_asm
ld hl, Voltorb5TrainerHeader
jr InitVoltorbBattle
Voltorb6Text:
- TX_ASM
+ text_asm
ld hl, Voltorb6TrainerHeader
jr InitVoltorbBattle
Voltorb7Text:
- TX_ASM
+ text_asm
ld hl, Voltorb7TrainerHeader
jr InitVoltorbBattle
ZapdosText:
- TX_ASM
+ text_asm
ld hl, ZapdosTrainerHeader
jr InitVoltorbBattle
VoltorbBattleText:
- TX_FAR _VoltorbBattleText
- db "@"
+ text_far _VoltorbBattleText
+ text_end
ZapdosBattleText:
- TX_FAR _ZapdosBattleText
- TX_ASM
+ text_far _ZapdosBattleText
+ text_asm
ld a, ZAPDOS
call PlayCry
call WaitForSoundToFinish