diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm
index 628aab69c..24eaf4288 100644
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -171,7 +171,7 @@ CheckPlayerTurn:
 	jr z, .WokeUp
 	xor a
 	ld [$cfca], a
-	ld de, ANIM_SLEEP
+	ld de, ANIM_SLP
 	call FarPlayBattleAnimation
 	jr .FastAsleep
 
@@ -315,7 +315,7 @@ CheckPlayerTurn:
 	xor a
 	ld [$cfca], a
 
-	ld de, ANIM_INLOVE
+	ld de, ANIM_IN_LOVE
 	call FarPlayBattleAnimation
 
 ; 50% chance of infatuation
@@ -432,7 +432,7 @@ CheckEnemyTurn: ; 3421f
 	call StdBattleTextBox
 	xor a
 	ld [$cfca], a
-	ld de, ANIM_SLEEP
+	ld de, ANIM_SLP
 	call FarPlayBattleAnimation
 	jr .FastAsleep
 
@@ -594,7 +594,7 @@ CheckEnemyTurn: ; 3421f
 	xor a
 	ld [$cfca], a
 
-	ld de, ANIM_INLOVE
+	ld de, ANIM_IN_LOVE
 	call FarPlayBattleAnimation
 
 ; 50% chance of infatuation
diff --git a/constants.asm b/constants.asm
index 095433471..7ffaba56a 100644
--- a/constants.asm
+++ b/constants.asm
@@ -23,6 +23,8 @@ INCLUDE "constants/event_flags.asm"
 INCLUDE "constants/engine_flags.asm"
 INCLUDE "constants/music_constants.asm"
 INCLUDE "constants/sfx_constants.asm"
+INCLUDE "constants/animation_constants.asm"
+INCLUDE "constants/gfx_constants.asm"
 
 
 
diff --git a/constants/animation_constants.asm b/constants/animation_constants.asm
new file mode 100644
index 000000000..54ab3c162
--- /dev/null
+++ b/constants/animation_constants.asm
@@ -0,0 +1,63 @@
+ANIM_SWEET_SCENT_2 EQU 255 ; unused?
+ANIM_THROW_POKE_BALL EQU 256
+ANIM_SEND_OUT_MON EQU 257 ; seems to also cover shiny
+ANIM_RETURN_MON EQU 258
+ANIM_CONFUSED EQU 259
+ANIM_SLP EQU 260
+ANIM_BRN EQU 261
+ANIM_PSN EQU 262
+ANIM_SAP EQU 263
+ANIM_FRZ EQU 264
+ANIM_PAR EQU 265
+ANIM_IN_LOVE EQU 266
+ANIM_IN_SANDSTORM EQU 267
+ANIM_IN_NIGHTMARE EQU 268
+ANIM_IN_WHIRLPOOL EQU 269
+ANIM_MISS EQU 270
+ANIM_ENEMY_DAMAGE EQU 271
+ANIM_ENEMY_STAT_DOWN EQU 272 ; vibrate horizontally
+ANIM_PLAYER_STAT_DOWN EQU 273 ; wobble horizontally
+ANIM_PLAYER_DAMAGE EQU 274
+ANIM_WOBBLE EQU 275
+ANIM_SHAKE EQU 276
+ANIM_HIT_CONFUSION EQU 277
+
+ANIM_OBJ_BURNED EQU $10
+ANIM_OBJ_FROZEN EQU $2a
+ANIM_OBJ_GUST EQU $3e
+ANIM_OBJ_CHICK EQU $52
+ANIM_OBJ_SKULL EQU $55
+ANIM_OBJ_PARALYZED EQU $59
+ANIM_OBJ_HEART EQU $7e
+ANIM_OBJ_FLOWER EQU $b6
+ANIM_OBJ_COTTON EQU $b7
+
+ANIM_BG_FLASH_INVERTED EQU $01
+ANIM_BG_FLASH_WHITE EQU $02
+ANIM_BG_WHITE_HUES EQU $03
+ANIM_BG_BLACK_HUES EQU $04
+ANIM_BG_ALTERNATE_HUES EQU $05
+; ???? EQU $06
+; ???? EQU $07
+; ???? EQU $08
+ANIM_BG_HIDE_MON EQU $09
+ANIM_BG_SHOW_MON EQU $0a
+ANIM_BG_ENTER_MON EQU $0b
+ANIM_BG_RETURN_MON EQU $0c
+ANIM_BG_SURF EQU $0d
+ANIM_BG_WHIRLPOOL EQU $0e
+ANIM_BG_TELEPORT EQU $0f
+ANIM_BG_NIGHT_SHADE EQU $10
+ANIM_BG_FEET_FOLLOW EQU $11
+ANIM_BG_HEAD_FOLLOW EQU $12
+ANIM_BG_DOUBLE_TEAM EQU $13
+ANIM_BG_ACID_ARMOR EQU $14
+ANIM_BG_RAPID_FLASH EQU $15 ; unused
+
+ANIM_BG_TACKLE EQU $24
+
+ANIM_BG_PSYCHIC EQU $29
+
+ANIM_BG_VIBRATE_MON EQU $33
+ANIM_BG_WOBBLE_MON EQU $34
+
diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm
index a1858da1f..b95991ae7 100644
--- a/constants/battle_constants.asm
+++ b/constants/battle_constants.asm
@@ -126,10 +126,6 @@ WEATHER_RAIN_END EQU 4
 WEATHER_SUN_END EQU 5
 WEATHER_SANDSTORM_END EQU 6
 
