From 5eac3ce1a2503a2d358033b7e0242c1ecd2b63e3 Mon Sep 17 00:00:00 2001 From: garak Date: Wed, 19 Dec 2018 22:19:54 -0500 Subject: rename fldeff_misc --- include/fldeff_misc.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 include/fldeff_misc.h (limited to 'include/fldeff_misc.h') diff --git a/include/fldeff_misc.h b/include/fldeff_misc.h new file mode 100644 index 000000000..954ecbb5c --- /dev/null +++ b/include/fldeff_misc.h @@ -0,0 +1,24 @@ +#ifndef GUARD_FLDEFF_MISC_H +#define GUARD_FLDEFF_MISC_H + +void PopSecretBaseBalloon(s16 id, s16 x, s16 y); +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; + +extern const u16 gTilesetPalettes_SecretBase[][16]; + +#endif //GUARD_FLDEFF_MISC_H -- cgit v1.2.3 From 6dffa6d17c35fe13f5878bd7bbf8a3fe1054c20c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 22 Dec 2018 19:33:45 +0100 Subject: Match and clean up fldeff misc --- include/fldeff_misc.h | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) (limited to 'include/fldeff_misc.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 -- cgit v1.2.3