diff --git a/battle/effect_command_pointers.asm b/battle/effect_command_pointers.asm
index 8a9014fa5..60c658dfc 100644
--- a/battle/effect_command_pointers.asm
+++ b/battle/effect_command_pointers.asm
@@ -1,6 +1,7 @@
 	dw 0 ; padding
 
 BattleCommandPointers: ; 3fd28
+; entries correspond to constants/effect_command_constants.asm
 	dw BattleCommand_CheckTurn ; 34084
 	dw BattleCommand_CheckObedience ; 343db
 	dw BattleCommand_UsedMoveText ; 34541
diff --git a/battle/moves/move_effects_pointers.asm b/battle/moves/move_effects_pointers.asm
index 2e4f1ea31..d15beedb7 100644
--- a/battle/moves/move_effects_pointers.asm
+++ b/battle/moves/move_effects_pointers.asm
@@ -1,3 +1,4 @@
+; entries correspond to EFFECT_* constants
 	dw NormalHit
 	dw DoSleep
 	dw PoisonHit
diff --git a/constants.asm b/constants.asm
index ffdf247e5..5d47dd065 100644
--- a/constants.asm
+++ b/constants.asm
@@ -7,6 +7,7 @@ INCLUDE "constants/wram_constants.asm"
 INCLUDE "constants/pokemon_constants.asm"
 INCLUDE "constants/type_constants.asm"
 INCLUDE "constants/move_constants.asm"
+INCLUDE "constants/effect_command_constants.asm"
 INCLUDE "constants/battle_constants.asm"
 INCLUDE "constants/map_dimension_constants.asm"
 INCLUDE "constants/map_constants.asm"
diff --git a/macros/move_effect.asm b/constants/effect_command_constants.asm
similarity index 99%
rename from macros/move_effect.asm
rename to constants/effect_command_constants.asm
index d3761c9a1..0d86e66a1 100644
--- a/macros/move_effect.asm
+++ b/constants/effect_command_constants.asm
@@ -1,10 +1,11 @@
+; BattleCommandPointers indexes (see battle/effect_commands.asm)
+
 command: macro
 	enum \1_command
 \1 equs "db \1_command"
 endm
 
 	enum_start 1
-
 	command checkturn               ; 01
 	command checkobedience          ; 02
 	command usedmovetext            ; 03
diff --git a/macros.asm b/macros.asm
index 9ada1e62a..f9913bce2 100644
--- a/macros.asm
+++ b/macros.asm
@@ -1,11 +1,9 @@
 INCLUDE "macros/enum.asm"
 INCLUDE "macros/basestats.asm"
-
 INCLUDE "macros/event.asm"
 INCLUDE "macros/sound.asm"
 INCLUDE "macros/text.asm"
 INCLUDE "macros/charmap.asm"
-INCLUDE "macros/move_effect.asm"
 INCLUDE "macros/move_anim.asm"
 INCLUDE "macros/movement.asm"
 INCLUDE "macros/map.asm"