diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 01:08:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 01:08:55 +0100 |
| commit | 44abbae60b6a39e2a1432426005e1860be196abb (patch) | |
| tree | f2405db72863761afcdcda57a88cf6ab0346e4fd /data/data2c.s | |
| parent | 039c9f4bd8ee6bfb299d4422372804c569eddebd (diff) | |
| parent | 224fdbf026cfb0ff88aac519875a39fb038e4bb1 (diff) | |
nerge with master, fix conflicts
Diffstat (limited to 'data/data2c.s')
| -rw-r--r-- | data/data2c.s | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/data/data2c.s b/data/data2c.s index be715493c..904009254 100644 --- a/data/data2c.s +++ b/data/data2c.s @@ -1,5 +1,9 @@ @ the second big chunk of data +#include "constants/abilities.h" +#include "constants/items.h" +#include "constants/moves.h" +#include "constants/species.h" .include "asm/macros.inc" .include "constants/constants.inc" |