tm_case finish code

6 files changed, 11 insertions, 3 deletions

diff --git a/include/list_menu.h b/include/list_menu.h
index 56106610d..9c4960e3e 100644
--- a/include/list_menu.h
+++ b/include/list_menu.h
@@ -58,5 +58,7 @@ 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, u16 *, u16 *);
 u16 ListMenuGetYCoordForPrintingArrowCursor(u8);
+void sub_8107D38(u8, u8);
+void sub_8107D68(u8, u8, u8, u8);
 
 #endif //GUARD_LIST_MENU_H
diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index aba8b1c0d..a04385b1d 100644
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -24,5 +24,7 @@ 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 sub_80BF5D0(u8 taskId, const struct WindowTemplate * unk1, u8 unk2, u8 unk3, u8 unk4, u8 unk5, u8 unk6, const TaskFunc *ptrs);
 
 #endif //GUARD_MENU_HELPERS_H
diff --git a/include/money.h b/include/money.h
index 25db1b157..5bcef18d4 100644
--- a/include/money.h
+++ b/include/money.h
@@ -10,9 +10,9 @@ 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, int amount, u8 speed);
-void PrintMoneyAmountInMoneyBoxInMoneyBoxWithBorder(u8 windowId, u16 tileStart, u8 pallete, int amount);
+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);
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/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/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);