diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2021-04-13 18:24:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-13 18:24:37 -0400 |
| commit | 506a14084e32d7532b8400a6457f46492bbc47ab (patch) | |
| tree | 60ce89cfa9dc1158c5e8a8353ef96fba810c929c /scripts/PowerPlant.asm | |
| parent | 2954013da1f10e11db4ec96f9586b7c01706ae1a (diff) | |
The 'def_trainers' macro checks that trainers' event flag bits are correct (#318)
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: |