Merge pull request #49 from PikalaxALT/tm_case

Tm case

17 files changed, 86 insertions, 5 deletions

diff --git a/include/graphics.h b/include/graphics.h
index d249ece10..83cc19bb3 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -150,4 +150,15 @@ extern const u16 gFameCheckerBgTiles[0xa50];
 extern const u16 gFameCheckerBg3Tilemap[0x400];
 extern const u16 gFameCheckerBg2Tilemap[0x400];
 
+// tm_case
+extern const u32 gUnknown_8E845D8[];
+extern const u32 gUnknown_8E84A24[];
+extern const u32 gUnknown_8E84B70[];
+extern const u32 gUnknown_8E84CB0[];
+extern const u32 gUnknown_8E84D20[];
+extern const u32 gTMCase_TMSpriteGfx[];
+extern const u32 gUnknown_8E84F20[];
+extern const u32 gUnknown_8E85068[];
+extern const u8 gUnknown_8E99118[];
+
 #endif //GUARD_GRAPHICS_H
diff --git a/include/item.h b/include/item.h
index 25177cb6e..320b7ffec 100644
--- a/include/item.h
+++ b/include/item.h
@@ -66,4 +66,10 @@ void CopyItemName(u16, u8 *);
 void sub_809A824(u16 itemId);
 bool8 AddBagItem(u16 itemId, u16 amount);
 
+void sub_809A5E4(struct BagPocket *);
+u16 BagGetItemIdByPocketPosition(u8 a0, u16 a1);
+u16 BagGetQuantityByPocketPosition(u8 a0, u16 a1);
+bool8 itemid_is_unique(u16 itemId);
+void sub_809A584(struct ItemSlot * slots, u8 capacity);
+
 #endif // ITEM_H
diff --git a/include/item_menu.h b/include/item_menu.h
index a6128b9fb..9ebe3918a 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -12,6 +12,7 @@ extern u16 gSpecialVar_ItemId;
 // Exported ROM declarations
 void sub_81AAC50(void);
 void sub_81AAC70(void);
+void sub_8108CF0(void);
 void UseFameCheckerFromMenu(void);
 
 #endif //GUARD_ITEM_MENU_H
diff --git a/include/list_menu.h b/include/list_menu.h
index 8834e5215..3fd54d0d1 100644
--- a/include/list_menu.h
+++ b/include/list_menu.h
@@ -48,6 +48,7 @@ struct ListMenu {
 };
 
 extern struct ListMenuTemplate gUnknown_03006310;
+extern struct ListMenuTemplate gMultiuseListMenuTemplate;
 
 // Exported ROM declarations
 
@@ -55,7 +56,8 @@ 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 sub_81AE6C8(u8 a0, u16 *a1, u16 *a2);
-void sub_810713C(u8, u8, u8);
+void DestroyListMenu(u8, u16 *, u16 *);
 u16 ListMenuGetYCoordForPrintingArrowCursor(u8);
+void sub_8107D38(u8, u8);
 
 #endif //GUARD_LIST_MENU_H
diff --git a/include/menu.h b/include/menu.h
index f26c7efde..4a5bd8a2c 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -48,5 +48,7 @@ void sub_810FF60(const struct WindowTemplate *, u8, u8, u8, u16, u8, u8);
 
 void StartBlendTask(u8 eva_start, u8 evb_start, u8 eva_end, u8 evb_end, u8 ev_step, u8 priority);
 bool8 IsBlendTaskActive(void);
+void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 letterSpacing, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, const u8 *a8);
+void sub_810F260(u8 windowId, u8 a1);
 
 #endif // GUARD_MENU_H
diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index b193388e5..e27fb4e5d 100644
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -18,6 +18,13 @@ 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);
+bool8 sub_80BF72C(void);
 bool8 sub_80BF708(void);
+void sub_80BF768(void);
+void sub_80BF7C8(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);
+void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate * unk1, u8 unk2, u8 unk3, u8 unk4, u8 unk5, u8 unk6, const struct YesNoFuncTable *ptrs);
 
 #endif //GUARD_MENU_HELPERS_H
