From 506a14084e32d7532b8400a6457f46492bbc47ab Mon Sep 17 00:00:00 2001 From: Rangi <35663410+Rangi42@users.noreply.github.com> Date: Tue, 13 Apr 2021 18:24:37 -0400 Subject: The 'def_trainers' macro checks that trainers' event flag bits are correct (#318) --- scripts/PowerPlant.asm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'scripts/PowerPlant.asm') 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: -- cgit v1.3.1-sl0p