diff --git a/include/pokemon.h b/include/pokemon.h
index 3cf1b8d91..9f617557e 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -40,6 +40,7 @@ void InitializeRecruitedPokemon(void);
 u8 GetBodySize(s32 index);
 void CopyMonsterNameToBuffer(u8 * buffer, s32 index);
 void CopyYellowMonsterNametoBuffer(u8 *buffer, s16 index);
+void CopyCyanMonsterNametoBuffer(u8 *buffer, s32 index_);
 void PrintColoredPokeNameToBuffer(u8 *buffer, PokemonStruct1 *pokemon, s32 colorNum);
 void sub_808D930(u8 *buffer, s32 index);
 void sub_808D9DC(u8 *buffer, PokemonStruct2 *, s32 colorNum);
diff --git a/include/pokemon_mid.h b/include/pokemon_mid.h
deleted file mode 100644
index 46e2dee28..000000000
--- a/include/pokemon_mid.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef GUARD_POKEMON_MID_H
-#define GUARD_POKEMON_MID_H
-
-#include "pokemon.h"
-
-// NOTE: this is kept separate since TransferOrbAction needs index to be s32
-// and I haven't had the time to fix matching
-void CopyCyanMonsterNametoBuffer(u8 *buffer, s16 index);
-
-#endif // GUARD_POKEMON_MID_H
diff --git a/src/code_806FDF4.c b/src/code_806FDF4.c
index 4ef8de5b9..e995c5d4f 100644
--- a/src/code_806FDF4.c
+++ b/src/code_806FDF4.c
@@ -18,7 +18,6 @@
 #include "friend_area.h"
 #include "pokemon.h"
 #include "pokemon_3.h"
-#include "pokemon_mid.h"
 #include "position_util.h"
 #include "text_util.h"
 #include "dungeon_util_1.h"
diff --git a/src/code_80718D8.c b/src/code_80718D8.c
index 4e0b9ccce..25fd1ca69 100644
--- a/src/code_80718D8.c
+++ b/src/code_80718D8.c
@@ -21,7 +21,6 @@
 #include "code_803E668.h"
 #include "code_806CD90.h"
 #include "moves.h"
-#include "pokemon_mid.h"
 #include "structs/dungeon_entity.h"
 #include "structs/map.h"
 #include "structs/str_pokemon.h"
diff --git a/src/code_8077274_1.c b/src/code_8077274_1.c
index c30b073b9..89406b5ba 100644
--- a/src/code_8077274_1.c
+++ b/src/code_8077274_1.c
@@ -19,7 +19,6 @@
 #include "math.h"
 #include "pokemon.h"
 #include "pokemon_3.h"
-#include "pokemon_mid.h"
 #include "structs/dungeon_entity.h"
 #include "structs/str_dungeon.h"
 #include "dungeon_map_access.h"
diff --git a/src/code_809A560.c b/src/code_809A560.c
index fade4f978..14b906db9 100644
--- a/src/code_809A560.c
+++ b/src/code_809A560.c
@@ -25,7 +25,6 @@
 #include "memory.h"
 #include "personality_test1.h"
 #include "pokemon.h"
-#include "pokemon_mid.h"
 #include "string_format.h"
 #include "text_1.h"
 #include "text_2.h"
diff --git a/src/dungeon.c b/src/dungeon.c
index 0ce2209b7..6879dafc7 100644
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -8,7 +8,6 @@
 #include "items.h"
 #include "moves.h"
 #include "pokemon.h"
-#include "pokemon_mid.h"
 #include "random.h"
 #include "string_format.h"
 #include "strings.h"
diff --git a/src/dungeon_jobs.c b/src/dungeon_jobs.c
index c21326b4f..0912e9669 100644
--- a/src/dungeon_jobs.c
+++ b/src/dungeon_jobs.c
@@ -10,7 +10,6 @@
 #include "string_format.h"
 #include "code_80958E8.h"
 #include "mailbox.h"
-#include "pokemon_mid.h"
 #include "structs/str_dungeon.h"
 #include "constants/dungeon.h"
 
diff --git a/src/dungeon_logic.c b/src/dungeon_logic.c
index 25cf204b6..89c8d8873 100644
--- a/src/dungeon_logic.c
+++ b/src/dungeon_logic.c
@@ -22,7 +22,6 @@
 #include "dungeon_move_util.h"
 #include "code_800D090.h"
 #include "dungeon_message.h"
