diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-16 08:36:51 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-16 19:00:07 -0500 |
commit | 236cbf96c8f94b8b2d23be8c72ee0e188e82842d (patch) | |
tree | c2042f78efdc37a5b64c9cd797cc0c66a0c80255 /constants/constants.inc | |
parent | 50501396b21bf132cf71d0f5d353bf51d277ba27 (diff) | |
parent | c0d180a8702b9b20afe07b09316286f6406e5811 (diff) |
Merge origin/master into pikalaxalt/link
Diffstat (limited to 'constants/constants.inc')
-rw-r--r-- | constants/constants.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/constants/constants.inc b/constants/constants.inc index 3928d63d6..fbd4e8af0 100644 --- a/constants/constants.inc +++ b/constants/constants.inc @@ -17,3 +17,4 @@ .include "constants/berry_constants.inc" .include "constants/field_object_constants.inc" .include "constants/contest_move_effects.inc" + .include "constants/songs.inc" |