diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/battle_anim_constants.asm | 65 |
1 files changed, 35 insertions, 30 deletions
diff --git a/constants/battle_anim_constants.asm b/constants/battle_anim_constants.asm index 3259be61a..c5a873e80 100644 --- a/constants/battle_anim_constants.asm +++ b/constants/battle_anim_constants.asm @@ -219,7 +219,7 @@ BATTLEANIM_BASE_TILE EQU 7 * 7 ; Maximum size of a pokemon picture const_def const BATTLEANIMFUNC_NULL const BATTLEANIMFUNC_USER_TO_TARGET - const BATTLEANIMFUNC_USER_TO_TARGET_DISSAPPEAR + const BATTLEANIMFUNC_USER_TO_TARGET_DISAPPEAR const BATTLEANIMFUNC_MOVE_IN_CIRCLE const BATTLEANIMFUNC_WAVE_TO_TARGET const BATTLEANIMFUNC_THROW_TO_TARGET @@ -712,9 +712,9 @@ BATTLEANIM_BASE_TILE EQU 7 * 7 ; Maximum size of a pokemon picture const ANIM_BG_WHITE_HUES const ANIM_BG_BLACK_HUES const ANIM_BG_ALTERNATE_HUES - const ANIM_BG_06 - const ANIM_BG_07 - const ANIM_BG_08 + const ANIM_BG_CYCLE_OBPALS_GRAY_AND_YELLOW + const ANIM_BG_CYCLE_MID_OBPALS_GRAY_AND_YELLOW + const ANIM_BG_CYCLE_BGPALS_INVERTED const ANIM_BG_HIDE_MON const ANIM_BG_SHOW_MON const ANIM_BG_ENTER_MON @@ -728,38 +728,38 @@ BATTLEANIM_BASE_TILE EQU 7 * 7 ; Maximum size of a pokemon picture const ANIM_BG_DOUBLE_TEAM const ANIM_BG_ACID_ARMOR const ANIM_BG_RAPID_FLASH - const ANIM_BG_16 - const ANIM_BG_17 - const ANIM_BG_18 - const ANIM_BG_19 - const ANIM_BG_1A - const ANIM_BG_1B - const ANIM_BG_1C - const ANIM_BG_1D - const ANIM_BG_1E - const ANIM_BG_1F - const ANIM_BG_20 + const ANIM_BG_FADE_MON_TO_LIGHT + const ANIM_BG_FADE_MON_TO_BLACK + const ANIM_BG_FADE_MON_TO_LIGHT_REPEATING + const ANIM_BG_FADE_MON_TO_BLACK_REPEATING + const ANIM_BG_CYCLE_MON_LIGHT_DARK_REPEATING + const ANIM_BG_FLASH_MON_REPEATING + const ANIM_BG_FADE_MONS_TO_BLACK_REPEATING + const ANIM_BG_FADE_MON_TO_WHITE_WAIT_FADE_BACK + const ANIM_BG_FADE_MON_FROM_WHITE + const ANIM_BG_SHAKE_SCREEN_X + const ANIM_BG_SHAKE_SCREEN_Y const ANIM_BG_WITHDRAW const ANIM_BG_BOUNCE_DOWN const ANIM_BG_DIG const ANIM_BG_TACKLE - const ANIM_BG_25 - const ANIM_BG_26 - const ANIM_BG_27 - const ANIM_BG_WAVE_DEFORM_USER + const ANIM_BG_BODY_SLAM + const ANIM_BG_WOBBLE_MON + const ANIM_BG_REMOVE_MON + const ANIM_BG_WAVE_DEFORM_MON const ANIM_BG_PSYCHIC - const ANIM_BG_2A - const ANIM_BG_2B - const ANIM_BG_2C - const ANIM_BG_2D - const ANIM_BG_2E - const ANIM_BG_2F - const ANIM_BG_30 - const ANIM_BG_31 - const ANIM_BG_32 + const ANIM_BG_BETA_SEND_OUT_MON1 + const ANIM_BG_BETA_SEND_OUT_MON2 + const ANIM_BG_FLAIL + const ANIM_BG_BETA_PURSUIT + const ANIM_BG_ROLLOUT + const ANIM_BG_VITAL_THROW + const ANIM_BG_START_WATER + const ANIM_BG_WATER + const ANIM_BG_END_WATER const ANIM_BG_VIBRATE_MON - const ANIM_BG_WOBBLE_MON - const ANIM_BG_35 + const ANIM_BG_WOBBLE_PLAYER + const ANIM_BG_WOBBLE_SCREEN ; AnimObjGFX indexes (see data/battle_anims/object_gfx.asm) const_def 1 @@ -814,6 +814,11 @@ BATTLEANIM_BASE_TILE EQU 7 * 7 ; Maximum size of a pokemon picture BG_EFFECT_STRUCT_LENGTH EQU const_value NUM_BG_EFFECTS EQU 5 ; see wActiveBGEffects +; + const_def + const BG_EFFECT_TARGET ; 0 + const BG_EFFECT_USER ; 1 + ; battle palettes const_def const PAL_BATTLE_BG_PLAYER ; 0 |