diff options
| author | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2020-05-12 17:30:12 +0100 |
|---|---|---|
| committer | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2020-12-16 00:21:22 +0000 |
| commit | 5d155daebbd51d2346046e42694c4893fc1d8dbb (patch) | |
| tree | 0124cf4acd3b5fbc16af979fa8e06ed2972441fd /src/wram.asm | |
| parent | edc1887122ac25073fa167a23d5af23ae2c37154 (diff) | |
Some effects and changed ChangedType to ChangedColor
Diffstat (limited to 'src/wram.asm')
| -rw-r--r-- | src/wram.asm | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/wram.asm b/src/wram.asm index 3613eba..8f30cf5 100644 --- a/src/wram.asm +++ b/src/wram.asm @@ -102,18 +102,18 @@ wPlayerBench5CardStage:: ; c2d3 ds $1 ; changed type from Venomoth's Shift Pokemon Power -; if bit 7 == 1, then bits 0-3 override the Pokemon's actual type -wPlayerArenaCardChangedType:: ; c2d4 +; if bit 7 == 1, then bits 0-3 override the Pokemon's actual color +wPlayerArenaCardChangedColor:: ; c2d4 ds $1 -wPlayerBench1CardChangedType:: ; c2d5 +wPlayerBench1CardChangedColor:: ; c2d5 ds $1 -wPlayerBench2CardChangedType:: ; c2d6 +wPlayerBench2CardChangedColor:: ; c2d6 ds $1 -wPlayerBench3CardChangedType:: ; c2d7 +wPlayerBench3CardChangedColor:: ; c2d7 ds $1 -wPlayerBench4CardChangedType:: ; c2d8 +wPlayerBench4CardChangedColor:: ; c2d8 ds $1 -wPlayerBench5CardChangedType:: ; c2d9 +wPlayerBench5CardChangedColor:: ; c2d9 ds $1 wPlayerArenaCardAttachedDefender:: ; c2da @@ -249,17 +249,17 @@ wOpponentBench4CardStage:: ; c3d2 wOpponentBench5CardStage:: ; c3d3 ds $1 -wOpponentArenaCardChangedType:: ; c3d4 +wOpponentArenaCardChangedColor:: ; c3d4 ds $1 -wOpponentBench1CardChangedType:: ; c3d5 +wOpponentBench1CardChangedColor:: ; c3d5 ds $1 -wOpponentBench2CardChangedType:: ; c3d6 +wOpponentBench2CardChangedColor:: ; c3d6 ds $1 -wOpponentBench3CardChangedType:: ; c3d7 +wOpponentBench3CardChangedColor:: ; c3d7 ds $1 -wOpponentBench4CardChangedType:: ; c3d8 +wOpponentBench4CardChangedColor:: ; c3d8 ds $1 -wOpponentBench5CardChangedType:: ; c3d9 +wOpponentBench5CardChangedColor:: ; c3d9 ds $1 wOpponentArenaCardAttachedDefender:: ; c3da @@ -988,6 +988,7 @@ wEffectFunctionsFeedback:: ; ccce ds $18 ; this is 1 (non-0) if dealing damage to self due to confusion +; or a self-destruct type attack wIsDamageToSelf:: ; cce6 ds $1 |