diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
| commit | c7722a492017dbd8a5fb3bb216062eb62129daf5 (patch) | |
| tree | 2a5c0ba6a6b9364aa93eb4a9a89b35153954ab63 /data/maps.s | |
| parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
fixing merge conflicts
Diffstat (limited to 'data/maps.s')
| -rw-r--r-- | data/maps.s | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/data/maps.s b/data/maps.s index a8074c02a..92f5544a1 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,3 +1,5 @@ +#include "constants/maps.h" +#include "constants/songs.h" .include "asm/macros.inc" .include "constants/constants.inc" |