diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-11-19 19:51:37 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-19 19:51:37 -0800 |
| commit | 0f42ef11742cfc141b720846777e43d96a64ffc3 (patch) | |
| tree | aae4004235e52acb73289336d37e09b4a8677dbf /include/field_effect.h | |
| parent | 4a365e9230962daf875a0444d51d76639c07c827 (diff) | |
| parent | 71ab629e9e4f29fc502411d41b0fd53064d94e02 (diff) | |
Merge pull request #463 from sceptillion/master
decompile fldeff_recordmixing
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 |