-; move animations are 1:1 with move ids
-ANIM_CONFUSED EQU $103
-ANIM_SLEEP    EQU $104
-ANIM_INLOVE   EQU $10a
 
 ; move effects
 EFFECT_NORMAL_HIT          EQU $00
diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm
new file mode 100644
index 000000000..a149bdff5
--- /dev/null
+++ b/constants/gfx_constants.asm
@@ -0,0 +1,40 @@
+ANIM_GFX_HIT        EQU 1
+ANIM_GFX_CUT        EQU 2
+ANIM_GFX_FIRE       EQU 3
+ANIM_GFX_WATER      EQU 4
+ANIM_GFX_LIGHTNING  EQU 5
+ANIM_GFX_PLANT      EQU 6
+ANIM_GFX_SMOKE      EQU 7
+ANIM_GFX_EXPLOSION  EQU 8
+ANIM_GFX_ROCKS      EQU 9
+ANIM_GFX_ICE        EQU 10
+ANIM_GFX_POKE_BALL  EQU 11
+ANIM_GFX_POISON     EQU 12
+ANIM_GFX_BUBBLE     EQU 13
+ANIM_GFX_NOISE      EQU 14
+ANIM_GFX_POWDER     EQU 15
+ANIM_GFX_BEAM       EQU 16
+ANIM_GFX_SPEED      EQU 17
+ANIM_GFX_CHARGE     EQU 18
+ANIM_GFX_WIND       EQU 19
+ANIM_GFX_WHIP       EQU 20
+ANIM_GFX_EGG        EQU 21
+ANIM_GFX_ROPE       EQU 22
+ANIM_GFX_PSYCHIC    EQU 23
+ANIM_GFX_REFLECT    EQU 24
+ANIM_GFX_STATUS     EQU 25
+ANIM_GFX_SAND       EQU 26
+ANIM_GFX_WEB        EQU 27
+ANIM_GFX_HAZE       EQU 28
+ANIM_GFX_HORN       EQU 29
+ANIM_GFX_FLOWER     EQU 30
+ANIM_GFX_MISC       EQU 31
+ANIM_GFX_SKY_ATTACK EQU 32
+ANIM_GFX_GLOBE      EQU 33
+ANIM_GFX_SHAPES     EQU 34
+ANIM_GFX_OBJECTS    EQU 35
+ANIM_GFX_SHINE      EQU 36
+ANIM_GFX_ANGELS     EQU 37
+ANIM_GFX_WAVE       EQU 38
+ANIM_GFX_AEROBLAST  EQU 39
+