diff options
| author | dannye <33dannye@gmail.com> | 2023-04-25 19:52:12 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-04-25 19:52:12 -0500 |
| commit | 667f1febbe59355b1ffea68619e5e5486fd3c408 (patch) | |
| tree | 9a3ca97fea7cb54d1db9c23ac8c2a405a13f6f5c /engine/battle/core.asm | |
| parent | Fix trainer parties' comments (#104) (diff) | |
| parent | Update `EndBug` to v9. (diff) | |
| download | pokeyellow-667f1febbe59355b1ffea68619e5e5486fd3c408.tar.gz pokeyellow-667f1febbe59355b1ffea68619e5e5486fd3c408.tar.xz pokeyellow-667f1febbe59355b1ffea68619e5e5486fd3c408.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/battle/core.asm')
| -rw-r--r-- | engine/battle/core.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 8618cced..addff324 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3496,7 +3496,7 @@ CheckPlayerStatusConditions: ; fast asleep xor a ld [wAnimationType], a - ld a, SLP_ANIM - 1 + ld a, SLP_PLAYER_ANIM call PlayMoveAnimation ld hl, FastAsleepText call PrintText @@ -3580,7 +3580,7 @@ CheckPlayerStatusConditions: call PrintText xor a ld [wAnimationType], a - ld a, CONF_ANIM - 1 + ld a, CONF_PLAYER_ANIM call PlayMoveAnimation call BattleRandom cp 50 percent + 1 ; chance to hurt itself |