Remove excess declarations of gScriptItemId

11 files changed, 9 insertions, 23 deletions

diff --git a/include/item_use.h b/include/item_use.h
index b35389ee8..61a3b4f7a 100644
--- a/include/item_use.h
+++ b/include/item_use.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_ITEM_USE_H
 #define GUARD_ITEM_USE_H
 
+extern u16 gScriptItemId;
+
 void ItemUseOnFieldCB_Bike(u8);
 void ItemUseOnFieldCB_Rod(u8);
 void ItemUseOnFieldCB_Itemfinder(u8);
diff --git a/include/script.h b/include/script.h
index 96874e3b4..4070a838f 100644
--- a/include/script.h
+++ b/include/script.h
@@ -56,6 +56,5 @@ void ClearRamScript(void);
 bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId);
 u8 *GetRamScript(u8 objectId, u8 *script);
 u16 gScriptResult;
-u16 gScriptItemId;
 
 #endif // GUARD_SCRIPT_H
diff --git a/include/strings.h b/include/strings.h
index a1fcc30cb..89a78e478 100755
--- a/include/strings.h
+++ b/include/strings.h
@@ -902,19 +902,4 @@ extern const u8 gSystemText_NoSaveFileNoTime[];
 extern const u8 gSystemText_ClockAdjustmentUsable[];
 extern const u8 gSystemText_Saving[];
 
-extern const u8 ContestStatsText_RedPokeBlock[];
-extern const u8 ContestStatsText_BluePokeBlock[];
-extern const u8 ContestStatsText_PinkPokeBlock[];
-extern const u8 ContestStatsText_GreenPokeBlock[];
-extern const u8 ContestStatsText_YellowPokeBlock[];
-extern const u8 ContestStatsText_PurplePokeBlock[];
-extern const u8 ContestStatsText_IndigoPokeBlock[];
-extern const u8 ContestStatsText_BrownPokeBlock[];
-extern const u8 ContestStatsText_LiteBluePokeBlock[];
-extern const u8 ContestStatsText_OlivePokeBlock[];
-extern const u8 ContestStatsText_GrayPokeBlock[];
-extern const u8 ContestStatsText_BlackPokeBlock[];
-extern const u8 ContestStatsText_WhitePokeBlock[];
-extern const u8 ContestStatsText_GoldPokeBlock[];
-
 #endif
diff --git a/src/battle_anim_8137220.c b/src/battle_anim_8137220.c
index 42d6cb8da..bb181d5fb 100644
--- a/src/battle_anim_8137220.c
+++ b/src/battle_anim_8137220.c
@@ -12,6 +12,7 @@
 #include "songs.h"
 #include "sound.h"
 #include "sprite.h"
+#include "item_use.h"
 #include "string_util.h"
 #include "task.h"
 #include "text.h"
@@ -33,7 +34,6 @@ extern u8 gBattleBufferA[][0x200];
 extern u8 gObjectBankIDs[];
 extern MainCallback gPreBattleCallback1;
 extern bool8 gDoingBattleAnim;
-extern u16 gScriptItemId;
 extern u16 gBattlePartyID[];
 extern u8 gHealthboxIDs[];
 extern u16 gBattleTypeFlags;
diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c
index cf572642e..73b847713 100644
--- a/src/battle_party_menu.c
+++ b/src/battle_party_menu.c
@@ -2,6 +2,7 @@
 #include "battle_party_menu.h"
 #include "battle.h"
 #include "item_menu.h"
+#include "item_use.h"
 #include "main.h"
 #include "menu.h"
 #include "menu_helpers.h"
@@ -55,7 +56,6 @@ extern void nullsub_14();
 extern void OpenPartyMenu();
 extern u8 sub_803FBBC(void);
 
-extern u16 gScriptItemId;
 extern u8 gPlayerPartyCount;
 extern u8 gNoOfAllBanks;
 extern u16 gBattlePartyID[];
diff --git a/src/berry.c b/src/berry.c
index d6fbb955e..fa15672e7 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -5,6 +5,7 @@
 #include "fieldmap.h"
 #include "item.h"
 #include "item_menu.h"
+#include "item_use.h"
 #include "items.h"
 #include "main.h"
 #include "rng.h"
@@ -974,7 +975,6 @@ const struct Berry gBerries[] =
 const struct BerryTree gBlankBerryTree = {0};
 
 extern u8 BerryTreeScript;
-extern u16 gScriptItemId;
 extern u16 gScriptLastTalked;
 extern u16 gSpecialVar_0x8004;
 extern u16 gSpecialVar_0x8005;
diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c
index 116ca2cca..0e81e4fec 100644
--- a/src/berry_tag_screen.c
+++ b/src/berry_tag_screen.c
@@ -5,6 +5,7 @@
 #include "field_map_obj.h"
 #include "item_menu.h"
 #include "items.h"
+#include "item_use.h"
 #include "main.h"
 #include "menu.h"
 #include "menu_helpers.h"
@@ -35,7 +36,6 @@ struct BerryTagStatus
 extern struct Struct2000000 unk_2000000;
 extern u8 gUnknown_0203932C;
 extern struct BerryTagStatus gUnknown_0203932E;
-extern u16 gScriptItemId;
 extern u16 gUnknown_030041B4;
 
 extern const struct CompressedSpriteSheet gUnknown_083C1F74;
diff --git a/src/item_use.c b/src/item_use.c
index a92161e9a..b906f91ad 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -50,7 +50,6 @@ extern u8 gUnknown_081A168F[];
 
 extern u16 gBattlePartyID[];
 
-extern u16 gScriptItemId;
 extern u16 gBattleTypeFlags;
 
 static const u8 gSSTidalBetaString[] = _("この　チケットで　ふねに　のりほうだい\nはやく　のってみたいな");
diff --git a/src/link.c b/src/link.c
index 363a8b494..5858ad8bf 100644
--- a/src/link.c
+++ b/src/link.c
@@ -4,6 +4,7 @@
 #include "berry.h"
 #include "berry_blender.h"
 #include "hall_of_fame.h"
+#include "item_use.h"
 #include "main.h"
 #include "menu.h"
 #include "palette.h"
@@ -38,7 +39,6 @@ struct LinkTestBGInfo
 extern u8 unk_2000000[];
 extern u8 unk_2004000[];
 extern u16 gBattleTypeFlags;
-extern u16 gScriptItemId;
 
 extern u16 word_3004858;
 
diff --git a/src/party_menu.c b/src/party_menu.c
index 99bbb5f83..1fcd2cdda 100644
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -6,6 +6,7 @@
 #include "data2.h"
 #include "event_data.h"
 #include "item.h"
+#include "item_use.h"
 #include "mail_data.h"
 #include "main.h"
 #include "menu.h"
@@ -78,7 +79,6 @@ extern u16 gUnknown_0202E8F8;
 extern u8 gUnknown_0202E8FA;
 extern u8 gLastFieldPokeMenuOpened;
 extern u8 gPlayerPartyCount;
-extern u16 gScriptItemId;
 extern s32 gBattleMoveDamage;
 
 //extern const u16 gUnknown_083769A8[][6];
diff --git a/src/pokeblock.c b/src/pokeblock.c
index a7c6daa8b..dec549bfa 100755
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -19,6 +19,7 @@
 #include "menu_helpers.h"
 #include "battle.h"
 #include "item_menu.h"
+#include "item_use.h"
 #include "item.h"
 #include "items.h"
 #include "sound.h"