I hope this fixes merge conflicts

1 files changed, 80 insertions, 0 deletions

diff --git a/include/field_effect.h b/include/field_effect.h
new file mode 100644
index 000000000..7ec26b3d7
--- /dev/null
+++ b/include/field_effect.h
@@ -0,0 +1,80 @@
+//
+// Created by Scott Norton on 9/15/17.
+//
+
+#ifndef GUARD_FIELD_EFFECTS_H
+#define GUARD_FIELD_EFFECTS_H
+
+enum FieldEffectScriptIdx
+{
+    FLDEFF_EXCLAMATION_MARK_ICON_1,
+    FLDEFF_USE_CUT_ON_GRASS,
+    FLDEFF_USE_CUT_ON_TREE,
+    FLDEFF_SHADOW,
+    FLDEFF_TALL_GRASS,
+    FLDEFF_RIPPLE,
+    FLDEFF_FIELD_MOVE_SHOW_MON,
+    FLDEFF_ASH,
+    FLDEFF_SURF_BLOB,
+    FLDEFF_USE_SURF,
+    FLDEFF_DUST,
+    FLDEFF_USE_SECRET_POWER_CAVE,
+    FLDEFF_JUMP_TALL_GRASS,
+    FLDEFF_SAND_FOOTPRINTS,
+    FLDEFF_JUMP_BIG_SPLASH,
+    FLDEFF_SPLASH,
+    FLDEFF_JUMP_SMALL_SPLASH,
+    FLDEFF_LONG_GRASS,
+    FLDEFF_JUMP_LONG_GRASS,
+    FLDEFF_UNKNOWN_19,
+    FLDEFF_UNKNOWN_20,
+    FLDEFF_UNKNOWN_21,
+    FLDEFF_UNKNOWN_22,
+    FLDEFF_BERRY_TREE_GROWTH_SPARKLE,
+    FLDEFF_DEEP_SAND_FOOTPRINTS,
+    FLDEFF_POKECENTER_HEAL,
+    FLDEFF_USE_SECRET_POWER_TREE,
+    FLDEFF_USE_SECRET_POWER_SHRUB,
+    FLDEFF_TREE_DISGUISE,
+    FLDEFF_MOUNTAIN_DISGUISE,
+    FLDEFF_NPCFLY_OUT,
+    FLDEFF_USE_FLY,
+    FLDEFF_FLY_IN,
+    FLDEFF_EXCLAMATION_MARK_ICON_2,
+    FLDEFF_FEET_IN_FLOWING_WATER,
+    FLDEFF_BIKE_TIRE_TRACKS,
+    FLDEFF_SAND_DISGUISE,
+    FLDEFF_USE_ROCK_SMASH,
+    FLDEFF_USE_DIG,
+    FLDEFF_SAND_PILE,
+    FLDEFF_USE_STRENGTH,
+    FLDEFF_SHORT_GRASS,
+    FLDEFF_HOT_SPRINGS_WATER,
+    FLDEFF_USE_WATERFALL,
+    FLDEFF_USE_DIVE,
+    FLDEFF_POKEBALL,
+    FLDEFF_HEART_ICON,
+    FLDEFF_NOP_47,
+    FLDEFF_NOP_48,
+    FLDEFF_POP_OUT_OF_ASH,
+    FLDEFF_LAVARIDGE_GYM_WARP,
+    FLDEFF_SWEET_SCENT,
+    FLDEFF_SAND_PILLAR,
+    FLDEFF_BUBBLES,
+    FLDEFF_SPARKLE,
+    FLDEFF_SECRET_POWER_CAVE,
+    FLDEFF_SECRET_POWER_TREE,
+    FLDEFF_SECRET_POWER_SHRUB,
+    FLDEFF_CUT_GRASS,
+    FLDEFF_FIELD_MOVE_SHOW_MON_INIT,
+    FLDEFF_USE_FLY_ANCIENT_TOMB,
+    FLDEFF_PCTURN_ON,
+    FLDEFF_HALL_OF_FAME_RECORD,
+    FLDEFF_USE_TELEPORT
+};
+
+extern u32 gFieldEffectSpawnParams[8];
+
+u8 FieldEffectStart(u8);
+
+#endif //GUARD_FIELD_EFFECTS_H