1 files changed, 60 insertions, 9 deletions
diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h
index 00ca60457..dc1085f7c 100644
--- a/include/constants/field_effects.h
+++ b/include/constants/field_effects.h
@@ -20,10 +20,10 @@
 #define FLDEFF_JUMP_SMALL_SPLASH         16
 #define FLDEFF_LONG_GRASS                17
 #define FLDEFF_JUMP_LONG_GRASS           18
-#define FLDEFF_UNKNOWN_19                19
-#define FLDEFF_UNKNOWN_20                20
-#define FLDEFF_UNKNOWN_21                21
-#define FLDEFF_UNKNOWN_22                22
+#define FLDEFF_UNUSED_GRASS              19
+#define FLDEFF_UNUSED_GRASS_2            20
+#define FLDEFF_UNUSED_SAND               21
+#define FLDEFF_WATER_SURFACING           22
 #define FLDEFF_BERRY_TREE_GROWTH_SPARKLE 23
 #define FLDEFF_DEEP_SAND_FOOTPRINTS      24
 #define FLDEFF_POKECENTER_HEAL           25
@@ -50,8 +50,8 @@
 #define FLDEFF_HEART_ICON                46
 #define FLDEFF_NOP_47                    47
 #define FLDEFF_NOP_48                    48
-#define FLDEFF_POP_OUT_OF_ASH            49
-#define FLDEFF_LAVARIDGE_GYM_WARP        50
+#define FLDEFF_ASH_PUFF                  49
+#define FLDEFF_ASH_LAUNCH                50
 #define FLDEFF_SWEET_SCENT               51
 #define FLDEFF_SAND_PILLAR               52
 #define FLDEFF_BUBBLES                   53
@@ -65,8 +65,59 @@
 #define FLDEFF_PCTURN_ON                 61
 #define FLDEFF_HALL_OF_FAME_RECORD       62
 #define FLDEFF_USE_TELEPORT              63
-#define FLDEFF_RAYQUAZA                  64
-#define FLDEFF_65                        65
+#define FLDEFF_RAYQUAZA_SPOTLIGHT        64
+#define FLDEFF_DESTROY_DEOXYS_ROCK       65
 #define FLDEFF_MOVE_DEOXYS_ROCK          66
 
-#endif
+#define FLDEFFOBJ_SHADOW_S              0
+#define FLDEFFOBJ_SHADOW_M              1
+#define FLDEFFOBJ_SHADOW_L              2
+#define FLDEFFOBJ_SHADOW_XL             3
+#define FLDEFFOBJ_TALL_GRASS            4
+#define FLDEFFOBJ_RIPPLE                5
+#define FLDEFFOBJ_ASH                   6
+#define FLDEFFOBJ_SURF_BLOB             7
+#define FLDEFFOBJ_ARROW                 8
+#define FLDEFFOBJ_GROUND_IMPACT_DUST    9
+#define FLDEFFOBJ_JUMP_TALL_GRASS       10
+#define FLDEFFOBJ_SAND_FOOTPRINTS       11
+#define FLDEFFOBJ_JUMP_BIG_SPLASH       12
+#define FLDEFFOBJ_SPLASH                13
+#define FLDEFFOBJ_JUMP_SMALL_SPLASH     14
+#define FLDEFFOBJ_LONG_GRASS            15
+#define FLDEFFOBJ_JUMP_LONG_GRASS       16
+#define FLDEFFOBJ_UNUSED_GRASS          17
+#define FLDEFFOBJ_UNUSED_GRASS_2        18
+#define FLDEFFOBJ_UNUSED_SAND           19
+#define FLDEFFOBJ_WATER_SURFACING       20
+#define FLDEFFOBJ_REFLECTION_DISTORTION 21
+#define FLDEFFOBJ_SPARKLE               22
+#define FLDEFFOBJ_DEEP_SAND_FOOTPRINTS  23
+#define FLDEFFOBJ_TREE_DISGUISE         24
+#define FLDEFFOBJ_MOUNTAIN_DISGUISE     25
+#define FLDEFFOBJ_BIRD                  26
+#define FLDEFFOBJ_BIKE_TIRE_TRACKS      27
+#define FLDEFFOBJ_SAND_DISGUISE         28
+#define FLDEFFOBJ_SAND_PILE             29
+#define FLDEFFOBJ_SHORT_GRASS           30
+#define FLDEFFOBJ_HOT_SPRINGS_WATER     31
+#define FLDEFFOBJ_ASH_PUFF              32
+#define FLDEFFOBJ_ASH_LAUNCH            33
+#define FLDEFFOBJ_BUBBLES               34
+#define FLDEFFOBJ_SMALL_SPARKLE         35
+#define FLDEFFOBJ_RAYQUAZA              36
+
+#define FLDEFF_PAL_TAG_CUT_GRASS          0x1000
+#define FLDEFF_PAL_TAG_SECRET_POWER_TREE  0x1003
+#define FLDEFF_PAL_TAG_GENERAL_0          0x1004
+#define FLDEFF_PAL_TAG_GENERAL_1          0x1005
+#define FLDEFF_PAL_TAG_POKEBALL_GLOW      0x1007
+#define FLDEFF_PAL_TAG_SECRET_POWER_PLANT 0x1008
+#define FLDEFF_PAL_TAG_POKEBALL           0x1009
+#define FLDEFF_PAL_TAG_ASH                0x100D
+#define FLDEFF_PAL_TAG_SAND_PILLAR        0x100E
+#define FLDEFF_PAL_TAG_SMALL_SPARKLE      0x100F
+#define FLDEFF_PAL_TAG_HOF_MONITOR        0x1010
+#define FLDEFF_PAL_TAG_UNKNOWN            0x1011
+
+#endif // GUARD_FIELD_EFFECT_CONSTANTS_H