diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-12-29 10:56:56 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-29 10:56:56 -0600 |
| commit | 60a68b2611959035e4b49fcd758656c2c8d9b5e7 (patch) | |
| tree | f5e8244e25e82ad39d26570b5ec67b430880ab0a /src/data | |
| parent | 39a348c7844186be17b59dfcfae6b043ec2eb489 (diff) | |
| parent | 4b1a0a6f81d5b30c7c03893bcd7e6faf33bbb389 (diff) | |
Merge pull request #87 from ElectroDeoxys/effects
Finish up effect functions
Diffstat (limited to 'src/data')
| -rw-r--r-- | src/data/effect_commands.asm | 20 |
1 files changed, 10 insertions, 10 deletions
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 |