diff --git a/include/battle_controllers.h b/include/battle_controllers.h index cc5f4809fd..a338e8707a 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -275,10 +275,6 @@ void BtlController_HandleHealthBarUpdate(u32 battler, bool32 updateHpText); void DoStatusIconUpdate(u32 battler); void BtlController_HandleStatusIconUpdate(u32 battler); void BtlController_HandleStatusAnimation(u32 battler); -void BtlController_HandleClearUnkVar(u32 battler); -void BtlController_HandleSetUnkVar(u32 battler); -void BtlController_HandleClearUnkFlag(u32 battler); -void BtlController_HandleToggleUnkFlag(u32 battler); void BtlController_HandleHitAnimation(u32 battler); void BtlController_HandlePlaySE(u32 battler); void BtlController_HandlePlayFanfareOrBGM(u32 battler); diff --git a/include/battle_dynamax.h b/include/battle_dynamax.h index 0762601c89..ed295bb1e6 100644 --- a/include/battle_dynamax.h +++ b/include/battle_dynamax.h @@ -20,8 +20,6 @@ void ChooseDamageNonTypesString(u8 type); void BS_UpdateDynamax(void); void BS_SetSteelsurge(void); -void BS_TrySetStatus1(void); -void BS_TrySetStatus2(void); void BS_HealOneSixth(void); void BS_TryRecycleBerry(void); void BS_JumpIfDynamaxed(void); diff --git a/include/battle_gimmick.h b/include/battle_gimmick.h index d0e975462a..42b8c7255a 100644 --- a/include/battle_gimmick.h +++ b/include/battle_gimmick.h @@ -39,7 +39,6 @@ void HideGimmickTriggerSprite(void); void DestroyGimmickTriggerSprite(void); void LoadIndicatorSpritesGfx(void); -u32 GetIndicatorTileTag(u32 battler); u32 GetIndicatorPalTag(u32 battler); void UpdateIndicatorVisibilityAndType(u32 healthboxId, bool32 invisible); void UpdateIndicatorOamPriority(u32 healthboxId, u32 oamPriority); diff --git a/include/berry.h b/include/berry.h index ba1bbb1d12..311207989c 100644 --- a/include/berry.h +++ b/include/berry.h @@ -16,7 +16,6 @@ u8 GetBerryTypeByBerryTreeId(u8 id); u8 GetStageByBerryTreeId(u8); u8 ItemIdToBerryType(u16 item); void GetBerryNameByBerryType(u8 berry, u8 *string); -void ResetBerryTreeSparkleFlag(u8 id); void Bag_ChooseBerry(void); void Bag_ChooseMulch(void); void ObjectEventInteractionGetBerryTreeData(void); diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h index 9a55f9e7bf..11c0f1c17d 100644 --- a/include/field_control_avatar.h +++ b/include/field_control_avatar.h @@ -25,7 +25,6 @@ struct FieldInput void FieldClearPlayerInput(struct FieldInput *pStruct); void FieldGetPlayerInput(struct FieldInput *pStruct, u16 keys, u16 heldKeys); int ProcessPlayerFieldInput(struct FieldInput *pStruct); -void overworld_poison_timer_set(void); void RestartWildEncounterImmunitySteps(void); const u8 *GetObjectEventScriptPointerPlayerFacing(void); bool8 TryDoDiveWarp(struct MapPosition *position, u16 b); diff --git a/include/field_effect.h b/include/field_effect.h index 3db86bc219..1e28be75f1 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -49,6 +49,5 @@ void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId); u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority); void StartEscapeRopeFieldEffect(void); void FieldEffectFreeGraphicsResources(struct Sprite *sprite); -void FieldEff_CaveDust(void); #endif // GUARD_FIELD_EFFECTS_H diff --git a/include/palette.h b/include/palette.h index 68b57dc54a..d58bfeb60c 100644 --- a/include/palette.h +++ b/include/palette.h @@ -95,7 +95,6 @@ u32 UpdatePaletteFade(void); void ResetPaletteFade(void); bool32 BeginNormalPaletteFade(u32 selectedPalettes, s8 delay, u8 startY, u8 targetY, u32 blendColor); bool32 BeginTimeOfDayPaletteFade(u32 selectedPalettes, s8 delay, u8 startY, u8 targetY, struct BlendSettings *bld0, struct BlendSettings *bld1, u32 weight, u32 color); -void PaletteStruct_ResetById(u32 id); void ResetPaletteFadeControl(void); void InvertPlttBuffer(u32 selectedPalettes); void TintPlttBuffer(u32 selectedPalettes, s8 r, s8 g, s8 b); @@ -117,12 +116,12 @@ void TintPalette_CustomTone(u16 *palette, u32 count, u16 rTone, u16 gTone, u16 b static inline void SetBackdropFromColor(u32 color) { - FillPalette(color, 0, PLTT_SIZEOF(1)); + FillPalette(color, 0, PLTT_SIZEOF(1)); } static inline void SetBackdropFromPalette(const u16 *palette) { - LoadPalette(palette, 0, PLTT_SIZEOF(1)); + LoadPalette(palette, 0, PLTT_SIZEOF(1)); } #endif // GUARD_PALETTE_H diff --git a/include/sprite.h b/include/sprite.h index 71e344e9a5..ccf0424c0a 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -300,16 +300,10 @@ u16 LoadSpriteSheet(const struct SpriteSheet *sheet); u16 LoadSpriteSheetByTemplate(const struct SpriteTemplate *template, u32 frame, s32 offset); void LoadSpriteSheets(const struct SpriteSheet *sheets); s16 AllocSpriteTiles(u16 tileCount); -u16 AllocTilesForSpriteSheet(struct SpriteSheet *sheet); -void AllocTilesForSpriteSheets(struct SpriteSheet *sheets); -void LoadTilesForSpriteSheet(const struct SpriteSheet *sheet); -void LoadTilesForSpriteSheets(struct SpriteSheet *sheets); void FreeSpriteTilesByTag(u16 tag); void FreeSpriteTileRanges(void); u16 GetSpriteTileStartByTag(u16 tag); u16 GetSpriteTileTagByTileStart(u16 start); -void RequestSpriteSheetCopy(const struct SpriteSheet *sheet); -u16 LoadSpriteSheetDeferred(const struct SpriteSheet *sheet); void FreeAllSpritePalettes(void); u32 LoadSpritePalette(const struct SpritePalette *palette); u32 LoadSpritePaletteWithTag(const u16 *pal, u16 tag);