diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 12:57:46 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 12:57:46 -0500 |
| commit | fdd7e7cb848747a1e0ace8a63d29aaa22dfd1140 (patch) | |
| tree | 6ddaed4de52bfcc517d573a8f30c5bd0a1650782 /include/field_effect.h | |
| parent | bb8f652504f886af296ffcaac57bf76cdc893c97 (diff) | |
| parent | 1c1ce902515ccb3ccecde29611711c9b1a3ce955 (diff) | |
Merge branch 'master' into cable_car
Diffstat (limited to 'include/field_effect.h')
| -rw-r--r-- | include/field_effect.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/field_effect.h b/include/field_effect.h index a509697e4..9f71efba1 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -67,7 +67,7 @@ enum FieldEffectScriptIdx FLDEFF_CUT_GRASS, FLDEFF_FIELD_MOVE_SHOW_MON_INIT, FLDEFF_USE_FLY_ANCIENT_TOMB, - FLDEFF_PCTURN_ON, + FLDEFF_SECRET_BASE_PC_TURN_ON, FLDEFF_HALL_OF_FAME_RECORD, FLDEFF_USE_TELEPORT }; @@ -253,6 +253,6 @@ void MultiplyInvertedPaletteRGBComponents(u16, u8, u8, u8); void sub_80878A8(void); void sub_8087BA8(void); -extern u32 gFieldEffectArguments[8]; +extern s32 gFieldEffectArguments[8]; #endif // GUARD_FIELD_EFFECT_H |