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 /constants | |
| 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 'constants')
| -rw-r--r-- | constants/move_constants.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/constants/move_constants.asm b/constants/move_constants.asm index 570be95e..3376c1af 100644 --- a/constants/move_constants.asm +++ b/constants/move_constants.asm @@ -178,14 +178,14 @@ DEF NUM_ATTACKS EQU const_value - 1 const SHOWPIC_ANIM const STATUS_AFFECTED_ANIM const ANIM_A8 - const ANIM_A9 + const ENEMY_HUD_SHAKE_ANIM const TRADE_BALL_DROP_ANIM const TRADE_BALL_SHAKE_ANIM const TRADE_BALL_TILT_ANIM const TRADE_BALL_POOF_ANIM const XSTATITEM_ANIM ; use X Attack/Defense/Speed/Special - const ANIM_AF - const ANIM_B0 + const XSTATITEM_DUPLICATE_ANIM + const SHRINKING_SQUARE_ANIM const ANIM_B1 const ANIM_B2 const ANIM_B3 @@ -197,18 +197,18 @@ DEF NUM_ATTACKS EQU const_value - 1 const ANIM_B9 const BURN_PSN_ANIM ; Plays when a monster is burned or poisoned const ANIM_BB - const ANIM_BC + const SLP_PLAYER_ANIM const SLP_ANIM ; sleeping monster - const ANIM_BE + const CONF_PLAYER_ANIM const CONF_ANIM ; confused monster - const ANIM_C0 + const SLIDE_DOWN_ANIM const TOSS_ANIM ; toss Poké Ball const SHAKE_ANIM ; shaking Poké Ball when catching monster const POOF_ANIM ; puff of smoke const BLOCKBALL_ANIM ; trainer knocks away Poké Ball const GREATTOSS_ANIM ; toss Great Ball const ULTRATOSS_ANIM ; toss Ultra Ball or Master Ball - const ANIM_C7 + const SHAKE_SCREEN_ANIM const HIDEPIC_ANIM ; monster disappears const ROCK_ANIM ; throw rock const BAIT_ANIM ; throw bait |