diff --git a/include/money.h b/include/money.h
index fa63e321c..5bcef18d4 100644
--- a/include/money.h
+++ b/include/money.h
@@ -10,13 +10,14 @@ void AddMoney(u32* moneyPtr, u32 toAdd);
 void RemoveMoney(u32* moneyPtr, u32 toSub);
 bool8 IsEnoughForCostInVar0x8005(void);
 void SubtractMoneyFromVar0x8005(void);
-void PrintMoneyAmountInMoneyBoxInMoneyBox(u8 windowId, int amount, u8 speed);
-void PrintMoneyAmountInMoneyBox(u8 windowId, u8 x, u8 y, int amount, u8 speed);
-void PrintMoneyAmountInMoneyBoxInMoneyBoxWithBorder(u8 windowId, u16 tileStart, u8 pallete, int amount);
+void PrintMoneyAmountInMoneyBox(u8 windowId, int amount, u8 speed);
+void PrintMoneyAmountInMoneyBox(u8 windowId, int amount, u8 speed);
+void PrintMoneyAmountInMoneyBoxWithBorder(u8 windowId, u16 tileStart, u8 pallete, int amount);
 void ChangeAmountInMoneyBox(int amount);
 void DrawMoneyBox(int amount, u8 x, u8 y);
 void HideMoneyBox(void);
 void AddMoneyLabelObject(u16 x, u16 y);
 void RemoveMoneyLabelObject(void);
+void PrintMoneyAmount(u8 windowId, u8 x, u8 y, int amount, u8 speed);
 
 #endif // GUARD_MONEY_H
diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h
index fe8b5b754..b17326667 100644
--- a/include/new_menu_helpers.h
+++ b/include/new_menu_helpers.h
@@ -29,5 +29,6 @@ void ResetBg0(void);
 void Menu_LoadStdPalAt(u16);
 void * malloc_and_decompress(const void * src, u32 * size);
 u16 sub_80F796C(void);
+void sub_80F6B08(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette);
 
 #endif // GUARD_NEW_MENU_HELPERS_H
diff --git a/include/party_menu.h b/include/party_menu.h
index 2e83c1496..5f7a3a68e 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -12,10 +12,16 @@ enum {
     AILMENT_BRN
 };
 
+extern void (*gUnknown_3005E98)(u8 taskId, TaskFunc func);
+
 bool8 MonKnowsMove(struct Pokemon *, u16);
 void sub_81B58A8(void);
 void DoWallyTutorialBagMenu(void);
 u8 pokemon_ailments_get_primary(u32 status);
 u16 ItemIdToBattleMoveId(u16 itemId);
+void sub_8125B40(u8 taskId, TaskFunc func);
+void sub_8124C8C(void);
+void sub_8126EDC(void);
+void c2_8123744(void);
 
 #endif // GUARD_PARTY_MENU_H
diff --git a/include/pokemon.h b/include/pokemon.h
index c08f37b5f..c84eb4c42 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -445,6 +445,8 @@ struct BattleMove
     u8 flags;
 };
 
+extern const struct BattleMove gBattleMoves[];
+
 #define FLAG_MAKES_CONTACT          0x1
 #define FLAG_PROTECT_AFFECTED       0x2
 #define FLAG_MAGICCOAT_AFFECTED     0x4
diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h
index 897c5a42e..f2fbe85a7 100644
--- a/include/pokemon_storage_system.h
+++ b/include/pokemon_storage_system.h
@@ -13,5 +13,6 @@ void CompactPartySlots(void);
 u32 GetBoxMonDataFromAnyBox(u8 boxId, u8 monPosition, u32 request);
 void sub_808BCB4(u8 boxId, u8 monPosition);
 u8 * GetBoxNamePtr(u8 boxId);
+void sub_808CE60(void);
 
 #endif // GUARD_POKEMON_STORAGE_SYSTEM_H
diff --git a/include/shop.h b/include/shop.h
index 1046a590a..05f5160e6 100644
--- a/include/shop.h
+++ b/include/shop.h
@@ -8,5 +8,6 @@ extern EWRAM_DATA struct ItemSlot gUnknown_02039F80[3];
 void CreatePokemartMenu(const u16 *);
 void CreateDecorationShop1Menu(const u16 *);
 void CreateDecorationShop2Menu(const u16 *);
+void sub_809C09C(u16, u16, u8);
 
 #endif // GUARD_SHOP_H
