diff options
| author | Aroymart <andrewrmartinek@gmail.com> | 2019-11-14 11:15:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-14 11:15:26 -0500 |
| commit | b3c8ae05a771ecc104deaf18dfee3777dd7e94ac (patch) | |
| tree | 1902847a3dd843d8dbd59415749f4b5e577a02a4 /src/data | |
| parent | 061a4bdc5a0ece89a5fad6279529d71926074084 (diff) | |
| parent | 1a7cad8645cba65555ef490bb47150e2ffa01035 (diff) | |
Merge pull request #60 from ElectroDeoxys/master
Disassemble banks 5 and 8 (AI routines)
Diffstat (limited to 'src/data')
| -rw-r--r-- | src/data/cards.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/data/cards.asm b/src/data/cards.asm index db2a9ec..8bbc091 100644 --- a/src/data/cards.asm +++ b/src/data/cards.asm @@ -2817,7 +2817,7 @@ RapidashCard: ; 31ada (c:5ada) db DAMAGE_NORMAL ; category dw RapidashAgilityEffectCommands ; effect commands db NONE ; flags 1 - db NULLIFY_OR_WEAKEN_ATTACK + $40 ; flags 2 + db NULLIFY_OR_WEAKEN_ATTACK | FLAG_2_BIT_6 ; flags 2 db NONE ; flags 3 db 0 db 81 ; animation @@ -5760,7 +5760,7 @@ Zapdos1Card: ; 32994 (c:6994) db 40 ; damage db DAMAGE_NORMAL ; category dw ZapdosThunderstormEffectCommands ; effect commands - db LOW_RECOIL + DAMAGE_TO_OPPONENT_BENCH ; flags 1 + db LOW_RECOIL | DAMAGE_TO_OPPONENT_BENCH ; flags 1 db NONE ; flags 2 db NONE ; flags 3 db 0 @@ -7866,7 +7866,7 @@ Mewtwo1Card: ; 333fd (c:73fd) db RESIDUAL ; category dw MewtwoBarrierEffectCommands ; effect commands db NONE ; flags 1 - db NULLIFY_OR_WEAKEN_ATTACK + DISCARD_ENERGY ; flags 2 + db NULLIFY_OR_WEAKEN_ATTACK | DISCARD_ENERGY ; flags 2 db NONE ; flags 3 db 2 db 80 ; animation |