Moved gDungeonGlobalData definition to dungeon_global_data.h

14 files changed, 2 insertions, 18 deletions

diff --git a/include/dungeon_global_data.h b/include/dungeon_global_data.h
index 2e46ef0..d1d57ae 100644
--- a/include/dungeon_global_data.h
+++ b/include/dungeon_global_data.h
@@ -12,6 +12,8 @@
 #define DUNGEON_MAX_WILD_POKEMON 16
 #define DUNGEON_MAX_POKEMON MAX_TEAM_MEMBERS + DUNGEON_MAX_WILD_POKEMON
 
+extern struct DungeonGlobalData *gDungeonGlobalData;
+
 struct DungeonGlobalData
 {
     u8 unk0;
diff --git a/src/code_8040094.c b/src/code_8040094.c
index cdebf7b..11429b0 100644
--- a/src/code_8040094.c
+++ b/src/code_8040094.c
@@ -3,7 +3,6 @@
 #include "file_system.h"
 #include "dungeon_global_data.h"
 
-extern struct DungeonGlobalData *gDungeonGlobalData;
 extern s32 gUnknown_80F6568[];
 extern u8 gUnknown_202EE01;
 extern const char gUnknown_80F6604; // "zmappat"
diff --git a/src/code_8041AD0.c b/src/code_8041AD0.c
index 70b063c..0091e9a 100644
--- a/src/code_8041AD0.c
+++ b/src/code_8041AD0.c
@@ -10,8 +10,6 @@ struct unkStruct_80420E8
     u32 unk8;
 };
 
-extern struct DungeonGlobalData *gDungeonGlobalData;
-
 
 extern void sub_803ED30(u8, struct DungeonEntity *r0, u8, u8);
 extern void sub_804151C(struct DungeonEntity *r0, u32 r1, u8 r2);
diff --git a/src/code_80521D0_1.c b/src/code_80521D0_1.c
index b859485..ac9ebef 100644
--- a/src/code_80521D0_1.c
+++ b/src/code_80521D0_1.c
@@ -12,7 +12,6 @@
 extern struct DungeonEntity *xxx_call_GetLeaderEntity(void);
 extern struct DungeonEntity *sub_8085680(u32);
 extern char gUnknown_202E038[0x50];
-extern struct DungeonGlobalData *gDungeonGlobalData;
 extern u32 gUnknown_202EDC8;
 
 extern u32 gUnknown_81062A8;
diff --git a/src/code_8057824.c b/src/code_8057824.c
index 031d063..172f949 100644
--- a/src/code_8057824.c
+++ b/src/code_8057824.c
@@ -3,8 +3,6 @@
 #include "dungeon_entity.h"
 #include "constants/move.h"
 
-extern struct DungeonGlobalData *gDungeonGlobalData;
-
 extern u32 gUnknown_80FCF74;
 extern u32 gUnknown_80FCF80;
 extern u16 gUnknown_80F4F42;
diff --git a/src/code_8057824_1.c b/src/code_8057824_1.c
index 646feca..f3a7db2 100644
--- a/src/code_8057824_1.c
+++ b/src/code_8057824_1.c
@@ -6,8 +6,6 @@
 #include "item.h"
 #include "pokemon.h"
 
-extern struct DungeonGlobalData *gDungeonGlobalData;
-
 extern u32 gUnknown_202EDC8;
 extern u8 gUnknown_202E038[0x50];
 extern u8 gAvailablePokemonNames[0x58];
diff --git a/src/code_806CD90.c b/src/code_806CD90.c
index e11f253..d3267a9 100644
--- a/src/code_806CD90.c
+++ b/src/code_806CD90.c
@@ -4,8 +4,6 @@
 #include "dungeon_global_data.h"
 #include "dungeon_util.h"
 
-extern struct DungeonGlobalData *gDungeonGlobalData;
-
 extern u8 sub_806CEBC(struct DungeonEntity *);
 extern void sub_806CCB4(struct DungeonEntity *, u8);
 
