diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-12 19:22:23 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-12 19:22:23 +0100 |
| commit | b5ea69cf74e24ab2b09572b3324ac4b3bbd8818a (patch) | |
| tree | cca355371fd2cdd9d9b6fd86c266a500837123a8 /include/field_effect.h | |
| parent | 734403fdfafd1dc4b738f98158dcec45bb01f58b (diff) | |
| parent | 54ad6794bce3ee534aa78a8c6e7f32715cd8f6a9 (diff) | |
Fix conflicts
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 3fa39aae0..2881a2cd7 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -179,8 +179,8 @@ bool8 sub_80B7B94(struct Task *, struct EventObject *, struct Sprite *); bool8 sub_80B7BCC(struct Task *, struct EventObject *, struct Sprite *); bool8 sub_80B7BF4(struct Task *, struct EventObject *, struct Sprite *); -void sub_80B7D14(struct Task *); -void sub_80B7D34(struct Task *); +static void EscapeRopeFieldEffect_Step0(struct Task *); +static void EscapeRopeFieldEffect_Step1(struct Task *); void sub_80B7EC4(struct Task *); void sub_80B7EE8(struct Task *); |