Merge branch 'master' into pokeball-doc

1 files changed, 11 insertions, 11 deletions

diff --git a/include/fldeff_misc.h b/include/fldeff_misc.h
index 6fd15c1ea..4acca7944 100644
--- a/include/fldeff_misc.h
+++ b/include/fldeff_misc.h
@@ -1,10 +1,10 @@
 #ifndef GUARD_FLDEFF_MISC_H
 #define GUARD_FLDEFF_MISC_H
 
-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);
+void ComputerScreenOpenEffect(u16 a0, u16 a1, u8 a2);
+void ComputerScreenCloseEffect(u16 a0, u16 a1, u8 a2);
+bool8 IsComputerScreenOpenEffectActive(void);
+bool8 IsComputerScreenCloseEffectActive(void);
 bool8 SetUpFieldMove_SecretPower(void);
 bool8 FldEff_UseSecretPowerCave(void);
 bool8 FldEff_SecretPowerCave(void);
@@ -15,22 +15,22 @@ 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);
+bool8 FldEff_Nop47(void);
+bool8 FldEff_Nop48(void);
 void ShatterSecretBaseBreakableDoor(s16 x, s16 y);
 void PlaySecretBaseMusicNoteMatSound(s16 metatileId);
 void DoSecretBaseGlitterMatSparkle(void);
 bool8 FldEff_SandPillar(void);
 void InteractWithShieldOrTVDecoration(void);
-bool8 sub_80FADE4(u16 arg0, u8 arg1);
+bool8 IsLargeBreakableDecoration(u16 arg0, u8 arg1);
 void FldEffPoison_Start(void);
 bool32 FldEffPoison_IsActive(void);
 void DoWateringBerryTreeAnim(void);
-u8 CreateRecordMixingSprite(void);
-void DestroyRecordMixingSprite(void);
+u8 CreateRecordMixingLights(void);
+void DestroyRecordMixingLights(void);
 
-extern const struct SpritePalette gFieldEffectObjectPaletteInfo7;
-extern const struct SpritePalette gFieldEffectObjectPaletteInfo8;
+extern const struct SpritePalette gSpritePalette_SecretPower_Cave;
+extern const struct SpritePalette gSpritePalette_SecretPower_Plant;
 extern const struct SpritePalette gFieldEffectObjectPaletteInfo9;
 extern const u16 gTilesetPalettes_SecretBase[][16];