diff --git a/src/code_80848F0.c b/src/code_80848F0.c
index ac98809..a5cb17a 100644
--- a/src/code_80848F0.c
+++ b/src/code_80848F0.c
@@ -1,8 +1,6 @@
 #include "global.h"
 #include "dungeon_global_data.h"
 
-extern struct DungeonGlobalData *gDungeonGlobalData;
-
 extern void SkarmoryPreFightDialogue();
 extern void SkarmoryReFightDialogue();
 extern void sub_8086E40();
diff --git a/src/code_80869E4.c b/src/code_80869E4.c
index 148a88e..bdcfd6d 100644
--- a/src/code_80869E4.c
+++ b/src/code_80869E4.c
@@ -15,7 +15,6 @@ struct unkStruct_202F3D0
 };
 
 EWRAM_DATA struct unkStruct_202F3D0 gUnknown_202F3D0;
-extern struct DungeonGlobalData *gDungeonGlobalData;
 
 s8 sub_8002984(s8, u8);
 void sub_803E708(u32, u32);
diff --git a/src/code_8086A3C.c b/src/code_8086A3C.c
index 43889de..1c15056 100644
--- a/src/code_8086A3C.c
+++ b/src/code_8086A3C.c
@@ -4,7 +4,6 @@
 #include "dungeon_global_data.h"
 #include "pokemon.h"
 
-extern struct DungeonGlobalData *gDungeonGlobalData;
 extern void LoadIQSkills(struct DungeonEntity *);
 extern struct DungeonEntity *GetPartnerEntity();
 extern struct DungeonEntity *xxx_call_GetLeaderEntity(void);
diff --git a/src/dungeon_ai_items.c b/src/dungeon_ai_items.c
index f48edbd..923384d 100644
--- a/src/dungeon_ai_items.c
+++ b/src/dungeon_ai_items.c
@@ -42,7 +42,6 @@ extern u32 gPotentialTargetWeights[NUM_DIRECTIONS];
 extern u32 gPotentialTargetDirections[NUM_DIRECTIONS];
 extern bool8 gTargetAhead[NUM_DIRECTIONS];
 extern struct TeamInventory *gTeamInventory_203B460;
-extern struct DungeonGlobalData *gDungeonGlobalData;
 
 void sub_807360C(struct DungeonEntity *pokemon)
 {
diff --git a/src/dungeon_movement.c b/src/dungeon_movement.c
index 86a2b01..275de05 100644
--- a/src/dungeon_movement.c
+++ b/src/dungeon_movement.c
@@ -20,7 +20,6 @@
 extern char gAvailablePokemonNames[];
 extern char *gPtrCouldntBeUsedMessage;
 extern char *gPtrItsaMonsterHouseMessage;
-extern struct DungeonGlobalData *gDungeonGlobalData;
 
 extern void SendImmobilizeEndMessage(struct DungeonEntity*, struct DungeonEntity*);
 extern void SetMessageArgument(char[], struct DungeonEntity*, u32);
diff --git a/src/dungeon_range.c b/src/dungeon_range.c
index d915677..86d0f7c 100644
--- a/src/dungeon_range.c
+++ b/src/dungeon_range.c
@@ -4,7 +4,6 @@
 #include "dungeon_global_data.h"
 #include "map.h"
 
-extern struct DungeonGlobalData *gDungeonGlobalData;
 extern struct MapTile* GetMapTileAtPosition(s16, s16);
 
 bool8 InSameRoom_2(struct Position *pos1, struct Position *pos2)
diff --git a/src/dungeon_util_1.c b/src/dungeon_util_1.c
index 034bab6..564cd12 100644
--- a/src/dungeon_util_1.c
+++ b/src/dungeon_util_1.c
@@ -6,7 +6,6 @@
 #include "dungeon_util.h"
 #include "random.h"
 
-extern struct DungeonGlobalData *gDungeonGlobalData;
 extern void sub_806CE68(struct DungeonEntity *, s32);
 
 extern s32 sub_803F994(void);