4 files changed, 7 insertions, 77 deletions
diff --git a/include/calculate_base_damage.h b/include/calculate_base_damage.h
deleted file mode 100644
index e9146c188..000000000
--- a/include/calculate_base_damage.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef GUARD_CALCULATE_BASE_DAMAGE_H
-#define GUARD_CALCULATE_BASE_DAMAGE_H
-
-s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *defender, u32 move, u16 sideStatus, u16 powerOverride, u8 typeOverride, u8 bankAtk, u8 bankDef);
-
-#endif // GUARD_CALCULATE_BASE_DAMAGE_H
diff --git a/include/pokemon.h b/include/pokemon.h
index ac2638557..0430a465b 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -675,6 +675,13 @@ void BoxMonToMon(const struct BoxPokemon *srcMon, struct Pokemon *dstMon);
 u8 GetLevelUpMovesBySpecies(u16 species, u16 *moves);
 u8 GetMonsStateToDoubles_2(void);
 
+bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 itemId, u8 partyId, u8 monMoveIndex, u8 a5);
+s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *defender, u32 move, u16 sideStatus, u16 powerOverride, u8 typeOverride, u8 bankAtk, u8 bankDef);
+const u8* GetTrainerClassNameFromId(u16 trainerId);
+const u8* GetTrainerNameFromId(u16 trainerId);
+void PlayMapChosenOrBattleBGM(u16 song);
+u8 GetTrainerEncounterMusicId(u16 trainerOpponentId);
+
 #include "sprite.h"
 
 void DoMonFrontSpriteAnimation(struct Sprite* sprite, u16 species, bool8 noCry, u8 arg3);
diff --git a/include/pokemon_3.h b/include/pokemon_3.h
deleted file mode 100644
index 82dfacf48..000000000
--- a/include/pokemon_3.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef GUARD_POKEMON_3_H
-#define GUARD_POKEMON_3_H
-
-const u8* GetTrainerClassNameFromId(u16 trainerId);
-const u8* GetTrainerNameFromId(u16 trainerId);
-void PlayMapChosenOrBattleBGM(u16 song);
-u8 GetTrainerEncounterMusicId(u16 trainerOpponentId);
-
-#endif // GUARD_POKEMON_3_H
diff --git a/include/pokemon_item_effects.h b/include/pokemon_item_effects.h
deleted file mode 100644
index 1564f7f99..000000000
--- a/include/pokemon_item_effects.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef GUARD_POKEMON_ITEM_EFFECTS
-#define GUARD_POKEMON_ITEM_EFFECTS
-
-#include "pokemon.h"
-
-// TODO once pokemon item effects is decompiled
-/*
-struct PokemonItemEffect
-{
-    //field 0
-    u8 xAtk : 4; // x1, x2, x4, x8 = xF
-    u8 field_0_x10 : 1; // x10
-    u8 critRatioUp : 1; // x20
-    u8 field_0_x40 : 1; // x40
-    u8 cureInfatuation : 1; // x80
-
-    /*field 1
-    u8 xSpeed : 4; // x1, x2, x4, x8 = xF
-    u8 xDefense : 4; // x10, x20, x40, xF0
-
-    /*field 2
-    u8 xSpAtk : 4; // x1, x2, x4, x8 = xF
-    u8 xAccuracy : 4; // x10, x20, x40, xF0
-
-    /*field 3
-    u8 cureConfusion : 1; // x1
-    u8 cureParalysis : 1; // x2
-    u8 cureFreeze : 1; // x4
-    u8 cureBurn : 1; // x8
-    u8 curePoison : 1; // x10
-    u8 cureSleep : 1; // x20
-    u8 field_3_x40 : 1; // x40
-    u8 cantLowerStats : 1; // x80
-
-    /*field 4
-    u8 hpEv : 1; // x1
-    u8 attackEv : 1; // x2
-    u8 healHp : 1; // x4
-    u8 field_4_x8 : 1; // x8
-    u8 field_4_x10 : 1; // x10
-    u8 ppUp : 1; // x20
-    u8 levelUp : 1; // x40
-    u8 evolutionStone : 1; // x80
-
-    /*field 5
-    u8 defEv:  1; // x1
-    u8 speedEv : 1; // x2
-    u8 spDefEv : 1; // x4
-    u8 spAtkEv : 1; // x8
-    u8 ppMax : 1; // x10
-    u8 field_5_x20 : 1; // x20
-    u8 field_5_x40 : 1; // x40
-    u8 field_5_x80 : 1; // x80
-
-    /*field 6
-    u8 value;
-};
-*/
-
-bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 itemId, u8 partyId, u8 monMoveIndex, u8 a5);
-
-#endif // GUARD_POKEMON_ITEM_EFFECTS