Sync field_effect_objects.h from Emerald

4 files changed, 53 insertions, 48 deletions

diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h
index 8c3ece863..47b5f2bed 100644
--- a/include/constants/field_effects.h
+++ b/include/constants/field_effects.h
@@ -1,16 +1,16 @@
 #ifndef GUARD_CONSTANTS_FIELD_EFFECTS_H 
 #define GUARD_CONSTANTS_FIELD_EFFECTS_H 
 
-#define FLDEFF_EXCLAMATION_MARK_ICON     0
-#define FLDEFF_USE_CUT_ON_GRASS          1 
-#define FLDEFF_USE_CUT_ON_TREE           2 
-#define FLDEFF_SHADOW                    3 
-#define FLDEFF_TALL_GRASS                4 
-#define FLDEFF_RIPPLE                    5 
-#define FLDEFF_FIELD_MOVE_SHOW_MON       6 
-#define FLDEFF_ASH                       7 
-#define FLDEFF_SURF_BLOB                 8 
-#define FLDEFF_USE_SURF                  9 
+#define FLDEFF_EXCLAMATION_MARK_ICON      0
+#define FLDEFF_USE_CUT_ON_GRASS           1
+#define FLDEFF_USE_CUT_ON_TREE            2
+#define FLDEFF_SHADOW                     3
+#define FLDEFF_TALL_GRASS                 4
+#define FLDEFF_RIPPLE                     5
+#define FLDEFF_FIELD_MOVE_SHOW_MON        6
+#define FLDEFF_ASH                        7
+#define FLDEFF_SURF_BLOB                  8
+#define FLDEFF_USE_SURF                   9
 #define FLDEFF_DUST                      10
 #define FLDEFF_USE_SECRET_POWER_CAVE     11
 #define FLDEFF_JUMP_TALL_GRASS           12
@@ -72,41 +72,46 @@
 #define FLDEFF_DESTROY_DEOXYS_ROCK       68
 #define FLDEFF_UNK_45                    69 // TODO: related to fame checker photos
 
-#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 FLDEFF_PAL_TAG_GENERAL_0          0x1004
+#define FLDEFF_PAL_TAG_GENERAL_1          0x1005
+#define FLDEFF_PAL_TAG_ASH                0x100D
+#define FLDEFF_PAL_TAG_SMALL_SPARKLE      0x100F
+
+#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_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
 
 #endif // GUARD_CONSTANTS_FIELD_EFFECTS_H
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 25fd988ea..f9b29a3f2 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -196,7 +196,7 @@ u8 GetMoveDirectionAnimNum(u8 direction);
 // Exported data declarations
 
 extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
-extern const struct SpritePalette gUnknown_83A5348;
+extern const struct SpritePalette gSpritePalette_GeneralFieldEffect1;
 extern const struct SpriteTemplate * const gFieldEffectObjectTemplatePointers[];
 extern const struct OamData gObjectEventBaseOam_32x32;
 extern const u16 gUnknown_8398648[];
diff --git a/include/field_effect.h b/include/field_effect.h
index a0673c517..48143b0d3 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -26,7 +26,7 @@ u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, bool8 unused);
 void ReturnToFieldFromFlyMapSelect(void);
 void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b);
 void SpriteCB_PopOutOfAsh(struct Sprite * sprite);
-void SpriteCB_LavaridgeGymWarp(struct Sprite * sprite);
+void SpriteCB_AshLaunch(struct Sprite * sprite);
 void FieldEffectActiveListClear(void);
 
 #endif //GUARD_FIELD_EFFECTS_H
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h
index a842c5dc6..689f6d87b 100644
--- a/include/field_effect_helpers.h
+++ b/include/field_effect_helpers.h
@@ -25,7 +25,7 @@ u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s
 void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y);
 void SetSpriteInvisible(u8 spriteId);
 void sub_80DC4A4(u8 spriteId, u8 value, s16 data1);
-void sub_80DCCE0(struct Sprite * sprite);
+void UpdateJumpImpactEffect(struct Sprite * sprite);
 void UpdateShadowFieldEffect(struct Sprite * sprite);
 void UpdateBubblesFieldEffect(struct Sprite * sprite);
 void UpdateSparkleFieldEffect(struct Sprite * sprite);