From 55406f92fd5cc6e97866dfb9982f15d41e8b83be Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Sat, 1 Jun 2019 16:07:06 +0800
Subject: teachy_tv and minor update to match DizzyEgg's struct def

---
 include/fame_checker.h | 2 +-
 include/list_menu.h    | 6 +++---
 include/menu_helpers.h | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'include')

diff --git a/include/fame_checker.h b/include/fame_checker.h
index 257431d8b..af705e34f 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(MainCallback savedCallback);
+void UseFameChecker(void (*)());
 void SetFlavorTextFlagFromSpecialVars(void);
 void UpdatePickStateFromSpecialVar8005(void);
 
diff --git a/include/list_menu.h b/include/list_menu.h
index 8ff65da0b..1c632e89c 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 *name;
+    s32 id;
 };
 
 struct ListMenu;
@@ -43,7 +43,7 @@ struct ListMenu {
     u16 selectedRow;
     u8 unk_1C;
     u8 unk_1D;
-    u8 unk_1E;
+    u8 taskId;
     u8 unk_1F;
 };
 
diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index e27fb4e5d..892636ba0 100644
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -20,8 +20,8 @@ void sub_8121F68(u8 taskId, const struct YesNoFuncTable *data);
 bool8 sub_81221AC(void);
 bool8 sub_80BF72C(void);
 bool8 sub_80BF708(void);
-void sub_80BF768(void);
-void sub_80BF7C8(void);
+void VblankHblankHandlerSetZero(void);
+void InitBgReg(void);
 u8 sub_80BF8E4(void);
 u8 sub_80BF848(s16 * a0, u16 a1);
 void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 arg2, u8 arg3, u8 fontId, u8 textSpeed, const u8 *string, void *taskFunc);
-- 
cgit v1.2.3


From 0a13397b8586bb4147d9e35c80a3c5aebff41d5b Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Sun, 2 Jun 2019 15:25:04 +0800
Subject: some more functions

---
 include/field_map_obj.h   | 2 +-
 include/menu_indicators.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index 69e3419de..590b54ce3 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 AddPseudoFieldObject(u16, void (*)(struct Sprite *), s16, s16, u8);
+u8 AddPseudoEventObject(u16, void (*)(struct Sprite *), s16, s16, u8);
 u8 show_sprite(u8, u8, u8);
 u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8);
 u8 SpawnSpecialFieldObject(struct MapObjectTemplate *);
diff --git a/include/menu_indicators.h b/include/menu_indicators.h
index f195ceb6d..f65e3f2ac 100644
--- a/include/menu_indicators.h
+++ b/include/menu_indicators.h
@@ -7,7 +7,7 @@
 
 // Exported RAM declarations
 
-struct ScrollIndicatorArrowPairTemplate
+struct ScrollArrowsTemplate
 {
     u8 unk_00;
     u8 unk_01;
@@ -25,7 +25,7 @@ struct ScrollIndicatorArrowPairTemplate
 
 // Exported ROM declarations
 u8 AddScrollIndicatorArrowPairParametrized(u8, u8, u8, u8, s32, u16, u16, u16 *);
-u8 AddScrollIndicatorArrowPair(const struct ScrollIndicatorArrowPairTemplate * template, u16 * a1);
+u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate * template, u16 * a1);
 void RemoveScrollIndicatorArrowPair(u8);
 
 #endif //GUARD_MENU_INDICATORS_H
-- 
cgit v1.2.3


From 49a1de36d38b41b0f3f7c443acc636281314b749 Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Mon, 3 Jun 2019 03:19:15 +0800
Subject: sub_815B0CC and rollback of failed attempt to make it compilable

---
 include/teachy_tv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/teachy_tv.h b/include/teachy_tv.h
index 374780c04..382ad117d 100644
--- a/include/teachy_tv.h
+++ b/include/teachy_tv.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_TEACHY_TV_H
 #define GUARD_TEACHY_TV_H
 
-void CB2_ReturnToTeachyTV(void);
+void sub_815ABFC(void);
 void sub_815AC20(void);
 
 #endif //GUARD_TEACHY_TV_H
-- 
cgit v1.2.3


From b6a166c45960e1963bf508f83b9da1a8d6a71df4 Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Tue, 4 Jun 2019 00:00:21 +0800
Subject: more symbol name fixes

