From 4b1a0a6f81d5b30c7c03893bcd7e6faf33bbb389 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Thu, 24 Dec 2020 17:36:47 +0000 Subject: Finish up effect functions --- src/data/effect_commands.asm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/data') diff --git a/src/data/effect_commands.asm b/src/data/effect_commands.asm index f90fe80..e95a93b 100644 --- a/src/data/effect_commands.asm +++ b/src/data/effect_commands.asm @@ -1600,20 +1600,20 @@ DevolutionSprayEffectCommands: db $00 SuperEnergyRemovalEffectCommands: - dbw EFFECTCMDTYPE_INITIAL_EFFECT_1, $7cd0 - dbw EFFECTCMDTYPE_INITIAL_EFFECT_2, $7ce4 - dbw EFFECTCMDTYPE_BEFORE_DAMAGE, $7d73 + dbw EFFECTCMDTYPE_INITIAL_EFFECT_1, SuperEnergyRemoval_EnergyCheck + dbw EFFECTCMDTYPE_INITIAL_EFFECT_2, SuperEnergyRemoval_PlayerSelection + dbw EFFECTCMDTYPE_BEFORE_DAMAGE, SuperEnergyRemoval_DiscardEffect db $00 SuperEnergyRetrievalEffectCommands: - dbw EFFECTCMDTYPE_INITIAL_EFFECT_1, $7da4 - dbw EFFECTCMDTYPE_INITIAL_EFFECT_2, $7db6 - dbw EFFECTCMDTYPE_BEFORE_DAMAGE, $7dfa - dbw EFFECTCMDTYPE_REQUIRE_SELECTION, $7dba + dbw EFFECTCMDTYPE_INITIAL_EFFECT_1, SuperEnergyRetrieval_HandEnergyCheck + dbw EFFECTCMDTYPE_INITIAL_EFFECT_2, SuperEnergyRetrieval_PlayerHandSelection + dbw EFFECTCMDTYPE_BEFORE_DAMAGE, SuperEnergyRetrieval_DiscardAndAddToHandEffect + dbw EFFECTCMDTYPE_REQUIRE_SELECTION, SuperEnergyRetrieval_PlayerDiscardPileSelection db $00 GustOfWindEffectCommands: - dbw EFFECTCMDTYPE_INITIAL_EFFECT_1, $7e6e - dbw EFFECTCMDTYPE_INITIAL_EFFECT_2, $7e79 - dbw EFFECTCMDTYPE_BEFORE_DAMAGE, $7e90 + dbw EFFECTCMDTYPE_INITIAL_EFFECT_1, GustOfWind_BenchCheck + dbw EFFECTCMDTYPE_INITIAL_EFFECT_2, GustOfWind_PlayerSelection + dbw EFFECTCMDTYPE_BEFORE_DAMAGE, GustOfWind_SwitchEffect db $00 -- cgit v1.2.3