Match and clean up fldeff misc

3 files changed, 34 insertions, 14 deletions

diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index cc45f1531..4d0c21f98 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -59,6 +59,8 @@ struct LockedAnimEventObjects
 };
 
 extern const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[];
+extern const struct OamData gEventObjectBaseOam_32x8;
+extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
 extern const u8 gReflectionEffectPaletteMap[];
 
 void ResetEventObjects(void);
diff --git a/include/event_scripts.h b/include/event_scripts.h
index 2661494d3..3dcb7f929 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -579,4 +579,9 @@ extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88[];
 extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F[];
 extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A[];
 
+// fldeff misc
+extern const u8 EventScript_275A86[];
+extern const u8 EventScript_275ADF[];
+extern const u8 EventScript_275B38[];
+
 #endif // GUARD_EVENT_SCRIPTS_H
diff --git a/include/fldeff_misc.h b/include/fldeff_misc.h
index 954ecbb5c..fc2f1b3e3 100644
--- a/include/fldeff_misc.h
+++ b/include/fldeff_misc.h
@@ -1,24 +1,37 @@
 #ifndef GUARD_FLDEFF_MISC_H
 #define GUARD_FLDEFF_MISC_H
 
-void PopSecretBaseBalloon(s16 id, s16 x, s16 y);
+void sub_80F9BCC(u16 a0, u16 a1, u8 a2);
+void sub_80F9BF4(u16 a0, u16 a1, u8 a2);
+bool8 sub_80F9C1C(void);
+bool8 sub_80F9C30(void);
+bool8 SetUpFieldMove_SecretPower(void);
+bool8 FldEff_UseSecretPowerCave(void);
+bool8 FldEff_SecretPowerCave(void);
+bool8 FldEff_UseSecretPowerTree(void);
+bool8 FldEff_SecretPowerTree(void);
+bool8 FldEff_UseSecretPowerShrub(void);
+bool8 FldEff_SecretPowerShrub(void);
+bool8 FldEff_SecretBasePCTurnOn(void);
+void DoSecretBasePCTurnOffEffect(void);
+void PopSecretBaseBalloon(s16 metatileId, s16 x, s16 y);
+bool8 FldEff_NopA6FC(void);
+bool8 FldEff_NopA700(void);
 void ShatterSecretBaseBreakableDoor(s16 x, s16 y);
-u8 CreateRecordMixingSprite(void);
-void DestroyRecordMixingSprite(void);
-void FldEffPoison_Start(void);
 void PlaySecretBaseMusicNoteMatSound(s16 metatileId);
 void DoSecretBaseGlitterMatSparkle(void);
-bool8 sub_80FADE4(u16, u8);
-
-extern struct MapPosition gPlayerFacingPosition;
-extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
-
-extern u8 EventScript_275A86[];
-extern u8 EventScript_275ADF[];
-extern u8 EventScript_275B38[];
-
-extern const struct OamData gEventObjectBaseOam_32x8;
+bool8 FldEff_SandPillar(void);
+void GetShieldToyTVDecorationInfo(void);
+bool8 sub_80FADE4(u16 arg0, u8 arg1);
+void FldEffPoison_Start(void);
+bool32 FldEffPoison_IsActive(void);
+void DoWateringBerryTreeAnim(void);
+u8 CreateRecordMixingSprite(void);
+void DestroyRecordMixingSprite(void);
 
+const struct SpritePalette gFieldEffectObjectPaletteInfo7;
+const struct SpritePalette gFieldEffectObjectPaletteInfo8;
+const struct SpritePalette gFieldEffectObjectPaletteInfo9;
 extern const u16 gTilesetPalettes_SecretBase[][16];
 
 #endif //GUARD_FLDEFF_MISC_H