diff options
| author | dannye <33dannye@gmail.com> | 2021-04-13 17:48:44 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-04-13 17:48:44 -0500 |
| commit | 3af309e80584a0e2567586613f406883118d88e3 (patch) | |
| tree | 9204f1351993e4679ad9ef91aa82ad1ebb4b8c4c /scripts/PowerPlant.asm | |
| parent | 3ce276892c1b97ae893d319125b13fed936d14f2 (diff) | |
| parent | 506a14084e32d7532b8400a6457f46492bbc47ab (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/PowerPlant.asm')
| -rw-r--r-- | scripts/PowerPlant.asm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/PowerPlant.asm b/scripts/PowerPlant.asm index 76859218..67056e07 100644 --- a/scripts/PowerPlant.asm +++ b/scripts/PowerPlant.asm @@ -1,6 +1,6 @@ PowerPlant_Script: call EnableAutoTextBoxDrawing - ld hl, Voltorb0TrainerHeader + ld hl, PowerPlantTrainerHeaders ld de, PowerPlant_ScriptPointers ld a, [wPowerPlantCurScript] call ExecuteCurMapScriptInTable @@ -28,6 +28,8 @@ PowerPlant_TextPointers: dw PickUpItemText dw PickUpItemText +PowerPlantTrainerHeaders: + def_trainers Voltorb0TrainerHeader: trainer EVENT_BEAT_POWER_PLANT_VOLTORB_0, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText Voltorb1TrainerHeader: @@ -43,9 +45,9 @@ Voltorb5TrainerHeader: Voltorb6TrainerHeader: trainer EVENT_BEAT_POWER_PLANT_VOLTORB_6, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText Voltorb7TrainerHeader: - trainer EVENT_BEAT_POWER_PLANT_VOLTORB_7, 1, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText + trainer EVENT_BEAT_POWER_PLANT_VOLTORB_7, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText ZapdosTrainerHeader: - trainer EVENT_BEAT_ZAPDOS, 1, 0, ZapdosBattleText, ZapdosBattleText, ZapdosBattleText + trainer EVENT_BEAT_ZAPDOS, 0, ZapdosBattleText, ZapdosBattleText, ZapdosBattleText db -1 ; end InitVoltorbBattle: |