summaryrefslogtreecommitdiff
path: root/src/constants.asm
diff options
context:
space:
mode:
authorxCrystal <rgr.crystal@gmail.com>2019-07-20 14:19:58 +0200
committerGitHub <noreply@github.com>2019-07-20 14:19:58 +0200
commit0b35ceb3481cca5a0527f540e4c685051de901c6 (patch)
tree7f4e30d90706d1309c7d8f2013ef50980b27e391 /src/constants.asm
parent53ad70b112d47ffa2536ee179fd136df900018a3 (diff)
parentc6b095eae729ed1a8cc19c28be746c43744d83d3 (diff)
Merge branch 'master' into master
Diffstat (limited to 'src/constants.asm')
-rw-r--r--src/constants.asm3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/constants.asm b/src/constants.asm
index cad6cae..aec75af 100644
--- a/src/constants.asm
+++ b/src/constants.asm
@@ -9,9 +9,10 @@ INCLUDE "constants/hardware_constants.asm"
INCLUDE "constants/map_constants.asm"
INCLUDE "constants/misc_constants.asm"
INCLUDE "constants/music_constants.asm"
+INCLUDE "constants/name_constants.asm"
INCLUDE "constants/npc_constants.asm"
INCLUDE "constants/sgb_constants.asm"
+INCLUDE "constants/sfx_constants.asm"
INCLUDE "constants/sprite_constants.asm"
INCLUDE "constants/text_constants.asm"
-INCLUDE "constants/name_constants.asm"
INCLUDE "constants/charmaps.asm" \ No newline at end of file