---
 include/global.fieldmap.h | 4 ++--
 include/list_menu.h       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index a14905cc2..3623737ea 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -51,8 +51,8 @@ struct Tileset
     /*0x04*/ void *tiles;
     /*0x08*/ void *palettes;
     /*0x0c*/ void *metatiles;
-    /*0x14*/ TilesetCB callback;
-    /*0x10*/ void *metatileAttributes;
+    /*0x10*/ TilesetCB callback;
+    /*0x14*/ void *metatileAttributes;
 };
 
 struct MapData
diff --git a/include/list_menu.h b/include/list_menu.h
index 1c632e89c..1aae55c82 100644
--- a/include/list_menu.h
+++ b/include/list_menu.h
@@ -54,7 +54,7 @@ extern struct ListMenuTemplate gMultiuseListMenuTemplate;
 
 u8 ListMenuInit(struct ListMenuTemplate *template, u16 a1, u16 a2);
 s32 ListMenuHandleInput(u8 id);
-void get_coro_args_x18_x1A(u8 a0, u16 *a1, u16 *a2);
+void ListMenuGetScrollAndRow(u8 a0, u16 *a1, u16 *a2);
 void sub_81AE6C8(u8 a0, u16 *a1, u16 *a2);
 void DestroyListMenu(u8, u16 *, u16 *);
 u16 ListMenuGetYCoordForPrintingArrowCursor(u8);
-- 
cgit v1.2.3


From 5110cafe24debb3ca0e1db52a8cd1a8edeb6daac Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Fri, 7 Jun 2019 03:40:49 +0800
Subject: fix header

---
 include/teachy_tv.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/teachy_tv.h b/include/teachy_tv.h
index 382ad117d..29ef726c9 100644
--- a/include/teachy_tv.h
+++ b/include/teachy_tv.h
@@ -1,7 +1,8 @@
 #ifndef GUARD_TEACHY_TV_H
 #define GUARD_TEACHY_TV_H
 
-void sub_815ABFC(void);
-void sub_815AC20(void);
+void sub_815ABC4(u8 mode, void (*cb)());
+void sub_815ABFC();
+void sub_815AC20();
 
 #endif //GUARD_TEACHY_TV_H
-- 
cgit v1.2.3


From cce7cee9bd710f59e4078dc1e088b5e645514049 Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Mon, 10 Jun 2019 07:20:37 +0800
Subject: all fixed

---
 include/teachy_tv.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/teachy_tv.h b/include/teachy_tv.h
index 29ef726c9..6f3a25266 100644
--- a/include/teachy_tv.h
+++ b/include/teachy_tv.h
@@ -2,7 +2,7 @@
 #define GUARD_TEACHY_TV_H
 
 void sub_815ABC4(u8 mode, void (*cb)());
-void sub_815ABFC();
-void sub_815AC20();
+void sub_815ABFC(void);
+void sub_815AC20(void);
 
 #endif //GUARD_TEACHY_TV_H
-- 
cgit v1.2.3


From b44bd642b889de26f944dbe8bc8c8acdf0adf273 Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Mon, 10 Jun 2019 08:22:56 +0800
Subject: more fix

---
 include/teachy_tv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/teachy_tv.h b/include/teachy_tv.h
index 6f3a25266..f3b9eb565 100644
--- a/include/teachy_tv.h
+++ b/include/teachy_tv.h
@@ -2,7 +2,7 @@
 #define GUARD_TEACHY_TV_H
 
 void sub_815ABC4(u8 mode, void (*cb)());
-void sub_815ABFC(void);
+void CB2_ReturnToTeachyTV(void);
 void sub_815AC20(void);
 
 #endif //GUARD_TEACHY_TV_H
-- 
cgit v1.2.3


From 12191612cd7a050283e37278fac1c02a2ef3776d Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Mon, 10 Jun 2019 09:03:39 +0800
Subject: TeachyTvLoadMapPalette and fixes

---
 include/help_system.h  | 1 +
 include/item_menu.h    | 1 +
 include/menu_helpers.h | 1 +
 include/overworld.h    | 1 +
 include/unk_8159F40.h  | 1 +
 5 files changed, 5 insertions(+)

(limited to 'include')

diff --git a/include/help_system.h b/include/help_system.h
index 6398d306b..97acec45e 100644
--- a/include/help_system.h
+++ b/include/help_system.h
@@ -5,6 +5,7 @@
 
 extern bool8 gUnknown_3005ECC;
 