-#include "pokemon_mid.h"
 #include "dungeon_strings.h"
 #include "constants/move_id.h"
 #include "moves.h"
diff --git a/src/move_orb_actions_4.c b/src/move_orb_actions_4.c
index 96a8e6a53..120a8deca 100644
--- a/src/move_orb_actions_4.c
+++ b/src/move_orb_actions_4.c
@@ -54,9 +54,6 @@ extern void DealDamageToEntity(Entity *, s32, u32, u32);
 extern u32 gUnknown_8106A50;
 extern u32 gUnknown_8106A4C;
 
-// TODO The parameters don't match the function definition in pokemon_mid.h (u8*, s16).
-extern void CopyCyanMonsterNametoBuffer(u8 *buffer, s32 index);
-
 bool8 ProtectMoveAction(Entity * pokemon,Entity * target,Move *move, s32 param_4)
 {
     ProtectStatusTarget(pokemon, target);
diff --git a/src/move_orb_effects_2.c b/src/move_orb_effects_2.c
index 07c114419..23ac4b0ff 100644
--- a/src/move_orb_effects_2.c
+++ b/src/move_orb_effects_2.c
@@ -24,7 +24,6 @@
 #include "dungeon_strings.h"
 #include "dungeon_random.h"
 #include "dungeon_misc.h"
-#include "pokemon_mid.h"
 
 extern u32 gUnknown_8106A4C;
 
diff --git a/src/move_orb_effects_3.c b/src/move_orb_effects_3.c
index da749b519..f9d02790f 100644
--- a/src/move_orb_effects_3.c
+++ b/src/move_orb_effects_3.c
@@ -20,7 +20,6 @@
 #include "math.h"
 #include "pokemon.h"
 #include "pokemon_3.h"
-#include "pokemon_mid.h"
 #include "structs/dungeon_entity.h"
 #include "structs/str_dungeon.h"
 #include "dungeon_map_access.h"
diff --git a/src/move_orb_effects_4.c b/src/move_orb_effects_4.c
index a76ae9e3f..9286f41d1 100644
--- a/src/move_orb_effects_4.c
+++ b/src/move_orb_effects_4.c
@@ -20,7 +20,6 @@
 #include "math.h"
 #include "pokemon.h"
 #include "pokemon_3.h"
-#include "pokemon_mid.h"
 #include "structs/dungeon_entity.h"
 #include "structs/str_dungeon.h"
 #include "dungeon_map_access.h"
diff --git a/src/move_orb_effects_5.c b/src/move_orb_effects_5.c
index 9ff148a16..8779f9aab 100644
--- a/src/move_orb_effects_5.c
+++ b/src/move_orb_effects_5.c
@@ -19,7 +19,6 @@
 #include "math.h"
 #include "pokemon.h"
 #include "pokemon_3.h"
-#include "pokemon_mid.h"
 #include "structs/dungeon_entity.h"
 #include "structs/str_dungeon.h"
 #include "dungeon_map_access.h"
diff --git a/src/pokemon.c b/src/pokemon.c
index c3fddc7f5..a06d9a422 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -656,10 +656,10 @@ void CopyYellowMonsterNametoBuffer(u8 *buffer, s16 index)
     sprintfStatic(buffer, gUnknown_8107600, gMonsterParameters[new_index].species); // {color YELLOW}%s{reset}
 }
 
-void CopyCyanMonsterNametoBuffer(u8 *buffer, s16 index)
+void CopyCyanMonsterNametoBuffer(u8 *buffer, s32 index_)
 {
-    s32 new_index = index;
-    sprintfStatic(buffer, gUnknown_8107608, gMonsterParameters[new_index].species); // {color CYAN}%s{reset}
+    s32 index = (s16) index_;
+    sprintfStatic(buffer, gUnknown_8107608, gMonsterParameters[index].species); // {color CYAN}%s{reset}
 }
 
 void sub_808D930(u8 *buffer, s32 index)
@@ -1132,7 +1132,7 @@ bool8 CanMonLearnMove(u16 moveID, s16 _species)
 {
   u16 levelUpMoveID;
   u16 HMTMMoveID;
-  s32 species = _species;  // r4
+  s32 species = _species;
   const u8* learnsetPtr;
 
   if (species == MONSTER_DECOY) return 0;