diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-02-01 08:46:53 -0500 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-02-01 08:46:53 -0500 |
| commit | ed4ac6d55156f7dab8e609f4086db270264ce594 (patch) | |
| tree | 20bf3f15d294c7e95d6f2be94cd913d7d6896cc6 /constants.asm | |
| parent | 71d31fee0ec5c9f58963f20d53e5cf7114370a2f (diff) | |
| parent | b48435bb260e87bd27cc954eb5f2473c4f80c8f4 (diff) | |
Merge branch 'master' of https://github.com/iimarckus/pokered
Conflicts:
main.asm
Diffstat (limited to 'constants.asm')
| -rw-r--r-- | constants.asm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/constants.asm b/constants.asm index 0f726b6a..3496aa6a 100644 --- a/constants.asm +++ b/constants.asm @@ -9,6 +9,8 @@ INCLUDE "hram.asm" INCLUDE "constants/hardware_constants.asm" INCLUDE "constants/oam_constants.asm" +INCLUDE "constants/wram_constants.asm" + INCLUDE "constants/pokemon_constants.asm" INCLUDE "constants/pokedex_constants.asm" INCLUDE "constants/trainer_constants.asm" @@ -26,3 +28,4 @@ INCLUDE "constants/map_constants.asm" INCLUDE "constants/map_dimensions.asm" INCLUDE "constants/connection_constants.asm" INCLUDE "constants/credits_constants.asm" +INCLUDE "constants/music_constants.asm" |