diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
| commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
| tree | 07e69072826569c7c31230cb4671a5d321e5f972 /src/fldeff_strength.c | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'src/fldeff_strength.c')
| -rw-r--r-- | src/fldeff_strength.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index 74eb100bc..f796ecea6 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -5,8 +5,10 @@ #include "party_menu.h" #include "rom6.h" #include "script.h" +#include "string_util.h" #include "task.h" #include "constants/event_objects.h" +#include "constants/field_effects.h" // static functions static void FldEff_UseStrength(void); |