diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-12-09 17:44:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-09 17:44:09 -0500 |
| commit | e025ab9db0b85cadb42e9b72ac408a58f8133672 (patch) | |
| tree | ff74fb06f4d6715bec8a711e31f41057d4625bb3 /constants/battle_anim_constants.asm | |
| parent | cbf4c663611d4b7d07f3fc8d43f0be756ccc19ed (diff) | |
| parent | fd1fa78ffe78c9101c0ae5a1ca299d4282462ecd (diff) | |
Merge pull request #578 from mid-kid/master
Fixes in the animation subsystem.
Diffstat (limited to 'constants/battle_anim_constants.asm')
| -rw-r--r-- | constants/battle_anim_constants.asm | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/constants/battle_anim_constants.asm b/constants/battle_anim_constants.asm index 58e19462e..91733cd34 100644 --- a/constants/battle_anim_constants.asm +++ b/constants/battle_anim_constants.asm @@ -26,6 +26,9 @@ const BATTLEANIMSTRUCT_17 BATTLEANIMSTRUCT_LENGTH EQU const_value +; Start tile for battle animation graphics +BATTLEANIM_BASE_TILE EQU 7 * 7 ; Maximum size of a pokemon picture + ; BattleAnimObjects indexes (see data/battle_anims/objects.asm) const_def const ANIM_OBJ_00 @@ -212,10 +215,10 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value const ANIM_OBJ_ROCK_SMASH const ANIM_OBJ_FLOWER const ANIM_OBJ_COTTON - const ANIM_OBJ_PLAYERFEETFOLLOW - const ANIM_OBJ_ENEMYFEETFOLLOW - const ANIM_OBJ_PLAYERHEADFOLLOW - const ANIM_OBJ_ENEMYHEADFOLLOW + const ANIM_OBJ_ENEMYFEET_1ROW + const ANIM_OBJ_PLAYERHEAD_1ROW + const ANIM_OBJ_ENEMYFEET_2ROW + const ANIM_OBJ_PLAYERHEAD_2ROW ; DoBattleAnimFrame arguments (see engine/battle_anims/functions.asm) const_def @@ -725,8 +728,8 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value const ANIM_BG_WHIRLPOOL const ANIM_BG_TELEPORT const ANIM_BG_NIGHT_SHADE - const ANIM_BG_FEET_FOLLOW - const ANIM_BG_HEAD_FOLLOW + const ANIM_BG_BATTLEROBJ_1ROW + const ANIM_BG_BATTLEROBJ_2ROW const ANIM_BG_DOUBLE_TEAM const ANIM_BG_ACID_ARMOR const ANIM_BG_RAPID_FLASH @@ -804,6 +807,8 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value const ANIM_GFX_ANGELS const ANIM_GFX_WAVE const ANIM_GFX_AEROBLAST + const ANIM_GFX_PLAYERHEAD + const ANIM_GFX_ENEMYFEET ; battle_bg_effect struct members (see macros/wram.asm) const_def |