summaryrefslogtreecommitdiff
path: root/constants.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2021-03-25 17:39:44 -0500
committerdannye <33dannye@gmail.com>2021-03-25 17:39:44 -0500
commiteb47bda8ee5c1f002236200df36012de9e243a97 (patch)
treefc69fc5435582efebd36fc54414673dd8ac7f646 /constants.asm
parentd07a66662728225c1422fed1072281dee71a2c9e (diff)
parent95ec2cf039f0efdc6dadfb6fe766ace231a1b6b1 (diff)
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'constants.asm')
-rw-r--r--constants.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/constants.asm b/constants.asm
index 2a277001..99714a84 100644
--- a/constants.asm
+++ b/constants.asm
@@ -9,16 +9,16 @@ INCLUDE "constants/gfx_constants.asm"
INCLUDE "constants/input_constants.asm"
INCLUDE "constants/serial_constants.asm"
INCLUDE "constants/script_constants.asm"
-INCLUDE "constants/pokemon_constants.asm"
-INCLUDE "constants/pokedex_constants.asm"
-INCLUDE "constants/pokemon_data_constants.asm"
-INCLUDE "constants/trainer_constants.asm"
INCLUDE "constants/type_constants.asm"
+INCLUDE "constants/battle_constants.asm"
INCLUDE "constants/move_constants.asm"
INCLUDE "constants/move_animation_constants.asm"
INCLUDE "constants/move_effect_constants.asm"
-INCLUDE "constants/battle_constants.asm"
INCLUDE "constants/item_constants.asm"
+INCLUDE "constants/pokemon_constants.asm"
+INCLUDE "constants/pokedex_constants.asm"
+INCLUDE "constants/pokemon_data_constants.asm"
+INCLUDE "constants/trainer_constants.asm"
INCLUDE "constants/icon_constants.asm"
INCLUDE "constants/sprite_constants.asm"
INCLUDE "constants/sprite_data_constants.asm"