diff options
| author | Thomas Winwood <twwinwood@gmail.com> | 2018-07-21 02:06:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 02:06:31 +0100 |
| commit | 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch) | |
| tree | 63c20c67efbdf8334c6e273f78065b83135e3886 /constants.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
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 5dcbc57be..28736a1a9 100644 --- a/constants.asm +++ b/constants.asm @@ -28,6 +28,7 @@ INCLUDE "constants/map_constants.asm" INCLUDE "constants/map_data_constants.asm" INCLUDE "constants/map_object_constants.asm" INCLUDE "constants/map_setup_constants.asm" +INCLUDE "constants/mart_constants.asm" INCLUDE "constants/menu_constants.asm" INCLUDE "constants/mobile_constants.asm" INCLUDE "constants/move_constants.asm" |