diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-30 13:17:47 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-30 13:17:47 -0400 |
| commit | 286c160c27e58caad32f776cec684eb8cb2cb22a (patch) | |
| tree | d89563a88a9674837896d6e88b9c9431b708bf97 /constants.asm | |
| parent | c8a5720cca08631dcc20d036731e261a09a9a76e (diff) | |
| parent | 188ac8a9b4816dd98df0108314e58885c3b07452 (diff) | |
Merge branch 'master' of https://github.com/yenatch/pokered
Conflicts:
engine/battle/1c.asm
Diffstat (limited to 'constants.asm')
| -rw-r--r-- | constants.asm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/constants.asm b/constants.asm index 26356edd..b427e3c7 100644 --- a/constants.asm +++ b/constants.asm @@ -3,6 +3,7 @@ INCLUDE "version.asm" INCLUDE "macros.asm" INCLUDE "hram.asm" +INCLUDE "vram.asm" INCLUDE "constants/hardware_constants.asm" INCLUDE "constants/oam_constants.asm" |