diff --git a/include/strings.h b/include/strings.h
index 40021a01d..6af1b0d69 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -92,4 +92,27 @@ extern const u8 gText_Coins[];
 extern const u8 gText_EggNickname[];
 extern const u8 gText_Pokemon[];
 
+extern const u8 gOtherText_Use[];
+extern const u8 gOtherText_Give[];
+extern const u8 gOtherText_Exit[];
+extern const u8 gText_ThreeHyphens[];
+extern const u8 gOtherText_UnkF9_08_Clear_01[];
+extern const u8 gFameCheckerText_ListMenuCursor[];
+extern const u8 gText_TimesStrVar1[];
+extern const u8 gText_IsSelected[];
+extern const u8 gText_ThereIsNoPokemon[];
+extern const u8 gText_ItemCantBeHeld[];
+extern const u8 gText_TMCase[];
+extern const u8 gText_Close[];
+extern const u8 gText_TMCaseWillBePutAway[];
+extern const u8 gText_FontSize0[];
+extern const u8 gText_FontSize2[];
+extern const u8 gText_OhNoICantBuyThat[];
+extern const u8 gText_HowManyWouldYouLikeToSell[];
+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[];
+
 #endif //GUARD_STRINGS_H
diff --git a/include/teachy_tv.h b/include/teachy_tv.h
new file mode 100644
index 000000000..374780c04
--- /dev/null
+++ b/include/teachy_tv.h
@@ -0,0 +1,7 @@
+#ifndef GUARD_TEACHY_TV_H
+#define GUARD_TEACHY_TV_H
+
+void CB2_ReturnToTeachyTV(void);
+void sub_815AC20(void);
+
+#endif //GUARD_TEACHY_TV_H
diff --git a/include/text_window.h b/include/text_window.h
index 72ce50efc..8a4113c62 100644
--- a/include/text_window.h
+++ b/include/text_window.h
@@ -20,6 +20,8 @@ void rbox_fill_rectangle(u8 windowId);
 const u16* stdpal_get(u8 id);
 const u16* GetOverworldTextboxPalettePtr(void);
 void sub_8098C6C(u8 bg, u16 destOffset, u8 palOffset);
+void sub_814FEAC(u8 windowId, u16 tileStart, u8 palette);
 void sub_814FF2C(u8 windowId, u16 tileStart, u8 palette);
+void sub_815001C(u8 windowId, u16 tileStart, u8 palette);
 
 #endif // GUARD_TEXT_WINDOW_H
diff --git a/include/tm_case.h b/include/tm_case.h
new file mode 100644
index 000000000..f77eae457
--- /dev/null
+++ b/include/tm_case.h
@@ -0,0 +1,8 @@
+#ifndef GUARD_TM_CASE_H
+#define GUARD_TM_CASE_H
+
+void InitTMCase(u8 a0, void (* a1)(void), u8 a2);
+void ResetTMCaseCursorPos(void);
+void PokeDude_InitTMCase(void);
+
+#endif //GUARD_TM_CASE_H
diff --git a/include/window.h b/include/window.h
index 2705a7895..8edaf73ae 100644
--- a/include/window.h
+++ b/include/window.h
@@ -56,7 +56,7 @@ void PutWindowTilemap(u8 windowId);
 void PutWindowRectTilemapOverridePalette(u8 windowId, u8 x, u8 y, u8 width, u8 height, u8 palette);
 void ClearWindowTilemap(u8 windowId);
 void PutWindowRectTilemap(u8 windowId, u8 x, u8 y, u8 width, u8 height);
-void BlitBitmapToWindow(u8 windowId, u8 *pixels, u16 x, u16 y, u16 width, u16 height);
+void BlitBitmapToWindow(u8 windowId, const u8 *pixels, u16 x, u16 y, u16 width, u16 height);
 void BlitBitmapRectToWindow(u8 windowId, const u8 *pixels, u16 srcX, u16 srcY, u16 srcWidth, int srcHeight, u16 destX, u16 destY, u16 rectWidth, u16 rectHeight);
 void FillWindowPixelRect(u8 windowId, u8 fillValue, u16 x, u16 y, u16 width, u16 height);
 void CopyToWindowPixelBuffer(u8 windowId, const u8 *src, u16 size, u16 tileOffset);