diff options
| author | camthesaxman <cameronghall@cox.net> | 2019-07-28 20:36:33 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2019-07-28 20:36:33 -0500 |
| commit | e03220c21de7c33e1ddeb3fd0585378da37d8b51 (patch) | |
| tree | 57da1db9027de960c4b066bdcf6ab17c03753791 /data/battle_scripts_1.s | |
| parent | 00b44d588618c9a0feff1285183c183f1c97f1bb (diff) | |
| parent | d442be12102ed3493c04b3688f37a4ffad6606f7 (diff) | |
Merge branch 'master' into filenames_1
Diffstat (limited to 'data/battle_scripts_1.s')
| -rw-r--r-- | data/battle_scripts_1.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 3c34da93a..7708f2f4f 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -1,5 +1,5 @@ #include "constants/abilities.h" -#include "constants/battle_constants.h" +#include "constants/battle.h" #include "constants/moves.h" #include "constants/songs.h" .include "include/macros.inc" |