diff options
Diffstat (limited to 'scripts/powerplant.asm')
| -rwxr-xr-x | scripts/powerplant.asm | 120 |
1 files changed, 60 insertions, 60 deletions
diff --git a/scripts/powerplant.asm b/scripts/powerplant.asm index 353ab2f4..c7a5625f 100755 --- a/scripts/powerplant.asm +++ b/scripts/powerplant.asm @@ -1,27 +1,27 @@ PowerPlantScript: call EnableAutoTextBoxDrawing ld hl, PowerPlantTrainerHeaders - ld de, PowerPlantScriptPointers - ld a, [W_POWERPLANTCURSCRIPT] + ld de, .ScriptPointers + ld a, [wPowerPlantCurScript] call ExecuteCurMapScriptInTable - ld [W_POWERPLANTCURSCRIPT], a + ld [wPowerPlantCurScript], a ret -PowerPlantScriptPointers: +.ScriptPointers dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle PowerPlantTextPointers: - dw PowerPlantText1 - dw PowerPlantText2 - dw PowerPlantText3 - dw PowerPlantText4 - dw PowerPlantText5 - dw PowerPlantText6 - dw PowerPlantText7 - dw PowerPlantText8 - dw PowerPlantText9 + dw Voltorb0Text + dw Voltorb1Text + dw Voltorb2Text + dw Voltorb3Text + dw Voltorb4Text + dw Voltorb5Text + dw Voltorb6Text + dw Voltorb7Text + dw ZapdosText dw PickUpItemText dw PickUpItemText dw PickUpItemText @@ -29,82 +29,82 @@ PowerPlantTextPointers: dw PickUpItemText PowerPlantTrainerHeaders: -PowerPlantTrainerHeader0: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_0 +Voltorb0TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_0 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_0 + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_0 dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader1: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_1 +Voltorb1TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_1 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_1 + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_1 dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader2: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_2 +Voltorb2TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_2 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_2 dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader3: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_3 +Voltorb3TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_3 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_3 dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader4: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_4 +Voltorb4TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_4 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_4 dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader5: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_5 +Voltorb5TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_5 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_5 dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader6: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_6 +Voltorb6TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_6 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_6 dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader7: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_7, 1 +Voltorb7TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_7, 1 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_7, 1 + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_7, 1 dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader8: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_8, 1 +ZapdosTrainerHeader: + dbEventFlagBit EVENT_BEAT_ZAPDOS, 1 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_8, 1 + dwEventFlagAddress EVENT_BEAT_ZAPDOS, 1 dw ZapdosBattleText ; TextBeforeBattle dw ZapdosBattleText ; TextAfterBattle dw ZapdosBattleText ; TextEndBattle @@ -114,53 +114,53 @@ PowerPlantTrainerHeader8: InitVoltorbBattle: call TalkToTrainer - ld a, [W_CURMAPSCRIPT] - ld [W_POWERPLANTCURSCRIPT], a + ld a, [wCurMapScript] + ld [wPowerPlantCurScript], a jp TextScriptEnd -PowerPlantText1: +Voltorb0Text: TX_ASM - ld hl, PowerPlantTrainerHeader0 + ld hl, Voltorb0TrainerHeader jr InitVoltorbBattle -PowerPlantText2: +Voltorb1Text: TX_ASM - ld hl, PowerPlantTrainerHeader1 + ld hl, Voltorb1TrainerHeader jr InitVoltorbBattle -PowerPlantText3: +Voltorb2Text: TX_ASM - ld hl, PowerPlantTrainerHeader2 + ld hl, Voltorb2TrainerHeader jr InitVoltorbBattle -PowerPlantText4: +Voltorb3Text: TX_ASM - ld hl, PowerPlantTrainerHeader3 + ld hl, Voltorb3TrainerHeader jr InitVoltorbBattle -PowerPlantText5: +Voltorb4Text: TX_ASM - ld hl, PowerPlantTrainerHeader4 + ld hl, Voltorb4TrainerHeader jr InitVoltorbBattle -PowerPlantText6: +Voltorb5Text: TX_ASM - ld hl, PowerPlantTrainerHeader5 + ld hl, Voltorb5TrainerHeader jr InitVoltorbBattle -PowerPlantText7: +Voltorb6Text: TX_ASM - ld hl, PowerPlantTrainerHeader6 + ld hl, Voltorb6TrainerHeader jr InitVoltorbBattle -PowerPlantText8: +Voltorb7Text: TX_ASM - ld hl, PowerPlantTrainerHeader7 + ld hl, Voltorb7TrainerHeader jr InitVoltorbBattle -PowerPlantText9: +ZapdosText: TX_ASM - ld hl, PowerPlantTrainerHeader8 + ld hl, ZapdosTrainerHeader jr InitVoltorbBattle VoltorbBattleText: |