fixed lots of stuff

8 files changed, 38 insertions, 7 deletions

diff --git a/include/fame_checker.h b/include/fame_checker.h
index af705e34f..257431d8b 100644
--- a/include/fame_checker.h
+++ b/include/fame_checker.h
@@ -41,7 +41,7 @@ extern u8 gIconDescriptionBoxIsOpen;
 
 void ResetFameChecker(void);
 void FullyUnlockFameChecker(void);
-void UseFameChecker(void (*)());
+void UseFameChecker(MainCallback savedCallback);
 void SetFlavorTextFlagFromSpecialVars(void);
 void UpdatePickStateFromSpecialVar8005(void);
 
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index d67fc476c..27a7f23d7 100644
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -46,7 +46,7 @@ void FieldObjectClearAnim(struct MapObject *);
 void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *);
 void SpawnFieldObjectsInView(s16, s16);
 u8 sprite_new(u8, u8, s16, s16, u8, u8);
-u8 AddPseudoEventObject(u16, void (*)(struct Sprite *), s16, s16, u8);
+u8 AddPseudoEventObject(u16, SpriteCallback, s16, s16, u8);
 u8 show_sprite(u8, u8, u8);
 u8 SpawnSpecialFieldObjectParameterized(u8, u8, u8, s16, s16, u8);
 u8 SpawnSpecialFieldObject(struct MapObjectTemplate *);
@@ -92,5 +92,7 @@ void npc_paltag_set_load(u8 mode);
 // Exported data declarations
 
 extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
+extern const struct SpritePalette gUnknown_83A5348;
+extern const struct SpriteTemplate * const gUnknown_83A0010[];
 
 #endif //GUARD_FIELD_MAP_OBJ_H
diff --git a/include/fieldmap.h b/include/fieldmap.h
index 537626edc..9903962a1 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -12,6 +12,7 @@
 #define VIRTUAL_MAP_SIZE 0x2800
 
 extern struct BackupMapData VMap;
+extern const struct MapData Route1_Layout;
 
 u32 MapGridGetMetatileIdAt(int, int);
 u32 MapGridGetMetatileBehaviorAt(int, int);
diff --git a/include/graphics.h b/include/graphics.h
index 04d05da2b..f48f7f8ca 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -160,6 +160,7 @@ extern const u32 gTMCase_TMSpriteGfx[];
 extern const u32 gUnknown_8E84F20[];
 extern const u32 gUnknown_8E85068[];
 extern const u8 gUnknown_8E99118[];
+extern const u16 gTMCaseMainWindowPalette[];
 
 // egg_hatch
 extern const u32 gBattleTextboxTiles[];
@@ -168,4 +169,10 @@ extern const u32 gBattleTextboxPalette[];
 extern const u32 gTradeGba2_Pal[];
 extern const u32 gTradeGba_Gfx[];
 
+// teachy_tv
+extern const u8 gUnknown_8E86240[];
+extern const u8 gUnknown_8E86BE8[];
+extern const u8 gUnknown_8E86D6C[];
+extern const u8 gUnknown_8E86F98[];
+
 #endif //GUARD_GRAPHICS_H
diff --git a/include/list_menu.h b/include/list_menu.h
index fe42651b6..79dc3ec3f 100644
--- a/include/list_menu.h
+++ b/include/list_menu.h
@@ -9,8 +9,8 @@
 
 struct ListMenuItem
 {
-    const u8 *unk_00;
-    s32 unk_04;
+    const u8 *label;
+    s32 index;
 };
 
 struct ListMenu;
diff --git a/include/main.h b/include/main.h
index 6e9d2a25d..a250475cb 100644
--- a/include/main.h
+++ b/include/main.h
@@ -3,8 +3,6 @@
 
 #include "global.h"
 
-#include "global.h"
-
 typedef void (*MainCallback)(void);
 typedef void (*IntrCallback)(void);
 typedef void (*IntrFunc)(void);
diff --git a/include/sprite.h b/include/sprite.h
index bc47f7100..fb0f710e8 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -232,6 +232,8 @@ struct OamMatrix
     s16 d;
 };
 
+typedef void (*SpriteCallback)(struct Sprite *);
+
 extern const struct OamData gDummyOamData;
 extern const union AnimCmd *const gDummySpriteAnimTable[];
 extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[];
diff --git a/include/strings.h b/include/strings.h
index 6af1b0d69..51aeb376a 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -113,6 +113,27 @@ extern const u8 gText_ICanPayThisMuch_WouldThatBeOkay[];
 extern const u8 gText_TurnedOverItemsWorthYen[];
 extern const u8 gPokeDudeText_TMTypes[];
 extern const u8 gPokeDudeText_ReadTMDescription[];
-extern const u16 gTMCaseMainWindowPalette[];
+
+// teachy_tv
+extern const u8 gUnknown_841B7A4[];
+extern const u8 gUnknown_841B7BC[];
+extern const u8 gUnknown_841B7D6[];
+extern const u8 gUnknown_841B7EE[];
+extern const u8 gUnknown_841B807[];
+extern const u8 gUnknown_841B81B[];
+extern const u8 gUnknown_841B836[];
+extern const u8 gUnknown_841B83D[];
+extern const u8 gUnknown_841B8BF[];
+extern const u8 gUnknown_841BB40[];
+extern const u8 gUnknown_841BE76[];
+extern const u8 gUnknown_841C23B[];
+extern const u8 gUnknown_841C459[];
+extern const u8 gUnknown_841C82A[];
+extern const u8 gUnknown_841BA41[];
+extern const u8 gUnknown_841BD10[];
+extern const u8 gUnknown_841C0AF[];
+extern const u8 gUnknown_841C384[];
+extern const u8 gUnknown_841C7B4[];
+extern const u8 gUnknown_841C994[];
 
 #endif //GUARD_STRINGS_H