diff --git a/include/text.h b/include/text.h index 99b122e6f..f9a460ed6 100644 --- a/include/text.h +++ b/include/text.h @@ -47,4 +47,5 @@ void sub_80089AC(const struct UnkTextStruct2 *a0, void *a1); void sub_8009388(void); void sub_800641C(struct UnkTextStruct2 *a0, u8 a1, u8 a2); void sub_8006518(struct UnkTextStruct2 *); +extern void xxx_call_draw_string(s32 x, u32 y, const u8 *str, u32 , u32); #endif diff --git a/src/adventure_log.c b/src/adventure_log.c index 95f50c71e..2d5f7f47e 100644 --- a/src/adventure_log.c +++ b/src/adventure_log.c @@ -54,7 +54,6 @@ extern s16 sub_8097838(); extern s16 sub_8097870(); extern s32 sub_80977B8(); extern s32 sub_80977F8(); -extern void xxx_call_draw_string(s32, u32, const u8 *, u32, u32); extern void sub_8008C54(u32); extern void sub_80073B8(u32); extern void sub_80073E0(u32); diff --git a/src/code_801C620.c b/src/code_801C620.c index 517f24954..8683dc2eb 100644 --- a/src/code_801C620.c +++ b/src/code_801C620.c @@ -162,7 +162,6 @@ extern void PlayMenuSoundEffect(u32); extern char * GetIQSkillDescription(u8 r0); extern s32 GetNumAvailableIQSkills(u8 *param_1, s32 pokeIQ); extern void sub_8013C68(u32 *); -extern void xxx_call_draw_string(u32, u32, const u8 *, u32, u32); extern char * GetIQSkillName(u8 r0); extern void xxx_format_and_draw(u32, u32, const u8 *, u32, u32); extern s32 sub_8013800(struct MenuInputStruct *, s32); diff --git a/src/code_801D760.c b/src/code_801D760.c index 7966dbbfb..81c5cdaac 100644 --- a/src/code_801D760.c +++ b/src/code_801D760.c @@ -62,7 +62,6 @@ extern void InitializeJobListMenu(u32); extern const char *sub_8098FB4(); extern void xxx_format_string(const char *, u8 *, u32 **, u32); extern s32 sub_8008ED0(u8 *); -extern void xxx_call_draw_string(s32 size, u32, u8 *, u32, u32); extern void sub_8008C54(u32); extern void sub_80073B8(u32); extern void sub_80073E0(u32); diff --git a/src/code_801EE10_mid.c b/src/code_801EE10_mid.c index c25df5096..6bc0e6fee 100644 --- a/src/code_801EE10_mid.c +++ b/src/code_801EE10_mid.c @@ -38,7 +38,6 @@ extern void sub_8008C54(u32); extern void sub_80073B8(u32); extern void sub_80073E0(u32); extern s32 sub_8013800(struct MenuInputStruct*, s32); -extern void xxx_call_draw_string(s32, s32, u8 *, s32, s32); u32 sub_801F7E4(void); void sub_801F690(void); diff --git a/src/code_8023144.c b/src/code_8023144.c index c1ebc4486..d61e65af9 100644 --- a/src/code_8023144.c +++ b/src/code_8023144.c @@ -493,7 +493,6 @@ struct unkStruct_8092638 u32 unk5; }; extern void sub_8092638(u8,struct unkStruct_8092638 *, u32, u32); -extern void xxx_call_draw_string(u32, u32, const u8 *, u32, u32); extern void sub_8008C54(u32); extern void sub_80073B8(u32); extern void sub_80073E0(u32); diff --git a/src/code_8031D70.c b/src/code_8031D70.c index 2feeea604..892213367 100644 --- a/src/code_8031D70.c +++ b/src/code_8031D70.c @@ -46,7 +46,6 @@ const struct UnkTextStruct2 gUnknown_80E1FC4 = { ALIGNED(4) const u8 gUnknown_80E1FDC[] = "Password"; ALIGNED(4) static const u8 fill0[] = "pksdir0"; -extern void xxx_call_draw_string(s32, s32, const u8 *, s32, s32); extern void sub_8008C54(u32); extern void sub_80073B8(u32); extern void sub_80073E0(u32); diff --git a/src/credits.c b/src/credits.c index b256fc638..8f1893797 100644 --- a/src/credits.c +++ b/src/credits.c @@ -37,8 +37,6 @@ extern const u32 gUnknown_80E4A40[]; extern struct CreditsData* gCreditsTable[27]; extern u16 gUnknown_80E5990[]; -extern void xxx_call_draw_string(s32, u32, const u8 *, u32, u32); - extern void sub_80015C0(u32, u32); extern s32 sub_8001658(u32, u32); extern void sub_80073B8(u32); diff --git a/src/debug_menu_1.c b/src/debug_menu_1.c index 8a26460f6..2ada25779 100644 --- a/src/debug_menu_1.c +++ b/src/debug_menu_1.c @@ -53,7 +53,6 @@ extern void sub_80073B8(u32); extern void sub_8013C68(u32 *); extern void sub_80073E0(u32); extern void sub_8023DA4(void); -extern void xxx_call_draw_string(u32, u32, const u8 *, u32, u32); extern void sub_803ACE8(); extern void sub_803AD88(); extern void sub_803AF38(); diff --git a/src/debug_menu_mid.c b/src/debug_menu_mid.c index 37e0b3344..096bccb1a 100644 --- a/src/debug_menu_mid.c +++ b/src/debug_menu_mid.c @@ -109,7 +109,6 @@ extern void sub_8008C54(u32); extern void sub_80073B8(u32); extern void sub_80073E0(u32); extern void sub_8013C68(u32 *); -extern void xxx_call_draw_string(s32, u32, const char *, u32, u32); extern u32 sub_801CA08(u32); extern u8 sub_801CB24(); extern void sub_801CBB8(); diff --git a/src/hints_menu.c b/src/hints_menu.c index 4ac53dc58..f118a31de 100644 --- a/src/hints_menu.c +++ b/src/hints_menu.c @@ -49,7 +49,6 @@ extern void PlayMenuSoundEffect(u32); extern void sub_801E714(void); extern void sub_801E76C(void); extern void DisplayChosenHint(void); -extern void xxx_call_draw_string(s32, u32, u8 *, u32, u32); extern void sub_80073E0(u32); extern void sub_80073B8(u32); extern s32 sub_8013800(struct MenuInputStruct *, u32); diff --git a/src/kangaskhan_storage_1.c b/src/kangaskhan_storage_1.c index 78195283c..e32dff046 100644 --- a/src/kangaskhan_storage_1.c +++ b/src/kangaskhan_storage_1.c @@ -53,7 +53,6 @@ extern void sub_8008C54(u32); extern void sub_80073B8(u32); extern void sub_8013C68(u32 *); extern void sub_80073E0(u32); -extern void xxx_call_draw_string(u32 x, u32 y, u8 *, u32, u32); extern void sub_801A9E0(); extern void sub_801841C(); diff --git a/src/kecleon_items_1.c b/src/kecleon_items_1.c index 933b07d0d..cbfdf8302 100644 --- a/src/kecleon_items_1.c +++ b/src/kecleon_items_1.c @@ -9,6 +9,7 @@ #include "team_inventory.h" #include "code_800D090.h" #include "menu_input.h" +#include "text.h" extern struct unkStruct_203B210 *gUnknown_203B210; extern u16 gUnknown_203B218; @@ -46,7 +47,6 @@ extern void sub_8008C54(u32); extern void sub_80073B8(u32); extern void sub_80073E0(u32); extern s32 sub_8013800(struct MenuInputStruct *, u32); -extern void xxx_call_draw_string(s32 x, s32, u8 *, u32, u32); extern void xxx_format_and_draw(u32, u32, u8 *, u32, u32); extern s32 sub_801AED0(s32); void sub_8007B7C(s32, s32, s32, s32, s32); diff --git a/src/load_screen.c b/src/load_screen.c index 8f30f7577..a5ce6acb0 100644 --- a/src/load_screen.c +++ b/src/load_screen.c @@ -49,7 +49,6 @@ extern bool8 sub_80023E4(u32); extern u8 *sub_8098FB4(); extern u8 *GetDungeonLocationInfo(void); extern u32 GetNumAdventures(void); -extern void xxx_call_draw_string(u32 x, u32 y, const u8 *, u32, u32); extern void PrintDungeonLocationtoBuffer(u8 *, u8 *); extern void sub_80922B4(u8 *, const u8 *, u32); extern u32 sub_8001658(u32, u32); diff --git a/src/mailbox.c b/src/mailbox.c index f7fc3dbbf..9eb3d5883 100644 --- a/src/mailbox.c +++ b/src/mailbox.c @@ -86,7 +86,6 @@ extern void InitializeJobListMenu(u32); extern void sub_802B640(u32, u32, u32); extern void sub_802B7D0(u32); extern void sub_802B9FC(u8); -extern void xxx_call_draw_string(s32 x, u32 y, const u8 *, u32 , u32); extern void sub_8008C54(u32); extern void sub_80073B8(u32); extern void sub_80073E0(u32); diff --git a/src/makuhita_dojo_1.c b/src/makuhita_dojo_1.c index a82b5257c..0425c0377 100644 --- a/src/makuhita_dojo_1.c +++ b/src/makuhita_dojo_1.c @@ -58,7 +58,6 @@ extern s16 sub_80A26CC(s16 r0); extern void sub_8008C54(u32); extern void sub_80073B8(u32); extern void sub_80073E0(u32); -extern void xxx_call_draw_string(s32 x, u32 y, const u8 *, u32 , u32); extern u8 sub_80A2740(s32 r0); extern s16 sub_80A2668(u32 r0); extern s32 sub_8013800(void *, u32); diff --git a/src/options_menu.c b/src/options_menu.c index 9e8a9c4a3..8f3d596d8 100644 --- a/src/options_menu.c +++ b/src/options_menu.c @@ -59,7 +59,6 @@ extern const char *gUnknown_80D4928[]; extern void sub_8008C54(u32); extern void sub_80073B8(u32); extern void sub_80073E0(u32); -extern void xxx_call_draw_string(u32, u32, u8 *, u32, u32); extern s32 sub_8008ED0(u8 *); extern s32 sub_8013800(u32 *, u32); extern void sub_80078A4(u32, u32, u32, u32, u32); diff --git a/src/party_list_menu.c b/src/party_list_menu.c index 78482869d..9d43a2e4f 100644 --- a/src/party_list_menu.c +++ b/src/party_list_menu.c @@ -174,7 +174,6 @@ extern void sub_80073E0(u32); extern void sub_80922B4(u8 *, const u8 *, u32); extern void sub_808D930(u8 *, s16); extern s32 sub_8008ED0(u8 *); -extern void xxx_call_draw_string(s32 x, s32 y, u8 *, u32, u32); extern void xxx_format_and_draw(s32, s32, const u8 *, ...); extern s32 sub_80144A4(s32 *); extern u32 sub_801F890(void); diff --git a/src/pelipper_board.c b/src/pelipper_board.c index fabbf70fe..9ac1d2cc8 100644 --- a/src/pelipper_board.c +++ b/src/pelipper_board.c @@ -79,7 +79,6 @@ extern void sub_803B35C(struct WonderMail *, struct unkStruct_802C39C *); extern void sub_802DE84(struct unkStruct_802C39C *); extern void InitializeJobListMenu(u32); -extern void xxx_call_draw_string(s32 x, u32 y, const u8 *, u32 , u32); extern void sub_8008C54(u32); extern void sub_80073B8(u32); extern void sub_80073E0(u32); diff --git a/src/personality_test.c b/src/personality_test.c index 6f3259ded..fdfe719a7 100644 --- a/src/personality_test.c +++ b/src/personality_test.c @@ -72,7 +72,6 @@ extern void PlayMenuSoundEffect(u32); extern void sub_8013984(struct MenuInputStruct *r0); u32 sub_8013800(struct MenuInputStruct *r0, u32); extern void AddMenuCursorSprite(struct MenuInputStruct *r0); -extern void xxx_call_draw_string(u32 x, u32 y, const char *text, u32, u32); extern u32 sub_80095E4(s16, u32); extern struct GameOptions *gGameOptionsRef; diff --git a/src/pokemon_news.c b/src/pokemon_news.c index 8f54f5a4e..f171c055c 100644 --- a/src/pokemon_news.c +++ b/src/pokemon_news.c @@ -181,7 +181,6 @@ extern void sub_8008C54(u32); extern void sub_80073B8(u32); extern void sub_802BC7C(void); extern void sub_80073E0(u32); -extern void xxx_call_draw_string(s32 x, u32 y, const u8 *, u32 , u32); extern void xxx_format_and_draw(u32, u32, const u8 *, u32, u32); extern void sub_803B6B0(u32, u32, u32, u32); extern s32 sub_8013800(struct MenuInputStruct *, s32); diff --git a/src/post_office_guide.c b/src/post_office_guide.c index 41c626f26..6f466b5a8 100644 --- a/src/post_office_guide.c +++ b/src/post_office_guide.c @@ -187,7 +187,6 @@ extern u8 *sub_80975DC(u32 r0); extern u8 sub_8099360(u8 *); extern u8 sub_8099394(volatile u8 *); extern struct WonderMail *GetJobSlotInfo(u8); -extern void xxx_call_draw_string(s32 x, u32 y, const u8 *, u32 , u32); extern void sub_80073B8(u32); extern void sub_80073E0(u32); extern void sprintfStatic(char *buffer, const char *text, ...); diff --git a/src/trade_items_menu.c b/src/trade_items_menu.c index 3c53c18a5..2d8c72e93 100644 --- a/src/trade_items_menu.c +++ b/src/trade_items_menu.c @@ -9,6 +9,7 @@ #include "save.h" #include "menu.h" #include "menu_input.h" +#include "text.h" EWRAM_DATA_2 struct TradeItemsMenu *gTradeItemsMenu = {0}; @@ -101,7 +102,6 @@ extern void sub_8008C54(u32); extern void sub_80073B8(u32); extern void sub_8013C68(u32 *); extern void sub_80073E0(u32); -extern void xxx_call_draw_string(u32, u32, const u8 *, u32, u32); extern u8 sub_801CF14(u32); extern u32 sub_801D008(); extern void sub_801C8C4(u32, u32, s32 *, u32); diff --git a/src/wonder_mail_2_1.c b/src/wonder_mail_2_1.c index c8fccdfaf..9ad4d167f 100644 --- a/src/wonder_mail_2_1.c +++ b/src/wonder_mail_2_1.c @@ -103,7 +103,6 @@ extern void sub_80073E0(u32); extern struct WonderMail* GetJobSlotInfo(u8); extern s32 sub_8013800(struct MenuInputStruct*, u32); extern void sub_803B35C(struct WonderMail *, struct unkStruct_802C39C *); -extern void xxx_call_draw_string(u32, u32, const u8 *, u32, u32); extern void CreateRescueTitle(struct unkStruct_802C39C *); extern void sub_8013984(struct MenuInputStruct*); diff --git a/src/wonder_mail_2_mid.c b/src/wonder_mail_2_mid.c index c1eb56a61..1b45522e4 100644 --- a/src/wonder_mail_2_mid.c +++ b/src/wonder_mail_2_mid.c @@ -32,7 +32,6 @@ extern void sub_803B35C(struct WonderMail *, u32 *); extern u8 gBulletinBoardText[]; extern bool8 IsMailinJobSlot(struct WonderMail *); extern void CreateRescueTitle(struct unkStruct_802C39C *); -extern void xxx_call_draw_string(s32, s32, u8 *, s32, s32); struct unkStruct_203B2D8 diff --git a/src/wonder_mail_3.c b/src/wonder_mail_3.c index 7d331d851..1447180c2 100644 --- a/src/wonder_mail_3.c +++ b/src/wonder_mail_3.c @@ -149,7 +149,6 @@ extern u8 *sub_8096DE8(void); extern void AcceptJob(struct unkSubStruct_203B2F8 *); extern void sub_8014248(const char *text, u32, u32, struct MenuItem *r0, u32, u32, u32, u32, u32); struct unkStruct_803B344 *sub_803B344(u8); -extern void xxx_call_draw_string(u32, u32, const u8 *, u32, u32); extern void sub_8008C54(u32); extern void sub_80073B8(u32); extern void sub_80073E0(u32); diff --git a/src/wonder_mail_3_mid.c b/src/wonder_mail_3_mid.c index 4e5d0c0e3..cc2b08450 100644 --- a/src/wonder_mail_3_mid.c +++ b/src/wonder_mail_3_mid.c @@ -138,7 +138,6 @@ extern u32 sub_801B60C(u32, u8, u8); extern void sub_8092578(u8 *buffer, u8 index, u8 r2); void HandleMissionReward(void); extern s32 sub_8013800(struct MenuInputStruct *, s32); -extern void xxx_call_draw_string(s32, s32, const u8 *, s32, s32); extern void sub_8008C54(u32); extern void sub_80073B8(u32); extern void sub_80073E0(u32); diff --git a/src/wonder_mail_4.c b/src/wonder_mail_4.c index 44011b132..cde0be528 100644 --- a/src/wonder_mail_4.c +++ b/src/wonder_mail_4.c @@ -89,7 +89,6 @@ extern void PlayMenuSoundEffect(u32); extern void sub_8013984(struct MenuInputStruct*); extern void AddMenuCursorSprite(struct MenuInputStruct*); extern s32 sub_8013800(struct MenuInputStruct*, u32); -extern void xxx_call_draw_string(u32, u32, const u8 *, u32, u32); extern void sub_8008C54(u32); extern void sub_80073B8(u32); extern void sub_80073E0(u32); diff --git a/src/wonder_mail_5.c b/src/wonder_mail_5.c index 7c6183cc6..d6313c687 100644 --- a/src/wonder_mail_5.c +++ b/src/wonder_mail_5.c @@ -51,7 +51,6 @@ extern void sub_801317C(void *); extern void PlayMenuSoundEffect(u32); extern u32 sub_8012A64(void *, u32); extern void CreateRescueDescription(struct unkStruct_802C39C *); -extern void xxx_call_draw_string(u32, u32, const char *, u32, u32); extern void sub_80073E0(u32); extern void sub_80073B8(u32);