From b218d9006b36e4b90051d333c75a7084bef89ee7 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 29 Oct 2024 14:07:52 +0100 Subject: [PATCH] string_format.c clean-up --- include/code_802DB28.h | 2 +- include/dungeon_message.h | 2 +- include/felicity_bank.h | 2 +- include/gulpin_shop.h | 2 +- include/{code_80130A8.h => string_format.h} | 45 ++++++++++++--------- ld_script.txt | 4 +- src/adventure_log.c | 2 +- src/code_2.c | 2 +- src/code_8012A18.c | 2 +- src/code_8015080.c | 2 +- src/code_801602C.c | 2 +- src/code_801AFA4.c | 2 +- src/code_801B3C0.c | 2 +- src/code_801B60C.c | 2 +- src/code_801D014.c | 2 +- src/code_801F808.c | 2 +- src/code_80227B8.c | 2 +- src/code_802DB28.c | 2 +- src/code_805D8C8_1.c | 2 +- src/code_8066D04.c | 2 +- src/code_8084778.c | 2 +- src/code_809447C.c | 2 +- src/debug_menu2.c | 2 +- src/debug_menu4.c | 2 +- src/dungeon_message.c | 2 +- src/felicity_bank.c | 2 +- src/friend_area_action_menu.c | 2 +- src/friend_list_menu.c | 2 +- src/friend_rescue.c | 2 +- src/gulpin_shop.c | 2 +- src/gulpin_shop_801FB50.c | 2 +- src/iq_skill_info_menu.c | 2 +- src/iq_skill_list_menu.c | 2 +- src/items.c | 2 +- src/kangaskhan_storage1.c | 2 +- src/kangaskhan_storage2.c | 2 +- src/kecleon_bros1.c | 2 +- src/kecleon_bros4.c | 2 +- src/load_screen.c | 2 +- src/luminous_cave.c | 4 +- src/makuhita_dojo1.c | 2 +- src/menu_input.c | 2 +- src/mission_reward.c | 2 +- src/moves.c | 2 +- src/options_menu1.c | 2 +- src/other_menus1.c | 2 +- src/party_list_menu.c | 2 +- src/personality_test1.c | 2 +- src/pokemon_news1.c | 2 +- src/pokemon_news2.c | 2 +- src/post_office_guide1.c | 2 +- src/quick_save_read.c | 2 +- src/quick_save_write.c | 2 +- src/rescue_password_menu.c | 2 +- src/save.c | 2 +- src/save_menu.c | 2 +- src/save_read.c | 2 +- src/save_write.c | 2 +- src/{code_80140DC.c => string_format.c} | 32 +++++++-------- src/thank_you_wonder_mail.c | 2 +- src/trade_items_menu.c | 2 +- src/wigglytuff_shop3.c | 2 +- src/wonder_mail.c | 2 +- src/wonder_mail_2.c | 2 +- src/wonder_mail_6.c | 2 +- src/wonder_mail_802D098.c | 2 +- src/wonder_mail_main_menu.c | 2 +- sym_ewram.txt | 2 +- 68 files changed, 110 insertions(+), 103 deletions(-) rename include/{code_80130A8.h => string_format.h} (65%) rename src/{code_80140DC.c => string_format.c} (97%) diff --git a/include/code_802DB28.h b/include/code_802DB28.h index 636c992aa..572a54287 100644 --- a/include/code_802DB28.h +++ b/include/code_802DB28.h @@ -4,7 +4,7 @@ #include "file_system.h" #include "structs/str_text.h" #include "structs/str_wonder_mail.h" -#include "code_80130A8.h" +#include "string_format.h" // size: 0xA8 struct unkStruct_203B2FC diff --git a/include/dungeon_message.h b/include/dungeon_message.h index 15c371209..0a8ceb0cd 100644 --- a/include/dungeon_message.h +++ b/include/dungeon_message.h @@ -2,7 +2,7 @@ #define GUARD_DUNGEON_MESSAGE_H #include "structs/dungeon_entity.h" -#include "code_80130A8.h" +#include "string_format.h" struct MonDialogueSpriteInfo { diff --git a/include/felicity_bank.h b/include/felicity_bank.h index b1973753b..42c65e138 100644 --- a/include/felicity_bank.h +++ b/include/felicity_bank.h @@ -4,7 +4,7 @@ #include "file_system.h" #include "structs/menu.h" #include "structs/str_text.h" -#include "code_80130A8.h" +#include "string_format.h" #define FELICITY_BANK_ACTION_WITHDRAW 0 #define FELICITY_BANK_ACTION_DEPOSIT 1 diff --git a/include/gulpin_shop.h b/include/gulpin_shop.h index c369055cf..60284eca3 100644 --- a/include/gulpin_shop.h +++ b/include/gulpin_shop.h @@ -5,7 +5,7 @@ #include "structs/menu.h" #include "structs/str_text.h" #include "structs/str_moves.h" -#include "code_80130A8.h" +#include "string_format.h" // size: 0x18C typedef struct GulpinShopWork diff --git a/include/code_80130A8.h b/include/string_format.h similarity index 65% rename from include/code_80130A8.h rename to include/string_format.h index a7d0d0547..d701b14f8 100644 --- a/include/code_80130A8.h +++ b/include/string_format.h @@ -1,10 +1,22 @@ -#ifndef GUARD_CODE_80130A8_H -#define GUARD_CODE_80130A8_H +#ifndef GUARD_STRING_FORMAT_H +#define GUARD_STRING_FORMAT_H #include "file_system.h" #include "structs/menu.h" #include "structs/str_text.h" +// TODO: once the files close to string_format.c are decompiled, check if these should be included here. Most likely, they should be declared elsewhere. +// code_80130A8.s +void sub_8013E54(void); +void sub_8013F84(void); +void sub_80140B4(UnkTextStruct2 *); +void sub_80140DC(void); +void sub_8014114(void); +s32 sub_80144A4(s32 *); +void sub_80151C0(u32, u8 *); +u32 sub_80154F0(void); +void sub_80155F0(void); + struct PortraitGfxSub { const u8 *pal; @@ -36,22 +48,17 @@ extern u8 gPlayerName[10][FORMAT_BUFFER_LEN]; extern u8 gUnknown_202E5D8[FORMAT_BUFFER_LEN]; extern u8 gUnknown_202E628[FRIEND_AREA_BUFFER_LEN]; -// code_80130A8.s -void sub_8013E54(void); -void sub_8013F84(void); -void sub_80140B4(UnkTextStruct2 *); -void sub_80140DC(void); -void sub_8014114(void); -void CreateDialogueBoxAndPortrait(const u8 *text, void *param_2, struct MonPortraitMsg *monPortraitPtr, u16 param_4); -void CreateYesNoDialogueBoxAndPortrait_DefaultYes(const u8 *text, struct MonPortraitMsg *monPortraitPtr, u16 param_3); -void CreateYesNoDialogueBoxAndPortrait_DefaultNo(const u8 *text, struct MonPortraitMsg *monPortraitPtr, u16 param_3); -void CreateMenuDialogueBoxAndPortrait(const u8 *text, void *a1, u32 r9, const MenuItem *menuItems, void *arg_0, u32 a5, u32 unknownUnused, struct MonPortraitMsg *monPortraitPtr, u16 r10); -s32 sub_80144A4(s32 *); -void sub_80151C0(u32, u8 *); -u32 sub_80154F0(void); -void sub_80155F0(void); +void sub_8014144(void); +void sub_801416C(s32 param_1,s32 param_2); +void CreateDialogueBoxAndPortrait(const u8 *text, void *param_2, struct MonPortraitMsg *monPortraitPtr, u16 flags); +void CreateYesNoDialogueBoxAndPortrait_DefaultYes(const u8 *text, struct MonPortraitMsg *monPortraitPtr, u16 flags); +void CreateYesNoDialogueBoxAndPortrait_DefaultNo(const u8 *text, struct MonPortraitMsg *monPortraitPtr, u16 flags); +void CreateMenuDialogueBoxAndPortrait(const u8 *text, void *a1, u32 r9, const MenuItem *menuItems, void *arg_0, u32 a5, u32 unknownUnused, struct MonPortraitMsg *monPortraitPtr, u16 flags); +void sub_8014490(void); +s32 sub_80144A4(s32 *a0); void DrawDialogueBoxString(void); -void PrintFormatStringOnWindow(s32 x, s32 y, const u8 *str, u32 windowId, u32 arg_0); -const u8 *xxx_format_string(const u8 *str, u8 *a1, u8 *r7, u16 r8); +const u8 *xxx_format_string(const u8 *str, u8 *dst, u8 *dstMax, u16 flags); +void PrintFormatStringOnWindow(s32 x, s32 y, const u8 *str, u32 windowId, u32 terminatingChr); +void PrintFormatStringOnWindow2(s32 x, s32 y, const u8 *str, u32 windowId, u32 terminatingChr, s32 lineSpacing); -#endif // GUARD_CODE_80130A8_H +#endif // GUARD_STRING_FORMAT_H diff --git a/ld_script.txt b/ld_script.txt index e345ab2d1..77ff0e155 100755 --- a/ld_script.txt +++ b/ld_script.txt @@ -103,7 +103,7 @@ SECTIONS { src/code_8012A18.o(.text); src/menu_input.o(.text); asm/code_80130A8.o(.text); - src/code_80140DC.o(.text); + src/string_format.o(.text); src/code_8015080.o(.text); asm/code_8015080.o(.text); src/code_8012A18_1.o(.text); @@ -443,7 +443,7 @@ SECTIONS { src/quick_save_read.o(.rodata); src/quick_save_write.o(.rodata); src/menu_input.o(.rodata); - src/code_80140DC.o(.rodata); + src/string_format.o(.rodata); data/data_80D47B8.o(.rodata); src/common_strings.o(.rodata); src/code_8015080.o(.rodata); diff --git a/src/adventure_log.c b/src/adventure_log.c index c9737ddc4..b57f1deba 100644 --- a/src/adventure_log.c +++ b/src/adventure_log.c @@ -2,7 +2,7 @@ #include "globaldata.h" #include "adventure_log.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_8097670.h" #include "constants/input.h" #include "input.h" diff --git a/src/code_2.c b/src/code_2.c index 50875aa5a..08b9f8871 100644 --- a/src/code_2.c +++ b/src/code_2.c @@ -5,7 +5,7 @@ #include "code_8009804.h" #include "code_800C9CC.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_8094F88.h" #include "code_8097670.h" #include "constants/bg_music.h" diff --git a/src/code_8012A18.c b/src/code_8012A18.c index f288b6cc0..82a67d061 100644 --- a/src/code_8012A18.c +++ b/src/code_8012A18.c @@ -4,7 +4,7 @@ #include "code_8009804.h" #include "code_800C9CC.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "game_options.h" #include "sprite.h" diff --git a/src/code_8015080.c b/src/code_8015080.c index f023a5fd7..b43f87000 100644 --- a/src/code_8015080.c +++ b/src/code_8015080.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80130A8.h" +#include "string_format.h" #include "input.h" #include "memory.h" #include "menu_input.h" diff --git a/src/code_801602C.c b/src/code_801602C.c index 5153d57cb..3205e3725 100644 --- a/src/code_801602C.c +++ b/src/code_801602C.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "code_8012A18_1.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_801602C.h" #include "common_strings.h" #include "input.h" diff --git a/src/code_801AFA4.c b/src/code_801AFA4.c index a4a053b19..a38a27fc4 100644 --- a/src/code_801AFA4.c +++ b/src/code_801AFA4.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_801AFA4.h" #include "code_8099360.h" #include "gulpin_shop.h" diff --git a/src/code_801B3C0.c b/src/code_801B3C0.c index 5fdf1502d..0237cfeb6 100644 --- a/src/code_801B3C0.c +++ b/src/code_801B3C0.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_801B3C0.h" #include "input.h" #include "items.h" diff --git a/src/code_801B60C.c b/src/code_801B60C.c index 39a3c429a..5e005f2a5 100644 --- a/src/code_801B60C.c +++ b/src/code_801B60C.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_801B3C0.h" #include "code_801B60C.h" #include "code_8099360.h" diff --git a/src/code_801D014.c b/src/code_801D014.c index 7096c0d35..3383cbf79 100644 --- a/src/code_801D014.c +++ b/src/code_801D014.c @@ -2,7 +2,7 @@ #include "globaldata.h" #include "bg_palette_buffer.h" #include "code_800D090.h" -#include "code_80130A8.h" +#include "string_format.h" #include "iq_skill_menu.h" #include "code_801D014.h" #include "code_80227B8.h" diff --git a/src/code_801F808.c b/src/code_801F808.c index bff83920d..41f0b1464 100644 --- a/src/code_801F808.c +++ b/src/code_801F808.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_80118A4.h" #include "input.h" #include "memory.h" diff --git a/src/code_80227B8.c b/src/code_80227B8.c index bcc2bed0d..23106ff38 100644 --- a/src/code_80227B8.c +++ b/src/code_80227B8.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_801AFA4.h" #include "code_801B3C0.h" #include "code_80227B8.h" diff --git a/src/code_802DB28.c b/src/code_802DB28.c index d26db142c..02df8c92b 100644 --- a/src/code_802DB28.c +++ b/src/code_802DB28.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_802DB28.h" #include "code_802F204.h" #include "code_803C1D0.h" diff --git a/src/code_805D8C8_1.c b/src/code_805D8C8_1.c index 6c2b498ba..256b9bb29 100644 --- a/src/code_805D8C8_1.c +++ b/src/code_805D8C8_1.c @@ -15,7 +15,7 @@ #include "dungeon_music.h" #include "dungeon_ai_movement.h" #include "code_8045A00.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_803E46C.h" #include "code_801602C.h" #include "code_800D090.h" diff --git a/src/code_8066D04.c b/src/code_8066D04.c index 46da84b08..7a24b441b 100644 --- a/src/code_8066D04.c +++ b/src/code_8066D04.c @@ -7,7 +7,7 @@ #include "dungeon_music.h" #include "dungeon_util.h" #include "items.h" -#include "code_80130A8.h" +#include "string_format.h" extern u8 *gUnknown_80F8BE0[]; extern u8 *gItemStickyCannotMove1[]; diff --git a/src/code_8084778.c b/src/code_8084778.c index 28f6e5f8b..38d1499d1 100644 --- a/src/code_8084778.c +++ b/src/code_8084778.c @@ -1,6 +1,6 @@ #include "global.h" #include "code_8084778.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_80958E8.h" #include "mailbox.h" #include "pokemon_mid.h" diff --git a/src/code_809447C.c b/src/code_809447C.c index 3ae8c5a09..f5a731af7 100644 --- a/src/code_809447C.c +++ b/src/code_809447C.c @@ -1,5 +1,5 @@ #include "global.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_8092334.h" #include "code_809447C.h" #include "dungeon.h" diff --git a/src/debug_menu2.c b/src/debug_menu2.c index f80d476fd..82e2acdc4 100644 --- a/src/debug_menu2.c +++ b/src/debug_menu2.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_801B3C0.h" #include "code_801C8C4.h" #include "common_strings.h" diff --git a/src/debug_menu4.c b/src/debug_menu4.c index f6bd80b13..3810d2339 100644 --- a/src/debug_menu4.c +++ b/src/debug_menu4.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_801602C.h" #include "code_8023868.h" #include "debug_menu4.h" diff --git a/src/dungeon_message.c b/src/dungeon_message.c index 032f463d1..214971ef0 100644 --- a/src/dungeon_message.c +++ b/src/dungeon_message.c @@ -3,7 +3,7 @@ #include "dungeon.h" #include "structs/dungeon_entity.h" #include "code_803E46C.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_800E9E4.h" #include "menu_input.h" #include "code_803E668.h" diff --git a/src/felicity_bank.c b/src/felicity_bank.c index db42aca55..5c079292f 100644 --- a/src/felicity_bank.c +++ b/src/felicity_bank.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "common_strings.h" #include "felicity_bank.h" #include "input.h" diff --git a/src/friend_area_action_menu.c b/src/friend_area_action_menu.c index 044667a79..335075dfd 100644 --- a/src/friend_area_action_menu.c +++ b/src/friend_area_action_menu.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_801B3C0.h" #include "iq_skill_menu.h" #include "code_801EE10.h" diff --git a/src/friend_list_menu.c b/src/friend_list_menu.c index 02f04afcb..b9cf7f1ee 100644 --- a/src/friend_list_menu.c +++ b/src/friend_list_menu.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_801602C.h" #include "code_801B3C0.h" #include "friend_list_menu.h" diff --git a/src/friend_rescue.c b/src/friend_rescue.c index 4d6eaeb6f..8c754a7be 100644 --- a/src/friend_rescue.c +++ b/src/friend_rescue.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_801B3C0.h" #include "code_801C8C4.h" #include "code_8023868.h" diff --git a/src/gulpin_shop.c b/src/gulpin_shop.c index 612e0843d..178b95f99 100644 --- a/src/gulpin_shop.c +++ b/src/gulpin_shop.c @@ -3,7 +3,7 @@ #include "code_80118A4.h" #include "code_801EE10.h" #include "code_801EE10_mid.h" -#include "code_80130A8.h" +#include "string_format.h" #include "common_strings.h" #include "gulpin_shop.h" #include "input.h" diff --git a/src/gulpin_shop_801FB50.c b/src/gulpin_shop_801FB50.c index 336046e29..84755ffb1 100644 --- a/src/gulpin_shop_801FB50.c +++ b/src/gulpin_shop_801FB50.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "iq_skill_menu.h" #include "code_801EE10.h" #include "code_801EE10_mid.h" diff --git a/src/iq_skill_info_menu.c b/src/iq_skill_info_menu.c index 5145d40cd..289abd286 100644 --- a/src/iq_skill_info_menu.c +++ b/src/iq_skill_info_menu.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "iq_skill_info_menu.h" #include "code_8097DD0.h" #include "input.h" diff --git a/src/iq_skill_list_menu.c b/src/iq_skill_list_menu.c index dbeb9b4a6..1e9c74707 100644 --- a/src/iq_skill_list_menu.c +++ b/src/iq_skill_list_menu.c @@ -2,7 +2,7 @@ #include "globaldata.h" #include "constants/input.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "iq_skill_list_menu.h" #include "input.h" #include "memory.h" diff --git a/src/items.c b/src/items.c index 8b21c3a33..5d0517bcb 100644 --- a/src/items.c +++ b/src/items.c @@ -10,7 +10,7 @@ #include "code_800D090.h" #include "text_util.h" #include "text2.h" -#include "code_80130A8.h" +#include "string_format.h" #include extern struct FileArchive gSystemFileArchive; diff --git a/src/kangaskhan_storage1.c b/src/kangaskhan_storage1.c index 70118b904..070266611 100644 --- a/src/kangaskhan_storage1.c +++ b/src/kangaskhan_storage1.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_801B3C0.h" #include "code_801C8C4.h" #include "code_8099360.h" diff --git a/src/kangaskhan_storage2.c b/src/kangaskhan_storage2.c index 3064b17a6..d68bec80f 100644 --- a/src/kangaskhan_storage2.c +++ b/src/kangaskhan_storage2.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_801B3C0.h" #include "code_801C8C4.h" #include "code_8099360.h" diff --git a/src/kecleon_bros1.c b/src/kecleon_bros1.c index 53a75f265..c83aa8273 100644 --- a/src/kecleon_bros1.c +++ b/src/kecleon_bros1.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_801B3C0.h" #include "code_8099360.h" #include "common_strings.h" diff --git a/src/kecleon_bros4.c b/src/kecleon_bros4.c index 2c84e6a55..004c6868f 100644 --- a/src/kecleon_bros4.c +++ b/src/kecleon_bros4.c @@ -2,7 +2,7 @@ #include "globaldata.h" #include "code_800D090.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_8099360.h" #include "constants/input.h" #include "input.h" diff --git a/src/load_screen.c b/src/load_screen.c index 2acdd182b..7013dffb4 100644 --- a/src/load_screen.c +++ b/src/load_screen.c @@ -2,7 +2,7 @@ #include "globaldata.h" #include "bg_palette_buffer.h" #include "code_800D090.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_8094F88.h" #include "code_8097670.h" #include "constants/main_menu.h" diff --git a/src/luminous_cave.c b/src/luminous_cave.c index e56318cf6..42078e986 100644 --- a/src/luminous_cave.c +++ b/src/luminous_cave.c @@ -1,8 +1,8 @@ #include "global.h" #include "globaldata.h" #include "code_80118A4.h" -#include "code_80130A8.h" -#include "code_80130A8.h" +#include "string_format.h" +#include "string_format.h" #include "code_801602C.h" #include "code_801B3C0.h" #include "code_8097670.h" diff --git a/src/makuhita_dojo1.c b/src/makuhita_dojo1.c index 447255015..10d57be46 100644 --- a/src/makuhita_dojo1.c +++ b/src/makuhita_dojo1.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_801B60C.h" #include "code_80A26CC.h" #include "common_strings.h" diff --git a/src/menu_input.c b/src/menu_input.c index 18c841b61..e6403bf7d 100644 --- a/src/menu_input.c +++ b/src/menu_input.c @@ -3,7 +3,7 @@ #include "code_800558C.h" #include "code_800D090.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "constants/colors.h" #include "constants/input.h" #include "input.h" diff --git a/src/mission_reward.c b/src/mission_reward.c index 0e98ebd0a..fa9797799 100644 --- a/src/mission_reward.c +++ b/src/mission_reward.c @@ -8,7 +8,7 @@ #include "input.h" #include "items.h" #include "memory.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_80118A4.h" #include "code_801B60C.h" #include "text1.h" diff --git a/src/moves.c b/src/moves.c index 39a96a39e..e018e9bae 100644 --- a/src/moves.c +++ b/src/moves.c @@ -1,6 +1,6 @@ #include "global.h" #include "code_800D090.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_8092334.h" #include "code_8097DD0.h" #include "constants/colors.h" diff --git a/src/options_menu1.c b/src/options_menu1.c index ba3710013..6e8682c06 100644 --- a/src/options_menu1.c +++ b/src/options_menu1.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_8099360.h" #include "common_strings.h" #include "hints_menu1.h" diff --git a/src/other_menus1.c b/src/other_menus1.c index 3a17868ba..355ff4c66 100644 --- a/src/other_menus1.c +++ b/src/other_menus1.c @@ -5,7 +5,7 @@ #include "code_8009804.h" #include "code_800C9CC.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "constants/communication_error_codes.h" #include "constants/main_menu.h" #include "structs/str_dungeon.h" diff --git a/src/party_list_menu.c b/src/party_list_menu.c index 192a4121d..0321bb138 100644 --- a/src/party_list_menu.c +++ b/src/party_list_menu.c @@ -2,7 +2,7 @@ #include "globaldata.h" #include "code_800D090.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_801B3C0.h" #include "iq_skill_menu.h" #include "code_801EE10.h" diff --git a/src/personality_test1.c b/src/personality_test1.c index fe8e45d2d..e23bab4d2 100644 --- a/src/personality_test1.c +++ b/src/personality_test1.c @@ -2,7 +2,7 @@ #include "globaldata.h" #include "bg_palette_buffer.h" #include "code_2.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_801602C.h" #include "code_8094D28.h" #include "code_8099360.h" diff --git a/src/pokemon_news1.c b/src/pokemon_news1.c index 9f6cd0a93..30a8572f4 100644 --- a/src/pokemon_news1.c +++ b/src/pokemon_news1.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_80958E8.h" #include "constants/input.h" #include "input.h" diff --git a/src/pokemon_news2.c b/src/pokemon_news2.c index 165efc089..e864f89b4 100644 --- a/src/pokemon_news2.c +++ b/src/pokemon_news2.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "game_options.h" #include "input.h" #include "pokemon_mail.h" diff --git a/src/post_office_guide1.c b/src/post_office_guide1.c index 1fc8c73bb..5fbd374fa 100644 --- a/src/post_office_guide1.c +++ b/src/post_office_guide1.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80130A8.h" +#include "string_format.h" #include "input.h" #include "memory.h" #include "structs/menu.h" diff --git a/src/quick_save_read.c b/src/quick_save_read.c index c6f864abc..2a16f9d4f 100644 --- a/src/quick_save_read.c +++ b/src/quick_save_read.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80130A8.h" +#include "string_format.h" #include "memory.h" #include "quick_save_read.h" #include "save.h" diff --git a/src/quick_save_write.c b/src/quick_save_write.c index a77fa1392..bec6b1ff2 100644 --- a/src/quick_save_write.c +++ b/src/quick_save_write.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80130A8.h" +#include "string_format.h" #include "memory.h" #include "quick_save_write.h" #include "save.h" diff --git a/src/rescue_password_menu.c b/src/rescue_password_menu.c index b290d0cf8..fd353aeb1 100644 --- a/src/rescue_password_menu.c +++ b/src/rescue_password_menu.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_803D0D8.h" #include "code_8094F88.h" #include "constants/main_menu.h" diff --git a/src/save.c b/src/save.c index 5f333724a..b4b1f8233 100644 --- a/src/save.c +++ b/src/save.c @@ -1,6 +1,6 @@ #include "global.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_8097670.h" #include "event_flag.h" #include "exclusive_pokemon.h" diff --git a/src/save_menu.c b/src/save_menu.c index ec56bfed7..72fef8bb1 100644 --- a/src/save_menu.c +++ b/src/save_menu.c @@ -1,5 +1,5 @@ #include "global.h" -#include "code_80130A8.h" +#include "string_format.h" #include "constants/main_menu.h" #include "input.h" #include "main_menu1.h" diff --git a/src/save_read.c b/src/save_read.c index 06bdfb303..de8870b24 100644 --- a/src/save_read.c +++ b/src/save_read.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80130A8.h" +#include "string_format.h" #include "memory.h" #include "save.h" #include "save_read.h" diff --git a/src/save_write.c b/src/save_write.c index f467f65eb..156d8f3cd 100644 --- a/src/save_write.c +++ b/src/save_write.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_8099360.h" #include "memory.h" #include "save.h" diff --git a/src/code_80140DC.c b/src/string_format.c similarity index 97% rename from src/code_80140DC.c rename to src/string_format.c index e93dd6fb3..c82102dfd 100644 --- a/src/code_80140DC.c +++ b/src/string_format.c @@ -4,7 +4,7 @@ #include "menu_input.h" #include "sprite.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "bg_palette_buffer.h" #include "input.h" #include "text1.h" @@ -121,10 +121,10 @@ extern void sub_8008274(s32 a0, const u8 *compressedData, s32 a2); extern void sub_80073E0(s32 a0); extern void sub_8011A04(void); -void sub_8014A88(void); -bool8 sub_8014B94(void); +static void sub_8014A88(void); +static bool8 sub_8014B94(void); static void nullsub_35(void); -bool8 AppendString_8014FA8(const u8 *, u8 **, u8 *, u16 r3); +static bool8 AppendString(const u8 *, u8 **, u8 *, u16 r3); // 'd', 'v' and 'V' EWRAM_DATA s32 gFormatData_202DE30[10] = {0}; @@ -199,19 +199,19 @@ void sub_801416C(s32 param_1,s32 param_2) gUnknown_202E73C = (param_2 < 0 ) ? 0 : param_2; } -void CreateDialogueBoxAndPortrait(const u8 *text, void *param_2, struct MonPortraitMsg *monPortraitPtr, u16 param_4) +void CreateDialogueBoxAndPortrait(const u8 *text, void *param_2, struct MonPortraitMsg *monPortraitPtr, u16 flags) { - CreateMenuDialogueBoxAndPortrait(text, param_2, -1, NULL, NULL, 3, 0, monPortraitPtr, param_4); + CreateMenuDialogueBoxAndPortrait(text, param_2, -1, NULL, NULL, 3, 0, monPortraitPtr, flags); } -void CreateYesNoDialogueBoxAndPortrait_DefaultYes(const u8 *text, struct MonPortraitMsg *monPortraitPtr, u16 param_3) +void CreateYesNoDialogueBoxAndPortrait_DefaultYes(const u8 *text, struct MonPortraitMsg *monPortraitPtr, u16 flags) { - CreateMenuDialogueBoxAndPortrait(text, NULL, -1, gUnknown_80D485C, NULL, 3, 0, monPortraitPtr, param_3 | 0x300); + CreateMenuDialogueBoxAndPortrait(text, NULL, -1, gUnknown_80D485C, NULL, 3, 0, monPortraitPtr, flags | 0x300); } -void CreateYesNoDialogueBoxAndPortrait_DefaultNo(const u8 *text, struct MonPortraitMsg *monPortraitPtr, u16 param_3) +void CreateYesNoDialogueBoxAndPortrait_DefaultNo(const u8 *text, struct MonPortraitMsg *monPortraitPtr, u16 flags) { - CreateMenuDialogueBoxAndPortrait(text, NULL, -1, gUnknown_80D4880, NULL, 3, 0, monPortraitPtr, param_3 | 0x300); + CreateMenuDialogueBoxAndPortrait(text, NULL, -1, gUnknown_80D4880, NULL, 3, 0, monPortraitPtr, flags | 0x300); } void CreateMenuDialogueBoxAndPortrait(const u8 *text, void *a1, u32 r9, const MenuItem *menuItems, void *arg_0, u32 a5, u32 unknownUnused, struct MonPortraitMsg *monPortraitPtr, u16 flags) @@ -618,7 +618,7 @@ void DrawDialogueBoxString(void) } } -void sub_8014A88(void) +static void sub_8014A88(void) { s32 r2, r1; u8 text[128]; @@ -668,7 +668,7 @@ void sub_8014A88(void) } } -bool8 sub_8014B94(void) +static bool8 sub_8014B94(void) { if (!sub_8012FD8(&gUnknown_202EBC0)) { sub_8013114(&gUnknown_202EBC0, &gUnknown_202EC1C); @@ -705,8 +705,8 @@ const u8 *xxx_format_string(const u8 *str, u8 *dst, u8 *dstMax, u16 flags) r10 = FALSE; r9 = FALSE; if (flags & 8) { - AppendString_8014FA8(gUnknown_202E5D8, &dst, dstMax, flags); - AppendString_8014FA8(gUnknown_80D48F4, &dst, dstMax, flags); + AppendString(gUnknown_202E5D8, &dst, dstMax, flags); + AppendString(gUnknown_80D48F4, &dst, dstMax, flags); } } else if (r9) { @@ -818,7 +818,7 @@ const u8 *xxx_format_string(const u8 *str, u8 *dst, u8 *dstMax, u16 flags) if (txtPtr != NULL) { - if (AppendString_8014FA8(txtPtr, &dst, dstMax, flags)) + if (AppendString(txtPtr, &dst, dstMax, flags)) break; } } @@ -849,7 +849,7 @@ const u8 *xxx_format_string(const u8 *str, u8 *dst, u8 *dstMax, u16 flags) return str; } -bool8 AppendString_8014FA8(const u8 *str, u8 **dstPtr, u8 *dstMax, u16 flags) +static bool8 AppendString(const u8 *str, u8 **dstPtr, u8 *dstMax, u16 flags) { u8 *dst = *dstPtr; while (*str != '\0') { diff --git a/src/thank_you_wonder_mail.c b/src/thank_you_wonder_mail.c index 603945d79..6de4515b9 100644 --- a/src/thank_you_wonder_mail.c +++ b/src/thank_you_wonder_mail.c @@ -2,7 +2,7 @@ #include "globaldata.h" #include "code_800D090.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_801B3C0.h" #include "code_801C8C4.h" #include "code_802F204.h" diff --git a/src/trade_items_menu.c b/src/trade_items_menu.c index ac02d8d09..7266383c4 100644 --- a/src/trade_items_menu.c +++ b/src/trade_items_menu.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_801B3C0.h" #include "code_801C8C4.h" #include "constants/communication_error_codes.h" diff --git a/src/wigglytuff_shop3.c b/src/wigglytuff_shop3.c index 27f546e66..9e121e5df 100644 --- a/src/wigglytuff_shop3.c +++ b/src/wigglytuff_shop3.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_8023144.h" #include "code_8099360.h" #include "common_strings.h" diff --git a/src/wonder_mail.c b/src/wonder_mail.c index 275d3dfc2..62e990f69 100644 --- a/src/wonder_mail.c +++ b/src/wonder_mail.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_8023868.h" #include "code_8024458.h" #include "code_8094F88.h" diff --git a/src/wonder_mail_2.c b/src/wonder_mail_2.c index af4d2a8f7..70bfb0b2d 100644 --- a/src/wonder_mail_2.c +++ b/src/wonder_mail_2.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "code_800D090.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_802F204.h" #include "code_8094F88.h" #include "code_8097670.h" diff --git a/src/wonder_mail_6.c b/src/wonder_mail_6.c index b19f643b3..0111b82ae 100644 --- a/src/wonder_mail_6.c +++ b/src/wonder_mail_6.c @@ -7,7 +7,7 @@ #include "pokemon.h" #include "code_8094F88.h" #include "menu_input.h" -#include "code_80130A8.h" +#include "string_format.h" #include "wonder_mail_4.h" #include "wonder_mail_5.h" diff --git a/src/wonder_mail_802D098.c b/src/wonder_mail_802D098.c index 28b1a3b0f..a5e341bc8 100644 --- a/src/wonder_mail_802D098.c +++ b/src/wonder_mail_802D098.c @@ -1,6 +1,6 @@ #include "global.h" #include "globaldata.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_802DE84.h" #include "code_803B050.h" #include "code_80958E8.h" diff --git a/src/wonder_mail_main_menu.c b/src/wonder_mail_main_menu.c index e64fcedef..a327a8453 100644 --- a/src/wonder_mail_main_menu.c +++ b/src/wonder_mail_main_menu.c @@ -1,7 +1,7 @@ #include "global.h" #include "globaldata.h" #include "code_80118A4.h" -#include "code_80130A8.h" +#include "string_format.h" #include "code_801B3C0.h" #include "code_803B050.h" #include "code_801C8C4.h" diff --git a/sym_ewram.txt b/sym_ewram.txt index 1298f8367..1a5b5655e 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -182,7 +182,7 @@ gUnknown_202DE19: /* 202DE19 (sub_800F990 - sub_8010014) */ .include "src/save.o" .space 4 - .include "src/code_80140DC.o" + .include "src/string_format.o" .space 4