Game-Decompilation/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2024-11-26 22:40:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

string_format.c clean-up

Browse Source
This commit is contained in:
DizzyEggg 2024-10-29 14:07:52 +01:00
parent 7438e1cf19
commit b218d9006b
68 changed files with 110 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/code_802DB28.h
View File

@ -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

2
include/dungeon_message.h
View File

@ -2,7 +2,7 @@
#define GUARD_DUNGEON_MESSAGE_H
#include "structs/dungeon_entity.h"
#include "code_80130A8.h"
#include "string_format.h"
struct MonDialogueSpriteInfo
{

2
include/felicity_bank.h
View File

@ -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

2
include/gulpin_shop.h
View File

@ -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

45
include/code_80130A8.h → include/string_format.h
View File

@ -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

4
ld_script.txt
View File

@ -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);

2
src/adventure_log.c
View File

@ -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"

2
src/code_2.c
View File

@ -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"

2
src/code_8012A18.c
View File

@ -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"

2
src/code_8015080.c
View File

@ -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"

2
src/code_801602C.c
View File

@ -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"

2
src/code_801AFA4.c
View File

@ -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"

2
src/code_801B3C0.c
View File

@ -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"

2
src/code_801B60C.c
View File

@ -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"

2
src/code_801D014.c
View File

@ -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"

2
src/code_801F808.c
View File

@ -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"

2
src/code_80227B8.c
View File

@ -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"

2
src/code_802DB28.c
View File

@ -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"

2
src/code_805D8C8_1.c
View File

@ -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"

2
src/code_8066D04.c
View File

@ -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[];

2
src/code_8084778.c
View File

@ -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"

2
src/code_809447C.c
View File

@ -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"

2
src/debug_menu2.c
View File

@ -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"

2
src/debug_menu4.c
View File

@ -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"

2
src/dungeon_message.c
View File

@ -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"

2
src/felicity_bank.c
View File

@ -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"

2
src/friend_area_action_menu.c
View File

@ -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"

2
src/friend_list_menu.c
View File

@ -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"

2
src/friend_rescue.c
View File

@ -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"

2
src/gulpin_shop.c
View File

@ -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"

2
src/gulpin_shop_801FB50.c
View File

@ -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"

2
src/iq_skill_info_menu.c
View File

@ -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"

2
src/iq_skill_list_menu.c
View File

@ -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"

2
src/items.c
View File

@ -10,7 +10,7 @@
#include "code_800D090.h"
#include "text_util.h"
#include "text2.h"
#include "code_80130A8.h"
#include "string_format.h"
#include <stddef.h>
extern struct FileArchive gSystemFileArchive;

2
src/kangaskhan_storage1.c
View File

@ -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"

2
src/kangaskhan_storage2.c
View File

@ -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"

2
src/kecleon_bros1.c
View File

@ -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"

2
src/kecleon_bros4.c
View File

@ -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"

2
src/load_screen.c
View File

@ -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"

4
src/luminous_cave.c
View File

@ -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"

2
src/makuhita_dojo1.c
View File

@ -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"

2
src/menu_input.c
View File

@ -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"

2
src/mission_reward.c
View File

@ -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"

2
src/moves.c
View File

@ -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"

2
src/options_menu1.c
View File

@ -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"

2
src/other_menus1.c
View File

@ -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"

2
src/party_list_menu.c
View File

@ -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"

2
src/personality_test1.c
View File

@ -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"

2
src/pokemon_news1.c
View File

@ -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"

2
src/pokemon_news2.c
View File

@ -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"

2
src/post_office_guide1.c
View File

@ -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"

2
src/quick_save_read.c
View File

@ -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"

2
src/quick_save_write.c
View File

@ -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"

2
src/rescue_password_menu.c
View File

@ -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"

2
src/save.c
View File

@ -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"

2
src/save_menu.c
View File

@ -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"

2
src/save_read.c
View File

@ -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"

2
src/save_write.c
View File

@ -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"

32
src/code_80140DC.c → src/string_format.c
View File

@ -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') {

2
src/thank_you_wonder_mail.c
View File

@ -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"

2
src/trade_items_menu.c
View File

@ -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"

2
src/wigglytuff_shop3.c
View File

@ -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"

2
src/wonder_mail.c
View File

@ -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"

2
src/wonder_mail_2.c
View File

@ -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"

2
src/wonder_mail_6.c
View File

@ -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"

2
src/wonder_mail_802D098.c
View File

@ -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"

2
src/wonder_mail_main_menu.c
View File

@ -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"

2
sym_ewram.txt
View File

@ -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