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/fldeff_80F9BCC.h | |
| parent | 734403fdfafd1dc4b738f98158dcec45bb01f58b (diff) | |
| parent | 54ad6794bce3ee534aa78a8c6e7f32715cd8f6a9 (diff) | |
Fix conflicts
Diffstat (limited to 'include/fldeff_80F9BCC.h')
| -rw-r--r-- | include/fldeff_80F9BCC.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/fldeff_80F9BCC.h b/include/fldeff_80F9BCC.h index 87a20d290..027bb4273 100644 --- a/include/fldeff_80F9BCC.h +++ b/include/fldeff_80F9BCC.h @@ -11,7 +11,7 @@ void sub_80FA5E4(s16 id, s16 x, s16 y); void sub_80FA794(s16 x, s16 y); void CreateRecordMixingSprite(void); void DestroyRecordMixingSprite(void); -void overworld_poison_effect(void); +void FldeffPoison_Start(void); void sub_80FA970(s16); void sub_80FA9D0(void); bool8 sub_80FADE4(u16, u8); |