diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2016-11-01 10:56:23 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2016-11-01 10:56:23 -0500 |
| commit | f09f9cef752c37e3cc0686573c1fdb29da842772 (patch) | |
| tree | 22bee285750a6739643859eb6afd52be4ded87e1 /data/field_effect_scripts.s | |
| parent | 442002dada4183c96b5ec09fcde8486aa5ba29b1 (diff) | |
| parent | 4db33778ad3faa64d994f46358a28c22c393f7c6 (diff) | |
Merge remote-tracking branch 'refs/remotes/pret/master'
Diffstat (limited to 'data/field_effect_scripts.s')
| -rw-r--r-- | data/field_effect_scripts.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 9f4a9ce3a..d879df0ce 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -1,5 +1,5 @@ - .include "asm/macros.s" - .include "constants/constants.s" + .include "asm/macros.inc" + .include "constants/constants.inc" .section script_data, "aw", %progbits |