diff options
Diffstat (limited to 'src/code_801D760.c')
| -rw-r--r-- | src/code_801D760.c | 38 |
1 files changed, 15 insertions, 23 deletions
diff --git a/src/code_801D760.c b/src/code_801D760.c index be96c88..3b07d05 100644 --- a/src/code_801D760.c +++ b/src/code_801D760.c @@ -4,12 +4,7 @@ #include "gUnknown_203B460.h" #include "memory.h" #include "input.h" - -struct unkData -{ - u8 unk0[0x14]; - u32 *unk14; -}; +#include "text.h" struct unkStruct_203B258 { @@ -18,16 +13,14 @@ struct unkStruct_203B258 u32 unk14; u8 fill18[0x34 - 0x18]; u32 unk34; - struct unkData *unk38; - struct unkData unk3C[4]; - u32 unk9C; + struct UnkTextStruct2 *unk38; + struct UnkTextStruct2 unk3C[4]; + u8 unk9C[4]; }; extern struct unkStruct_203B258 *gUnknown_203B258; -extern struct unkData gUnknown_80DBF88; +extern struct UnkTextStruct2 gUnknown_80DBF88; -extern void sub_800641C(struct unkData *, u32, u32); -extern void sub_8006518(struct unkData *); extern void sub_8013818(void *, u32, u32, u32); extern void sub_8013878(void *, s32); extern u8 sub_80138B8(void *, u32); @@ -62,7 +55,6 @@ extern u8 sub_8012FD8(u32 *); extern void sub_8013114(u32 *, s32 *); extern const char *sub_8098FB4(); extern void xxx_format_string(const char *, u8 *, u32 **, u32); -extern const char *GetFriendAreaName(u8); extern s32 sub_8008ED0(u8 *); extern void xxx_call_draw_string(s32 size, u32, u8 *, u32, u32); extern const char *GetFriendAreaName(u8); @@ -73,7 +65,7 @@ extern void sub_8008C54(u32); extern void sub_80073B8(u32); extern void sub_80073E0(u32); void LoadTeamRankBadge(u32, u32, u32); -extern void sub_800D158(u8 *, u32 *, ...); +extern void ExpandPlaceholdersBuffer(u8 *, u32 *, ...); extern void SetBGPaletteBufferColorArray(s32 index, u8 *colorArray); extern void sub_8007E20(u32, u32, u32, u32, u32, u8 *, u32); @@ -316,7 +308,7 @@ void sub_801D894(void) // Stored on stack u32 *preload_string; u32 *r5; // R5 - u8 auStack116 [96]; // sp +4 + u8 buffer [96]; // sp +4 if (gUnknown_203B250->currFriendAreaLocation == NONE) { location = sub_8098FB4(); @@ -325,12 +317,12 @@ void sub_801D894(void) location = GetFriendAreaName(gUnknown_203B250->currFriendAreaLocation); } // TODO this is def a hack - xxx_format_string(location, auStack116, &preload_string + 1, 0); - location_length = sub_8008ED0(auStack116); + xxx_format_string(location, buffer, &preload_string + 1, 0); + location_length = sub_8008ED0(buffer); x_coord = (128 - location_length) / 2; // Centers the location name sub_8008C54(1); sub_80073B8(1); - xxx_call_draw_string(x_coord, 4, auStack116, 1, 0); + xxx_call_draw_string(x_coord, 4, buffer, 1, 0); sub_80073E0(1); sub_8008C54(2); sub_80073B8(2); @@ -339,10 +331,10 @@ void sub_801D894(void) // Have to load before TeamRank funcs r5 = &gUnknown_80DBF3C; // %s #C5%d#R Pts. rank = GetRescueTeamRank(); - sub_800D158(auStack116, r5, GetTeamRankString(rank), GetTeamRankPts()); - xxx_call_draw_string(32, 4, auStack116, 2, 0); - sub_800D158(auStack116, &gUnknown_80DBF4C, gUnknown_203B460->teamMoney); - xxx_call_draw_string(32, 18, auStack116, 2, 0); + ExpandPlaceholdersBuffer(buffer, r5, GetTeamRankString(rank), GetTeamRankPts()); + xxx_call_draw_string(32, 4, buffer, 2, 0); + ExpandPlaceholdersBuffer(buffer, &gUnknown_80DBF4C, gUnknown_203B460->teamMoney); + xxx_call_draw_string(32, 18, buffer, 2, 0); sub_80073E0(2); } @@ -374,7 +366,7 @@ u32 sub_801D9E4(void) gUnknown_203B258->unk38 = &gUnknown_203B258->unk3C[3]; sub_8006518(gUnknown_203B258->unk3C); gUnknown_203B258->unk3C[gUnknown_203B258->unk34] = gUnknown_80DBF88; - gUnknown_203B258->unk38->unk14 = &gUnknown_203B258->unk9C; + gUnknown_203B258->unk38->unk14 = gUnknown_203B258->unk9C; ResetUnusedInputStruct(); sub_800641C(gUnknown_203B258->unk3C,1,1); sub_8013818(gUnknown_203B258,0xe5,10,gUnknown_203B258->unk34); |