11 files changed, 24 insertions, 31 deletions
diff --git a/include/battle_ai.h b/include/battle_ai.h
index 028da2c27..2922da0b3 100644
--- a/include/battle_ai.h
+++ b/include/battle_ai.h
@@ -23,6 +23,7 @@ enum
 
 // battle_ai
 void BattleAI_SetupAIData(void);
+u8 BattleAI_GetAIActionToUse(void);
 void BattleAI_DoAIProcessing(void);
 void sub_810745C(void);
 void AIStackPushVar(u8 *);
diff --git a/include/contest_painting.h b/include/contest_painting.h
index ad1cecfed..48ab95fbc 100644
--- a/include/contest_painting.h
+++ b/include/contest_painting.h
@@ -49,11 +49,6 @@ struct ContestEntry
     /*0x16*/ u8 trainer_name[OT_NAME_LENGTH];
 };
 
-struct Unk3000756
-{
-    /*0x00*/ u8 var_0;
-};
-
 struct LabelPair
 {
     const u8 *prefix;
diff --git a/include/event_data.h b/include/event_data.h
index 5cac27cc8..98e4a6da3 100644
--- a/include/event_data.h
+++ b/include/event_data.h
@@ -25,4 +25,20 @@ u8 FlagSet(u16 id);
 u8 FlagReset(u16 id);
 bool8 FlagGet(u16 id);
 
+extern u16 gSpecialVar_0x8000;
+extern u16 gSpecialVar_0x8001;
+extern u16 gSpecialVar_0x8002;
+extern u16 gSpecialVar_0x8003;
+extern u16 gSpecialVar_0x8004;
+extern u16 gSpecialVar_0x8005;
+extern u16 gSpecialVar_0x8006;
+extern u16 gSpecialVar_0x8007;
+extern u16 gSpecialVar_0x8008;
+extern u16 gSpecialVar_0x8009;
+extern u16 gSpecialVar_0x800A;
+extern u16 gSpecialVar_0x800B;
+extern u16 gScriptResult;
+extern u16 gScriptLastTalked;
+extern u16 gScriptFacing;
+
 #endif // GUARD_EVENT_DATA_H
diff --git a/include/field_effect.h b/include/field_effect.h
index 5edca21dc..bf80ca0dc 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -245,4 +245,6 @@ void MultiplyInvertedPaletteRGBComponents(u16, u8, u8, u8);
 void sub_80878A8(void);
 void sub_8087BA8(void);
 
+extern u32 gUnknown_0202FF84[8];
+
 #endif // GUARD_FIELD_EFFECT_H
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index 6595a51ca..d2a1a9b1f 100644
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -70,8 +70,6 @@ extern struct CameraSomething gUnknown_03004880;
 extern u16 gUnknown_03004898;
 extern u16 gUnknown_0300489C;
 
-extern u32 gUnknown_0202FF84[];
-
 extern const struct Coords16 gDirectionToVector[];
 
 void FieldObjectCB_BerryTree(struct Sprite *);
diff --git a/include/field_specials.h b/include/field_specials.h
index 710f0a2a0..d61aa3b20 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -8,11 +8,6 @@ struct ElevatorMenu {
     u8 var3;
 };
 
-extern struct ElevatorMenu gUnknown_03000760[20];
-extern struct WarpData gUnknown_020297F0;
-extern u8 gBattleOutcome;
-
-extern u16 gScriptResult;
 extern u8 gUnknown_02039250;
 extern u8 gUnknown_02039251;
 extern u32 gUnknown_02039254;
@@ -22,9 +17,6 @@ extern u8 gUnknown_0203925A;
 extern u8 gUnknown_0203925B;
 extern u8 gUnknown_0203925C;
 
-extern u16 gSpecialVar_0x8004;
-extern u16 gSpecialVar_0x8005;
-
 void ResetCyclingRoadChallengeData(void);
 bool32 CountSSTidalStep(u16);
 u8 GetSSTidalLocation(s8 *, s8 *, s16 *, s16 *);
diff --git a/include/graphics.h b/include/graphics.h
index fa6a85513..5632cb831 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -2435,6 +2435,10 @@ extern const u8 gMonFrontPic_UnownQuestionMark[];
 extern const u8 gMonBackPic_UnownQuestionMark[];
 extern const u8 gMonIcon_UnownQuestionMark[];
 
+extern const u8 gMonIcon_QuestionMark[];
+extern const u8 gMonIcon_Egg[];
+extern const u16 gMonIconPalettes[][16];
+
 // data/graphics.s
 extern const u8 gBagMaleTiles[];
 extern const u8 gBagFemaleTiles[];
diff --git a/include/libgncmultiboot.h b/include/libgncmultiboot.h
index 33c9f6bfa..23ac64d17 100644
--- a/include/libgncmultiboot.h
+++ b/include/libgncmultiboot.h
@@ -5,6 +5,7 @@ struct GcmbStruct
 {
     u16 gcmb_field_0;
     u8 gcmb_field_2;
+    u8 filler3[0x2C - 0x3];
 };
 
 void GameCubeMultiBoot_Main(struct GcmbStruct *pStruct);
diff --git a/include/pokeblock.h b/include/pokeblock.h
index 0d8e965e4..f78ed40c3 100644
--- a/include/pokeblock.h
+++ b/include/pokeblock.h
@@ -1,11 +1,6 @@
 #ifndef GUARD_POKEBLOCK_H
 #define GUARD_POKEBLOCK_H
 
-struct YesNoCBTable {
-    void (*yesFunc)(void);
-    void (*noFunc)(void);
-};
-
 enum {
     PBLOCK_CLR_BLACK,
     PBLOCK_CLR_RED,
@@ -15,12 +10,6 @@ enum {
     PBLOCK_CLR_YELLOW
 };
 
-extern u8 ewram[];
-extern u8 gUnknown_02039244;
-extern u8 gUnknown_02039248[4];
-extern u8 gUnknown_0203924C;
-extern const u8 *gUnknown_03000758;
-
 void sub_810B96C(void);
 u8 sub_810BA50(s16, s16, u8);
 u8 sub_810C9B0(struct Pokeblock *);
diff --git a/include/script.h b/include/script.h
index e35ec7608..b3d888edf 100644
--- a/include/script.h
+++ b/include/script.h
@@ -55,7 +55,5 @@ u32 CalculateRamScriptChecksum(void);
 void ClearRamScript(void);
 bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId);
 u8 *GetRamScript(u8 objectId, u8 *script);
-u16 gScriptResult;
-extern u16 gScriptLastTalked;
 
 #endif // GUARD_SCRIPT_H
diff --git a/include/use_pokeblock.h b/include/use_pokeblock.h
index 978476d89..f34857cf1 100644
--- a/include/use_pokeblock.h
+++ b/include/use_pokeblock.h
@@ -5,9 +5,6 @@
 #ifndef POKERUBY_USE_POKEBLOCK_H
 #define POKERUBY_USE_POKEBLOCK_H
 
-extern void *gUnknown_02030400;
-extern s16 gUnknown_02039312;
-
 void sub_8136130(struct Pokeblock *, MainCallback);
 
 #endif //POKERUBY_USE_POKEBLOCK_H