diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-03 13:56:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-03 13:56:22 -0400 |
| commit | 3e49ac804b53cdb4d39b4f92de949eb858efcee4 (patch) | |
| tree | f3598d27d0511ad5cd3457edeef60ef96cbb4305 /include/constants | |
| parent | afb9ff3a40dcfb2681ef274752bceb726d14b783 (diff) | |
| parent | e14210ce1f9be3ae894490a4e3050832aecbdde7 (diff) | |
Merge branch 'master' into doc-finalmisc
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/field_effects.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h index e02e01efb..a62040947 100644 --- a/include/constants/field_effects.h +++ b/include/constants/field_effects.h @@ -46,7 +46,7 @@ #define FLDEFF_HOT_SPRINGS_WATER 42 #define FLDEFF_USE_WATERFALL 43 #define FLDEFF_USE_DIVE 44 -#define FLDEFF_POKEBALL 45 +#define FLDEFF_POKEBALL_TRAIL 45 #define FLDEFF_HEART_ICON 46 #define FLDEFF_NOP_47 47 #define FLDEFF_NOP_48 48 @@ -113,7 +113,7 @@ #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_POKEBALL_TRAIL 0x1009 #define FLDEFF_PAL_TAG_ASH 0x100D #define FLDEFF_PAL_TAG_SAND_PILLAR 0x100E #define FLDEFF_PAL_TAG_SMALL_SPARKLE 0x100F |