+void sub_812B1E0(u16);
 void sub_812B484(void);
 void HelpSystem_SetSomeVariable2(u8);
 void sub_812B478(void);
diff --git a/include/item_menu.h b/include/item_menu.h
index efd0066ed..2801a5001 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -25,6 +25,7 @@ extern u16 gSpecialVar_ItemId;
 void sub_81AAC50(void);
 void sub_81AAC70(void);
 void sub_8108CF0(void);
+void sub_810B108(u8);
 void UseFameCheckerFromMenu(void);
 
 #endif //GUARD_ITEM_MENU_H
diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index 892636ba0..f8b57034a 100644
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -18,6 +18,7 @@ void sub_812225C(u16 *, u16 *, u8, u8);
 void sub_8122298(u16 *, u16 *, u8, u8, u8);
 void sub_8121F68(u8 taskId, const struct YesNoFuncTable *data);
 bool8 sub_81221AC(void);
+bool16 sub_80BF518(u8 textPrinterId);
 bool8 sub_80BF72C(void);
 bool8 sub_80BF708(void);
 void VblankHblankHandlerSetZero(void);
diff --git a/include/overworld.h b/include/overworld.h
index 5c4235b8c..a3fe1161f 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -109,6 +109,7 @@ void Overworld_ResetStateAfterTeleport(void);
 
 void Overworld_FadeOutMapMusic(void);
 void sub_805671C(void);
+void sub_8055DC4(void);
 bool8 sub_8055FC4(void);
 
 #endif //GUARD_ROM4_H
diff --git a/include/unk_8159F40.h b/include/unk_8159F40.h
index f0e85d416..7f6a98c3a 100644
--- a/include/unk_8159F40.h
+++ b/include/unk_8159F40.h
@@ -3,6 +3,7 @@
 
 #include "global.h"
 
+void sub_8159F40(void);
 void sub_815A008(struct QuestLog *);
 void sub_815A1F8(struct QuestLog *, struct MapObjectTemplate *);
 
-- 
cgit v1.2.3


From 20a09555eac362113abe831dd6b3973b480f56e9 Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Tue, 11 Jun 2019 05:20:42 +0800
Subject: fixed lots of stuff

---
 include/fame_checker.h  |  2 +-
 include/field_map_obj.h |  4 +++-
 include/fieldmap.h      |  1 +
 include/graphics.h      |  7 +++++++
 include/list_menu.h     |  4 ++--
 include/main.h          |  2 --
 include/sprite.h        |  2 ++
 include/strings.h       | 23 ++++++++++++++++++++++-
 8 files changed, 38 insertions(+), 7 deletions(-)

(limited to 'include')

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
-- 
cgit v1.2.3


From c28365392e7f5f3f2101f48fd8b43d22f496fd1d Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Tue, 11 Jun 2019 05:44:21 +0800
Subject: struct ScrollArrowsTemplate

---
 include/menu_indicators.h | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'include')

diff --git a/include/menu_indicators.h b/include/menu_indicators.h
index 8c669aeef..76f25224c 100644
--- a/include/menu_indicators.h
+++ b/include/menu_indicators.h
@@ -7,25 +7,24 @@
 
 // Exported RAM declarations
 
-struct ScrollIndicatorArrowPairTemplate
+struct ScrollArrowsTemplate
 {
-    u8 unk_00;
-    u8 unk_01;
-    u8 unk_02;
-    u8 unk_03;
-    u8 unk_04;
-    u8 unk_05;
-    u16 unk_06;
-    u16 unk_08;
-    u16 unk_0a;
-    u16 unk_0c;
-    u16 unk_0e_0:4;
-    u16 unk_0e_4:12;
+    u8 firstArrowType;
+    u8 firstX;
+    u8 firstY;
+    u8 secondArrowType;
+    u8 secondX;
+    u8 secondY;
+    u16 fullyUpThreshold;
+    u16 fullyDownThreshold;
+    u16 tileTag;
+    u16 palTag;
+    u8 palNum;
 };
 
 // Exported ROM declarations
 u8 AddScrollIndicatorArrowPairParameterized(u8, u8, u8, u8, s32, u16, u16, u16 *);
-u8 AddScrollIndicatorArrowPair(const struct ScrollIndicatorArrowPairTemplate * template, u16 * a1);
+u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate * template, u16 * a1);
 void RemoveScrollIndicatorArrowPair(u8);
 
 #endif //GUARD_MENU_INDICATORS_H
-- 
cgit v1.2.3